diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 08b58326bd85..000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: 1.0.{build}
-skip_tags: true
-skip_branch_with_pr: true
-image:
-  - Visual Studio 2019
-environment:
-  PYTHON: "C:\\Python27"
-  PYTHON_VERSION: "2.7.13"
-  PYTHON_ARCH: "32"
-  matrix:
-    - build_type: windows32_cmake_test
-#    - build_type: android_cpp_tests
-#    - build_type: android_lua_tests
-#    - build_type: android_cocos_new_test
-#    - build_type: android_cpp_empty_test
-#    - build_type: android_gen_libs
-
-
-platform:
-  - x86
-
-configuration:
-  - Release
-
-before_build:
-  - ps: ./tools/appveyor-scripts/before-build.ps1
-
-build_script:
-  - ps: ./tools/appveyor-scripts/build.ps1
-
-branches:
-  except:
-  - v1
-  - v2
-  - v4-develop
-  - v3-doc
-  - v3.11_backup
-  - v35-for-tizen
-
-clone_depth: 50
-
-test: off
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index a6d7a75b0138..30e2da959a43 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: linux
+  GH_OS_NAME: linux
   BUILD_TARGET: android
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
   PYENV_VERSION: 2.7.18
 
 jobs:
@@ -51,8 +48,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
       
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index 51ce1bc9a5e7..007d1e0325c8 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -7,7 +7,7 @@ on:
         # actions run ID
         description: 'Commit clang-format changes?'
         # Default value if no value is explicitly provided
-        default: false
+        default: 'false'
         # Input has to be provided for the workflow to run
         required: false
 
@@ -21,9 +21,9 @@ jobs:
     - name: Run clang-format lint
       uses: DoozyX/clang-format-lint-action@v0.13
       with:
-        source: './cocos ./extensions'
-        exclude: './thidrparty ./extensions/fairygui ./extensions/scripting/lua-bindings/auto ./extensions/spine'
-        extensions: 'h,cpp,c'
+        source: './cocos ./extensions ./tests ./templates'
+        exclude: './thidrparty ./extensions/fairygui ./extensions/scripting/lua-bindings/auto ./extensions/spine ./tests/fairygui-tests'
+        extensions: 'h,cpp,c,mm'
         clangFormatVersion: 13
         inplace: True
     - name: Commit clang-format changes
diff --git a/.github/workflows/genbindings-ci.yml b/.github/workflows/genbindings-ci.yml
new file mode 100644
index 000000000000..9e2857817be9
--- /dev/null
+++ b/.github/workflows/genbindings-ci.yml
@@ -0,0 +1,36 @@
+name: genbindings
+
+on: 
+  push:
+    branches:
+      - dev
+      - main
+    paths:
+      - cocos/**/*
+      - extensions/**/*
+      - .github/workflows/genbindings-ci.yml
+
+jobs:
+  build:
+    if: ${{ !startsWith(github.event.commits[0].message, 'Merge pull request') }}
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        lfs: 'true'
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+
+    - uses: ilammy/msvc-dev-cmd@v1.9.0
+      with: 
+        arch: ${{ env.BUILD_ARCH }}
+
+    - name: Build
+      run: tools\win-ci\genbindings.ps1
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index 276438373fc1..ed204106b8a4 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: osx
+  GH_OS_NAME: osx
   BUILD_TARGET: ios
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
 
 jobs:
   build:
@@ -41,8 +38,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
       
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index a8b17e6bb348..086aecbe2026 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -16,12 +16,10 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: linux
+  GH_OS_NAME: linux
   BUILD_TARGET: linux
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
+  PYENV_VERSION: 2.7.18
 
 jobs:
   build:
@@ -41,8 +39,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
 
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/osx-ci.yml b/.github/workflows/osx-ci.yml
index edd9ff2ca26c..8c925befa212 100644
--- a/.github/workflows/osx-ci.yml
+++ b/.github/workflows/osx-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: osx
+  GH_OS_NAME: osx
   BUILD_TARGET: osx
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
 
 jobs:
   build:
@@ -41,8 +38,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
       
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index 2a27801caca0..23cc0f8019fa 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -8,9 +8,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
-  GITHUB_CI: true
+  PYENV_VERSION: 2.7.18
 
 jobs:
   build-windows:
@@ -31,13 +29,13 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
       - name: Build
-        run: tools\windows-ci\build.ps1 $env:BUILD_ARCH
+        run: tools\win-ci\build.ps1 $env:BUILD_ARCH
 
   build-linux:
     name: build-linux
     runs-on: ubuntu-latest
     env:
-      TRAVIS_OS_NAME: linux
+      GH_OS_NAME: linux
       BUILD_TARGET: linux
     steps:
       - uses: actions/checkout@v2
@@ -46,8 +44,8 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
 
   build-android:
     name: build-android
@@ -59,9 +57,8 @@ jobs:
           - arm64-v8a
           - x86
     env:
-      TRAVIS_OS_NAME: linux
+      GH_OS_NAME: linux
       BUILD_TARGET: android
-      PYENV_VERSION: 2.7.18
       BUILD_ARCH: ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v2
@@ -70,14 +67,14 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
 
   build-osx:
     name: build-osx
     runs-on: macos-latest
     env:
-      TRAVIS_OS_NAME: osx
+      GH_OS_NAME: osx
       BUILD_TARGET: osx
     steps:
       - uses: actions/checkout@v2
@@ -86,14 +83,14 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
  
   build-ios:
     name: build-ios
     runs-on: macos-latest
     env:
-      TRAVIS_OS_NAME: osx
+      GH_OS_NAME: osx
       BUILD_TARGET: ios
     steps:
       - uses: actions/checkout@v2
@@ -102,5 +99,5 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 6ed0450144f8..0abb5b8b8a69 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -44,4 +44,4 @@ jobs:
         arch: ${{ env.BUILD_ARCH }}
 
     - name: Build
-      run: tools\windows-ci\build.ps1 $env:BUILD_ARCH
+      run: tools\win-ci\build.ps1 $env:BUILD_ARCH
diff --git a/README.md b/README.md
index c85f86c3332e..b27f735bfbd9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # adxe
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
-[![dev](https://img.shields.io/badge/v1.0.0-beta4-yellow.svg)](https://github.com/adxeproject/adxe/releases)
+
+[![dev](https://img.shields.io/badge/v1.0.0-beta5-yellow.svg)](https://github.com/adxeproject/adxe/releases)
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/adxeproject/adxe/pulls)
   
 [![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
 [![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
@@ -9,7 +11,7 @@
 [![Linux Build Status](https://github.com/adxeproject/adxe/workflows/linux/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
 [![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)  
 
-**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 14/17 and some more (see 'Highlight Features' for more info).**  
+**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 17 and some more (see 'Highlight Features' for more info).**  
 
 ### View code with vscode online: 
 - [![github1s](https://img.shields.io/badge/github1s-green.svg)](https://github1s.com/adxeproject/adxe)
@@ -19,10 +21,9 @@
 **[简体中文](README_CN.md)**
   
 ### Purpose Summary
-* C++ 14/17
+* C++ 17
 * Focus on native game dev (quick starting, easy to use, fast)
 * Bugfixes ASAP
-* Usefull PRs from **you** are welcome (review/merge ASAP)
   
 ### Highlight Features
 * Windows x64 build support
@@ -36,7 +37,7 @@
 * Implement all .wav formats supported by ```OpenAL Soft```, such as MS-ADPCM, ADPCM, ...
 * Use modern GL loader ```Glad```
 * Google [angle](https://github.com/google/angle) renderer backend support
-* C++ 14 standard
+* C++ 17 standard
 * IOS SDK 9.0 as minimal deployment
 * Use fast pugixml
 * Use [curl](https://github.com/curl/curl) for transferring data with URL syntax
@@ -136,7 +137,7 @@ https://github.com/adxeproject/adxe/discussions/411
 - @aismann
 - @weiwest
 
-### Fullly changes since cocos2d-x-4.0
+### Fully changes since cocos2d-x-4.0
 
 - [HIGHLIGHT] Implement Windows WebView using WebView2 Edge Chromium, thanks to @rh101
 - [HIGHLIGHT] Windows x64 build support
diff --git a/README_CN.md b/README_CN.md
index d52c00e6a883..8784b18e7480 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,8 +1,9 @@
 # adxe
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
-[![dev](https://img.shields.io/badge/v1.0.0-beta4-yellow.svg)](https://github.com/adxeproject/adxe/releases)
+[![dev](https://img.shields.io/badge/v1.0.0-beta5-yellow.svg)](https://github.com/adxeproject/adxe/releases)
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/adxeproject/adxe/pulls)
   
 [![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
 [![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
@@ -11,16 +12,15 @@
 [![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)  
 
 
-**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++14/17...**
+**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++17...**
   
 **[English](README.md)**
   
 ### 宗旨:
-* C++14/17
+* C++17
 * Focus on native game dev only
 * Fix bugs ASAP
 * Review PR ASAP
-* Excellent PRs from any guys are welcome, we will review & merge ASAP
   
 ### 主要特性:
 * Windows x64编译支持
@@ -33,7 +33,7 @@
 * AudioEngine实现wav所有 ```openal-soft``` 支持的封装格式, 例如MS-ADPCM, ADPCM等
 * 使用现代化的GL加载器glad代替glew
 * 增加google angle渲染后端支持
-* 设置默认C++标准为C++14
+* C++最低标准要求: C++17
 * 设置ios下最低目标平台为ios9.0
 * 使用更快的xml解析库pugixml代替tinyxml2
 * Downloader全平台统一实现，均基于curl
diff --git a/cocos/2d/CCActionTiledGrid.cpp b/cocos/2d/CCActionTiledGrid.cpp
index 85558d98e3f0..74665cd9b41f 100644
--- a/cocos/2d/CCActionTiledGrid.cpp
+++ b/cocos/2d/CCActionTiledGrid.cpp
@@ -247,7 +247,7 @@ Vec2 ShuffleTiles::getDelta(const Vec2& pos) const
     pos2.x = (float)(_tilesOrder[idx] / (int)_gridSize.height);
     pos2.y = (float)(_tilesOrder[idx] % (int)_gridSize.height);
 
-    return Vec2((int)(pos2.x - pos.width), (int)(pos2.y - pos.height));
+    return Vec2(static_cast<float>((int)(pos2.x - pos.width)), static_cast<float>((int)(pos2.y - pos.height)));
 }
 
 void ShuffleTiles::placeTile(const Vec2& pos, Tile* t)
diff --git a/cocos/2d/CCActionTween.cpp b/cocos/2d/CCActionTween.cpp
index 37f93ffae189..68b84f63ba44 100644
--- a/cocos/2d/CCActionTween.cpp
+++ b/cocos/2d/CCActionTween.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 NS_CC_BEGIN
 
-ActionTween* ActionTween::create(float duration, const std::string& key, float from, float to)
+ActionTween* ActionTween::create(float duration, std::string_view key, float from, float to)
 {
     ActionTween* ret = new ActionTween();
     if (ret->initWithDuration(duration, key, from, to))
@@ -42,7 +42,7 @@ ActionTween* ActionTween::create(float duration, const std::string& key, float f
     return nullptr;
 }
 
-bool ActionTween::initWithDuration(float duration, const std::string& key, float from, float to)
+bool ActionTween::initWithDuration(float duration, std::string_view key, float from, float to)
 {
     if (ActionInterval::initWithDuration(duration))
     {
diff --git a/cocos/2d/CCActionTween.h b/cocos/2d/CCActionTween.h
index 4890f07a93bb..c0d1b7454f71 100644
--- a/cocos/2d/CCActionTween.h
+++ b/cocos/2d/CCActionTween.h
@@ -59,7 +59,7 @@ class CC_DLL ActionTweenDelegate
     @param value The new value of the specified key.
     @param key The key of property which should be updated.
     */
-    virtual void updateTweenAction(float value, const std::string& key) = 0;
+    virtual void updateTweenAction(float value, std::string_view key) = 0;
 };
 
 /** ActionTween
@@ -93,7 +93,7 @@ class CC_DLL ActionTween : public ActionInterval
      * @param to The value of the specified property when the action end.
      * @return If the creation success, return a pointer of ActionTween; otherwise, return nil.
      */
-    static ActionTween* create(float duration, const std::string& key, float from, float to);
+    static ActionTween* create(float duration, std::string_view key, float from, float to);
 
     // Overrides
     void startWithTarget(Node* target) override;
@@ -111,7 +111,7 @@ class CC_DLL ActionTween : public ActionInterval
          * @return If the initialization success, return true; otherwise, return false.
          */
         bool
-        initWithDuration(float duration, const std::string& key, float from, float to);
+        initWithDuration(float duration, std::string_view key, float from, float to);
 
 protected:
     std::string _key;
diff --git a/cocos/2d/CCAnimation.cpp b/cocos/2d/CCAnimation.cpp
index 7909c0e9a36b..7f0887964509 100644
--- a/cocos/2d/CCAnimation.cpp
+++ b/cocos/2d/CCAnimation.cpp
@@ -165,7 +165,7 @@ void Animation::addSpriteFrame(SpriteFrame* spriteFrame)
     _totalDelayUnits++;
 }
 
-void Animation::addSpriteFrameWithFile(const std::string& filename)
+void Animation::addSpriteFrameWithFile(std::string_view filename)
 {
     Texture2D* texture = Director::getInstance()->getTextureCache()->addImage(filename);
     Rect rect          = Rect::ZERO;
diff --git a/cocos/2d/CCAnimation.h b/cocos/2d/CCAnimation.h
index 1a312fc3f7ae..b9b266c61739 100644
--- a/cocos/2d/CCAnimation.h
+++ b/cocos/2d/CCAnimation.h
@@ -199,7 +199,7 @@ class CC_DLL Animation : public Ref, public Clonable
      * Added to facilitate the migration from v0.8 to v0.9.
      * @param filename The path of SpriteFrame.
      */
-    void addSpriteFrameWithFile(const std::string& filename);
+    void addSpriteFrameWithFile(std::string_view filename);
 
     /** Adds a frame with a texture and a rect. Internally it will create a SpriteFrame and it will add it.
      * The frame will be added with one "delay unit".
diff --git a/cocos/2d/CCAnimationCache.cpp b/cocos/2d/CCAnimationCache.cpp
index 6c3f62eecb0d..eefbf411d7c5 100644
--- a/cocos/2d/CCAnimationCache.cpp
+++ b/cocos/2d/CCAnimationCache.cpp
@@ -63,12 +63,12 @@ AnimationCache::~AnimationCache()
     CCLOGINFO("deallocing AnimationCache: %p", this);
 }
 
-void AnimationCache::addAnimation(Animation* animation, const std::string& name)
+void AnimationCache::addAnimation(Animation* animation, std::string_view name)
 {
-    _animations.insert(name, animation);
+    _animations.insert(std::string{name}, animation);
 }
 
-void AnimationCache::removeAnimation(const std::string& name)
+void AnimationCache::removeAnimation(std::string_view name)
 {
     if (name.empty())
         return;
@@ -76,7 +76,7 @@ void AnimationCache::removeAnimation(const std::string& name)
     _animations.erase(name);
 }
 
-Animation* AnimationCache::getAnimation(const std::string& name)
+Animation* AnimationCache::getAnimation(std::string_view name)
 {
     return _animations.at(name);
 }
@@ -205,7 +205,7 @@ void AnimationCache::parseVersion2(const ValueMap& animations)
     }
 }
 
-void AnimationCache::addAnimationsWithDictionary(const ValueMap& dictionary, const std::string& plist)
+void AnimationCache::addAnimationsWithDictionary(const ValueMap& dictionary, std::string_view plist)
 {
     auto anisItr = dictionary.find("animations");
     if (anisItr == dictionary.end())
@@ -245,7 +245,7 @@ void AnimationCache::addAnimationsWithDictionary(const ValueMap& dictionary, con
 }
 
 /** Read an NSDictionary from a plist file and parse it automatically for animations */
-void AnimationCache::addAnimationsWithFile(const std::string& plist)
+void AnimationCache::addAnimationsWithFile(std::string_view plist)
 {
     CCASSERT(!plist.empty(), "Invalid texture file name");
     if (plist.empty())
@@ -259,7 +259,7 @@ void AnimationCache::addAnimationsWithFile(const std::string& plist)
     CCASSERT(!dict.empty(), "CCAnimationCache: File could not be found");
     if (dict.empty())
     {
-        log("AnimationCache::addAnimationsWithFile error:%s not exist!", plist.c_str());
+        log("AnimationCache::addAnimationsWithFile error:%s not exist!", plist.data());
     }
 
     addAnimationsWithDictionary(dict, plist);
diff --git a/cocos/2d/CCAnimationCache.h b/cocos/2d/CCAnimationCache.h
index 0c41b66454ab..35ae26a737e6 100644
--- a/cocos/2d/CCAnimationCache.h
+++ b/cocos/2d/CCAnimationCache.h
@@ -81,13 +81,13 @@ class CC_DLL AnimationCache : public Ref
      * @param animation An animation.
      * @param name The name of animation.
      */
-    void addAnimation(Animation* animation, const std::string& name);
+    void addAnimation(Animation* animation, std::string_view name);
 
     /** Deletes a Animation from the cache.
      *
      * @param name The name of animation.
      */
-    void removeAnimation(const std::string& name);
+    void removeAnimation(std::string_view name);
 
     /** Returns a Animation that was previously added.
      * If the name is not found it will return nil.
@@ -95,7 +95,7 @@ class CC_DLL AnimationCache : public Ref
      *
      * @return A Animation that was previously added. If the name is not found it will return nil.
      */
-    Animation* getAnimation(const std::string& name);
+    Animation* getAnimation(std::string_view name);
 
     /** Adds an animation from an NSDictionary.
      * Make sure that the frames were previously loaded in the SpriteFrameCache.
@@ -104,7 +104,7 @@ class CC_DLL AnimationCache : public Ref
      * @since v1.1
          @js NA
      */
-    void addAnimationsWithDictionary(const ValueMap& dictionary, const std::string& plist);
+    void addAnimationsWithDictionary(const ValueMap& dictionary, std::string_view plist);
 
     /** Adds an animation from a plist file.
      * Make sure that the frames were previously loaded in the SpriteFrameCache.
@@ -113,14 +113,14 @@ class CC_DLL AnimationCache : public Ref
      * @lua addAnimations
      * @param plist An animation from a plist file.
      */
-    void addAnimationsWithFile(const std::string& plist);
+    void addAnimationsWithFile(std::string_view plist);
 
 private:
     void parseVersion1(const ValueMap& animations);
     void parseVersion2(const ValueMap& animations);
 
 private:
-    Map<std::string, Animation*> _animations;
+    StringMap<Animation*> _animations;
     static AnimationCache* s_sharedAnimationCache;
 };
 
diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp
index d1448ebdb439..6f38d8935076 100644
--- a/cocos/2d/CCAtlasNode.cpp
+++ b/cocos/2d/CCAtlasNode.cpp
@@ -47,7 +47,7 @@ AtlasNode::~AtlasNode()
     CC_SAFE_RELEASE(_textureAtlas);
 }
 
-AtlasNode* AtlasNode::create(const std::string& tile, int tileWidth, int tileHeight, int itemsToRender)
+AtlasNode* AtlasNode::create(std::string_view tile, int tileWidth, int tileHeight, int itemsToRender)
 {
     AtlasNode* ret = new AtlasNode();
     if (ret->initWithTileFile(tile, tileWidth, tileHeight, itemsToRender))
@@ -59,7 +59,7 @@ AtlasNode* AtlasNode::create(const std::string& tile, int tileWidth, int tileHei
     return nullptr;
 }
 
-bool AtlasNode::initWithTileFile(const std::string& tile, int tileWidth, int tileHeight, int itemsToRender)
+bool AtlasNode::initWithTileFile(std::string_view tile, int tileWidth, int tileHeight, int itemsToRender)
 {
     CCASSERT(!tile.empty(), "file size should not be empty");
     Texture2D* texture = _director->getTextureCache()->addImage(tile);
@@ -222,7 +222,7 @@ void AtlasNode::setIgnoreContentScaleFactor(bool ignoreContentScaleFactor)
         auto label = dynamic_cast<LabelProtocol*>(this);
         if (label)
         {
-            Vec2 s = Vec2(label->getString().size() * _itemWidth, _itemHeight);
+            Vec2 s = Vec2(static_cast<float>(label->getString().size() * _itemWidth), static_cast<float>(_itemHeight));
             this->setContentSize(s);
         }
     }
diff --git a/cocos/2d/CCAtlasNode.h b/cocos/2d/CCAtlasNode.h
index e35c14942df9..63125c6d336d 100644
--- a/cocos/2d/CCAtlasNode.h
+++ b/cocos/2d/CCAtlasNode.h
@@ -57,7 +57,7 @@ class CC_DLL AtlasNode : public Node, public TextureProtocol
      * @param tileHeight The height of the item.
      * @param itemsToRender The quantity of items to render.
      */
-    static AtlasNode* create(const std::string& filename, int tileWidth, int tileHeight, int itemsToRender);
+    static AtlasNode* create(std::string_view filename, int tileWidth, int tileHeight, int itemsToRender);
 
     /** updates the Atlas (indexed vertex array).
      * Shall be overridden in subclasses.
@@ -106,7 +106,7 @@ class CC_DLL AtlasNode : public Node, public TextureProtocol
 
     /** Initializes an AtlasNode  with an Atlas file the width and height of each item and the quantity of items to
      * render*/
-    bool initWithTileFile(const std::string& tile, int tileWidth, int tileHeight, int itemsToRender);
+    bool initWithTileFile(std::string_view tile, int tileWidth, int tileHeight, int itemsToRender);
 
     /** Initializes an AtlasNode  with a texture the width and height of each item measured in points and the quantity
      * of items to render*/
diff --git a/cocos/2d/CCAutoPolygon.cpp b/cocos/2d/CCAutoPolygon.cpp
index 6becd122ecbf..6cec4151315e 100644
--- a/cocos/2d/CCAutoPolygon.cpp
+++ b/cocos/2d/CCAutoPolygon.cpp
@@ -168,7 +168,7 @@ float PolygonInfo::getArea() const
     return area;
 }
 
-AutoPolygon::AutoPolygon(const std::string& filename)
+AutoPolygon::AutoPolygon(std::string_view filename)
     : _image(nullptr), _data(nullptr), _filename(""), _width(0), _height(0), _scaleFactor(0)
 {
     _filename = filename;
@@ -714,7 +714,7 @@ PolygonInfo AutoPolygon::generateTriangles(const Rect& rect, float epsilon, floa
     return ret;
 }
 
-PolygonInfo AutoPolygon::generatePolygon(const std::string& filename, const Rect& rect, float epsilon, float threshold)
+PolygonInfo AutoPolygon::generatePolygon(std::string_view filename, const Rect& rect, float epsilon, float threshold)
 {
     AutoPolygon ap(filename);
     return ap.generateTriangles(rect, epsilon, threshold);
diff --git a/cocos/2d/CCAutoPolygon.h b/cocos/2d/CCAutoPolygon.h
index 1552ab99afff..676c6bd03b2c 100644
--- a/cocos/2d/CCAutoPolygon.h
+++ b/cocos/2d/CCAutoPolygon.h
@@ -117,8 +117,8 @@ class CC_DLL PolygonInfo
 
     const Rect& getRect() const { return _rect; }
     void setRect(const Rect& rect) { _rect = rect; }
-    const std::string& getFilename() const { return _filename; }
-    void setFilename(const std::string& filename) { _filename = filename; }
+    std::string_view getFilename() const { return _filename; }
+    void setFilename(std::string_view filename) { _filename = filename; }
 
     // FIXME: this should be a property, not a public ivar
     TrianglesCommand::Triangles triangles;
@@ -147,7 +147,7 @@ class CC_DLL AutoPolygon
      * @param   filename    a path to image file, e.g., "scene1/monster.png".
      * @return  an AutoPolygon object;
      */
-    AutoPolygon(const std::string& filename);
+    AutoPolygon(std::string_view filename);
 
     /**
      * Destructor of AutoPolygon.
@@ -254,7 +254,7 @@ class CC_DLL AutoPolygon
      * auto sp = Sprite::create(AutoPolygon::generatePolygon("grossini.png"));
      * @endcode
      */
-    static PolygonInfo generatePolygon(const std::string& filename,
+    static PolygonInfo generatePolygon(std::string_view filename,
                                        const Rect& rect = Rect::ZERO,
                                        float epsilon    = 2.0f,
                                        float threshold  = 0.05f);
diff --git a/cocos/2d/CCCameraBackgroundBrush.cpp b/cocos/2d/CCCameraBackgroundBrush.cpp
index 442ca25bcb32..f983bfa87f03 100644
--- a/cocos/2d/CCCameraBackgroundBrush.cpp
+++ b/cocos/2d/CCCameraBackgroundBrush.cpp
@@ -71,12 +71,12 @@ CameraBackgroundDepthBrush* CameraBackgroundBrush::createDepthBrush(float depth)
     return CameraBackgroundDepthBrush::create(depth);
 }
 
-CameraBackgroundSkyBoxBrush* CameraBackgroundBrush::createSkyboxBrush(const std::string& positive_x,
-                                                                      const std::string& negative_x,
-                                                                      const std::string& positive_y,
-                                                                      const std::string& negative_y,
-                                                                      const std::string& positive_z,
-                                                                      const std::string& negative_z)
+CameraBackgroundSkyBoxBrush* CameraBackgroundBrush::createSkyboxBrush(std::string_view positive_x,
+                                                                      std::string_view negative_x,
+                                                                      std::string_view positive_y,
+                                                                      std::string_view negative_y,
+                                                                      std::string_view positive_z,
+                                                                      std::string_view negative_z)
 {
     return CameraBackgroundSkyBoxBrush::create(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z);
 }
@@ -303,12 +303,12 @@ CameraBackgroundSkyBoxBrush::~CameraBackgroundSkyBoxBrush()
 #endif
 }
 
-CameraBackgroundSkyBoxBrush* CameraBackgroundSkyBoxBrush::create(const std::string& positive_x,
-                                                                 const std::string& negative_x,
-                                                                 const std::string& positive_y,
-                                                                 const std::string& negative_y,
-                                                                 const std::string& positive_z,
-                                                                 const std::string& negative_z)
+CameraBackgroundSkyBoxBrush* CameraBackgroundSkyBoxBrush::create(std::string_view positive_x,
+                                                                 std::string_view negative_x,
+                                                                 std::string_view positive_y,
+                                                                 std::string_view negative_y,
+                                                                 std::string_view positive_z,
+                                                                 std::string_view negative_z)
 {
     CameraBackgroundSkyBoxBrush* ret = nullptr;
 
diff --git a/cocos/2d/CCCameraBackgroundBrush.h b/cocos/2d/CCCameraBackgroundBrush.h
index 1f884cff8554..630b1a87e373 100644
--- a/cocos/2d/CCCameraBackgroundBrush.h
+++ b/cocos/2d/CCCameraBackgroundBrush.h
@@ -105,12 +105,12 @@ class CC_DLL CameraBackgroundBrush : public Ref
      @param negative_z texture for the rear side of the texture cube face.
      @return  A new brush inited with given parameters.
      */
-    static CameraBackgroundSkyBoxBrush* createSkyboxBrush(const std::string& positive_x,
-                                                          const std::string& negative_x,
-                                                          const std::string& positive_y,
-                                                          const std::string& negative_y,
-                                                          const std::string& positive_z,
-                                                          const std::string& negative_z);
+    static CameraBackgroundSkyBoxBrush* createSkyboxBrush(std::string_view positive_x,
+                                                          std::string_view negative_x,
+                                                          std::string_view positive_y,
+                                                          std::string_view negative_y,
+                                                          std::string_view positive_z,
+                                                          std::string_view negative_z);
     /**
      * draw the background
      */
@@ -253,12 +253,12 @@ class CC_DLL CameraBackgroundSkyBoxBrush : public CameraBackgroundBrush
      @param negative_z texture for the rear side of the texture cube face.
      @return  A new brush inited with given parameters.
      */
-    static CameraBackgroundSkyBoxBrush* create(const std::string& positive_x,
-                                               const std::string& negative_x,
-                                               const std::string& positive_y,
-                                               const std::string& negative_y,
-                                               const std::string& positive_z,
-                                               const std::string& negative_z);
+    static CameraBackgroundSkyBoxBrush* create(std::string_view positive_x,
+                                               std::string_view negative_x,
+                                               std::string_view positive_y,
+                                               std::string_view negative_y,
+                                               std::string_view positive_z,
+                                               std::string_view negative_z);
 
     /** Creates a Skybox brush with 6 textures.
      */
diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h
index d780a665e63c..6fa5ff0859ca 100644
--- a/cocos/2d/CCComponent.h
+++ b/cocos/2d/CCComponent.h
@@ -60,8 +60,8 @@ class CC_DLL Component : public Ref
     bool isEnabled() const { return _enabled; }
     virtual void setEnabled(bool enabled);
 
-    const std::string& getName() const { return _name; }
-    virtual void setName(const std::string& name) { _name = name; }
+    std::string_view getName() const { return _name; }
+    virtual void setName(std::string_view name) { _name = name; }
 
     Node* getOwner() const { return _owner; }
     virtual void setOwner(Node* owner);
diff --git a/cocos/2d/CCComponentContainer.cpp b/cocos/2d/CCComponentContainer.cpp
index 92f57884155c..456fcb8783fd 100644
--- a/cocos/2d/CCComponentContainer.cpp
+++ b/cocos/2d/CCComponentContainer.cpp
@@ -33,7 +33,7 @@ ComponentContainer::ComponentContainer(Node* node) : _owner(node) {}
 
 ComponentContainer::~ComponentContainer() {}
 
-Component* ComponentContainer::get(const std::string& name) const
+Component* ComponentContainer::get(std::string_view name) const
 {
     Component* ret = nullptr;
 
@@ -60,7 +60,7 @@ bool ComponentContainer::add(Component* com)
             CCASSERT(false, "ComponentContainer already have this kind of component");
             break;
         }
-        _componentMap[componentName] = com;
+        hlookup::set_item(_componentMap, componentName, com);  //_componentMap[componentName] = com;
         com->retain();
         com->setOwner(_owner);
         com->onAdd();
@@ -70,7 +70,7 @@ bool ComponentContainer::add(Component* com)
     return ret;
 }
 
-bool ComponentContainer::remove(const std::string& componentName)
+bool ComponentContainer::remove(std::string_view componentName)
 {
     bool ret = false;
     do
diff --git a/cocos/2d/CCComponentContainer.h b/cocos/2d/CCComponentContainer.h
index caba0e1a2420..bdc08df7593e 100644
--- a/cocos/2d/CCComponentContainer.h
+++ b/cocos/2d/CCComponentContainer.h
@@ -54,10 +54,10 @@ class CC_DLL ComponentContainer
     /**
      * @js getComponent
      */
-    Component* get(const std::string& name) const;
+    Component* get(std::string_view name) const;
 
     bool add(Component* com);
-    bool remove(const std::string& name);
+    bool remove(std::string_view name);
     bool remove(Component* com);
     void removeAll();
     void visit(float delta);
@@ -68,7 +68,7 @@ class CC_DLL ComponentContainer
     bool isEmpty() const { return _componentMap.empty(); }
 
 private:
-    std::unordered_map<std::string, Component*> _componentMap;
+    hlookup::string_map<Component*> _componentMap;
     Node* _owner;
 
     friend class Node;
diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp
index c3f82291a9b5..566eae82230c 100644
--- a/cocos/2d/CCFastTMXLayer.cpp
+++ b/cocos/2d/CCFastTMXLayer.cpp
@@ -799,7 +799,7 @@ void FastTMXLayer::removeChild(Node* node, bool cleanup)
 }
 
 // TMXLayer - Properties
-Value FastTMXLayer::getProperty(const std::string& propertyName) const
+Value FastTMXLayer::getProperty(std::string_view propertyName) const
 {
     auto propItr = _properties.find(propertyName);
     if (propItr != _properties.end())
diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h
index 0c69484ed8fa..0da9a39e8d07 100644
--- a/cocos/2d/CCFastTMXLayer.h
+++ b/cocos/2d/CCFastTMXLayer.h
@@ -152,7 +152,7 @@ class CC_DLL FastTMXLayer : public Node
      * @param propertyName The value for the specific property name.
      * @return The value for the specific property name.
      */
-    Value getProperty(const std::string& propertyName) const;
+    Value getProperty(std::string_view propertyName) const;
 
     /** Creates the tiles. */
     void setupTiles();
@@ -161,13 +161,13 @@ class CC_DLL FastTMXLayer : public Node
      *
      * @return The tile layer name.
      */
-    const std::string& getLayerName() { return _layerName; }
+    std::string_view getLayerName() { return _layerName; }
 
     /** Set the tile layer name.
      *
      * @param layerName The new layer name.
      */
-    void setLayerName(const std::string& layerName) { _layerName = layerName; }
+    void setLayerName(std::string_view layerName) { _layerName = layerName; }
 
     /** Gets the size of the layer in tiles.
      *
diff --git a/cocos/2d/CCFastTMXTiledMap.cpp b/cocos/2d/CCFastTMXTiledMap.cpp
index b17ff6328f92..d06d483a7c48 100644
--- a/cocos/2d/CCFastTMXTiledMap.cpp
+++ b/cocos/2d/CCFastTMXTiledMap.cpp
@@ -33,7 +33,7 @@ NS_CC_BEGIN
 
 // implementation FastTMXTiledMap
 
-FastTMXTiledMap* FastTMXTiledMap::create(const std::string& tmxFile)
+FastTMXTiledMap* FastTMXTiledMap::create(std::string_view tmxFile)
 {
     FastTMXTiledMap* ret = new FastTMXTiledMap();
     if (ret->initWithTMXFile(tmxFile))
@@ -45,7 +45,7 @@ FastTMXTiledMap* FastTMXTiledMap::create(const std::string& tmxFile)
     return nullptr;
 }
 
-FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath)
+FastTMXTiledMap* FastTMXTiledMap::createWithXML(std::string_view tmxString, std::string_view resourcePath)
 {
     FastTMXTiledMap* ret = new FastTMXTiledMap();
     if (ret->initWithXML(tmxString, resourcePath))
@@ -57,7 +57,7 @@ FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, co
     return nullptr;
 }
 
-bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile)
+bool FastTMXTiledMap::initWithTMXFile(std::string_view tmxFile)
 {
     CCASSERT(tmxFile.size() > 0, "FastTMXTiledMap: tmx file should not be empty");
 
@@ -77,7 +77,7 @@ bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile)
     return true;
 }
 
-bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath)
+bool FastTMXTiledMap::initWithXML(std::string_view tmxString, std::string_view resourcePath)
 {
     setContentSize(Vec2::ZERO);
 
@@ -194,7 +194,7 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
 }
 
 // public
-FastTMXLayer* FastTMXTiledMap::getLayer(const std::string& layerName) const
+FastTMXLayer* FastTMXTiledMap::getLayer(std::string_view layerName) const
 {
     CCASSERT(!layerName.empty(), "Invalid layer name!");
 
@@ -214,7 +214,7 @@ FastTMXLayer* FastTMXTiledMap::getLayer(const std::string& layerName) const
     return nullptr;
 }
 
-TMXObjectGroup* FastTMXTiledMap::getObjectGroup(const std::string& groupName) const
+TMXObjectGroup* FastTMXTiledMap::getObjectGroup(std::string_view groupName) const
 {
     CCASSERT(!groupName.empty(), "Invalid group name!");
 
@@ -233,7 +233,7 @@ TMXObjectGroup* FastTMXTiledMap::getObjectGroup(const std::string& groupName) co
     return nullptr;
 }
 
-Value FastTMXTiledMap::getProperty(const std::string& propertyName) const
+Value FastTMXTiledMap::getProperty(std::string_view propertyName) const
 {
     auto propsItr = _properties.find(propertyName);
     if (propsItr != _properties.end())
diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h
index da7a0273ac31..9790ea746ba5 100644
--- a/cocos/2d/CCFastTMXTiledMap.h
+++ b/cocos/2d/CCFastTMXTiledMap.h
@@ -101,7 +101,7 @@ class CC_DLL FastTMXTiledMap : public Node
      *
      * @return An autorelease object.
      */
-    static FastTMXTiledMap* create(const std::string& tmxFile);
+    static FastTMXTiledMap* create(std::string_view tmxFile);
 
     /** Initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources.
      *
@@ -109,25 +109,25 @@ class CC_DLL FastTMXTiledMap : public Node
      * @param resourcePath A path to TMX resources.
      * @return An autorelease object.
      */
-    static FastTMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath);
+    static FastTMXTiledMap* createWithXML(std::string_view tmxString, std::string_view resourcePath);
 
     /** Return the FastTMXLayer for the specific layer.
      *
      * @return Return the FastTMXLayer for the specific layer.
      */
-    FastTMXLayer* getLayer(const std::string& layerName) const;
+    FastTMXLayer* getLayer(std::string_view layerName) const;
 
     /** Return the TMXObjectGroup for the specific group.
      *
      * @return Return the TMXObjectGroup for the specific group.
      */
-    TMXObjectGroup* getObjectGroup(const std::string& groupName) const;
+    TMXObjectGroup* getObjectGroup(std::string_view groupName) const;
 
     /** Return the value for the specific property name.
      *
      * @return Return the value for the specific property name.
      */
-    Value getProperty(const std::string& propertyName) const;
+    Value getProperty(std::string_view propertyName) const;
 
     /** Return properties dictionary for tile GID.
      *
@@ -207,7 +207,7 @@ class CC_DLL FastTMXTiledMap : public Node
 
     int getLayerCount() const { return _layerCount; }
 
-    const std::string& getResourceFile() const { return _tmxFile; }
+    std::string_view getResourceFile() const { return _tmxFile; }
 
     CC_CONSTRUCTOR_ACCESS :
         /**
@@ -221,10 +221,10 @@ class CC_DLL FastTMXTiledMap : public Node
     virtual ~FastTMXTiledMap();
 
     /** initializes a TMX Tiled Map with a TMX file */
-    bool initWithTMXFile(const std::string& tmxFile);
+    bool initWithTMXFile(std::string_view tmxFile);
 
     /** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */
-    bool initWithXML(const std::string& tmxString, const std::string& resourcePath);
+    bool initWithXML(std::string_view tmxString, std::string_view resourcePath);
 
 protected:
     FastTMXLayer* parseLayer(TMXLayerInfo* layerInfo, TMXMapInfo* mapInfo);
diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp
index df0db9bc0208..fc1aabd928f2 100644
--- a/cocos/2d/CCFontAtlas.cpp
+++ b/cocos/2d/CCFontAtlas.cpp
@@ -520,9 +520,9 @@ void FontAtlas::setLineHeight(float newHeight)
     _lineHeight = newHeight;
 }
 
-std::string FontAtlas::getFontName() const
+std::string_view FontAtlas::getFontName() const
 {
-    std::string fontName = _fontFreeType ? _fontFreeType->getFontName() : "";
+    std::string_view fontName = _fontFreeType ? _fontFreeType->getFontName() : ""sv;
     if (fontName.empty())
         return fontName;
     auto idx = fontName.rfind('/');
diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h
index 384aecb2548a..16bcfc72a81e 100644
--- a/cocos/2d/CCFontAtlas.h
+++ b/cocos/2d/CCFontAtlas.h
@@ -86,7 +86,7 @@ class CC_DLL FontAtlas : public Ref
     float getLineHeight() const { return _lineHeight; }
     void setLineHeight(float newHeight);
 
-    std::string getFontName() const;
+    std::string_view getFontName() const;
 
     Texture2D* getTexture(int slot);
     const Font* getFont() const { return _font; }
diff --git a/cocos/2d/CCFontAtlasCache.cpp b/cocos/2d/CCFontAtlasCache.cpp
index d9df5ab56683..4ab977172066 100644
--- a/cocos/2d/CCFontAtlasCache.cpp
+++ b/cocos/2d/CCFontAtlasCache.cpp
@@ -36,7 +36,7 @@
 
 NS_CC_BEGIN
 
-std::unordered_map<std::string, FontAtlas*> FontAtlasCache::_atlasMap;
+hlookup::string_map<FontAtlas*> FontAtlasCache::_atlasMap;
 #define ATLAS_MAP_KEY_PREFIX_BUFFER_SIZE 255
 
 void FontAtlasCache::purgeCachedData()
@@ -80,8 +80,7 @@ FontAtlas* FontAtlasCache::getFontAtlasTTF(const _ttfConfig* config)
             auto tempAtlas = font->newFontAtlas();
             if (tempAtlas)
             {
-                _atlasMap[atlasName] = tempAtlas;
-                return _atlasMap[atlasName];
+                return _atlasMap.emplace(atlasName, tempAtlas).first->second;
             }
         }
     }
@@ -91,16 +90,17 @@ FontAtlas* FontAtlasCache::getFontAtlasTTF(const _ttfConfig* config)
     return nullptr;
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName)
+FontAtlas* FontAtlasCache::getFontAtlasFNT(std::string_view fontFileName)
 {
     return getFontAtlasFNT(fontFileName, Rect::ZERO, false);
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName, const std::string& subTextureKey)
+FontAtlas* FontAtlasCache::getFontAtlasFNT(std::string_view fontFileName, std::string_view subTextureKey)
 {
     const auto realFontFilename = FileUtils::getInstance()->getNewFilename(
         fontFileName);  // resolves real file path, to prevent storing multiple atlases for the same file.
-    std::string atlasName = subTextureKey + " " + realFontFilename;
+    std::string atlasName{subTextureKey};
+    atlasName.append(" ", 1).append(realFontFilename);
 
     const auto it = _atlasMap.find(atlasName);
     if (it == _atlasMap.end())
@@ -123,7 +123,7 @@ FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName, cons
     return nullptr;
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName, const Rect& imageRect, bool imageRotated)
+FontAtlas* FontAtlasCache::getFontAtlasFNT(std::string_view fontFileName, const Rect& imageRect, bool imageRotated)
 {
     const auto realFontFilename = FileUtils::getInstance()->getNewFilename(
         fontFileName);  // resolves real file path, to prevent storing multiple atlases for the same file.
@@ -153,14 +153,14 @@ FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName, cons
     return nullptr;
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasFNT(const std::string& fontFileName, const Vec2& imageOffset)
+FontAtlas* FontAtlasCache::getFontAtlasFNT(std::string_view fontFileName, const Vec2& imageOffset)
 {
     return getFontAtlasFNT(fontFileName, Rect(imageOffset.x, imageOffset.y, 0, 0), false);
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasCharMap(const std::string& plistFile)
+FontAtlas* FontAtlasCache::getFontAtlasCharMap(std::string_view plistFile)
 {
-    const std::string& atlasName = plistFile;
+    std::string_view atlasName = plistFile;
 
     auto it = _atlasMap.find(atlasName);
     if (it == _atlasMap.end())
@@ -172,8 +172,8 @@ FontAtlas* FontAtlasCache::getFontAtlasCharMap(const std::string& plistFile)
             auto tempAtlas = font->newFontAtlas();
             if (tempAtlas)
             {
-                _atlasMap[atlasName] = tempAtlas;
-                return _atlasMap[atlasName];
+                hlookup::set_item(_atlasMap, atlasName, tempAtlas);  // _atlasMap[atlasName] = tempAtlas;
+                return tempAtlas;
             }
         }
     }
@@ -210,7 +210,7 @@ FontAtlas* FontAtlasCache::getFontAtlasCharMap(Texture2D* texture, int itemWidth
     return nullptr;
 }
 
-FontAtlas* FontAtlasCache::getFontAtlasCharMap(const std::string& charMapFile,
+FontAtlas* FontAtlasCache::getFontAtlasCharMap(std::string_view charMapFile,
                                                int itemWidth,
                                                int itemHeight,
                                                int startCharMap)
@@ -263,7 +263,7 @@ bool FontAtlasCache::releaseFontAtlas(FontAtlas* atlas)
     return false;
 }
 
-void FontAtlasCache::reloadFontAtlasFNT(const std::string& fontFileName, const Rect& imageRect, bool imageRotated)
+void FontAtlasCache::reloadFontAtlasFNT(std::string_view fontFileName, const Rect& imageRect, bool imageRotated)
 {
     char keyPrefix[ATLAS_MAP_KEY_PREFIX_BUFFER_SIZE];
     snprintf(keyPrefix, ATLAS_MAP_KEY_PREFIX_BUFFER_SIZE, "%.2f %.2f ", imageRect.origin.x, imageRect.origin.y);
@@ -288,12 +288,12 @@ void FontAtlasCache::reloadFontAtlasFNT(const std::string& fontFileName, const R
     }
 }
 
-void FontAtlasCache::reloadFontAtlasFNT(const std::string& fontFileName, const Vec2& imageOffset)
+void FontAtlasCache::reloadFontAtlasFNT(std::string_view fontFileName, const Vec2& imageOffset)
 {
     reloadFontAtlasFNT(fontFileName, Rect(imageOffset.x, imageOffset.y, 0, 0), false);
 }
 
-void FontAtlasCache::unloadFontAtlasTTF(const std::string& fontFileName)
+void FontAtlasCache::unloadFontAtlasTTF(std::string_view fontFileName)
 {
     auto item = _atlasMap.begin();
     while (item != _atlasMap.end())
diff --git a/cocos/2d/CCFontAtlasCache.h b/cocos/2d/CCFontAtlasCache.h
index d995d2a92ffb..f02e41ad2219 100644
--- a/cocos/2d/CCFontAtlasCache.h
+++ b/cocos/2d/CCFontAtlasCache.h
@@ -43,17 +43,17 @@ class CC_DLL FontAtlasCache
 public:
     static FontAtlas* getFontAtlasTTF(const _ttfConfig* config);
 
-    static FontAtlas* getFontAtlasFNT(const std::string& fontFileName);
-    static FontAtlas* getFontAtlasFNT(const std::string& fontFileName, const std::string& subTextureKey);
-    static FontAtlas* getFontAtlasFNT(const std::string& fontFileName, const Rect& imageRect, bool imageRotated);
-    CC_DEPRECATED_ATTRIBUTE static FontAtlas* getFontAtlasFNT(const std::string& fontFileName, const Vec2& imageOffset);
+    static FontAtlas* getFontAtlasFNT(std::string_view fontFileName);
+    static FontAtlas* getFontAtlasFNT(std::string_view fontFileName, std::string_view subTextureKey);
+    static FontAtlas* getFontAtlasFNT(std::string_view fontFileName, const Rect& imageRect, bool imageRotated);
+    CC_DEPRECATED_ATTRIBUTE static FontAtlas* getFontAtlasFNT(std::string_view fontFileName, const Vec2& imageOffset);
 
-    static FontAtlas* getFontAtlasCharMap(const std::string& charMapFile,
+    static FontAtlas* getFontAtlasCharMap(std::string_view charMapFile,
                                           int itemWidth,
                                           int itemHeight,
                                           int startCharMap);
     static FontAtlas* getFontAtlasCharMap(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
-    static FontAtlas* getFontAtlasCharMap(const std::string& plistFile);
+    static FontAtlas* getFontAtlasCharMap(std::string_view plistFile);
 
     static bool releaseFontAtlas(FontAtlas* atlas);
 
@@ -66,19 +66,19 @@ class CC_DLL FontAtlasCache
      CAUTION : All component use this font texture should be reset font name, though the file name is same!
                otherwise, it will cause program crash!
     */
-    static void reloadFontAtlasFNT(const std::string& fontFileName, const Rect& imageRect, bool imageRotated);
+    static void reloadFontAtlasFNT(std::string_view fontFileName, const Rect& imageRect, bool imageRotated);
 
-    CC_DEPRECATED_ATTRIBUTE static void reloadFontAtlasFNT(const std::string& fontFileName,
+    CC_DEPRECATED_ATTRIBUTE static void reloadFontAtlasFNT(std::string_view fontFileName,
                                                            const Vec2& imageOffset = Vec2::ZERO);
 
     /** Unload all texture atlas texture create by special file name.
      CAUTION : All component use this font texture should be reset font name, though the file name is same!
                otherwise, it will cause program crash!
     */
-    static void unloadFontAtlasTTF(const std::string& fontFileName);
+    static void unloadFontAtlasTTF(std::string_view fontFileName);
 
 private:
-    static std::unordered_map<std::string, FontAtlas*> _atlasMap;
+    static hlookup::string_map<FontAtlas*> _atlasMap;
 };
 
 NS_CC_END
diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp
index c8625143b92a..8eb4986c8380 100644
--- a/cocos/2d/CCFontCharMap.cpp
+++ b/cocos/2d/CCFontCharMap.cpp
@@ -33,7 +33,7 @@
 
 NS_CC_BEGIN
 
-FontCharMap* FontCharMap::create(const std::string& plistFile)
+FontCharMap* FontCharMap::create(std::string_view plistFile)
 {
     std::string pathStr    = FileUtils::getInstance()->fullPathForFilename(plistFile);
     std::string relPathStr = pathStr.substr(0, pathStr.find_last_of('/')) + "/";
@@ -64,7 +64,7 @@ FontCharMap* FontCharMap::create(const std::string& plistFile)
     return tempFont;
 }
 
-FontCharMap* FontCharMap::create(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap)
+FontCharMap* FontCharMap::create(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap)
 {
     Texture2D* tempTexture = Director::getInstance()->getTextureCache()->addImage(charMapFile);
 
diff --git a/cocos/2d/CCFontCharMap.h b/cocos/2d/CCFontCharMap.h
index 1c576571968e..436290471d07 100644
--- a/cocos/2d/CCFontCharMap.h
+++ b/cocos/2d/CCFontCharMap.h
@@ -38,9 +38,9 @@ class Texture2D;
 class FontCharMap : public Font
 {
 public:
-    static FontCharMap* create(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
+    static FontCharMap* create(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap);
     static FontCharMap* create(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
-    static FontCharMap* create(const std::string& plistFile);
+    static FontCharMap* create(std::string_view plistFile);
 
     virtual int* getHorizontalKerningForTextUTF32(const std::u32string& text, int& outNumLetters) const override;
     virtual FontAtlas* newFontAtlas() override;
diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp
index d3b252a4b280..87fa76440de5 100644
--- a/cocos/2d/CCFontFNT.cpp
+++ b/cocos/2d/CCFontFNT.cpp
@@ -56,15 +56,15 @@ struct _FontDefHashElement;
 //
 // FNTConfig Cache - free functions
 //
-static Map<std::string, BMFontConfiguration*>* s_configurations = nullptr;
+static StringMap<BMFontConfiguration*>* s_configurations = nullptr;
 
-BMFontConfiguration* FNTConfigLoadFile(const std::string& fntFile)
+BMFontConfiguration* FNTConfigLoadFile(std::string_view fntFile)
 {
     BMFontConfiguration* ret = nullptr;
 
     if (s_configurations == nullptr)
     {
-        s_configurations = new Map<std::string, BMFontConfiguration*>();
+        s_configurations = new StringMap<BMFontConfiguration*>();
     }
 
     ret = s_configurations->at(fntFile);
@@ -84,7 +84,7 @@ BMFontConfiguration* FNTConfigLoadFile(const std::string& fntFile)
 // BitmapFontConfiguration
 //
 
-BMFontConfiguration* BMFontConfiguration::create(const std::string& FNTfile)
+BMFontConfiguration* BMFontConfiguration::create(std::string_view FNTfile)
 {
     BMFontConfiguration* ret = new BMFontConfiguration();
     if (ret->initWithFNTfile(FNTfile))
@@ -96,7 +96,7 @@ BMFontConfiguration* BMFontConfiguration::create(const std::string& FNTfile)
     return nullptr;
 }
 
-bool BMFontConfiguration::initWithFNTfile(const std::string& FNTfile)
+bool BMFontConfiguration::initWithFNTfile(std::string_view FNTfile)
 {
     _characterSet = this->parseConfigFile(FNTfile);
 
@@ -141,7 +141,7 @@ void BMFontConfiguration::purgeFontDefDictionary()
     _fontDefDictionary.clear();
 }
 
-std::set<unsigned int>* BMFontConfiguration::parseConfigFile(const std::string& controlFile)
+std::set<unsigned int>* BMFontConfiguration::parseConfigFile(std::string_view controlFile)
 {
     std::string data = FileUtils::getInstance()->getStringFromFile(controlFile);
     if (data.empty())
@@ -156,7 +156,7 @@ std::set<unsigned int>* BMFontConfiguration::parseConfigFile(const std::string&
     }
     if (data[0] == 0)
     {
-        CCLOG("cocos2d: Error parsing FNTfile %s", controlFile.c_str());
+        CCLOG("cocos2d: Error parsing FNTfile %s", controlFile.data());
         return nullptr;
     }
     auto contents = data.c_str();
@@ -223,7 +223,7 @@ std::set<unsigned int>* BMFontConfiguration::parseConfigFile(const std::string&
 
 std::set<unsigned int>* BMFontConfiguration::parseBinaryConfigFile(unsigned char* pData,
                                                                    uint32_t size,
-                                                                   const std::string& controlFile)
+                                                                   std::string_view controlFile)
 {
     /* based on http://www.angelcode.com/products/bmfont/doc/file_format.html file format */
 
@@ -399,7 +399,7 @@ std::set<unsigned int>* BMFontConfiguration::parseBinaryConfigFile(unsigned char
     return validCharsString;
 }
 
-void BMFontConfiguration::parseImageFileName(const char* line, const std::string& fntFile)
+void BMFontConfiguration::parseImageFileName(const char* line, std::string_view fntFile)
 {
     //////////////////////////////////////////////////////////////////////////
     // line to parse:
@@ -528,7 +528,7 @@ void BMFontConfiguration::parseKerningEntry(const char* line)
     _kerningDictionary[key] = amount;
 }
 
-FontFNT* FontFNT::create(const std::string& fntFilePath, const Rect& imageRect, bool imageRotated)
+FontFNT* FontFNT::create(std::string_view fntFilePath, const Rect& imageRect, bool imageRotated)
 {
     const auto newConf = FNTConfigLoadFile(fntFilePath);
     if (!newConf)
@@ -545,7 +545,7 @@ FontFNT* FontFNT::create(const std::string& fntFilePath, const Rect& imageRect,
     return tempFont;
 }
 
-FontFNT* FontFNT::create(const std::string& fntFilePath, const std::string& subTextureKey)
+FontFNT* FontFNT::create(std::string_view fntFilePath, std::string_view subTextureKey)
 {
     const auto newConf = FNTConfigLoadFile(fntFilePath);
     if (!newConf)
@@ -567,7 +567,7 @@ FontFNT* FontFNT::create(const std::string& fntFilePath, const std::string& subT
     return tempFont;
 }
 
-FontFNT* FontFNT::create(const std::string& fntFilePath)
+FontFNT* FontFNT::create(std::string_view fntFilePath)
 {
     const auto newConf = FNTConfigLoadFile(fntFilePath);
     if (!newConf)
@@ -590,7 +590,7 @@ FontFNT* FontFNT::create(const std::string& fntFilePath)
     return tempFont;
 }
 
-FontFNT* FontFNT::create(const std::string& fntFilePath, const Vec2& imageOffset)
+FontFNT* FontFNT::create(std::string_view fntFilePath, const Vec2& imageOffset)
 {
     return create(fntFilePath, Rect(imageOffset.x, imageOffset.y, 0, 0), false);
 }
@@ -762,11 +762,11 @@ FontAtlas* FontFNT::newFontAtlas()
     return tempAtlas;
 }
 
-void FontFNT::reloadBMFontResource(const std::string& fntFilePath)
+void FontFNT::reloadBMFontResource(std::string_view fntFilePath)
 {
     if (s_configurations == nullptr)
     {
-        s_configurations = new Map<std::string, BMFontConfiguration*>();
+        s_configurations = new StringMap<BMFontConfiguration*>();
     }
 
     BMFontConfiguration* ret = s_configurations->at(fntFilePath);
diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h
index 3e6cb364a62b..a255920330a9 100644
--- a/cocos/2d/CCFontFNT.h
+++ b/cocos/2d/CCFontFNT.h
@@ -115,27 +115,27 @@ class CC_DLL BMFontConfiguration : public Ref
     std::string description() const;
 
     /** allocates a BMFontConfiguration with a FNT file */
-    static BMFontConfiguration* create(const std::string& FNTfile);
+    static BMFontConfiguration* create(std::string_view FNTfile);
 
     /** initializes a BitmapFontConfiguration with a FNT file */
-    bool initWithFNTfile(const std::string& FNTfile);
+    bool initWithFNTfile(std::string_view FNTfile);
 
-    const std::string& getAtlasName() { return _atlasName; }
-    void setAtlasName(const std::string& atlasName) { _atlasName = atlasName; }
+    std::string_view getAtlasName() { return _atlasName; }
+    void setAtlasName(std::string_view atlasName) { _atlasName = atlasName; }
 
     std::set<unsigned int>* getCharacterSet() const;
 
 protected:
-    virtual std::set<unsigned int>* parseConfigFile(const std::string& controlFile);
+    virtual std::set<unsigned int>* parseConfigFile(std::string_view controlFile);
     virtual std::set<unsigned int>* parseBinaryConfigFile(unsigned char* pData,
                                                           uint32_t size,
-                                                          const std::string& controlFile);
+                                                          std::string_view controlFile);
 
 private:
     unsigned int parseCharacterDefinition(const char* line);
     void parseInfoArguments(const char* line);
     void parseCommonArguments(const char* line);
-    void parseImageFileName(const char* line, const std::string& fntFile);
+    void parseImageFileName(const char* line, std::string_view fntFile);
     void parseKerningEntry(const char* line);
     void purgeKerningDictionary();
     void purgeFontDefDictionary();
@@ -145,12 +145,11 @@ class CC_DLL FontFNT : public Font
 {
 
 public:
-    static FontFNT* create(const std::string& fntFilePath, const Rect& imageRect, bool imageRotated);
-    static FontFNT* create(const std::string& fntFilePath, const std::string& subTextureKey);
-    static FontFNT* create(const std::string& fntFilePath);
+    static FontFNT* create(std::string_view fntFilePath, const Rect& imageRect, bool imageRotated);
+    static FontFNT* create(std::string_view fntFilePath, std::string_view subTextureKey);
+    static FontFNT* create(std::string_view fntFilePath);
 
-    CC_DEPRECATED_ATTRIBUTE static FontFNT* create(const std::string& fntFilePath,
-                                                   const Vec2& imageOffset = Vec2::ZERO);
+    CC_DEPRECATED_ATTRIBUTE static FontFNT* create(std::string_view fntFilePath, const Vec2& imageOffset = Vec2::ZERO);
 
     /** Purges the cached data.
     Removes from memory the cached configurations and the atlas name dictionary.
@@ -164,7 +163,7 @@ class CC_DLL FontFNT : public Font
 
     int getOriginalFontSize() const;
 
-    static void reloadBMFontResource(const std::string& fntFilePath);
+    static void reloadBMFontResource(std::string_view fntFilePath);
 
 protected:
     FontFNT(BMFontConfiguration* theContfig, const Rect& imageRect, bool imageRotated);
diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp
index 4a93709cb187..c038926bc7b5 100644
--- a/cocos/2d/CCFontFreeType.cpp
+++ b/cocos/2d/CCFontFreeType.cpp
@@ -653,7 +653,7 @@ std::string_view FontFreeType::getGlyphCollection() const
     return glyphCollection;
 }
 
-void FontFreeType::releaseFont(const std::string& fontName)
+void FontFreeType::releaseFont(std::string_view fontName)
 {
     auto item = s_cacheFontData.begin();
     while (s_cacheFontData.end() != item)
diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h
index 177571476b04..505812e87caa 100644
--- a/cocos/2d/CCFontFreeType.h
+++ b/cocos/2d/CCFontFreeType.h
@@ -101,12 +101,12 @@ class CC_DLL FontFreeType : public Font
 
     int getFontAscender() const;
     const char* getFontFamily() const;
-    const std::string& getFontName() const { return _fontName; }
+    std::string_view getFontName() const { return _fontName; }
 
     virtual FontAtlas* newFontAtlas() override;
     virtual int getFontMaxHeight() const override { return _lineHeight; }
 
-    static void releaseFont(const std::string& fontName);
+    static void releaseFont(std::string_view fontName);
 
     static FT_Library getFTLibrary();
 
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
index a184fa67d3d3..e7f8a819435b 100644
--- a/cocos/2d/CCLabel.cpp
+++ b/cocos/2d/CCLabel.cpp
@@ -240,8 +240,8 @@ Label* Label::create()
     return ret;
 }
 
-Label* Label::createWithSystemFont(const std::string& text,
-                                   const std::string& font,
+Label* Label::createWithSystemFont(std::string_view text,
+                                   std::string_view font,
                                    float fontSize,
                                    const Vec2& dimensions /* = Vec2::ZERO */,
                                    TextHAlignment hAlignment /* = TextHAlignment::LEFT */,
@@ -259,8 +259,8 @@ Label* Label::createWithSystemFont(const std::string& text,
     return ret;
 }
 
-Label* Label::createWithTTF(const std::string& text,
-                            const std::string& fontFile,
+Label* Label::createWithTTF(std::string_view text,
+                            std::string_view fontFile,
                             float fontSize,
                             const Vec2& dimensions /* = Vec2::ZERO */,
                             TextHAlignment hAlignment /* = TextHAlignment::LEFT */,
@@ -279,7 +279,7 @@ Label* Label::createWithTTF(const std::string& text,
 }
 
 Label* Label::createWithTTF(const TTFConfig& ttfConfig,
-                            const std::string& text,
+                            std::string_view text,
                             TextHAlignment hAlignment /* = TextHAlignment::CENTER */,
                             int maxLineWidth /* = 0 */)
 {
@@ -295,8 +295,8 @@ Label* Label::createWithTTF(const TTFConfig& ttfConfig,
     return nullptr;
 }
 
-Label* Label::createWithBMFont(const std::string& bmfontPath,
-                               const std::string& text,
+Label* Label::createWithBMFont(std::string_view bmfontPath,
+                               std::string_view text,
                                const TextHAlignment& hAlignment,
                                int maxLineWidth)
 {
@@ -315,8 +315,8 @@ Label* Label::createWithBMFont(const std::string& bmfontPath,
     return nullptr;
 }
 
-Label* Label::createWithBMFont(const std::string& bmfontPath,
-                               const std::string& text,
+Label* Label::createWithBMFont(std::string_view bmfontPath,
+                               std::string_view text,
                                const TextHAlignment& hAlignment,
                                int maxLineWidth,
                                const Rect& imageRect,
@@ -337,11 +337,11 @@ Label* Label::createWithBMFont(const std::string& bmfontPath,
     return nullptr;
 }
 
-Label* Label::createWithBMFont(const std::string& bmfontPath,
-                               const std::string& text,
+Label* Label::createWithBMFont(std::string_view bmfontPath,
+                               std::string_view text,
                                const TextHAlignment& hAlignment,
                                int maxLineWidth,
-                               const std::string& subTextureKey)
+                               std::string_view subTextureKey)
 {
     auto ret = new Label(hAlignment);
 
@@ -358,8 +358,8 @@ Label* Label::createWithBMFont(const std::string& bmfontPath,
     return nullptr;
 }
 
-Label* Label::createWithBMFont(const std::string& bmfontPath,
-                               const std::string& text,
+Label* Label::createWithBMFont(std::string_view bmfontPath,
+                               std::string_view text,
                                const TextHAlignment& hAlignment,
                                int maxLineWidth,
                                const Vec2& imageOffset)
@@ -368,7 +368,7 @@ Label* Label::createWithBMFont(const std::string& bmfontPath,
                             false);
 }
 
-Label* Label::createWithCharMap(const std::string& plistFile)
+Label* Label::createWithCharMap(std::string_view plistFile)
 {
     auto ret = new Label();
 
@@ -396,7 +396,7 @@ Label* Label::createWithCharMap(Texture2D* texture, int itemWidth, int itemHeigh
     return nullptr;
 }
 
-Label* Label::createWithCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap)
+Label* Label::createWithCharMap(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap)
 {
     auto ret = new Label();
 
@@ -410,7 +410,7 @@ Label* Label::createWithCharMap(const std::string& charMapFile, int itemWidth, i
     return nullptr;
 }
 
-bool Label::setCharMap(const std::string& plistFile)
+bool Label::setCharMap(std::string_view plistFile)
 {
     auto newAtlas = FontAtlasCache::getFontAtlasCharMap(plistFile);
 
@@ -426,8 +426,8 @@ bool Label::setCharMap(const std::string& plistFile)
     return true;
 }
 
-bool Label::initWithTTF(const std::string& text,
-                        const std::string& fontFilePath,
+bool Label::initWithTTF(std::string_view text,
+                        std::string_view fontFilePath,
                         float fontSize,
                         const Vec2& dimensions,
                         TextHAlignment /*hAlignment*/,
@@ -447,7 +447,7 @@ bool Label::initWithTTF(const std::string& text,
 }
 
 bool Label::initWithTTF(const TTFConfig& ttfConfig,
-                        const std::string& text,
+                        std::string_view text,
                         TextHAlignment /*hAlignment*/,
                         int maxLineWidth)
 {
@@ -476,7 +476,7 @@ bool Label::setCharMap(Texture2D* texture, int itemWidth, int itemHeight, int st
     return true;
 }
 
-bool Label::setCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap)
+bool Label::setCharMap(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap)
 {
     auto newAtlas = FontAtlasCache::getFontAtlasCharMap(charMapFile, itemWidth, itemHeight, startCharMap);
 
@@ -841,7 +841,7 @@ bool Label::setTTFConfig(const TTFConfig& ttfConfig)
     return setTTFConfigInternal(ttfConfig);
 }
 
-bool Label::setBMFontFilePath(const std::string& bmfontFilePath, float fontSize)
+bool Label::setBMFontFilePath(std::string_view bmfontFilePath, float fontSize)
 {
     FontAtlas* newAtlas = FontAtlasCache::getFontAtlasFNT(bmfontFilePath);
 
@@ -875,10 +875,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, float fontSize)
     return true;
 }
 
-bool Label::setBMFontFilePath(const std::string& bmfontFilePath,
-                              const Rect& imageRect,
-                              bool imageRotated,
-                              float fontSize)
+bool Label::setBMFontFilePath(std::string_view bmfontFilePath, const Rect& imageRect, bool imageRotated, float fontSize)
 {
     FontAtlas* newAtlas = FontAtlasCache::getFontAtlasFNT(bmfontFilePath, imageRect, imageRotated);
 
@@ -914,7 +911,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath,
     return true;
 }
 
-bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const std::string& subTextureKey, float fontSize)
+bool Label::setBMFontFilePath(std::string_view bmfontFilePath, std::string_view subTextureKey, float fontSize)
 {
     FontAtlas* newAtlas = FontAtlasCache::getFontAtlasFNT(bmfontFilePath, subTextureKey);
 
@@ -949,7 +946,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const std::stri
     return true;
 }
 
-bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Vec2& imageOffset, float fontSize)
+bool Label::setBMFontFilePath(std::string_view bmfontFilePath, const Vec2& imageOffset, float fontSize)
 {
     return setBMFontFilePath(bmfontFilePath, Rect(imageOffset.x, imageOffset.y, 0, 0), false);
 }
@@ -2105,7 +2102,7 @@ void Label::drawSelf(bool visibleByCamera, Renderer* renderer, uint32_t flags)
     }
 }
 
-void Label::setSystemFontName(const std::string& systemFont)
+void Label::setSystemFontName(std::string_view systemFont)
 {
     if (systemFont != _systemFont)
     {
diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h
index 66d4669cd88c..fa3e5e57e808 100644
--- a/cocos/2d/CCLabel.h
+++ b/cocos/2d/CCLabel.h
@@ -166,8 +166,8 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      *
      * @return An automatically released Label object.
      */
-    static Label* createWithSystemFont(const std::string& text,
-                                       const std::string& font,
+    static Label* createWithSystemFont(std::string_view text,
+                                       std::string_view font,
                                        float fontSize,
                                        const Vec2& dimensions    = Vec2::ZERO,
                                        TextHAlignment hAlignment = TextHAlignment::LEFT,
@@ -185,8 +185,8 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      *
      * @return An automatically released Label object.
      */
-    static Label* createWithTTF(const std::string& text,
-                                const std::string& fontFilePath,
+    static Label* createWithTTF(std::string_view text,
+                                std::string_view fontFilePath,
                                 float fontSize,
                                 const Vec2& dimensions    = Vec2::ZERO,
                                 TextHAlignment hAlignment = TextHAlignment::LEFT,
@@ -204,7 +204,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @see TTFConfig setTTFConfig setMaxLineWidth
      */
     static Label* createWithTTF(const TTFConfig& ttfConfig,
-                                const std::string& text,
+                                std::string_view text,
                                 TextHAlignment hAlignment = TextHAlignment::LEFT,
                                 int maxLineWidth          = 0);
 
@@ -219,8 +219,8 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @return An automatically released Label object.
      * @see setBMFontFilePath setMaxLineWidth
      */
-    static Label* createWithBMFont(const std::string& bmfontPath,
-                                   const std::string& text,
+    static Label* createWithBMFont(std::string_view bmfontPath,
+                                   std::string_view text,
                                    const TextHAlignment& hAlignment = TextHAlignment::LEFT,
                                    int maxLineWidth                 = 0);
 
@@ -237,8 +237,8 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @return An automatically released Label object.
      * @see setBMFontFilePath setMaxLineWidth
      */
-    static Label* createWithBMFont(const std::string& bmfontPath,
-                                   const std::string& text,
+    static Label* createWithBMFont(std::string_view bmfontPath,
+                                   std::string_view text,
                                    const TextHAlignment& hAlignment,
                                    int maxLineWidth,
                                    const Rect& imageRect,
@@ -256,11 +256,11 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @return An automatically released Label object.
      * @see setBMFontFilePath setMaxLineWidth
      */
-    static Label* createWithBMFont(const std::string& bmfontPath,
-                                   const std::string& text,
+    static Label* createWithBMFont(std::string_view bmfontPath,
+                                   std::string_view text,
                                    const TextHAlignment& hAlignment,
                                    int maxLineWidth,
-                                   const std::string& subTextureKey);
+                                   std::string_view subTextureKey);
 
     /**
      * Allocates and initializes a Label, with a bitmap font file.
@@ -274,8 +274,8 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @return An automatically released Label object.
      * @see setBMFontFilePath setMaxLineWidth
      */
-    CC_DEPRECATED_ATTRIBUTE static Label* createWithBMFont(const std::string& bmfontPath,
-                                                           const std::string& text,
+    CC_DEPRECATED_ATTRIBUTE static Label* createWithBMFont(std::string_view bmfontPath,
+                                                           std::string_view text,
                                                            const TextHAlignment& hAlignment,
                                                            int maxLineWidth,
                                                            const Vec2& imageOffset);
@@ -290,7 +290,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      *
      * @return An automatically released Label object.
      */
-    static Label* createWithCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
+    static Label* createWithCharMap(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap);
 
     /**
      * Allocates and initializes a Label, with char map configuration.
@@ -311,7 +311,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      *
      * @return An automatically released Label object.
      */
-    static Label* createWithCharMap(const std::string& plistFile);
+    static Label* createWithCharMap(std::string_view plistFile);
 
     //  end of creators group
     /// @}
@@ -332,33 +332,31 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     virtual const TTFConfig& getTTFConfig() const { return _fontConfig; }
 
     /** Sets a new bitmap font to Label */
-    virtual bool setBMFontFilePath(const std::string& bmfontFilePath, float fontSize = 0);
+    virtual bool setBMFontFilePath(std::string_view bmfontFilePath, float fontSize = 0);
 
     /** Sets a new bitmap font to Label */
-    virtual bool setBMFontFilePath(const std::string& bmfontFilePath,
+    virtual bool setBMFontFilePath(std::string_view bmfontFilePath,
                                    const Rect& imageRect,
                                    bool imageRotated,
                                    float fontSize = 0);
 
     /** Sets a new bitmap font to Label */
-    virtual bool setBMFontFilePath(const std::string& bmfontFilePath,
-                                   const std::string& subTextureKey,
-                                   float fontSize = 0);
+    virtual bool setBMFontFilePath(std::string_view bmfontFilePath, std::string_view subTextureKey, float fontSize = 0);
 
     /** Sets a new bitmap font to Label */
-    CC_DEPRECATED_ATTRIBUTE virtual bool setBMFontFilePath(const std::string& bmfontFilePath,
+    CC_DEPRECATED_ATTRIBUTE virtual bool setBMFontFilePath(std::string_view bmfontFilePath,
                                                            const Vec2& imageOffset,
                                                            float fontSize = 0);
 
     /** Returns the bitmap font used by the Label.*/
-    const std::string& getBMFontFilePath() const { return _bmFontPath; }
+    std::string_view getBMFontFilePath() const { return _bmFontPath; }
 
     /**
      * Sets a new char map configuration to Label.
      *
-     * @see `createWithCharMap(const std::string&,int,int,int)`
+     * @see `createWithCharMap(std::string_view,int,int,int)`
      */
-    virtual bool setCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
+    virtual bool setCharMap(std::string_view charMapFile, int itemWidth, int itemHeight, int startCharMap);
 
     /**
      * Sets a new char map configuration to Label.
@@ -370,9 +368,9 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     /**
      * Sets a new char map configuration to Label.
      *
-     * @see `createWithCharMap(const std::string&)`
+     * @see `createWithCharMap(std::string_view)`
      */
-    virtual bool setCharMap(const std::string& plistFile);
+    virtual bool setCharMap(std::string_view plistFile);
 
     /**
      * Sets a new system font to Label.
@@ -380,10 +378,10 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      * @param font A font file or a font family name.
      * @warning
      */
-    virtual void setSystemFontName(const std::string& font);
+    virtual void setSystemFontName(std::string_view font);
 
     /** Returns the system font used by the Label.*/
-    virtual const std::string& getSystemFontName() const { return _systemFont; }
+    virtual std::string_view getSystemFontName() const { return _systemFont; }
 
     /* Sets the system font size of Label.*/
     virtual void setSystemFontSize(float fontSize);
@@ -403,7 +401,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
     virtual void setString(std::string_view text) override;
 
     /** Return the text the Label is currently displaying.*/
-    virtual const std::string& getString() const override { return _utf8Text; }
+    virtual std::string_view getString() const override { return _utf8Text; }
 
     /**
      * Return the number of lines of text.
@@ -716,15 +714,15 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      */
     virtual ~Label();
 
-    bool initWithTTF(const std::string& text,
-                     const std::string& fontFilePath,
+    bool initWithTTF(std::string_view text,
+                     std::string_view fontFilePath,
                      float fontSize,
                      const Vec2& dimensions    = Vec2::ZERO,
                      TextHAlignment hAlignment = TextHAlignment::LEFT,
                      TextVAlignment vAlignment = TextVAlignment::TOP);
 
     bool initWithTTF(const TTFConfig& ttfConfig,
-                     const std::string& text,
+                     std::string_view text,
                      TextHAlignment hAlignment = TextHAlignment::LEFT,
                      int maxLineWidth          = 0);
 
diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp
index 4b45ff28bdd3..5179b6ff0615 100644
--- a/cocos/2d/CCLabelAtlas.cpp
+++ b/cocos/2d/CCLabelAtlas.cpp
@@ -40,8 +40,8 @@ NS_CC_BEGIN
 
 // CCLabelAtlas - Creation & Init
 
-LabelAtlas* LabelAtlas::create(const std::string& string,
-                               const std::string& charMapFile,
+LabelAtlas* LabelAtlas::create(std::string_view string,
+                               std::string_view charMapFile,
                                int itemWidth,
                                int itemHeight,
                                int startCharMap)
@@ -56,8 +56,8 @@ LabelAtlas* LabelAtlas::create(const std::string& string,
     return nullptr;
 }
 
-bool LabelAtlas::initWithString(const std::string& string,
-                                const std::string& charMapFile,
+bool LabelAtlas::initWithString(std::string_view string,
+                                std::string_view charMapFile,
                                 int itemWidth,
                                 int itemHeight,
                                 int startCharMap)
@@ -66,7 +66,7 @@ bool LabelAtlas::initWithString(const std::string& string,
     return initWithString(string, texture, itemWidth, itemHeight, startCharMap);
 }
 
-bool LabelAtlas::initWithString(const std::string& string,
+bool LabelAtlas::initWithString(std::string_view string,
                                 Texture2D* texture,
                                 int itemWidth,
                                 int itemHeight,
@@ -81,7 +81,7 @@ bool LabelAtlas::initWithString(const std::string& string,
     return false;
 }
 
-LabelAtlas* LabelAtlas::create(const std::string& string, const std::string& fntFile)
+LabelAtlas* LabelAtlas::create(std::string_view string, std::string_view fntFile)
 {
     LabelAtlas* ret = new LabelAtlas();
 
@@ -97,7 +97,7 @@ LabelAtlas* LabelAtlas::create(const std::string& string, const std::string& fnt
     return ret;
 }
 
-LabelAtlas* LabelAtlas::create(const std::string& string,
+LabelAtlas* LabelAtlas::create(std::string_view string,
                                Texture2D* texture,
                                int itemWidth,
                                int itemHeight,
@@ -117,7 +117,7 @@ LabelAtlas* LabelAtlas::create(const std::string& string,
     return ret;
 }
 
-bool LabelAtlas::initWithString(const std::string& theString, const std::string& fntFile)
+bool LabelAtlas::initWithString(std::string_view theString, std::string_view fntFile)
 {
     std::string pathStr    = FileUtils::getInstance()->fullPathForFilename(fntFile);
     std::string relPathStr = pathStr.substr(0, pathStr.find_last_of('/')) + "/";
@@ -128,8 +128,8 @@ bool LabelAtlas::initWithString(const std::string& theString, const std::string&
 
     std::string textureFilename = relPathStr + dict["textureFilename"].asString();
 
-    unsigned int width     = dict["itemWidth"].asInt() / CC_CONTENT_SCALE_FACTOR();
-    unsigned int height    = dict["itemHeight"].asInt() / CC_CONTENT_SCALE_FACTOR();
+    unsigned int width     = static_cast<unsigned int>(dict["itemWidth"].asInt() / CC_CONTENT_SCALE_FACTOR());
+    unsigned int height    = static_cast<unsigned int>(dict["itemHeight"].asInt() / CC_CONTENT_SCALE_FACTOR());
     unsigned int startChar = dict["firstChar"].asInt();
 
     this->initWithString(theString, textureFilename, width, height, startChar);
@@ -156,8 +156,8 @@ void LabelAtlas::updateAtlasValues()
     float itemHeightInPixels = _itemHeight * CC_CONTENT_SCALE_FACTOR();
     if (_ignoreContentScaleFactor)
     {
-        itemWidthInPixels  = _itemWidth;
-        itemHeightInPixels = _itemHeight;
+        itemWidthInPixels  = static_cast<float>(_itemWidth);
+        itemHeightInPixels = static_cast<float>(_itemHeight);
     }
 
     CCASSERT(n <= _textureAtlas->getCapacity(), "updateAtlasValues: Invalid String length");
@@ -239,7 +239,7 @@ void LabelAtlas::setString(std::string_view label)
     _quadsToDraw = len;
 }
 
-const std::string& LabelAtlas::getString() const
+std::string_view LabelAtlas::getString() const
 {
     return _string;
 }
diff --git a/cocos/2d/CCLabelAtlas.h b/cocos/2d/CCLabelAtlas.h
index b1f10ca9a94a..1965e75f32ce 100644
--- a/cocos/2d/CCLabelAtlas.h
+++ b/cocos/2d/CCLabelAtlas.h
@@ -58,8 +58,8 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
 public:
     /** Creates the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and the
      * starting char of the atlas. */
-    static LabelAtlas* create(const std::string& string,
-                              const std::string& charMapFile,
+    static LabelAtlas* create(std::string_view string,
+                              std::string_view charMapFile,
                               int itemWidth,
                               int itemHeight,
                               int startCharMap);
@@ -68,13 +68,13 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
      * Creates the LabelAtlas with a string and a configuration file.
      * @since v2.0
      */
-    static LabelAtlas* create(const std::string& string, const std::string& fntFile);
+    static LabelAtlas* create(std::string_view string, std::string_view fntFile);
 
     /**
      * Creates the LabelAtlas with a string, a texture, the width and height of each element and the starting char of
      * the atlas.
      */
-    static LabelAtlas* create(const std::string& string,
+    static LabelAtlas* create(std::string_view string,
                               Texture2D* texture,
                               int itemWidth,
                               int itemHeight,
@@ -82,8 +82,8 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
 
     /** Initializes the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and
      * the starting char of the atlas. */
-    bool initWithString(const std::string& string,
-                        const std::string& charMapFile,
+    bool initWithString(std::string_view string,
+                        std::string_view charMapFile,
                         int itemWidth,
                         int itemHeight,
                         int startCharMap);
@@ -92,14 +92,14 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
      * Initializes the LabelAtlas with a string and a configuration file.
      * @since v2.0
      */
-    bool initWithString(const std::string& string, const std::string& fntFile);
+    bool initWithString(std::string_view string, std::string_view fntFile);
 
     /** Initializes the LabelAtlas with a string, a texture, the width and height in points of each element and the
      * starting char of the atlas */
-    bool initWithString(const std::string& string, Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
+    bool initWithString(std::string_view string, Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
 
     virtual void setString(std::string_view label) override;
-    virtual const std::string& getString() const override;
+    virtual std::string_view getString() const override;
 
     virtual void updateAtlasValues() override;
     /**
diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp
index a357c06edefa..2a28d7686f70 100644
--- a/cocos/2d/CCLabelTextFormatter.cpp
+++ b/cocos/2d/CCLabelTextFormatter.cpp
@@ -109,7 +109,7 @@ int Label::getFirstWordLen(const std::u32string& utf32Text, int startIndex, int
                 break;
         }
 
-        nextLetterX += letterDef.xAdvance * _bmfontScale + _additionalKerning;
+        nextLetterX += static_cast<int>(letterDef.xAdvance * _bmfontScale + _additionalKerning);
 
         len++;
     }
@@ -139,9 +139,9 @@ void Label::updateBMFontScale()
     auto font = _fontAtlas->getFont();
     if (_currentLabelType == LabelType::BMFONT)
     {
-        FontFNT* bmFont        = (FontFNT*)font;
-        float originalFontSize = bmFont->getOriginalFontSize();
-        _bmfontScale           = _bmFontSize * CC_CONTENT_SCALE_FACTOR() / originalFontSize;
+        FontFNT* bmFont       = (FontFNT*)font;
+        auto originalFontSize = bmFont->getOriginalFontSize();
+        _bmfontScale          = _bmFontSize * CC_CONTENT_SCALE_FACTOR() / originalFontSize;
     }
     else
     {
@@ -242,7 +242,7 @@ bool Label::multilineTextWrap(const std::function<int(const std::u32string&, int
             {
                 float newLetterWidth = 0.f;
                 if (_horizontalKernings && letterIndex < textLen - 1)
-                    newLetterWidth = _horizontalKernings[letterIndex + 1];
+                    newLetterWidth = static_cast<float>(_horizontalKernings[letterIndex + 1]);
                 newLetterWidth += letterDef.xAdvance * _bmfontScale + _additionalKerning;
 
                 nextLetterX += newLetterWidth;
diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp
index bbd8808cc6ce..d24e01529155 100644
--- a/cocos/2d/CCMenu.cpp
+++ b/cocos/2d/CCMenu.cpp
@@ -175,7 +175,7 @@ void Menu::addChild(Node* child, int zOrder, int tag)
     Layer::addChild(child, zOrder, tag);
 }
 
-void Menu::addChild(Node* child, int zOrder, const std::string& name)
+void Menu::addChild(Node* child, int zOrder, std::string_view name)
 {
     CCASSERT(dynamic_cast<MenuItem*>(child) != nullptr, "Menu only supports MenuItem objects as children");
     Layer::addChild(child, zOrder, name);
diff --git a/cocos/2d/CCMenu.h b/cocos/2d/CCMenu.h
index 560c75c8e506..37d86df33257 100644
--- a/cocos/2d/CCMenu.h
+++ b/cocos/2d/CCMenu.h
@@ -148,7 +148,7 @@ class CC_DLL Menu : public Layer
     virtual void addChild(Node* child) override;
     virtual void addChild(Node* child, int zOrder) override;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
 
     virtual void onEnter() override;
     virtual void onExit() override;
diff --git a/cocos/2d/CCMenuItem.cpp b/cocos/2d/CCMenuItem.cpp
index 83927a12d263..fb797cc8646b 100644
--- a/cocos/2d/CCMenuItem.cpp
+++ b/cocos/2d/CCMenuItem.cpp
@@ -180,13 +180,13 @@ bool MenuItemLabel::initWithLabel(Node* label, const ccMenuCallback& callback)
 
 MenuItemLabel::~MenuItemLabel() {}
 
-void MenuItemLabel::setString(const std::string& label)
+void MenuItemLabel::setString(std::string_view label)
 {
     dynamic_cast<LabelProtocol*>(_label)->setString(label);
     this->setContentSize(_label->getContentSize());
 }
 
-std::string MenuItemLabel::getString() const
+std::string_view MenuItemLabel::getString() const
 {
     auto label = dynamic_cast<LabelProtocol*>(_label);
     return label->getString();
@@ -259,8 +259,8 @@ void MenuItemLabel::setEnabled(bool enabled)
 // CCMenuItemAtlasFont
 //
 
-MenuItemAtlasFont* MenuItemAtlasFont::create(const std::string& value,
-                                             const std::string& charMapFile,
+MenuItemAtlasFont* MenuItemAtlasFont::create(std::string_view value,
+                                             std::string_view charMapFile,
                                              int itemWidth,
                                              int itemHeight,
                                              char startCharMap)
@@ -269,8 +269,8 @@ MenuItemAtlasFont* MenuItemAtlasFont::create(const std::string& value,
                                      (const ccMenuCallback&)nullptr);
 }
 
-MenuItemAtlasFont* MenuItemAtlasFont::create(const std::string& value,
-                                             const std::string& charMapFile,
+MenuItemAtlasFont* MenuItemAtlasFont::create(std::string_view value,
+                                             std::string_view charMapFile,
                                              int itemWidth,
                                              int itemHeight,
                                              char startCharMap,
@@ -282,8 +282,8 @@ MenuItemAtlasFont* MenuItemAtlasFont::create(const std::string& value,
     return ret;
 }
 
-bool MenuItemAtlasFont::initWithString(const std::string& value,
-                                       const std::string& charMapFile,
+bool MenuItemAtlasFont::initWithString(std::string_view value,
+                                       std::string_view charMapFile,
                                        int itemWidth,
                                        int itemHeight,
                                        char startCharMap,
@@ -312,7 +312,7 @@ int MenuItemFont::getFontSize()
     return _globalFontSize;
 }
 
-void MenuItemFont::setFontName(const std::string& name)
+void MenuItemFont::setFontName(std::string_view name)
 {
     if (_globalFontNameRelease)
     {
@@ -322,12 +322,12 @@ void MenuItemFont::setFontName(const std::string& name)
     _globalFontNameRelease = true;
 }
 
-const std::string& MenuItemFont::getFontName()
+std::string_view MenuItemFont::getFontName()
 {
     return _globalFontName;
 }
 
-MenuItemFont* MenuItemFont::create(const std::string& value, const ccMenuCallback& callback)
+MenuItemFont* MenuItemFont::create(std::string_view value, const ccMenuCallback& callback)
 {
     MenuItemFont* ret = new MenuItemFont();
     ret->initWithString(value, callback);
@@ -335,7 +335,7 @@ MenuItemFont* MenuItemFont::create(const std::string& value, const ccMenuCallbac
     return ret;
 }
 
-MenuItemFont* MenuItemFont::create(const std::string& value)
+MenuItemFont* MenuItemFont::create(std::string_view value)
 {
     MenuItemFont* ret = new MenuItemFont();
     ret->initWithString(value, (const ccMenuCallback&)nullptr);
@@ -350,7 +350,7 @@ MenuItemFont::~MenuItemFont()
     CCLOGINFO("In the destructor of MenuItemFont (%p).", this);
 }
 
-bool MenuItemFont::initWithString(const std::string& value, const ccMenuCallback& callback)
+bool MenuItemFont::initWithString(std::string_view value, const ccMenuCallback& callback)
 {
     CCASSERT(!value.empty(), "Value length must be greater than 0");
 
@@ -377,14 +377,14 @@ int MenuItemFont::getFontSizeObj() const
     return _fontSize;
 }
 
-void MenuItemFont::setFontNameObj(const std::string& name)
+void MenuItemFont::setFontNameObj(std::string_view name)
 {
     _fontName = name;
     dynamic_cast<Label*>(_label)->setSystemFontName(_fontName);
     this->setContentSize(dynamic_cast<Label*>(_label)->getContentSize());
 }
 
-const std::string& MenuItemFont::getFontNameObj() const
+std::string_view MenuItemFont::getFontNameObj() const
 {
     return _fontName;
 }
@@ -600,21 +600,21 @@ bool MenuItemImage::init()
     return initWithNormalImage("", "", "", (const ccMenuCallback&)nullptr);
 }
 
-MenuItemImage* MenuItemImage::create(const std::string& normalImage, const std::string& selectedImage)
+MenuItemImage* MenuItemImage::create(std::string_view normalImage, std::string_view selectedImage)
 {
     return MenuItemImage::create(normalImage, selectedImage, "", (const ccMenuCallback&)nullptr);
 }
 
-MenuItemImage* MenuItemImage::create(const std::string& normalImage,
-                                     const std::string& selectedImage,
+MenuItemImage* MenuItemImage::create(std::string_view normalImage,
+                                     std::string_view selectedImage,
                                      const ccMenuCallback& callback)
 {
     return MenuItemImage::create(normalImage, selectedImage, "", callback);
 }
 
-MenuItemImage* MenuItemImage::create(const std::string& normalImage,
-                                     const std::string& selectedImage,
-                                     const std::string& disabledImage,
+MenuItemImage* MenuItemImage::create(std::string_view normalImage,
+                                     std::string_view selectedImage,
+                                     std::string_view disabledImage,
                                      const ccMenuCallback& callback)
 {
     MenuItemImage* ret = new MenuItemImage();
@@ -627,9 +627,9 @@ MenuItemImage* MenuItemImage::create(const std::string& normalImage,
     return nullptr;
 }
 
-MenuItemImage* MenuItemImage::create(const std::string& normalImage,
-                                     const std::string& selectedImage,
-                                     const std::string& disabledImage)
+MenuItemImage* MenuItemImage::create(std::string_view normalImage,
+                                     std::string_view selectedImage,
+                                     std::string_view disabledImage)
 {
     MenuItemImage* ret = new MenuItemImage();
     if (ret->initWithNormalImage(normalImage, selectedImage, disabledImage, (const ccMenuCallback&)nullptr))
@@ -641,9 +641,9 @@ MenuItemImage* MenuItemImage::create(const std::string& normalImage,
     return nullptr;
 }
 
-bool MenuItemImage::initWithNormalImage(const std::string& normalImage,
-                                        const std::string& selectedImage,
-                                        const std::string& disabledImage,
+bool MenuItemImage::initWithNormalImage(std::string_view normalImage,
+                                        std::string_view selectedImage,
+                                        std::string_view disabledImage,
                                         const ccMenuCallback& callback)
 {
     Node* normalSprite   = nullptr;
diff --git a/cocos/2d/CCMenuItem.h b/cocos/2d/CCMenuItem.h
index a36b65aaf6ba..20639746c90b 100644
--- a/cocos/2d/CCMenuItem.h
+++ b/cocos/2d/CCMenuItem.h
@@ -137,10 +137,10 @@ class CC_DLL MenuItemLabel : public MenuItem
     static MenuItemLabel* create(Node* label);
 
     /** Sets a new string to the inner label. */
-    void setString(const std::string& label);
+    void setString(std::string_view label);
 
     /** Get the inner string of the inner label. */
-    std::string getString() const;
+    std::string_view getString() const;
 
     /** Gets the color that will be used when the item is disabled. */
     const Color3B& getDisabledColor() const { return _disabledColor; }
@@ -196,14 +196,14 @@ class CC_DLL MenuItemAtlasFont : public MenuItemLabel
 {
 public:
     /** Creates a menu item from a string and atlas with a target/selector. */
-    static MenuItemAtlasFont* create(const std::string& value,
-                                     const std::string& charMapFile,
+    static MenuItemAtlasFont* create(std::string_view value,
+                                     std::string_view charMapFile,
                                      int itemWidth,
                                      int itemHeight,
                                      char startCharMap);
     /** Creates a menu item from a string and atlas. Use it with MenuItemToggle. */
-    static MenuItemAtlasFont* create(const std::string& value,
-                                     const std::string& charMapFile,
+    static MenuItemAtlasFont* create(std::string_view value,
+                                     std::string_view charMapFile,
                                      int itemWidth,
                                      int itemHeight,
                                      char startCharMap,
@@ -222,8 +222,8 @@ class CC_DLL MenuItemAtlasFont : public MenuItemLabel
     virtual ~MenuItemAtlasFont() {}
 
     /** Initializes a menu item from a string and atlas with a target/selector. */
-    bool initWithString(const std::string& value,
-                        const std::string& charMapFile,
+    bool initWithString(std::string_view value,
+                        std::string_view charMapFile,
                         int itemWidth,
                         int itemHeight,
                         char startCharMap,
@@ -240,18 +240,18 @@ class CC_DLL MenuItemFont : public MenuItemLabel
 {
 public:
     /** Creates a menu item from a string without target/selector. To be used with MenuItemToggle. */
-    static MenuItemFont* create(const std::string& value = "");
+    static MenuItemFont* create(std::string_view value = "");
     /** Creates a menu item from a string with a target/selector. */
-    static MenuItemFont* create(const std::string& value, const ccMenuCallback& callback);
+    static MenuItemFont* create(std::string_view value, const ccMenuCallback& callback);
 
     /** Set default font size. */
     static void setFontSize(int size);
     /** Get default font size. */
     static int getFontSize();
     /** Set the default font name. */
-    static void setFontName(const std::string& name);
+    static void setFontName(std::string_view name);
     /** Get the default font name. */
-    static const std::string& getFontName();
+    static std::string_view getFontName();
 
     /** Set font size.
      * c++ can not overload static and non-static member functions with the same parameter types.
@@ -274,13 +274,13 @@ class CC_DLL MenuItemFont : public MenuItemLabel
      * @js setFontName
      * @js NA
      */
-    void setFontNameObj(const std::string& name);
+    void setFontNameObj(std::string_view name);
 
     /** Returns the name of the Font.
      * @js getFontNameObj
      * @js NA
      */
-    const std::string& getFontNameObj() const;
+    std::string_view getFontNameObj() const;
 
     CC_CONSTRUCTOR_ACCESS :
         /**
@@ -294,7 +294,7 @@ class CC_DLL MenuItemFont : public MenuItemLabel
     virtual ~MenuItemFont();
 
     /** Initializes a menu item from a string with a target/selector. */
-    bool initWithString(const std::string& value, const ccMenuCallback& callback);
+    bool initWithString(std::string_view value, const ccMenuCallback& callback);
 
 protected:
     int _fontSize;
@@ -392,19 +392,19 @@ class CC_DLL MenuItemImage : public MenuItemSprite
     /** Creates an MenuItemImage. */
     static MenuItemImage* create();
     /** Creates a menu item with a normal and selected image.*/
-    static MenuItemImage* create(const std::string& normalImage, const std::string& selectedImage);
+    static MenuItemImage* create(std::string_view normalImage, std::string_view selectedImage);
     /** Creates a menu item with a normal,selected  and disabled image.*/
-    static MenuItemImage* create(const std::string& normalImage,
-                                 const std::string& selectedImage,
-                                 const std::string& disabledImage);
+    static MenuItemImage* create(std::string_view normalImage,
+                                 std::string_view selectedImage,
+                                 std::string_view disabledImage);
     /** Creates a menu item with a normal and selected image with a callable object. */
-    static MenuItemImage* create(const std::string& normalImage,
-                                 const std::string& selectedImage,
+    static MenuItemImage* create(std::string_view normalImage,
+                                 std::string_view selectedImage,
                                  const ccMenuCallback& callback);
     /** Creates a menu item with a normal,selected and disabled image with a callable object. */
-    static MenuItemImage* create(const std::string& normalImage,
-                                 const std::string& selectedImage,
-                                 const std::string& disabledImage,
+    static MenuItemImage* create(std::string_view normalImage,
+                                 std::string_view selectedImage,
+                                 std::string_view disabledImage,
                                  const ccMenuCallback& callback);
 
     /** Sets the sprite frame for the normal image. */
@@ -429,9 +429,9 @@ class CC_DLL MenuItemImage : public MenuItemSprite
     bool init();
 
     /** Initializes a menu item with a normal, selected and disabled image with a callable object. */
-    bool initWithNormalImage(const std::string& normalImage,
-                             const std::string& selectedImage,
-                             const std::string& disabledImage,
+    bool initWithNormalImage(std::string_view normalImage,
+                             std::string_view selectedImage,
+                             std::string_view disabledImage,
                              const ccMenuCallback& callback);
 
 private:
diff --git a/cocos/2d/CCMotionStreak.cpp b/cocos/2d/CCMotionStreak.cpp
index d92839e9541e..1535875ef675 100644
--- a/cocos/2d/CCMotionStreak.cpp
+++ b/cocos/2d/CCMotionStreak.cpp
@@ -52,11 +52,7 @@ MotionStreak::~MotionStreak()
     CC_SAFE_FREE(_texCoords);
 }
 
-MotionStreak* MotionStreak::create(float fade,
-                                   float minSeg,
-                                   float stroke,
-                                   const Color3B& color,
-                                   const std::string& path)
+MotionStreak* MotionStreak::create(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path)
 {
     MotionStreak* ret = new MotionStreak();
     if (ret->initWithFade(fade, minSeg, stroke, color, path))
@@ -82,7 +78,7 @@ MotionStreak* MotionStreak::create(float fade, float minSeg, float stroke, const
     return nullptr;
 }
 
-bool MotionStreak::initWithFade(float fade, float minSeg, float stroke, const Color3B& color, const std::string& path)
+bool MotionStreak::initWithFade(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path)
 {
     CCASSERT(!path.empty(), "Invalid filename");
 
diff --git a/cocos/2d/CCMotionStreak.h b/cocos/2d/CCMotionStreak.h
index 07ab945dd5f5..7ce1ca2c742a 100644
--- a/cocos/2d/CCMotionStreak.h
+++ b/cocos/2d/CCMotionStreak.h
@@ -59,7 +59,7 @@ class CC_DLL MotionStreak : public Node, public TextureProtocol
                                 float minSeg,
                                 float strokeWidth,
                                 const Color3B& strokeColor,
-                                const std::string& imagePath);
+                                std::string_view imagePath);
     /** Creates and initializes a motion streak with fade in seconds, minimum segments, stroke's width, color, texture.
      *
      * @param timeToFade The fade time, in seconds.
@@ -163,7 +163,7 @@ class CC_DLL MotionStreak : public Node, public TextureProtocol
 
     /** initializes a motion streak with fade in seconds, minimum segments, stroke's width, color and texture filename
      */
-    bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, const std::string& path);
+    bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path);
 
     /** initializes a motion streak with fade in seconds, minimum segments, stroke's width, color and texture  */
     bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, Texture2D* texture);
diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp
index aa068ac8fd78..49fa7a83f106 100644
--- a/cocos/2d/CCNode.cpp
+++ b/cocos/2d/CCNode.cpp
@@ -56,7 +56,7 @@ THE SOFTWARE.
 /*
  * 4.5x faster than std::hash in release mode
  */
-#define CC_HASH_NODE_NAME(name) (!name.empty() ? XXH3_64bits(name.c_str(), name.length()) : 0)
+#define CC_HASH_NODE_NAME(name) (!name.empty() ? XXH3_64bits(name.data(), name.length()) : 0)
 
 NS_CC_BEGIN
 
@@ -695,12 +695,12 @@ void Node::setTag(int tag)
     _tag = tag;
 }
 
-const std::string& Node::getName() const
+std::string_view Node::getName() const
 {
     return _name;
 }
 
-void Node::setName(const std::string& name)
+void Node::setName(std::string_view name)
 {
     updateParentChildrenIndexer(name);
     _name = name;
@@ -717,7 +717,7 @@ void Node::updateParentChildrenIndexer(int tag)
     }
 }
 
-void Node::updateParentChildrenIndexer(const std::string& name)
+void Node::updateParentChildrenIndexer(std::string_view name)
 {
     uint64_t newHash           = CC_HASH_NODE_NAME(name);
     auto parentChildrenIndexer = getParentChildrenIndexer();
@@ -817,7 +817,7 @@ Node* Node::getChildByTag(int tag) const
     return nullptr;
 }
 
-Node* Node::getChildByName(const std::string& name) const
+Node* Node::getChildByName(std::string_view name) const
 {
     // CCASSERT(!name.empty(), "Invalid name");
     auto hash = CC_HASH_NODE_NAME(name);
@@ -837,7 +837,7 @@ Node* Node::getChildByName(const std::string& name) const
     return nullptr;
 }
 
-void Node::enumerateChildren(const std::string& name, std::function<bool(Node*)> callback) const
+void Node::enumerateChildren(std::string_view name, std::function<bool(Node*)> callback) const
 {
     CCASSERT(!name.empty(), "Invalid name");
     CCASSERT(callback != nullptr, "Invalid callback function");
@@ -865,7 +865,7 @@ void Node::enumerateChildren(const std::string& name, std::function<bool(Node*)>
     }
 
     // Remove '//', '/..' if exist
-    std::string newName = name.substr(subStrStartPos, subStrlength);
+    auto newName = name.substr(subStrStartPos, subStrlength);
 
     const Node* target = this;
 
@@ -886,15 +886,15 @@ void Node::enumerateChildren(const std::string& name, std::function<bool(Node*)>
     else
     {
         // name is xxx
-        target->doEnumerate(newName, callback);
+        target->doEnumerate(std::string{newName}, callback);
     }
 }
 
-bool Node::doEnumerateRecursive(const Node* node, const std::string& name, std::function<bool(Node*)> callback) const
+bool Node::doEnumerateRecursive(const Node* node, std::string_view name, std::function<bool(Node*)> callback) const
 {
     bool ret = false;
 
-    if (node->doEnumerate(name, callback))
+    if (node->doEnumerate(std::string{name}, callback))
     {
         // search itself
         ret = true;
@@ -966,7 +966,7 @@ void Node::addChild(Node* child, int localZOrder, int tag)
     addChildHelper(child, localZOrder, tag, "", true);
 }
 
-void Node::addChild(Node* child, int localZOrder, const std::string& name)
+void Node::addChild(Node* child, int localZOrder, std::string_view name)
 {
     CCASSERT(child != nullptr, "Argument must be non-nil");
     CCASSERT(child->_parent == nullptr, "child already added. It can't be added again");
@@ -974,7 +974,7 @@ void Node::addChild(Node* child, int localZOrder, const std::string& name)
     addChildHelper(child, localZOrder, INVALID_TAG, name, false);
 }
 
-void Node::addChildHelper(Node* child, int localZOrder, int tag, const std::string& name, bool setTag)
+void Node::addChildHelper(Node* child, int localZOrder, int tag, std::string_view name, bool setTag)
 {
     auto assertNotSelfChild([this, child]() -> bool {
         for (Node* parent(getParent()); parent != nullptr; parent = parent->getParent())
@@ -1088,7 +1088,7 @@ void Node::removeChildByTag(int tag, bool cleanup /* = true */)
     }
 }
 
-void Node::removeChildByName(const std::string& name, bool cleanup)
+void Node::removeChildByName(std::string_view name, bool cleanup)
 {
     CCASSERT(!name.empty(), "Invalid name");
 
@@ -1096,7 +1096,7 @@ void Node::removeChildByName(const std::string& name, bool cleanup)
 
     if (child == nullptr)
     {
-        CCLOG("cocos2d: removeChildByName(name = %s): child not found!", name.c_str());
+        CCLOG("cocos2d: removeChildByName(name = %s): child not found!", name.data());
     }
     else
     {
@@ -1490,7 +1490,7 @@ bool Node::isScheduled(SEL_SCHEDULE selector) const
     return _scheduler->isScheduled(selector, this);
 }
 
-bool Node::isScheduled(const std::string& key) const
+bool Node::isScheduled(std::string_view key) const
 {
     return _scheduler->isScheduled(key, this);
 }
@@ -1547,12 +1547,12 @@ void Node::schedule(SEL_SCHEDULE selector, float interval, unsigned int repeat,
     _scheduler->schedule(selector, this, interval, repeat, delay, !_running);
 }
 
-void Node::schedule(const std::function<void(float)>& callback, const std::string& key)
+void Node::schedule(const std::function<void(float)>& callback, std::string_view key)
 {
     _scheduler->schedule(callback, this, 0, !_running, key);
 }
 
-void Node::schedule(const std::function<void(float)>& callback, float interval, const std::string& key)
+void Node::schedule(const std::function<void(float)>& callback, float interval, std::string_view key)
 {
     _scheduler->schedule(callback, this, interval, !_running, key);
 }
@@ -1561,7 +1561,7 @@ void Node::schedule(const std::function<void(float)>& callback,
                     float interval,
                     unsigned int repeat,
                     float delay,
-                    const std::string& key)
+                    std::string_view key)
 {
     _scheduler->schedule(callback, this, interval, repeat, delay, !_running, key);
 }
@@ -1571,7 +1571,7 @@ void Node::scheduleOnce(SEL_SCHEDULE selector, float delay)
     this->schedule(selector, 0.0f, 0, delay);
 }
 
-void Node::scheduleOnce(const std::function<void(float)>& callback, float delay, const std::string& key)
+void Node::scheduleOnce(const std::function<void(float)>& callback, float delay, std::string_view key)
 {
     _scheduler->schedule(callback, this, 0, 0, delay, !_running, key);
 }
@@ -1585,7 +1585,7 @@ void Node::unschedule(SEL_SCHEDULE selector)
     _scheduler->unschedule(selector, this);
 }
 
-void Node::unschedule(const std::string& key)
+void Node::unschedule(std::string_view key)
 {
     _scheduler->unschedule(key, this);
 }
@@ -1923,7 +1923,7 @@ void Node::updateTransform()
 
 // MARK: components
 
-Component* Node::getComponent(const std::string& name)
+Component* Node::getComponent(std::string_view name)
 {
     if (_componentContainer)
         return _componentContainer->get(name);
@@ -1943,7 +1943,7 @@ bool Node::addComponent(Component* component)
     return _componentContainer->add(component);
 }
 
-bool Node::removeComponent(const std::string& name)
+bool Node::removeComponent(std::string_view name)
 {
     if (_componentContainer)
         return _componentContainer->remove(name);
diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h
index 01bd103303fc..9ebc5b5f6718 100644
--- a/cocos/2d/CCNode.h
+++ b/cocos/2d/CCNode.h
@@ -762,7 +762,7 @@ class CC_DLL Node : public Ref
      * @param name      A string to identify the node easily. Please refer to `setName(int)`.
      *
      */
-    virtual void addChild(Node* child, int localZOrder, const std::string& name);
+    virtual void addChild(Node* child, int localZOrder, std::string_view name);
     /**
      * Gets a child from the container with its tag.
      *
@@ -796,7 +796,7 @@ class CC_DLL Node : public Ref
      *
      * @since v3.2
      */
-    virtual Node* getChildByName(const std::string& name) const;
+    virtual Node* getChildByName(std::string_view name) const;
     /**
      * Gets a child from the container with its name that can be cast to Type T.
      *
@@ -805,7 +805,7 @@ class CC_DLL Node : public Ref
      * @return a Node with the given name that can be cast to Type T.
      */
     template <typename T>
-    T getChildByName(const std::string& name) const
+    T getChildByName(std::string_view name) const
     {
         return static_cast<T>(getChildByName(name));
     }
@@ -835,7 +835,7 @@ class CC_DLL Node : public Ref
      *
      * @since v3.2
      */
-    virtual void enumerateChildren(const std::string& name, std::function<bool(Node* node)> callback) const;
+    virtual void enumerateChildren(std::string_view name, std::function<bool(Node* node)> callback) const;
     /**
      * Returns the array of the node's children.
      *
@@ -909,7 +909,7 @@ class CC_DLL Node : public Ref
      * @param name       A string that identifies a child node.
      * @param cleanup   True if all running actions and callbacks on the child node will be cleanup, false otherwise.
      */
-    virtual void removeChildByName(const std::string& name, bool cleanup = true);
+    virtual void removeChildByName(std::string_view name, bool cleanup = true);
     /**
      * Removes all children from the container with a cleanup.
      *
@@ -989,13 +989,13 @@ class CC_DLL Node : public Ref
      *
      * @since v3.2
      */
-    virtual const std::string& getName() const;
+    virtual std::string_view getName() const;
     /** Changes the name that is used to identify the node easily.
      * @param name A string that identifies the node.
      *
      * @since v3.2
      */
-    virtual void setName(const std::string& name);
+    virtual void setName(std::string_view name);
 
     /**
      * Returns a custom user data pointer.
@@ -1306,7 +1306,7 @@ class CC_DLL Node : public Ref
      * @js NA
      * @lua NA
      */
-    bool isScheduled(const std::string& key) const;
+    bool isScheduled(std::string_view key) const;
 
     /**
      * Schedules the "update" method.
@@ -1385,7 +1385,7 @@ class CC_DLL Node : public Ref
      * @param key           The key of the lambda function. To be used if you want to unschedule it.
      * @lua NA
      */
-    void scheduleOnce(const std::function<void(float)>& callback, float delay, const std::string& key);
+    void scheduleOnce(const std::function<void(float)>& callback, float delay, std::string_view key);
 
     /**
      * Schedules a custom selector, the scheduled selector will be ticked every frame.
@@ -1403,7 +1403,7 @@ class CC_DLL Node : public Ref
      * @param key           The key of the lambda function. To be used if you want to unschedule it.
      * @lua NA
      */
-    void schedule(const std::function<void(float)>& callback, const std::string& key);
+    void schedule(const std::function<void(float)>& callback, std::string_view key);
 
     /**
      * Schedules a lambda function. The scheduled lambda function will be called every "interval" seconds
@@ -1413,7 +1413,7 @@ class CC_DLL Node : public Ref
      * @param key           The key of the lambda function. To be used if you want to unschedule it
      * @lua NA
      */
-    void schedule(const std::function<void(float)>& callback, float interval, const std::string& key);
+    void schedule(const std::function<void(float)>& callback, float interval, std::string_view key);
 
     /**
      * Schedules a lambda function.
@@ -1430,7 +1430,7 @@ class CC_DLL Node : public Ref
                   float interval,
                   unsigned int repeat,
                   float delay,
-                  const std::string& key);
+                  std::string_view key);
 
     /**
      * Unschedules a custom selector.
@@ -1447,7 +1447,7 @@ class CC_DLL Node : public Ref
      * @param key      The key of the lambda function to be unscheduled.
      * @lua NA
      */
-    void unschedule(const std::string& key);
+    void unschedule(std::string_view key);
 
     /**
      * Unschedule all scheduled selectors and lambda functions: custom selectors, and the 'update' selector and lambda
@@ -1633,7 +1633,7 @@ class CC_DLL Node : public Ref
      * @param name A given name of component.
      * @return The Component by name.
      */
-    Component* getComponent(const std::string& name);
+    Component* getComponent(std::string_view name);
 
     /**
      * Adds a component.
@@ -1649,7 +1649,7 @@ class CC_DLL Node : public Ref
      * @param name A given name of component.
      * @return True if removed success.
      */
-    virtual bool removeComponent(const std::string& name);
+    virtual bool removeComponent(std::string_view name);
 
     /**
      * Removes a component by its pointer.
@@ -1854,7 +1854,7 @@ class CC_DLL Node : public Ref
     virtual void updateColor() {}
 
     bool doEnumerate(std::string name, std::function<bool(Node*)> callback) const;
-    bool doEnumerateRecursive(const Node* node, const std::string& name, std::function<bool(Node*)> callback) const;
+    bool doEnumerateRecursive(const Node* node, std::string_view name, std::function<bool(Node*)> callback) const;
 
     // check whether this camera mask is visible by the current visiting camera
     bool isVisitableByVisitingCamera() const;
@@ -1865,10 +1865,10 @@ class CC_DLL Node : public Ref
     void updateRotation3D();
 
     void updateParentChildrenIndexer(int tag);
-    void updateParentChildrenIndexer(const std::string& name);
+    void updateParentChildrenIndexer(std::string_view name);
 
 private:
-    void addChildHelper(Node* child, int localZOrder, int tag, const std::string& name, bool setTag);
+    void addChildHelper(Node* child, int localZOrder, int tag, std::string_view name, bool setTag);
 
     NodeIndexerMap_t* getParentChildrenIndexer();
 
diff --git a/cocos/2d/CCParallaxNode.cpp b/cocos/2d/CCParallaxNode.cpp
index 7282e416a453..a2c04f4ec229 100644
--- a/cocos/2d/CCParallaxNode.cpp
+++ b/cocos/2d/CCParallaxNode.cpp
@@ -91,7 +91,7 @@ void ParallaxNode::addChild(Node* /*child*/, int /*zOrder*/, int /*tag*/)
     CCASSERT(0, "ParallaxNode: use addChild:z:parallaxRatio:positionOffset instead");
 }
 
-void ParallaxNode::addChild(Node* /*child*/, int /*zOrder*/, const std::string& /*name*/)
+void ParallaxNode::addChild(Node* /*child*/, int /*zOrder*/, std::string_view /*name*/)
 {
     CCASSERT(0, "ParallaxNode: use addChild:z:parallaxRatio:positionOffset instead");
 }
diff --git a/cocos/2d/CCParallaxNode.h b/cocos/2d/CCParallaxNode.h
index 577069ec82be..409717a0e989 100644
--- a/cocos/2d/CCParallaxNode.h
+++ b/cocos/2d/CCParallaxNode.h
@@ -83,7 +83,7 @@ class CC_DLL ParallaxNode : public Node
     // Overrides
     //
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
     virtual void removeChild(Node* child, bool cleanup) override;
     virtual void removeAllChildrenWithCleanup(bool cleanup) override;
     virtual void visit(Renderer* renderer, const Mat4& parentTransform, uint32_t parentFlags) override;
diff --git a/cocos/2d/CCParticleBatchNode.cpp b/cocos/2d/CCParticleBatchNode.cpp
index e91e27c5f6b7..e9f8edabb191 100644
--- a/cocos/2d/CCParticleBatchNode.cpp
+++ b/cocos/2d/CCParticleBatchNode.cpp
@@ -108,7 +108,7 @@ ParticleBatchNode* ParticleBatchNode::createWithTexture(Texture2D* tex, int capa
  * creation with File Image
  */
 
-ParticleBatchNode* ParticleBatchNode::create(const std::string& imageFile, int capacity /* = kParticleDefaultCapacity*/)
+ParticleBatchNode* ParticleBatchNode::create(std::string_view imageFile, int capacity /* = kParticleDefaultCapacity*/)
 {
     ParticleBatchNode* p = new ParticleBatchNode();
     if (p->initWithFile(imageFile, capacity))
@@ -140,7 +140,7 @@ bool ParticleBatchNode::initWithTexture(Texture2D* tex, int capacity)
 /*
  * init with FileImage
  */
-bool ParticleBatchNode::initWithFile(const std::string& fileImage, int capacity)
+bool ParticleBatchNode::initWithFile(std::string_view fileImage, int capacity)
 {
     Texture2D* tex = _director->getTextureCache()->addImage(fileImage);
     return initWithTexture(tex, capacity);
@@ -193,7 +193,7 @@ void ParticleBatchNode::addChild(Node* aChild, int zOrder, int tag)
     addChildByTagOrName(child, zOrder, tag, "", true);
 }
 
-void ParticleBatchNode::addChild(Node* aChild, int zOrder, const std::string& name)
+void ParticleBatchNode::addChild(Node* aChild, int zOrder, std::string_view name)
 {
     CCASSERT(aChild != nullptr, "Argument must be non-nullptr");
     CCASSERT(dynamic_cast<ParticleSystem*>(aChild) != nullptr,
@@ -208,7 +208,7 @@ void ParticleBatchNode::addChild(Node* aChild, int zOrder, const std::string& na
 void ParticleBatchNode::addChildByTagOrName(ParticleSystem* child,
                                             int zOrder,
                                             int tag,
-                                            const std::string& name,
+                                            std::string_view name,
                                             bool setTag)
 {
     // If this is the 1st children, then copy blending function
@@ -251,7 +251,7 @@ void ParticleBatchNode::addChildByTagOrName(ParticleSystem* child,
 // faster
 // FIXME: or possibly using vertexZ for reordering, that would be fastest
 // this helper is almost equivalent to Node's addChild, but doesn't make use of the lazy sorting
-int ParticleBatchNode::addChildHelper(ParticleSystem* child, int z, int aTag, const std::string& name, bool setTag)
+int ParticleBatchNode::addChildHelper(ParticleSystem* child, int z, int aTag, std::string_view name, bool setTag)
 {
     CCASSERT(child != nullptr, "Argument must be non-nil");
     CCASSERT(child->getParent() == nullptr, "child already added. It can't be added again");
diff --git a/cocos/2d/CCParticleBatchNode.h b/cocos/2d/CCParticleBatchNode.h
index 442416209d80..6ad5991e53dd 100644
--- a/cocos/2d/CCParticleBatchNode.h
+++ b/cocos/2d/CCParticleBatchNode.h
@@ -87,7 +87,7 @@ class CC_DLL ParticleBatchNode : public Node, public TextureProtocol
      * @param capacity A capacity of particles.
      * @return An autoreleased ParticleBatchNode object.
      */
-    static ParticleBatchNode* create(const std::string& fileImage, int capacity = kParticleDefaultCapacity);
+    static ParticleBatchNode* create(std::string_view fileImage, int capacity = kParticleDefaultCapacity);
 
     /** Inserts a child into the ParticleBatchNode.
      *
@@ -127,7 +127,7 @@ class CC_DLL ParticleBatchNode : public Node, public TextureProtocol
 
     using Node::addChild;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
     virtual void removeChild(Node* child, bool cleanup) override;
     virtual void reorderChild(Node* child, int zOrder) override;
     virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
@@ -163,15 +163,15 @@ class CC_DLL ParticleBatchNode : public Node, public TextureProtocol
 
     /** initializes the particle system with the name of a file on disk (for a list of supported formats look at the
      * Texture2D class), a capacity of particles */
-    bool initWithFile(const std::string& fileImage, int capacity);
+    bool initWithFile(std::string_view fileImage, int capacity);
 
 private:
     void updateAllAtlasIndexes();
     void increaseAtlasCapacityTo(ssize_t quantity);
     int searchNewPositionInChildrenForZ(int z);
     void getCurrentIndex(int* oldIndex, int* newIndex, Node* child, int z);
-    int addChildHelper(ParticleSystem* child, int z, int aTag, const std::string& name, bool setTag);
-    void addChildByTagOrName(ParticleSystem* child, int z, int tag, const std::string& name, bool setTag);
+    int addChildHelper(ParticleSystem* child, int z, int aTag, std::string_view name, bool setTag);
+    void addChildByTagOrName(ParticleSystem* child, int z, int tag, std::string_view name, bool setTag);
     void updateBlendFunc();
 
     void updateProgramStateTexture();
diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp
index 8a40ac94f177..b2820844ed07 100644
--- a/cocos/2d/CCParticleSystem.cpp
+++ b/cocos/2d/CCParticleSystem.cpp
@@ -191,11 +191,6 @@ void ParticleData::release()
 Vector<ParticleSystem*> ParticleSystem::__allInstances;
 float ParticleSystem::__totalParticleCountFactor = 1.0f;
 
-inline static const cocos2d::Value& optValue(const ValueMap& dictionary, const std::string& key)
-{
-    return dictionary.find(key) != dictionary.cend() ? dictionary.at(key) : cocos2d::Value::Null;
-}
-
 ParticleSystem::ParticleSystem()
     : _isBlendAdditive(false)
     , _isAutoRemoveOnFinish(false)
@@ -250,7 +245,7 @@ ParticleSystem::ParticleSystem()
 }
 // implementation ParticleSystem
 
-ParticleSystem* ParticleSystem::create(const std::string& plistFile)
+ParticleSystem* ParticleSystem::create(std::string_view plistFile)
 {
     ParticleSystem* ret = new ParticleSystem();
     if (ret->initWithFile(plistFile))
@@ -290,7 +285,7 @@ bool ParticleSystem::init()
     return initWithTotalParticles(150);
 }
 
-bool ParticleSystem::initWithFile(const std::string& plistFile)
+bool ParticleSystem::initWithFile(std::string_view plistFile)
 {
     bool ret      = false;
     _plistFile    = FileUtils::getInstance()->fullPathForFilename(plistFile);
@@ -299,7 +294,7 @@ bool ParticleSystem::initWithFile(const std::string& plistFile)
     CCASSERT(!dict.empty(), "Particles: file not found");
 
     // FIXME: compute path from a path, should define a function somewhere to do it
-    string listFilePath = plistFile;
+    auto listFilePath = plistFile;
     if (listFilePath.find('/') != string::npos)
     {
         listFilePath = listFilePath.substr(0, listFilePath.rfind('/') + 1);
@@ -318,7 +313,7 @@ bool ParticleSystem::initWithDictionary(const ValueMap& dictionary)
     return initWithDictionary(dictionary, "");
 }
 
-bool ParticleSystem::initWithDictionary(const ValueMap& dictionary, const std::string& dirname)
+bool ParticleSystem::initWithDictionary(const ValueMap& dictionary, std::string_view dirname)
 {
     bool ret              = false;
     unsigned char* buffer = nullptr;
@@ -487,12 +482,12 @@ bool ParticleSystem::initWithDictionary(const ValueMap& dictionary, const std::s
                     if (!dirname.empty() && textureDir != dirname)
                     {
                         textureName = textureName.substr(rPos + 1);
-                        textureName = dirname + textureName;
+                        textureName.insert(0, dirname);  // textureName = dirname + textureName;
                     }
                 }
                 else if (!dirname.empty() && !textureName.empty())
                 {
-                    textureName = dirname + textureName;
+                    textureName.insert(0, dirname);  // textureName = dirname + textureName;
                 }
 
                 Texture2D* tex = nullptr;
diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h
index 558cf8711192..6e9dcff08c7d 100644
--- a/cocos/2d/CCParticleSystem.h
+++ b/cocos/2d/CCParticleSystem.h
@@ -237,7 +237,7 @@ class CC_DLL ParticleSystem : public Node, public TextureProtocol, public Playab
      * @param plistFile Particle plist file name.
      * @return An autoreleased ParticleSystem object.
      */
-    static ParticleSystem* create(const std::string& plistFile);
+    static ParticleSystem* create(std::string_view plistFile);
 
     /** Create a system with a fixed number of particles.
      *
@@ -761,7 +761,7 @@ class CC_DLL ParticleSystem : public Node, public TextureProtocol, public Playab
      */
     virtual const BlendFunc& getBlendFunc() const override;
 
-    const std::string& getResourceFile() const { return _plistFile; }
+    std::string_view getResourceFile() const { return _plistFile; }
 
     /// @{
     /// @name implement Playable Protocol
@@ -793,7 +793,7 @@ class CC_DLL ParticleSystem : public Node, public TextureProtocol, public Playab
      http://particledesigner.71squared.com/
      @since v0.99.3
      */
-    bool initWithFile(const std::string& plistFile);
+    bool initWithFile(std::string_view plistFile);
 
     /** initializes a QuadParticleSystem from a Dictionary.
      @since v0.99.3
@@ -803,7 +803,7 @@ class CC_DLL ParticleSystem : public Node, public TextureProtocol, public Playab
     /** initializes a particle system from a NSDictionary and the path from where to load the png
      @since v2.1
      */
-    bool initWithDictionary(const ValueMap& dictionary, const std::string& dirname);
+    bool initWithDictionary(const ValueMap& dictionary, std::string_view dirname);
 
     //! Initializes a system with a fixed number of particles
     virtual bool initWithTotalParticles(int numberOfParticles);
diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp
index 17e1b7de46ee..0c87d08083eb 100644
--- a/cocos/2d/CCParticleSystemQuad.cpp
+++ b/cocos/2d/CCParticleSystemQuad.cpp
@@ -91,7 +91,7 @@ ParticleSystemQuad::~ParticleSystemQuad()
 
 // implementation ParticleSystemQuad
 
-ParticleSystemQuad* ParticleSystemQuad::create(const std::string& filename)
+ParticleSystemQuad* ParticleSystemQuad::create(std::string_view filename)
 {
     ParticleSystemQuad* ret = new ParticleSystemQuad();
     if (ret->initWithFile(filename))
diff --git a/cocos/2d/CCParticleSystemQuad.h b/cocos/2d/CCParticleSystemQuad.h
index 5ab121035261..65229bd27f69 100644
--- a/cocos/2d/CCParticleSystemQuad.h
+++ b/cocos/2d/CCParticleSystemQuad.h
@@ -75,7 +75,7 @@ class CC_DLL ParticleSystemQuad : public ParticleSystem
      * @param filename Particle plist file name.
      * @return An autoreleased ParticleSystemQuad object.
      */
-    static ParticleSystemQuad* create(const std::string& filename);
+    static ParticleSystemQuad* create(std::string_view filename);
     /** Creates a Particle Emitter with a dictionary.
      *
      * @param dictionary Particle dictionary.
diff --git a/cocos/2d/CCPlistSpriteSheetLoader.cpp b/cocos/2d/CCPlistSpriteSheetLoader.cpp
index 93a2a975e7ac..1406327d304a 100644
--- a/cocos/2d/CCPlistSpriteSheetLoader.cpp
+++ b/cocos/2d/CCPlistSpriteSheetLoader.cpp
@@ -18,7 +18,7 @@ using namespace std;
 
 NS_CC_BEGIN
 
-void PlistSpriteSheetLoader::load(const std::string& filePath, SpriteFrameCache& cache)
+void PlistSpriteSheetLoader::load(std::string_view filePath, SpriteFrameCache& cache)
 {
     CCASSERT(!filePath.empty(), "plist filename should not be nullptr");
 
@@ -26,7 +26,7 @@ void PlistSpriteSheetLoader::load(const std::string& filePath, SpriteFrameCache&
     if (fullPath.empty())
     {
         // return if plist file doesn't exist
-        CCLOG("cocos2d: SpriteFrameCache: can not find %s", filePath.c_str());
+        CCLOG("cocos2d: SpriteFrameCache: can not find %s", filePath.data());
         return;
     }
 
@@ -66,7 +66,7 @@ void PlistSpriteSheetLoader::load(const std::string& filePath, SpriteFrameCache&
     addSpriteFramesWithDictionary(dict, texturePath, filePath, cache);
 }
 
-void PlistSpriteSheetLoader::load(const std::string& filePath, Texture2D* texture, SpriteFrameCache& cache)
+void PlistSpriteSheetLoader::load(std::string_view filePath, Texture2D* texture, SpriteFrameCache& cache)
 {
     const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
     auto dict           = FileUtils::getInstance()->getValueMapFromFile(fullPath);
@@ -74,9 +74,7 @@ void PlistSpriteSheetLoader::load(const std::string& filePath, Texture2D* textur
     addSpriteFramesWithDictionary(dict, texture, filePath, cache);
 }
 
-void PlistSpriteSheetLoader::load(const std::string& filePath,
-                                  const std::string& textureFileName,
-                                  SpriteFrameCache& cache)
+void PlistSpriteSheetLoader::load(std::string_view filePath, std::string_view textureFileName, SpriteFrameCache& cache)
 {
     CCASSERT(!textureFileName.empty(), "texture name should not be null");
     const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
@@ -98,7 +96,7 @@ void PlistSpriteSheetLoader::load(const Data& content, Texture2D* texture, Sprit
     addSpriteFramesWithDictionary(dict, texture, "by#addSpriteFramesWithFileContent()", cache);
 }
 
-void PlistSpriteSheetLoader::reload(const std::string& filePath, SpriteFrameCache& cache)
+void PlistSpriteSheetLoader::reload(std::string_view filePath, SpriteFrameCache& cache)
 {
     const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
     auto dict           = FileUtils::getInstance()->getValueMapFromFile(fullPath);
@@ -151,7 +149,7 @@ void PlistSpriteSheetLoader::reload(const std::string& filePath, SpriteFrameCach
 
 void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
                                                            Texture2D* texture,
-                                                           const std::string& plist,
+                                                           std::string_view plist,
                                                            SpriteFrameCache& cache)
 {
     /*
@@ -178,15 +176,15 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
     Vec2 textureSize;
 
     // get the format
-    auto metaItr = dictionary.find("metadata");
+    auto metaItr = dictionary.find("metadata"sv);
     if (metaItr != dictionary.end())
     {
         auto& metadataDict = metaItr->second.asValueMap();
-        format             = metadataDict["format"].asInt();
+        format             = optValue(metadataDict, "format"sv).asInt();
 
-        if (metadataDict.find("size") != metadataDict.end())
+        if (metadataDict.find("size"sv) != metadataDict.end())
         {
-            textureSize = SizeFromString(metadataDict["size"].asString());
+            textureSize = SizeFromString(optValue(metadataDict, "size"sv).asString());
         }
     }
 
@@ -210,14 +208,14 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
 
         if (format == 0)
         {
-            auto x  = frameDict["x"].asFloat();
-            auto y  = frameDict["y"].asFloat();
-            auto w  = frameDict["width"].asFloat();
-            auto h  = frameDict["height"].asFloat();
-            auto ox = frameDict["offsetX"].asFloat();
-            auto oy = frameDict["offsetY"].asFloat();
-            auto ow = frameDict["originalWidth"].asInt();
-            auto oh = frameDict["originalHeight"].asInt();
+            auto x  = optValue(frameDict, "x"sv).asFloat();
+            auto y  = optValue(frameDict, "y"sv).asFloat();
+            auto w  = optValue(frameDict, "width"sv).asFloat();
+            auto h  = optValue(frameDict, "height"sv).asFloat();
+            auto ox = optValue(frameDict, "offsetX"sv).asFloat();
+            auto oy = optValue(frameDict, "offsetY"sv).asFloat();
+            auto ow = optValue(frameDict, "originalWidth"sv).asInt();
+            auto oh = optValue(frameDict, "originalHeight"sv).asInt();
             // check ow/oh
             if (!ow || !oh)
             {
@@ -234,17 +232,17 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
         }
         else if (format == 1 || format == 2)
         {
-            auto frame   = RectFromString(frameDict["frame"].asString());
+            auto frame   = RectFromString(optValue(frameDict, "frame"sv).asString());
             auto rotated = false;
 
             // rotation
             if (format == 2)
             {
-                rotated = frameDict["rotated"].asBool();
+                rotated = optValue(frameDict, "rotated"sv).asBool();
             }
 
-            auto offset     = PointFromString(frameDict["offset"].asString());
-            auto sourceSize = SizeFromString(frameDict["sourceSize"].asString());
+            auto offset     = PointFromString(optValue(frameDict, "offset"sv).asString());
+            auto sourceSize = SizeFromString(optValue(frameDict, "sourceSize"sv).asString());
 
             // create frame
             spriteFrame = SpriteFrame::createWithTexture(texture, frame, rotated, offset, sourceSize);
@@ -252,14 +250,14 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
         else if (format == 3)
         {
             // get values
-            auto spriteSize       = SizeFromString(frameDict["spriteSize"].asString());
-            auto spriteOffset     = PointFromString(frameDict["spriteOffset"].asString());
-            auto spriteSourceSize = SizeFromString(frameDict["spriteSourceSize"].asString());
-            auto textureRect      = RectFromString(frameDict["textureRect"].asString());
-            auto textureRotated   = frameDict["textureRotated"].asBool();
+            auto spriteSize       = SizeFromString(optValue(frameDict, "spriteSize"sv).asString());
+            auto spriteOffset     = PointFromString(optValue(frameDict, "spriteOffset"sv).asString());
+            auto spriteSourceSize = SizeFromString(optValue(frameDict, "spriteSourceSize"sv).asString());
+            auto textureRect      = RectFromString(optValue(frameDict, "textureRect"sv).asString());
+            auto textureRotated   = optValue(frameDict, "textureRotated"sv).asBool();
 
             // get aliases
-            auto& aliases = frameDict["aliases"].asValueVector();
+            auto& aliases = optValue(frameDict, "aliases"sv).asValueVector();
 
             for (const auto& value : aliases)
             {
@@ -282,9 +280,9 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
             if (frameDict.find("vertices") != frameDict.end())
             {
                 using cocos2d::utils::parseIntegerList;
-                auto vertices   = parseIntegerList(frameDict["vertices"].asString());
-                auto verticesUV = parseIntegerList(frameDict["verticesUV"].asString());
-                auto indices    = parseIntegerList(frameDict["triangles"].asString());
+                auto vertices   = parseIntegerList(optValue(frameDict, "vertices"sv).asString());
+                auto verticesUV = parseIntegerList(optValue(frameDict, "verticesUV"sv).asString());
+                auto indices    = parseIntegerList(optValue(frameDict, "triangles"sv).asString());
 
                 PolygonInfo info;
                 initializePolygonInfo(textureSize, spriteSourceSize, vertices, verticesUV, indices, info);
@@ -292,7 +290,7 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
             }
             if (frameDict.find("anchor") != frameDict.end())
             {
-                spriteFrame->setAnchorPoint(PointFromString(frameDict["anchor"].asString()));
+                spriteFrame->setAnchorPoint(PointFromString(optValue(frameDict, "anchor"sv).asString()));
             }
         }
 
@@ -323,8 +321,8 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
 }
 
 void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dict,
-                                                           const std::string& texturePath,
-                                                           const std::string& plist,
+                                                           std::string_view texturePath,
+                                                           std::string_view plist,
                                                            SpriteFrameCache& cache)
 {
     std::string pixelFormatName;
@@ -378,7 +376,7 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dict,
 
 void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
                                                               Texture2D* texture,
-                                                              const std::string& plist,
+                                                              std::string_view plist,
                                                               SpriteFrameCache& cache)
 {
     auto& framesDict = dict["frames"].asValueMap();
@@ -401,8 +399,8 @@ void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
 
     for (auto& iter : framesDict)
     {
-        ValueMap& frameDict         = iter.second.asValueMap();
-        std::string spriteFrameName = iter.first;
+        const ValueMap& frameDict        = iter.second.asValueMap();
+        std::string_view spriteFrameName = iter.first;
 
         cache.eraseFrame(spriteFrameName);
 
@@ -411,14 +409,14 @@ void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
 
         if (format == 0)
         {
-            const auto x  = frameDict["x"].asFloat();
-            const auto y  = frameDict["y"].asFloat();
-            const auto w  = frameDict["width"].asFloat();
-            const auto h  = frameDict["height"].asFloat();
-            const auto ox = frameDict["offsetX"].asFloat();
-            const auto oy = frameDict["offsetY"].asFloat();
-            auto ow       = frameDict["originalWidth"].asInt();
-            auto oh       = frameDict["originalHeight"].asInt();
+            const auto x  = optValue(frameDict, "x"sv).asFloat();
+            const auto y  = optValue(frameDict, "y"sv).asFloat();
+            const auto w  = optValue(frameDict, "width"sv).asFloat();
+            const auto h  = optValue(frameDict, "height"sv).asFloat();
+            const auto ox = optValue(frameDict, "offsetX"sv).asFloat();
+            const auto oy = optValue(frameDict, "offsetY"sv).asFloat();
+            auto ow       = optValue(frameDict, "originalWidth"sv).asInt();
+            auto oh       = optValue(frameDict, "originalHeight"sv).asInt();
             // check ow/oh
             if (!ow || !oh)
             {
@@ -435,17 +433,17 @@ void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
         }
         else if (format == 1 || format == 2)
         {
-            auto frame   = RectFromString(frameDict["frame"].asString());
+            auto frame   = RectFromString(optValue(frameDict, "frame"sv).asString());
             auto rotated = false;
 
             // rotation
             if (format == 2)
             {
-                rotated = frameDict["rotated"].asBool();
+                rotated = optValue(frameDict, "rotated"sv).asBool();
             }
 
-            auto offset     = PointFromString(frameDict["offset"].asString());
-            auto sourceSize = SizeFromString(frameDict["sourceSize"].asString());
+            auto offset     = PointFromString(optValue(frameDict, "offset"sv).asString());
+            auto sourceSize = SizeFromString(optValue(frameDict, "sourceSize"sv).asString());
 
             // create frame
             spriteFrame = SpriteFrame::createWithTexture(texture, frame, rotated, offset, sourceSize);
@@ -453,14 +451,14 @@ void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
         else if (format == 3)
         {
             // get values
-            const auto spriteSize     = SizeFromString(frameDict["spriteSize"].asString());
-            auto spriteOffset         = PointFromString(frameDict["spriteOffset"].asString());
-            auto spriteSourceSize     = SizeFromString(frameDict["spriteSourceSize"].asString());
-            const auto textureRect    = RectFromString(frameDict["textureRect"].asString());
-            const auto textureRotated = frameDict["textureRotated"].asBool();
+            const auto spriteSize     = SizeFromString(optValue(frameDict, "spriteSize"sv).asString());
+            auto spriteOffset         = PointFromString(optValue(frameDict, "spriteOffset"sv).asString());
+            auto spriteSourceSize     = SizeFromString(optValue(frameDict, "spriteSourceSize"sv).asString());
+            const auto textureRect    = RectFromString(optValue(frameDict, "textureRect"sv).asString());
+            const auto textureRotated = optValue(frameDict, "textureRotated"sv).asBool();
 
             // get aliases
-            ValueVector& aliases = frameDict["aliases"].asValueVector();
+            const ValueVector& aliases = optValue(frameDict, "aliases"sv).asValueVector();
 
             for (const auto& value : aliases)
             {
diff --git a/cocos/2d/CCPlistSpriteSheetLoader.h b/cocos/2d/CCPlistSpriteSheetLoader.h
index 79aa405400a4..6f36caad0b32 100644
--- a/cocos/2d/CCPlistSpriteSheetLoader.h
+++ b/cocos/2d/CCPlistSpriteSheetLoader.h
@@ -14,30 +14,30 @@ class PlistSpriteSheetLoader : public SpriteSheetLoader
     static constexpr uint32_t FORMAT = SpriteSheetFormat::PLIST;
 
     uint32_t getFormat() override { return FORMAT; }
-    void load(const std::string& filePath, SpriteFrameCache& cache) override;
-    void load(const std::string& filePath, Texture2D* texture, SpriteFrameCache& cache) override;
-    void load(const std::string& filePath, const std::string& textureFileName, SpriteFrameCache& cache) override;
+    void load(std::string_view filePath, SpriteFrameCache& cache) override;
+    void load(std::string_view filePath, Texture2D* texture, SpriteFrameCache& cache) override;
+    void load(std::string_view filePath, std::string_view textureFileName, SpriteFrameCache& cache) override;
     void load(const Data& content, Texture2D* texture, SpriteFrameCache& cache) override;
-    void reload(const std::string& filePath, SpriteFrameCache& cache) override;
+    void reload(std::string_view filePath, SpriteFrameCache& cache) override;
 
 protected:
     /*Adds multiple Sprite Frames with a dictionary. The texture will be associated with the created sprite frames.
      */
     void addSpriteFramesWithDictionary(ValueMap& dictionary,
                                        Texture2D* texture,
-                                       const std::string& plist,
+                                       std::string_view plist,
                                        SpriteFrameCache& cache);
 
     /*Adds multiple Sprite Frames with a dictionary. The texture will be associated with the created sprite frames.
      */
     void addSpriteFramesWithDictionary(ValueMap& dict,
-                                       const std::string& texturePath,
-                                       const std::string& plist,
+                                       std::string_view texturePath,
+                                       std::string_view plist,
                                        SpriteFrameCache& cache);
 
     void reloadSpriteFramesWithDictionary(ValueMap& dict,
                                           Texture2D* texture,
-                                          const std::string& plist,
+                                          std::string_view plist,
                                           SpriteFrameCache& cache);
 };
 
diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp
index 067237e12e46..7525359dbf84 100644
--- a/cocos/2d/CCRenderTexture.cpp
+++ b/cocos/2d/CCRenderTexture.cpp
@@ -357,9 +357,7 @@ void RenderTexture::visit(Renderer* renderer, const Mat4& parentTransform, uint3
     // setOrderOfArrival(0);
 }
 
-bool RenderTexture::saveToFileAsNonPMA(const std::string& filename,
-                                       bool isRGBA,
-                                       std::function<void(RenderTexture*, const std::string&)> callback)
+bool RenderTexture::saveToFileAsNonPMA(std::string_view filename, bool isRGBA, SaveFileCallbackType callback)
 {
     std::string basename(filename);
     std::transform(basename.begin(), basename.end(), basename.begin(), ::tolower);
@@ -382,9 +380,7 @@ bool RenderTexture::saveToFileAsNonPMA(const std::string& filename,
     return saveToFileAsNonPMA(filename, Image::Format::JPG, false, callback);
 }
 
-bool RenderTexture::saveToFile(const std::string& filename,
-                               bool isRGBA,
-                               std::function<void(RenderTexture*, const std::string&)> callback)
+bool RenderTexture::saveToFile(std::string_view filename, bool isRGBA, SaveFileCallbackType callback)
 {
     std::string basename(filename);
     std::transform(basename.begin(), basename.end(), basename.begin(), ::tolower);
@@ -407,10 +403,10 @@ bool RenderTexture::saveToFile(const std::string& filename,
     return saveToFile(filename, Image::Format::JPG, false, callback);
 }
 
-bool RenderTexture::saveToFileAsNonPMA(const std::string& fileName,
+bool RenderTexture::saveToFileAsNonPMA(std::string_view fileName,
                                        Image::Format format,
                                        bool isRGBA,
-                                       std::function<void(RenderTexture*, const std::string&)> callback)
+                                       SaveFileCallbackType callback)
 {
     CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG,
              "the image can only be saved as JPG or PNG format");
@@ -419,7 +415,7 @@ bool RenderTexture::saveToFileAsNonPMA(const std::string& fileName,
 
     _saveFileCallback = callback;
 
-    std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName;
+    std::string fullpath = FileUtils::getInstance()->getWritablePath().append(fileName);
     _saveToFileCommand.init(_globalZOrder);
     _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile, this, fullpath, isRGBA, true);
 
@@ -427,10 +423,10 @@ bool RenderTexture::saveToFileAsNonPMA(const std::string& fileName,
     return true;
 }
 
-bool RenderTexture::saveToFile(const std::string& fileName,
+bool RenderTexture::saveToFile(std::string_view fileName,
                                Image::Format format,
                                bool isRGBA,
-                               std::function<void(RenderTexture*, const std::string&)> callback)
+                               std::function<void(RenderTexture*, std::string_view)> callback)
 {
     CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG,
              "the image can only be saved as JPG or PNG format");
@@ -439,7 +435,7 @@ bool RenderTexture::saveToFile(const std::string& fileName,
 
     _saveFileCallback = callback;
 
-    std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName;
+    std::string fullpath = FileUtils::getInstance()->getWritablePath().append(fileName);
     _saveToFileCommand.init(_globalZOrder);
     _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile, this, fullpath, isRGBA, false);
 
@@ -447,7 +443,7 @@ bool RenderTexture::saveToFile(const std::string& fileName,
     return true;
 }
 
-void RenderTexture::onSaveToFile(const std::string& filename, bool isRGBA, bool forceNonPMA)
+void RenderTexture::onSaveToFile(std::string_view filename, bool isRGBA, bool forceNonPMA)
 {
     auto callbackFunc = [&, filename, isRGBA, forceNonPMA](RefPtr<Image> image) {
         if (image)
diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h
index 0fdfb5f5434a..b43e9c380bc9 100644
--- a/cocos/2d/CCRenderTexture.h
+++ b/cocos/2d/CCRenderTexture.h
@@ -61,6 +61,7 @@ class EventCustom;
 class CC_DLL RenderTexture : public Node
 {
 public:
+    using SaveFileCallbackType = std::function<void(RenderTexture*, std::string_view)>;
     /** Initializes a RenderTexture object with width and height in Points and a pixel format( only RGB and RGBA formats
      * are valid ) and depthStencil format.
      *
@@ -171,9 +172,7 @@ class CC_DLL RenderTexture : public Node
      * @param callback When the file is save finished,it will callback this function.
      * @return Returns true if the operation is successful.
      */
-    bool saveToFileAsNonPMA(const std::string& filename,
-                            bool isRGBA                                                      = true,
-                            std::function<void(RenderTexture*, const std::string&)> callback = nullptr);
+    bool saveToFileAsNonPMA(std::string_view filename, bool isRGBA = true, SaveFileCallbackType = nullptr);
 
     /** Saves the texture into a file using JPEG format. The file will be saved in the Documents folder.
      * Returns true if the operation is successful.
@@ -183,9 +182,7 @@ class CC_DLL RenderTexture : public Node
      * @param callback When the file is save finished,it will callback this function.
      * @return Returns true if the operation is successful.
      */
-    bool saveToFile(const std::string& filename,
-                    bool isRGBA                                                      = true,
-                    std::function<void(RenderTexture*, const std::string&)> callback = nullptr);
+    bool saveToFile(std::string_view filename, bool isRGBA = true, SaveFileCallbackType = nullptr);
 
     /** saves the texture into a file in non-PMA. The format could be JPG or PNG. The file will be saved in the
       Documents folder. Returns true if the operation is successful.
@@ -201,10 +198,10 @@ class CC_DLL RenderTexture : public Node
       * @param callback When the file is save finished,it will callback this function.
       * @return Returns true if the operation is successful.
       */
-    bool saveToFileAsNonPMA(const std::string& fileName,
+    bool saveToFileAsNonPMA(std::string_view fileName,
                             Image::Format format,
                             bool isRGBA,
-                            std::function<void(RenderTexture*, const std::string&)> callback);
+                            SaveFileCallbackType callback);
 
     /** saves the texture into a file. The format could be JPG or PNG. The file will be saved in the Documents folder.
         Returns true if the operation is successful.
@@ -220,10 +217,10 @@ class CC_DLL RenderTexture : public Node
      * @param callback When the file is save finished,it will callback this function.
      * @return Returns true if the operation is successful.
      */
-    bool saveToFile(const std::string& filename,
+    bool saveToFile(std::string_view filename,
                     Image::Format format,
-                    bool isRGBA                                                      = true,
-                    std::function<void(RenderTexture*, const std::string&)> callback = nullptr);
+                    bool isRGBA                   = true,
+                    SaveFileCallbackType callback = nullptr);
 
     /** Listen "come to background" message, and save render texture.
      * It only has effect on Android.
@@ -367,7 +364,7 @@ class CC_DLL RenderTexture : public Node
     void onEnd();
     void clearColorAttachment();
 
-    void onSaveToFile(const std::string& fileName, bool isRGBA = true, bool forceNonPMA = false);
+    void onSaveToFile(std::string_view fileName, bool isRGBA = true, bool forceNonPMA = false);
 
     bool _keepMatrix = false;
     Rect _rtTextureRect;
@@ -411,7 +408,7 @@ class CC_DLL RenderTexture : public Node
      and the command and callback will be executed twice.
     */
     CallbackCommand _saveToFileCommand;
-    std::function<void(RenderTexture*, const std::string&)> _saveFileCallback = nullptr;
+    std::function<void(RenderTexture*, std::string_view)> _saveFileCallback = nullptr;
 
     Mat4 _oldTransMatrix, _oldProjMatrix;
     Mat4 _transformMatrix, _projectionMatrix;
diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h
index 96890c12dfc6..2eed035aecb3 100644
--- a/cocos/2d/CCScene.h
+++ b/cocos/2d/CCScene.h
@@ -142,7 +142,7 @@ class CC_DLL Scene : public Node
     std::vector<Camera*> _cameras;     // weak ref to Camera
     Camera* _defaultCamera = nullptr;  // weak ref, default camera created by scene, _cameras[0], Caution that the
                                        // default camera can not be added to _cameras before onEnter is called
-    bool _cameraOrderDirty = true;  // order is dirty, need sort
+    bool _cameraOrderDirty = true;     // order is dirty, need sort
     EventListenerCustom* _event;
 
     std::vector<BaseLight*> _lights;
diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp
index f5e87fcd73b9..2a97c4f2474e 100644
--- a/cocos/2d/CCSprite.cpp
+++ b/cocos/2d/CCSprite.cpp
@@ -72,7 +72,7 @@ Sprite* Sprite::createWithTexture(Texture2D* texture, const Rect& rect, bool rot
     return nullptr;
 }
 
-Sprite* Sprite::create(const std::string& filename)
+Sprite* Sprite::create(std::string_view filename)
 {
     Sprite* sprite = new Sprite();
     if (sprite->initWithFile(filename))
@@ -96,7 +96,7 @@ Sprite* Sprite::create(const PolygonInfo& info)
     return nullptr;
 }
 
-Sprite* Sprite::create(const std::string& filename, const Rect& rect)
+Sprite* Sprite::create(std::string_view filename, const Rect& rect)
 {
     Sprite* sprite = new Sprite();
     if (sprite->initWithFile(filename, rect))
@@ -120,13 +120,13 @@ Sprite* Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame)
     return nullptr;
 }
 
-Sprite* Sprite::createWithSpriteFrameName(const std::string& spriteFrameName)
+Sprite* Sprite::createWithSpriteFrameName(std::string_view spriteFrameName)
 {
     SpriteFrame* frame = SpriteFrameCache::getInstance()->getSpriteFrameByName(spriteFrameName);
 
 #if COCOS2D_DEBUG > 0
     char msg[256] = {0};
-    sprintf(msg, "Invalid spriteFrameName: %s", spriteFrameName.c_str());
+    sprintf(msg, "Invalid spriteFrameName: %s", spriteFrameName.data());
     CCASSERT(frame != nullptr, msg);
 #endif
 
@@ -167,7 +167,7 @@ bool Sprite::initWithTexture(Texture2D* texture, const Rect& rect)
     return initWithTexture(texture, rect, false);
 }
 
-bool Sprite::initWithFile(const std::string& filename)
+bool Sprite::initWithFile(std::string_view filename)
 {
     if (filename.empty())
     {
@@ -191,7 +191,7 @@ bool Sprite::initWithFile(const std::string& filename)
     return false;
 }
 
-bool Sprite::initWithFile(const std::string& filename, const Rect& rect)
+bool Sprite::initWithFile(std::string_view filename, const Rect& rect)
 {
     CCASSERT(!filename.empty(), "Invalid filename");
     if (filename.empty())
@@ -209,7 +209,7 @@ bool Sprite::initWithFile(const std::string& filename, const Rect& rect)
     return false;
 }
 
-bool Sprite::initWithSpriteFrameName(const std::string& spriteFrameName)
+bool Sprite::initWithSpriteFrameName(std::string_view spriteFrameName)
 {
     CCASSERT(!spriteFrameName.empty(), "Invalid spriteFrameName");
     if (spriteFrameName.empty())
@@ -332,7 +332,7 @@ static unsigned char cc_2x2_white_image[] = {
 #define CC_2x2_WHITE_IMAGE_KEY "/cc_2x2_white_image"
 
 // MARK: texture
-void Sprite::setTexture(const std::string& filename)
+void Sprite::setTexture(std::string_view filename)
 {
     Texture2D* texture = _director->getTextureCache()->addImage(filename);
     setTexture(texture);
@@ -1132,7 +1132,7 @@ void Sprite::addChild(Node* child, int zOrder, int tag)
     Node::addChild(child, zOrder, tag);
 }
 
-void Sprite::addChild(Node* child, int zOrder, const std::string& name)
+void Sprite::addChild(Node* child, int zOrder, std::string_view name)
 {
     CCASSERT(child != nullptr, "Argument must be non-nullptr");
     if (child == nullptr)
@@ -1539,7 +1539,7 @@ bool Sprite::isOpacityModifyRGB() const
 
 // MARK: Frames
 
-void Sprite::setSpriteFrame(const std::string& spriteFrameName)
+void Sprite::setSpriteFrame(std::string_view spriteFrameName)
 {
     CCASSERT(!spriteFrameName.empty(), "spriteFrameName must not be empty");
     if (spriteFrameName.empty())
@@ -1590,7 +1590,7 @@ void Sprite::setSpriteFrame(SpriteFrame* spriteFrame)
         setCenterRect(spriteFrame->getCenterRect());
 }
 
-void Sprite::setDisplayFrameWithAnimationName(const std::string& animationName, unsigned int frameIndex)
+void Sprite::setDisplayFrameWithAnimationName(std::string_view animationName, unsigned int frameIndex)
 {
     CCASSERT(!animationName.empty(), "CCSprite#setDisplayFrameWithAnimationName. animationName must not be nullptr");
     if (animationName.empty())
diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h
index e81f18064e31..d993a6fef2ed 100644
--- a/cocos/2d/CCSprite.h
+++ b/cocos/2d/CCSprite.h
@@ -129,7 +129,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @param   filename A path to image file, e.g., "scene1/monster.png".
      * @return  An autoreleased sprite object.
      */
-    static Sprite* create(const std::string& filename);
+    static Sprite* create(std::string_view filename);
 
     /**
      * Creates a polygon sprite with a polygon info.
@@ -149,7 +149,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @param   rect     A subrect of the image file.
      * @return  An autoreleased sprite object.
      */
-    static Sprite* create(const std::string& filename, const Rect& rect);
+    static Sprite* create(std::string_view filename, const Rect& rect);
 
     /**
      * Creates a sprite with a Texture2D object.
@@ -191,7 +191,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @param   spriteFrameName The name of sprite frame.
      * @return  An autoreleased sprite object.
      */
-    static Sprite* createWithSpriteFrameName(const std::string& spriteFrameName);
+    static Sprite* createWithSpriteFrameName(std::string_view spriteFrameName);
 
     //  end of creators group
     /// @}
@@ -233,7 +233,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      *  @memberof Sprite
      *  It will call `setTextureRect()` with the texture's content size.
      */
-    virtual void setTexture(const std::string& filename);
+    virtual void setTexture(std::string_view filename);
 
     /** @overload
      *
@@ -304,7 +304,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
     /** @{
      * Sets a new SpriteFrame to the Sprite.
      */
-    virtual void setSpriteFrame(const std::string& spriteFrameName);
+    virtual void setSpriteFrame(std::string_view spriteFrameName);
     virtual void setSpriteFrame(SpriteFrame* newFrame);
     /** @} */
 
@@ -326,7 +326,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * Changes the display frame with animation name and index.
      * The animation name will be get from the AnimationCache.
      */
-    virtual void setDisplayFrameWithAnimationName(const std::string& animationName, unsigned int frameIndex);
+    virtual void setDisplayFrameWithAnimationName(std::string_view animationName, unsigned int frameIndex);
     /// @}
 
     /// @{
@@ -370,7 +370,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
     virtual void reorderChild(Node* child, int zOrder) override;
     using Node::addChild;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
     virtual void sortAllChildren() override;
     virtual void setScale(float scale) override;
     virtual void setPositionZ(float positionZ) override;
@@ -513,7 +513,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
     /// @}
 
     int getResourceType() const { return _fileType; }
-    const std::string& getResourceName() const { return _fileName; }
+    std::string_view getResourceName() const { return _fileName; }
 
     CC_CONSTRUCTOR_ACCESS :
         /**
@@ -588,7 +588,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @param   spriteFrameName  A key string that can fetched a valid SpriteFrame from SpriteFrameCache.
      * @return  True if the sprite is initialized properly, false otherwise.
      */
-    virtual bool initWithSpriteFrameName(const std::string& spriteFrameName);
+    virtual bool initWithSpriteFrameName(std::string_view spriteFrameName);
 
     /**
      * Initializes a sprite with an image filename.
@@ -601,7 +601,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @return  True if the sprite is initialized properly, false otherwise.
      * @lua     init
      */
-    virtual bool initWithFile(const std::string& filename);
+    virtual bool initWithFile(std::string_view filename);
 
     /**
      * Initializes a sprite with an image filename, and a rect.
@@ -615,7 +615,7 @@ class CC_DLL Sprite : public Node, public TextureProtocol
      * @return  True if the sprite is initialized properly, false otherwise.
      * @lua     init
      */
-    virtual bool initWithFile(const std::string& filename, const Rect& rect);
+    virtual bool initWithFile(std::string_view filename, const Rect& rect);
 
     virtual void setVertexLayout();
 
diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp
index c2c809c51826..4888ac8b5f50 100644
--- a/cocos/2d/CCSpriteBatchNode.cpp
+++ b/cocos/2d/CCSpriteBatchNode.cpp
@@ -64,7 +64,7 @@ SpriteBatchNode* SpriteBatchNode::createWithTexture(Texture2D* tex, ssize_t capa
  * creation with File Image
  */
 
-SpriteBatchNode* SpriteBatchNode::create(const std::string& fileImage, ssize_t capacity /* = DEFAULT_CAPACITY*/)
+SpriteBatchNode* SpriteBatchNode::create(std::string_view fileImage, ssize_t capacity /* = DEFAULT_CAPACITY*/)
 {
     SpriteBatchNode* batchNode = new SpriteBatchNode();
     if (batchNode->initWithFile(fileImage, capacity))
@@ -168,7 +168,7 @@ bool SpriteBatchNode::init()
 /*
  * init with FileImage
  */
-bool SpriteBatchNode::initWithFile(const std::string& fileImage, ssize_t capacity /* = DEFAULT_CAPACITY*/)
+bool SpriteBatchNode::initWithFile(std::string_view fileImage, ssize_t capacity /* = DEFAULT_CAPACITY*/)
 {
     Texture2D* texture2D = _director->getTextureCache()->addImage(fileImage);
     return initWithTexture(texture2D, capacity);
@@ -236,7 +236,7 @@ void SpriteBatchNode::addChild(Node* child, int zOrder, int tag)
     appendChild(sprite);
 }
 
-void SpriteBatchNode::addChild(Node* child, int zOrder, const std::string& name)
+void SpriteBatchNode::addChild(Node* child, int zOrder, std::string_view name)
 {
     CCASSERT(child != nullptr, "child should not be null");
     CCASSERT(dynamic_cast<Sprite*>(child) != nullptr, "CCSpriteBatchNode only supports Sprites as children");
diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h
index 3d99cdfa52b5..cb68aed0f4c0 100644
--- a/cocos/2d/CCSpriteBatchNode.h
+++ b/cocos/2d/CCSpriteBatchNode.h
@@ -84,7 +84,7 @@ class CC_DLL SpriteBatchNode : public Node, public TextureProtocol
      * @param capacity The capacity of children.
      * @return Return an autorelease object.
      */
-    static SpriteBatchNode* create(const std::string& fileImage, ssize_t capacity = DEFAULT_CAPACITY);
+    static SpriteBatchNode* create(std::string_view fileImage, ssize_t capacity = DEFAULT_CAPACITY);
 
     /** Returns the TextureAtlas object.
      *
@@ -195,7 +195,7 @@ class CC_DLL SpriteBatchNode : public Node, public TextureProtocol
 
     using Node::addChild;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
     virtual void reorderChild(Node* child, int zOrder) override;
 
     virtual void removeChild(Node* child, bool cleanup) override;
@@ -250,7 +250,7 @@ class CC_DLL SpriteBatchNode : public Node, public TextureProtocol
      * @js init
      * @lua init
      */
-    bool initWithFile(const std::string& fileImage, ssize_t capacity = DEFAULT_CAPACITY);
+    bool initWithFile(std::string_view fileImage, ssize_t capacity = DEFAULT_CAPACITY);
     bool init() override;
 
 protected:
diff --git a/cocos/2d/CCSpriteFrame.cpp b/cocos/2d/CCSpriteFrame.cpp
index 7fa67690200a..6ef46c7e67d1 100644
--- a/cocos/2d/CCSpriteFrame.cpp
+++ b/cocos/2d/CCSpriteFrame.cpp
@@ -35,7 +35,7 @@ NS_CC_BEGIN
 
 // implementation of SpriteFrame
 
-SpriteFrame* SpriteFrame::create(const std::string& filename, const Rect& rect)
+SpriteFrame* SpriteFrame::create(std::string_view filename, const Rect& rect)
 {
     SpriteFrame* spriteFrame = new SpriteFrame();
     spriteFrame->initWithTextureFilename(filename, rect);
@@ -70,7 +70,7 @@ SpriteFrame* SpriteFrame::createWithTexture(Texture2D* texture,
     return nullptr;
 }
 
-SpriteFrame* SpriteFrame::create(const std::string& filename,
+SpriteFrame* SpriteFrame::create(std::string_view filename,
                                  const Rect& rect,
                                  bool rotated,
                                  const Vec2& offset,
@@ -94,7 +94,7 @@ bool SpriteFrame::initWithTexture(Texture2D* texture, const Rect& rect)
     return initWithTexture(texture, rectInPixels, false, Vec2::ZERO, rectInPixels.size);
 }
 
-bool SpriteFrame::initWithTextureFilename(const std::string& filename, const Rect& rect)
+bool SpriteFrame::initWithTextureFilename(std::string_view filename, const Rect& rect)
 {
     Rect rectInPixels = CC_RECT_POINTS_TO_PIXELS(rect);
     return initWithTextureFilename(filename, rectInPixels, false, Vec2::ZERO, rectInPixels.size);
@@ -126,7 +126,7 @@ bool SpriteFrame::initWithTexture(Texture2D* texture,
     return true;
 }
 
-bool SpriteFrame::initWithTextureFilename(const std::string& filename,
+bool SpriteFrame::initWithTextureFilename(std::string_view filename,
                                           const Rect& rect,
                                           bool rotated,
                                           const Vec2& offset,
diff --git a/cocos/2d/CCSpriteFrame.h b/cocos/2d/CCSpriteFrame.h
index 32e93be8eef0..5f17fc12807a 100644
--- a/cocos/2d/CCSpriteFrame.h
+++ b/cocos/2d/CCSpriteFrame.h
@@ -66,7 +66,7 @@ class CC_DLL SpriteFrame : public Ref, public Clonable
      * @param rect A specified rect.
      * @return An autoreleased SpriteFrame object.
      */
-    static SpriteFrame* create(const std::string& filename, const Rect& rect);
+    static SpriteFrame* create(std::string_view filename, const Rect& rect);
 
     /** Create a SpriteFrame with a texture filename, rect, rotated, offset and originalSize in pixels.
      The originalSize is the size in pixels of the frame before being trimmed.
@@ -78,7 +78,7 @@ class CC_DLL SpriteFrame : public Ref, public Clonable
      * @param originalSize A specified original size.
      * @return An autoreleased SpriteFrame object.
      */
-    static SpriteFrame* create(const std::string& filename,
+    static SpriteFrame* create(std::string_view filename,
                                const Rect& rect,
                                bool rotated,
                                const Vec2& offset,
@@ -279,7 +279,7 @@ class CC_DLL SpriteFrame : public Ref, public Clonable
     /** Initializes a SpriteFrame with a texture filename, rect in points;
      It is assumed that the frame was not trimmed.
      */
-    bool initWithTextureFilename(const std::string& filename, const Rect& rect);
+    bool initWithTextureFilename(std::string_view filename, const Rect& rect);
 
     /** Initializes a SpriteFrame with a texture, rect, rotated, offset and originalSize in pixels.
      The originalSize is the size in points of the frame before being trimmed.
@@ -295,7 +295,7 @@ class CC_DLL SpriteFrame : public Ref, public Clonable
 
      @since v1.1
      */
-    bool initWithTextureFilename(const std::string& filename,
+    bool initWithTextureFilename(std::string_view filename,
                                  const Rect& rect,
                                  bool rotated,
                                  const Vec2& offset,
diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp
index db7b97745828..6c4fc158a652 100644
--- a/cocos/2d/CCSpriteFrameCache.cpp
+++ b/cocos/2d/CCSpriteFrameCache.cpp
@@ -75,8 +75,8 @@ bool SpriteFrameCache::init()
 
 SpriteFrameCache::~SpriteFrameCache() {}
 
-void SpriteFrameCache::addSpriteFramesWithFile(const std::string& spriteSheetFileName,
-                                               const std::string& textureFileName,
+void SpriteFrameCache::addSpriteFramesWithFile(std::string_view spriteSheetFileName,
+                                               std::string_view textureFileName,
                                                uint32_t spriteSheetFormat)
 {
     auto* loader = getSpriteSheetLoader(spriteSheetFormat);
@@ -86,7 +86,7 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& spriteSheetFil
     }
 }
 
-void SpriteFrameCache::addSpriteFramesWithFile(const std::string& spriteSheetFileName,
+void SpriteFrameCache::addSpriteFramesWithFile(std::string_view spriteSheetFileName,
                                                Texture2D* texture,
                                                uint32_t spriteSheetFormat)
 {
@@ -97,7 +97,7 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& spriteSheetFil
     }
 }
 
-void SpriteFrameCache::addSpriteFramesWithFile(const std::string& spriteSheetFileName, uint32_t spriteSheetFormat)
+void SpriteFrameCache::addSpriteFramesWithFile(std::string_view spriteSheetFileName, uint32_t spriteSheetFormat)
 {
     auto* loader = getSpriteSheetLoader(spriteSheetFormat);
     if (loader)
@@ -117,12 +117,12 @@ void SpriteFrameCache::addSpriteFramesWithFileContent(const Data& content,
     }
 }
 
-bool SpriteFrameCache::isSpriteFramesWithFileLoaded(const std::string& plist) const
+bool SpriteFrameCache::isSpriteFramesWithFileLoaded(std::string_view plist) const
 {
     return isSpriteSheetInUse(plist) && isPlistFull(plist);
 }
 
-void SpriteFrameCache::addSpriteFrame(SpriteFrame* frame, const std::string& frameName)
+void SpriteFrameCache::addSpriteFrame(SpriteFrame* frame, std::string_view frameName)
 {
     CCASSERT(frame, "frame should not be nil");
 
@@ -169,7 +169,7 @@ void SpriteFrameCache::removeUnusedSpriteFrames()
     }
 }
 
-void SpriteFrameCache::removeSpriteFrameByName(const std::string& name)
+void SpriteFrameCache::removeSpriteFrameByName(std::string_view name)
 {
     // explicit nil handling
     if (name.empty())
@@ -178,7 +178,7 @@ void SpriteFrameCache::removeSpriteFrameByName(const std::string& name)
     eraseFrame(name);
 }
 
-void SpriteFrameCache::removeSpriteFramesFromFile(const std::string& atlasPath)
+void SpriteFrameCache::removeSpriteFramesFromFile(std::string_view atlasPath)
 {
     // const auto fullPath = FileUtils::getInstance()->fullPathForFilename(plist);
     // auto dict = FileUtils::getInstance()->getValueMapFromFile(fullPath);
@@ -193,7 +193,7 @@ void SpriteFrameCache::removeSpriteFramesFromFile(const std::string& atlasPath)
     removeSpriteSheet(atlasPath);
 }
 
-void SpriteFrameCache::removeSpriteFramesFromFileContent(const std::string& plist_content)
+void SpriteFrameCache::removeSpriteFramesFromFileContent(std::string_view plist_content)
 {
     auto dict =
         FileUtils::getInstance()->getValueMapFromData(plist_content.data(), static_cast<int>(plist_content.size()));
@@ -241,17 +241,17 @@ void SpriteFrameCache::removeSpriteFramesFromTexture(Texture2D* texture)
     eraseFrames(keysToRemove);
 }
 
-SpriteFrame* SpriteFrameCache::getSpriteFrameByName(const std::string& name)
+SpriteFrame* SpriteFrameCache::getSpriteFrameByName(std::string_view name)
 {
     auto* frame = findFrame(name);
     if (!frame)
     {
-        CCLOG("cocos2d: SpriteFrameCache: Frame '%s' isn't found", name.c_str());
+        CCLOG("cocos2d: SpriteFrameCache: Frame '%s' isn't found", name.data());
     }
     return frame;
 }
 
-bool SpriteFrameCache::reloadTexture(const std::string& spriteSheetFileName)
+bool SpriteFrameCache::reloadTexture(std::string_view spriteSheetFileName)
 {
     CCASSERT(!spriteSheetFileName.empty(), "plist filename should not be nullptr");
 
@@ -283,16 +283,18 @@ bool SpriteFrameCache::reloadTexture(const std::string& spriteSheetFileName)
 }
 
 void SpriteFrameCache::insertFrame(const std::shared_ptr<SpriteSheet>& spriteSheet,
-                                   const std::string& frameName,
+                                   std::string_view frameName,
                                    SpriteFrame* spriteFrame)
 {
-    spriteSheet->frames.insert(frameName);
+    spriteSheet->frames.emplace(frameName);
     _spriteFrames.insert(frameName, spriteFrame);  // add SpriteFrame
-    _spriteSheets[spriteSheet->path]        = spriteSheet;
-    _spriteFrameToSpriteSheetMap[frameName] = spriteSheet;  // insert index frameName->plist
+    _spriteSheets[spriteSheet->path] = spriteSheet;
+    hlookup::set_item(_spriteFrameToSpriteSheetMap, frameName,
+                      spriteSheet);  // _spriteFrameToSpriteSheetMap[frameName] = spriteSheet;  // insert
+                                     // index frameName->plist
 }
 
-bool SpriteFrameCache::eraseFrame(const std::string& frameName)
+bool SpriteFrameCache::eraseFrame(std::string_view frameName)
 {
     _spriteFrames.erase(frameName);  // drop SpriteFrame
     const auto itFrame = _spriteFrameToSpriteSheetMap.find(frameName);
@@ -330,7 +332,7 @@ bool SpriteFrameCache::eraseFrames(const std::vector<std::string>& frames)
     return ret;
 }
 
-bool SpriteFrameCache::removeSpriteSheet(const std::string& spriteSheetFileName)
+bool SpriteFrameCache::removeSpriteSheet(std::string_view spriteSheetFileName)
 {
     auto it = _spriteSheets.find(spriteSheetFileName);
     if (it == _spriteSheets.end())
@@ -356,18 +358,18 @@ void SpriteFrameCache::clear()
     _spriteFrames.clear();
 }
 
-bool SpriteFrameCache::hasFrame(const std::string& frame) const
+bool SpriteFrameCache::hasFrame(std::string_view frame) const
 {
     return _spriteFrameToSpriteSheetMap.find(frame) != _spriteFrameToSpriteSheetMap.end();
 }
 
-bool SpriteFrameCache::isSpriteSheetInUse(const std::string& spriteSheetFileName) const
+bool SpriteFrameCache::isSpriteSheetInUse(std::string_view spriteSheetFileName) const
 {
     const auto spriteSheetItr = _spriteSheets.find(spriteSheetFileName);
     return spriteSheetItr != _spriteSheets.end() && !spriteSheetItr->second->frames.empty();
 }
 
-SpriteFrame* SpriteFrameCache::findFrame(const std::string& frame)
+SpriteFrame* SpriteFrameCache::findFrame(std::string_view frame)
 {
     return _spriteFrames.at(frame);
 }
@@ -377,7 +379,7 @@ void SpriteFrameCache::addSpriteFrameCapInset(SpriteFrame* spriteFrame, const Re
     texture->addSpriteFrameCapInset(spriteFrame, capInsets);
 }
 
-Map<std::string, SpriteFrame*>& SpriteFrameCache::getSpriteFrames()
+StringMap<SpriteFrame*>& SpriteFrameCache::getSpriteFrames()
 {
     return _spriteFrames;
 }
diff --git a/cocos/2d/CCSpriteFrameCache.h b/cocos/2d/CCSpriteFrameCache.h
index 3009a6bd85e5..78db1c5bffd4 100644
--- a/cocos/2d/CCSpriteFrameCache.h
+++ b/cocos/2d/CCSpriteFrameCache.h
@@ -117,7 +117,7 @@ class CC_DLL SpriteFrameCache : public Ref
 
     /** Adds multiple Sprite Frames from a plist file.
      * A texture will be loaded automatically. The texture name will composed by replacing the .plist suffix with .png.
-     * If you want to use another texture, you should use the addSpriteFramesWithFile(const std::string& plist, const
+     * If you want to use another texture, you should use the addSpriteFramesWithFile(std::string_view plist, const
      * std::string& textureFileName) method.
      * @js addSpriteFrames
      * @lua addSpriteFrames
@@ -125,7 +125,7 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param spriteSheetFileName file name.
      * @param spriteSheetFormat
      */
-    void addSpriteFramesWithFile(const std::string& spriteSheetFileName,
+    void addSpriteFramesWithFile(std::string_view spriteSheetFileName,
                                  uint32_t spriteSheetFormat = SpriteSheetFormat::PLIST);
 
     /** Adds multiple Sprite Frames from a plist file. The texture will be associated with the created sprite frames.
@@ -137,8 +137,8 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param textureFileName Texture file name.
      * @param spriteSheetFormat
      */
-    void addSpriteFramesWithFile(const std::string& spriteSheetFileName,
-                                 const std::string& textureFileName,
+    void addSpriteFramesWithFile(std::string_view spriteSheetFileName,
+                                 std::string_view textureFileName,
                                  uint32_t spriteSheetFormat = SpriteSheetFormat::PLIST);
 
     /** Adds multiple Sprite Frames from a plist file. The texture will be associated with the created sprite frames.
@@ -149,7 +149,7 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param texture Texture pointer.
      * @param spriteSheetFormat
      */
-    void addSpriteFramesWithFile(const std::string& spriteSheetFileName,
+    void addSpriteFramesWithFile(std::string_view spriteSheetFileName,
                                  Texture2D* texture,
                                  uint32_t spriteSheetFormat = SpriteSheetFormat::PLIST);
 
@@ -172,7 +172,7 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param frame A certain sprite frame.
      * @param frameName The name of the sprite frame.
      */
-    void addSpriteFrame(SpriteFrame* frame, const std::string& frameName);
+    void addSpriteFrame(SpriteFrame* frame, std::string_view frameName);
 
     /** Check if multiple Sprite Frames from a plist file have been loaded.
      * @js NA
@@ -181,7 +181,7 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param plist Plist file name.
      * @return True if the file is loaded.
      */
-    bool isSpriteFramesWithFileLoaded(const std::string& plist) const;
+    bool isSpriteFramesWithFileLoaded(std::string_view plist) const;
 
     /** Purges the dictionary of loaded sprite frames.
      * Call this method if you receive the "Memory Warning".
@@ -202,7 +202,7 @@ class CC_DLL SpriteFrameCache : public Ref
      *
      * @param name The name of the sprite frame that needs to removed.
      */
-    void removeSpriteFrameByName(const std::string& name);
+    void removeSpriteFrameByName(std::string_view name);
 
     /** Removes multiple Sprite Frames from a plist file.
      * Sprite Frames stored in this file will be removed.
@@ -211,7 +211,7 @@ class CC_DLL SpriteFrameCache : public Ref
      *
      * @param plist The name of the plist that needs to removed.
      */
-    void removeSpriteFramesFromFile(const std::string& plist);
+    void removeSpriteFramesFromFile(std::string_view plist);
 
     /** Removes multiple Sprite Frames from a plist file content.
      * Sprite Frames stored in this file will be removed.
@@ -220,7 +220,7 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param plist_content The string of the plist content that needs to removed.
      * @js NA
      */
-    void removeSpriteFramesFromFileContent(const std::string& plist_content);
+    void removeSpriteFramesFromFileContent(std::string_view plist_content);
 
     /** Removes all Sprite Frames associated with the specified textures.
      * It is convenient to call this method when a specific texture needs to be removed.
@@ -239,22 +239,22 @@ class CC_DLL SpriteFrameCache : public Ref
      * @param name A certain sprite frame name.
      * @return The sprite frame.
      */
-    SpriteFrame* getSpriteFrameByName(const std::string& name);
+    SpriteFrame* getSpriteFrameByName(std::string_view name);
 
-    bool reloadTexture(const std::string& spriteSheetFileName);
+    bool reloadTexture(std::string_view spriteSheetFileName);
 
-    SpriteFrame* findFrame(const std::string& frame);
+    SpriteFrame* findFrame(std::string_view frame);
 
     /**  Record SpriteFrame with plist and frame name, add frame name
      *    and plist to index
      */
     void insertFrame(const std::shared_ptr<SpriteSheet>& spriteSheet,
-                     const std::string& frameName,
+                     std::string_view frameName,
                      SpriteFrame* frameObj);
 
     /** Delete frame from cache, rebuild index
      */
-    bool eraseFrame(const std::string& frameName);
+    bool eraseFrame(std::string_view frameName);
 
     void addSpriteFrameCapInset(SpriteFrame* spriteFrame, const Rect& capInsets, Texture2D* texture);
 
@@ -277,30 +277,35 @@ class CC_DLL SpriteFrameCache : public Ref
     bool eraseFrames(const std::vector<std::string>& frame);
     /** Delete frame from index and SpriteFrame is kept.
      */
-    bool removeSpriteSheet(const std::string& spriteSheetFileName);
+    bool removeSpriteSheet(std::string_view spriteSheetFileName);
     /** Clear index and all SpriteFrames.
      */
     void clear();
 
-    inline bool hasFrame(const std::string& frame) const;
-    inline bool isSpriteSheetInUse(const std::string& spriteSheetFileName) const;
+    inline bool hasFrame(std::string_view frame) const;
+    inline bool isSpriteSheetInUse(std::string_view spriteSheetFileName) const;
 
-    inline Map<std::string, SpriteFrame*>& getSpriteFrames();
+    inline StringMap<SpriteFrame*>& getSpriteFrames();
 
-    void markPlistFull(const std::string& spriteSheetFileName, bool full)
+    void markPlistFull(std::string_view spriteSheetFileName, bool full)
     {
-        _spriteSheets[spriteSheetFileName]->full = full;
+        // _spriteSheets[spriteSheetFileName]->full = full;
+        auto it = _spriteSheets.find(spriteSheetFileName);
+        if (it != _spriteSheets.end())
+        {
+            it.value()->full = full;
+        }
     }
-    bool isPlistFull(const std::string& spriteSheetFileName) const
+    bool isPlistFull(std::string_view spriteSheetFileName) const
     {
-        auto&& it = _spriteSheets.find(spriteSheetFileName);
+        auto it = _spriteSheets.find(spriteSheetFileName);
         return it == _spriteSheets.end() ? false : it->second->full;
     }
 
 private:
-    Map<std::string, SpriteFrame*> _spriteFrames;
-    std::unordered_map<std::string, std::shared_ptr<SpriteSheet>> _spriteSheets;
-    std::unordered_map<std::string, std::shared_ptr<SpriteSheet>> _spriteFrameToSpriteSheetMap;
+    StringMap<SpriteFrame*> _spriteFrames;
+    hlookup::string_map<std::shared_ptr<SpriteSheet>> _spriteSheets;
+    hlookup::string_map<std::shared_ptr<SpriteSheet>> _spriteFrameToSpriteSheetMap;
 
     std::map<uint32_t, std::shared_ptr<ISpriteSheetLoader>> _spriteSheetLoaders;
 };
diff --git a/cocos/2d/CCSpriteSheetLoader.h b/cocos/2d/CCSpriteSheetLoader.h
index 80d93632d576..d4a236ee9db8 100644
--- a/cocos/2d/CCSpriteSheetLoader.h
+++ b/cocos/2d/CCSpriteSheetLoader.h
@@ -65,20 +65,20 @@ class SpriteSheet
 public:
     std::string path;
     uint32_t format;
-    std::set<std::string> frames;
+    hlookup::string_set frames;
     bool full = false;
 };
 
 class ISpriteSheetLoader
 {
 public:
-    virtual ~ISpriteSheetLoader()                                                               = default;
-    virtual uint32_t getFormat()                                                                = 0;
-    virtual void load(const std::string& filePath, SpriteFrameCache& cache)                     = 0;
-    virtual void load(const std::string& filePath, Texture2D* texture, SpriteFrameCache& cache) = 0;
-    virtual void load(const std::string& filePath, const std::string& textureFileName, SpriteFrameCache& cache) = 0;
-    virtual void load(const Data& content, Texture2D* texture, SpriteFrameCache& cache)                         = 0;
-    virtual void reload(const std::string& filePath, SpriteFrameCache& cache)                                   = 0;
+    virtual ~ISpriteSheetLoader()                                                                           = default;
+    virtual uint32_t getFormat()                                                                            = 0;
+    virtual void load(std::string_view filePath, SpriteFrameCache& cache)                                   = 0;
+    virtual void load(std::string_view filePath, Texture2D* texture, SpriteFrameCache& cache)               = 0;
+    virtual void load(std::string_view filePath, std::string_view textureFileName, SpriteFrameCache& cache) = 0;
+    virtual void load(const Data& content, Texture2D* texture, SpriteFrameCache& cache)                     = 0;
+    virtual void reload(std::string_view filePath, SpriteFrameCache& cache)                                 = 0;
 };
 
 class SpriteSheetLoader : public ISpriteSheetLoader
@@ -92,12 +92,12 @@ class SpriteSheetLoader : public ISpriteSheetLoader
                                const std::vector<int>& triangleIndices,
                                PolygonInfo& polygonInfo);
 
-    uint32_t getFormat() override                                                                                = 0;
-    void load(const std::string& filePath, SpriteFrameCache& cache) override                                     = 0;
-    void load(const std::string& filePath, Texture2D* texture, SpriteFrameCache& cache) override                 = 0;
-    void load(const std::string& filePath, const std::string& textureFileName, SpriteFrameCache& cache) override = 0;
-    void load(const Data& content, Texture2D* texture, SpriteFrameCache& cache) override                         = 0;
-    void reload(const std::string& filePath, SpriteFrameCache& cache) override                                   = 0;
+    uint32_t getFormat() override                                                                            = 0;
+    void load(std::string_view filePath, SpriteFrameCache& cache) override                                   = 0;
+    void load(std::string_view filePath, Texture2D* texture, SpriteFrameCache& cache) override               = 0;
+    void load(std::string_view filePath, std::string_view textureFileName, SpriteFrameCache& cache) override = 0;
+    void load(const Data& content, Texture2D* texture, SpriteFrameCache& cache) override                     = 0;
+    void reload(std::string_view filePath, SpriteFrameCache& cache) override                                 = 0;
 };
 
 // end of _2d group
diff --git a/cocos/2d/CCTMXObjectGroup.cpp b/cocos/2d/CCTMXObjectGroup.cpp
index 7196acad9b88..99042b01b332 100644
--- a/cocos/2d/CCTMXObjectGroup.cpp
+++ b/cocos/2d/CCTMXObjectGroup.cpp
@@ -40,7 +40,7 @@ TMXObjectGroup::~TMXObjectGroup()
     CCLOGINFO("deallocing TMXObjectGroup: %p", this);
 }
 
-ValueMap TMXObjectGroup::getObject(const std::string& objectName) const
+ValueMap TMXObjectGroup::getObject(std::string_view objectName) const
 {
     if (!_objects.empty())
     {
@@ -59,7 +59,7 @@ ValueMap TMXObjectGroup::getObject(const std::string& objectName) const
     return ValueMap();
 }
 
-Value TMXObjectGroup::getProperty(const std::string& propertyName) const
+Value TMXObjectGroup::getProperty(std::string_view propertyName) const
 {
     if (_properties.find(propertyName) != _properties.end())
         return _properties.at(propertyName);
diff --git a/cocos/2d/CCTMXObjectGroup.h b/cocos/2d/CCTMXObjectGroup.h
index d7df9de64bbd..5a012fc18025 100644
--- a/cocos/2d/CCTMXObjectGroup.h
+++ b/cocos/2d/CCTMXObjectGroup.h
@@ -60,13 +60,13 @@ class CC_DLL TMXObjectGroup : public Ref
      *
      * @return The group name.
      */
-    const std::string& getGroupName() const { return _groupName; }
+    std::string_view getGroupName() const { return _groupName; }
 
     /** Set the group name.
      *
      * @param groupName A string,it is used to set the group name.
      */
-    void setGroupName(const std::string& groupName) { _groupName = groupName; }
+    void setGroupName(std::string_view groupName) { _groupName = groupName; }
 
     /** Return the value for the specific property name.
      *
@@ -74,14 +74,14 @@ class CC_DLL TMXObjectGroup : public Ref
      * @return Return the value for the specific property name.
      * @js NA
      */
-    Value getProperty(const std::string& propertyName) const;
+    Value getProperty(std::string_view propertyName) const;
 
     /** Return the dictionary for the specific object name.
      * It will return the 1st object found on the array for the given name.
      *
      * @return Return the dictionary for the specific object name.
      */
-    ValueMap getObject(const std::string& objectName) const;
+    ValueMap getObject(std::string_view objectName) const;
 
     /** Gets the offset position of child objects.
      *
diff --git a/cocos/2d/CCTMXXMLParser.cpp b/cocos/2d/CCTMXXMLParser.cpp
index 69161885483e..e8d33801d827 100644
--- a/cocos/2d/CCTMXXMLParser.cpp
+++ b/cocos/2d/CCTMXXMLParser.cpp
@@ -92,7 +92,7 @@ Rect TMXTilesetInfo::getRectForGID(uint32_t gid)
 
 // implementation TMXMapInfo
 
-TMXMapInfo* TMXMapInfo::create(const std::string& tmxFile)
+TMXMapInfo* TMXMapInfo::create(std::string_view tmxFile)
 {
     TMXMapInfo* ret = new TMXMapInfo();
     if (ret->initWithTMXFile(tmxFile))
@@ -104,7 +104,7 @@ TMXMapInfo* TMXMapInfo::create(const std::string& tmxFile)
     return nullptr;
 }
 
-TMXMapInfo* TMXMapInfo::createWithXML(const std::string& tmxString, const std::string& resourcePath)
+TMXMapInfo* TMXMapInfo::createWithXML(std::string_view tmxString, std::string_view resourcePath)
 {
     TMXMapInfo* ret = new TMXMapInfo();
     if (ret->initWithXML(tmxString, resourcePath))
@@ -116,7 +116,7 @@ TMXMapInfo* TMXMapInfo::createWithXML(const std::string& tmxString, const std::s
     return nullptr;
 }
 
-void TMXMapInfo::internalInit(const std::string& tmxFileName, const std::string& resourcePath)
+void TMXMapInfo::internalInit(std::string_view tmxFileName, std::string_view resourcePath)
 {
     if (!tmxFileName.empty())
     {
@@ -138,13 +138,13 @@ void TMXMapInfo::internalInit(const std::string& tmxFileName, const std::string&
     _currentFirstGID   = -1;
 }
 
-bool TMXMapInfo::initWithXML(const std::string& tmxString, const std::string& resourcePath)
+bool TMXMapInfo::initWithXML(std::string_view tmxString, std::string_view resourcePath)
 {
     internalInit("", resourcePath);
     return parseXMLString(tmxString);
 }
 
-bool TMXMapInfo::initWithTMXFile(const std::string& tmxFile)
+bool TMXMapInfo::initWithTMXFile(std::string_view tmxFile)
 {
     internalInit(tmxFile, "");
     return parseXMLFile(_TMXFileName);
@@ -171,7 +171,7 @@ TMXMapInfo::~TMXMapInfo()
     CCLOGINFO("deallocing TMXMapInfo: %p", this);
 }
 
-bool TMXMapInfo::parseXMLString(const std::string& xmlString)
+bool TMXMapInfo::parseXMLString(std::string_view xmlString)
 {
     size_t len = xmlString.size();
     if (len <= 0)
@@ -186,10 +186,10 @@ bool TMXMapInfo::parseXMLString(const std::string& xmlString)
 
     parser.setDelegator(this);
 
-    return parser.parse(xmlString.c_str(), len);
+    return parser.parse(xmlString.data(), len);
 }
 
-bool TMXMapInfo::parseXMLFile(const std::string& xmlFilename)
+bool TMXMapInfo::parseXMLFile(std::string_view xmlFilename)
 {
     SAXParser parser;
 
@@ -265,7 +265,7 @@ void TMXMapInfo::startElement(void* /*ctx*/, const char* name, const char** atts
             tmxMapInfo->setStaggerIndex(TMXStaggerIndex_Even);
         }
 
-        float hexSideLength = attributeDict["hexsidelength"].asFloat();
+        auto hexSideLength = attributeDict["hexsidelength"].asInt();
         tmxMapInfo->setHexSideLength(hexSideLength);
 
         Vec2 s;
@@ -348,7 +348,7 @@ void TMXMapInfo::startElement(void* /*ctx*/, const char* name, const char** atts
             TMXLayerInfo* layer = tmxMapInfo->getLayers().back();
             Vec2 layerSize      = layer->_layerSize;
             uint32_t gid        = static_cast<uint32_t>(attributeDict["gid"].asUnsignedInt());
-            int tilesAmount     = layerSize.width * layerSize.height;
+            int tilesAmount     = static_cast<int>(layerSize.width * layerSize.height);
 
             if (_xmlTileIndex < tilesAmount)
             {
@@ -443,7 +443,7 @@ void TMXMapInfo::startElement(void* /*ctx*/, const char* name, const char** atts
 
             TMXLayerInfo* layer = tmxMapInfo->getLayers().back();
             Vec2 layerSize      = layer->_layerSize;
-            int tilesAmount     = layerSize.width * layerSize.height;
+            int tilesAmount     = static_cast<int>(layerSize.width * layerSize.height);
 
             uint32_t* tiles = (uint32_t*)malloc(tilesAmount * sizeof(uint32_t));
             // set all value to 0
@@ -688,10 +688,10 @@ void TMXMapInfo::endElement(void* /*ctx*/, const char* name)
 
             TMXLayerInfo* layer = tmxMapInfo->getLayers().back();
 
-            std::string currentString = tmxMapInfo->getCurrentString();
+            auto currentString = tmxMapInfo->getCurrentString();
             unsigned char* buffer;
             auto len =
-                base64Decode((unsigned char*)currentString.c_str(), (unsigned int)currentString.length(), &buffer);
+                base64Decode((unsigned char*)currentString.data(), (unsigned int)currentString.length(), &buffer);
             if (!buffer)
             {
                 CCLOG("cocos2d: TiledMap: decode data error");
@@ -733,10 +733,11 @@ void TMXMapInfo::endElement(void* /*ctx*/, const char* name)
             TMXLayerInfo* layer = tmxMapInfo->getLayers().back();
 
             tmxMapInfo->setStoringCharacters(false);
-            std::string currentString = tmxMapInfo->getCurrentString();
+            auto currentString = tmxMapInfo->getCurrentString();
 
             vector<string> gidTokens;
-            istringstream filestr(currentString);
+            std::stringstream filestr;
+            filestr << currentString;
             string sRow;
             while (getline(filestr, sRow, '\n'))
             {
@@ -810,7 +811,7 @@ void TMXMapInfo::textHandler(void* /*ctx*/, const char* ch, size_t len)
 
     if (tmxMapInfo->isStoringCharacters())
     {
-        std::string currentString = tmxMapInfo->getCurrentString();
+        std::string currentString{tmxMapInfo->getCurrentString()};
         currentString += text;
         tmxMapInfo->setCurrentString(currentString);
     }
diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h
index 20f780526c2d..1ec2a821f4e3 100644
--- a/cocos/2d/CCTMXXMLParser.h
+++ b/cocos/2d/CCTMXXMLParser.h
@@ -250,9 +250,9 @@ class CC_DLL TMXMapInfo : public Ref, public SAXDelegator
 {
 public:
     /** creates a TMX Format with a tmx file */
-    static TMXMapInfo* create(const std::string& tmxFile);
+    static TMXMapInfo* create(std::string_view tmxFile);
     /** creates a TMX Format with an XML string and a TMX resource path */
-    static TMXMapInfo* createWithXML(const std::string& tmxString, const std::string& resourcePath);
+    static TMXMapInfo* createWithXML(std::string_view tmxString, std::string_view resourcePath);
 
     /**
      * @js ctor
@@ -265,13 +265,13 @@ class CC_DLL TMXMapInfo : public Ref, public SAXDelegator
     virtual ~TMXMapInfo();
 
     /** initializes a TMX format with a  tmx file */
-    bool initWithTMXFile(const std::string& tmxFile);
+    bool initWithTMXFile(std::string_view tmxFile);
     /** initializes a TMX format with an XML string and a TMX resource path */
-    bool initWithXML(const std::string& tmxString, const std::string& resourcePath);
+    bool initWithXML(std::string_view tmxString, std::string_view resourcePath);
     /** initializes parsing of an XML file, either a tmx (Map) file or tsx (Tileset) file */
-    bool parseXMLFile(const std::string& xmlFilename);
+    bool parseXMLFile(std::string_view xmlFilename);
     /* initializes parsing of an XML string, either a tmx (Map) string or tsx (Tileset) string */
-    bool parseXMLString(const std::string& xmlString);
+    bool parseXMLString(std::string_view xmlString);
 
     ValueMapIntKey& getTileProperties() { return _tileProperties; };
     void setTileProperties(const ValueMapIntKey& tileProperties) { _tileProperties = tileProperties; }
@@ -353,14 +353,14 @@ class CC_DLL TMXMapInfo : public Ref, public SAXDelegator
      */
     void textHandler(void* ctx, const char* ch, size_t len) override;
 
-    const std::string& getCurrentString() const { return _currentString; }
-    void setCurrentString(const std::string& currentString) { _currentString = currentString; }
-    const std::string& getTMXFileName() const { return _TMXFileName; }
-    void setTMXFileName(const std::string& fileName) { _TMXFileName = fileName; }
-    const std::string& getExternalTilesetFileName() const { return _externalTilesetFilename; }
+    std::string_view getCurrentString() const { return _currentString; }
+    void setCurrentString(std::string_view currentString) { _currentString = currentString; }
+    std::string_view getTMXFileName() const { return _TMXFileName; }
+    void setTMXFileName(std::string_view fileName) { _TMXFileName = fileName; }
+    std::string_view getExternalTilesetFileName() const { return _externalTilesetFilename; }
 
 protected:
-    void internalInit(const std::string& tmxFileName, const std::string& resourcePath);
+    void internalInit(std::string_view tmxFileName, std::string_view resourcePath);
 
     /// map orientation
     int _orientation;
diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp
index 8ccdaace71e9..a134395fb9ec 100644
--- a/cocos/2d/CCTextFieldTTF.cpp
+++ b/cocos/2d/CCTextFieldTTF.cpp
@@ -109,10 +109,10 @@ TextFieldTTF::~TextFieldTTF() {}
 // static constructor
 //////////////////////////////////////////////////////////////////////////
 
-TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(const std::string& placeholder,
+TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(std::string_view placeholder,
                                                      const Vec2& dimensions,
                                                      TextHAlignment alignment,
-                                                     const std::string& fontName,
+                                                     std::string_view fontName,
                                                      float fontSize)
 {
     TextFieldTTF* ret = new TextFieldTTF();
@@ -129,8 +129,8 @@ TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(const std::string& placehol
     return nullptr;
 }
 
-TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(const std::string& placeholder,
-                                                     const std::string& fontName,
+TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(std::string_view placeholder,
+                                                     std::string_view fontName,
                                                      float fontSize)
 {
     TextFieldTTF* ret = new TextFieldTTF();
@@ -151,10 +151,10 @@ TextFieldTTF* TextFieldTTF::textFieldWithPlaceHolder(const std::string& placehol
 // initialize
 //////////////////////////////////////////////////////////////////////////
 
-bool TextFieldTTF::initWithPlaceHolder(const std::string& placeholder,
+bool TextFieldTTF::initWithPlaceHolder(std::string_view placeholder,
                                        const Vec2& dimensions,
                                        TextHAlignment alignment,
-                                       const std::string& fontName,
+                                       std::string_view fontName,
                                        float fontSize)
 {
     setDimensions(dimensions.width, dimensions.height);
@@ -162,7 +162,7 @@ bool TextFieldTTF::initWithPlaceHolder(const std::string& placeholder,
 
     return initWithPlaceHolder(placeholder, fontName, fontSize);
 }
-bool TextFieldTTF::initWithPlaceHolder(const std::string& placeholder, const std::string& fontName, float fontSize)
+bool TextFieldTTF::initWithPlaceHolder(std::string_view placeholder, std::string_view fontName, float fontSize)
 {
     _placeHolder = placeholder;
 
@@ -366,7 +366,7 @@ void TextFieldTTF::deleteBackward()
     }
 }
 
-const std::string& TextFieldTTF::getContentText()
+std::string_view TextFieldTTF::getContentText()
 {
     return _inputText;
 }
@@ -573,9 +573,9 @@ void TextFieldTTF::setString(std::string_view text)
     _charCount = charCount;
 }
 
-void TextFieldTTF::appendString(const std::string& text)
+void TextFieldTTF::appendString(std::string_view text)
 {
-    insertText(text.c_str(), text.length());
+    insertText(text.data(), text.length());
 }
 
 void TextFieldTTF::makeStringSupportCursor(std::string& displayText)
@@ -677,13 +677,13 @@ void TextFieldTTF::controlKey(EventKeyboard::KeyCode keyCode)
     }
 }
 
-const std::string& TextFieldTTF::getString() const
+std::string_view TextFieldTTF::getString() const
 {
     return _inputText;
 }
 
 // place holder text property
-void TextFieldTTF::setPlaceHolder(const std::string& text)
+void TextFieldTTF::setPlaceHolder(std::string_view text)
 {
     _placeHolder = text;
     if (_inputText.empty() && !_isAttachWithIME)
@@ -693,7 +693,7 @@ void TextFieldTTF::setPlaceHolder(const std::string& text)
     }
 }
 
-const std::string& TextFieldTTF::getPlaceHolder() const
+std::string_view TextFieldTTF::getPlaceHolder() const
 {
     return _placeHolder;
 }
@@ -733,7 +733,7 @@ void TextFieldTTF::setSecureTextEntry(bool value)
     }
 }
 
-void TextFieldTTF::setPasswordTextStyle(const std::string& text)
+void TextFieldTTF::setPasswordTextStyle(std::string_view text)
 {
     if (text.length() < 1)
     {
@@ -747,7 +747,7 @@ void TextFieldTTF::setPasswordTextStyle(const std::string& text)
     }
 }
 
-const std::string& TextFieldTTF::getPasswordTextStyle() const
+std::string_view TextFieldTTF::getPasswordTextStyle() const
 {
     return _passwordStyleText;
 }
diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h
index 4eee6e0f8649..b9276ffb4a78 100644
--- a/cocos/2d/CCTextFieldTTF.h
+++ b/cocos/2d/CCTextFieldTTF.h
@@ -98,28 +98,28 @@ class CC_DLL TextFieldTTF : public Label, public IMEDelegate
     /** Creates a TextFieldTTF from a fontname, alignment, dimension and font size.
      * @js NA
      */
-    static TextFieldTTF* textFieldWithPlaceHolder(const std::string& placeholder,
+    static TextFieldTTF* textFieldWithPlaceHolder(std::string_view placeholder,
                                                   const Vec2& dimensions,
                                                   TextHAlignment alignment,
-                                                  const std::string& fontName,
+                                                  std::string_view fontName,
                                                   float fontSize);
 
     /** Creates a TextFieldTTF from a fontname and font size.
      * @js NA
      */
-    static TextFieldTTF* textFieldWithPlaceHolder(const std::string& placeholder,
-                                                  const std::string& fontName,
+    static TextFieldTTF* textFieldWithPlaceHolder(std::string_view placeholder,
+                                                  std::string_view fontName,
                                                   float fontSize);
 
     /** Initializes the TextFieldTTF with a font name, alignment, dimension and font size. */
-    bool initWithPlaceHolder(const std::string& placeholder,
+    bool initWithPlaceHolder(std::string_view placeholder,
                              const Vec2& dimensions,
                              TextHAlignment alignment,
-                             const std::string& fontName,
+                             std::string_view fontName,
                              float fontSize);
 
     /** Initializes the TextFieldTTF with a font name and font size. */
-    bool initWithPlaceHolder(const std::string& placeholder, const std::string& fontName, float fontSize);
+    bool initWithPlaceHolder(std::string_view placeholder, std::string_view fontName, float fontSize);
 
     /**
      *@brief    Open keyboard and receive input text.
@@ -183,26 +183,26 @@ class CC_DLL TextFieldTTF : public Label, public IMEDelegate
      * Append to input text of TextField.
      *@param text The append text of TextField.
      */
-    virtual void appendString(const std::string& text);
+    virtual void appendString(std::string_view text);
 
     /**
      * Query the input text of TextField.
      *@return Get the input text of TextField.
      */
-    virtual const std::string& getString() const override;
+    virtual std::string_view getString() const override;
 
     /**
      * Change placeholder text.
      * place holder text displayed when there is no text in the text field.
      *@param text  The placeholder string.
      */
-    virtual void setPlaceHolder(const std::string& text);
+    virtual void setPlaceHolder(std::string_view text);
 
     /**
      * Query the placeholder string.
      *@return The placeholder string.
      */
-    virtual const std::string& getPlaceHolder() const;
+    virtual std::string_view getPlaceHolder() const;
 
     /**
      * Set enable secure text entry representation.
@@ -211,8 +211,8 @@ class CC_DLL TextFieldTTF : public Label, public IMEDelegate
      * @js NA
      */
     virtual void setSecureTextEntry(bool value);
-    virtual void setPasswordTextStyle(const std::string& text);
-    const std::string& getPasswordTextStyle() const;
+    virtual void setPasswordTextStyle(std::string_view text);
+    std::string_view getPasswordTextStyle() const;
 
     /**
      * Query whether the currently display mode is secure text entry or not.
@@ -260,7 +260,7 @@ class CC_DLL TextFieldTTF : public Label, public IMEDelegate
     virtual void didDetachWithIME() override;
     virtual void insertText(const char* text, size_t len) override;
     virtual void deleteBackward() override;
-    virtual const std::string& getContentText() override;
+    virtual std::string_view getContentText() override;
     virtual void controlKey(EventKeyboard::KeyCode keyCode) override;
 
     TextFieldDelegate* _delegate;
diff --git a/cocos/2d/CCTileMapAtlas.cpp b/cocos/2d/CCTileMapAtlas.cpp
index 987d598f7e87..f0ca242ed4d8 100644
--- a/cocos/2d/CCTileMapAtlas.cpp
+++ b/cocos/2d/CCTileMapAtlas.cpp
@@ -36,7 +36,7 @@ NS_CC_BEGIN
 
 // implementation TileMapAtlas
 
-TileMapAtlas* TileMapAtlas::create(const std::string& tile, const std::string& mapFile, int tileWidth, int tileHeight)
+TileMapAtlas* TileMapAtlas::create(std::string_view tile, std::string_view mapFile, int tileWidth, int tileHeight)
 {
     TileMapAtlas* ret = new TileMapAtlas();
     if (ret->initWithTileFile(tile, mapFile, tileWidth, tileHeight))
@@ -48,7 +48,7 @@ TileMapAtlas* TileMapAtlas::create(const std::string& tile, const std::string& m
     return nullptr;
 }
 
-bool TileMapAtlas::initWithTileFile(const std::string& tile, const std::string& mapFile, int tileWidth, int tileHeight)
+bool TileMapAtlas::initWithTileFile(std::string_view tile, std::string_view mapFile, int tileWidth, int tileHeight)
 {
     this->loadTGAfile(mapFile);
     this->calculateItemsToRender();
@@ -100,7 +100,7 @@ void TileMapAtlas::calculateItemsToRender()
     }
 }
 
-void TileMapAtlas::loadTGAfile(const std::string& file)
+void TileMapAtlas::loadTGAfile(std::string_view file)
 {
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(file);
 
diff --git a/cocos/2d/CCTileMapAtlas.h b/cocos/2d/CCTileMapAtlas.h
index 711f9e13990b..b5adc261e2d1 100644
--- a/cocos/2d/CCTileMapAtlas.h
+++ b/cocos/2d/CCTileMapAtlas.h
@@ -59,7 +59,7 @@ class CC_DLL TileMapAtlas : public AtlasNode
     /** creates a TileMap with a tile file (atlas) with a map file and the width and height of each tile in points.
      The tile file will be loaded using the TextureMgr.
      */
-    static TileMapAtlas* create(const std::string& tile, const std::string& mapFile, int tileWidth, int tileHeight);
+    static TileMapAtlas* create(std::string_view tile, std::string_view mapFile, int tileWidth, int tileHeight);
     /**
      * @js ctor
      */
@@ -73,7 +73,7 @@ class CC_DLL TileMapAtlas : public AtlasNode
     /** initializes a TileMap with a tile file (atlas) with a map file and the width and height of each tile in points.
     The file will be loaded using the TextureMgr.
     */
-    bool initWithTileFile(const std::string& tile, const std::string& mapFile, int tileWidth, int tileHeight);
+    bool initWithTileFile(std::string_view tile, std::string_view mapFile, int tileWidth, int tileHeight);
     /**
      * Returns a tile from position x,y.
      *For the moment only channel R is used
@@ -100,7 +100,7 @@ class CC_DLL TileMapAtlas : public AtlasNode
     void setTGAInfo(struct sImageTGA* TGAInfo) { _TGAInfo = TGAInfo; }
 
 protected:
-    void loadTGAfile(const std::string& file);
+    void loadTGAfile(std::string_view file);
     void calculateItemsToRender();
     void updateAtlasValueAt(const Vec2& pos, const Color3B& value, int index);
     void updateAtlasValues();
diff --git a/cocos/3d/CCAnimate3D.cpp b/cocos/3d/CCAnimate3D.cpp
index 7ad77b1ce53d..a192bbd1bfc7 100644
--- a/cocos/3d/CCAnimate3D.cpp
+++ b/cocos/3d/CCAnimate3D.cpp
@@ -128,9 +128,9 @@ Animate3D* Animate3D::reverse() const
     return animate;
 }
 
-Node* findChildByNameRecursively(Node* node, const std::string& childName)
+Node* findChildByNameRecursively(Node* node, std::string_view childName)
 {
-    const std::string& name = node->getName();
+    std::string_view name = node->getName();
     if (name == childName)
         return node;
 
@@ -162,11 +162,11 @@ void Animate3D::startWithTarget(Node* target)
         {
             if (_animation)
             {
-                const std::unordered_map<std::string, Animation3D::Curve*>& boneCurves = _animation->getBoneCurves();
+                auto& boneCurves = _animation->getBoneCurves();
                 for (const auto& iter : boneCurves)
                 {
-                    const std::string& boneName = iter.first;
-                    auto skin                   = sprite->getSkeleton();
+                    std::string_view boneName = iter.first;
+                    auto skin                 = sprite->getSkeleton();
                     if (skin)
                     {
                         auto bone = skin->getBoneByName(boneName);
@@ -200,11 +200,11 @@ void Animate3D::startWithTarget(Node* target)
         }
         else
         {
-            const std::unordered_map<std::string, Animation3D::Curve*>& boneCurves = _animation->getBoneCurves();
+            auto& boneCurves = _animation->getBoneCurves();
             for (const auto& iter : boneCurves)
             {
-                const std::string& boneName = iter.first;
-                Node* node                  = nullptr;
+                std::string_view boneName = iter.first;
+                Node* node                = nullptr;
                 if (target->getName() == boneName)
                     node = target;
                 else
diff --git a/cocos/3d/CCAnimation3D.cpp b/cocos/3d/CCAnimation3D.cpp
index 7657842afd36..7407b218871c 100644
--- a/cocos/3d/CCAnimation3D.cpp
+++ b/cocos/3d/CCAnimation3D.cpp
@@ -29,11 +29,11 @@
 
 NS_CC_BEGIN
 
-Animation3D* Animation3D::create(const std::string& fileName, const std::string& animationName)
+Animation3D* Animation3D::create(std::string_view fileName, std::string_view animationName)
 {
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
-    std::string key      = fullPath + "#" + animationName;
-    auto animation       = Animation3DCache::getInstance()->getAnimation(key);
+    fullPath.append("#").append(animationName);
+    auto animation = Animation3DCache::getInstance()->getAnimation(fullPath);
     if (animation != nullptr)
         return animation;
 
@@ -50,7 +50,7 @@ Animation3D* Animation3D::create(const std::string& fileName, const std::string&
     return animation;
 }
 
-bool Animation3D::initWithFile(const std::string& filename, const std::string& animationName)
+bool Animation3D::initWithFile(std::string_view filename, std::string_view animationName)
 {
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filename);
 
@@ -59,8 +59,8 @@ bool Animation3D::initWithFile(const std::string& filename, const std::string& a
     Animation3DData animationdata;
     if (bundle->load(fullPath) && bundle->loadAnimationData(animationName, &animationdata) && init(animationdata))
     {
-        std::string key = fullPath + "#" + animationName;
-        Animation3DCache::getInstance()->addAnimation(key, this);
+        fullPath.append("#").append(animationName);
+        Animation3DCache::getInstance()->addAnimation(fullPath, this);
         Bundle3D::destroyBundle(bundle);
         return true;
     }
@@ -70,7 +70,7 @@ bool Animation3D::initWithFile(const std::string& filename, const std::string& a
     return false;
 }
 
-Animation3D::Curve* Animation3D::getBoneCurveByName(const std::string& name) const
+Animation3D::Curve* Animation3D::getBoneCurveByName(std::string_view name) const
 {
     auto it = _boneCurves.find(name);
     if (it != _boneCurves.end())
@@ -199,7 +199,7 @@ void Animation3DCache::destroyInstance()
     CC_SAFE_DELETE(_cacheInstance);
 }
 
-Animation3D* Animation3DCache::getAnimation(const std::string& key)
+Animation3D* Animation3DCache::getAnimation(std::string_view key)
 {
     auto it = _animations.find(key);
     if (it != _animations.end())
@@ -207,14 +207,14 @@ Animation3D* Animation3DCache::getAnimation(const std::string& key)
     return nullptr;
 }
 
-void Animation3DCache::addAnimation(const std::string& key, Animation3D* animation)
+void Animation3DCache::addAnimation(std::string_view key, Animation3D* animation)
 {
     const auto& it = _animations.find(key);
     if (it != _animations.end())
     {
         return;  // already have this key
     }
-    _animations[key] = animation;
+    _animations.emplace(key, animation);  //_animations[key] = animation;
     animation->retain();
 }
 
diff --git a/cocos/3d/CCAnimation3D.h b/cocos/3d/CCAnimation3D.h
index 80f528ae2702..64b1302d83ee 100644
--- a/cocos/3d/CCAnimation3D.h
+++ b/cocos/3d/CCAnimation3D.h
@@ -69,7 +69,7 @@ class CC_DLL Animation3D : public Ref
     };
 
     /**read all animation or only the animation with given animationName? animationName == "" read the first.*/
-    static Animation3D* create(const std::string& filename, const std::string& animationName = "");
+    static Animation3D* create(std::string_view filename, std::string_view animationName = "");
 
     /**get duration*/
     float getDuration() const { return _duration; }
@@ -79,10 +79,10 @@ class CC_DLL Animation3D : public Ref
      *
      * @lua NA
      */
-    Curve* getBoneCurveByName(const std::string& name) const;
+    Curve* getBoneCurveByName(std::string_view name) const;
 
     /**get the bone Curves set*/
-    const std::unordered_map<std::string, Curve*>& getBoneCurves() const { return _boneCurves; }
+    const hlookup::string_map<Curve*>& getBoneCurves() const { return _boneCurves; }
 
     CC_CONSTRUCTOR_ACCESS : Animation3D();
     virtual ~Animation3D();
@@ -90,10 +90,10 @@ class CC_DLL Animation3D : public Ref
     bool init(const Animation3DData& data);
 
     /**init Animation3D with file name and animation name*/
-    bool initWithFile(const std::string& filename, const std::string& animationName);
+    bool initWithFile(std::string_view filename, std::string_view animationName);
 
 protected:
-    std::unordered_map<std::string, Curve*> _boneCurves;  // bone curves map, key bone name, value AnimationCurve
+    hlookup::string_map<Curve*> _boneCurves;  // bone curves map, key bone name, value AnimationCurve
 
     float _duration;  // animation duration
 };
@@ -109,10 +109,10 @@ class Animation3DCache
     static void destroyInstance();
 
     /**get animation by key*/
-    Animation3D* getAnimation(const std::string& key);
+    Animation3D* getAnimation(std::string_view key);
 
     /**add animation to cache*/
-    void addAnimation(const std::string& key, Animation3D* animation);
+    void addAnimation(std::string_view key, Animation3D* animation);
 
     /**remove all animation*/
     void removeAllAnimations();
@@ -125,7 +125,7 @@ class Animation3DCache
 
     static Animation3DCache* _cacheInstance;  // cache instance
 
-    std::unordered_map<std::string, Animation3D*> _animations;  // cached animations
+    hlookup::string_map<Animation3D*> _animations;  // cached animations
 };
 
 // end of 3d group
diff --git a/cocos/3d/CCBillBoard.cpp b/cocos/3d/CCBillBoard.cpp
index 427d262a4c72..5eaba2dbb015 100644
--- a/cocos/3d/CCBillBoard.cpp
+++ b/cocos/3d/CCBillBoard.cpp
@@ -53,7 +53,7 @@ BillBoard* BillBoard::createWithTexture(Texture2D* texture, Mode mode)
     return nullptr;
 }
 
-BillBoard* BillBoard::create(const std::string& filename, Mode mode)
+BillBoard* BillBoard::create(std::string_view filename, Mode mode)
 {
     BillBoard* billboard = new BillBoard();
     if (billboard->initWithFile(filename))
@@ -66,7 +66,7 @@ BillBoard* BillBoard::create(const std::string& filename, Mode mode)
     return nullptr;
 }
 
-BillBoard* BillBoard::create(const std::string& filename, const Rect& rect, Mode mode)
+BillBoard* BillBoard::create(std::string_view filename, const Rect& rect, Mode mode)
 {
     BillBoard* billboard = new BillBoard();
     if (billboard->initWithFile(filename, rect))
diff --git a/cocos/3d/CCBillBoard.h b/cocos/3d/CCBillBoard.h
index 4eef5d257a16..2f3237023571 100644
--- a/cocos/3d/CCBillBoard.h
+++ b/cocos/3d/CCBillBoard.h
@@ -63,7 +63,7 @@ class CC_DLL BillBoard : public Sprite
      * @param   filename A path to image file, e.g., "scene1/monster.png"
      * @return  An autoreleased BillBoard object.
      */
-    static BillBoard* create(const std::string& filename, Mode mode = Mode::VIEW_POINT_ORIENTED);
+    static BillBoard* create(std::string_view filename, Mode mode = Mode::VIEW_POINT_ORIENTED);
 
     /**
      * Creates a BillBoard with an image filename and a rect.
@@ -72,7 +72,7 @@ class CC_DLL BillBoard : public Sprite
      * @param   rect     A subrect of the image file
      * @return  An autoreleased BillBoard object
      */
-    static BillBoard* create(const std::string& filename, const Rect& rect, Mode mode = Mode::VIEW_POINT_ORIENTED);
+    static BillBoard* create(std::string_view filename, const Rect& rect, Mode mode = Mode::VIEW_POINT_ORIENTED);
 
     /**
      * Creates a BillBoard with a Texture2D object.
diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp
index d735f5f39d2d..2f18d15daa71 100644
--- a/cocos/3d/CCBundle3D.cpp
+++ b/cocos/3d/CCBundle3D.cpp
@@ -169,7 +169,7 @@ void Bundle3D::clear()
     }
 }
 
-bool Bundle3D::load(const std::string& path)
+bool Bundle3D::load(std::string_view path)
 {
     if (path.empty())
         return false;
@@ -193,7 +193,7 @@ bool Bundle3D::load(const std::string& path)
     }
     else
     {
-        CCLOG("warning: %s is invalid file formate", path.c_str());
+        CCLOG("warning: %s is invalid file formate", path.data());
     }
 
     ret ? (_path = path) : (_path = "");
@@ -204,7 +204,7 @@ bool Bundle3D::load(const std::string& path)
 bool Bundle3D::loadObj(MeshDatas& meshdatas,
                        MaterialDatas& materialdatas,
                        NodeDatas& nodedatas,
-                       const std::string& fullPath,
+                       std::string_view fullPath,
                        const char* mtl_basepath)
 {
     meshdatas.resetData();
@@ -219,7 +219,7 @@ bool Bundle3D::loadObj(MeshDatas& meshdatas,
 
     std::vector<tinyobj::shape_t> shapes;
     std::vector<tinyobj::material_t> materials;
-    auto ret = tinyobj::LoadObj(shapes, materials, fullPath.c_str(), mtlPath.c_str());
+    auto ret = tinyobj::LoadObj(shapes, materials, fullPath.data(), mtlPath.c_str());
     if (ret.empty())
     {
         // fill data
@@ -329,11 +329,11 @@ bool Bundle3D::loadObj(MeshDatas& meshdatas,
 
         return true;
     }
-    CCLOG("warning: load %s file error: %s", fullPath.c_str(), ret.c_str());
+    CCLOG("warning: load %s file error: %s", fullPath.data(), ret.c_str());
     return false;
 }
 
-bool Bundle3D::loadSkinData(const std::string& /*id*/, SkinData* skindata)
+bool Bundle3D::loadSkinData(std::string_view /*id*/, SkinData* skindata)
 {
     skindata->resetData();
 
@@ -347,7 +347,7 @@ bool Bundle3D::loadSkinData(const std::string& /*id*/, SkinData* skindata)
     }
 }
 
-bool Bundle3D::loadAnimationData(const std::string& id, Animation3DData* animationdata)
+bool Bundle3D::loadAnimationData(std::string_view id, Animation3DData* animationdata)
 {
     animationdata->resetData();
 
@@ -1062,7 +1062,7 @@ bool Bundle3D::loadMaterialsJson(MaterialDatas& materialdatas)
     }
     return true;
 }
-bool Bundle3D::loadJson(const std::string& path)
+bool Bundle3D::loadJson(std::string_view path)
 {
     clear();
 
@@ -1084,7 +1084,7 @@ bool Bundle3D::loadJson(const std::string& path)
     return true;
 }
 
-bool Bundle3D::loadBinary(const std::string& path)
+bool Bundle3D::loadBinary(std::string_view path)
 {
     clear();
 
@@ -1094,7 +1094,7 @@ bool Bundle3D::loadBinary(const std::string& path)
     if (_binaryBuffer.isNull())
     {
         clear();
-        CCLOG("warning: Failed to read file: %s", path.c_str());
+        CCLOG("warning: Failed to read file: %s", path.data());
         return false;
     }
 
@@ -1107,7 +1107,7 @@ bool Bundle3D::loadBinary(const std::string& path)
     if (_binaryReader.read(sig, 1, 4) != 4 || memcmp(sig, identifier, 4) != 0)
     {
         clear();
-        CCLOG("warning: Invalid identifier: %s", path.c_str());
+        CCLOG("warning: Invalid identifier: %s", path.data());
         return false;
     }
 
@@ -1127,7 +1127,7 @@ bool Bundle3D::loadBinary(const std::string& path)
     if (_binaryReader.read(&_referenceCount, 4, 1) != 1)
     {
         clear();
-        CCLOG("warning: Failed to read ref table size '%s'.", path.c_str());
+        CCLOG("warning: Failed to read ref table size '%s'.", path.data());
         return false;
     }
 
@@ -1141,7 +1141,7 @@ bool Bundle3D::loadBinary(const std::string& path)
             _binaryReader.read(&_references[i].offset, 4, 1) != 1)
         {
             clear();
-            CCLOG("warning: Failed to read ref number %u for bundle '%s'.", i, path.c_str());
+            CCLOG("warning: Failed to read ref number %u for bundle '%s'.", i, path.data());
             CC_SAFE_DELETE_ARRAY(_references);
             return false;
         }
@@ -1460,7 +1460,7 @@ bool loadMaterialDataJson_0_2(MaterialData* /*materialdata*/)
     return true;
 }
 
-bool Bundle3D::loadAnimationDataJson(const std::string& id, Animation3DData* animationdata)
+bool Bundle3D::loadAnimationDataJson(std::string_view id, Animation3DData* animationdata)
 {
     std::string anim = "";
     if (_version == "1.2" || _version == "0.2")
@@ -1549,7 +1549,7 @@ bool Bundle3D::loadAnimationDataJson(const std::string& id, Animation3DData* ani
     return true;
 }
 
-bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* animationdata)
+bool Bundle3D::loadAnimationDataBinary(std::string_view id, Animation3DData* animationdata)
 {
 
     if (_version == "0.1" || _version == "0.2" || _version == "0.3" || _version == "0.4")
@@ -1560,9 +1560,9 @@ bool Bundle3D::loadAnimationDataBinary(const std::string& id, Animation3DData* a
     else
     {
         // if id is not a null string, we need to add a suffix of "animation" for seeding.
-        std::string id_ = id;
-        if (id != "")
-            id_ = id + "animation";
+        std::string id_{id};
+        if (!id.empty())
+            id_.append("animation");
 
         if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS, id_))
             return false;
@@ -1998,7 +1998,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton, bool singleSprit
     return nodedata;
 }
 
-backend::VertexFormat Bundle3D::parseGLDataType(const std::string& str, int size)
+backend::VertexFormat Bundle3D::parseGLDataType(std::string_view str, int size)
 {
     backend::VertexFormat ret = backend::VertexFormat::INT;
     if (str == "GL_BYTE")
@@ -2097,7 +2097,7 @@ backend::VertexFormat Bundle3D::parseGLDataType(const std::string& str, int size
     return ret;
 }
 
-backend::SamplerAddressMode Bundle3D::parseSamplerAddressMode(const std::string& str)
+backend::SamplerAddressMode Bundle3D::parseSamplerAddressMode(std::string_view str)
 {
 
     if (str == "REPEAT")
@@ -2115,7 +2115,7 @@ backend::SamplerAddressMode Bundle3D::parseSamplerAddressMode(const std::string&
     }
 }
 
-NTextureData::Usage Bundle3D::parseGLTextureType(const std::string& str)
+NTextureData::Usage Bundle3D::parseGLTextureType(std::string_view str)
 {
     if (str == "AMBIENT")
     {
@@ -2163,7 +2163,7 @@ NTextureData::Usage Bundle3D::parseGLTextureType(const std::string& str)
         return NTextureData::Usage::Unknown;
     }
 }
-shaderinfos::VertexKey Bundle3D::parseGLProgramAttribute(const std::string& str)
+shaderinfos::VertexKey Bundle3D::parseGLProgramAttribute(std::string_view str)
 {
     if (str == "VERTEX_ATTRIB_POSITION")
     {
@@ -2233,14 +2233,14 @@ shaderinfos::VertexKey Bundle3D::parseGLProgramAttribute(const std::string& str)
     }
 }
 
-void Bundle3D::getModelRelativePath(const std::string& path)
+void Bundle3D::getModelRelativePath(std::string_view path)
 {
     ssize_t index = path.find_last_of('/');
     std::string fullModelPath;
     _modelPath = path.substr(0, index + 1);
 }
 
-Reference* Bundle3D::seekToFirstType(unsigned int type, const std::string& id)
+Reference* Bundle3D::seekToFirstType(unsigned int type, std::string_view id)
 {
     // for each Reference
     for (unsigned int i = 0; i < _referenceCount; ++i)
@@ -2266,7 +2266,7 @@ Reference* Bundle3D::seekToFirstType(unsigned int type, const std::string& id)
     return nullptr;
 }
 
-std::vector<Vec3> Bundle3D::getTrianglesList(const std::string& path)
+std::vector<Vec3> Bundle3D::getTrianglesList(std::string_view path)
 {
     std::vector<Vec3> trianglesList;
 
diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h
index 1a92eeb20d91..6fb3d760a13e 100644
--- a/cocos/3d/CCBundle3D.h
+++ b/cocos/3d/CCBundle3D.h
@@ -64,32 +64,32 @@ class CC_DLL Bundle3D
      * get define data type
      * @param str The type in string
      */
-    static backend::VertexFormat parseGLDataType(const std::string& str, int size);
+    static backend::VertexFormat parseGLDataType(std::string_view str, int size);
 
     /**
      * get define data type
      * @param str The type in string
      */
-    static backend::SamplerAddressMode parseSamplerAddressMode(const std::string& str);
+    static backend::SamplerAddressMode parseSamplerAddressMode(std::string_view str);
 
     /**
      * load a file. You must load a file first, then call loadMeshData, loadSkinData, and so on
      * @param path File to be loaded
      * @return result of load
      */
-    virtual bool load(const std::string& path);
+    virtual bool load(std::string_view path);
 
     /**
      * load skin data from bundle
      * @param id The ID of the skin, load the first Skin in the bundle if it is empty
      */
-    virtual bool loadSkinData(const std::string& id, SkinData* skindata);
+    virtual bool loadSkinData(std::string_view id, SkinData* skindata);
 
     /**
      * load material data from bundle
      * @param id The ID of the animation, load the first animation in the bundle if it is empty
      */
-    virtual bool loadAnimationData(const std::string& id, Animation3DData* animationdata);
+    virtual bool loadAnimationData(std::string_view id, Animation3DData* animationdata);
 
     // since 3.3, to support reskin
     virtual bool loadMeshDatas(MeshDatas& meshdatas);
@@ -102,21 +102,21 @@ class CC_DLL Bundle3D
      * load triangle list
      * @param path the file path to load
      */
-    static std::vector<Vec3> getTrianglesList(const std::string& path);
+    static std::vector<Vec3> getTrianglesList(std::string_view path);
 
     // load .obj file
     static bool loadObj(MeshDatas& meshdatas,
                         MaterialDatas& materialdatas,
                         NodeDatas& nodedatas,
-                        const std::string& fullPath,
+                        std::string_view fullPath,
                         const char* mtl_basepath = nullptr);
 
     // calculate aabb
     static AABB calculateAABB(const std::vector<float>& vertex, int stride, const std::vector<unsigned short>& index);
 
 protected:
-    bool loadJson(const std::string& path);
-    bool loadBinary(const std::string& path);
+    bool loadJson(std::string_view path);
+    bool loadBinary(std::string_view path);
     bool loadMeshDatasJson(MeshDatas& meshdatas);
     bool loadMeshDataJson_0_1(MeshDatas& meshdatas);
     bool loadMeshDataJson_0_2(MeshDatas& meshdatas);
@@ -137,8 +137,8 @@ class CC_DLL Bundle3D
     bool loadMaterialDataJson(MaterialData* materialdata);
     bool loadMaterialDataJson_0_1(MaterialData* materialdata);
     bool loadMaterialDataJson_0_2(MaterialData* materialdata);
-    bool loadAnimationDataJson(const std::string& id, Animation3DData* animationdata);
-    bool loadAnimationDataBinary(const std::string& id, Animation3DData* animationdata);
+    bool loadAnimationDataJson(std::string_view id, Animation3DData* animationdata);
+    bool loadAnimationDataBinary(std::string_view id, Animation3DData* animationdata);
 
     /**
      * load nodes of json
@@ -156,26 +156,26 @@ class CC_DLL Bundle3D
      * get define data type
      * @param str The type in string
      */
-    NTextureData::Usage parseGLTextureType(const std::string& str);
+    NTextureData::Usage parseGLTextureType(std::string_view str);
 
     /**
      * get vertex attribute type
      * @param str The type in string
      */
-    shaderinfos::VertexKey parseGLProgramAttribute(const std::string& str);
+    shaderinfos::VertexKey parseGLProgramAttribute(std::string_view str);
 
     /*
      * get model path
      * @param str Full path of model file
      */
-    void getModelRelativePath(const std::string& path);
+    void getModelRelativePath(std::string_view path);
 
     /*
      * set the read position in buffer to the target type
      * @param The data type
      * @param The data id
      */
-    Reference* seekToFirstType(unsigned int type, const std::string& id = "");
+    Reference* seekToFirstType(unsigned int type, std::string_view id = "");
 
     CC_CONSTRUCTOR_ACCESS : Bundle3D();
     virtual ~Bundle3D();
diff --git a/cocos/3d/CCBundle3DData.h b/cocos/3d/CCBundle3DData.h
index 2f54bdfcf2af..25382094583d 100644
--- a/cocos/3d/CCBundle3DData.h
+++ b/cocos/3d/CCBundle3DData.h
@@ -220,21 +220,21 @@ struct SkinData
         rootBoneIndex = -1;
     }
 
-    void addSkinBoneNames(const std::string& name)
+    void addSkinBoneNames(std::string_view name)
     {
         auto it = std::find(skinBoneNames.begin(), skinBoneNames.end(), name);
         if (it == skinBoneNames.end())
-            skinBoneNames.push_back(name);
+            skinBoneNames.push_back(std::string{name});
     }
 
-    void addNodeBoneNames(const std::string& name)
+    void addNodeBoneNames(std::string_view name)
     {
         auto it = std::find(nodeBoneNames.begin(), nodeBoneNames.end(), name);
         if (it == nodeBoneNames.end())
-            nodeBoneNames.push_back(name);
+            nodeBoneNames.push_back(std::string{name});
     }
 
-    int getSkinBoneNameIndex(const std::string& name) const
+    int getSkinBoneNameIndex(std::string_view name) const
     {
         int i = 0;
         for (const auto& iter : skinBoneNames)
@@ -246,7 +246,7 @@ struct SkinData
         return -1;
     }
 
-    int getBoneNameIndex(const std::string& name) const
+    int getBoneNameIndex(std::string_view name) const
     {
         int i = 0;
         for (const auto& iter : skinBoneNames)
@@ -323,7 +323,7 @@ struct MaterialDatas
 {
     std::vector<NMaterialData> materials;
     void resetData() { materials.clear(); }
-    const NMaterialData* getMaterialData(const std::string& materialid) const
+    const NMaterialData* getMaterialData(std::string_view materialid) const
     {
         for (const auto& it : materials)
         {
diff --git a/cocos/3d/CCMesh.cpp b/cocos/3d/CCMesh.cpp
index 92a9434da0c9..3a2478849907 100644
--- a/cocos/3d/CCMesh.cpp
+++ b/cocos/3d/CCMesh.cpp
@@ -228,7 +228,7 @@ Mesh* Mesh::create(const std::vector<float>& vertices,
     return create("", indexData);
 }
 
-Mesh* Mesh::create(const std::string& name, MeshIndexData* indexData, MeshSkin* skin)
+Mesh* Mesh::create(std::string_view name, MeshIndexData* indexData, MeshSkin* skin)
 {
     auto state = new Mesh();
     state->autorelease();
@@ -255,7 +255,7 @@ bool Mesh::isVisible() const
     return _visible;
 }
 
-void Mesh::setTexture(const std::string& texPath)
+void Mesh::setTexture(std::string_view texPath)
 {
     _texFile = texPath;
     auto tex = Director::getInstance()->getTextureCache()->addImage(texPath);
@@ -307,7 +307,7 @@ void Mesh::setTexture(Texture2D* tex, NTextureData::Usage usage, bool cacheFileN
     }
 }
 
-void Mesh::setTexture(const std::string& texPath, NTextureData::Usage usage)
+void Mesh::setTexture(std::string_view texPath, NTextureData::Usage usage)
 {
     auto tex = Director::getInstance()->getTextureCache()->addImage(texPath);
     setTexture(tex, usage);
@@ -350,7 +350,7 @@ void Mesh::setMaterial(Material* material)
                 if (_material->getTechnique()->getName().compare(technique->getName()) == 0)
                 {
                     auto program        = pass->getProgramState()->getProgram();
-                    auto& attributes    = program->getActiveAttributes();
+                    auto attributes     = program->getActiveAttributes();
                     auto meshVertexData = _meshIndexData->getMeshVertexData();
                     auto attributeCount = meshVertexData->getMeshVertexAttribCount();
                     CCASSERT(attributes.size() <= attributeCount, "missing attribute data");
diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h
index bbd9610b7ac7..3f8490edca82 100644
--- a/cocos/3d/CCMesh.h
+++ b/cocos/3d/CCMesh.h
@@ -83,7 +83,7 @@ class CC_DLL Mesh : public Ref
      * create mesh
      * @lua NA
      */
-    static Mesh* create(const std::string& name, MeshIndexData* indexData, MeshSkin* skin = nullptr);
+    static Mesh* create(std::string_view name, MeshIndexData* indexData, MeshSkin* skin = nullptr);
 
     /**
      * get vertex buffer
@@ -109,7 +109,7 @@ class CC_DLL Mesh : public Ref
      * call setTexture(texPath, NTextureData::Usage::Diffuse)
      * @param texPath texture path
      */
-    void setTexture(const std::string& texPath);
+    void setTexture(std::string_view texPath);
     /**
      * set texture (diffuse), which is responsible for the main appearance. It is also means main texture, you can also
      * call setTexture(texPath, NTextureData::Usage::Diffuse)
@@ -128,7 +128,7 @@ class CC_DLL Mesh : public Ref
      * @param texPath texture path
      * @param usage Usage of this texture
      */
-    void setTexture(const std::string& texPath, NTextureData::Usage usage);
+    void setTexture(std::string_view texPath, NTextureData::Usage usage);
     /**
      * Get texture (diffuse), which is responsible for the main appearance. It is also means main texture, you can also
      * call getTexture(NTextureData::Usage::Diffuse)
@@ -168,7 +168,7 @@ class CC_DLL Mesh : public Ref
     backend::ProgramState* getProgramState() const;
 
     /**name getter */
-    const std::string& getName() const { return _name; }
+    std::string_view getName() const { return _name; }
 
     void setBlendFunc(const BlendFunc& blendFunc);
     const BlendFunc& getBlendFunc() const;
@@ -225,7 +225,7 @@ class CC_DLL Mesh : public Ref
     /**Mesh index data setter*/
     void setMeshIndexData(MeshIndexData* indexdata);
     /**name setter*/
-    void setName(const std::string& name) { _name = name; }
+    void setName(std::string_view name) { _name = name; }
 
     /**
      * calculate the AABB of the mesh
diff --git a/cocos/3d/CCMeshSkin.cpp b/cocos/3d/CCMeshSkin.cpp
index 903ff6cc7b87..868aa50e088b 100644
--- a/cocos/3d/CCMeshSkin.cpp
+++ b/cocos/3d/CCMeshSkin.cpp
@@ -75,7 +75,7 @@ Bone3D* MeshSkin::getBoneByIndex(unsigned int index) const
 
     return nullptr;
 }
-Bone3D* MeshSkin::getBoneByName(const std::string& id) const
+Bone3D* MeshSkin::getBoneByName(std::string_view id) const
 {
     // search from skin bones
     for (const auto& it : _skinBones)
diff --git a/cocos/3d/CCMeshSkin.h b/cocos/3d/CCMeshSkin.h
index 13df17857297..3533f113376d 100644
--- a/cocos/3d/CCMeshSkin.h
+++ b/cocos/3d/CCMeshSkin.h
@@ -54,7 +54,7 @@ class CC_DLL MeshSkin : public Ref
 
 public:
     /**create a new meshskin if do not want to share meshskin*/
-    static MeshSkin* create(Skeleton3D* skeleton, const std::string& filename, const std::string& name);
+    static MeshSkin* create(Skeleton3D* skeleton, std::string_view filename, std::string_view name);
 
     static MeshSkin* create(Skeleton3D* skeleton,
                             const std::vector<std::string>& boneNames,
@@ -65,7 +65,7 @@ class CC_DLL MeshSkin : public Ref
 
     /**get bone*/
     Bone3D* getBoneByIndex(unsigned int index) const;
-    Bone3D* getBoneByName(const std::string& id) const;
+    Bone3D* getBoneByName(std::string_view id) const;
 
     /**get bone index*/
     int getBoneIndex(Bone3D* bone) const;
diff --git a/cocos/3d/CCMeshVertexIndexData.cpp b/cocos/3d/CCMeshVertexIndexData.cpp
index 0f4c7308594d..3e0544022d3c 100644
--- a/cocos/3d/CCMeshVertexIndexData.cpp
+++ b/cocos/3d/CCMeshVertexIndexData.cpp
@@ -49,7 +49,7 @@ using namespace std;
 NS_CC_BEGIN
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-MeshIndexData* MeshIndexData::create(const std::string& id,
+MeshIndexData* MeshIndexData::create(std::string_view id,
                                      MeshVertexData* vertexData,
                                      backend::Buffer* indexbuffer,
                                      const AABB& aabb)
@@ -160,7 +160,7 @@ MeshVertexData* MeshVertexData::create(const MeshData& meshdata)
     return vertexdata;
 }
 
-MeshIndexData* MeshVertexData::getMeshIndexDataById(const std::string& id) const
+MeshIndexData* MeshVertexData::getMeshIndexDataById(std::string_view id) const
 {
     for (auto it : _indexs)
     {
diff --git a/cocos/3d/CCMeshVertexIndexData.h b/cocos/3d/CCMeshVertexIndexData.h
index a65a9ab64105..ef68b9455cdf 100644
--- a/cocos/3d/CCMeshVertexIndexData.h
+++ b/cocos/3d/CCMeshVertexIndexData.h
@@ -55,7 +55,7 @@ class CC_DLL MeshIndexData : public Ref
 {
 public:
     /** create  */
-    static MeshIndexData* create(const std::string& id,
+    static MeshIndexData* create(std::string_view id,
                                  MeshVertexData* vertexData,
                                  backend::Buffer* indexbuffer,
                                  const AABB& aabb);
@@ -74,8 +74,8 @@ class CC_DLL MeshIndexData : public Ref
     const AABB& getAABB() const { return _aabb; }
 
     /** id setter and getter */
-    void setId(const std::string& id) { _id = id; }
-    const std::string& getId() const { return _id; }
+    void setId(std::string_view id) { _id = id; }
+    std::string_view getId() const { return _id; }
 
     /**primitive type setter & getter*/
     MeshCommand::PrimitiveType getPrimitiveType() const { return _primitiveType; }
@@ -128,7 +128,7 @@ class CC_DLL MeshVertexData : public Ref
     /** get index data by index */
     MeshIndexData* getMeshIndexDataByIndex(int index) const { return _indexs.at(index); }
     /** get index data by id */
-    MeshIndexData* getMeshIndexDataById(const std::string& id) const;
+    MeshIndexData* getMeshIndexDataById(std::string_view id) const;
 
     ssize_t getSizePerVertex() const { return _sizePerVertex; }
 
diff --git a/cocos/3d/CCMotionStreak3D.cpp b/cocos/3d/CCMotionStreak3D.cpp
index e7ca8d32df9b..6337c9fd6668 100644
--- a/cocos/3d/CCMotionStreak3D.cpp
+++ b/cocos/3d/CCMotionStreak3D.cpp
@@ -61,7 +61,7 @@ MotionStreak3D* MotionStreak3D::create(float fade,
                                        float minSeg,
                                        float stroke,
                                        const Color3B& color,
-                                       const std::string& path)
+                                       std::string_view path)
 {
     MotionStreak3D* ret = new MotionStreak3D();
     if (ret && ret->initWithFade(fade, minSeg, stroke, color, path))
@@ -87,7 +87,7 @@ MotionStreak3D* MotionStreak3D::create(float fade, float minSeg, float stroke, c
     return nullptr;
 }
 
-bool MotionStreak3D::initWithFade(float fade, float minSeg, float stroke, const Color3B& color, const std::string& path)
+bool MotionStreak3D::initWithFade(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path)
 {
     CCASSERT(!path.empty(), "Invalid filename");
 
diff --git a/cocos/3d/CCMotionStreak3D.h b/cocos/3d/CCMotionStreak3D.h
index 6b020a02cd6a..dc7e072e3c45 100644
--- a/cocos/3d/CCMotionStreak3D.h
+++ b/cocos/3d/CCMotionStreak3D.h
@@ -57,11 +57,7 @@ class CC_DLL MotionStreak3D : public Node, public TextureProtocol
      * @param path The texture file name of stoke.
      * @return An autoreleased MotionStreak3D object.
      */
-    static MotionStreak3D* create(float fade,
-                                  float minSeg,
-                                  float stroke,
-                                  const Color3B& color,
-                                  const std::string& path);
+    static MotionStreak3D* create(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path);
     /** Creates and initializes a motion streak with fade in seconds, minimum segments, stroke's width, color, texture.
      *
      * @param fade The fade time, in seconds.
@@ -164,7 +160,7 @@ class CC_DLL MotionStreak3D : public Node, public TextureProtocol
 
     /** initializes a motion streak with fade in seconds, minimum segments, stroke's width, color and texture filename
      */
-    bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, const std::string& path);
+    bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, std::string_view path);
 
     /** initializes a motion streak with fade in seconds, minimum segments, stroke's width, color and texture  */
     bool initWithFade(float fade, float minSeg, float stroke, const Color3B& color, Texture2D* texture);
diff --git a/cocos/3d/CCObjLoader.cpp b/cocos/3d/CCObjLoader.cpp
index 4d78b5d4750a..b3f0935f86ee 100644
--- a/cocos/3d/CCObjLoader.cpp
+++ b/cocos/3d/CCObjLoader.cpp
@@ -395,7 +395,7 @@ static bool exportFaceGroupToShape(shape_t& shape,
                                    const std::vector<float>& in_texcoords,
                                    const std::vector<std::vector<vertex_index>>& faceGroup,
                                    const int material_id,
-                                   const std::string& name,
+                                   std::string_view name,
                                    bool clearCache)
 {
     if (faceGroup.empty())
@@ -517,7 +517,7 @@ std::string LoadMtl(std::map<std::string, int>& material_map,
             char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
             token += 7;
 #ifdef _MSC_VER
-            sscanf_s(token, "%s", namebuf, _countof(namebuf));
+            sscanf_s(token, "%s", namebuf, static_cast<unsigned int>(_countof(namebuf)));
 #else
             sscanf(token, "%s", namebuf);
 #endif
@@ -681,7 +681,7 @@ std::string LoadMtl(std::map<std::string, int>& material_map,
     return err.str();
 }
 
-std::string MaterialFileReader::operator()(const std::string& matId,
+std::string MaterialFileReader::operator()(std::string_view matId,
                                            std::vector<material_t>& materials,
                                            std::map<std::string, int>& matMap)
 {
@@ -689,7 +689,7 @@ std::string MaterialFileReader::operator()(const std::string& matId,
 
     if (!m_mtlBasePath.empty())
     {
-        filepath = std::string(m_mtlBasePath) + matId;
+        filepath.append(m_mtlBasePath).append(matId);
     }
     else
     {
diff --git a/cocos/3d/CCObjLoader.h b/cocos/3d/CCObjLoader.h
index ef0dde2912b0..af64222dc36d 100644
--- a/cocos/3d/CCObjLoader.h
+++ b/cocos/3d/CCObjLoader.h
@@ -75,7 +75,7 @@ class MaterialReader
     MaterialReader() {}
     virtual ~MaterialReader() {}
 
-    virtual std::string operator()(const std::string& matId,
+    virtual std::string operator()(std::string_view matId,
                                    std::vector<material_t>& materials,
                                    std::map<std::string, int>& matMap) = 0;
 };
@@ -83,9 +83,9 @@ class MaterialReader
 class MaterialFileReader : public MaterialReader
 {
 public:
-    MaterialFileReader(const std::string& mtl_basepath) : m_mtlBasePath(mtl_basepath) {}
+    MaterialFileReader(std::string_view mtl_basepath) : m_mtlBasePath(mtl_basepath) {}
     virtual ~MaterialFileReader() {}
-    virtual std::string operator()(const std::string& matId,
+    virtual std::string operator()(std::string_view matId,
                                    std::vector<material_t>& materials,
                                    std::map<std::string, int>& matMap);
 
diff --git a/cocos/3d/CCSkeleton3D.cpp b/cocos/3d/CCSkeleton3D.cpp
index 4bf8763fbada..7aa8d6a386f2 100644
--- a/cocos/3d/CCSkeleton3D.cpp
+++ b/cocos/3d/CCSkeleton3D.cpp
@@ -136,7 +136,7 @@ void Bone3D::clearBoneBlendState()
 /**
  * Creates C3DBone.
  */
-Bone3D* Bone3D::create(const std::string& id)
+Bone3D* Bone3D::create(std::string_view id)
 {
     auto bone = new Bone3D(id);
     bone->autorelease();
@@ -185,7 +185,7 @@ void Bone3D::removeAllChildBone()
     _children.clear();
 }
 
-Bone3D::Bone3D(const std::string& id) : _name(id), _parent(nullptr), _worldDirty(true) {}
+Bone3D::Bone3D(std::string_view id) : _name(id), _parent(nullptr), _worldDirty(true) {}
 
 Bone3D::~Bone3D()
 {
@@ -279,7 +279,7 @@ Bone3D* Skeleton3D::getBoneByIndex(unsigned int index) const
 
     return nullptr;
 }
-Bone3D* Skeleton3D::getBoneByName(const std::string& id) const
+Bone3D* Skeleton3D::getBoneByName(std::string_view id) const
 {
     // search from bones
     for (auto it : _bones)
diff --git a/cocos/3d/CCSkeleton3D.h b/cocos/3d/CCSkeleton3D.h
index e63a06050cce..bd13a8a95998 100644
--- a/cocos/3d/CCSkeleton3D.h
+++ b/cocos/3d/CCSkeleton3D.h
@@ -61,7 +61,7 @@ class CC_DLL Bone3D : public Ref
     const Mat4& getWorldMat();
 
     /**get bone name*/
-    const std::string& getName() const { return _name; }
+    std::string_view getName() const { return _name; }
 
     /**
      * set animation value
@@ -78,7 +78,7 @@ class CC_DLL Bone3D : public Ref
     /**
      * Creates C3DBone.
      */
-    static Bone3D* create(const std::string& id);
+    static Bone3D* create(std::string_view id);
 
     /**
      * Sets the inverse bind pose matrix.
@@ -139,7 +139,7 @@ class CC_DLL Bone3D : public Ref
     /**
      * Constructor.
      */
-    Bone3D(const std::string& id);
+    Bone3D(std::string_view id);
 
     /**
      * Destructor.
@@ -190,7 +190,7 @@ class CC_DLL Skeleton3D : public Ref
 
     /**get bone*/
     Bone3D* getBoneByIndex(unsigned int index) const;
-    Bone3D* getBoneByName(const std::string& id) const;
+    Bone3D* getBoneByName(std::string_view id) const;
 
     /**get & set root bone*/
     ssize_t getRootCount() const;
diff --git a/cocos/3d/CCSkybox.cpp b/cocos/3d/CCSkybox.cpp
index e21c9770f88a..7e9d1fc2e81a 100644
--- a/cocos/3d/CCSkybox.cpp
+++ b/cocos/3d/CCSkybox.cpp
@@ -41,12 +41,12 @@ Skybox::~Skybox()
     _texture->release();
 }
 
-Skybox* Skybox::create(const std::string& positive_x,
-                       const std::string& negative_x,
-                       const std::string& positive_y,
-                       const std::string& negative_y,
-                       const std::string& positive_z,
-                       const std::string& negative_z)
+Skybox* Skybox::create(std::string_view positive_x,
+                       std::string_view negative_x,
+                       std::string_view positive_y,
+                       std::string_view negative_y,
+                       std::string_view positive_z,
+                       std::string_view negative_z)
 {
     auto ret = new Skybox();
     ret->init(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z);
@@ -90,12 +90,12 @@ bool Skybox::init()
     return true;
 }
 
-bool Skybox::init(const std::string& positive_x,
-                  const std::string& negative_x,
-                  const std::string& positive_y,
-                  const std::string& negative_y,
-                  const std::string& positive_z,
-                  const std::string& negative_z)
+bool Skybox::init(std::string_view positive_x,
+                  std::string_view negative_x,
+                  std::string_view positive_y,
+                  std::string_view negative_y,
+                  std::string_view positive_z,
+                  std::string_view negative_z)
 {
     auto texture = TextureCube::create(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z);
     if (texture == nullptr)
diff --git a/cocos/3d/CCSkybox.h b/cocos/3d/CCSkybox.h
index 644da6446330..40560f2978df 100644
--- a/cocos/3d/CCSkybox.h
+++ b/cocos/3d/CCSkybox.h
@@ -58,12 +58,12 @@ class CC_DLL Skybox : public Node
      @param negative_z texture for the rear side of the texture cube face.
      @return  A new skybox inited with given parameters.
      */
-    static Skybox* create(const std::string& positive_x,
-                          const std::string& negative_x,
-                          const std::string& positive_y,
-                          const std::string& negative_y,
-                          const std::string& positive_z,
-                          const std::string& negative_z);
+    static Skybox* create(std::string_view positive_x,
+                          std::string_view negative_x,
+                          std::string_view positive_y,
+                          std::string_view negative_y,
+                          std::string_view positive_z,
+                          std::string_view negative_z);
 
     /**texture getter and setter*/
     void setTexture(TextureCube*);
@@ -93,12 +93,12 @@ class CC_DLL Skybox : public Node
     /**
      * initialize with texture path
      */
-    bool init(const std::string& positive_x,
-              const std::string& negative_x,
-              const std::string& positive_y,
-              const std::string& negative_y,
-              const std::string& positive_z,
-              const std::string& negative_z);
+    bool init(std::string_view positive_x,
+              std::string_view negative_x,
+              std::string_view positive_y,
+              std::string_view negative_y,
+              std::string_view positive_z,
+              std::string_view negative_z);
 
 protected:
     /**
diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp
index 3dcdf8e65a8b..f4d2e8cb6826 100644
--- a/cocos/3d/CCSprite3D.cpp
+++ b/cocos/3d/CCSprite3D.cpp
@@ -63,7 +63,7 @@ Sprite3D* Sprite3D::create()
     return nullptr;
 }
 
-Sprite3D* Sprite3D::create(const std::string& modelPath)
+Sprite3D* Sprite3D::create(std::string_view modelPath)
 {
     CCASSERT(modelPath.length() >= 4, "invalid filename for Sprite3D");
 
@@ -77,7 +77,7 @@ Sprite3D* Sprite3D::create(const std::string& modelPath)
     CC_SAFE_DELETE(sprite);
     return nullptr;
 }
-Sprite3D* Sprite3D::create(const std::string& modelPath, const std::string& texturePath)
+Sprite3D* Sprite3D::create(std::string_view modelPath, std::string_view texturePath)
 {
     auto sprite = create(modelPath);
     if (sprite)
@@ -88,15 +88,15 @@ Sprite3D* Sprite3D::create(const std::string& modelPath, const std::string& text
     return sprite;
 }
 
-void Sprite3D::createAsync(const std::string& modelPath,
+void Sprite3D::createAsync(std::string_view modelPath,
                            const std::function<void(Sprite3D*, void*)>& callback,
                            void* callbackparam)
 {
     createAsync(modelPath, "", callback, callbackparam);
 }
 
-void Sprite3D::createAsync(const std::string& modelPath,
-                           const std::string& texturePath,
+void Sprite3D::createAsync(std::string_view modelPath,
+                           std::string_view texturePath,
                            const std::function<void(Sprite3D*, void*)>& callback,
                            void* callbackparam)
 {
@@ -197,7 +197,7 @@ AABB Sprite3D::getAABBRecursivelyImp(Node* node)
     return aabb;
 }
 
-bool Sprite3D::loadFromCache(const std::string& path)
+bool Sprite3D::loadFromCache(std::string_view path)
 {
     auto spritedata = Sprite3DCache::getInstance()->getSpriteData(path);
     if (spritedata)
@@ -238,7 +238,7 @@ bool Sprite3D::loadFromCache(const std::string& path)
     return false;
 }
 
-bool Sprite3D::loadFromFile(const std::string& path,
+bool Sprite3D::loadFromFile(std::string_view path,
                             NodeDatas* nodedatas,
                             MeshDatas* meshdatas,
                             MaterialDatas* materialdatas)
@@ -296,7 +296,7 @@ bool Sprite3D::init()
     return false;
 }
 
-bool Sprite3D::initWithFile(const std::string& path)
+bool Sprite3D::initWithFile(std::string_view path)
 {
     _aabbDirty = true;
     _meshes.clear();
@@ -654,7 +654,7 @@ void Sprite3D::createNode(NodeData* nodedata, Node* root, const MaterialDatas& m
     }
 }
 
-MeshIndexData* Sprite3D::getMeshIndexData(const std::string& indexId) const
+MeshIndexData* Sprite3D::getMeshIndexData(std::string_view indexId) const
 {
     for (auto it : _meshVertexDatas)
     {
@@ -672,7 +672,7 @@ void Sprite3D::addMesh(Mesh* mesh)
     _meshes.pushBack(mesh);
 }
 
-void Sprite3D::setTexture(const std::string& texFile)
+void Sprite3D::setTexture(std::string_view texFile)
 {
     auto tex = _director->getTextureCache()->addImage(texFile);
     setTexture(tex);
@@ -685,7 +685,7 @@ void Sprite3D::setTexture(Texture2D* texture)
         mesh->setTexture(texture);
     }
 }
-AttachNode* Sprite3D::getAttachNode(const std::string& boneName)
+AttachNode* Sprite3D::getAttachNode(std::string_view boneName)
 {
     auto it = _attachments.find(boneName);
     if (it != _attachments.end())
@@ -698,7 +698,7 @@ AttachNode* Sprite3D::getAttachNode(const std::string& boneName)
         {
             auto attachNode = AttachNode::create(bone);
             addChild(attachNode);
-            _attachments[boneName] = attachNode;
+            _attachments.emplace(boneName, attachNode);  // _attachments[boneName] = attachNode;
             return attachNode;
         }
     }
@@ -706,7 +706,7 @@ AttachNode* Sprite3D::getAttachNode(const std::string& boneName)
     return nullptr;
 }
 
-void Sprite3D::removeAttachNode(const std::string& boneName)
+void Sprite3D::removeAttachNode(std::string_view boneName)
 {
     auto it = _attachments.find(boneName);
     if (it != _attachments.end())
@@ -918,7 +918,7 @@ Mesh* Sprite3D::getMeshByIndex(int index) const
 }
 
 /**get Mesh by Name */
-Mesh* Sprite3D::getMeshByName(const std::string& name) const
+Mesh* Sprite3D::getMeshByName(std::string_view name) const
 {
     for (const auto& it : _meshes)
     {
@@ -928,7 +928,7 @@ Mesh* Sprite3D::getMeshByName(const std::string& name) const
     return nullptr;
 }
 
-std::vector<Mesh*> Sprite3D::getMeshArrayByName(const std::string& name) const
+std::vector<Mesh*> Sprite3D::getMeshArrayByName(std::string_view name) const
 {
     std::vector<Mesh*> meshes;
     for (const auto& it : _meshes)
@@ -973,7 +973,7 @@ void Sprite3DCache::destroyInstance()
     }
 }
 
-Sprite3DCache::Sprite3DData* Sprite3DCache::getSpriteData(const std::string& key) const
+Sprite3DCache::Sprite3DData* Sprite3DCache::getSpriteData(std::string_view key) const
 {
     auto it = _spriteDatas.find(key);
     if (it != _spriteDatas.end())
@@ -981,18 +981,18 @@ Sprite3DCache::Sprite3DData* Sprite3DCache::getSpriteData(const std::string& key
     return nullptr;
 }
 
-bool Sprite3DCache::addSprite3DData(const std::string& key, Sprite3DCache::Sprite3DData* spritedata)
+bool Sprite3DCache::addSprite3DData(std::string_view key, Sprite3DCache::Sprite3DData* spritedata)
 {
     auto it = _spriteDatas.find(key);
     if (it == _spriteDatas.end())
     {
-        _spriteDatas[key] = spritedata;
+        _spriteDatas.emplace(key, spritedata);  // _spriteDatas[key] = spritedata;
         return true;
     }
     return false;
 }
 
-void Sprite3DCache::removeSprite3DData(const std::string& key)
+void Sprite3DCache::removeSprite3DData(std::string_view key)
 {
     auto it = _spriteDatas.find(key);
     if (it != _spriteDatas.end())
diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h
index 477b6968ce3a..d038ce60b7da 100644
--- a/cocos/3d/CCSprite3D.h
+++ b/cocos/3d/CCSprite3D.h
@@ -62,10 +62,10 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
     static Sprite3D* create();
 
     /** creates a Sprite3D*/
-    static Sprite3D* create(const std::string& modelPath);
+    static Sprite3D* create(std::string_view modelPath);
 
     // creates a Sprite3D. It only supports one texture, and overrides the internal texture with 'texturePath'
-    static Sprite3D* create(const std::string& modelPath, const std::string& texturePath);
+    static Sprite3D* create(std::string_view modelPath, std::string_view texturePath);
 
     /** create 3d sprite asynchronously
      * If the 3d model was previously loaded, it will create a new 3d sprite and the callback will be called at once.
@@ -76,31 +76,31 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
      * @param callback callback after loading
      * @param callbackparam user defined parameter for the callback
      */
-    static void createAsync(const std::string& modelPath,
+    static void createAsync(std::string_view modelPath,
                             const std::function<void(Sprite3D*, void*)>& callback,
                             void* callbackparam);
 
-    static void createAsync(const std::string& modelPath,
-                            const std::string& texturePath,
+    static void createAsync(std::string_view modelPath,
+                            std::string_view texturePath,
                             const std::function<void(Sprite3D*, void*)>& callback,
                             void* callbackparam);
 
     /**set diffuse texture, set the first if multiple textures exist*/
-    void setTexture(const std::string& texFile);
+    void setTexture(std::string_view texFile);
     void setTexture(Texture2D* texture);
 
     /**get Mesh by index*/
     Mesh* getMeshByIndex(int index) const;
 
     /**get Mesh by Name, it returns the first one if there are more than one mesh with the same name */
-    Mesh* getMeshByName(const std::string& name) const;
+    Mesh* getMeshByName(std::string_view name) const;
 
     /**
      * get mesh array by name, returns all meshes with the given name
      *
      * @lua NA
      */
-    std::vector<Mesh*> getMeshArrayByName(const std::string& name) const;
+    std::vector<Mesh*> getMeshArrayByName(std::string_view name) const;
 
     /**get mesh*/
     Mesh* getMesh() const;
@@ -111,10 +111,10 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
     Skeleton3D* getSkeleton() const { return _skeleton; }
 
     /**get AttachNode by bone name, return nullptr if not exist*/
-    AttachNode* getAttachNode(const std::string& boneName);
+    AttachNode* getAttachNode(std::string_view boneName);
 
     /**remove attach node*/
-    void removeAttachNode(const std::string& boneName);
+    void removeAttachNode(std::string_view boneName);
 
     /**remove all attach nodes*/
     void removeAllAttachNode();
@@ -214,19 +214,16 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
 
     virtual bool init() override;
 
-    bool initWithFile(const std::string& path);
+    bool initWithFile(std::string_view path);
 
     bool initFrom(const NodeDatas& nodedatas, const MeshDatas& meshdatas, const MaterialDatas& materialdatas);
 
     /**load sprite3d from cache, return true if succeed, false otherwise*/
-    bool loadFromCache(const std::string& path);
+    bool loadFromCache(std::string_view path);
 
     /** load file and set it to meshedatas, nodedatas and materialdatas, obj file .mtl file should be at the same
      * directory if exist */
-    bool loadFromFile(const std::string& path,
-                      NodeDatas* nodedatas,
-                      MeshDatas* meshdatas,
-                      MaterialDatas* materialdatas);
+    bool loadFromFile(std::string_view path, NodeDatas* nodedatas, MeshDatas* meshdatas, MaterialDatas* materialdatas);
 
     /**
      * Visits this Sprite3D's children and draw them recursively.
@@ -242,7 +239,7 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
     Sprite3D* createSprite3DNode(NodeData* nodedata, ModelData* modeldata, const MaterialDatas& materialdatas);
 
     /**get MeshIndexData by Id*/
-    MeshIndexData* getMeshIndexData(const std::string& indexId) const;
+    MeshIndexData* getMeshIndexData(std::string_view indexId) const;
 
     void addMesh(Mesh* mesh);
 
@@ -257,7 +254,7 @@ class CC_DLL Sprite3D : public Node, public BlendProtocol
 
     Vector<MeshVertexData*> _meshVertexDatas;
 
-    std::unordered_map<std::string, AttachNode*> _attachments;
+    hlookup::string_map<AttachNode*> _attachments;
 
     BlendFunc _blend;
 
@@ -319,17 +316,17 @@ class CC_DLL Sprite3DCache
      *
      * @lua NA
      */
-    Sprite3DData* getSpriteData(const std::string& key) const;
+    Sprite3DData* getSpriteData(std::string_view key) const;
 
     /**
      * add the SpriteData into Sprite3D by given the specified key
      *
      * @lua NA
      */
-    bool addSprite3DData(const std::string& key, Sprite3DData* spritedata);
+    bool addSprite3DData(std::string_view key, Sprite3DData* spritedata);
 
     /**remove the SpriteData from Sprite3D by given the specified key*/
-    void removeSprite3DData(const std::string& key);
+    void removeSprite3DData(std::string_view key);
 
     /**remove all the SpriteData from Sprite3D*/
     void removeAllSprite3DData();
@@ -339,7 +336,7 @@ class CC_DLL Sprite3DCache
 
 protected:
     static Sprite3DCache* _cacheInstance;
-    std::unordered_map<std::string, Sprite3DData*> _spriteDatas;  // cached sprite data
+    hlookup::string_map<Sprite3DData*> _spriteDatas;  // cached sprite data
 };
 
 // end of 3d group
diff --git a/cocos/3d/CCSprite3DMaterial.cpp b/cocos/3d/CCSprite3DMaterial.cpp
index 5be1ec697435..1c109af5bbf0 100644
--- a/cocos/3d/CCSprite3DMaterial.cpp
+++ b/cocos/3d/CCSprite3DMaterial.cpp
@@ -238,7 +238,7 @@ Sprite3DMaterial* Sprite3DMaterial::createBuiltInMaterial(MaterialType type, boo
     return nullptr;
 }
 
-Sprite3DMaterial* Sprite3DMaterial::createWithFilename(const std::string& path)
+Sprite3DMaterial* Sprite3DMaterial::createWithFilename(std::string_view path)
 {
     auto validfilename = FileUtils::getInstance()->fullPathForFilename(path);
     if (!validfilename.empty())
@@ -311,19 +311,19 @@ void Sprite3DMaterialCache::destroyInstance()
     }
 }
 
-bool Sprite3DMaterialCache::addSprite3DMaterial(const std::string& key, Texture2D* texture)
+bool Sprite3DMaterialCache::addSprite3DMaterial(std::string_view key, Texture2D* texture)
 {
     auto itr = _materials.find(key);
     if (itr == _materials.end())
     {
         CC_SAFE_RETAIN(texture);
-        _materials[key] = texture;
+        _materials.emplace(key, texture);
         return true;
     }
     return false;
 }
 
-Texture2D* Sprite3DMaterialCache::getSprite3DMaterial(const std::string& key)
+Texture2D* Sprite3DMaterialCache::getSprite3DMaterial(std::string_view key)
 {
     auto itr = _materials.find(key);
     if (itr != _materials.end())
diff --git a/cocos/3d/CCSprite3DMaterial.h b/cocos/3d/CCSprite3DMaterial.h
index 1a128d02189c..2162627f721d 100644
--- a/cocos/3d/CCSprite3DMaterial.h
+++ b/cocos/3d/CCSprite3DMaterial.h
@@ -87,7 +87,7 @@ class CC_DLL Sprite3DMaterial : public Material
      * @param path Path of material file
      * @return Created material
      */
-    static Sprite3DMaterial* createWithFilename(const std::string& path);
+    static Sprite3DMaterial* createWithFilename(std::string_view path);
 
     /**
      * Create material with GLProgramState
@@ -162,10 +162,10 @@ class Sprite3DMaterialCache
     static void destroyInstance();
 
     /**add to cache*/
-    bool addSprite3DMaterial(const std::string& key, Texture2D* tex);
+    bool addSprite3DMaterial(std::string_view key, Texture2D* tex);
 
     /**get material from cache*/
-    Texture2D* getSprite3DMaterial(const std::string& key);
+    Texture2D* getSprite3DMaterial(std::string_view key);
 
     /**remove all spritematerial*/
     void removeAllSprite3DMaterial();
@@ -178,8 +178,8 @@ class Sprite3DMaterialCache
     ~Sprite3DMaterialCache();
 
 protected:
-    static Sprite3DMaterialCache* _cacheInstance;            // instance
-    std::unordered_map<std::string, Texture2D*> _materials;  // cached material
+    static Sprite3DMaterialCache* _cacheInstance;  // instance
+    hlookup::string_map<Texture2D*> _materials;    // cached material
 };
 
 // end of 3d group
diff --git a/cocos/3d/CCTerrain.cpp b/cocos/3d/CCTerrain.cpp
index cc3bea4f6cf2..19e0f005613c 100644
--- a/cocos/3d/CCTerrain.cpp
+++ b/cocos/3d/CCTerrain.cpp
@@ -83,7 +83,7 @@ bool Terrain::initWithTerrainData(TerrainData& parameter, CrackFixedType fixedTy
     return initResult;
 }
 
-void cocos2d::Terrain::setLightMap(const std::string& fileName)
+void cocos2d::Terrain::setLightMap(std::string_view fileName)
 {
     CC_SAFE_RELEASE(_lightMap);
     auto image = new Image();
@@ -197,7 +197,7 @@ void Terrain::draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform,
     }
 }
 
-bool Terrain::initHeightMap(const std::string& heightMap)
+bool Terrain::initHeightMap(std::string_view heightMap)
 {
     _heightMapImage = new Image();
     _heightMapImage->initWithImageFile(heightMap);
@@ -343,7 +343,7 @@ float Terrain::getHeight(float x, float z, Vec3* normal) const
             normal->z = d - a;
             normal->normalize();
             //(*normal) = (1-u)*(1-v)*getNormal(i,j)+ (1-u)*v*getNormal(i,j+1) + u*(1-v)*getNormal(i+1,j)+
-            //u*v*getNormal(i+1,j+1);
+            // u*v*getNormal(i+1,j+1);
         }
         float result = (1 - u) * (1 - v) * getImageHeight(i, j) * getScaleY() +
                        (1 - u) * v * getImageHeight(i, j + 1) * getScaleY() +
@@ -611,7 +611,7 @@ cocos2d::Vec2 Terrain::convertToTerrainSpace(const Vec2& worldSpaceXZ) const
     return Vec2(image_x, image_y);
 }
 
-void Terrain::resetHeightMap(const std::string& heightMap)
+void Terrain::resetHeightMap(std::string_view heightMap)
 {
     _heightMapImage->release();
     _vertices.clear();
@@ -1154,8 +1154,8 @@ void Terrain::Chunk::updateIndicesLOD()
     }
     memcpy(_neighborOldLOD, currentNeighborLOD, sizeof(currentNeighborLOD));
     _oldLod   = _currentLod;
-    int gridY = _size.height;
-    int gridX = _size.width;
+    int gridY = static_cast<int>(_size.height);
+    int gridX = static_cast<int>(_size.width);
 
     int step = 1 << _currentLod;
     if ((_left && _left->_currentLod > _currentLod) || (_right && _right->_currentLod > _currentLod) ||
@@ -1644,8 +1644,8 @@ Terrain::QuadTree::~QuadTree()
         delete _br;
 }
 
-Terrain::TerrainData::TerrainData(const std::string& heightMapsrc,
-                                  const std::string& textureSrc,
+Terrain::TerrainData::TerrainData(std::string_view heightMapsrc,
+                                  std::string_view textureSrc,
                                   const Vec2& chunksize,
                                   float height,
                                   float scale)
@@ -1659,8 +1659,8 @@ Terrain::TerrainData::TerrainData(const std::string& heightMapsrc,
     _skirtHeightRatio                  = 1;
 }
 
-Terrain::TerrainData::TerrainData(const std::string& heightMapsrc,
-                                  const std::string& alphamap,
+Terrain::TerrainData::TerrainData(std::string_view heightMapsrc,
+                                  std::string_view alphamap,
                                   const DetailMap& detail1,
                                   const DetailMap& detail2,
                                   const DetailMap& detail3,
@@ -1682,8 +1682,8 @@ Terrain::TerrainData::TerrainData(const std::string& heightMapsrc,
     _skirtHeightRatio    = 1;
 }
 
-Terrain::TerrainData::TerrainData(const std::string& heightMapsrc,
-                                  const std::string& alphamap,
+Terrain::TerrainData::TerrainData(std::string_view heightMapsrc,
+                                  std::string_view alphamap,
                                   const DetailMap& detail1,
                                   const DetailMap& detail2,
                                   const DetailMap& detail3,
@@ -1729,7 +1729,7 @@ Terrain::ChunkIndices::~ChunkIndices()
     CC_SAFE_RELEASE_NULL(_indexBuffer);
 }
 
-Terrain::DetailMap::DetailMap(const std::string& detailMapPath, float size /*= 35*/)
+Terrain::DetailMap::DetailMap(std::string_view detailMapPath, float size /*= 35*/)
 {
     this->_detailMapSrc  = detailMapPath;
     this->_detailMapSize = size;
diff --git a/cocos/3d/CCTerrain.h b/cocos/3d/CCTerrain.h
index 25ebc401c9aa..e05a5721b2cc 100644
--- a/cocos/3d/CCTerrain.h
+++ b/cocos/3d/CCTerrain.h
@@ -108,7 +108,7 @@ class CC_DLL Terrain : public Node
     {
         /*Constructors*/
         DetailMap();
-        DetailMap(const std::string& detailMapSrc, float size = 35);
+        DetailMap(std::string_view detailMapSrc, float size = 35);
         /*detail Image source file path*/
         std::string _detailMapSrc;
         /*detailMapSize determine how many tiles that Terrain represent*/
@@ -136,14 +136,14 @@ class CC_DLL Terrain : public Node
         /**empty constructor*/
         TerrainData();
         /**constructor, this constructor construct a simple terrain which only have 1 detailmap*/
-        TerrainData(const std::string& heightMapsrc,
-                    const std::string& textureSrc,
+        TerrainData(std::string_view heightMapsrc,
+                    std::string_view textureSrc,
                     const Vec2& chunksize = Vec2(32, 32),
                     float mapHeight       = 2,
                     float mapScale        = 0.1);
         /**constructor, this constructor construct a terrain which have 4 detailmaps, 1 alpha map*/
-        TerrainData(const std::string& heightMapsrc,
-                    const std::string& alphamap,
+        TerrainData(std::string_view heightMapsrc,
+                    std::string_view alphamap,
                     const DetailMap& detail1,
                     const DetailMap& detail2,
                     const DetailMap& detail3,
@@ -152,8 +152,8 @@ class CC_DLL Terrain : public Node
                     float mapHeight       = 2,
                     float mapScale        = 0.1);
         /**constructor, this constructor construct a terrain which have 3 detailmaps, 1 alpha map*/
-        TerrainData(const std::string& heightMapsrc,
-                    const std::string& alphamap,
+        TerrainData(std::string_view heightMapsrc,
+                    std::string_view alphamap,
                     const DetailMap& detail1,
                     const DetailMap& detail2,
                     const DetailMap& detail3,
@@ -337,7 +337,7 @@ class CC_DLL Terrain : public Node
 
 public:
     /** set light map texture */
-    void setLightMap(const std::string& fileName);
+    void setLightMap(std::string_view fileName);
 
     /**
      set directional light for the terrain
@@ -349,7 +349,7 @@ class CC_DLL Terrain : public Node
     /**initialize all Properties which terrain need */
     bool initProperties();
     /**initialize heightMap data */
-    bool initHeightMap(const std::string& heightMap);
+    bool initHeightMap(std::string_view heightMap);
     /**initialize alphaMap ,detailMaps textures*/
     bool initTextures();
     /**create entry*/
@@ -429,7 +429,7 @@ class CC_DLL Terrain : public Node
     /**
      * reset the heightmap data.
      */
-    void resetHeightMap(const std::string& heightMap);
+    void resetHeightMap(std::string_view heightMap);
 
     /**
      * get the terrain's minimal height.
diff --git a/cocos/3d/CCVertexAttribBinding.cpp b/cocos/3d/CCVertexAttribBinding.cpp
index 9aa5e165b7fe..f7325edb7e79 100644
--- a/cocos/3d/CCVertexAttribBinding.cpp
+++ b/cocos/3d/CCVertexAttribBinding.cpp
@@ -122,9 +122,8 @@ void VertexAttribBinding::parseAttributes()
     _attributes.clear();
     _vertexAttribsFlags = 0;
 
-    auto program     = _programState->getProgram();
-    auto& attributes = program->getActiveAttributes();
-    _attributes      = attributes;
+    auto program = _programState->getProgram();
+    _attributes  = program->getActiveAttributes();
 }
 
 bool VertexAttribBinding::hasAttribute(const shaderinfos::VertexKey& key) const
@@ -133,7 +132,7 @@ bool VertexAttribBinding::hasAttribute(const shaderinfos::VertexKey& key) const
     return _attributes.find(name) != _attributes.end();
 }
 
-backend::AttributeBindInfo* VertexAttribBinding::getVertexAttribValue(const std::string& name)
+backend::AttributeBindInfo* VertexAttribBinding::getVertexAttribValue(std::string_view name)
 {
     const auto itr = _attributes.find(name);
     if (itr != _attributes.end())
@@ -141,7 +140,7 @@ backend::AttributeBindInfo* VertexAttribBinding::getVertexAttribValue(const std:
     return nullptr;
 }
 
-void VertexAttribBinding::setVertexAttribPointer(const std::string& name,
+void VertexAttribBinding::setVertexAttribPointer(std::string_view name,
                                                  backend::VertexFormat type,
                                                  bool normalized,
                                                  int offset,
diff --git a/cocos/3d/CCVertexAttribBinding.h b/cocos/3d/CCVertexAttribBinding.h
index 20879586c072..e92378262593 100644
--- a/cocos/3d/CCVertexAttribBinding.h
+++ b/cocos/3d/CCVertexAttribBinding.h
@@ -107,18 +107,18 @@ class CC_DLL VertexAttribBinding : public Ref
     VertexAttribBinding& operator=(const VertexAttribBinding&);
 
     bool init(MeshIndexData* meshIndexData, Pass* pass, MeshCommand*);
-    void setVertexAttribPointer(const std::string& name,
+    void setVertexAttribPointer(std::string_view name,
                                 backend::VertexFormat type,
                                 bool normalized,
                                 int offset,
                                 int flag);
-    backend::AttributeBindInfo* getVertexAttribValue(const std::string& name);
+    backend::AttributeBindInfo* getVertexAttribValue(std::string_view name);
     void parseAttributes();
 
     MeshIndexData* _meshIndexData;
     backend::ProgramState* _programState;
     std::shared_ptr<backend::VertexLayout> _vertexLayout = std::make_shared<backend::VertexLayout>();
-    std::unordered_map<std::string, backend::AttributeBindInfo> _attributes;
+    hlookup::string_map<backend::AttributeBindInfo> _attributes;
     uint32_t _vertexAttribsFlags;
 };
 
diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt
index 389e4295a86e..a25fe697daa9 100644
--- a/cocos/CMakeLists.txt
+++ b/cocos/CMakeLists.txt
@@ -40,6 +40,10 @@ if (NOT DEFINED CC_COMPAT_GL)
     set(CC_COMPAT_GL FALSE CACHE INTERNAL "Enabling CC_COMPAT_GL" )
 endif()
 
+if (NOT DEFINED ADXE_ENABLE_WEBVIEW2)
+    set(ADXE_ENABLE_WEBVIEW2 TRUE CACHE INTERNAL "Enabling windows webview2" )
+endif()
+
 project(adxe_libs)
 
 if(XCODE)
@@ -161,17 +165,20 @@ if(WINDOWS)
     # compile c as c++. needed for precompiled header
     set_source_files_properties(${COCOS_SPINE_SRC} base/ccFPSImages.c PROPERTIES LANGUAGE CXX)
     
-    find_program(NUGET_EXE NAMES nuget 
-        PATHS ${ADXE_ROOT_PATH}/tools/external/nuget)
-        
-    if(NOT NUGET_EXE)
-        message("NUGET.EXE not found.")
-        message(FATAL_ERROR "Please run setup.py again to download NUGET.EXE, and run CMake again.")
+    if(ADXE_ENABLE_WEBVIEW2)
+        find_program(NUGET_EXE NAMES nuget 
+            PATHS ${ADXE_ROOT_PATH}/tools/external/nuget)
+            
+        if(NOT NUGET_EXE)
+            message("NUGET.EXE not found.")
+            message(FATAL_ERROR "Please run setup.py again to download NUGET.EXE, and run CMake again.")
+        endif()
+     
+        exec_program(${NUGET_EXE}
+            ARGS install "Microsoft.Web.WebView2" -Version 1.0.992.28 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
+        target_link_libraries(${ADXE_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
+        target_compile_definitions(${ADXE_CORE_LIB} PUBLIC ADXE_HAVE_WEBVIEW2)
     endif()
- 
-    exec_program(${NUGET_EXE}
-        ARGS install "Microsoft.Web.WebView2" -Version 1.0.992.28 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
-    target_link_libraries(${ADXE_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)    
 endif()
 
 # engine extensions
@@ -179,6 +186,7 @@ add_subdirectory(${ADXE_ROOT_PATH}/extensions ${ENGINE_BINARY_PATH}/extensions)
 
 if(MSVC_IDE)
     target_sources(${ADXE_CORE_LIB} PRIVATE ../thirdparty/yasio/yasio.natvis)
+    target_sources(${ADXE_CORE_LIB} PRIVATE ../thirdparty/robin-map/tsl-robin-map.natvis)
 endif()
 
 # copy all thirdparty libraries to ${CMAKE_BINARY_DIR}/lib/$<CONFIG>
diff --git a/cocos/adxe.cpp b/cocos/adxe.cpp
index 1dc63f4fb608..559aea4e0af2 100644
--- a/cocos/adxe.cpp
+++ b/cocos/adxe.cpp
@@ -33,7 +33,7 @@ NS_CC_BEGIN
 
 CC_DLL const char* adxeVersion()
 {
-    return "adxe-1.0.0b4";
+    return "adxe-1.0.0b5";
 }
 
 NS_CC_END
diff --git a/cocos/audio/include/AudioDecoder.h b/cocos/audio/include/AudioDecoder.h
index 1e1a27043d2d..780ddc2933cb 100644
--- a/cocos/audio/include/AudioDecoder.h
+++ b/cocos/audio/include/AudioDecoder.h
@@ -60,7 +60,7 @@ class AudioDecoder
      * @brief Opens an audio file specified by a file path.
      * @return true if succeed, otherwise false.
      */
-    virtual bool open(const std::string& path) = 0;
+    virtual bool open(std::string_view path) = 0;
 
     /**
      * @brief Checks whether decoder has opened file successfully.
diff --git a/cocos/audio/include/AudioDecoderEXT.h b/cocos/audio/include/AudioDecoderEXT.h
index d8d598c8ae8c..f6eea0dbd20b 100644
--- a/cocos/audio/include/AudioDecoderEXT.h
+++ b/cocos/audio/include/AudioDecoderEXT.h
@@ -49,7 +49,7 @@ class AudioDecoderEXT : public AudioDecoder
      * @brief Opens an audio file specified by a file path.
      * @return true if succeed, otherwise false.
      */
-    bool open(const std::string& path) override;
+    bool open(std::string_view path) override;
 
     /**
      * @brief Closes opened audio file.
diff --git a/cocos/audio/include/AudioDecoderManager.h b/cocos/audio/include/AudioDecoderManager.h
index fe5c2d1ed938..3075bf10d9be 100644
--- a/cocos/audio/include/AudioDecoderManager.h
+++ b/cocos/audio/include/AudioDecoderManager.h
@@ -37,7 +37,7 @@ class AudioDecoderManager
 public:
     static bool init();
     static void destroy();
-    static AudioDecoder* createDecoder(const std::string& path);
+    static AudioDecoder* createDecoder(std::string_view path);
     static void destroyDecoder(AudioDecoder* decoder);
 };
 
diff --git a/cocos/audio/include/AudioDecoderMp3.h b/cocos/audio/include/AudioDecoderMp3.h
index a8be6fbeb3de..97311573974e 100644
--- a/cocos/audio/include/AudioDecoderMp3.h
+++ b/cocos/audio/include/AudioDecoderMp3.h
@@ -52,7 +52,7 @@ class AudioDecoderMp3 : public AudioDecoder
      * @brief Opens an audio file specified by a file path.
      * @return true if succeed, otherwise false.
      */
-    bool open(const std::string& path) override;
+    bool open(std::string_view path) override;
 
     /**
      * @brief Closes opened audio file.
diff --git a/cocos/audio/include/AudioDecoderOgg.h b/cocos/audio/include/AudioDecoderOgg.h
index 0ca447b68019..18d86ebcedd3 100644
--- a/cocos/audio/include/AudioDecoderOgg.h
+++ b/cocos/audio/include/AudioDecoderOgg.h
@@ -44,7 +44,7 @@ class AudioDecoderOgg : public AudioDecoder
      * @brief Opens an audio file specified by a file path.
      * @return true if succeed, otherwise false.
      */
-    bool open(const std::string& path) override;
+    bool open(std::string_view path) override;
 
     /**
      * @brief Closes opened audio file.
diff --git a/cocos/audio/include/AudioDecoderWav.h b/cocos/audio/include/AudioDecoderWav.h
index 59864494638b..8e9e101dd2fc 100644
--- a/cocos/audio/include/AudioDecoderWav.h
+++ b/cocos/audio/include/AudioDecoderWav.h
@@ -128,7 +128,7 @@ class AudioDecoderWav : public AudioDecoder
      * @brief Opens an audio file specified by a file path.
      * @return true if succeed, otherwise false.
      */
-    bool open(const std::string& path) override;
+    bool open(std::string_view path) override;
 
     /**
      * @brief The helper function for convert frames to bytes
diff --git a/cocos/audio/include/AudioEngine.h b/cocos/audio/include/AudioEngine.h
index ee89635def62..2d864b78ee45 100644
--- a/cocos/audio/include/AudioEngine.h
+++ b/cocos/audio/include/AudioEngine.h
@@ -126,7 +126,7 @@ class CC_DLL AudioEngine
      *
      * @see `AudioProfile`
      */
-    static AUDIO_ID play2d(const std::string& filePath,
+    static AUDIO_ID play2d(std::string_view filePath,
                            bool loop                   = false,
                            float volume                = 1.0f,
                            const AudioProfile* profile = nullptr);
@@ -232,7 +232,7 @@ class CC_DLL AudioEngine
      * @param audioID An audioID returned by the play2d function.
      * @param callback
      */
-    static void setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, const std::string&)>& callback);
+    static void setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, std::string_view)>& callback);
 
     /**
      * Gets the maximum number of simultaneous audio instance of AudioEngine.
@@ -253,7 +253,7 @@ class CC_DLL AudioEngine
      * @warning This can lead to stop related audio first.
      * @param filePath Audio file path.
      */
-    static void uncache(const std::string& filePath);
+    static void uncache(std::string_view filePath);
 
     /**
      * Uncache all audio data from internal buffer.
@@ -276,20 +276,20 @@ class CC_DLL AudioEngine
      * @param profileName A name of audio profile.
      * @return The audio profile.
      */
-    static AudioProfile* getProfile(const std::string& profileName);
+    static AudioProfile* getProfile(std::string_view profileName);
 
     /**
      * Preload audio file.
      * @param filePath The file path of an audio.
      */
-    static void preload(const std::string& filePath) { preload(filePath, nullptr); }
+    static void preload(std::string_view filePath) { preload(filePath, nullptr); }
 
     /**
      * Preload audio file.
      * @param filePath The file path of an audio.
      * @param callback A callback which will be called after loading is finished.
      */
-    static void preload(const std::string& filePath, std::function<void(bool isSuccess)> callback);
+    static void preload(std::string_view filePath, std::function<void(bool isSuccess)> callback);
 
     /**
      * Gets playing audio count.
@@ -346,10 +346,10 @@ class CC_DLL AudioEngine
     static std::unordered_map<AUDIO_ID, AudioInfo> _audioIDInfoMap;
 
     // audio file path,audio IDs
-    static std::unordered_map<std::string, std::list<AUDIO_ID>> _audioPathIDMap;
+    static hlookup::string_map<std::list<AUDIO_ID>> _audioPathIDMap;
 
     // profileName,ProfileHelper
-    static std::unordered_map<std::string, ProfileHelper> _audioPathProfileHelperMap;
+    static hlookup::string_map<ProfileHelper> _audioPathProfileHelperMap;
 
     static unsigned int _maxInstances;
 
diff --git a/cocos/audio/include/AudioEngineImpl.h b/cocos/audio/include/AudioEngineImpl.h
index cbb5c7284afd..eb1c4c9610c7 100644
--- a/cocos/audio/include/AudioEngineImpl.h
+++ b/cocos/audio/include/AudioEngineImpl.h
@@ -49,7 +49,7 @@ class CC_DLL AudioEngineImpl : public cocos2d::Ref
     ~AudioEngineImpl();
 
     bool init();
-    AUDIO_ID play2d(const std::string& fileFullPath, bool loop, float volume);
+    AUDIO_ID play2d(std::string_view fileFullPath, bool loop, float volume);
     void setVolume(AUDIO_ID audioID, float volume);
     void setLoop(AUDIO_ID audioID, bool loop);
     bool pause(AUDIO_ID audioID);
@@ -59,11 +59,11 @@ class CC_DLL AudioEngineImpl : public cocos2d::Ref
     float getDuration(AUDIO_ID audioID);
     float getCurrentTime(AUDIO_ID audioID);
     bool setCurrentTime(AUDIO_ID audioID, float time);
-    void setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, const std::string&)>& callback);
+    void setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, std::string_view)>& callback);
 
-    void uncache(const std::string& filePath);
+    void uncache(std::string_view filePath);
     void uncacheAll();
-    AudioCache* preload(const std::string& filePath, std::function<void(bool)> callback);
+    AudioCache* preload(std::string_view filePath, std::function<void(bool)> callback);
     void update(float dt);
 
 private:
@@ -81,7 +81,7 @@ class CC_DLL AudioEngineImpl : public cocos2d::Ref
     std::queue<ALuint> _unusedSourcesPool;
 
     // filePath,bufferInfo
-    std::unordered_map<std::string, AudioCache> _audioCaches;
+    hlookup::string_map<std::unique_ptr<AudioCache>> _audioCaches;
 
     // audioID,AudioInfo
     std::unordered_map<AUDIO_ID, AudioPlayer*> _audioPlayers;
diff --git a/cocos/audio/include/AudioPlayer.h b/cocos/audio/include/AudioPlayer.h
index e114c5ea8132..81512b98d99f 100644
--- a/cocos/audio/include/AudioPlayer.h
+++ b/cocos/audio/include/AudioPlayer.h
@@ -72,7 +72,7 @@ class CC_DLL AudioPlayer
 
     float _volume;
     bool _loop;
-    std::function<void(AUDIO_ID, const std::string&)> _finishCallbak;
+    std::function<void(AUDIO_ID, std::string_view)> _finishCallbak;
 
     bool _isDestroyed;
     bool _removeByAudioEngine;
diff --git a/cocos/audio/src/AudioDecoderEXT.mm b/cocos/audio/src/AudioDecoderEXT.mm
index d310eb38e800..eb7f9ceaa4c0 100644
--- a/cocos/audio/src/AudioDecoderEXT.mm
+++ b/cocos/audio/src/AudioDecoderEXT.mm
@@ -32,183 +32,194 @@ of this software and associated documentation files (the "Software"), to deal
 
 #define LOG_TAG "AudioDecoder"
 
-namespace cocos2d {
-
-    AudioDecoderEXT::AudioDecoderEXT()
-    : _extRef(nullptr), _fileStream(nullptr), _streamSize(0), _audioFileId(nullptr)
+namespace cocos2d
+{
+
+AudioDecoderEXT::AudioDecoderEXT() : _extRef(nullptr), _fileStream(nullptr), _streamSize(0), _audioFileId(nullptr)
+{
+    memset(&_outputFormat, 0, sizeof(_outputFormat));
+}
+
+AudioDecoderEXT::~AudioDecoderEXT()
+{
+    closeInternal();
+}
+
+bool AudioDecoderEXT::open(std::string_view fullPath)
+{
+    bool ret         = false;
+    CFURLRef fileURL = nil;
+    do
     {
-        memset(&_outputFormat, 0, sizeof(_outputFormat));
-    }
+        BREAK_IF_ERR_LOG(fullPath.empty(), "Invalid path!");
 
-    AudioDecoderEXT::~AudioDecoderEXT()
-    {
-        closeInternal();
-    }
-
-    bool AudioDecoderEXT::open(const std::string& fullPath)
-    {
-        bool ret = false;
-        CFURLRef fileURL = nil;
-        do
-        {
-            BREAK_IF_ERR_LOG(fullPath.empty(), "Invalid path!");
-
-            _fileStream = cocos2d::FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ);
-            BREAK_IF_ERR_LOG(_fileStream == nullptr, "FileUtils::openFileStream FAILED for file: %s", fullPath.c_str());
-            if (_fileStream)
-            {
-                _streamSize = _fileStream->size(); // cache the stream size
-            }
-            
-            OSStatus status = AudioFileOpenWithCallbacks(this, &AudioDecoderEXT::readCallback, nullptr, &AudioDecoderEXT::getSizeCallback, nullptr, 0, &_audioFileId);
-            BREAK_IF_ERR_LOG(status != noErr, "AudioFileOpenWithCallbacks FAILED, Error = %d", (int)status);
-
-            status = ExtAudioFileWrapAudioFileID(_audioFileId, false, &_extRef);
-            BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileWrapAudioFileID FAILED, Error = %d", (int)status);
-
-            BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileOpenURL FAILED, Error = %d", (int)status);
-
-            AudioStreamBasicDescription	fileFormat;
-            UInt32 propertySize = sizeof(fileFormat);
-
-            // Get the audio data format
-            status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileFormat);
-            BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = %d", (int)status);
-            BREAK_IF_ERR_LOG(fileFormat.mChannelsPerFrame > 2, "Unsupported Format, channel count is greater than stereo!");
-
-            // Set the client format to 16 bit signed integer (native-endian) data
-            // Maintain the channel count and sample rate of the original source format
-            _outputFormat.mSampleRate = fileFormat.mSampleRate;
-            _outputFormat.mChannelsPerFrame = fileFormat.mChannelsPerFrame;
-            _outputFormat.mFormatID = kAudioFormatLinearPCM;
-            _outputFormat.mFramesPerPacket = 1;
-            _outputFormat.mBitsPerChannel = 16;
-            _outputFormat.mFormatFlags = kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked | kAudioFormatFlagIsSignedInteger;
-
-            _sampleRate = _outputFormat.mSampleRate;
-            _channelCount = _outputFormat.mChannelsPerFrame;
-            _bytesPerBlock = 2 * _outputFormat.mChannelsPerFrame;
-
-            _outputFormat.mBytesPerPacket = _bytesPerBlock;
-            _outputFormat.mBytesPerFrame = _bytesPerBlock;
-
-            status = ExtAudioFileSetProperty(_extRef, kExtAudioFileProperty_ClientDataFormat, sizeof(_outputFormat), &_outputFormat);
-            BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileSetProperty FAILED, Error = %d", (int)status);
-
-            // Get the total frame count
-            SInt64 totalFrames = 0;
-            propertySize = sizeof(totalFrames);
-            status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileLengthFrames, &propertySize, &totalFrames);
-            BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = %d",(int)status);
-            BREAK_IF_ERR_LOG(totalFrames <= 0, "Total frames is 0, it's an invalid audio file: %s", fullPath.c_str());
-            _totalFrames = static_cast<uint32_t>(totalFrames);
-            _isOpened = true;
-
-            ret = true;
-        } while (false);
-
-        if (fileURL != nil)
-            CFRelease(fileURL);
-
-        if (!ret)
+        _fileStream = cocos2d::FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ);
+        BREAK_IF_ERR_LOG(_fileStream == nullptr, "FileUtils::openFileStream FAILED for file: %s", fullPath.data());
+        if (_fileStream)
         {
-            close();
+            _streamSize = _fileStream->size();  // cache the stream size
         }
 
-        return ret;
-    }
-
-    void AudioDecoderEXT::close()
+        OSStatus status = AudioFileOpenWithCallbacks(this, &AudioDecoderEXT::readCallback, nullptr,
+                                                     &AudioDecoderEXT::getSizeCallback, nullptr, 0, &_audioFileId);
+        BREAK_IF_ERR_LOG(status != noErr, "AudioFileOpenWithCallbacks FAILED, Error = %d", (int)status);
+
+        status = ExtAudioFileWrapAudioFileID(_audioFileId, false, &_extRef);
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileWrapAudioFileID FAILED, Error = %d", (int)status);
+
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileOpenURL FAILED, Error = %d", (int)status);
+
+        AudioStreamBasicDescription fileFormat;
+        UInt32 propertySize = sizeof(fileFormat);
+
+        // Get the audio data format
+        status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileFormat);
+        BREAK_IF_ERR_LOG(status != noErr,
+                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = %d",
+                         (int)status);
+        BREAK_IF_ERR_LOG(fileFormat.mChannelsPerFrame > 2, "Unsupported Format, channel count is greater than stereo!");
+
+        // Set the client format to 16 bit signed integer (native-endian) data
+        // Maintain the channel count and sample rate of the original source format
+        _outputFormat.mSampleRate       = fileFormat.mSampleRate;
+        _outputFormat.mChannelsPerFrame = fileFormat.mChannelsPerFrame;
+        _outputFormat.mFormatID         = kAudioFormatLinearPCM;
+        _outputFormat.mFramesPerPacket  = 1;
+        _outputFormat.mBitsPerChannel   = 16;
+        _outputFormat.mFormatFlags =
+            kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked | kAudioFormatFlagIsSignedInteger;
+
+        _sampleRate    = _outputFormat.mSampleRate;
+        _channelCount  = _outputFormat.mChannelsPerFrame;
+        _bytesPerBlock = 2 * _outputFormat.mChannelsPerFrame;
+
+        _outputFormat.mBytesPerPacket = _bytesPerBlock;
+        _outputFormat.mBytesPerFrame  = _bytesPerBlock;
+
+        status = ExtAudioFileSetProperty(_extRef, kExtAudioFileProperty_ClientDataFormat, sizeof(_outputFormat),
+                                         &_outputFormat);
+        BREAK_IF_ERR_LOG(status != noErr, "ExtAudioFileSetProperty FAILED, Error = %d", (int)status);
+
+        // Get the total frame count
+        SInt64 totalFrames = 0;
+        propertySize       = sizeof(totalFrames);
+        status = ExtAudioFileGetProperty(_extRef, kExtAudioFileProperty_FileLengthFrames, &propertySize, &totalFrames);
+        BREAK_IF_ERR_LOG(status != noErr,
+                         "ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = %d",
+                         (int)status);
+        BREAK_IF_ERR_LOG(totalFrames <= 0, "Total frames is 0, it's an invalid audio file: %s", fullPath.data());
+        _totalFrames = static_cast<uint32_t>(totalFrames);
+        _isOpened    = true;
+
+        ret = true;
+    } while (false);
+
+    if (fileURL != nil)
+        CFRelease(fileURL);
+
+    if (!ret)
     {
-        closeInternal();
+        close();
     }
 
-    uint32_t AudioDecoderEXT::read(uint32_t framesToRead, char* pcmBuf)
-    {
-        uint32_t ret = 0;
-        do
-        {
-            BREAK_IF_ERR_LOG(!isOpened(), "decoder isn't openned");
-            BREAK_IF_ERR_LOG(framesToRead == INVALID_FRAME_INDEX, "frameToRead is INVALID_FRAME_INDEX");
-            BREAK_IF_ERR_LOG(framesToRead == 0, "frameToRead is 0");
-            BREAK_IF_ERR_LOG(pcmBuf == nullptr, "pcmBuf is nullptr");
-
-            AudioBufferList bufferList;
-            bufferList.mNumberBuffers = 1;
-            bufferList.mBuffers[0].mDataByteSize = framesToRead * _bytesPerBlock;
-            bufferList.mBuffers[0].mNumberChannels = _outputFormat.mChannelsPerFrame;
-            bufferList.mBuffers[0].mData = pcmBuf;
-
-            UInt32 frames = framesToRead;
-            OSStatus status = ExtAudioFileRead(_extRef, &frames, &bufferList);
-            BREAK_IF(status != noErr);
-            ret = frames;
-        } while (false);
-
-        return ret;
-    }
+    return ret;
+}
+
+void AudioDecoderEXT::close()
+{
+    closeInternal();
+}
 
-    bool AudioDecoderEXT::seek(uint32_t frameOffset)
+uint32_t AudioDecoderEXT::read(uint32_t framesToRead, char* pcmBuf)
+{
+    uint32_t ret = 0;
+    do
     {
-        bool ret = false;
-        do
-        {
-            BREAK_IF_ERR_LOG(!isOpened(), "decoder isn't openned");
-            BREAK_IF_ERR_LOG(frameOffset == INVALID_FRAME_INDEX, "frameIndex is INVALID_FRAME_INDEX");
-
-            OSStatus status = ExtAudioFileSeek(_extRef, frameOffset);
-            BREAK_IF(status != noErr);
-            ret = true;
-        } while(false);
-        return ret;
+        BREAK_IF_ERR_LOG(!isOpened(), "decoder isn't openned");
+        BREAK_IF_ERR_LOG(framesToRead == INVALID_FRAME_INDEX, "frameToRead is INVALID_FRAME_INDEX");
+        BREAK_IF_ERR_LOG(framesToRead == 0, "frameToRead is 0");
+        BREAK_IF_ERR_LOG(pcmBuf == nullptr, "pcmBuf is nullptr");
+
+        AudioBufferList bufferList;
+        bufferList.mNumberBuffers              = 1;
+        bufferList.mBuffers[0].mDataByteSize   = framesToRead * _bytesPerBlock;
+        bufferList.mBuffers[0].mNumberChannels = _outputFormat.mChannelsPerFrame;
+        bufferList.mBuffers[0].mData           = pcmBuf;
+
+        UInt32 frames   = framesToRead;
+        OSStatus status = ExtAudioFileRead(_extRef, &frames, &bufferList);
+        BREAK_IF(status != noErr);
+        ret = frames;
+    } while (false);
+
+    return ret;
+}
+
+bool AudioDecoderEXT::seek(uint32_t frameOffset)
+{
+    bool ret = false;
+    do
+    {
+        BREAK_IF_ERR_LOG(!isOpened(), "decoder isn't openned");
+        BREAK_IF_ERR_LOG(frameOffset == INVALID_FRAME_INDEX, "frameIndex is INVALID_FRAME_INDEX");
+
+        OSStatus status = ExtAudioFileSeek(_extRef, frameOffset);
+        BREAK_IF(status != noErr);
+        ret = true;
+    } while (false);
+    return ret;
+}
+
+void AudioDecoderEXT::closeInternal()
+{
+    if (_extRef != nullptr)
+    {
+        ExtAudioFileDispose(_extRef);
+        AudioFileClose(_audioFileId);
+        _extRef      = nullptr;
+        _audioFileId = nullptr;
+        _fileStream  = nullptr;
     }
-
-    void AudioDecoderEXT::closeInternal()
+}
+
+OSStatus AudioDecoderEXT::readCallback(void* inClientData,
+                                       SInt64 inPosition,
+                                       UInt32 requestCount,
+                                       void* buffer,
+                                       UInt32* actualCount)
+{
+    if (!inClientData)
     {
-        if (_extRef != nullptr)
-        {
-            ExtAudioFileDispose(_extRef);
-            AudioFileClose(_audioFileId);
-            _extRef = nullptr;
-            _audioFileId = nullptr;
-            _fileStream = nullptr;
-        }
+        return kAudioFileNotOpenError;
     }
 
-    OSStatus AudioDecoderEXT::readCallback(void *inClientData, SInt64 inPosition, UInt32 requestCount, void *buffer, UInt32 *actualCount)
+    auto* audioDecoder = (AudioDecoderEXT*)inClientData;
+    auto* fileStream   = audioDecoder->_fileStream.get();
+    auto currPos       = (SInt64)fileStream->tell();
+    auto posDiff       = inPosition - currPos;
+    if (posDiff != 0)
     {
-        if (!inClientData)
-        {
-            return kAudioFileNotOpenError;
-        }
-        
-        auto* audioDecoder = (AudioDecoderEXT*)inClientData;
-        auto* fileStream = audioDecoder->_fileStream.get();
-        auto currPos = (SInt64)fileStream->tell();
-        auto posDiff = inPosition - currPos;
-        if (posDiff != 0)
+        if (fileStream->seek(posDiff, SEEK_CUR) < 0)
         {
-            if (fileStream->seek(posDiff, SEEK_CUR) < 0)
-            {
-                return kAudioFilePositionError;
-            }
+            return kAudioFilePositionError;
         }
-        
-        const auto count = fileStream->read(buffer, requestCount);
-        
-        if (count < 0)
-        {
-            return kAudioFileEndOfFileError;
-        }
-        
-        *actualCount = count;
-        
-        return noErr;
     }
 
-    SInt64 AudioDecoderEXT::getSizeCallback(void *inClientData)
+    const auto count = fileStream->read(buffer, requestCount);
+
+    if (count < 0)
     {
-        auto* audioDecoder = (AudioDecoderEXT*)inClientData;
-        return audioDecoder->_streamSize;
+        return kAudioFileEndOfFileError;
     }
-} // namespace cocos2d {
+
+    *actualCount = count;
+
+    return noErr;
+}
+
+SInt64 AudioDecoderEXT::getSizeCallback(void* inClientData)
+{
+    auto* audioDecoder = (AudioDecoderEXT*)inClientData;
+    return audioDecoder->_streamSize;
+}
+}  // namespace cocos2d {
diff --git a/cocos/audio/src/AudioDecoderManager.cpp b/cocos/audio/src/AudioDecoderManager.cpp
index fc0730e1c4ea..879d893a63c0 100644
--- a/cocos/audio/src/AudioDecoderManager.cpp
+++ b/cocos/audio/src/AudioDecoderManager.cpp
@@ -60,7 +60,7 @@ void AudioDecoderManager::destroy()
 #endif
 }
 
-AudioDecoder* AudioDecoderManager::createDecoder(const std::string& path)
+AudioDecoder* AudioDecoderManager::createDecoder(std::string_view path)
 {
     cxx17::string_view svPath(path);
     if (cxx20::ic::ends_with(svPath, ".ogg"))
diff --git a/cocos/audio/src/AudioDecoderMp3.cpp b/cocos/audio/src/AudioDecoderMp3.cpp
index a1c8c2cc5a56..b02cecc2a112 100644
--- a/cocos/audio/src/AudioDecoderMp3.cpp
+++ b/cocos/audio/src/AudioDecoderMp3.cpp
@@ -126,7 +126,7 @@ AudioDecoderMp3::~AudioDecoderMp3()
     close();
 }
 
-bool AudioDecoderMp3::open(const std::string& fullPath)
+bool AudioDecoderMp3::open(std::string_view fullPath)
 {
 #if !CC_USE_MPG123
     do
diff --git a/cocos/audio/src/AudioDecoderOgg.cpp b/cocos/audio/src/AudioDecoderOgg.cpp
index 15c4cc9ce866..bad5a4f6f404 100644
--- a/cocos/audio/src/AudioDecoderOgg.cpp
+++ b/cocos/audio/src/AudioDecoderOgg.cpp
@@ -70,7 +70,7 @@ AudioDecoderOgg::~AudioDecoderOgg()
     close();
 }
 
-bool AudioDecoderOgg::open(const std::string& fullPath)
+bool AudioDecoderOgg::open(std::string_view fullPath)
 {
     auto fs = FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ).release();
     if (!fs)
diff --git a/cocos/audio/src/AudioDecoderWav.cpp b/cocos/audio/src/AudioDecoderWav.cpp
index 28366caed4d1..3d6be1e0feee 100644
--- a/cocos/audio/src/AudioDecoderWav.cpp
+++ b/cocos/audio/src/AudioDecoderWav.cpp
@@ -78,7 +78,7 @@ static bool wav_scan_chunk(WAV_FILE* wavf, uint32_t chunkID, void* header, void*
     }
     return false;
 }
-static bool wav_open(const std::string& fullPath, WAV_FILE* wavf)
+static bool wav_open(std::string_view fullPath, WAV_FILE* wavf)
 {
     wavf->Stream = FileUtils::getInstance()->openFileStream(fullPath, FileStream::Mode::READ);
     if (!wavf->Stream)
@@ -192,7 +192,7 @@ AudioDecoderWav::~AudioDecoderWav()
     close();
 }
 
-bool AudioDecoderWav::open(const std::string& fullPath)
+bool AudioDecoderWav::open(std::string_view fullPath)
 {
     if (wav_open(fullPath, &_wavf))
     {
diff --git a/cocos/audio/src/AudioEngine.cpp b/cocos/audio/src/AudioEngine.cpp
index a59ac5b9a9f2..8590394e9744 100644
--- a/cocos/audio/src/AudioEngine.cpp
+++ b/cocos/audio/src/AudioEngine.cpp
@@ -47,9 +47,9 @@ const int AudioEngine::INVALID_AUDIO_ID = -1;
 const float AudioEngine::TIME_UNKNOWN   = -1.0f;
 
 // audio file path,audio IDs
-std::unordered_map<std::string, std::list<AUDIO_ID>> AudioEngine::_audioPathIDMap;
+hlookup::string_map<std::list<AUDIO_ID>> AudioEngine::_audioPathIDMap;
 // profileName,ProfileHelper
-std::unordered_map<std::string, AudioEngine::ProfileHelper> AudioEngine::_audioPathProfileHelperMap;
+hlookup::string_map<AudioEngine::ProfileHelper> AudioEngine::_audioPathProfileHelperMap;
 unsigned int AudioEngine::_maxInstances                        = MAX_AUDIOINSTANCES;
 AudioEngine::ProfileHelper* AudioEngine::_defaultProfileHelper = nullptr;
 std::unordered_map<AUDIO_ID, AudioEngine::AudioInfo> AudioEngine::_audioIDInfoMap;
@@ -172,7 +172,7 @@ bool AudioEngine::lazyInit()
     return true;
 }
 
-AUDIO_ID AudioEngine::play2d(const std::string& filePath, bool loop, float volume, const AudioProfile* profile)
+AUDIO_ID AudioEngine::play2d(std::string_view filePath, bool loop, float volume, const AudioProfile* profile)
 {
     AUDIO_ID ret = AudioEngine::INVALID_AUDIO_ID;
 
@@ -203,7 +203,7 @@ AUDIO_ID AudioEngine::play2d(const std::string& filePath, bool loop, float volum
 
         if (_audioIDInfoMap.size() >= _maxInstances)
         {
-            log("Fail to play %s cause by limited max instance of AudioEngine", filePath.c_str());
+            log("Fail to play %s cause by limited max instance of AudioEngine", filePath.data());
             break;
         }
         if (profileHelper)
@@ -211,7 +211,7 @@ AUDIO_ID AudioEngine::play2d(const std::string& filePath, bool loop, float volum
             if (profileHelper->profile.maxInstances != 0 &&
                 profileHelper->audioIDs.size() >= profileHelper->profile.maxInstances)
             {
-                log("Fail to play %s cause by limited max instance of AudioProfile", filePath.c_str());
+                log("Fail to play %s cause by limited max instance of AudioProfile", filePath.data());
                 break;
             }
             if (profileHelper->profile.minDelay > TIME_DELAY_PRECISION)
@@ -220,7 +220,7 @@ AUDIO_ID AudioEngine::play2d(const std::string& filePath, bool loop, float volum
                 if (profileHelper->lastPlayTime > TIME_DELAY_PRECISION &&
                     currTime - profileHelper->lastPlayTime <= profileHelper->profile.minDelay)
                 {
-                    log("Fail to play %s cause by limited minimum delay", filePath.c_str());
+                    log("Fail to play %s cause by limited minimum delay", filePath.data());
                     break;
                 }
             }
@@ -238,7 +238,7 @@ AUDIO_ID AudioEngine::play2d(const std::string& filePath, bool loop, float volum
         ret = _audioEngineImpl->play2d(filePath, loop, volume);
         if (ret != INVALID_AUDIO_ID)
         {
-            _audioPathIDMap[filePath].push_back(ret);
+            _audioPathIDMap[filePath.data()].push_back(ret);
             auto it = _audioPathIDMap.find(filePath);
 
             auto& audioRef    = _audioIDInfoMap[ret];
@@ -380,7 +380,7 @@ void AudioEngine::stopAll()
     _audioIDInfoMap.clear();
 }
 
-void AudioEngine::uncache(const std::string& filePath)
+void AudioEngine::uncache(std::string_view filePath)
 {
     if (!_audioEngineImpl)
     {
@@ -463,7 +463,7 @@ float AudioEngine::getCurrentTime(AUDIO_ID audioID)
     return 0.0f;
 }
 
-void AudioEngine::setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, const std::string&)>& callback)
+void AudioEngine::setFinishCallback(AUDIO_ID audioID, const std::function<void(AUDIO_ID, std::string_view)>& callback)
 {
     auto it = _audioIDInfoMap.find(audioID);
     if (it != _audioIDInfoMap.end())
@@ -539,7 +539,7 @@ AudioProfile* AudioEngine::getDefaultProfile()
     return &_defaultProfileHelper->profile;
 }
 
-AudioProfile* AudioEngine::getProfile(const std::string& name)
+AudioProfile* AudioEngine::getProfile(std::string_view name)
 {
     auto it = _audioPathProfileHelperMap.find(name);
     if (it != _audioPathProfileHelperMap.end())
@@ -552,7 +552,7 @@ AudioProfile* AudioEngine::getProfile(const std::string& name)
     }
 }
 
-void AudioEngine::preload(const std::string& filePath, std::function<void(bool isSuccess)> callback)
+void AudioEngine::preload(std::string_view filePath, std::function<void(bool isSuccess)> callback)
 {
     if (!isEnabled())
     {
diff --git a/cocos/audio/src/AudioEngineImpl.mm b/cocos/audio/src/AudioEngineImpl.mm
index f51ed483fc25..f4aca8818f8e 100644
--- a/cocos/audio/src/AudioEngineImpl.mm
+++ b/cocos/audio/src/AudioEngineImpl.mm
@@ -32,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 #include "audio/include/AudioDecoderManager.h"
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
-#import <AVFoundation/AVFoundation.h>
+#    import <AVFoundation/AVFoundation.h>
 #endif
 
 #include "audio/include/AudioEngine.h"
@@ -42,31 +42,33 @@ of this software and associated documentation files (the "Software"), to deal
 #include "base/ccUtils.h"
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
-#import <UIKit/UIKit.h>
+#    import <UIKit/UIKit.h>
 #endif
 
 using namespace cocos2d;
 
-static ALCdevice* s_ALDevice = nullptr;
-static ALCcontext* s_ALContext = nullptr;
+static ALCdevice* s_ALDevice       = nullptr;
+static ALCcontext* s_ALContext     = nullptr;
 static AudioEngineImpl* s_instance = nullptr;
 
-static void ccALPauseDevice() {
+static void ccALPauseDevice()
+{
     ALOGD("%s", "===> ccALPauseDevice");
 #if CC_USE_ALSOFT
     alcDevicePauseSOFT(s_ALDevice);
 #else
-    if(alcGetCurrentContext())
+    if (alcGetCurrentContext())
         alcMakeContextCurrent(nullptr);
 #endif
 }
 
-static void ccALResumeDevice() {
+static void ccALResumeDevice()
+{
     ALOGD("%s", "===> ccALResumeDevice");
 #if CC_USE_ALSOFT
     alcDeviceResumeSOFT(s_ALDevice);
 #else
-    if(alcGetCurrentContext())
+    if (alcGetCurrentContext())
         alcMakeContextCurrent(nullptr);
     alcMakeContextCurrent(s_ALContext);
 #endif
@@ -75,8 +77,14 @@ static void ccALResumeDevice() {
 #if defined(__APPLE__)
 
 typedef ALvoid (*alSourceNotificationProc)(ALuint sid, ALuint notificationID, ALvoid* userData);
-typedef ALenum (*alSourceAddNotificationProcPtr)(ALuint sid, ALuint notificationID, alSourceNotificationProc notifyProc, ALvoid* userData);
-static ALenum alSourceAddNotificationExt(ALuint sid, ALuint notificationID, alSourceNotificationProc notifyProc, ALvoid* userData)
+typedef ALenum (*alSourceAddNotificationProcPtr)(ALuint sid,
+                                                 ALuint notificationID,
+                                                 alSourceNotificationProc notifyProc,
+                                                 ALvoid* userData);
+static ALenum alSourceAddNotificationExt(ALuint sid,
+                                         ALuint notificationID,
+                                         alSourceNotificationProc notifyProc,
+                                         ALvoid* userData)
 {
     static alSourceAddNotificationProcPtr proc = nullptr;
 
@@ -92,42 +100,48 @@ static ALenum alSourceAddNotificationExt(ALuint sid, ALuint notificationID, alSo
     return AL_INVALID_VALUE;
 }
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
-@interface AudioEngineSessionHandler : NSObject
-{
+#    if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+@interface AudioEngineSessionHandler : NSObject {
 }
 
--(id) init;
--(void)handleInterruption:(NSNotification*)notification;
+- (id)init;
+- (void)handleInterruption:(NSNotification*)notification;
 
 @end
 
 @implementation AudioEngineSessionHandler
 
--(id) init
+- (id)init
 {
     if (self = [super init])
     {
         int deviceVer = [[[UIDevice currentDevice] systemVersion] intValue];
         ALOGD("===> The device version: %d", deviceVer);
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleInterruption:) name:AVAudioSessionInterruptionNotification object:[AVAudioSession sharedInstance]];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleInterruption:) name:UIApplicationDidBecomeActiveNotification object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleInterruption:) name:UIApplicationWillResignActiveNotification object:nil];
-
-        BOOL success = [[AVAudioSession sharedInstance]
-                    setCategory: AVAudioSessionCategoryAmbient
-                    error: nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleInterruption:)
+                                                     name:AVAudioSessionInterruptionNotification
+                                                   object:[AVAudioSession sharedInstance]];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleInterruption:)
+                                                     name:UIApplicationDidBecomeActiveNotification
+                                                   object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleInterruption:)
+                                                     name:UIApplicationWillResignActiveNotification
+                                                   object:nil];
+
+        BOOL success = [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:nil];
         if (!success)
             ALOGE("Fail to set audio session.");
     }
     return self;
 }
 
--(void)handleInterruption:(NSNotification*)notification
+- (void)handleInterruption:(NSNotification*)notification
 {
     static bool isAudioSessionInterrupted = false;
-    static bool resumeOnBecomingActive = false;
-    static bool pauseOnResignActive = false;
+    static bool resumeOnBecomingActive    = false;
+    static bool pauseOnResignActive       = false;
 
     if ([notification.name isEqualToString:AVAudioSessionInterruptionNotification])
     {
@@ -138,13 +152,15 @@ -(void)handleInterruption:(NSNotification*)notification
 
             if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive)
             {
-                ALOGD("AVAudioSessionInterruptionTypeBegan, application != UIApplicationStateActive, alcMakeContextCurrent(nullptr)");
+                ALOGD("AVAudioSessionInterruptionTypeBegan, application != UIApplicationStateActive, "
+                      "alcMakeContextCurrent(nullptr)");
             }
             else
             {
-                ALOGD("AVAudioSessionInterruptionTypeBegan, application == UIApplicationStateActive, pauseOnResignActive = true");
+                ALOGD("AVAudioSessionInterruptionTypeBegan, application == UIApplicationStateActive, "
+                      "pauseOnResignActive = true");
             }
-            
+
             // We always pause device when interruption began
             ccALPauseDevice();
         }
@@ -154,8 +170,9 @@ -(void)handleInterruption:(NSNotification*)notification
 
             if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive)
             {
-                ALOGD("AVAudioSessionInterruptionTypeEnded, application == UIApplicationStateActive, alcMakeContextCurrent(s_ALContext)");
-                NSError *error = nil;
+                ALOGD("AVAudioSessionInterruptionTypeEnded, application == UIApplicationStateActive, "
+                      "alcMakeContextCurrent(s_ALContext)");
+                NSError* error = nil;
                 [[AVAudioSession sharedInstance] setActive:YES error:&error];
                 ccALResumeDevice();
                 if (Director::getInstance()->isPaused())
@@ -166,7 +183,8 @@ -(void)handleInterruption:(NSNotification*)notification
             }
             else
             {
-                ALOGD("AVAudioSessionInterruptionTypeEnded, application != UIApplicationStateActive, resumeOnBecomingActive = true");
+                ALOGD("AVAudioSessionInterruptionTypeEnded, application != UIApplicationStateActive, "
+                      "resumeOnBecomingActive = true");
                 resumeOnBecomingActive = true;
             }
         }
@@ -188,14 +206,15 @@ -(void)handleInterruption:(NSNotification*)notification
         {
             resumeOnBecomingActive = false;
             ALOGD("UIApplicationDidBecomeActiveNotification, alcMakeContextCurrent(s_ALContext)");
-            NSError *error = nil;
-            BOOL success = [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error];
-            if (!success) {
+            NSError* error = nil;
+            BOOL success   = [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&error];
+            if (!success)
+            {
                 ALOGE("Fail to set audio session.");
                 return;
             }
             [[AVAudioSession sharedInstance] setActive:YES error:&error];
-            
+
             ccALResumeDevice();
         }
         else if (isAudioSessionInterrupted)
@@ -205,18 +224,20 @@ -(void)handleInterruption:(NSNotification*)notification
     }
 }
 
--(void) dealloc
+- (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:AVAudioSessionInterruptionNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillResignActiveNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIApplicationWillResignActiveNotification
+                                                  object:nil];
 
     [super dealloc];
 }
 @end
 
 static id s_AudioEngineSessionHandler = nullptr;
-#endif
+#    endif
 
 ALvoid AudioEngineImpl::myAlSourceNotificationCallback(ALuint sid, ALuint notificationID, ALvoid* userData)
 {
@@ -239,10 +260,7 @@ -(void) dealloc
 
 #endif
 
-AudioEngineImpl::AudioEngineImpl()
-: _scheduled(false)
-, _currentAudioID(0)
-, _scheduler(nullptr)
+AudioEngineImpl::AudioEngineImpl() : _scheduled(false), _currentAudioID(0), _scheduler(nullptr)
 {
     s_instance = this;
 }
@@ -254,7 +272,8 @@ -(void) dealloc
         _scheduler->unschedule(CC_SCHEDULE_SELECTOR(AudioEngineImpl::update), this);
     }
 
-    if (s_ALContext) {
+    if (s_ALContext)
+    {
         alDeleteSources(MAX_AUDIOINSTANCES, _alSources);
 
         _audioCaches.clear();
@@ -264,7 +283,8 @@ -(void) dealloc
         s_ALContext = nullptr;
     }
 
-    if (s_ALDevice) {
+    if (s_ALDevice)
+    {
         alcCloseDevice(s_ALDevice);
         s_ALDevice = nullptr;
     }
@@ -280,30 +300,34 @@ -(void) dealloc
 bool AudioEngineImpl::init()
 {
     bool ret = false;
-    do{
+    do
+    {
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
         s_AudioEngineSessionHandler = [[AudioEngineSessionHandler alloc] init];
 #endif
 
         s_ALDevice = alcOpenDevice(nullptr);
 
-        if (s_ALDevice) {
+        if (s_ALDevice)
+        {
             alGetError();
             s_ALContext = alcCreateContext(s_ALDevice, nullptr);
             alcMakeContextCurrent(s_ALContext);
 
             alGenSources(MAX_AUDIOINSTANCES, _alSources);
             auto alError = alGetError();
-            if(alError != AL_NO_ERROR)
+            if (alError != AL_NO_ERROR)
             {
                 ALOGE("%s:generating sources failed! error = %x\n", __FUNCTION__, alError);
                 break;
             }
 
-            for (int i = 0; i < MAX_AUDIOINSTANCES; ++i) {
+            for (int i = 0; i < MAX_AUDIOINSTANCES; ++i)
+            {
                 _unusedSourcesPool.push(_alSources[i]);
 #if defined(__APPLE__)
-                alSourceAddNotificationExt(_alSources[i], AL_BUFFERS_PROCESSED, myAlSourceNotificationCallback, nullptr);
+                alSourceAddNotificationExt(_alSources[i], AL_BUFFERS_PROCESSED, myAlSourceNotificationCallback,
+                                           nullptr);
 #endif
             }
 
@@ -368,28 +392,30 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 #endif
             // ================ Workaround end ================ //
 
-            _scheduler = Director::getInstance()->getScheduler();
-            ret = AudioDecoderManager::init();
-            const char* vender = alGetString(AL_VENDOR);
+            _scheduler          = Director::getInstance()->getScheduler();
+            ret                 = AudioDecoderManager::init();
+            const char* vender  = alGetString(AL_VENDOR);
             const char* version = alGetString(AL_VERSION);
             ALOGI("OpenAL was initialized successfully, vender:%s, version:%s", vender, version);
         }
-    }while (false);
+    } while (false);
 
     return ret;
 }
 
-AudioCache* AudioEngineImpl::preload(const std::string& filePath, std::function<void(bool)> callback)
+AudioCache* AudioEngineImpl::preload(std::string_view filePath, std::function<void(bool)> callback)
 {
     AudioCache* audioCache = nullptr;
 
     auto it = _audioCaches.find(filePath);
-    if (it == _audioCaches.end()) {
-        audioCache = &_audioCaches[filePath];
+    if (it == _audioCaches.end())
+    {
+        audioCache = new AudioCache();  // hlookup_second(it);
+        _audioCaches.emplace(filePath, std::unique_ptr<AudioCache>(audioCache));
         audioCache->_fileFullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
-        unsigned int cacheId = audioCache->_id;
-        auto isCacheDestroyed = audioCache->_isDestroyed;
-        AudioEngine::addTask([audioCache, cacheId, isCacheDestroyed](){
+        unsigned int cacheId      = audioCache->_id;
+        auto isCacheDestroyed     = audioCache->_isDestroyed;
+        AudioEngine::addTask([audioCache, cacheId, isCacheDestroyed]() {
             if (*isCacheDestroyed)
             {
                 ALOGV("AudioCache (id=%u) was destroyed, no need to launch readDataTask.", cacheId);
@@ -399,8 +425,9 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
             audioCache->readDataTask(cacheId);
         });
     }
-    else {
-        audioCache = &it->second;
+    else
+    {
+        audioCache = it->second.get();
     }
 
     if (audioCache && callback)
@@ -410,9 +437,10 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     return audioCache;
 }
 
-AUDIO_ID AudioEngineImpl::play2d(const std::string &filePath ,bool loop ,float volume)
+AUDIO_ID AudioEngineImpl::play2d(std::string_view filePath, bool loop, float volume)
 {
-    if (s_ALDevice == nullptr) {
+    if (s_ALDevice == nullptr)
+    {
         return AudioEngine::INVALID_AUDIO_ID;
     }
 
@@ -423,16 +451,18 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     }
 
     auto player = new AudioPlayer;
-    if (player == nullptr) {
+    if (player == nullptr)
+    {
         return AudioEngine::INVALID_AUDIO_ID;
     }
 
     player->_alSource = alSource;
-    player->_loop = loop;
-    player->_volume = volume;
+    player->_loop     = loop;
+    player->_volume   = volume;
 
     auto audioCache = preload(filePath, nullptr);
-    if (audioCache == nullptr) {
+    if (audioCache == nullptr)
+    {
         delete player;
         return AudioEngine::INVALID_AUDIO_ID;
     }
@@ -442,7 +472,7 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     _audioPlayers.emplace(++_currentAudioID, player);
     _threadMutex.unlock();
 
-    audioCache->addPlayCallback(std::bind(&AudioEngineImpl::_play2d,this,audioCache,_currentAudioID));
+    audioCache->addPlayCallback(std::bind(&AudioEngineImpl::_play2d, this, audioCache, _currentAudioID));
 
     if (!_scheduled)
     {
@@ -453,7 +483,7 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     return _currentAudioID;
 }
 
-void AudioEngineImpl::_play2d(AudioCache *cache, AUDIO_ID audioID)
+void AudioEngineImpl::_play2d(AudioCache* cache, AUDIO_ID audioID)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
@@ -461,13 +491,14 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
         return;
     auto player = iter->second;
 
-    //Note: It maybe in sub thread or main thread :(
+    // Note: It maybe in sub thread or main thread :(
     if (!*cache->_isDestroyed && cache->_state == AudioCache::State::READY)
     {
-        if (player->play2d()) {
-            _scheduler->performFunctionInCocosThread([audioID](){
-
-                if (AudioEngine::_audioIDInfoMap.find(audioID) != AudioEngine::_audioIDInfoMap.end()) {
+        if (player->play2d())
+        {
+            _scheduler->performFunctionInCocosThread([audioID]() {
+                if (AudioEngine::_audioIDInfoMap.find(audioID) != AudioEngine::_audioIDInfoMap.end())
+                {
                     AudioEngine::_audioIDInfoMap[audioID].state = AudioEngine::AudioState::PLAYING;
                 }
             });
@@ -492,23 +523,25 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     return sourceId;
 }
 
-void AudioEngineImpl::setVolume(AUDIO_ID audioID,float volume)
+void AudioEngineImpl::setVolume(AUDIO_ID audioID, float volume)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return;
-    
+
     auto player = iter->second;
     lck.unlock();
-    
+
     player->_volume = volume;
 
-    if (player->_ready) {
+    if (player->_ready)
+    {
         alSourcef(player->_alSource, AL_GAIN, volume);
 
         auto error = alGetError();
-        if (error != AL_NO_ERROR) {
+        if (error != AL_NO_ERROR)
+        {
             ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__, audioID, error);
         }
     }
@@ -518,30 +551,39 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return;
-    
+
     auto player = iter->second;
 
     lck.unlock();
-    
-    if (player->_ready) {
-        if (player->_streamingSource) {
+
+    if (player->_ready)
+    {
+        if (player->_streamingSource)
+        {
             player->setLoop(loop);
-        } else {
-            if (loop) {
+        }
+        else
+        {
+            if (loop)
+            {
                 alSourcei(player->_alSource, AL_LOOPING, AL_TRUE);
-            } else {
+            }
+            else
+            {
                 alSourcei(player->_alSource, AL_LOOPING, AL_FALSE);
             }
 
             auto error = alGetError();
-            if (error != AL_NO_ERROR) {
+            if (error != AL_NO_ERROR)
+            {
                 ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__, audioID, error);
             }
         }
     }
-    else {
+    else
+    {
         player->_loop = loop;
     }
 }
@@ -550,18 +592,19 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return false;
-    
+
     auto player = iter->second;
-    
+
     lck.unlock();
-    
+
     bool ret = true;
     alSourcePause(player->_alSource);
 
     auto error = alGetError();
-    if (error != AL_NO_ERROR) {
+    if (error != AL_NO_ERROR)
+    {
         ret = false;
         ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x\n", __FUNCTION__, audioID, error);
     }
@@ -574,16 +617,17 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     bool ret = true;
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return false;
-    
+
     auto player = iter->second;
     lck.unlock();
-    
+
     alSourcePlay(player->_alSource);
 
     auto error = alGetError();
-    if (error != AL_NO_ERROR) {
+    if (error != AL_NO_ERROR)
+    {
         ret = false;
         ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x\n", __FUNCTION__, audioID, error);
     }
@@ -595,29 +639,30 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return;
-    
+
     auto player = iter->second;
     player->destroy();
 
-    // Call '_updatePlayersState' method to cleanup immediately since the schedule may be cancelled without any notification.
+    // Call '_updatePlayersState' method to cleanup immediately since the schedule may be cancelled without any
+    // notification.
     _updatePlayers(true);
 }
 
 void AudioEngineImpl::stopAll()
 {
     std::lock_guard<std::recursive_mutex> lck(_threadMutex);
-    for(auto&& player : _audioPlayers)
+    for (auto&& player : _audioPlayers)
     {
         player.second->destroy();
     }
-    //Note: Don't set the flag to false here, it should be set in 'update' function.
+    // Note: Don't set the flag to false here, it should be set in 'update' function.
     // Otherwise, the state got from alSourceState may be wrong
-//    for(int index = 0; index < MAX_AUDIOINSTANCES; ++index)
-//    {
-//        _alSourceUsed[_alSources[index]] = false;
-//    }
+    //    for(int index = 0; index < MAX_AUDIOINSTANCES; ++index)
+    //    {
+    //        _alSourceUsed[_alSources[index]] = false;
+    //    }
 
     // Call '_updatePlayers' method to cleanup immediately since the schedule may be cancelled without any notification.
     _updatePlayers(true);
@@ -627,9 +672,11 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 {
     std::lock_guard<std::recursive_mutex> lck(_threadMutex);
     auto it = _audioPlayers.find(audioID);
-    if (it != _audioPlayers.end()) {
+    if (it != _audioPlayers.end())
+    {
         auto player = it->second;
-        if (player->_ready) {
+        if (player->_ready)
+        {
             return player->_audioCache->_duration;
         }
     }
@@ -639,21 +686,25 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
 float AudioEngineImpl::getCurrentTime(AUDIO_ID audioID)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
-    auto it = _audioPlayers.find(audioID); 
+    auto it = _audioPlayers.find(audioID);
     if (it == _audioPlayers.end())
         return 0.0f;
 
-    float ret = 0.0f;
+    float ret   = 0.0f;
     auto player = it->second;
-    if (player->_ready) {
-        if (player->_streamingSource) {
+    if (player->_ready)
+    {
+        if (player->_streamingSource)
+        {
             ret = player->getTime();
         }
-        else {
+        else
+        {
             alGetSourcef(player->_alSource, AL_SEC_OFFSET, &ret);
 
             auto error = alGetError();
-            if (error != AL_NO_ERROR) {
+            if (error != AL_NO_ERROR)
+            {
                 ALOGE("%s, audio id:" AUDIO_ID_PRID ",error code:%x", __FUNCTION__, audioID, error);
             }
         }
@@ -667,23 +718,28 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     bool ret = false;
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return false;
-    
+
     auto player = iter->second;
 
-    do {
-        if (!player->_ready) {
+    do
+    {
+        if (!player->_ready)
+        {
             break;
         }
 
-        if (player->_streamingSource) {
+        if (player->_streamingSource)
+        {
             ret = player->setTime(time);
             break;
         }
-        else {
+        else
+        {
             if (player->_audioCache->_framesRead != player->_audioCache->_totalFrames &&
-                (time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead) {
+                (time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead)
+            {
                 ALOGE("%s: audio id = " AUDIO_ID_PRID, __FUNCTION__, audioID);
                 break;
             }
@@ -691,7 +747,8 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
             alSourcef(player->_alSource, AL_SEC_OFFSET, time);
 
             auto error = alGetError();
-            if (error != AL_NO_ERROR) {
+            if (error != AL_NO_ERROR)
+            {
                 ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__, audioID, error);
             }
             ret = true;
@@ -701,16 +758,17 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     return ret;
 }
 
-void AudioEngineImpl::setFinishCallback(AUDIO_ID audioID, const std::function<void (AUDIO_ID, const std::string &)> &callback)
+void AudioEngineImpl::setFinishCallback(AUDIO_ID audioID,
+                                        const std::function<void(AUDIO_ID, std::string_view)>& callback)
 {
     std::unique_lock<std::recursive_mutex> lck(_threadMutex);
     auto iter = _audioPlayers.find(audioID);
-    if(iter == _audioPlayers.end())
+    if (iter == _audioPlayers.end())
         return;
-    
+
     auto player = iter->second;
     lck.unlock();
-    
+
     player->_finishCallbak = callback;
 }
 
@@ -726,45 +784,49 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     AudioPlayer* player;
     ALuint alSource;
 
-//    ALOGV("AudioPlayer count: %d", (int)_audioPlayers.size());
-    for (auto it = _audioPlayers.begin(); it != _audioPlayers.end(); ) {
-        audioID = it->first;
-        player = it->second;
+    //    ALOGV("AudioPlayer count: %d", (int)_audioPlayers.size());
+    for (auto it = _audioPlayers.begin(); it != _audioPlayers.end();)
+    {
+        audioID  = it->first;
+        player   = it->second;
         alSource = player->_alSource;
 
         if (player->_removeByAudioEngine)
         {
             AudioEngine::remove(audioID);
-            
+
             it = _audioPlayers.erase(it);
             delete player;
             _unusedSourcesPool.push(alSource);
         }
-        else if (player->_ready && player->isFinished()) {
+        else if (player->_ready && player->isFinished())
+        {
 
             std::string filePath;
-            if (player->_finishCallbak) {
+            if (player->_finishCallbak)
+            {
                 auto& audioInfo = AudioEngine::_audioIDInfoMap[audioID];
-                filePath = audioInfo.filePath;
+                filePath        = audioInfo.filePath;
             }
 
             AudioEngine::remove(audioID);
-            
+
             it = _audioPlayers.erase(it);
 
-            if (player->_finishCallbak) {
+            if (player->_finishCallbak)
+            {
                 /// ###IMPORTANT: don't call immidiately, because at callback, user-end may play a new audio
                 /// cause _audioPlayers' iterator goan to invalid.
-                _finishCallbacks.push_back([finishCallback = std::move(player->_finishCallbak), audioID, filePath = std::move(filePath)](){
-                    finishCallback(audioID, filePath);
-                });
+                _finishCallbacks.push_back([finishCallback = std::move(player->_finishCallbak), audioID,
+                                            filePath = std::move(filePath)]() { finishCallback(audioID, filePath); });
             }
             // clear cache when audio player finsihed properly
             player->setCache(nullptr);
             delete player;
             _unusedSourcesPool.push(alSource);
         }
-        else{
+        else
+        {
             ++it;
         }
     }
@@ -786,7 +848,8 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
         _unscheduleUpdate();
 }
 
-void AudioEngineImpl::_unscheduleUpdate() {
+void AudioEngineImpl::_unscheduleUpdate()
+{
     if (_scheduled)
     {
         _scheduled = false;
@@ -794,7 +857,7 @@ AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *bids)
     }
 }
 
-void AudioEngineImpl::uncache(const std::string &filePath)
+void AudioEngineImpl::uncache(std::string_view filePath)
 {
     _audioCaches.erase(filePath);
 }
diff --git a/cocos/base/CCAutoreleasePool.cpp b/cocos/base/CCAutoreleasePool.cpp
index 9be2e9cdf0f6..3027fee8a0f8 100644
--- a/cocos/base/CCAutoreleasePool.cpp
+++ b/cocos/base/CCAutoreleasePool.cpp
@@ -38,7 +38,7 @@ AutoreleasePool::AutoreleasePool()
     PoolManager::getInstance()->push(this);
 }
 
-AutoreleasePool::AutoreleasePool(const std::string& name)
+AutoreleasePool::AutoreleasePool(std::string_view name)
     : _name(name)
 #if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
     , _isClearing(false)
diff --git a/cocos/base/CCAutoreleasePool.h b/cocos/base/CCAutoreleasePool.h
index fde07e39ded7..d2a8341adef2 100644
--- a/cocos/base/CCAutoreleasePool.h
+++ b/cocos/base/CCAutoreleasePool.h
@@ -58,7 +58,7 @@ class CC_DLL AutoreleasePool
      *
      * @param name The name of created autorelease pool.
      */
-    AutoreleasePool(const std::string& name);
+    AutoreleasePool(std::string_view name);
 
     /**
      * @js NA
diff --git a/cocos/base/CCConfiguration.cpp b/cocos/base/CCConfiguration.cpp
index 0d623209a947..1979f0225c22 100644
--- a/cocos/base/CCConfiguration.cpp
+++ b/cocos/base/CCConfiguration.cpp
@@ -186,7 +186,7 @@ void Configuration::destroyInstance()
     CC_SAFE_RELEASE_NULL(s_sharedConfiguration);
 }
 
-bool Configuration::checkForGLExtension(const std::string& searchName) const
+bool Configuration::checkForGLExtension(std::string_view searchName) const
 {
     return _glExtensions.find(searchName) != std::string::npos;
 }
@@ -315,7 +315,7 @@ Animate3DQuality Configuration::getAnimate3DQuality() const
 //
 // generic getters for properties
 //
-const Value& Configuration::getValue(const std::string& key, const Value& defaultValue) const
+const Value& Configuration::getValue(std::string_view key, const Value& defaultValue) const
 {
     auto iter = _valueDict.find(key);
     if (iter != _valueDict.cend())
@@ -324,15 +324,15 @@ const Value& Configuration::getValue(const std::string& key, const Value& defaul
     return defaultValue;
 }
 
-void Configuration::setValue(const std::string& key, const Value& value)
+void Configuration::setValue(std::string_view key, const Value& value)
 {
-    _valueDict[key] = value;
+    hlookup::set_item(_valueDict, key, value);  // _valueDict[key] = value;
 }
 
 //
 // load file
 //
-void Configuration::loadConfigFile(const std::string& filename)
+void Configuration::loadConfigFile(std::string_view filename)
 {
     ValueMap dict = FileUtils::getInstance()->getValueMapFromFile(filename);
     CCASSERT(!dict.empty(), "cannot create dictionary");
@@ -360,14 +360,14 @@ void Configuration::loadConfigFile(const std::string& filename)
 
     if (!validMetadata)
     {
-        CCLOG("Invalid config format for file: %s", filename.c_str());
+        CCLOG("Invalid config format for file: %s", filename.data());
         return;
     }
 
     auto dataIter = dict.find("data");
     if (dataIter == dict.cend() || dataIter->second.getType() != Value::Type::MAP)
     {
-        CCLOG("Expected 'data' dict, but not found. Config file: %s", filename.c_str());
+        CCLOG("Expected 'data' dict, but not found. Config file: %s", filename.data());
         return;
     }
 
diff --git a/cocos/base/CCConfiguration.h b/cocos/base/CCConfiguration.h
index 976113588474..aefcefbede10 100644
--- a/cocos/base/CCConfiguration.h
+++ b/cocos/base/CCConfiguration.h
@@ -205,7 +205,7 @@ class CC_DLL Configuration : public Ref
      * @param searchName A given search name.
      * @return Is true if an OpenGL is supported.
      */
-    bool checkForGLExtension(const std::string& searchName) const;
+    bool checkForGLExtension(std::string_view searchName) const;
 
     /** Initialize method.
      *
@@ -219,14 +219,14 @@ class CC_DLL Configuration : public Ref
      * @param defaultValue if not find the value, return the defaultValue.
      * @return
      */
-    const Value& getValue(const std::string& key, const Value& defaultValue = Value::Null) const;
+    const Value& getValue(std::string_view key, const Value& defaultValue = Value::Null) const;
 
     /** Sets a new key/value pair  in the configuration dictionary.
      *
      * @param key A given key.
      * @param value A given value.
      */
-    void setValue(const std::string& key, const Value& value);
+    void setValue(std::string_view key, const Value& value);
 
     /** Returns the Configuration info.
      *
@@ -243,7 +243,7 @@ class CC_DLL Configuration : public Ref
      *
      * @param filename Config file name.
      */
-    void loadConfigFile(const std::string& filename);
+    void loadConfigFile(std::string_view filename);
 
     static const char* CONFIG_FILE_LOADED;
 
diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp
index c0953cb9e517..60c03d7aa6da 100644
--- a/cocos/base/CCConsole.cpp
+++ b/cocos/base/CCConsole.cpp
@@ -204,9 +204,10 @@ std::string& Console::Utility::trim(std::string& s)
     return Console::Utility::ltrim(Console::Utility::rtrim(s));
 }
 
-std::vector<std::string>& Console::Utility::split(const std::string& s, char delim, std::vector<std::string>& elems)
+std::vector<std::string>& Console::Utility::split(std::string_view s, char delim, std::vector<std::string>& elems)
 {
-    std::stringstream ss(s);
+    std::stringstream ss;
+    ss << s;
     std::string item;
     while (std::getline(ss, item, delim))
     {
@@ -215,7 +216,7 @@ std::vector<std::string>& Console::Utility::split(const std::string& s, char del
     return elems;
 }
 
-std::vector<std::string> Console::Utility::split(const std::string& s, char delim)
+std::vector<std::string> Console::Utility::split(std::string_view s, char delim)
 {
     std::vector<std::string> elems;
     Console::Utility::split(s, delim, elems);
@@ -223,13 +224,14 @@ std::vector<std::string> Console::Utility::split(const std::string& s, char deli
 }
 
 // isFloat taken from http://stackoverflow.com/questions/447206/c-isfloat-function
-bool Console::Utility::isFloat(const std::string& myString)
+bool Console::Utility::isFloat(std::string_view myString)
 {
-    std::istringstream iss(myString);
+    std::stringstream ss;
+    ss << myString;
     float f;
-    iss >> std::noskipws >> f;  // noskipws considers leading whitespace invalid
+    ss >> std::noskipws >> f;  // noskipws considers leading whitespace invalid
     // Check the entire string was consumed and if either failbit or badbit is set
-    return iss.eof() && !iss.fail();
+    return ss.eof() && !ss.fail();
 }
 
 ssize_t Console::Utility::sendToConsole(int fd, const void* buffer, size_t length, int flags)
@@ -275,12 +277,12 @@ void Console::Utility::sendPrompt(int fd)
     send(fd, prompt, strlen(prompt), 0);
 }
 
-void Console::Utility::setPrompt(const std::string& prompt)
+void Console::Utility::setPrompt(std::string_view prompt)
 {
     _prompt = prompt;
 }
 
-const std::string& Console::Utility::getPrompt()
+std::string_view Console::Utility::getPrompt()
 {
     return _prompt;
 }
@@ -291,11 +293,10 @@ const std::string& Console::Utility::getPrompt()
 
 Console::Command::Command() : _callback(nullptr) {}
 
-Console::Command::Command(const std::string& name, const std::string& help)
-    : _name(name), _help(help), _callback(nullptr)
+Console::Command::Command(std::string_view name, std::string_view help) : _name(name), _help(help), _callback(nullptr)
 {}
 
-Console::Command::Command(const std::string& name, const std::string& help, const Callback& callback)
+Console::Command::Command(std::string_view name, std::string_view help, const Callback& callback)
     : _name(name), _help(help), _callback(callback)
 {}
 
@@ -378,7 +379,7 @@ void Console::Command::addSubCommand(const Command& subCmd)
     _subCommands[subCmd._name] = cmd;
 }
 
-const Console::Command* Console::Command::getSubCommand(const std::string& subCmdName) const
+const Console::Command* Console::Command::getSubCommand(std::string_view subCmdName) const
 {
     auto it = _subCommands.find(subCmdName);
     if (it != _subCommands.end())
@@ -389,7 +390,7 @@ const Console::Command* Console::Command::getSubCommand(const std::string& subCm
     return nullptr;
 }
 
-void Console::Command::delSubCommand(const std::string& subCmdName)
+void Console::Command::delSubCommand(std::string_view subCmdName)
 {
     auto iter = _subCommands.find(subCmdName);
     if (iter != _subCommands.end())
@@ -399,7 +400,7 @@ void Console::Command::delSubCommand(const std::string& subCmdName)
     }
 }
 
-void Console::Command::commandHelp(int fd, const std::string& /*args*/)
+void Console::Command::commandHelp(int fd, std::string_view /*args*/)
 {
     if (!_help.empty())
     {
@@ -412,7 +413,7 @@ void Console::Command::commandHelp(int fd, const std::string& /*args*/)
     }
 }
 
-void Console::Command::commandGeneric(int fd, const std::string& args)
+void Console::Command::commandGeneric(int fd, std::string_view args)
 {
     // The first argument (including the empty)
     std::string key(args);
@@ -621,10 +622,10 @@ void Console::addCommand(const Command& cmd)
         delete iter->second;
         _commands.erase(iter);
     }
-    _commands[cmd.getName()] = newCommand;
+    _commands.emplace(cmd.getName(), newCommand);  // _commands[cmd.getName()] = newCommand;
 }
 
-void Console::addSubCommand(const std::string& cmdName, const Command& subCmd)
+void Console::addSubCommand(std::string_view cmdName, const Command& subCmd)
 {
     auto it = _commands.find(cmdName);
     if (it != _commands.end())
@@ -639,7 +640,7 @@ void Console::addSubCommand(Command& cmd, const Command& subCmd)
     cmd.addSubCommand(subCmd);
 }
 
-const Console::Command* Console::getCommand(const std::string& cmdName)
+const Console::Command* Console::getCommand(std::string_view cmdName)
 {
     auto it = _commands.find(cmdName);
     if (it != _commands.end())
@@ -650,7 +651,7 @@ const Console::Command* Console::getCommand(const std::string& cmdName)
     return nullptr;
 }
 
-const Console::Command* Console::getSubCommand(const std::string& cmdName, const std::string& subCmdName)
+const Console::Command* Console::getSubCommand(std::string_view cmdName, std::string_view subCmdName)
 {
     auto it = _commands.find(cmdName);
     if (it != _commands.end())
@@ -661,12 +662,12 @@ const Console::Command* Console::getSubCommand(const std::string& cmdName, const
     return nullptr;
 }
 
-const Console::Command* Console::getSubCommand(const Command& cmd, const std::string& subCmdName)
+const Console::Command* Console::getSubCommand(const Command& cmd, std::string_view subCmdName)
 {
     return cmd.getSubCommand(subCmdName);
 }
 
-void Console::delCommand(const std::string& cmdName)
+void Console::delCommand(std::string_view cmdName)
 {
     auto it = _commands.find(cmdName);
     if (it != _commands.end())
@@ -676,7 +677,7 @@ void Console::delCommand(const std::string& cmdName)
     }
 }
 
-void Console::delSubCommand(const std::string& cmdName, const std::string& subCmdName)
+void Console::delSubCommand(std::string_view cmdName, std::string_view subCmdName)
 {
     auto it = _commands.find(cmdName);
     if (it != _commands.end())
@@ -686,7 +687,7 @@ void Console::delSubCommand(const std::string& cmdName, const std::string& subCm
     }
 }
 
-void Console::delSubCommand(Command& cmd, const std::string& subCmdName)
+void Console::delSubCommand(Command& cmd, std::string_view subCmdName)
 {
     cmd.delSubCommand(subCmdName);
 }
@@ -701,7 +702,7 @@ void Console::log(const char* buf)
     }
 }
 
-void Console::setBindAddress(const std::string& address)
+void Console::setBindAddress(std::string_view address)
 {
     _bindAddress = address;
 }
@@ -973,7 +974,7 @@ bool Console::parseCommand(socket_native_type fd)
     return true;
 }
 
-void Console::performCommand(socket_native_type fd, const std::string& command)
+void Console::performCommand(socket_native_type fd, std::string_view command)
 {
     std::vector<std::string> args = Console::Utility::split(command, ' ');
     if (args.empty())
@@ -998,7 +999,7 @@ void Console::performCommand(socket_native_type fd, const std::string& command)
     }
     else
     {
-        throw std::runtime_error("Unknown command " + command + ". Type 'help' for options\n");
+        throw std::runtime_error(std::string{"Unknown command "}.append(command).append(". Type 'help' for options\n"));
     }
 }
 
@@ -1162,7 +1163,7 @@ void Console::createCommandVersion()
 // commands
 //
 
-void Console::commandAllocator(socket_native_type fd, const std::string& /*args*/)
+void Console::commandAllocator(socket_native_type fd, std::string_view /*args*/)
 {
 #if CC_ENABLE_ALLOCATOR_DIAGNOSTICS
     auto info = allocator::AllocatorDiagnostics::instance()->diagnostics();
@@ -1173,7 +1174,7 @@ void Console::commandAllocator(socket_native_type fd, const std::string& /*args*
 #endif
 }
 
-void Console::commandConfig(socket_native_type fd, const std::string& /*args*/)
+void Console::commandConfig(socket_native_type fd, std::string_view /*args*/)
 {
     Scheduler* sched = Director::getInstance()->getScheduler();
     sched->performFunctionInCocosThread([=]() {
@@ -1182,49 +1183,49 @@ void Console::commandConfig(socket_native_type fd, const std::string& /*args*/)
     });
 }
 
-void Console::commandDebugMsg(socket_native_type fd, const std::string& /*args*/)
+void Console::commandDebugMsg(socket_native_type fd, std::string_view /*args*/)
 {
     Console::Utility::mydprintf(fd, "Debug message is: %s\n", _sendDebugStrings ? "on" : "off");
 }
 
-void Console::commandDebugMsgSubCommandOnOff(socket_native_type /*fd*/, const std::string& args)
+void Console::commandDebugMsgSubCommandOnOff(socket_native_type /*fd*/, std::string_view args)
 {
     _sendDebugStrings = (args.compare("on") == 0);
 }
 
-void Console::commandDirectorSubCommandPause(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandDirectorSubCommandPause(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director    = Director::getInstance();
     Scheduler* sched = director->getScheduler();
     sched->performFunctionInCocosThread([]() { Director::getInstance()->pause(); });
 }
 
-void Console::commandDirectorSubCommandResume(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandDirectorSubCommandResume(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director = Director::getInstance();
     director->resume();
 }
 
-void Console::commandDirectorSubCommandStop(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandDirectorSubCommandStop(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director    = Director::getInstance();
     Scheduler* sched = director->getScheduler();
     sched->performFunctionInCocosThread([]() { Director::getInstance()->stopAnimation(); });
 }
 
-void Console::commandDirectorSubCommandStart(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandDirectorSubCommandStart(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director = Director::getInstance();
     director->startAnimation();
 }
 
-void Console::commandDirectorSubCommandEnd(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandDirectorSubCommandEnd(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director = Director::getInstance();
     director->end();
 }
 
-void Console::commandExit(socket_native_type fd, const std::string& /*args*/)
+void Console::commandExit(socket_native_type fd, std::string_view /*args*/)
 {
     FD_CLR(fd, &_read_set);
     _fds.erase(std::remove(_fds.begin(), _fds.end(), fd), _fds.end());
@@ -1235,23 +1236,23 @@ void Console::commandExit(socket_native_type fd, const std::string& /*args*/)
 #endif
 }
 
-void Console::commandFileUtils(socket_native_type fd, const std::string& /*args*/)
+void Console::commandFileUtils(socket_native_type fd, std::string_view /*args*/)
 {
     Scheduler* sched = Director::getInstance()->getScheduler();
     sched->performFunctionInCocosThread(std::bind(&Console::printFileUtils, this, fd));
 }
 
-void Console::commandFileUtilsSubCommandFlush(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandFileUtilsSubCommandFlush(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     FileUtils::getInstance()->purgeCachedEntries();
 }
 
-void Console::commandFps(socket_native_type fd, const std::string& /*args*/)
+void Console::commandFps(socket_native_type fd, std::string_view /*args*/)
 {
     Console::Utility::mydprintf(fd, "FPS is: %s\n", Director::getInstance()->isDisplayStats() ? "on" : "off");
 }
 
-void Console::commandFpsSubCommandOnOff(socket_native_type /*fd*/, const std::string& args)
+void Console::commandFpsSubCommandOnOff(socket_native_type /*fd*/, std::string_view args)
 {
     bool state       = (args.compare("on") == 0);
     Director* dir    = Director::getInstance();
@@ -1259,12 +1260,12 @@ void Console::commandFpsSubCommandOnOff(socket_native_type /*fd*/, const std::st
     sched->performFunctionInCocosThread(std::bind(&Director::setDisplayStats, dir, state));
 }
 
-void Console::commandHelp(socket_native_type fd, const std::string& /*args*/)
+void Console::commandHelp(socket_native_type fd, std::string_view /*args*/)
 {
     sendHelp(fd, _commands, "\nAvailable commands:\n");
 }
 
-void Console::commandProjection(socket_native_type fd, const std::string& /*args*/)
+void Console::commandProjection(socket_native_type fd, std::string_view /*args*/)
 {
     auto director = Director::getInstance();
     char buf[20];
@@ -1288,25 +1289,26 @@ void Console::commandProjection(socket_native_type fd, const std::string& /*args
     Console::Utility::mydprintf(fd, "Current projection: %s\n", buf);
 }
 
-void Console::commandProjectionSubCommand2d(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandProjectionSubCommand2d(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director    = Director::getInstance();
     Scheduler* sched = director->getScheduler();
     sched->performFunctionInCocosThread([=]() { director->setProjection(Director::Projection::_2D); });
 }
 
-void Console::commandProjectionSubCommand3d(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandProjectionSubCommand3d(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     auto director    = Director::getInstance();
     Scheduler* sched = director->getScheduler();
     sched->performFunctionInCocosThread([=]() { director->setProjection(Director::Projection::_3D); });
 }
 
-void Console::commandResolution(socket_native_type /*fd*/, const std::string& args)
+void Console::commandResolution(socket_native_type /*fd*/, std::string_view args)
 {
     int policy;
     float width, height;
-    std::istringstream stream(args);
+    std::stringstream stream;
+    stream << args;
     stream >> width >> height >> policy;
 
     Scheduler* sched = Director::getInstance()->getScheduler();
@@ -1316,7 +1318,7 @@ void Console::commandResolution(socket_native_type /*fd*/, const std::string& ar
     });
 }
 
-void Console::commandResolutionSubCommandEmpty(socket_native_type fd, const std::string& /*args*/)
+void Console::commandResolutionSubCommandEmpty(socket_native_type fd, std::string_view /*args*/)
 {
     auto director        = Director::getInstance();
     Vec2 points          = director->getWinSize();
@@ -1340,13 +1342,13 @@ void Console::commandResolutionSubCommandEmpty(socket_native_type fd, const std:
                                 (int)visibleRect.origin.y, (int)visibleRect.size.width, (int)visibleRect.size.height);
 }
 
-void Console::commandSceneGraph(socket_native_type fd, const std::string& /*args*/)
+void Console::commandSceneGraph(socket_native_type fd, std::string_view /*args*/)
 {
     Scheduler* sched = Director::getInstance()->getScheduler();
     sched->performFunctionInCocosThread(std::bind(&Console::printSceneGraphBoot, this, fd));
 }
 
-void Console::commandTextures(socket_native_type fd, const std::string& /*args*/)
+void Console::commandTextures(socket_native_type fd, std::string_view /*args*/)
 {
     Scheduler* sched = Director::getInstance()->getScheduler();
     sched->performFunctionInCocosThread([=]() {
@@ -1356,13 +1358,13 @@ void Console::commandTextures(socket_native_type fd, const std::string& /*args*/
     });
 }
 
-void Console::commandTexturesSubCommandFlush(socket_native_type /*fd*/, const std::string& /*args*/)
+void Console::commandTexturesSubCommandFlush(socket_native_type /*fd*/, std::string_view /*args*/)
 {
     Scheduler* sched = Director::getInstance()->getScheduler();
     sched->performFunctionInCocosThread([]() { Director::getInstance()->getTextureCache()->removeAllTextures(); });
 }
 
-void Console::commandTouchSubCommandTap(socket_native_type fd, const std::string& args)
+void Console::commandTouchSubCommandTap(socket_native_type fd, std::string_view args)
 {
     auto argv = Console::Utility::split(args, ' ');
 
@@ -1387,7 +1389,7 @@ void Console::commandTouchSubCommandTap(socket_native_type fd, const std::string
     }
 }
 
-void Console::commandTouchSubCommandSwipe(socket_native_type fd, const std::string& args)
+void Console::commandTouchSubCommandSwipe(socket_native_type fd, std::string_view args)
 {
     auto argv = Console::Utility::split(args, ' ');
 
@@ -1558,7 +1560,7 @@ void Console::commandUpload(socket_native_type fd)
     }
 }
 
-void Console::commandVersion(socket_native_type fd, const std::string& /*args*/)
+void Console::commandVersion(socket_native_type fd, std::string_view /*args*/)
 {
     Console::Utility::mydprintf(fd, "%s\n", adxeVersion());
 }
@@ -1618,9 +1620,7 @@ void Console::printFileUtils(socket_native_type fd)
     Console::Utility::sendPrompt(fd);
 }
 
-void Console::sendHelp(socket_native_type fd,
-                       const std::unordered_map<std::string, Command*>& commands,
-                       const char* msg)
+void Console::sendHelp(socket_native_type fd, const hlookup::string_map<Command*>& commands, const char* msg)
 {
     Console::Utility::sendToConsole(fd, msg, strlen(msg));
     for (auto& it : commands)
@@ -1629,14 +1629,14 @@ void Console::sendHelp(socket_native_type fd,
         if (command->getHelp().empty())
             continue;
 
-        Console::Utility::mydprintf(fd, "\t%s", command->getName().c_str());
-        ssize_t tabs = strlen(command->getName().c_str()) / 8;
+        Console::Utility::mydprintf(fd, "\t%s", command->getName().data());
+        ssize_t tabs = command->getName().length() / 8;
         tabs         = 3 - tabs;
         for (int j = 0; j < tabs; j++)
         {
             Console::Utility::mydprintf(fd, "\t");
         }
-        Console::Utility::mydprintf(fd, "%s\n", command->getHelp().c_str());
+        Console::Utility::mydprintf(fd, "%s\n", command->getHelp().data());
     }
 }
 
diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h
index 20f5aa54f446..07882085c6b7 100644
--- a/cocos/base/CCConsole.h
+++ b/cocos/base/CCConsole.h
@@ -82,11 +82,11 @@ class CC_DLL Console : public Ref
         static std::string& trim(std::string& s);
 
         // split
-        static std::vector<std::string>& split(const std::string& s, char delim, std::vector<std::string>& elems);
-        static std::vector<std::string> split(const std::string& s, char delim);
+        static std::vector<std::string>& split(std::string_view s, char delim, std::vector<std::string>& elems);
+        static std::vector<std::string> split(std::string_view s, char delim);
 
         /** Checks myString is a floating-point type. */
-        static bool isFloat(const std::string& myString);
+        static bool isFloat(std::string_view myString);
 
         /** send a message to console */
         static ssize_t sendToConsole(int fd, const void* buffer, size_t length, int flags = 0);
@@ -98,10 +98,10 @@ class CC_DLL Console : public Ref
         static void sendPrompt(int fd);
 
         /** set a new string for the prompt. */
-        static void setPrompt(const std::string& prompt);
+        static void setPrompt(std::string_view prompt);
 
         /** get the prompt string. */
-        static const std::string& getPrompt();
+        static std::string_view getPrompt();
 
     private:
         static std::string _prompt; /*!< prompt */
@@ -111,11 +111,11 @@ class CC_DLL Console : public Ref
     class CC_DLL Command
     {
     public:
-        using Callback = std::function<void(int fd, const std::string& args)>;
+        using Callback = std::function<void(int fd, std::string_view args)>;
         /** Constructor */
         Command();
-        Command(const std::string& name, const std::string& help);
-        Command(const std::string& name, const std::string& help, const Callback& callback);
+        Command(std::string_view name, std::string_view help);
+        Command(std::string_view name, std::string_view help, const Callback& callback);
 
         /** Copy constructor */
         Command(const Command& o);
@@ -139,29 +139,29 @@ class CC_DLL Console : public Ref
         void addSubCommand(const Command& subCmd);
 
         /** get sub command */
-        const Command* getSubCommand(const std::string& subCmdName) const;
+        const Command* getSubCommand(std::string_view subCmdName) const;
 
         /** delete sub command */
-        void delSubCommand(const std::string& subCmdName);
+        void delSubCommand(std::string_view subCmdName);
 
         /** help command handler */
-        void commandHelp(int fd, const std::string& args);
+        void commandHelp(int fd, std::string_view args);
 
         /** generic command handler */
-        void commandGeneric(int fd, const std::string& args);
+        void commandGeneric(int fd, std::string_view args);
 
         /** Gets the name of the current command */
-        const std::string& getName() const { return _name; }
+        std::string_view getName() const { return _name; }
 
         /** Gets the help information of the current command */
-        const std::string& getHelp() const { return _help; }
+        std::string_view getHelp() const { return _help; }
 
     private:
         std::string _name;
         std::string _help;
 
         Callback _callback;
-        std::unordered_map<std::string, Command*> _subCommands;
+        hlookup::string_map<Command*> _subCommands;
     };
 
     /** Constructor */
@@ -181,18 +181,18 @@ class CC_DLL Console : public Ref
 
     /** add custom command */
     void addCommand(const Command& cmd);
-    void addSubCommand(const std::string& cmdName, const Command& subCmd);
+    void addSubCommand(std::string_view cmdName, const Command& subCmd);
     void addSubCommand(Command& cmd, const Command& subCmd);
 
     /** get custom command */
-    const Command* getCommand(const std::string& cmdName);
-    const Command* getSubCommand(const std::string& cmdName, const std::string& subCmdName);
-    const Command* getSubCommand(const Command& cmd, const std::string& subCmdName);
+    const Command* getCommand(std::string_view cmdName);
+    const Command* getSubCommand(std::string_view cmdName, std::string_view subCmdName);
+    const Command* getSubCommand(const Command& cmd, std::string_view subCmdName);
 
     /** delete custom command */
-    void delCommand(const std::string& cmdName);
-    void delSubCommand(const std::string& cmdName, const std::string& subCmdName);
-    void delSubCommand(Command& cmd, const std::string& subCmdName);
+    void delCommand(std::string_view cmdName);
+    void delSubCommand(std::string_view cmdName, std::string_view subCmdName);
+    void delSubCommand(Command& cmd, std::string_view subCmdName);
 
     /** log something in the console */
     void log(const char* buf);
@@ -202,7 +202,7 @@ class CC_DLL Console : public Ref
      *
      * @address : 127.0.0.1
      */
-    void setBindAddress(const std::string& address);
+    void setBindAddress(std::string_view address);
 
     /** Checks whether the server for console is bound with ipv6 address */
     bool isIpv6Server() const;
@@ -218,7 +218,7 @@ class CC_DLL Console : public Ref
     ssize_t readline(socket_native_type fd, char* buf, size_t maxlen);
     ssize_t readBytes(socket_native_type fd, char* buffer, size_t maxlen, bool* more);
     bool parseCommand(socket_native_type fd);
-    void performCommand(socket_native_type fd, const std::string& command);
+    void performCommand(socket_native_type fd, std::string_view command);
 
     void addClient();
 
@@ -240,33 +240,33 @@ class CC_DLL Console : public Ref
     void createCommandVersion();
 
     // Add commands here
-    void commandAllocator(socket_native_type fd, const std::string& args);
-    void commandConfig(socket_native_type fd, const std::string& args);
-    void commandDebugMsg(socket_native_type fd, const std::string& args);
-    void commandDebugMsgSubCommandOnOff(socket_native_type fd, const std::string& args);
-    void commandDirectorSubCommandPause(socket_native_type fd, const std::string& args);
-    void commandDirectorSubCommandResume(socket_native_type fd, const std::string& args);
-    void commandDirectorSubCommandStop(socket_native_type fd, const std::string& args);
-    void commandDirectorSubCommandStart(socket_native_type fd, const std::string& args);
-    void commandDirectorSubCommandEnd(socket_native_type fd, const std::string& args);
-    void commandExit(socket_native_type fd, const std::string& args);
-    void commandFileUtils(socket_native_type fd, const std::string& args);
-    void commandFileUtilsSubCommandFlush(socket_native_type fd, const std::string& args);
-    void commandFps(socket_native_type fd, const std::string& args);
-    void commandFpsSubCommandOnOff(socket_native_type fd, const std::string& args);
-    void commandHelp(socket_native_type fd, const std::string& args);
-    void commandProjection(socket_native_type fd, const std::string& args);
-    void commandProjectionSubCommand2d(socket_native_type fd, const std::string& args);
-    void commandProjectionSubCommand3d(socket_native_type fd, const std::string& args);
-    void commandResolution(socket_native_type fd, const std::string& args);
-    void commandResolutionSubCommandEmpty(socket_native_type fd, const std::string& args);
-    void commandSceneGraph(socket_native_type fd, const std::string& args);
-    void commandTextures(socket_native_type fd, const std::string& args);
-    void commandTexturesSubCommandFlush(socket_native_type fd, const std::string& args);
-    void commandTouchSubCommandTap(socket_native_type fd, const std::string& args);
-    void commandTouchSubCommandSwipe(socket_native_type fd, const std::string& args);
+    void commandAllocator(socket_native_type fd, std::string_view args);
+    void commandConfig(socket_native_type fd, std::string_view args);
+    void commandDebugMsg(socket_native_type fd, std::string_view args);
+    void commandDebugMsgSubCommandOnOff(socket_native_type fd, std::string_view args);
+    void commandDirectorSubCommandPause(socket_native_type fd, std::string_view args);
+    void commandDirectorSubCommandResume(socket_native_type fd, std::string_view args);
+    void commandDirectorSubCommandStop(socket_native_type fd, std::string_view args);
+    void commandDirectorSubCommandStart(socket_native_type fd, std::string_view args);
+    void commandDirectorSubCommandEnd(socket_native_type fd, std::string_view args);
+    void commandExit(socket_native_type fd, std::string_view args);
+    void commandFileUtils(socket_native_type fd, std::string_view args);
+    void commandFileUtilsSubCommandFlush(socket_native_type fd, std::string_view args);
+    void commandFps(socket_native_type fd, std::string_view args);
+    void commandFpsSubCommandOnOff(socket_native_type fd, std::string_view args);
+    void commandHelp(socket_native_type fd, std::string_view args);
+    void commandProjection(socket_native_type fd, std::string_view args);
+    void commandProjectionSubCommand2d(socket_native_type fd, std::string_view args);
+    void commandProjectionSubCommand3d(socket_native_type fd, std::string_view args);
+    void commandResolution(socket_native_type fd, std::string_view args);
+    void commandResolutionSubCommandEmpty(socket_native_type fd, std::string_view args);
+    void commandSceneGraph(socket_native_type fd, std::string_view args);
+    void commandTextures(socket_native_type fd, std::string_view args);
+    void commandTexturesSubCommandFlush(socket_native_type fd, std::string_view args);
+    void commandTouchSubCommandTap(socket_native_type fd, std::string_view args);
+    void commandTouchSubCommandSwipe(socket_native_type fd, std::string_view args);
     void commandUpload(socket_native_type fd);
-    void commandVersion(socket_native_type fd, const std::string& args);
+    void commandVersion(socket_native_type fd, std::string_view args);
     // file descriptor: socket, console, etc.
     socket_native_type _listenfd;
     socket_native_type _maxfd;
@@ -279,7 +279,7 @@ class CC_DLL Console : public Ref
     bool _endThread;
     bool _isIpv6Server;
 
-    std::unordered_map<std::string, Command*> _commands;
+    hlookup::string_map<Command*> _commands;
 
     // strings generated by cocos2d sent to the remote console
     bool _sendDebugStrings;
@@ -299,9 +299,7 @@ class CC_DLL Console : public Ref
     void printFileUtils(socket_native_type fd);
 
     /** send help message to console */
-    static void sendHelp(socket_native_type fd,
-                         const std::unordered_map<std::string, Command*>& commands,
-                         const char* msg);
+    static void sendHelp(socket_native_type fd, const hlookup::string_map<Command*>& commands, const char* msg);
 };
 
 NS_CC_END
diff --git a/cocos/base/CCController-android.cpp b/cocos/base/CCController-android.cpp
index 564735b5c987..d7084d06cc63 100644
--- a/cocos/base/CCController-android.cpp
+++ b/cocos/base/CCController-android.cpp
@@ -40,7 +40,7 @@ class ControllerImpl
 public:
     ControllerImpl(Controller* controller) : _controller(controller) {}
 
-    static std::vector<Controller*>::iterator findController(const std::string& deviceName, int deviceId)
+    static std::vector<Controller*>::iterator findController(std::string_view deviceName, int deviceId)
     {
         auto iter = std::find_if(
             Controller::s_allController.begin(), Controller::s_allController.end(), [&](Controller* controller) {
@@ -50,10 +50,10 @@ class ControllerImpl
         return iter;
     }
 
-    static void onConnected(const std::string& deviceName, int deviceId)
+    static void onConnected(std::string_view deviceName, int deviceId)
     {
         // Check whether the controller is already connected.
-        CCLOG("onConnected %s,%d", deviceName.c_str(), deviceId);
+        CCLOG("onConnected %s,%d", deviceName.data(), deviceId);
 
         auto iter = findController(deviceName, deviceId);
         if (iter != Controller::s_allController.end())
@@ -68,9 +68,9 @@ class ControllerImpl
         controller->onConnected();
     }
 
-    static void onDisconnected(const std::string& deviceName, int deviceId)
+    static void onDisconnected(std::string_view deviceName, int deviceId)
     {
-        CCLOG("onDisconnected %s,%d", deviceName.c_str(), deviceId);
+        CCLOG("onDisconnected %s,%d", deviceName.data(), deviceId);
 
         auto iter = findController(deviceName, deviceId);
         if (iter == Controller::s_allController.end())
@@ -83,7 +83,7 @@ class ControllerImpl
         Controller::s_allController.erase(iter);
     }
 
-    static void onButtonEvent(const std::string& deviceName,
+    static void onButtonEvent(std::string_view deviceName,
                               int deviceId,
                               int keyCode,
                               bool isPressed,
@@ -101,7 +101,7 @@ class ControllerImpl
         (*iter)->onButtonEvent(keyCode, isPressed, value, isAnalog);
     }
 
-    static void onAxisEvent(const std::string& deviceName, int deviceId, int axisCode, float value, bool isAnalog)
+    static void onAxisEvent(std::string_view deviceName, int deviceId, int axisCode, float value, bool isAnalog)
     {
         auto iter = findController(deviceName, deviceId);
         if (iter == Controller::s_allController.end())
diff --git a/cocos/base/CCController-apple.mm b/cocos/base/CCController-apple.mm
index 349ab4188c9a..0140a148ff4f 100644
--- a/cocos/base/CCController-apple.mm
+++ b/cocos/base/CCController-apple.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2014 cocos2d-x.org
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,36 +28,35 @@ of this software and associated documentation files (the "Software"), to deal
 #include "platform/CCPlatformConfig.h"
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
 
-#include "base/ccMacros.h"
-#include "base/CCEventDispatcher.h"
-#include "base/CCEventController.h"
-#include "base/CCEventListenerController.h"
-#include "base/CCDirector.h"
-#include "2d/CCLabel.h"
+#    include "base/ccMacros.h"
+#    include "base/CCEventDispatcher.h"
+#    include "base/CCEventController.h"
+#    include "base/CCEventListenerController.h"
+#    include "base/CCDirector.h"
+#    include "2d/CCLabel.h"
 
-#import <GameController/GameController.h>
+#    import <GameController/GameController.h>
 
 typedef void (^GCControllerConnectionBlock)(GCController* controller);
 typedef void (^GCControllerDisconnectionBlock)(GCController* controller);
 
-@interface GCControllerConnectionEventHandler : NSObject
-{
+@interface GCControllerConnectionEventHandler : NSObject {
 }
 
-@property (copy) GCControllerConnectionBlock _connectionBlock;
-@property (copy) GCControllerDisconnectionBlock _disconnectionBlock;
+@property(copy) GCControllerConnectionBlock _connectionBlock;
+@property(copy) GCControllerDisconnectionBlock _disconnectionBlock;
 
-+(GCControllerConnectionEventHandler*) getInstance;
-+(void) destroyInstance;
++ (GCControllerConnectionEventHandler*)getInstance;
++ (void)destroyInstance;
 @end
 
 @implementation GCControllerConnectionEventHandler
 
-
 static GCControllerConnectionEventHandler* __instance = nil;
 
-+(GCControllerConnectionEventHandler*) getInstance {
-    
++ (GCControllerConnectionEventHandler*)getInstance
+{
+
     if (__instance == nil)
     {
         __instance = [[GCControllerConnectionEventHandler alloc] init];
@@ -65,7 +64,8 @@ +(GCControllerConnectionEventHandler*) getInstance {
     return __instance;
 }
 
-+(void) destroyInstance {
++ (void)destroyInstance
+{
     if (__instance)
     {
         [__instance release];
@@ -73,33 +73,44 @@ +(void) destroyInstance {
     }
 }
 
--(void) observerConnection: (GCControllerConnectionBlock) connectBlock disconnection: (GCControllerDisconnectionBlock) disconnectBlock {
-    self._connectionBlock = connectBlock;
+- (void)observerConnection:(GCControllerConnectionBlock)connectBlock
+             disconnection:(GCControllerDisconnectionBlock)disconnectBlock
+{
+    self._connectionBlock    = connectBlock;
     self._disconnectionBlock = disconnectBlock;
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onControllerConnected:) name:GCControllerDidConnectNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onControllerDisconnected:) name:GCControllerDidDisconnectNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onControllerConnected:)
+                                                 name:GCControllerDidConnectNotification
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onControllerDisconnected:)
+                                                 name:GCControllerDidDisconnectNotification
+                                               object:nil];
 }
 
--(void)dealloc {
+- (void)dealloc
+{
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     // Have to reset 'copy' property to nil value to avoid memory leak.
-    self._connectionBlock = nil;
+    self._connectionBlock    = nil;
     self._disconnectionBlock = nil;
 
     [super dealloc];
 }
 
--(void) onControllerConnected :(NSNotification *)connectedNotification {
-    GCController *controller =(GCController *)[connectedNotification object];
-    
+- (void)onControllerConnected:(NSNotification*)connectedNotification
+{
+    GCController* controller = (GCController*)[connectedNotification object];
+
     self._connectionBlock(controller);
 }
 
--(void) onControllerDisconnected :(NSNotification *)connectedNotification {
-    
-    GCController *controller =(GCController *)[connectedNotification object];
+- (void)onControllerDisconnected:(NSNotification*)connectedNotification
+{
+
+    GCController* controller = (GCController*)[connectedNotification object];
     self._disconnectionBlock(controller);
 }
 
@@ -110,67 +121,64 @@ -(void) onControllerDisconnected :(NSNotification *)connectedNotification {
 class ControllerImpl
 {
 public:
-    ControllerImpl(Controller* controller)
-    : _controller(controller)
-    , _gcController(nil)
-    {
-        
-    }
-    
+    ControllerImpl(Controller* controller) : _controller(controller), _gcController(nil) {}
+
     Controller* _controller;
     GCController* _gcController;
 };
 
 void Controller::startDiscoveryController()
 {
-    if (NSClassFromString(@"GCController") == nil) {
+    if (NSClassFromString(@"GCController") == nil)
+    {
         return;
     }
-    [GCController startWirelessControllerDiscoveryWithCompletionHandler: nil];
-    
-    [[GCControllerConnectionEventHandler getInstance] observerConnection: ^(GCController* gcController) {
-        
-        auto controller = new Controller();
-        controller->_impl->_gcController = gcController;
-        controller->_deviceName = [gcController.vendorName UTF8String];
-        
-        s_allController.push_back(controller);
-        
-        controller->registerListeners();
-        controller->getDeviceName();
-        
-        controller->onConnected();
-        
-    } disconnection: ^(GCController* gcController) {
-        auto iter = std::find_if(s_allController.begin(), s_allController.end(), [gcController](Controller* c){ return c->_impl->_gcController == gcController; });
-        
-        if(iter == s_allController.end())
-        {
-            log("disconnect:Could not find the controller");
-            return;
+    [GCController startWirelessControllerDiscoveryWithCompletionHandler:nil];
+
+    [[GCControllerConnectionEventHandler getInstance]
+        observerConnection:^(GCController* gcController) {
+          auto controller                  = new Controller();
+          controller->_impl->_gcController = gcController;
+          controller->_deviceName          = [gcController.vendorName UTF8String];
+
+          s_allController.push_back(controller);
+
+          controller->registerListeners();
+          controller->getDeviceName();
+
+          controller->onConnected();
         }
-        
-        (*iter)->onDisconnected();
-        s_allController.erase(iter);
-        
-    }];
+        disconnection:^(GCController* gcController) {
+          auto iter = std::find_if(s_allController.begin(), s_allController.end(),
+                                   [gcController](Controller* c) { return c->_impl->_gcController == gcController; });
+
+          if (iter == s_allController.end())
+          {
+              log("disconnect:Could not find the controller");
+              return;
+          }
+
+          (*iter)->onDisconnected();
+          s_allController.erase(iter);
+        }];
 }
 
 void Controller::stopDiscoveryController()
 {
-    if (NSClassFromString(@"GCController") == nil) {
+    if (NSClassFromString(@"GCController") == nil)
+    {
         return;
     }
     [GCController stopWirelessControllerDiscovery];
 }
 
 Controller::Controller()
-: _deviceId(0)
-, _controllerTag(TAG_UNSET)
-, _impl(new ControllerImpl(this))
-, _connectEvent(nullptr)
-, _keyEvent(nullptr)
-, _axisEvent(nullptr)
+    : _deviceId(0)
+    , _controllerTag(TAG_UNSET)
+    , _impl(new ControllerImpl(this))
+    , _connectEvent(nullptr)
+    , _keyEvent(nullptr)
+    , _axisEvent(nullptr)
 {
     init();
 }
@@ -178,7 +186,7 @@ -(void) onControllerDisconnected :(NSNotification *)connectedNotification {
 Controller::~Controller()
 {
     delete _impl;
-    
+
     delete _connectEvent;
     delete _keyEvent;
     delete _axisEvent;
@@ -188,164 +196,184 @@ -(void) onControllerDisconnected :(NSNotification *)connectedNotification {
 {
     if (_impl->_gcController.extendedGamepad != nil)
     {
-        _impl->_gcController.extendedGamepad.dpad.up.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.dpad.down.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.dpad.left.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.dpad.right.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.leftThumbstick.xAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
-            onAxisEvent(Key::JOYSTICK_LEFT_X, value, axis.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.leftThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
-            onAxisEvent(Key::JOYSTICK_LEFT_Y, -value, axis.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.rightThumbstick.xAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
-            onAxisEvent(Key::JOYSTICK_RIGHT_X, value, axis.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.rightThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
-            onAxisEvent(Key::JOYSTICK_RIGHT_Y, -value, axis.isAnalog);
-        };
-        
-        _impl->_gcController.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element){
-            if (element == gamepad.buttonA)
-            {
-                onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
-            }
-            else if (element == gamepad.buttonB)
-            {
-                onButtonEvent(Key::BUTTON_B, gamepad.buttonB.isPressed, gamepad.buttonB.value, gamepad.buttonB.isAnalog);
-            }
-            else if (element == gamepad.buttonX)
-            {
-                onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
-            }
-            else if (element == gamepad.buttonY)
-            {
-                onButtonEvent(Key::BUTTON_Y, gamepad.buttonY.isPressed, gamepad.buttonY.value, gamepad.buttonY.isAnalog);
-            }
-            else if (element == gamepad.leftShoulder)
-            {
-                onButtonEvent(Key::BUTTON_LEFT_SHOULDER, gamepad.leftShoulder.isPressed, gamepad.leftShoulder.value, gamepad.leftShoulder.isAnalog);
-            }
-            else if (element == gamepad.rightShoulder)
-            {
-                onButtonEvent(Key::BUTTON_RIGHT_SHOULDER, gamepad.rightShoulder.isPressed, gamepad.rightShoulder.value, gamepad.rightShoulder.isAnalog);
-            }
-            else if (element == gamepad.leftTrigger)
-            {
-                onAxisEvent(Key::AXIS_LEFT_TRIGGER, gamepad.leftTrigger.value, gamepad.leftTrigger.isAnalog);
-            }
-            else if (element == gamepad.rightTrigger)
-            {
-                onAxisEvent(Key::AXIS_RIGHT_TRIGGER, gamepad.rightTrigger.value, gamepad.rightTrigger.isAnalog);
-            }
+        _impl->_gcController.extendedGamepad.dpad.up.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.dpad.down.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.dpad.left.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.dpad.right.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.leftThumbstick.xAxis.valueChangedHandler =
+            ^(GCControllerAxisInput* axis, float value) {
+              onAxisEvent(Key::JOYSTICK_LEFT_X, value, axis.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.leftThumbstick.yAxis.valueChangedHandler =
+            ^(GCControllerAxisInput* axis, float value) {
+              onAxisEvent(Key::JOYSTICK_LEFT_Y, -value, axis.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.rightThumbstick.xAxis.valueChangedHandler =
+            ^(GCControllerAxisInput* axis, float value) {
+              onAxisEvent(Key::JOYSTICK_RIGHT_X, value, axis.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.rightThumbstick.yAxis.valueChangedHandler =
+            ^(GCControllerAxisInput* axis, float value) {
+              onAxisEvent(Key::JOYSTICK_RIGHT_Y, -value, axis.isAnalog);
+            };
+
+        _impl->_gcController.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad* gamepad,
+                                                                     GCControllerElement* element) {
+          if (element == gamepad.buttonA)
+          {
+              onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
+          }
+          else if (element == gamepad.buttonB)
+          {
+              onButtonEvent(Key::BUTTON_B, gamepad.buttonB.isPressed, gamepad.buttonB.value, gamepad.buttonB.isAnalog);
+          }
+          else if (element == gamepad.buttonX)
+          {
+              onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
+          }
+          else if (element == gamepad.buttonY)
+          {
+              onButtonEvent(Key::BUTTON_Y, gamepad.buttonY.isPressed, gamepad.buttonY.value, gamepad.buttonY.isAnalog);
+          }
+          else if (element == gamepad.leftShoulder)
+          {
+              onButtonEvent(Key::BUTTON_LEFT_SHOULDER, gamepad.leftShoulder.isPressed, gamepad.leftShoulder.value,
+                            gamepad.leftShoulder.isAnalog);
+          }
+          else if (element == gamepad.rightShoulder)
+          {
+              onButtonEvent(Key::BUTTON_RIGHT_SHOULDER, gamepad.rightShoulder.isPressed, gamepad.rightShoulder.value,
+                            gamepad.rightShoulder.isAnalog);
+          }
+          else if (element == gamepad.leftTrigger)
+          {
+              onAxisEvent(Key::AXIS_LEFT_TRIGGER, gamepad.leftTrigger.value, gamepad.leftTrigger.isAnalog);
+          }
+          else if (element == gamepad.rightTrigger)
+          {
+              onAxisEvent(Key::AXIS_RIGHT_TRIGGER, gamepad.rightTrigger.value, gamepad.rightTrigger.isAnalog);
+          }
         };
     }
     else if (_impl->_gcController.gamepad != nil)
     {
-        _impl->_gcController.gamepad.dpad.up.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.gamepad.dpad.down.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.gamepad.dpad.left.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.gamepad.dpad.right.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.gamepad.valueChangedHandler = ^(GCGamepad *gamepad, GCControllerElement *element){
-            
-            if (element == gamepad.buttonA)
-            {
-                onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
-            }
-            else if (element == gamepad.buttonB)
-            {
-                onButtonEvent(Key::BUTTON_B, gamepad.buttonB.isPressed, gamepad.buttonB.value, gamepad.buttonB.isAnalog);
-            }
-            else if (element == gamepad.buttonX)
-            {
-                onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
-            }
-            else if (element == gamepad.buttonY)
-            {
-                onButtonEvent(Key::BUTTON_Y, gamepad.buttonY.isPressed, gamepad.buttonY.value, gamepad.buttonY.isAnalog);
-            }
-            else if (element == gamepad.leftShoulder)
-            {
-                onButtonEvent(Key::BUTTON_LEFT_SHOULDER, gamepad.leftShoulder.isPressed, gamepad.leftShoulder.value, gamepad.leftShoulder.isAnalog);
-            }
-            else if (element == gamepad.rightShoulder)
-            {
-                onButtonEvent(Key::BUTTON_RIGHT_SHOULDER, gamepad.rightShoulder.isPressed, gamepad.rightShoulder.value, gamepad.rightShoulder.isAnalog);
-            }
+        _impl->_gcController.gamepad.dpad.up.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.gamepad.dpad.down.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.gamepad.dpad.left.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.gamepad.dpad.right.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.gamepad.valueChangedHandler = ^(GCGamepad* gamepad, GCControllerElement* element) {
+          if (element == gamepad.buttonA)
+          {
+              onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
+          }
+          else if (element == gamepad.buttonB)
+          {
+              onButtonEvent(Key::BUTTON_B, gamepad.buttonB.isPressed, gamepad.buttonB.value, gamepad.buttonB.isAnalog);
+          }
+          else if (element == gamepad.buttonX)
+          {
+              onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
+          }
+          else if (element == gamepad.buttonY)
+          {
+              onButtonEvent(Key::BUTTON_Y, gamepad.buttonY.isPressed, gamepad.buttonY.value, gamepad.buttonY.isAnalog);
+          }
+          else if (element == gamepad.leftShoulder)
+          {
+              onButtonEvent(Key::BUTTON_LEFT_SHOULDER, gamepad.leftShoulder.isPressed, gamepad.leftShoulder.value,
+                            gamepad.leftShoulder.isAnalog);
+          }
+          else if (element == gamepad.rightShoulder)
+          {
+              onButtonEvent(Key::BUTTON_RIGHT_SHOULDER, gamepad.rightShoulder.isPressed, gamepad.rightShoulder.value,
+                            gamepad.rightShoulder.isAnalog);
+          }
         };
     }
-#if defined(CC_TARGET_OS_TVOS)
+#    if defined(CC_TARGET_OS_TVOS)
     else if (_impl->_gcController.microGamepad != nil)
     {
-        _impl->_gcController.microGamepad.dpad.up.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.microGamepad.dpad.down.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.microGamepad.dpad.left.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.microGamepad.dpad.right.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed){
-            onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
-        };
-        
-        _impl->_gcController.microGamepad.valueChangedHandler = ^(GCMicroGamepad *gamepad, GCControllerElement *element){
-            
-            if (element == gamepad.buttonA)
-            {
-                onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
-            }
-            else if (element == gamepad.buttonX)
-            {
-                onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
-            }
+        _impl->_gcController.microGamepad.dpad.up.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_UP, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.microGamepad.dpad.down.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_DOWN, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.microGamepad.dpad.left.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_LEFT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.microGamepad.dpad.right.valueChangedHandler =
+            ^(GCControllerButtonInput* button, float value, BOOL pressed) {
+              onButtonEvent(Key::BUTTON_DPAD_RIGHT, pressed, value, button.isAnalog);
+            };
+
+        _impl->_gcController.microGamepad.valueChangedHandler = ^(GCMicroGamepad* gamepad,
+                                                                  GCControllerElement* element) {
+          if (element == gamepad.buttonA)
+          {
+              onButtonEvent(Key::BUTTON_A, gamepad.buttonA.isPressed, gamepad.buttonA.value, gamepad.buttonA.isAnalog);
+          }
+          else if (element == gamepad.buttonX)
+          {
+              onButtonEvent(Key::BUTTON_X, gamepad.buttonX.isPressed, gamepad.buttonX.value, gamepad.buttonX.isAnalog);
+          }
         };
     }
-#endif
-    
-    _impl->_gcController.controllerPausedHandler = ^(GCController* gcCon){
-        
-        auto iter = std::find_if(s_allController.begin(), s_allController.end(), [gcCon](Controller* c){ return c->_impl->_gcController == gcCon; });
-        
-        if(iter == s_allController.end())
-        {
-            log("Could not find the controller");
-            return;
-        }
-        
-        onButtonEvent(Key::BUTTON_PAUSE, true, 1.0f, false);
-        onButtonEvent(Key::BUTTON_PAUSE, false, 0.0f, false);
+#    endif
+
+    _impl->_gcController.controllerPausedHandler = ^(GCController* gcCon) {
+      auto iter = std::find_if(s_allController.begin(), s_allController.end(),
+                               [gcCon](Controller* c) { return c->_impl->_gcController == gcCon; });
+
+      if (iter == s_allController.end())
+      {
+          log("Could not find the controller");
+          return;
+      }
+
+      onButtonEvent(Key::BUTTON_PAUSE, true, 1.0f, false);
+      onButtonEvent(Key::BUTTON_PAUSE, false, 0.0f, false);
     };
 }
 
@@ -354,10 +382,8 @@ -(void) onControllerDisconnected :(NSNotification *)connectedNotification {
     return _impl->_gcController.isAttachedToDevice == YES;
 }
 
-void Controller::receiveExternalKeyEvent(int externalKeyCode,bool receive)
-{
-}
+void Controller::receiveExternalKeyEvent(int externalKeyCode, bool receive) {}
 
 NS_CC_END
 
-#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+#endif  // #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
diff --git a/cocos/base/CCController-linux-win32.cpp b/cocos/base/CCController-linux-win32.cpp
index cca3d2ee2cf0..f99e23b64188 100644
--- a/cocos/base/CCController-linux-win32.cpp
+++ b/cocos/base/CCController-linux-win32.cpp
@@ -4203,7 +4203,7 @@ class CC_DLL ControllerImpl
         return iter;
     }
 
-    static void onConnected(const std::string& deviceName, int deviceId)
+    static void onConnected(std::string_view deviceName, int deviceId)
     {
         // Check whether the controller is already registered
         auto iter = findController(deviceId);
@@ -4222,7 +4222,7 @@ class CC_DLL ControllerImpl
             if (deviceName.compare(it.first) == 0)
             {
                 // Found controller profile. Attach it to the controller:
-                CCLOG("ControllerImpl: Found input profile for controller: %s", deviceName.c_str());
+                CCLOG("ControllerImpl: Found input profile for controller: %s", deviceName.data());
                 controller->_buttonInputMap = it.second.first;
                 controller->_axisInputMap   = it.second.second;
 
@@ -4241,7 +4241,7 @@ class CC_DLL ControllerImpl
                         CCLOG(
                             "ControllerImpl: Could not find a button input mapping for controller \"%s\", and keyCode "
                             "\"%d\". This keyCode will not match any from Controller::Key",
-                            controller->getDeviceName().c_str(), i);
+                            controller->getDeviceName().data(), i);
                     }
                 }
 
@@ -4255,7 +4255,7 @@ class CC_DLL ControllerImpl
                         CCLOG(
                             "ControllerImpl: Could not find an axis input mapping for controller \"%s\", and keyCode "
                             "\"%d\". This keyCode will not match any from Controller::Key",
-                            controller->getDeviceName().c_str(), i);
+                            controller->getDeviceName().data(), i);
                     }
                 }
 #    endif
@@ -4268,12 +4268,12 @@ class CC_DLL ControllerImpl
 #    ifdef COCOS2D_DEBUG
         if (controller->_buttonInputMap.empty())
         {
-            CCLOG("ControllerImpl: Could not find a button input map for controller: %s", deviceName.c_str());
+            CCLOG("ControllerImpl: Could not find a button input map for controller: %s", deviceName.data());
         }
 
         if (controller->_axisInputMap.empty())
         {
-            CCLOG("ControllerImpl: Could not find an axis input map for controller: %s", deviceName.c_str());
+            CCLOG("ControllerImpl: Could not find an axis input map for controller: %s", deviceName.data());
         }
 #    endif
 
diff --git a/cocos/base/CCController.h b/cocos/base/CCController.h
index 646195def434..f6c3bc70f4f3 100644
--- a/cocos/base/CCController.h
+++ b/cocos/base/CCController.h
@@ -153,7 +153,7 @@ class CC_DLL Controller
     /**
      * Gets the name of this Controller object.
      */
-    const std::string& getDeviceName() const { return _deviceName; }
+    std::string_view getDeviceName() const { return _deviceName; }
 
     /**
      * Gets the Controller id.
diff --git a/cocos/base/CCEventCustom.cpp b/cocos/base/CCEventCustom.cpp
index 025252f7a79a..2d3cb05fd2b7 100644
--- a/cocos/base/CCEventCustom.cpp
+++ b/cocos/base/CCEventCustom.cpp
@@ -28,7 +28,6 @@
 
 NS_CC_BEGIN
 
-EventCustom::EventCustom(const std::string& eventName) : Event(Type::CUSTOM), _userData(nullptr), _eventName(eventName)
-{}
+EventCustom::EventCustom(std::string_view eventName) : Event(Type::CUSTOM), _userData(nullptr), _eventName(eventName) {}
 
 NS_CC_END
diff --git a/cocos/base/CCEventCustom.h b/cocos/base/CCEventCustom.h
index ae14031001df..e7a03091c752 100644
--- a/cocos/base/CCEventCustom.h
+++ b/cocos/base/CCEventCustom.h
@@ -47,7 +47,7 @@ class CC_DLL EventCustom : public Event
      * @param eventName A given name of the custom event.
      * @js ctor
      */
-    EventCustom(const std::string& eventName);
+    EventCustom(std::string_view eventName);
 
     /** Sets user data.
      *
@@ -65,7 +65,7 @@ class CC_DLL EventCustom : public Event
      *
      * @return The name of the event.
      */
-    const std::string& getEventName() const { return _eventName; }
+    std::string_view getEventName() const { return _eventName; }
 
 protected:
     void* _userData;  ///< User data
diff --git a/cocos/base/CCEventDispatcher.cpp b/cocos/base/CCEventDispatcher.cpp
index 7a18512e6612..41eae69d1e37 100644
--- a/cocos/base/CCEventDispatcher.cpp
+++ b/cocos/base/CCEventDispatcher.cpp
@@ -451,9 +451,9 @@ void EventDispatcher::addEventListener(EventListener* listener)
 
 void EventDispatcher::forceAddEventListener(EventListener* listener)
 {
-    EventListenerVector* listeners       = nullptr;
-    EventListener::ListenerID listenerID = listener->getListenerID();
-    auto itr                             = _listenerMap.find(listenerID);
+    EventListenerVector* listeners = nullptr;
+    auto listenerID                = listener->getListenerID();
+    auto itr                       = _listenerMap.find(listenerID);
     if (itr == _listenerMap.end())
     {
 
@@ -579,7 +579,7 @@ void EventDispatcher::addEventListenerWithFixedPriority(EventListener* listener,
     addEventListener(listener);
 }
 
-EventListenerCustom* EventDispatcher::addCustomEventListener(const std::string& eventName,
+EventListenerCustom* EventDispatcher::addCustomEventListener(std::string_view eventName,
                                                              const std::function<void(EventCustom*)>& callback)
 {
     EventListenerCustom* listener = EventListenerCustom::create(eventName, callback);
@@ -931,14 +931,14 @@ void EventDispatcher::dispatchEvent(Event* event)
     updateListeners(event);
 }
 
-void EventDispatcher::dispatchCustomEvent(const std::string& eventName, void* optionalUserData)
+void EventDispatcher::dispatchCustomEvent(std::string_view eventName, void* optionalUserData)
 {
     EventCustom ev(eventName);
     ev.setUserData(optionalUserData);
     dispatchEvent(&ev);
 }
 
-bool EventDispatcher::hasEventListener(const EventListener::ListenerID& listenerID) const
+bool EventDispatcher::hasEventListener(std::string_view listenerID) const
 {
     return getListeners(listenerID) != nullptr;
 }
@@ -1268,7 +1268,7 @@ void EventDispatcher::updateDirtyFlagForSceneGraph()
     }
 }
 
-void EventDispatcher::sortEventListeners(const EventListener::ListenerID& listenerID)
+void EventDispatcher::sortEventListeners(std::string_view listenerID)
 {
     DirtyFlag dirtyFlag = DirtyFlag::NONE;
 
@@ -1303,8 +1303,7 @@ void EventDispatcher::sortEventListeners(const EventListener::ListenerID& listen
     }
 }
 
-void EventDispatcher::sortEventListenersOfSceneGraphPriority(const EventListener::ListenerID& listenerID,
-                                                             Node* rootNode)
+void EventDispatcher::sortEventListenersOfSceneGraphPriority(std::string_view listenerID, Node* rootNode)
 {
     auto listeners = getListeners(listenerID);
 
@@ -1337,7 +1336,7 @@ void EventDispatcher::sortEventListenersOfSceneGraphPriority(const EventListener
 #endif
 }
 
-void EventDispatcher::sortEventListenersOfFixedPriority(const EventListener::ListenerID& listenerID)
+void EventDispatcher::sortEventListenersOfFixedPriority(std::string_view listenerID)
 {
     auto listeners = getListeners(listenerID);
 
@@ -1374,7 +1373,7 @@ void EventDispatcher::sortEventListenersOfFixedPriority(const EventListener::Lis
 #endif
 }
 
-EventDispatcher::EventListenerVector* EventDispatcher::getListeners(const EventListener::ListenerID& listenerID) const
+EventDispatcher::EventListenerVector* EventDispatcher::getListeners(std::string_view listenerID) const
 {
     auto iter = _listenerMap.find(listenerID);
     if (iter != _listenerMap.end())
@@ -1385,7 +1384,7 @@ EventDispatcher::EventListenerVector* EventDispatcher::getListeners(const EventL
     return nullptr;
 }
 
-void EventDispatcher::removeEventListenersForListenerID(const EventListener::ListenerID& listenerID)
+void EventDispatcher::removeEventListenersForListenerID(std::string_view listenerID)
 {
     auto listenerItemIter = _listenerMap.find(listenerID);
     if (listenerItemIter != _listenerMap.end())
@@ -1479,7 +1478,7 @@ void EventDispatcher::removeEventListenersForType(EventListener::Type listenerTy
     }
 }
 
-void EventDispatcher::removeCustomEventListeners(const std::string& customEventName)
+void EventDispatcher::removeCustomEventListeners(std::string_view customEventName)
 {
     removeEventListenersForListenerID(customEventName);
 }
@@ -1539,7 +1538,7 @@ void EventDispatcher::setDirtyForNode(Node* node)
     }
 }
 
-void EventDispatcher::setDirty(const EventListener::ListenerID& listenerID, DirtyFlag flag)
+void EventDispatcher::setDirty(std::string_view listenerID, DirtyFlag flag)
 {
     auto iter = _priorityDirtyFlagMap.find(listenerID);
     if (iter == _priorityDirtyFlagMap.end())
diff --git a/cocos/base/CCEventDispatcher.h b/cocos/base/CCEventDispatcher.h
index 2523f7ff2b96..9c01a79663a1 100644
--- a/cocos/base/CCEventDispatcher.h
+++ b/cocos/base/CCEventDispatcher.h
@@ -87,7 +87,7 @@ class CC_DLL EventDispatcher : public Ref
      * @param callback A given callback method that associated the event name.
      * @return the generated event. Needed in order to remove the event from the dispatcher
      */
-    EventListenerCustom* addCustomEventListener(const std::string& eventName,
+    EventListenerCustom* addCustomEventListener(std::string_view eventName,
                                                 const std::function<void(EventCustom*)>& callback);
 
     /////////////////////////////////////////////
@@ -117,7 +117,7 @@ class CC_DLL EventDispatcher : public Ref
      *
      * @param customEventName A given event listener name which needs to be removed.
      */
-    void removeCustomEventListeners(const std::string& customEventName);
+    void removeCustomEventListeners(std::string_view customEventName);
 
     /** Removes all listeners.
      */
@@ -177,7 +177,7 @@ class CC_DLL EventDispatcher : public Ref
      * @param eventName The name of the event which needs to be dispatched.
      * @param optionalUserData The optional user data, it's a void*, the default value is nullptr.
      */
-    void dispatchCustomEvent(const std::string& eventName, void* optionalUserData = nullptr);
+    void dispatchCustomEvent(std::string_view eventName, void* optionalUserData = nullptr);
 
     /** Query whether the specified event listener id has been added.
      *
@@ -185,7 +185,7 @@ class CC_DLL EventDispatcher : public Ref
      *
      * @return True if dispatching events is exist
      */
-    bool hasEventListener(const EventListener::ListenerID& listenerID) const;
+    bool hasEventListener(std::string_view listenerID) const;
 
     /////////////////////////////////////////////
 
@@ -252,22 +252,22 @@ class CC_DLL EventDispatcher : public Ref
     void forceAddEventListener(EventListener* listener);
 
     /** Gets event the listener list for the event listener type. */
-    EventListenerVector* getListeners(const EventListener::ListenerID& listenerID) const;
+    EventListenerVector* getListeners(std::string_view listenerID) const;
 
     /** Update dirty flag */
     void updateDirtyFlagForSceneGraph();
 
     /** Removes all listeners with the same event listener ID */
-    void removeEventListenersForListenerID(const EventListener::ListenerID& listenerID);
+    void removeEventListenersForListenerID(std::string_view listenerID);
 
     /** Sort event listener */
-    void sortEventListeners(const EventListener::ListenerID& listenerID);
+    void sortEventListeners(std::string_view listenerID);
 
     /** Sorts the listeners of specified type by scene graph priority */
-    void sortEventListenersOfSceneGraphPriority(const EventListener::ListenerID& listenerID, Node* rootNode);
+    void sortEventListenersOfSceneGraphPriority(std::string_view listenerID, Node* rootNode);
 
     /** Sorts the listeners of specified type by fixed priority */
-    void sortEventListenersOfFixedPriority(const EventListener::ListenerID& listenerID);
+    void sortEventListenersOfFixedPriority(std::string_view listenerID);
 
     /** Updates all listeners
      *  1) Removes all listener items that have been marked as 'removed' when dispatching event.
@@ -311,7 +311,7 @@ class CC_DLL EventDispatcher : public Ref
     };
 
     /** Sets the dirty flag for a specified listener ID */
-    void setDirty(const EventListener::ListenerID& listenerID, DirtyFlag flag);
+    void setDirty(std::string_view listenerID, DirtyFlag flag);
 
     /** Walks though scene graph to get the draw order for each node, it's called before sorting event listener with
      * scene graph priority */
@@ -321,10 +321,10 @@ class CC_DLL EventDispatcher : public Ref
     void cleanToRemovedListeners();
 
     /** Listeners map */
-    std::unordered_map<EventListener::ListenerID, EventListenerVector*> _listenerMap;
+    hlookup::string_map<EventListenerVector*> _listenerMap;
 
     /** The map of dirty flag */
-    std::unordered_map<EventListener::ListenerID, DirtyFlag> _priorityDirtyFlagMap;
+    hlookup::string_map<DirtyFlag> _priorityDirtyFlagMap;
 
     /** The map of node and event listeners */
     std::unordered_map<Node*, std::vector<EventListener*>*> _nodeListenersMap;
diff --git a/cocos/base/CCEventListener.cpp b/cocos/base/CCEventListener.cpp
index 5da92081a718..d2e9e29c88ff 100644
--- a/cocos/base/CCEventListener.cpp
+++ b/cocos/base/CCEventListener.cpp
@@ -35,7 +35,7 @@ EventListener::~EventListener()
     CCLOGINFO("In the destructor of EventListener. %p", this);
 }
 
-bool EventListener::init(Type t, const ListenerID& listenerID, const std::function<void(Event*)>& callback)
+bool EventListener::init(Type t, std::string_view listenerID, const std::function<void(Event*)>& callback)
 {
     _onEvent      = callback;
     _type         = t;
diff --git a/cocos/base/CCEventListener.h b/cocos/base/CCEventListener.h
index 3f8a64631d57..6eb1f728edcf 100644
--- a/cocos/base/CCEventListener.h
+++ b/cocos/base/CCEventListener.h
@@ -79,7 +79,7 @@ class CC_DLL EventListener : public Ref
      * Initializes event with type and callback function
      * @js NA
      */
-    bool init(Type t, const ListenerID& listenerID, const std::function<void(Event*)>& callback);
+    bool init(Type t, std::string_view listenerID, const std::function<void(Event*)>& callback);
 
 public:
     /** Destructor.
@@ -143,7 +143,7 @@ class CC_DLL EventListener : public Ref
     /** Gets the listener ID of this listener
      *  When event is being dispatched, listener ID is used as key for searching listeners according to event type.
      */
-    const ListenerID& getListenerID() const { return _listenerID; }
+    std::string_view getListenerID() const { return _listenerID; }
 
     /** Sets the fixed priority for this listener
      *  @note This method is only used for `fixed priority listeners`, it needs to access a non-zero value.
diff --git a/cocos/base/CCEventListenerCustom.cpp b/cocos/base/CCEventListenerCustom.cpp
index 6ccfe8071268..299d6724fcbf 100644
--- a/cocos/base/CCEventListenerCustom.cpp
+++ b/cocos/base/CCEventListenerCustom.cpp
@@ -30,7 +30,7 @@ NS_CC_BEGIN
 
 EventListenerCustom::EventListenerCustom() : _onCustomEvent(nullptr) {}
 
-EventListenerCustom* EventListenerCustom::create(const std::string& eventName,
+EventListenerCustom* EventListenerCustom::create(std::string_view eventName,
                                                  const std::function<void(EventCustom*)>& callback)
 {
     EventListenerCustom* ret = new EventListenerCustom();
@@ -45,7 +45,7 @@ EventListenerCustom* EventListenerCustom::create(const std::string& eventName,
     return ret;
 }
 
-bool EventListenerCustom::init(const ListenerID& listenerId, const std::function<void(EventCustom*)>& callback)
+bool EventListenerCustom::init(std::string_view listenerId, const std::function<void(EventCustom*)>& callback)
 {
     bool ret = false;
 
diff --git a/cocos/base/CCEventListenerCustom.h b/cocos/base/CCEventListenerCustom.h
index b9821624919a..ea68f2302e3c 100644
--- a/cocos/base/CCEventListenerCustom.h
+++ b/cocos/base/CCEventListenerCustom.h
@@ -66,7 +66,7 @@ class CC_DLL EventListenerCustom : public EventListener
      * @param callback The callback function when the specified event was emitted.
      * @return An autoreleased EventListenerCustom object.
      */
-    static EventListenerCustom* create(const std::string& eventName, const std::function<void(EventCustom*)>& callback);
+    static EventListenerCustom* create(std::string_view eventName, const std::function<void(EventCustom*)>& callback);
 
     /// Overrides
     virtual bool checkAvailable() override;
@@ -77,7 +77,7 @@ class CC_DLL EventListenerCustom : public EventListener
         EventListenerCustom();
 
     /** Initializes event with type and callback function */
-    bool init(const ListenerID& listenerId, const std::function<void(EventCustom*)>& callback);
+    bool init(std::string_view listenerId, const std::function<void(EventCustom*)>& callback);
 
 protected:
     std::function<void(EventCustom*)> _onCustomEvent;
diff --git a/cocos/base/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h
index 9c9c63574c98..276c0d5d24f1 100644
--- a/cocos/base/CCIMEDelegate.h
+++ b/cocos/base/CCIMEDelegate.h
@@ -137,7 +137,7 @@ class CC_DLL IMEDelegate
     * @js NA
     * @lua NA
     */
-    virtual const std::string& getContentText() { return STD_STRING_EMPTY; }
+    virtual std::string_view getContentText() { return STD_STRING_EMPTY; }
 
     //////////////////////////////////////////////////////////////////////////
     // keyboard show/hide notification
diff --git a/cocos/base/CCIMEDispatcher.cpp b/cocos/base/CCIMEDispatcher.cpp
index ccd59f96dcf5..744446667823 100644
--- a/cocos/base/CCIMEDispatcher.cpp
+++ b/cocos/base/CCIMEDispatcher.cpp
@@ -247,7 +247,7 @@ void IMEDispatcher::dispatchControlKey(EventKeyboard::KeyCode keyCode)
     } while (0);
 }
 
-const std::string& IMEDispatcher::getContentText()
+std::string_view IMEDispatcher::getContentText()
 {
     if (_impl && _impl->_delegateWithIme)
     {
diff --git a/cocos/base/CCIMEDispatcher.h b/cocos/base/CCIMEDispatcher.h
index 5040b9d32431..4ab9b6f5b493 100644
--- a/cocos/base/CCIMEDispatcher.h
+++ b/cocos/base/CCIMEDispatcher.h
@@ -76,7 +76,7 @@ class CC_DLL IMEDispatcher
      * @brief Get the content text from IMEDelegate, retrieved previously from IME.
      * @lua NA
      */
-    const std::string& getContentText();
+    std::string_view getContentText();
 
     //////////////////////////////////////////////////////////////////////////
     // dispatch keyboard notification
diff --git a/cocos/base/CCMap.h b/cocos/base/CCMap.h
index 8bfd817dfab0..af45abeacf17 100644
--- a/cocos/base/CCMap.h
+++ b/cocos/base/CCMap.h
@@ -27,6 +27,7 @@
 #define __CCMAP_H__
 
 #define USE_STD_UNORDERED_MAP 1
+#define USE_ROBIN_MAP 1
 
 #include "base/ccMacros.h"
 #include "base/CCRef.h"
@@ -51,12 +52,12 @@ NS_CC_BEGIN
  * @js NA
  * @lua NA
  */
-template <class K, class V>
+template <class K, class V, typename H = std::hash<K>, typename E = std::equal_to<K>>
 class Map
 {
 public:
 #if USE_STD_UNORDERED_MAP
-    typedef std::unordered_map<K, V> RefMap;
+    typedef tsl::robin_map<K, V, H, E> RefMap;
 #else
     typedef std::map<K, V> RefMap;
 #endif
@@ -86,14 +87,14 @@ class Map
     const_iterator cend() const { return _data.cend(); }
 
     /** Default constructor */
-    Map<K, V>() : _data()
+    Map() : _data()
     {
         static_assert(std::is_convertible<V, Ref*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the default constructor of Map!");
     }
 
     /** Constructor with capacity. */
-    explicit Map<K, V>(ssize_t capacity) : _data()
+    explicit Map(ssize_t capacity) : _data()
     {
         static_assert(std::is_convertible<V, Ref*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the constructor with capacity of Map!");
@@ -101,7 +102,7 @@ class Map
     }
 
     /** Copy constructor. */
-    Map<K, V>(const Map<K, V>& other)
+    Map(const Map& other)
     {
         static_assert(std::is_convertible<V, Ref*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the copy constructor of Map!");
@@ -110,7 +111,7 @@ class Map
     }
 
     /** Move constructor. */
-    Map<K, V>(Map<K, V>&& other)
+    Map(Map&& other)
     {
         static_assert(std::is_convertible<V, Ref*>::value, "Invalid Type for cocos2d::Map<K, V>!");
         CCLOGINFO("In the move constructor of Map!");
@@ -121,7 +122,7 @@ class Map
      * Destructor.
      * It will release all objects in map.
      */
-    ~Map<K, V>()
+    ~Map()
     {
         CCLOGINFO("In the destructor of Map!");
         clear();
@@ -148,7 +149,7 @@ class Map
     /** Returns the number of elements in bucket n. */
     ssize_t bucketSize(ssize_t n) const
     {
-#if USE_STD_UNORDERED_MAP
+#if USE_STD_UNORDERED_MAP && !defined(USE_ROBIN_MAP)
         return _data.bucket_size(n);
 #else
         return 0;
@@ -158,7 +159,7 @@ class Map
     /** Returns the bucket number where the element with key k is located. */
     ssize_t bucket(const K& k) const
     {
-#if USE_STD_UNORDERED_MAP
+#if USE_STD_UNORDERED_MAP && !defined(USE_ROBIN_MAP)
         return _data.bucket(k);
 #else
         return 0;
@@ -223,7 +224,8 @@ class Map
      *       Member type K is the keys for the elements in the container. defined in Map<K, V> as an alias of its first
      * template parameter (Key).
      */
-    const V at(const K& key) const
+    template <typename K2>
+    const V at(const K2& key) const
     {
         auto iter = _data.find(key);
         if (iter != _data.end())
@@ -231,7 +233,8 @@ class Map
         return nullptr;
     }
 
-    V at(const K& key)
+    template <typename K2>
+    V at(const K2& key)
     {
         auto iter = _data.find(key);
         if (iter != _data.end())
@@ -247,9 +250,17 @@ class Map
      *        Member type 'K' is the type of the keys for the elements in the container,
      *        defined in Map<K, V> as an alias of its first template parameter (Key).
      */
-    const_iterator find(const K& key) const { return _data.find(key); }
+    template <typename K2>
+    const_iterator find(const K2& key) const
+    {
+        return _data.find(key);
+    }
 
-    iterator find(const K& key) { return _data.find(key); }
+    template <typename K2>
+    iterator find(const K2& key)
+    {
+        return _data.find(key);
+    }
 
     /**
      * Inserts new elements in the map.
@@ -259,7 +270,8 @@ class Map
      * @param key The key to be inserted.
      * @param object The object to be inserted.
      */
-    void insert(const K& key, V object)
+    template <typename K2>
+    void insert(const K2& key, V object)
     {
         CCASSERT(object != nullptr, "Object is nullptr!");
         object->retain();
@@ -280,6 +292,13 @@ class Map
         return _data.erase(position);
     }
 
+    iterator erase(iterator position)
+    {
+        CCASSERT(position != _data.cend(), "Invalid iterator!");
+        position->second->release();
+        return _data.erase(position);
+    }
+
     /**
      * Removes an element with an iterator from the Map<K, V> container.
      *
@@ -287,7 +306,20 @@ class Map
      *        Member type 'K' is the type of the keys for the elements in the container,
      *        defined in Map<K, V> as an alias of its first template parameter (Key).
      */
-    size_t erase(const K& k)
+    // size_t erase(const K& k)
+    //{
+    //     auto iter = _data.find(k);
+    //     if (iter != _data.end())
+    //     {
+    //         iter->second->release();
+    //         _data.erase(iter);
+    //         return 1;
+    //     }
+    //     return 0;
+    // }
+
+    template <typename _K2>
+    size_t erase(const _K2& k)
     {
         auto iter = _data.find(k);
         if (iter != _data.end())
@@ -304,7 +336,8 @@ class Map
      *
      * @param keys Keys of elements to be erased.
      */
-    void erase(const std::vector<K>& keys)
+    template <typename _K2>
+    void erase(const std::vector<_K2>& keys)
     {
         for (const auto& key : keys)
         {
@@ -369,7 +402,7 @@ class Map
     //    }
 
     /** Copy assignment operator. */
-    Map<K, V>& operator=(const Map<K, V>& other)
+    Map& operator=(const Map& other)
     {
         if (this != &other)
         {
@@ -382,7 +415,7 @@ class Map
     }
 
     /** Move assignment operator. */
-    Map<K, V>& operator=(Map<K, V>&& other)
+    Map& operator=(Map&& other)
     {
         if (this != &other)
         {
@@ -406,6 +439,9 @@ class Map
     RefMap _data;
 };
 
+template <typename _Valty>
+using StringMap = Map<std::string, _Valty, hlookup::string_hash, hlookup::equal_to>;
+
 NS_CC_END
 // end group
 /// @}
diff --git a/cocos/base/CCNS.cpp b/cocos/base/CCNS.cpp
index 2ebd2ff5a699..17d4165860d3 100644
--- a/cocos/base/CCNS.cpp
+++ b/cocos/base/CCNS.cpp
@@ -38,7 +38,7 @@ NS_CC_BEGIN
 typedef std::vector<std::string> strArray;
 
 // string toolkit
-static inline void split(const std::string& src, const std::string& token, strArray& vect)
+static inline void split(std::string_view src, std::string_view token, strArray& vect)
 {
     size_t nend      = 0;
     size_t nbegin    = 0;
@@ -47,9 +47,9 @@ static inline void split(const std::string& src, const std::string& token, strAr
     {
         nend = src.find(token, nbegin);
         if (nend == std::string::npos)
-            vect.push_back(src.substr(nbegin, src.length() - nbegin));
+            vect.push_back(std::string{src.substr(nbegin, src.length() - nbegin)});
         else
-            vect.push_back(src.substr(nbegin, nend - nbegin));
+            vect.push_back(std::string{src.substr(nbegin, nend - nbegin)});
         nbegin = nend + tokenSize;
     }
 }
@@ -58,7 +58,7 @@ static inline void split(const std::string& src, const std::string& token, strAr
 // if the form is right,the string will be split into the parameter strs;
 // or the parameter strs will be empty.
 // if the form is right return true,else return false.
-static bool splitWithForm(const std::string& content, strArray& strs)
+static bool splitWithForm(std::string_view content, strArray& strs)
 {
     bool bRet = false;
 
@@ -74,7 +74,7 @@ static bool splitWithForm(const std::string& content, strArray& strs)
         // '}' is before '{'
         CC_BREAK_IF(nPosLeft > nPosRight);
 
-        const std::string pointStr = content.substr(nPosLeft + 1, nPosRight - nPosLeft - 1);
+        auto pointStr = content.substr(nPosLeft + 1, nPosRight - nPosLeft - 1);
         // nothing between '{' and '}'
         CC_BREAK_IF(pointStr.empty());
 
@@ -98,14 +98,14 @@ static bool splitWithForm(const std::string& content, strArray& strs)
 
 // implement the functions
 
-Rect RectFromString(const std::string& str)
+Rect RectFromString(std::string_view str)
 {
     Rect result = Rect::ZERO;
 
     do
     {
         CC_BREAK_IF(str.empty());
-        std::string content = str;
+        auto content = str;
 
         // find the first '{' and the third '}'
         size_t nPosLeft  = content.find('{');
@@ -127,8 +127,8 @@ Rect RectFromString(const std::string& str)
         CC_BREAK_IF(nPointEnd == std::string::npos);
 
         // get the point string and size string
-        const std::string pointStr = content.substr(0, nPointEnd);
-        const std::string sizeStr  = content.substr(nPointEnd + 1, content.length() - nPointEnd);
+        auto pointStr = content.substr(0, nPointEnd);
+        auto sizeStr  = content.substr(nPointEnd + 1, content.length() - nPointEnd);
 
         // split the string with ','
         strArray pointInfo;
@@ -147,7 +147,7 @@ Rect RectFromString(const std::string& str)
     return result;
 }
 
-Vec2 PointFromString(const std::string& str)
+Vec2 PointFromString(std::string_view str)
 {
     Vec2 ret;
 
@@ -165,7 +165,7 @@ Vec2 PointFromString(const std::string& str)
     return ret;
 }
 
-Vec2 SizeFromString(const std::string& pszContent)
+Vec2 SizeFromString(std::string_view pszContent)
 {
     Vec2 ret = Vec2::ZERO;
 
diff --git a/cocos/base/CCNS.h b/cocos/base/CCNS.h
index 730fd94faa0f..c08b79999237 100644
--- a/cocos/base/CCNS.h
+++ b/cocos/base/CCNS.h
@@ -46,7 +46,7 @@ NS_CC_BEGIN
  * @return A Core Graphics structure that represents a rectangle.
  *      If the string is not well-formed, the function returns Rect::ZERO.
  */
-Rect CC_DLL RectFromString(const std::string& str);
+Rect CC_DLL RectFromString(std::string_view str);
 
 /**
  * @brief Returns a Core Graphics point structure corresponding to the data in a given string.
@@ -58,7 +58,7 @@ Rect CC_DLL RectFromString(const std::string& str);
  * @return A Core Graphics structure that represents a point.
  *      If the string is not well-formed, the function returns Vec2::ZERO.
  */
-Vec2 CC_DLL PointFromString(const std::string& str);
+Vec2 CC_DLL PointFromString(std::string_view str);
 
 /**
  * @brief Returns a Core Graphics size structure corresponding to the data in a given string.
@@ -70,7 +70,7 @@ Vec2 CC_DLL PointFromString(const std::string& str);
  * @return A Core Graphics structure that represents a size.
  *      If the string is not well-formed, the function returns Vec2::ZERO.
  */
-Vec2 CC_DLL SizeFromString(const std::string& str);
+Vec2 CC_DLL SizeFromString(std::string_view str);
 
 // end of data_structure group
 /** @} */
diff --git a/cocos/base/CCNinePatchImageParser.cpp b/cocos/base/CCNinePatchImageParser.cpp
index ab71f14fdd43..5d23b2041f54 100644
--- a/cocos/base/CCNinePatchImageParser.cpp
+++ b/cocos/base/CCNinePatchImageParser.cpp
@@ -179,7 +179,7 @@ void NinePatchImageParser::setSpriteFrameInfo(Image* image, const cocos2d::Rect&
     this->_isRotated  = rotated;
 }
 
-bool NinePatchImageParser::isNinePatchImage(const std::string& filepath)
+bool NinePatchImageParser::isNinePatchImage(std::string_view filepath)
 {
     size_t length = filepath.length();
     if (length < 7)
diff --git a/cocos/base/CCNinePatchImageParser.h b/cocos/base/CCNinePatchImageParser.h
index c695e10b8544..b16c6be5937b 100644
--- a/cocos/base/CCNinePatchImageParser.h
+++ b/cocos/base/CCNinePatchImageParser.h
@@ -51,7 +51,7 @@ class CC_DLL NinePatchImageParser
      *
      * @return If the filename contains ".9.png", then return true, otherwise false.
      */
-    static bool isNinePatchImage(const std::string& filename);
+    static bool isNinePatchImage(std::string_view filename);
 
     /**
      * Default constructor.
diff --git a/cocos/base/CCProperties.cpp b/cocos/base/CCProperties.cpp
index a518a91d7f7a..4709844f7a23 100644
--- a/cocos/base/CCProperties.cpp
+++ b/cocos/base/CCProperties.cpp
@@ -38,7 +38,7 @@ USING_NS_CC;
 
 // Utility functions (shared with SceneLoader).
 /** @script{ignore} */
-void calculateNamespacePath(const std::string& urlString,
+void calculateNamespacePath(std::string_view urlString,
                             std::string& fileString,
                             std::vector<std::string>& namespacePath);
 /** @script{ignore} */
@@ -79,7 +79,7 @@ Properties::Properties(Data* data, ssize_t* dataIdx)
 
 Properties::Properties(Data* data,
                        ssize_t* dataIdx,
-                       const std::string& name,
+                       std::string_view name,
                        const char* id,
                        const char* parentID,
                        Properties* parent)
@@ -97,7 +97,7 @@ Properties::Properties(Data* data,
     rewind();
 }
 
-Properties* Properties::createNonRefCounted(const std::string& url)
+Properties* Properties::createNonRefCounted(std::string_view url)
 {
     if (url.empty())
     {
@@ -106,7 +106,7 @@ Properties* Properties::createNonRefCounted(const std::string& url)
     }
 
     // Calculate the file and full namespace path from the specified url.
-    std::string urlString = url;
+    auto& urlString = url;
     std::string fileString;
     std::vector<std::string> namespacePath;
     calculateNamespacePath(urlString, fileString, namespacePath);
@@ -122,7 +122,7 @@ Properties* Properties::createNonRefCounted(const std::string& url)
     Properties* p = getPropertiesFromNamespacePath(properties, namespacePath);
     if (!p)
     {
-        CCLOGWARN("Failed to load properties from url '%s'.", url.c_str());
+        CCLOGWARN("Failed to load properties from url '%s'.", url.data());
         CC_SAFE_DELETE(properties);
         return nullptr;
     }
@@ -1093,7 +1093,7 @@ void Properties::setDirectoryPath(const std::string* path)
     }
 }
 
-void Properties::setDirectoryPath(const std::string& path)
+void Properties::setDirectoryPath(std::string_view path)
 {
     if (_dirPath == NULL)
     {
@@ -1105,7 +1105,7 @@ void Properties::setDirectoryPath(const std::string& path)
     }
 }
 
-void calculateNamespacePath(const std::string& urlString,
+void calculateNamespacePath(std::string_view urlString,
                             std::string& fileString,
                             std::vector<std::string>& namespacePath)
 {
@@ -1114,14 +1114,14 @@ void calculateNamespacePath(const std::string& urlString,
     size_t loc = urlString.rfind('#');
     if (loc != std::string::npos)
     {
-        fileString                      = urlString.substr(0, loc);
-        std::string namespacePathString = urlString.substr(loc + 1);
+        fileString               = urlString.substr(0, loc);
+        auto namespacePathString = urlString.substr(loc + 1);
         while ((loc = namespacePathString.find('/')) != std::string::npos)
         {
-            namespacePath.push_back(namespacePathString.substr(0, loc));
+            namespacePath.push_back(std::string{namespacePathString.substr(0, loc)});
             namespacePathString = namespacePathString.substr(loc + 1);
         }
-        namespacePath.push_back(namespacePathString);
+        namespacePath.push_back(std::string{namespacePathString});
     }
     else
     {
diff --git a/cocos/base/CCProperties.h b/cocos/base/CCProperties.h
index 97c123802c1d..14ddc7eeb33f 100644
--- a/cocos/base/CCProperties.h
+++ b/cocos/base/CCProperties.h
@@ -183,7 +183,7 @@ class CC_DLL Properties
      * @return The created Properties or NULL if there was an error.
      * @script{create}
      */
-    static Properties* createNonRefCounted(const std::string& url);
+    static Properties* createNonRefCounted(std::string_view url);
 
     /**
      * Destructor.
@@ -533,7 +533,7 @@ class CC_DLL Properties
     {
         std::string name;
         std::string value;
-        Property(const std::string& aname, const std::string& avalue) : name(aname), value(avalue) {}
+        Property(std::string_view aname, std::string_view avalue) : name(aname), value(avalue) {}
     };
 
     /**
@@ -554,7 +554,7 @@ class CC_DLL Properties
      */
     Properties(Data* data,
                ssize_t* dataIdx,
-               const std::string& name,
+               std::string_view name,
                const char* id,
                const char* parentID,
                Properties* parent);
@@ -578,7 +578,7 @@ class CC_DLL Properties
     Properties* clone();
 
     void setDirectoryPath(const std::string* path);
-    void setDirectoryPath(const std::string& path);
+    void setDirectoryPath(std::string_view path);
 
     /**
      * Reads the next character from the Data. Returns EOF if the end of the Data is reached.
diff --git a/cocos/base/CCProtocols.h b/cocos/base/CCProtocols.h
index 99708d8fc1a9..a5e3a138ef4c 100644
--- a/cocos/base/CCProtocols.h
+++ b/cocos/base/CCProtocols.h
@@ -250,7 +250,7 @@ class CC_DLL LabelProtocol
      * @js NA
      * @lua NA
      */
-    virtual const std::string& getString() const = 0;
+    virtual std::string_view getString() const = 0;
 };
 
 /**
diff --git a/cocos/base/CCScheduler.cpp b/cocos/base/CCScheduler.cpp
index 029a12f1b6bd..7709d9468741 100644
--- a/cocos/base/CCScheduler.cpp
+++ b/cocos/base/CCScheduler.cpp
@@ -188,7 +188,7 @@ TimerTargetCallback::TimerTargetCallback() : _target(nullptr), _callback(nullptr
 bool TimerTargetCallback::initWithCallback(Scheduler* scheduler,
                                            const ccSchedulerFunc& callback,
                                            void* target,
-                                           const std::string& key,
+                                           std::string_view key,
                                            float seconds,
                                            unsigned int repeat,
                                            float delay)
@@ -283,7 +283,7 @@ void Scheduler::schedule(const ccSchedulerFunc& callback,
                          void* target,
                          float interval,
                          bool paused,
-                         const std::string& key)
+                         std::string_view key)
 {
     this->schedule(callback, target, interval, CC_REPEAT_FOREVER, 0.0f, paused, key);
 }
@@ -294,7 +294,7 @@ void Scheduler::schedule(const ccSchedulerFunc& callback,
                          unsigned int repeat,
                          float delay,
                          bool paused,
-                         const std::string& key)
+                         std::string_view key)
 {
     CCASSERT(target, "Argument target must be non-nullptr");
     CCASSERT(!key.empty(), "key should not be empty!");
@@ -344,7 +344,7 @@ void Scheduler::schedule(const ccSchedulerFunc& callback,
     timer->release();
 }
 
-void Scheduler::unschedule(const std::string& key, void* target)
+void Scheduler::unschedule(std::string_view key, void* target)
 {
     // explicit handle nil arguments when removing an object
     if (target == nullptr || key.empty())
@@ -513,7 +513,7 @@ void Scheduler::schedulePerFrame(const ccSchedulerFunc& callback, void* target,
     }
 }
 
-bool Scheduler::isScheduled(const std::string& key, const void* target) const
+bool Scheduler::isScheduled(std::string_view key, const void* target) const
 {
     CCASSERT(!key.empty(), "Argument key must not be empty");
     CCASSERT(target, "Argument target must be non-nullptr");
diff --git a/cocos/base/CCScheduler.h b/cocos/base/CCScheduler.h
index 5cf609f375f3..2dfe4283c444 100644
--- a/cocos/base/CCScheduler.h
+++ b/cocos/base/CCScheduler.h
@@ -109,13 +109,13 @@ class CC_DLL TimerTargetCallback : public Timer
     bool initWithCallback(Scheduler* scheduler,
                           const ccSchedulerFunc& callback,
                           void* target,
-                          const std::string& key,
+                          std::string_view key,
                           float seconds,
                           unsigned int repeat,
                           float delay);
 
     const ccSchedulerFunc& getCallback() const { return _callback; }
-    const std::string& getKey() const { return _key; }
+    std::string_view getKey() const { return _key; }
 
     virtual void trigger(float dt) override;
     virtual void cancel() override;
@@ -252,7 +252,7 @@ class CC_DLL Scheduler : public Ref
                   unsigned int repeat,
                   float delay,
                   bool paused,
-                  const std::string& key);
+                  std::string_view key);
 
     /** The scheduled method will be called every 'interval' seconds for ever.
      @param callback The callback function.
@@ -263,7 +263,7 @@ class CC_DLL Scheduler : public Ref
      @param key The key to identify the callback function, because there is not way to identify a std::function<>.
      @since v3.0
      */
-    void schedule(const ccSchedulerFunc& callback, void* target, float interval, bool paused, const std::string& key);
+    void schedule(const ccSchedulerFunc& callback, void* target, float interval, bool paused, std::string_view key);
 
     /** The scheduled method will be called every `interval` seconds.
      If paused is true, then it won't be called until it is resumed.
@@ -329,7 +329,7 @@ class CC_DLL Scheduler : public Ref
      @param target The target to be unscheduled.
      @since v3.0
      */
-    void unschedule(const std::string& key, void* target);
+    void unschedule(std::string_view key, void* target);
 
     /** Unschedules a selector for a given target.
      If you want to unschedule the "update", use `unscheduleUpdate()`.
@@ -386,7 +386,7 @@ class CC_DLL Scheduler : public Ref
      @return True if the specified callback is invoked, false if not.
      @since v3.0.0
      */
-    bool isScheduled(const std::string& key, const void* target) const;
+    bool isScheduled(std::string_view key, const void* target) const;
 
     /** Checks whether a selector for a given target is scheduled.
      @param selector The selector to be checked.
diff --git a/cocos/base/CCScriptSupport.h b/cocos/base/CCScriptSupport.h
index 318eec1da08d..6613b152da6b 100644
--- a/cocos/base/CCScriptSupport.h
+++ b/cocos/base/CCScriptSupport.h
@@ -756,7 +756,7 @@ class CC_DLL ScriptEngineProtocol
      * @lua NA
      * @js NA
      */
-    virtual bool parseConfig(ConfigType type, const std::string& str) = 0;
+    virtual bool parseConfig(ConfigType type, std::string_view str) = 0;
 
     /** Root a Reference.
      It tells the Garbage Collector that the associated Scripting object should not be collected
diff --git a/cocos/base/CCUserDefault.cpp b/cocos/base/CCUserDefault.cpp
index e3b243fe9c69..d241ca88a43f 100644
--- a/cocos/base/CCUserDefault.cpp
+++ b/cocos/base/CCUserDefault.cpp
@@ -211,12 +211,12 @@ double UserDefault::getDoubleForKey(const char* pKey, double defaultValue)
     return defaultValue;
 }
 
-std::string UserDefault::getStringForKey(const char* pKey)
+std::string_view UserDefault::getStringForKey(const char* pKey)
 {
     return getStringForKey(pKey, "");
 }
 
-std::string UserDefault::getStringForKey(const char* pKey, const std::string& defaultValue)
+std::string_view UserDefault::getStringForKey(const char* pKey, std::string_view defaultValue)
 {
     auto pValue = getValueForKey(pKey);
     if (pValue)
@@ -225,7 +225,7 @@ std::string UserDefault::getStringForKey(const char* pKey, const std::string& de
     return defaultValue;
 }
 
-const std::string* UserDefault::getValueForKey(const std::string& key)
+const std::string* UserDefault::getValueForKey(std::string_view key)
 {
     // do lazyInit at here to make sure _encryptEnabled works well,
     lazyInit();
@@ -294,7 +294,7 @@ void UserDefault::setDoubleForKey(const char* pKey, double value)
     setStringForKey(pKey, tmp);
 }
 
-void UserDefault::setStringForKey(const char* pKey, const std::string& value)
+void UserDefault::setStringForKey(const char* pKey, std::string_view value)
 {
     // ignore empty key
     if (!pKey || !*pKey)
@@ -338,7 +338,7 @@ void UserDefault::setStringForKey(const char* pKey, const std::string& value)
 #endif
 }
 
-void UserDefault::setValueForKey(const std::string& key, const std::string& value)
+void UserDefault::setValueForKey(std::string_view key, std::string_view value)
 {
     // do lazyInit at here to make sure _encryptEnabled works well
     lazyInit();
@@ -346,7 +346,7 @@ void UserDefault::setValueForKey(const std::string& key, const std::string& valu
     updateValueForKey(key, value);
 }
 
-void UserDefault::updateValueForKey(const std::string& key, const std::string& value)
+void UserDefault::updateValueForKey(std::string_view key, std::string_view value)
 {
     auto it = _values.find(key);
     if (it != _values.end())
diff --git a/cocos/base/CCUserDefault.h b/cocos/base/CCUserDefault.h
index 6f100450459f..cf5de7f394e9 100644
--- a/cocos/base/CCUserDefault.h
+++ b/cocos/base/CCUserDefault.h
@@ -149,7 +149,7 @@ class CC_DLL UserDefault
      * @return String value of the key.
      * @js NA
      */
-    std::string getStringForKey(const char* key);
+    std::string_view getStringForKey(const char* key);
 
     /**
      * Get string value by key, if the key doesn't exist, will return passed default value.
@@ -158,7 +158,7 @@ class CC_DLL UserDefault
      * @return String value of the key.
      * @js NA
      */
-    virtual std::string getStringForKey(const char* key, const std::string& defaultValue);
+    virtual std::string_view getStringForKey(const char* key, std::string_view defaultValue);
 
     // set value methods
 
@@ -203,7 +203,7 @@ class CC_DLL UserDefault
      * @param value A string value to set to the key.
      * @js NA
      */
-    virtual void setStringForKey(const char* key, const std::string& value);
+    virtual void setStringForKey(const char* key, std::string_view value);
 
     /**
      * Since we reimplement UserDefault with file mapping io,
@@ -265,16 +265,16 @@ class CC_DLL UserDefault
     void closeFileMapping();
 
     // The low level API of all getXXXForKey
-    const std::string* getValueForKey(const std::string& key);
+    const std::string* getValueForKey(std::string_view key);
 
     // The low level API of all setXXXForKey
-    void setValueForKey(const std::string& key, const std::string& value);
+    void setValueForKey(std::string_view key, std::string_view value);
 
     // Update value without lazyInit
-    void updateValueForKey(const std::string& key, const std::string& value);
+    void updateValueForKey(std::string_view key, std::string_view value);
 
 protected:
-    std::unordered_map<std::string, std::string> _values;
+    hlookup::string_map<std::string> _values;
 
     static UserDefault* _userDefault;
     std::string _filePath;
diff --git a/cocos/base/CCValue.cpp b/cocos/base/CCValue.cpp
index 8045669764a7..225d8976ba46 100644
--- a/cocos/base/CCValue.cpp
+++ b/cocos/base/CCValue.cpp
@@ -92,7 +92,7 @@ Value::Value(const char* v) : _type(Type::STRING)
     _field.strVal = new std::string(v ? v : "");
 }
 
-Value::Value(const std::string& v) : _type(Type::STRING)
+Value::Value(std::string_view v) : _type(Type::STRING)
 {
     _field.strVal = new std::string(v);
 }
@@ -308,7 +308,7 @@ Value& Value::operator=(const char* v)
     return *this;
 }
 
-Value& Value::operator=(const std::string& v)
+Value& Value::operator=(std::string_view v)
 {
     reset(Type::STRING);
     *_field.strVal = v;
@@ -769,7 +769,7 @@ std::string Value::asString() const
     return ret;
 }
 
-const std::string& Value::asStringRef() const
+std::string_view Value::asStringRef() const
 {
     if (_type == Type::STRING)
         return *_field.strVal;
diff --git a/cocos/base/CCValue.h b/cocos/base/CCValue.h
index 47e511cf43fa..27c8c94fc15d 100644
--- a/cocos/base/CCValue.h
+++ b/cocos/base/CCValue.h
@@ -43,7 +43,7 @@ NS_CC_BEGIN
 class Value;
 
 typedef std::vector<Value> ValueVector;
-typedef std::unordered_map<std::string, Value> ValueMap;
+typedef hlookup::string_map<Value> ValueMap;
 typedef std::unordered_map<int, Value> ValueMapIntKey;
 
 CC_DLL extern const ValueVector ValueVectorNull;
@@ -91,7 +91,7 @@ class CC_DLL Value
     explicit Value(const char* v);
 
     /** Create a Value by a string. */
-    explicit Value(const std::string& v);
+    explicit Value(std::string_view v);
 
     explicit Value(std::string&& v);
 
@@ -142,7 +142,7 @@ class CC_DLL Value
     /** Assignment operator, assign from char* to Value. */
     Value& operator=(const char* v);
     /** Assignment operator, assign from string to Value. */
-    Value& operator=(const std::string& v);
+    Value& operator=(std::string_view v);
     Value& operator=(std::string&& v);
 
     /** Assignment operator, assign from ValueVector to Value. */
@@ -193,7 +193,7 @@ class CC_DLL Value
     std::string asString() const;
 
     /** Gets as a string value reference without conversion, if value type is not string will return "" */
-    const std::string& asStringRef() const;
+    std::string_view asStringRef() const;
 
     /** Gets as a ValueVector reference. Will convert to ValueVector if possible, or will trigger assert error. */
     ValueVector& asValueVector();
@@ -279,6 +279,11 @@ class CC_DLL Value
     Type _type;
 };
 
+inline const cocos2d::Value& optValue(const ValueMap& dictionary, std::string_view key)
+{
+    return dictionary.find(key) != dictionary.cend() ? dictionary.at(key) : cocos2d::Value::Null;
+}
+
 /** @} */
 
 NS_CC_END
diff --git a/cocos/base/ObjectFactory.cpp b/cocos/base/ObjectFactory.cpp
index 065d70f04966..d0920f7dff71 100644
--- a/cocos/base/ObjectFactory.cpp
+++ b/cocos/base/ObjectFactory.cpp
@@ -30,12 +30,12 @@ NS_CC_BEGIN
 
 ObjectFactory::TInfo::TInfo() : _class(""), _fun(nullptr), _func(nullptr) {}
 
-ObjectFactory::TInfo::TInfo(const std::string& type, Instance ins) : _class(type), _fun(ins), _func(nullptr)
+ObjectFactory::TInfo::TInfo(std::string_view type, Instance ins) : _class(type), _fun(ins), _func(nullptr)
 {
     ObjectFactory::getInstance()->registerType(*this);
 }
 
-ObjectFactory::TInfo::TInfo(const std::string& type, InstanceFunc ins) : _class(type), _fun(nullptr), _func(ins)
+ObjectFactory::TInfo::TInfo(std::string_view type, InstanceFunc ins) : _class(type), _fun(nullptr), _func(ins)
 {
     ObjectFactory::getInstance()->registerType(*this);
 }
@@ -85,12 +85,16 @@ void ObjectFactory::destroyInstance()
     CC_SAFE_DELETE(_sharedFactory);
 }
 
-Ref* ObjectFactory::createObject(const std::string& name)
+Ref* ObjectFactory::createObject(std::string_view name)
 {
     Ref* o = nullptr;
     do
     {
-        const TInfo t = _typeMap[name];
+        // const TInfo t = _typeMap[name.data];
+        auto it = _typeMap.find(name);
+        if (it == _typeMap.end())
+            break;
+        auto& t = it->second;
         if (t._fun != nullptr)
         {
             o = t._fun();
diff --git a/cocos/base/ObjectFactory.h b/cocos/base/ObjectFactory.h
index e7499b08e0e1..0ee3ad46f75a 100644
--- a/cocos/base/ObjectFactory.h
+++ b/cocos/base/ObjectFactory.h
@@ -42,8 +42,8 @@ class CC_DLL ObjectFactory
     struct CC_DLL TInfo
     {
         TInfo();
-        TInfo(const std::string& type, Instance ins = nullptr);
-        TInfo(const std::string& type, InstanceFunc ins = nullptr);
+        TInfo(std::string_view type, Instance ins = nullptr);
+        TInfo(std::string_view type, InstanceFunc ins = nullptr);
         TInfo(const TInfo& t);
         ~TInfo();
         TInfo& operator=(const TInfo& t);
@@ -51,11 +51,11 @@ class CC_DLL ObjectFactory
         Instance _fun;
         InstanceFunc _func;
     };
-    typedef std::unordered_map<std::string, TInfo> FactoryMap;
+    typedef hlookup::string_map<TInfo> FactoryMap;
 
     static ObjectFactory* getInstance();
     static void destroyInstance();
-    cocos2d::Ref* createObject(const std::string& name);
+    cocos2d::Ref* createObject(std::string_view name);
 
     void registerType(const TInfo& t);
     void removeAll();
diff --git a/cocos/base/ZipUtils.cpp b/cocos/base/ZipUtils.cpp
index f5fa6beb313f..3aea081acede 100644
--- a/cocos/base/ZipUtils.cpp
+++ b/cocos/base/ZipUtils.cpp
@@ -658,7 +658,7 @@ struct ZipFilePrivate
     std::unique_ptr<ourmemory_s> memfs;
 
     // std::unordered_map is faster if available on the platform
-    typedef std::unordered_map<std::string, struct ZipEntryInfo> FileListContainer;
+    typedef hlookup::string_map<struct ZipEntryInfo> FileListContainer;
     FileListContainer fileList;
 
     zlib_filefunc_def functionOverrides{};
@@ -683,10 +683,10 @@ ZipFile::ZipFile() : _data(new ZipFilePrivate())
     _data->zipFile = nullptr;
 }
 
-ZipFile::ZipFile(const std::string& zipFile, const std::string& filter) : _data(new ZipFilePrivate())
+ZipFile::ZipFile(std::string_view zipFile, std::string_view filter) : _data(new ZipFilePrivate())
 {
     _data->zipFileName = zipFile;
-    _data->zipFile     = unzOpen2(zipFile.c_str(), &_data->functionOverrides);
+    _data->zipFile     = unzOpen2(zipFile.data(), &_data->functionOverrides);
     setFilter(filter);
 }
 
@@ -700,7 +700,7 @@ ZipFile::~ZipFile()
     CC_SAFE_DELETE(_data);
 }
 
-bool ZipFile::setFilter(const std::string& filter)
+bool ZipFile::setFilter(std::string_view filter)
 {
     bool ret = false;
     do
@@ -743,7 +743,7 @@ bool ZipFile::setFilter(const std::string& filter)
     return ret;
 }
 
-bool ZipFile::fileExists(const std::string& fileName) const
+bool ZipFile::fileExists(std::string_view fileName) const
 {
     bool ret = false;
     do
@@ -756,7 +756,7 @@ bool ZipFile::fileExists(const std::string& fileName) const
     return ret;
 }
 
-std::vector<std::string> ZipFile::listFiles(const std::string& pathname) const
+std::vector<std::string> ZipFile::listFiles(std::string_view pathname) const
 {
 
     // filter files which `filename.startsWith(pathname)`
@@ -766,22 +766,23 @@ std::vector<std::string> ZipFile::listFiles(const std::string& pathname) const
     ZipFilePrivate::FileListContainer::const_iterator it  = _data->fileList.begin();
     ZipFilePrivate::FileListContainer::const_iterator end = _data->fileList.end();
     // ensure pathname ends with `/` as a directory
-    std::string dirname = pathname[pathname.length() - 1] == '/' ? pathname : pathname + "/";
+    std::string ensureDir;
+    std::string_view dirname = pathname[pathname.length() - 1] == '/' ? pathname : (ensureDir.append(pathname) += '/');
     for (auto& item : _data->fileList)
     {
-        const std::string& filename = item.first;
-        if (cxx20::starts_with(cxx17::string_view{filename}, cxx17::string_view{dirname}))
+        std::string_view filename = item.first;
+        if (cxx20::starts_with(filename, cxx17::string_view{dirname}))
         {
-            std::string suffix = filename.substr(dirname.length());
-            auto pos           = suffix.find('/');
+            std::string_view suffix{filename.substr(dirname.length())};
+            auto pos = suffix.find('/');
             if (pos == std::string::npos)
             {
-                fileSet.insert(suffix);
+                fileSet.insert(std::string{suffix});
             }
             else
             {
                 // fileSet.insert(parts[0] + "/");
-                fileSet.insert(suffix.substr(0, pos + 1));
+                fileSet.insert(std::string{suffix.substr(0, pos + 1)});
             }
         }
     }
@@ -789,7 +790,7 @@ std::vector<std::string> ZipFile::listFiles(const std::string& pathname) const
     return std::vector<std::string>{fileSet.begin(), fileSet.end()};
 }
 
-unsigned char* ZipFile::getFileData(const std::string& fileName, ssize_t* size)
+unsigned char* ZipFile::getFileData(std::string_view fileName, ssize_t* size)
 {
     unsigned char* buffer = nullptr;
     if (size)
@@ -800,7 +801,7 @@ unsigned char* ZipFile::getFileData(const std::string& fileName, ssize_t* size)
         CC_BREAK_IF(!_data->zipFile);
         CC_BREAK_IF(fileName.empty());
 
-        ZipFilePrivate::FileListContainer::iterator it = _data->fileList.find(fileName);
+        auto it = _data->fileList.find(fileName);
         CC_BREAK_IF(it == _data->fileList.end());
 
         ZipEntryInfo& fileInfo = it->second;
@@ -828,7 +829,7 @@ unsigned char* ZipFile::getFileData(const std::string& fileName, ssize_t* size)
     return buffer;
 }
 
-bool ZipFile::getFileData(const std::string& fileName, ResizableBuffer* buffer)
+bool ZipFile::getFileData(std::string_view fileName, ResizableBuffer* buffer)
 {
     bool res = false;
     do
@@ -915,7 +916,7 @@ bool ZipFile::initWithBuffer(const void* buffer, unsigned int size)
     return true;
 }
 
-bool ZipFile::zfopen(const std::string& fileName, ZipFileStream* zfs)
+bool ZipFile::zfopen(std::string_view fileName, ZipFileStream* zfs)
 {
     if (!zfs)
         return false;
@@ -1005,7 +1006,7 @@ long long ZipFile::zfsize(ZipFileStream* zfs)
     return -1;
 }
 
-unsigned char* ZipFile::getFileDataFromZip(const std::string& zipFilePath, const std::string& filename, ssize_t* size)
+unsigned char* ZipFile::getFileDataFromZip(std::string_view zipFilePath, std::string_view filename, ssize_t* size)
 {
     unsigned char* buffer = nullptr;
     unzFile file          = nullptr;
@@ -1015,11 +1016,11 @@ unsigned char* ZipFile::getFileDataFromZip(const std::string& zipFilePath, const
     {
         CC_BREAK_IF(zipFilePath.empty());
 
-        file = unzOpen(zipFilePath.c_str());
+        file = unzOpen(zipFilePath.data());
         CC_BREAK_IF(!file);
 
         // minizip 1.2.0 is same with other platforms
-        int ret = unzLocateFile(file, filename.c_str(), nullptr);
+        int ret = unzLocateFile(file, filename.data(), nullptr);
 
         CC_BREAK_IF(UNZ_OK != ret);
 
diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h
index 4a74a38fb214..8fb4e5b5295f 100644
--- a/cocos/base/ZipUtils.h
+++ b/cocos/base/ZipUtils.h
@@ -250,7 +250,7 @@ class CC_DLL ZipFile
      *
      * @since v2.0.5
      */
-    ZipFile(const std::string& zipFile, const std::string& filter = std::string());
+    ZipFile(std::string_view zipFile, std::string_view filter = std::string());
     virtual ~ZipFile();
 
     /**
@@ -262,7 +262,7 @@ class CC_DLL ZipFile
      *
      * @since v2.0.5
      */
-    bool setFilter(const std::string& filter);
+    bool setFilter(std::string_view filter);
 
     /**
      * Check does a file exists or not in zip file
@@ -272,7 +272,7 @@ class CC_DLL ZipFile
      *
      * @since v2.0.5
      */
-    bool fileExists(const std::string& fileName) const;
+    bool fileExists(std::string_view fileName) const;
 
     /**
      * Get files and folders in pathname
@@ -280,7 +280,7 @@ class CC_DLL ZipFile
      * @param dirname
      * @return
      */
-    std::vector<std::string> listFiles(const std::string& pathname) const;
+    std::vector<std::string> listFiles(std::string_view pathname) const;
 
     /**
      * Get resource file data from a zip file.
@@ -291,7 +291,7 @@ class CC_DLL ZipFile
      *
      * @since v2.0.5
      */
-    unsigned char* getFileData(const std::string& fileName, ssize_t* size);
+    unsigned char* getFileData(std::string_view fileName, ssize_t* size);
 
     /**
      * Get resource file data from a zip file.
@@ -299,7 +299,7 @@ class CC_DLL ZipFile
      * @param[out] buffer If the file read operation succeeds, if will contain the file data.
      * @return True if successful.
      */
-    bool getFileData(const std::string& fileName, ResizableBuffer* buffer);
+    bool getFileData(std::string_view fileName, ResizableBuffer* buffer);
 
     std::string getFirstFilename();
     std::string getNextFilename();
@@ -310,7 +310,7 @@ class CC_DLL ZipFile
      * zipFile Streaming support, !!!important, the file in zip must no compress level, otherwise
      *  stream seek doesn't work.
      */
-    bool zfopen(const std::string& fileName, ZipFileStream* zfs);
+    bool zfopen(std::string_view fileName, ZipFileStream* zfs);
     int zfread(ZipFileStream* zfs, void* buf, unsigned int size);
     int32_t zfseek(ZipFileStream* zfs, int32_t offset, int origin);
     void zfclose(ZipFileStream* zfs);
@@ -325,9 +325,7 @@ class CC_DLL ZipFile
      *  @warning Recall: you are responsible for calling free() on any Non-nullptr pointer returned.
      */
     CC_DEPRECATED()
-    static unsigned char* getFileDataFromZip(const std::string& zipFilePath,
-                                             const std::string& filename,
-                                             ssize_t* size);
+    static unsigned char* getFileDataFromZip(std::string_view zipFilePath, std::string_view filename, ssize_t* size);
 
 private:
     /* Only used internal for createWithBuffer() */
diff --git a/cocos/base/ccUTF8.cpp b/cocos/base/ccUTF8.cpp
index 1c993a629967..2db5969e2b25 100644
--- a/cocos/base/ccUTF8.cpp
+++ b/cocos/base/ccUTF8.cpp
@@ -375,7 +375,7 @@ std::string getStringUTFCharsJNI(JNIEnv* env, jstring srcjStr, bool* ret)
     return utf8Str;
 }
 
-jstring newStringUTFJNI(JNIEnv* env, const std::string& utf8Str, bool* ret)
+jstring newStringUTFJNI(JNIEnv* env, std::string_view utf8Str, bool* ret)
 {
     std::u16string utf16Str;
     bool flag = cocos2d::StringUtils::UTF8ToUTF16(utf8Str, utf16Str);
@@ -399,9 +399,9 @@ std::vector<char16_t> getChar16VectorFromUTF16String(const std::u16string& utf16
     return std::vector<char16_t>(utf16.begin(), utf16.end());
 }
 
-int32_t getCharacterCountInUTF8String(const std::string& utf8)
+int32_t getCharacterCountInUTF8String(std::string_view utf8)
 {
-    return getUTF8StringLength((const UTF8*)utf8.c_str());
+    return getUTF8StringLength((const UTF8*)utf8.data());
 }
 
 bool hasNonAsciiUTF8(const char* str, size_t len)
@@ -455,7 +455,7 @@ bool isLegalUTF8String(const char* str, size_t len)
 
 StringUTF8::StringUTF8() {}
 
-StringUTF8::StringUTF8(const std::string& newStr)
+StringUTF8::StringUTF8(std::string_view newStr)
 {
     replace(newStr);
 }
@@ -467,18 +467,18 @@ std::size_t StringUTF8::length() const
     return _str.size();
 }
 
-void StringUTF8::replace(const std::string& newStr)
+void StringUTF8::replace(std::string_view newStr)
 {
     _str.clear();
     if (!newStr.empty())
     {
-        UTF8* sequenceUtf8 = (UTF8*)newStr.c_str();
+        UTF8* sequenceUtf8 = (UTF8*)newStr.data();
 
         int lengthString = getUTF8StringLength(sequenceUtf8);
 
         if (lengthString == 0)
         {
-            CCLOG("Bad utf-8 set string: %s", newStr.c_str());
+            CCLOG("Bad utf-8 set string: %s", newStr.data());
             return;
         }
 
@@ -536,7 +536,7 @@ bool StringUTF8::deleteChar(std::size_t pos)
     }
 }
 
-bool StringUTF8::insert(std::size_t pos, const std::string& insertStr)
+bool StringUTF8::insert(std::size_t pos, std::string_view insertStr)
 {
     StringUTF8 utf8(insertStr);
 
diff --git a/cocos/base/ccUTF8.h b/cocos/base/ccUTF8.h
index 80626a4bc81c..a64837201807 100644
--- a/cocos/base/ccUTF8.h
+++ b/cocos/base/ccUTF8.h
@@ -147,7 +147,7 @@ CC_DLL std::string getStringUTFCharsJNI(JNIEnv* env, jstring srcjStr, bool* ret
  *  @param ret     True if the conversion succeeds and the ret pointer isn't null
  *  @returns the result of jstring,the jstring need to DeleteLocalRef(jstring);
  */
-CC_DLL jstring newStringUTFJNI(JNIEnv* env, const std::string& utf8Str, bool* ret = nullptr);
+CC_DLL jstring newStringUTFJNI(JNIEnv* env, std::string_view utf8Str, bool* ret = nullptr);
 #endif
 
 /**
@@ -199,7 +199,7 @@ CC_DLL bool isUnicodeNonBreaking(char32_t ch);
  *  @param utf8 An UTF-8 encoded string.
  *  @returns The length of the string in characters.
  */
-CC_DLL int32_t getCharacterCountInUTF8String(const std::string& utf8);
+CC_DLL int32_t getCharacterCountInUTF8String(std::string_view utf8);
 
 /**
  *  @brief Gets the index of the last character that is not equal to the character given.
@@ -245,18 +245,18 @@ class CC_DLL StringUTF8
     typedef std::vector<CharUTF8> CharUTF8Store;
 
     StringUTF8();
-    StringUTF8(const std::string& newStr);
+    StringUTF8(std::string_view newStr);
     ~StringUTF8();
 
     std::size_t length() const;
-    void replace(const std::string& newStr);
+    void replace(std::string_view newStr);
 
     std::string getAsCharSequence() const;
     std::string getAsCharSequence(std::size_t pos) const;
     std::string getAsCharSequence(std::size_t pos, std::size_t len) const;
 
     bool deleteChar(std::size_t pos);
-    bool insert(std::size_t pos, const std::string& insertStr);
+    bool insert(std::size_t pos, std::string_view insertStr);
     bool insert(std::size_t pos, const StringUTF8& insertStr);
 
     CharUTF8Store& getString() { return _str; }
diff --git a/cocos/base/ccUtils.cpp b/cocos/base/ccUtils.cpp
index a661939ab0b9..c10a345f0b66 100644
--- a/cocos/base/ccUtils.cpp
+++ b/cocos/base/ccUtils.cpp
@@ -178,13 +178,13 @@ void captureNode(Node* startNode, std::function<void(RefPtr<Image>)> imageCallba
 }
 
 // [DEPRECATED]
-void captureScreen(std::function<void(bool, const std::string&)> afterCap, const std::string& filename)
+void captureScreen(std::function<void(bool, std::string_view)> afterCap, std::string_view filename)
 {
     std::string outfile;
     if (FileUtils::getInstance()->isAbsolutePath(filename))
         outfile = filename;
     else
-        outfile = FileUtils::getInstance()->getWritablePath() + filename;
+        outfile = FileUtils::getInstance()->getWritablePath().append(filename);
 
     captureScreen([_afterCap = std::move(afterCap), _outfile = std::move(outfile)](RefPtr<Image> image) mutable {
         AsyncTaskPool::getInstance()->enqueue(
@@ -199,7 +199,7 @@ void captureScreen(std::function<void(bool, const std::string&)> afterCap, const
     });
 }
 
-std::vector<Node*> findChildren(const Node& node, const std::string& name)
+std::vector<Node*> findChildren(const Node& node, std::string_view name)
 {
     std::vector<Node*> vec;
 
@@ -348,7 +348,7 @@ Sprite* createSpriteFromBase64(const char* base64String)
     return sprite;
 }
 
-Node* findChild(Node* levelRoot, const std::string& name)
+Node* findChild(Node* levelRoot, std::string_view name)
 {
     if (levelRoot == nullptr || name.empty())
         return nullptr;
@@ -389,7 +389,7 @@ Node* findChild(Node* levelRoot, int tag)
     return nullptr;
 }
 
-std::string getFileMD5Hash(const std::string& filename)
+std::string getFileMD5Hash(std::string_view filename)
 {
     Data data;
     FileUtils::getInstance()->getContents(filename, &data);
diff --git a/cocos/base/ccUtils.h b/cocos/base/ccUtils.h
index 9ea8fad56d15..8276c42355cf 100644
--- a/cocos/base/ccUtils.h
+++ b/cocos/base/ccUtils.h
@@ -92,7 +92,7 @@ CC_DLL void captureNode(Node* startNode, std::function<void(RefPtr<Image>)> imag
  * etc.).
  * @since v4.0
  */
-CC_DLL void captureScreen(std::function<void(bool, const std::string&)> afterCap, const std::string& filename);
+CC_DLL void captureScreen(std::function<void(bool, std::string_view)> afterCap, std::string_view filename);
 
 /** Find children by name, it will return all child that has the same name.
  * It supports c++ 11 regular expression. It is  a helper function of `Node::enumerateChildren()`.
@@ -103,7 +103,7 @@ CC_DLL void captureScreen(std::function<void(bool, const std::string&)> afterCap
  * @return Array of Nodes that matches the name
  * @since v3.2
  */
-CC_DLL std::vector<Node*> findChildren(const Node& node, const std::string& name);
+CC_DLL std::vector<Node*> findChildren(const Node& node, std::string_view name);
 
 /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof.
  * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal
@@ -151,7 +151,7 @@ CC_DLL Sprite* createSpriteFromBase64(const char* base64String);
 
  * @return  Returns found node or nullptr
  */
-CC_DLL Node* findChild(Node* levelRoot, const std::string& name);
+CC_DLL Node* findChild(Node* levelRoot, std::string_view name);
 
 /**
  * Find a child by tag recursively
@@ -166,7 +166,7 @@ CC_DLL Node* findChild(Node* levelRoot, int tag);
  * @return  Returns found node or nullptr with specified type 'T'
  */
 template <typename T>
-inline T findChild(Node* levelRoot, const std::string& name)
+inline T findChild(Node* levelRoot, std::string_view name)
 {
     return dynamic_cast<T>(findChild(levelRoot, name));
 }
@@ -187,7 +187,7 @@ inline T findChild(Node* levelRoot, int tag)
  *  @param filename The file to calculate md5 hash.
  *  @return The md5 hash for the file
  */
-CC_DLL std::string getFileMD5Hash(const std::string& filename);
+CC_DLL std::string getFileMD5Hash(std::string_view filename);
 
 /**
  *  Gets the md5 hash for the given buffer.
diff --git a/cocos/base/hlookup.h b/cocos/base/hlookup.h
new file mode 100644
index 000000000000..6a6694933316
--- /dev/null
+++ b/cocos/base/hlookup.h
@@ -0,0 +1,64 @@
+// Heterogeneous lookup support on c++17 with robin_hash
+// C++20 demo: Heterogeneous lookup for unordered containers (transparent hashing)
+// https://en.cppreference.com/w/cpp/container/unordered_map/find
+#pragma once
+#include <string>
+#include <string_view>
+#include <map>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include "tsl/robin_map.h"
+#include "tsl/robin_set.h"
+
+using namespace std::string_literals;
+using namespace std::string_view_literals;
+
+namespace hlookup
+{
+struct string_hash
+{
+    using hash_type      = std::hash<std::string_view>;
+    using is_transparent = void;
+
+    size_t operator()(const char* str) const { return hash_type{}(str); }
+    size_t operator()(std::string_view str) const { return hash_type{}(str); }
+    size_t operator()(const std::string& str) const { return hash_type{}(str); }
+};
+
+struct equal_to
+{
+    template <class _Ty1, class _Ty2>
+    constexpr auto operator()(_Ty1&& _Left, _Ty2&& _Right) const
+        noexcept(noexcept(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right)))  // strengthened
+        -> decltype(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right))
+    {
+        return static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right);
+    }
+
+    using is_transparent = void;
+};
+
+template <typename _Valty>
+using stl_string_map = std::map<std::string, _Valty, std::less<>>;
+using stl_string_set = std::set<std::string, std::less<>>;
+
+template <typename _Valty>
+using string_map = tsl::robin_map<std::string, _Valty, string_hash, equal_to>;
+using string_set = tsl::robin_set<std::string, string_hash, equal_to>;
+
+template <typename _Cont, typename _Valty>
+inline auto set_item(_Cont& cont, std::string_view k, _Valty&& v)
+{
+    typename _Cont::iterator it = cont.find(k);
+    if (it != cont.end())
+        it->second = std::forward<_Valty>(v);
+    else
+        it = cont.emplace(k, std::forward<_Valty>(v)).first;
+    return it;
+}
+
+constexpr auto empty_sv = ""sv;
+
+}  // namespace hlookup
diff --git a/cocos/math/CCMathBase.h b/cocos/math/CCMathBase.h
index 36b6ff1a3afc..527be2f10e17 100644
--- a/cocos/math/CCMathBase.h
+++ b/cocos/math/CCMathBase.h
@@ -53,9 +53,9 @@
 //#define MATH_LOG2E                  1.442695040888963387f
 //#define MATH_PI                     3.14159265358979323846f
 //#define MATH_RANDOM_MINUS1_1()      ((2.0f*((float)rand()/RAND_MAX))-1.0f)      // Returns a random float between -1
-//and 1. #define MATH_RANDOM_0_1()           ((float)rand()/RAND_MAX)                    // Returns a random float
-//between 0 and 1. #define MATH_CLAMP(x, lo, hi)       ((x < lo) ? lo : ((x > hi) ? hi : x)) #ifndef M_1_PI #define
-//M_1_PI                      0.31830988618379067154
+// and 1. #define MATH_RANDOM_0_1()           ((float)rand()/RAND_MAX)                    // Returns a random float
+// between 0 and 1. #define MATH_CLAMP(x, lo, hi)       ((x < lo) ? lo : ((x > hi) ? hi : x)) #ifndef M_1_PI #define
+// M_1_PI                      0.31830988618379067154
 
 #ifdef __cplusplus
 #    define NS_CC_MATH_BEGIN \
diff --git a/cocos/navmesh/CCNavMesh.cpp b/cocos/navmesh/CCNavMesh.cpp
index cd990f580f07..dacb3948fb29 100644
--- a/cocos/navmesh/CCNavMesh.cpp
+++ b/cocos/navmesh/CCNavMesh.cpp
@@ -90,7 +90,7 @@ static const int TILECACHESET_MAGIC   = 'T' << 24 | 'S' << 16 | 'E' << 8 | 'T';
 static const int TILECACHESET_VERSION = 2;                                       // 1: fastlz, 2: lz4
 static const int MAX_AGENTS           = 128;
 
-NavMesh* NavMesh::create(const std::string& navFilePath, const std::string& geomFilePath)
+NavMesh* NavMesh::create(std::string_view navFilePath, std::string_view geomFilePath)
 {
     auto ref = new NavMesh();
     if (ref->initWithFilePath(navFilePath, geomFilePath))
@@ -138,7 +138,7 @@ NavMesh::~NavMesh()
     _obstacleList.clear();
 }
 
-bool NavMesh::initWithFilePath(const std::string& navFilePath, const std::string& geomFilePath)
+bool NavMesh::initWithFilePath(std::string_view navFilePath, std::string_view geomFilePath)
 {
     _navFilePath  = navFilePath;
     _geomFilePath = geomFilePath;
diff --git a/cocos/navmesh/CCNavMesh.h b/cocos/navmesh/CCNavMesh.h
index 44aaaa1d0321..41ad2f8d6b58 100644
--- a/cocos/navmesh/CCNavMesh.h
+++ b/cocos/navmesh/CCNavMesh.h
@@ -60,7 +60,7 @@ class CC_DLL NavMesh : public Ref
     @param navFilePath The NavMesh File path.
     @param geomFilePath The geometry File Path,include offmesh information,etc.
     */
-    static NavMesh* create(const std::string& navFilePath, const std::string& geomFilePath);
+    static NavMesh* create(std::string_view navFilePath, std::string_view geomFilePath);
 
     /** update navmesh. */
     void update(float dt);
@@ -99,7 +99,7 @@ class CC_DLL NavMesh : public Ref
     virtual ~NavMesh();
 
 protected:
-    bool initWithFilePath(const std::string& navFilePath, const std::string& geomFilePath);
+    bool initWithFilePath(std::string_view navFilePath, std::string_view geomFilePath);
     bool read();
     bool loadNavMeshFile();
     bool loadGeomFile();
diff --git a/cocos/navmesh/CCNavMeshAgent.cpp b/cocos/navmesh/CCNavMeshAgent.cpp
index 920bd386d1b8..f72ee758a250 100644
--- a/cocos/navmesh/CCNavMeshAgent.cpp
+++ b/cocos/navmesh/CCNavMeshAgent.cpp
@@ -60,7 +60,7 @@ NavMeshAgent* NavMeshAgent::create(const NavMeshAgentParam& param)
     return nullptr;
 }
 
-const std::string& NavMeshAgent::getNavMeshAgentComponentName()
+std::string_view NavMeshAgent::getNavMeshAgentComponentName()
 {
     static std::string comName = "___NavMeshAgentComponent___";
     return comName;
diff --git a/cocos/navmesh/CCNavMeshAgent.h b/cocos/navmesh/CCNavMeshAgent.h
index d92e541d619f..9b532cfd4a6f 100644
--- a/cocos/navmesh/CCNavMeshAgent.h
+++ b/cocos/navmesh/CCNavMeshAgent.h
@@ -97,7 +97,7 @@ class CC_DLL NavMeshAgent : public Component
     @param param The parameters of agent.
     */
     static NavMeshAgent* create(const NavMeshAgentParam& param);
-    static const std::string& getNavMeshAgentComponentName();
+    static std::string_view getNavMeshAgentComponentName();
 
     virtual void onEnter() override;
     virtual void onExit() override;
diff --git a/cocos/navmesh/CCNavMeshObstacle.cpp b/cocos/navmesh/CCNavMeshObstacle.cpp
index 61ad5d183a8c..81e9ec900fbe 100644
--- a/cocos/navmesh/CCNavMeshObstacle.cpp
+++ b/cocos/navmesh/CCNavMeshObstacle.cpp
@@ -45,7 +45,7 @@ NavMeshObstacle* NavMeshObstacle::create(float radius, float height)
     return nullptr;
 }
 
-const std::string& NavMeshObstacle::getNavMeshObstacleComponentName()
+std::string_view NavMeshObstacle::getNavMeshObstacleComponentName()
 {
     static std::string comName = "___NavMeshObstacleComponent___";
     return comName;
diff --git a/cocos/navmesh/CCNavMeshObstacle.h b/cocos/navmesh/CCNavMeshObstacle.h
index 0dc5677284d0..b0a0ad32f3ec 100644
--- a/cocos/navmesh/CCNavMeshObstacle.h
+++ b/cocos/navmesh/CCNavMeshObstacle.h
@@ -64,7 +64,7 @@ class CC_DLL NavMeshObstacle : public Component
     @param height The height of obstacle.
     */
     static NavMeshObstacle* create(float radius, float height);
-    static const std::string& getNavMeshObstacleComponentName();
+    static std::string_view getNavMeshObstacleComponentName();
 
     virtual void onEnter() override;
     virtual void onExit() override;
diff --git a/cocos/network/CCDownloader-curl.cpp b/cocos/network/CCDownloader-curl.cpp
index 41e97da10b23..7a98042eb60c 100644
--- a/cocos/network/CCDownloader-curl.cpp
+++ b/cocos/network/CCDownloader-curl.cpp
@@ -106,7 +106,7 @@ class DownloadTaskCURL : public IDownloadTask
         DLLOG("Destruct DownloadTaskCURL %p", this);
     }
 
-    bool init(const std::string& filename, const std::string& tempSuffix)
+    bool init(std::string_view filename, std::string_view tempSuffix)
     {
         if (0 == filename.length())
         {
@@ -170,7 +170,7 @@ class DownloadTaskCURL : public IDownloadTask
             }
 
             // init md5 state
-            _checksumFileName = filename + ".chksum";
+            _checksumFileName = _tempFileName + ".chksum";
 
             _fsMd5 = FileUtils::getInstance()->openFileStream(_checksumFileName, FileStream::Mode::OVERLAPPED);
             _fsMd5->seek(0, SEEK_END);
@@ -219,7 +219,7 @@ class DownloadTaskCURL : public IDownloadTask
     /*
     retval: 0. don't check, 1. check succeed, 2. check failed
     */
-    int checkFileMd5(const std::string& requiredsum, std::string* outsum = nullptr)
+    int checkFileMd5(std::string_view requiredsum, std::string* outsum = nullptr)
     {
         int status = 0;
         if (!requiredsum.empty())
@@ -573,7 +573,7 @@ class DownloaderCURL::Impl : public std::enable_shared_from_this<DownloaderCURL:
         do
         {
             long httpResponseCode = 0;
-            rc                       = curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &httpResponseCode);
+            rc                    = curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &httpResponseCode);
             if (CURLE_OK != rc)
             {
                 break;
diff --git a/cocos/network/CCDownloader.cpp b/cocos/network/CCDownloader.cpp
index 14c337a1c2d4..5c9e67a36ac3 100644
--- a/cocos/network/CCDownloader.cpp
+++ b/cocos/network/CCDownloader.cpp
@@ -39,17 +39,17 @@ DownloadTask::DownloadTask()
     DLLOG("Construct DownloadTask %p", this);
 }
 
-DownloadTask::DownloadTask(const std::string& srcUrl, const std::string& identifier)
+DownloadTask::DownloadTask(std::string_view srcUrl, std::string_view identifier)
 {
     this->requestURL = srcUrl;
     this->identifier = identifier;
     this->background = false;
 }
 
-DownloadTask::DownloadTask(const std::string& srcUrl,
-                           const std::string& storagePath,
-                           const std::string& checksum,
-                           const std::string& identifier,
+DownloadTask::DownloadTask(std::string_view srcUrl,
+                           std::string_view storagePath,
+                           std::string_view checksum,
+                           std::string_view identifier,
                            bool background)
 {
     this->requestURL  = srcUrl;
@@ -87,7 +87,7 @@ Downloader::Downloader(const DownloaderHints& hints)
     };
 
     _impl->onTaskFinish = [this](const DownloadTask& task, int errorCode, int errorCodeInternal,
-                                 const std::string& errorStr, std::vector<unsigned char>& data) {
+                                 std::string_view errorStr, std::vector<unsigned char>& data) {
         if (DownloadTask::ERROR_NO_ERROR != errorCode)
         {
             if (onTaskError)
@@ -121,8 +121,8 @@ Downloader::~Downloader()
     DLLOG("Destruct Downloader %p", this);
 }
 
-std::shared_ptr<DownloadTask> Downloader::createDownloadDataTask(const std::string& srcUrl,
-                                                                 const std::string& identifier /* = ""*/)
+std::shared_ptr<DownloadTask> Downloader::createDownloadDataTask(std::string_view srcUrl,
+                                                                 std::string_view identifier /* = ""*/)
 {
     auto task = std::make_shared<DownloadTask>(srcUrl, identifier);
 
@@ -143,10 +143,10 @@ std::shared_ptr<DownloadTask> Downloader::createDownloadDataTask(const std::stri
     return task;
 }
 
-std::shared_ptr<DownloadTask> Downloader::createDownloadFileTask(const std::string& srcUrl,
-                                                                 const std::string& storagePath,
-                                                                 const std::string& identifier,
-                                                                 const std::string& md5checksum,
+std::shared_ptr<DownloadTask> Downloader::createDownloadFileTask(std::string_view srcUrl,
+                                                                 std::string_view storagePath,
+                                                                 std::string_view identifier,
+                                                                 std::string_view md5checksum,
                                                                  bool background)
 {
     auto task = std::make_shared<DownloadTask>(srcUrl, storagePath, md5checksum, identifier, background);
@@ -167,7 +167,7 @@ std::shared_ptr<DownloadTask> Downloader::createDownloadFileTask(const std::stri
     return task;
 }
 
-// std::string Downloader::getFileNameFromUrl(const std::string& srcUrl)
+// std::string Downloader::getFileNameFromUrl(std::string_view srcUrl)
 //{
 //    // Find file name and file extension
 //    std::string filename;
diff --git a/cocos/network/CCDownloader.h b/cocos/network/CCDownloader.h
index 164859bb73ec..c6e3379a40f2 100644
--- a/cocos/network/CCDownloader.h
+++ b/cocos/network/CCDownloader.h
@@ -72,11 +72,11 @@ class CC_DLL DownloadTask final
     } mutable progressInfo;
 
     DownloadTask();
-    DownloadTask(const std::string& srcUrl, const std::string& identifier);
-    DownloadTask(const std::string& srcUrl,
-                 const std::string& storagePath,
-                 const std::string& checksum,  // currently is MD5
-                 const std::string& identifier,
+    DownloadTask(std::string_view srcUrl, std::string_view identifier);
+    DownloadTask(std::string_view srcUrl,
+                 std::string_view storagePath,
+                 std::string_view checksum,  // currently is MD5
+                 std::string_view identifier,
                  bool background);
 
     virtual ~DownloadTask();
@@ -114,7 +114,7 @@ class CC_DLL Downloader final
 
     std::function<void(const DownloadTask& task)> onTaskProgress;
 
-    std::function<void(const DownloadTask& task, int errorCode, int errorCodeInternal, const std::string& errorStr)>
+    std::function<void(const DownloadTask& task, int errorCode, int errorCodeInternal, std::string_view errorStr)>
         onTaskError;
 
     void setOnFileTaskSuccess(const std::function<void(const DownloadTask& task)>& callback)
@@ -129,19 +129,18 @@ class CC_DLL Downloader final
 
     void setOnTaskError(
         const std::function<
-            void(const DownloadTask& task, int errorCode, int errorCodeInternal, const std::string& errorStr)>&
-            callback)
+            void(const DownloadTask& task, int errorCode, int errorCodeInternal, std::string_view errorStr)>& callback)
     {
         onTaskError = callback;
     };
 
-    std::shared_ptr<DownloadTask> createDownloadDataTask(const std::string& srcUrl, const std::string& identifier = "");
+    std::shared_ptr<DownloadTask> createDownloadDataTask(std::string_view srcUrl, std::string_view identifier = "");
 
-    std::shared_ptr<DownloadTask> createDownloadFileTask(const std::string& srcUrl,
-                                                         const std::string& storagePath,
-                                                         const std::string& identifier = "",
-                                                         const std::string& checksum   = "",
-                                                         bool background               = false);
+    std::shared_ptr<DownloadTask> createDownloadFileTask(std::string_view srcUrl,
+                                                         std::string_view storagePath,
+                                                         std::string_view identifier = "",
+                                                         std::string_view checksum   = "",
+                                                         bool background             = false);
 
 private:
     std::unique_ptr<IDownloaderImpl> _impl;
diff --git a/cocos/network/CCIDownloaderImpl.h b/cocos/network/CCIDownloaderImpl.h
index 71ffa7925345..ceefec26fe78 100644
--- a/cocos/network/CCIDownloaderImpl.h
+++ b/cocos/network/CCIDownloaderImpl.h
@@ -67,7 +67,7 @@ class IDownloaderImpl
     std::function<void(const DownloadTask& task,
                        int errorCode,
                        int errorCodeInternal,
-                       const std::string& errorStr,
+                       std::string_view errorStr,
                        std::vector<unsigned char>& data)>
         onTaskFinish;
 
diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp
index 0f2f78290ef7..6c54503bd76c 100644
--- a/cocos/network/HttpClient.cpp
+++ b/cocos/network/HttpClient.cpp
@@ -104,7 +104,7 @@ void HttpClient::enableCookies(const char* cookieFile)
     _cookie->readFile();
 }
 
-void HttpClient::setSSLVerification(const std::string& caFile)
+void HttpClient::setSSLVerification(std::string_view caFile)
 {
     std::lock_guard<std::recursive_mutex> lock(_sslCaFileMutex);
     _sslCaFilename = caFile;
@@ -167,9 +167,9 @@ void HttpClient::handleNetworkStatusChanged()
     _service->set_option(YOPT_S_DNS_DIRTY, 1);
 }
 
-void HttpClient::setNameServers(const std::string& servers)
+void HttpClient::setNameServers(std::string_view servers)
 {
-    _service->set_option(YOPT_S_DNS_LIST, servers.c_str());
+    _service->set_option(YOPT_S_DNS_LIST, servers.data());
 }
 
 yasio::io_service* HttpClient::getInternalService()
@@ -208,7 +208,7 @@ int HttpClient::tryTakeAvailChannel()
     return -1;
 }
 
-void HttpClient::processResponse(HttpResponse* response, const std::string& url)
+void HttpClient::processResponse(HttpResponse* response, std::string_view url)
 {
     auto channelIndex = tryTakeAvailChannel();
     response->retain();
@@ -221,7 +221,7 @@ void HttpClient::processResponse(HttpResponse* response, const std::string& url)
             auto& requestUri       = response->getRequestUri();
             auto channelHandle     = _service->channel_at(channelIndex);
             channelHandle->ud_.ptr = response;
-            _service->set_option(YOPT_C_REMOTE_ENDPOINT, channelIndex, requestUri.getHost().c_str(),
+            _service->set_option(YOPT_C_REMOTE_ENDPOINT, channelIndex, requestUri.getHost().data(),
                                  (int)requestUri.getPort());
             if (requestUri.isSecure())
                 _service->open(channelIndex, YCK_SSL_CLIENT);
@@ -292,7 +292,7 @@ void HttpClient::handleNetworkEvent(yasio::io_event* event)
             obs.write_bytes(uri.getPath());
             if (!usePostData)
             {
-                auto& query = uri.getQuery();
+                auto query = uri.getQuery();
                 if (!query.empty())
                 {
                     obs.write_byte('?');
@@ -530,13 +530,13 @@ int HttpClient::getTimeoutForRead()
     return _timeoutForRead;
 }
 
-const std::string& HttpClient::getCookieFilename()
+std::string_view HttpClient::getCookieFilename()
 {
     std::lock_guard<std::recursive_mutex> lock(_cookieFileMutex);
     return _cookieFilename;
 }
 
-const std::string& HttpClient::getSSLVerification()
+std::string_view HttpClient::getSSLVerification()
 {
     std::lock_guard<std::recursive_mutex> lock(_sslCaFileMutex);
     return _sslCaFilename;
diff --git a/cocos/network/HttpClient.h b/cocos/network/HttpClient.h
index 7d6fd1a7a649..36a191fbf654 100644
--- a/cocos/network/HttpClient.h
+++ b/cocos/network/HttpClient.h
@@ -89,21 +89,21 @@ class CC_DLL HttpClient
      *
      * @return the cookie filename
      */
-    const std::string& getCookieFilename();
+    std::string_view getCookieFilename();
 
     /**
      * Set root certificate path for SSL verification.
      *
      * @param caFile a full path of root certificate.if it is empty, SSL verification is disabled.
      */
-    void setSSLVerification(const std::string& caFile);
+    void setSSLVerification(std::string_view caFile);
 
     /**
      * Get the ssl CA filename
      *
      * @return the ssl CA filename
      */
-    const std::string& getSSLVerification();
+    std::string_view getSSLVerification();
 
     /**
      * Send http request concurrently, non-blocking
@@ -197,7 +197,7 @@ class CC_DLL HttpClient
      * Sets custom dns server list:
      * format: "xxx.xxx.xxx.xxx[:port],xxx.xxx.xxx.xxx[:port]
      */
-    void setNameServers(const std::string& servers);
+    void setNameServers(std::string_view servers);
 
     yasio::io_service* getInternalService();
 
@@ -205,7 +205,7 @@ class CC_DLL HttpClient
     HttpClient();
     virtual ~HttpClient();
 
-    void processResponse(HttpResponse* response, const std::string& url);
+    void processResponse(HttpResponse* response, std::string_view url);
 
     int tryTakeAvailChannel();
 
diff --git a/cocos/network/HttpCookie.cpp b/cocos/network/HttpCookie.cpp
index be22e571b11e..bfe76554e184 100644
--- a/cocos/network/HttpCookie.cpp
+++ b/cocos/network/HttpCookie.cpp
@@ -151,11 +151,11 @@ std::string HttpCookie::checkAndGetFormatedMatchCookies(const Uri& uri)
     return ret;
 }
 
-bool HttpCookie::updateOrAddCookie(const std::string& cookie, const Uri& uri)
+bool HttpCookie::updateOrAddCookie(std::string_view cookie, const Uri& uri)
 {
     unsigned int count = 0;
     CookieInfo info;
-    xsbase::nzls::fast_split(cookie.c_str(), cookie.length(), ';', [&](const char* start, const char* end) {
+    xsbase::nzls::fast_split(cookie.data(), cookie.length(), ';', [&](const char* start, const char* end) {
         unsigned int count_ = 0;
         while (*start == ' ')
             ++start;  // skip ws
@@ -289,7 +289,7 @@ void HttpCookie::writeFile()
     fclose(out);
 }
 
-void HttpCookie::setCookieFileName(const std::string& filename)
+void HttpCookie::setCookieFileName(std::string_view filename)
 {
     _cookieFileName = filename;
 }
diff --git a/cocos/network/HttpCookie.h b/cocos/network/HttpCookie.h
index 8e7d116cac0c..4ba517d2d25f 100644
--- a/cocos/network/HttpCookie.h
+++ b/cocos/network/HttpCookie.h
@@ -90,7 +90,7 @@ class HttpCookie
     void readFile();
 
     void writeFile();
-    void setCookieFileName(const std::string& fileName);
+    void setCookieFileName(std::string_view fileName);
 
     const std::vector<CookieInfo>* getCookies() const;
     const CookieInfo* getMatchCookie(const Uri& uri) const;
@@ -98,7 +98,7 @@ class HttpCookie
 
     // Check match cookies for http request
     std::string checkAndGetFormatedMatchCookies(const Uri& uri);
-    bool updateOrAddCookie(const std::string& cookie, const Uri& uri);
+    bool updateOrAddCookie(std::string_view cookie, const Uri& uri);
 
 private:
     std::string _cookieFileName;
diff --git a/cocos/network/HttpRequest.h b/cocos/network/HttpRequest.h
index 2dee876f3200..10a5ad007211 100644
--- a/cocos/network/HttpRequest.h
+++ b/cocos/network/HttpRequest.h
@@ -125,14 +125,14 @@ class CC_DLL HttpRequest : public Ref
      *
      * @param url the string object.
      */
-    void setUrl(const std::string& url) { _url = url; }
+    void setUrl(std::string_view url) { _url = url; }
 
     /**
      * Get the url address of HttpRequest object.
      *
      * @return const char* the pointer of _url.
      */
-    const std::string& getUrl() const { return _url; }
+    std::string_view getUrl() const { return _url; }
 
     /**
      * Set the request data of HttpRequest object.
@@ -168,7 +168,7 @@ class CC_DLL HttpRequest : public Ref
      *
      * @param tag the string object.
      */
-    void setTag(const std::string& tag) { _tag = tag; }
+    void setTag(std::string_view tag) { _tag = tag; }
 
     /**
      * Get the string tag to identify the request.
diff --git a/cocos/network/HttpResponse.h b/cocos/network/HttpResponse.h
index 8909c36440ea..68b3694df6e4 100644
--- a/cocos/network/HttpResponse.h
+++ b/cocos/network/HttpResponse.h
@@ -155,7 +155,7 @@ class CC_DLL HttpResponse : public cocos2d::Ref
      * @param value a string pointer that point to response data buffer.
      * @param n the defined size that the response data buffer would be copied.
      */
-    bool prepareForProcess(const std::string& url)
+    bool prepareForProcess(std::string_view url)
     {
         /* Resets response status */
         _finished = false;
diff --git a/cocos/network/Uri.cpp b/cocos/network/Uri.cpp
index 665837fccc88..835738740bff 100644
--- a/cocos/network/Uri.cpp
+++ b/cocos/network/Uri.cpp
@@ -143,7 +143,7 @@ bool Uri::operator==(const Uri& o) const
             _queryParams == o._queryParams);
 }
 
-Uri Uri::parse(const std::string& str)
+Uri Uri::parse(std::string_view str)
 {
     Uri uri;
 
@@ -155,7 +155,7 @@ Uri Uri::parse(const std::string& str)
     return uri;
 }
 
-bool Uri::doParse(const std::string& str)
+bool Uri::doParse(std::string_view str)
 {
     static const std::regex uriRegex(
         "([a-zA-Z][a-zA-Z0-9+.-]*):"  // scheme:
@@ -182,7 +182,7 @@ bool Uri::doParse(const std::string& str)
     std::smatch match;
     if (UNLIKELY(!std::regex_match(copied.cbegin(), copied.cend(), match, uriRegex)))
     {
-        CCLOGERROR("Invalid URI: %s", str.c_str());
+        CCLOGERROR("Invalid URI: %s", str.data());
         return false;
     }
 
diff --git a/cocos/network/Uri.h b/cocos/network/Uri.h
index aa24b1d9249d..de32b9892158 100644
--- a/cocos/network/Uri.h
+++ b/cocos/network/Uri.h
@@ -58,7 +58,7 @@ class CC_DLL Uri
     /**
      * Parse a Uri from a string.  Throws std::invalid_argument on parse error.
      */
-    static Uri parse(const std::string& str);
+    static Uri parse(std::string_view str);
 
     /** Default constructor */
     Uri();
@@ -85,18 +85,18 @@ class CC_DLL Uri
     bool isSecure() const { return _isSecure; }
 
     /** Gets the scheme name for this URI. */
-    const std::string& getScheme() const { return _scheme; }
+    std::string_view getScheme() const { return _scheme; }
 
     /** Gets the user name with the specified URI. */
-    const std::string& getUserName() const { return _username; }
+    std::string_view getUserName() const { return _username; }
 
     /** Gets the password with the specified URI. */
-    const std::string& getPassword() const { return _password; }
+    std::string_view getPassword() const { return _password; }
     /**
      * Get host part of URI. If host is an IPv6 address, square brackets will be
      * returned, for example: "[::1]".
      */
-    const std::string& getHost() const { return _host; }
+    std::string_view getHost() const { return _host; }
     /**
      * Get host part of URI. If host is an IPv6 address, square brackets will not
      * be returned, for exmaple "::1"; otherwise it returns the same thing as
@@ -106,29 +106,29 @@ class CC_DLL Uri
      * or API that connects to that host/port; e.g. getaddrinfo() only understands
      * IPv6 host without square brackets
      */
-    const std::string& getHostName() const { return _hostName; }
+    std::string_view getHostName() const { return _hostName; }
 
     /** Gets the port number of the URI. */
     uint16_t getPort() const { return _port; }
 
     /** Gets the path part of the URI. */
-    const std::string& getPath() const { return _path; }
+    std::string_view getPath() const { return _path; }
 
     /// Gets the path, query and fragment parts of the URI.
-    const std::string& getPathEtc() const { return _pathEtc; }
+    std::string_view getPathEtc() const { return _pathEtc; }
 
     /** Gets the query part of the URI. */
-    const std::string& getQuery() const { return _query; }
+    std::string_view getQuery() const { return _query; }
 
     /** Gets the fragment part of the URI */
-    const std::string& getFragment() const { return _fragment; }
+    std::string_view getFragment() const { return _fragment; }
 
     /** Gets the authority part (userName, password, host and port) of the URI.
      * @note If the port number is a well-known port
      *      number for the given scheme (e.g., 80 for http), it
      *      is not included in the authority.
      */
-    const std::string& getAuthority() const { return _authority; }
+    std::string_view getAuthority() const { return _authority; }
 
     /** Gets a string representation of the URI. */
     std::string toString() const;
@@ -159,7 +159,7 @@ class CC_DLL Uri
     void clear();
 
 private:
-    bool doParse(const std::string& str);
+    bool doParse(std::string_view str);
 
     bool _isValid;
     bool _isSecure;
diff --git a/cocos/physics3d/CCPhysicsSprite3D.cpp b/cocos/physics3d/CCPhysicsSprite3D.cpp
index be3b00805401..26a0da9a7f52 100644
--- a/cocos/physics3d/CCPhysicsSprite3D.cpp
+++ b/cocos/physics3d/CCPhysicsSprite3D.cpp
@@ -31,7 +31,7 @@
 
 NS_CC_BEGIN
 
-PhysicsSprite3D* PhysicsSprite3D::create(const std::string& modelPath,
+PhysicsSprite3D* PhysicsSprite3D::create(std::string_view modelPath,
                                          Physics3DRigidBodyDes* rigidDes,
                                          const cocos2d::Vec3& translateInPhysics,
                                          const cocos2d::Quaternion& rotInPhsyics)
@@ -50,7 +50,7 @@ PhysicsSprite3D* PhysicsSprite3D::create(const std::string& modelPath,
     return ret;
 }
 
-PhysicsSprite3D* PhysicsSprite3D::createWithCollider(const std::string& modelPath,
+PhysicsSprite3D* PhysicsSprite3D::createWithCollider(std::string_view modelPath,
                                                      Physics3DColliderDes* colliderDes,
                                                      const cocos2d::Vec3& translateInPhysics,
                                                      const cocos2d::Quaternion& rotInPhsyics)
diff --git a/cocos/physics3d/CCPhysicsSprite3D.h b/cocos/physics3d/CCPhysicsSprite3D.h
index 3a61876de442..7e94346f5504 100644
--- a/cocos/physics3d/CCPhysicsSprite3D.h
+++ b/cocos/physics3d/CCPhysicsSprite3D.h
@@ -48,13 +48,13 @@ class CC_DLL PhysicsSprite3D : public cocos2d::Sprite3D
 {
 public:
     /** creates a PhysicsSprite3D*/
-    static PhysicsSprite3D* create(const std::string& modelPath,
+    static PhysicsSprite3D* create(std::string_view modelPath,
                                    Physics3DRigidBodyDes* rigidDes,
                                    const cocos2d::Vec3& translateInPhysics = cocos2d::Vec3::ZERO,
                                    const cocos2d::Quaternion& rotInPhsyics = cocos2d::Quaternion::ZERO);
 
     /** creates a PhysicsSprite3D as a collider*/
-    static PhysicsSprite3D* createWithCollider(const std::string& modelPath,
+    static PhysicsSprite3D* createWithCollider(std::string_view modelPath,
                                                Physics3DColliderDes* colliderDes,
                                                const cocos2d::Vec3& translateInPhysics = cocos2d::Vec3::ZERO,
                                                const cocos2d::Quaternion& rotInPhsyics = cocos2d::Quaternion::ZERO);
diff --git a/cocos/platform/CCApplicationProtocol.h b/cocos/platform/CCApplicationProtocol.h
index 7bb1e930fdaa..cfb3b0ba0443 100644
--- a/cocos/platform/CCApplicationProtocol.h
+++ b/cocos/platform/CCApplicationProtocol.h
@@ -152,7 +152,7 @@ class CC_DLL ApplicationProtocol
      * @js NA
      * @lua NA
      */
-    virtual bool openURL(const std::string& url) = 0;
+    virtual bool openURL(std::string_view url) = 0;
 };
 
 // end of platform group
diff --git a/cocos/platform/CCFileStream.h b/cocos/platform/CCFileStream.h
index e44e74a512fb..74caba22bc73 100644
--- a/cocos/platform/CCFileStream.h
+++ b/cocos/platform/CCFileStream.h
@@ -28,7 +28,7 @@ class CC_DLL FileStream
      *  @param mode File open mode, being READ | WRITE | APPEND
      *  @return true if successful, false if not
      */
-    virtual bool open(const std::string& path, FileStream::Mode mode) = 0;
+    virtual bool open(std::string_view path, FileStream::Mode mode) = 0;
 
     /**
      *  Close a file stream
diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp
index 06fd8061c896..517cb2fc2e20 100644
--- a/cocos/platform/CCFileUtils.cpp
+++ b/cocos/platform/CCFileUtils.cpp
@@ -29,6 +29,7 @@ THE SOFTWARE.
 
 #include <stack>
 #include <sstream>
+#include <algorithm>
 
 #include "base/CCData.h"
 #include "base/ccMacros.h"
@@ -44,9 +45,38 @@ THE SOFTWARE.
 #endif
 #include <sys/stat.h>
 
+#if defined(_WIN32)
+#    include "ntcvt/ntcvt.hpp"
+#endif
+
+#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
+#    include "tinydir/tinydir.h"
+#endif
+
 #include "pugixml/pugixml.hpp"
+
 #define DECLARE_GUARD (void)0
 
+#if CC_TARGET_PLATFORM != CC_PLATFORM_IOS && (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID || (defined(__NDK_MAJOR__) && __NDK_MAJOR__ >= 22) )
+#    define ADXE_HAVE_STDFS 1
+#    include <filesystem>
+namespace stdfs = std::filesystem;
+#    if defined(_WIN32)
+inline stdfs::path toFspath(const std::string_view& pathSV)
+{
+    return stdfs::path{ntcvt::from_chars(pathSV)};
+}
+#    else
+inline stdfs::path toFspath(const std::string_view& pathSV)
+{
+    return stdfs::path{pathSV};
+}
+#    endif
+#else
+#    include "tinydir/tinydir.h"
+#    define ADXE_HAVE_STDFS 0
+#endif
+
 NS_CC_BEGIN
 
 // Implement DictMaker
@@ -92,7 +122,7 @@ class DictMaker : public SAXDelegator
 
     ~DictMaker() {}
 
-    ValueMap dictionaryWithContentsOfFile(const std::string& fileName)
+    ValueMap dictionaryWithContentsOfFile(std::string_view fileName)
     {
         _resultType = SAX_RESULT_DICT;
         SAXParser parser;
@@ -116,7 +146,7 @@ class DictMaker : public SAXDelegator
         return _rootDict;
     }
 
-    ValueVector arrayWithContentsOfFile(const std::string& fileName)
+    ValueVector arrayWithContentsOfFile(std::string_view fileName)
     {
         _resultType = SAX_RESULT_ARRAY;
         SAXParser parser;
@@ -156,9 +186,9 @@ class DictMaker : public SAXDelegator
             {
                 // add a new dictionary into the pre dictionary
                 CCASSERT(!_dictStack.empty(), "The state is wrong!");
-                ValueMap* preDict   = _dictStack.top();
-                (*preDict)[_curKey] = Value(ValueMap());
-                _curDict            = &(*preDict)[_curKey].asValueMap();
+                ValueMap* preDict = _dictStack.top();
+                auto& curVal      = hlookup::set_item(*preDict, _curKey, Value(ValueMap()))->second;
+                _curDict          = &curVal.asValueMap();
             }
 
             // record the dict state
@@ -321,7 +351,7 @@ class DictMaker : public SAXDelegator
     }
 };
 
-ValueMap FileUtils::getValueMapFromFile(const std::string& filename) const
+ValueMap FileUtils::getValueMapFromFile(std::string_view filename) const
 {
     const std::string fullPath = fullPathForFilename(filename);
     DictMaker tMaker;
@@ -334,7 +364,7 @@ ValueMap FileUtils::getValueMapFromData(const char* filedata, int filesize) cons
     return tMaker.dictionaryWithDataOfFile(filedata, filesize);
 }
 
-ValueVector FileUtils::getValueVectorFromFile(const std::string& filename) const
+ValueVector FileUtils::getValueVectorFromFile(std::string_view filename) const
 {
     const std::string fullPath = fullPathForFilename(filename);
     DictMaker tMaker;
@@ -350,12 +380,12 @@ static void generateElementForDict(const ValueMap& dict, pugi::xml_node& innerDi
 /*
  * Use pugixml to write plist files
  */
-bool FileUtils::writeToFile(const ValueMap& dict, const std::string& fullPath) const
+bool FileUtils::writeToFile(const ValueMap& dict, std::string_view fullPath) const
 {
     return writeValueMapToFile(dict, fullPath);
 }
 
-bool FileUtils::writeValueMapToFile(const ValueMap& dict, const std::string& fullPath) const
+bool FileUtils::writeValueMapToFile(const ValueMap& dict, std::string_view fullPath) const
 {
     pugi::xml_document doc;
     doc.load_string(R"(<?xml version="1.0" encoding="UTF-8" ?>
@@ -371,7 +401,7 @@ bool FileUtils::writeValueMapToFile(const ValueMap& dict, const std::string& ful
     return writeStringToFile(ss.str(), fullPath);
 }
 
-bool FileUtils::writeValueVectorToFile(const ValueVector& vecData, const std::string& fullPath) const
+bool FileUtils::writeValueVectorToFile(const ValueVector& vecData, std::string_view fullPath) const
 {
     pugi::xml_document doc;
     doc.load_string(R"(<?xml version="1.0" encoding="UTF-8" ?>
@@ -460,35 +490,37 @@ FileUtils::FileUtils() : _writablePath("") {}
 
 FileUtils::~FileUtils() {}
 
-bool FileUtils::writeStringToFile(const std::string& dataStr, const std::string& fullPath) const
+bool FileUtils::writeStringToFile(std::string_view dataStr, std::string_view fullPath) const
 {
-    return FileUtils::writeBinaryToFile(dataStr.c_str(), dataStr.size(), fullPath);
+    return FileUtils::writeBinaryToFile(dataStr.data(), dataStr.size(), fullPath);
 }
 
 void FileUtils::writeStringToFile(std::string dataStr,
-                                  const std::string& fullPath,
+                                  std::string_view fullPath,
                                   std::function<void(bool)> callback) const
 {
     performOperationOffthread(
-        [fullPath](const std::string& dataStrIn) -> bool {
-            return FileUtils::getInstance()->writeStringToFile(dataStrIn, fullPath);
+        [path = std::string{fullPath}](std::string_view dataStrIn) -> bool {
+            return FileUtils::getInstance()->writeStringToFile(dataStrIn, path);
         },
         std::move(callback), std::move(dataStr));
 }
 
-bool FileUtils::writeDataToFile(const Data& data, const std::string& fullPath) const
+bool FileUtils::writeDataToFile(const Data& data, std::string_view fullPath) const
 {
     return FileUtils::writeBinaryToFile(data.getBytes(), data.getSize(), fullPath);
 }
 
-void FileUtils::writeDataToFile(Data data, const std::string& fullPath, std::function<void(bool)> callback) const
+void FileUtils::writeDataToFile(Data data, std::string_view fullPath, std::function<void(bool)> callback) const
 {
     performOperationOffthread(
-        [fullPath](const Data& dataIn) -> bool { return FileUtils::getInstance()->writeDataToFile(dataIn, fullPath); },
+        [path = std::string{fullPath}](const Data& dataIn) -> bool {
+            return FileUtils::getInstance()->writeDataToFile(dataIn, path);
+        },
         std::move(callback), std::move(data));
 }
 
-bool FileUtils::writeBinaryToFile(const void* data, size_t dataSize, const std::string& fullPath)
+bool FileUtils::writeBinaryToFile(const void* data, size_t dataSize, std::string_view fullPath)
 {
     CCASSERT(!fullPath.empty() && dataSize > 0, "Invalid parameters.");
 
@@ -521,38 +553,39 @@ void FileUtils::purgeCachedEntries()
     _fullPathCacheDir.clear();
 }
 
-std::string FileUtils::getStringFromFile(const std::string& filename) const
+std::string FileUtils::getStringFromFile(std::string_view filename) const
 {
     std::string s;
     getContents(filename, &s);
     return s;
 }
 
-void FileUtils::getStringFromFile(const std::string& path, std::function<void(std::string)> callback) const
+void FileUtils::getStringFromFile(std::string_view path, std::function<void(std::string)> callback) const
 {
     // Get the full path on the main thread, to avoid the issue that FileUtil's is not
     // thread safe, and accessing the fullPath cache and searching the search paths is not thread safe
     auto fullPath = fullPathForFilename(path);
     performOperationOffthread(
-        [fullPath]() -> std::string { return FileUtils::getInstance()->getStringFromFile(fullPath); },
+        [path = std::string{fullPath}]() -> std::string { return FileUtils::getInstance()->getStringFromFile(path); },
         std::move(callback));
 }
 
-Data FileUtils::getDataFromFile(const std::string& filename) const
+Data FileUtils::getDataFromFile(std::string_view filename) const
 {
     Data d;
     getContents(filename, &d);
     return d;
 }
 
-void FileUtils::getDataFromFile(const std::string& filename, std::function<void(Data)> callback) const
+void FileUtils::getDataFromFile(std::string_view filename, std::function<void(Data)> callback) const
 {
     auto fullPath = fullPathForFilename(filename);
-    performOperationOffthread([fullPath]() -> Data { return FileUtils::getInstance()->getDataFromFile(fullPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{fullPath}]() -> Data { return FileUtils::getInstance()->getDataFromFile(path); },
+        std::move(callback));
 }
 
-FileUtils::Status FileUtils::getContents(const std::string& filename, ResizableBuffer* buffer) const
+FileUtils::Status FileUtils::getContents(std::string_view filename, ResizableBuffer* buffer) const
 {
     if (filename.empty())
         return Status::NotExists;
@@ -590,30 +623,28 @@ FileUtils::Status FileUtils::getContents(const std::string& filename, ResizableB
     return Status::OK;
 }
 
-void FileUtils::writeValueMapToFile(ValueMap dict,
-                                    const std::string& fullPath,
-                                    std::function<void(bool)> callback) const
+void FileUtils::writeValueMapToFile(ValueMap dict, std::string_view fullPath, std::function<void(bool)> callback) const
 {
 
     performOperationOffthread(
-        [fullPath](const ValueMap& dictIn) -> bool {
-            return FileUtils::getInstance()->writeValueMapToFile(dictIn, fullPath);
+        [path = std::string{fullPath}](const ValueMap& dictIn) -> bool {
+            return FileUtils::getInstance()->writeValueMapToFile(dictIn, path);
         },
         std::move(callback), std::move(dict));
 }
 
 void FileUtils::writeValueVectorToFile(ValueVector vecData,
-                                       const std::string& fullPath,
+                                       std::string_view fullPath,
                                        std::function<void(bool)> callback) const
 {
     performOperationOffthread(
-        [fullPath](const ValueVector& vecDataIn) -> bool {
-            return FileUtils::getInstance()->writeValueVectorToFile(vecDataIn, fullPath);
+        [path = std::string{fullPath}](const ValueVector& vecDataIn) -> bool {
+            return FileUtils::getInstance()->writeValueVectorToFile(vecDataIn, path);
         },
         std::move(callback), std::move(vecData));
 }
 
-std::string FileUtils::getNewFilename(const std::string& filename) const
+std::string FileUtils::getNewFilename(std::string_view filename) const
 {
     std::string newFileName;
 
@@ -633,13 +664,13 @@ std::string FileUtils::getNewFilename(const std::string& filename) const
     return newFileName;
 }
 
-std::string FileUtils::getPathForFilename(const std::string& filename,
-                                          const std::string& resolutionDirectory,
-                                          const std::string& searchPath) const
+std::string FileUtils::getPathForFilename(std::string_view filename,
+                                          std::string_view resolutionDirectory,
+                                          std::string_view searchPath) const
 {
-    std::string file      = filename;
-    std::string file_path = "";
-    size_t pos            = filename.find_last_of('/');
+    auto file                  = filename;
+    std::string_view file_path = hlookup::empty_sv;
+    size_t pos                 = filename.find_last_of('/');
     if (pos != std::string::npos)
     {
         file_path = filename.substr(0, pos + 1);
@@ -647,7 +678,7 @@ std::string FileUtils::getPathForFilename(const std::string& filename,
     }
 
     // searchPath + file_path + resourceDirectory
-    std::string path = searchPath;
+    std::string path{searchPath};
     path += file_path;
     path += resolutionDirectory;
 
@@ -656,14 +687,14 @@ std::string FileUtils::getPathForFilename(const std::string& filename,
     return path;
 }
 
-std::string FileUtils::getPathForDirectory(const std::string& dir,
-                                           const std::string& resolutionDiretory,
-                                           const std::string& searchPath) const
+std::string FileUtils::getPathForDirectory(std::string_view dir,
+                                           std::string_view resolutionDiretory,
+                                           std::string_view searchPath) const
 {
-    return searchPath + resolutionDiretory + dir;
+    return std::string{searchPath}.append(resolutionDiretory).append(dir);
 }
 
-std::string FileUtils::fullPathForFilename(const std::string& filename) const
+std::string FileUtils::fullPathForFilename(std::string_view filename) const
 {
 
     DECLARE_GUARD;
@@ -681,7 +712,7 @@ std::string FileUtils::fullPathForFilename(const std::string& filename) const
      */
     if (isAbsolutePath(filename))
     {
-        return filename;
+        return std::string{filename};
     }
 
     // Already Cached ?
@@ -713,14 +744,14 @@ std::string FileUtils::fullPathForFilename(const std::string& filename) const
 
     if (isPopupNotify())
     {
-        CCLOG("cocos2d: fullPathForFilename: No file found at %s. Possible missing file.", filename.c_str());
+        CCLOG("cocos2d: fullPathForFilename: No file found at %s. Possible missing file.", filename.data());
     }
 
     // The file wasn't found, return empty string.
-    return "";
+    return std::string{};
 }
 
-std::string FileUtils::fullPathForDirectory(const std::string& dir) const
+std::string FileUtils::fullPathForDirectory(std::string_view dir) const
 {
     DECLARE_GUARD;
 
@@ -731,7 +762,7 @@ std::string FileUtils::fullPathForDirectory(const std::string& dir) const
 
     if (isAbsolutePath(dir))
     {
-        return dir;
+        return std::string{dir};
     }
 
     // Already Cached ?
@@ -740,7 +771,7 @@ std::string FileUtils::fullPathForDirectory(const std::string& dir) const
     {
         return cacheIter->second;
     }
-    std::string longdir = dir;
+    std::string longdir{dir};
     std::string fullpath;
 
     if (longdir[longdir.length() - 1] != '/')
@@ -766,16 +797,16 @@ std::string FileUtils::fullPathForDirectory(const std::string& dir) const
 
     if (isPopupNotify())
     {
-        CCLOG("cocos2d: fullPathForDirectory: No directory found at %s. Possible missing directory.", dir.c_str());
+        CCLOG("cocos2d: fullPathForDirectory: No directory found at %s. Possible missing directory.", dir.data());
     }
 
     // The file wasn't found, return empty string.
     return "";
 }
 
-std::string FileUtils::fullPathFromRelativeFile(const std::string& filename, const std::string& relativeFile) const
+std::string FileUtils::fullPathFromRelativeFile(std::string_view filename, std::string_view relativeFile) const
 {
-    return relativeFile.substr(0, relativeFile.rfind('/') + 1) + getNewFilename(filename);
+    return std::string{relativeFile.substr(0, relativeFile.rfind('/') + 1)}.append(getNewFilename(filename));
 }
 
 void FileUtils::setSearchResolutionsOrder(const std::vector<std::string>& searchResolutionsOrder)
@@ -795,7 +826,7 @@ void FileUtils::setSearchResolutionsOrder(const std::vector<std::string>& search
     for (const auto& iter : searchResolutionsOrder)
     {
         std::string resolutionDirectory = iter;
-        if (!existDefault && resolutionDirectory == "")
+        if (!existDefault && resolutionDirectory.empty())
         {
             existDefault = true;
         }
@@ -814,12 +845,12 @@ void FileUtils::setSearchResolutionsOrder(const std::vector<std::string>& search
     }
 }
 
-void FileUtils::addSearchResolutionsOrder(const std::string& order, const bool front)
+void FileUtils::addSearchResolutionsOrder(std::string_view order, const bool front)
 {
 
     DECLARE_GUARD;
 
-    std::string resOrder = order;
+    std::string resOrder{order};
     if (!resOrder.empty() && resOrder[resOrder.length() - 1] != '/')
         resOrder.push_back('/');
 
@@ -851,7 +882,7 @@ const std::vector<std::string> FileUtils::getOriginalSearchPaths() const
     return _originalSearchPaths;
 }
 
-void FileUtils::setWritablePath(const std::string& writablePath)
+void FileUtils::setWritablePath(std::string_view writablePath)
 {
     DECLARE_GUARD;
     _writablePath = writablePath;
@@ -863,7 +894,7 @@ const std::string FileUtils::getDefaultResourceRootPath() const
     return _defaultResRootPath;
 }
 
-void FileUtils::setDefaultResourceRootPath(const std::string& path)
+void FileUtils::setDefaultResourceRootPath(std::string_view path)
 {
     DECLARE_GUARD;
     if (_defaultResRootPath != path)
@@ -919,14 +950,14 @@ void FileUtils::setSearchPaths(const std::vector<std::string>& searchPaths)
     }
 }
 
-void FileUtils::addSearchPath(const std::string& searchpath, const bool front)
+void FileUtils::addSearchPath(std::string_view searchpath, const bool front)
 {
     DECLARE_GUARD;
-    std::string prefix;
+    std::string path;
     if (!isAbsolutePath(searchpath))
-        prefix = _defaultResRootPath;
+        path = _defaultResRootPath;
 
-    std::string path = prefix + searchpath;
+    path.append(searchpath);
     if (!path.empty() && path[path.length() - 1] != '/')
     {
         path += "/";
@@ -934,13 +965,13 @@ void FileUtils::addSearchPath(const std::string& searchpath, const bool front)
 
     if (front)
     {
-        _originalSearchPaths.insert(_originalSearchPaths.begin(), searchpath);
-        _searchPathArray.insert(_searchPathArray.begin(), path);
+        _originalSearchPaths.insert(_originalSearchPaths.begin(), std::string{searchpath});
+        _searchPathArray.insert(_searchPathArray.begin(), std::move(path));
     }
     else
     {
-        _originalSearchPaths.push_back(searchpath);
-        _searchPathArray.push_back(path);
+        _originalSearchPaths.push_back(std::string{searchpath});
+        _searchPathArray.push_back(std::move(path));
     }
 }
 
@@ -952,7 +983,7 @@ void FileUtils::setFilenameLookupDictionary(const ValueMap& filenameLookupDict)
     _filenameLookupDict = filenameLookupDict;
 }
 
-void FileUtils::loadFilenameLookupDictionaryFromFile(const std::string& filename)
+void FileUtils::loadFilenameLookupDictionaryFromFile(std::string_view filename)
 {
     const std::string fullPath = fullPathForFilename(filename);
     if (!fullPath.empty())
@@ -965,7 +996,7 @@ void FileUtils::loadFilenameLookupDictionaryFromFile(const std::string& filename
             if (version != 1)
             {
                 CCLOG("cocos2d: ERROR: Invalid filenameLookup dictionary version: %d. Filename: %s", version,
-                      filename.c_str());
+                      filename.data());
                 return;
             }
             setFilenameLookupDictionary(dict["filenames"].asValueMap());
@@ -973,12 +1004,12 @@ void FileUtils::loadFilenameLookupDictionaryFromFile(const std::string& filename
     }
 }
 
-std::string FileUtils::getFullPathForFilenameWithinDirectory(const std::string& directory,
-                                                             const std::string& filename) const
+std::string FileUtils::getFullPathForFilenameWithinDirectory(std::string_view directory,
+                                                             std::string_view filename) const
 {
     // get directory+filename, safely adding '/' as necessary
-    std::string ret = directory;
-    if (directory.size() && directory[directory.size() - 1] != '/')
+    std::string ret{directory};
+    if (!directory.empty() && directory[directory.size() - 1] != '/')
     {
         ret += '/';
     }
@@ -986,12 +1017,12 @@ std::string FileUtils::getFullPathForFilenameWithinDirectory(const std::string&
     // if the file doesn't exist, return an empty string
     if (!isFileExistInternal(ret))
     {
-        ret = "";
+        ret.clear();
     }
     return ret;
 }
 
-bool FileUtils::isFileExist(const std::string& filename) const
+bool FileUtils::isFileExist(std::string_view filename) const
 {
     if (isAbsolutePath(filename))
     {
@@ -1007,19 +1038,20 @@ bool FileUtils::isFileExist(const std::string& filename) const
     }
 }
 
-void FileUtils::isFileExist(const std::string& filename, std::function<void(bool)> callback) const
+void FileUtils::isFileExist(std::string_view filename, std::function<void(bool)> callback) const
 {
     auto fullPath = fullPathForFilename(filename);
-    performOperationOffthread([fullPath]() -> bool { return FileUtils::getInstance()->isFileExist(fullPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{fullPath}]() -> bool { return FileUtils::getInstance()->isFileExist(path); },
+        std::move(callback));
 }
 
-bool FileUtils::isAbsolutePath(const std::string& path) const
+bool FileUtils::isAbsolutePath(std::string_view path) const
 {
     return isAbsolutePathInternal(path);
 }
 
-bool FileUtils::isAbsolutePathInternal(const std::string& path)
+bool FileUtils::isAbsolutePathInternal(std::string_view path)
 {
 #if defined(_WIN32)
     // see also: https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN
@@ -1034,7 +1066,7 @@ bool FileUtils::isAbsolutePathInternal(const std::string& path)
 #endif
 }
 
-bool FileUtils::isDirectoryExist(const std::string& dirPath) const
+bool FileUtils::isDirectoryExist(std::string_view dirPath) const
 {
     CCASSERT(!dirPath.empty(), "Invalid path");
 
@@ -1051,79 +1083,87 @@ bool FileUtils::isDirectoryExist(const std::string& dirPath) const
     }
 }
 
-void FileUtils::isDirectoryExist(const std::string& fullPath, std::function<void(bool)> callback) const
+void FileUtils::isDirectoryExist(std::string_view fullPath, std::function<void(bool)> callback) const
 {
     CCASSERT(isAbsolutePath(fullPath), "Async isDirectoryExist only accepts absolute file paths");
-    performOperationOffthread([fullPath]() -> bool { return FileUtils::getInstance()->isDirectoryExist(fullPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{fullPath}]() -> bool { return FileUtils::getInstance()->isDirectoryExist(path); },
+        std::move(callback));
 }
 
-void FileUtils::createDirectory(const std::string& dirPath, std::function<void(bool)> callback) const
+void FileUtils::createDirectory(std::string_view dirPath, std::function<void(bool)> callback) const
 {
-    performOperationOffthread([dirPath]() -> bool { return FileUtils::getInstance()->createDirectory(dirPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{dirPath}]() -> bool { return FileUtils::getInstance()->createDirectory(path); },
+        std::move(callback));
 }
 
-void FileUtils::removeDirectory(const std::string& dirPath, std::function<void(bool)> callback) const
+void FileUtils::removeDirectory(std::string_view dirPath, std::function<void(bool)> callback) const
 {
-    performOperationOffthread([dirPath]() -> bool { return FileUtils::getInstance()->removeDirectory(dirPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{dirPath}]() -> bool { return FileUtils::getInstance()->removeDirectory(path); },
+        std::move(callback));
 }
 
-void FileUtils::removeFile(const std::string& filepath, std::function<void(bool)> callback) const
+void FileUtils::removeFile(std::string_view filepath, std::function<void(bool)> callback) const
 {
     auto fullPath = fullPathForFilename(filepath);
-    performOperationOffthread([fullPath]() -> bool { return FileUtils::getInstance()->removeFile(fullPath); },
-                              std::move(callback));
+    performOperationOffthread(
+        [path = std::string{fullPath}]() -> bool { return FileUtils::getInstance()->removeFile(path); },
+        std::move(callback));
 }
 
-void FileUtils::renameFile(const std::string& path,
-                           const std::string& oldname,
-                           const std::string& name,
+void FileUtils::renameFile(std::string_view path,
+                           std::string_view oldname,
+                           std::string_view name,
                            std::function<void(bool)> callback) const
 {
     performOperationOffthread(
-        [path, oldname, name]() -> bool { return FileUtils::getInstance()->renameFile(path, oldname, name); },
+        [path = std::string{path}, oldname = std::string{oldname}, name = std::string{name}]() -> bool {
+            return FileUtils::getInstance()->renameFile(path, oldname, name);
+        },
         std::move(callback));
 }
 
-void FileUtils::renameFile(const std::string& oldfullpath,
-                           const std::string& newfullpath,
+void FileUtils::renameFile(std::string_view oldfullpath,
+                           std::string_view newfullpath,
                            std::function<void(bool)> callback) const
 {
     performOperationOffthread(
-        [oldfullpath, newfullpath]() { return FileUtils::getInstance()->renameFile(oldfullpath, newfullpath); },
+        [oldpath = std::string{oldfullpath}, newpath = std::string{newfullpath}]() {
+            return FileUtils::getInstance()->renameFile(oldpath, newpath);
+        },
         std::move(callback));
 }
 
-void FileUtils::getFileSize(const std::string& filepath, std::function<void(int64_t)> callback) const
+void FileUtils::getFileSize(std::string_view filepath, std::function<void(int64_t)> callback) const
 {
     auto fullPath = fullPathForFilename(filepath);
-    performOperationOffthread([fullPath]() { return FileUtils::getInstance()->getFileSize(fullPath); },
+    performOperationOffthread([path = std::string{fullPath}]() { return FileUtils::getInstance()->getFileSize(path); },
                               std::move(callback));
 }
 
-void FileUtils::listFilesAsync(const std::string& dirPath, std::function<void(std::vector<std::string>)> callback) const
+void FileUtils::listFilesAsync(std::string_view dirPath, std::function<void(std::vector<std::string>)> callback) const
 {
     auto fullPath = fullPathForDirectory(dirPath);
-    performOperationOffthread([fullPath]() { return FileUtils::getInstance()->listFiles(fullPath); },
+    performOperationOffthread([path = std::string{fullPath}]() { return FileUtils::getInstance()->listFiles(path); },
                               std::move(callback));
 }
 
-void FileUtils::listFilesRecursivelyAsync(const std::string& dirPath,
+void FileUtils::listFilesRecursivelyAsync(std::string_view dirPath,
                                           std::function<void(std::vector<std::string>)> callback) const
 {
     auto fullPath = fullPathForDirectory(dirPath);
     performOperationOffthread(
-        [fullPath]() {
+        [path = std::string{fullPath}]() {
             std::vector<std::string> retval;
-            FileUtils::getInstance()->listFilesRecursively(fullPath, &retval);
+            FileUtils::getInstance()->listFilesRecursively(path, &retval);
             return retval;
         },
         std::move(callback));
 }
 
-std::unique_ptr<FileStream> FileUtils::openFileStream(const std::string& filePath, FileStream::Mode mode)
+std::unique_ptr<FileStream> FileUtils::openFileStream(std::string_view filePath, FileStream::Mode mode)
 {
     PosixFileStream fs;
 
@@ -1135,64 +1175,211 @@ std::unique_ptr<FileStream> FileUtils::openFileStream(const std::string& filePat
     return nullptr;
 }
 
+/* !!!Notes for c++fs
+ a. ios: require ios 13.0+
+ b. android: require ndk-r22+
+*/
+#if ADXE_HAVE_STDFS
+std::vector<std::string> FileUtils::listFiles(std::string_view dirPath) const
+{
+    const auto fullPath = fullPathForDirectory(dirPath);
+    auto fsPath         = toFspath(fullPath);
+    if (!stdfs::is_directory(fsPath))
+    {
+        return {};
+    }
+    std::vector<std::string> files = {};
+    for (const auto& entry : stdfs::directory_iterator(fsPath))
+    {
+        const auto isDir = entry.is_directory();
+        if (isDir || entry.is_regular_file())
+        {
+#    if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#        if defined(__cpp_lib_char8_t)
+            std::u8string u8path = entry.path().u8string();
+            std::string pathStr  = {u8path.begin(), u8path.end()};
+#        else
+            std::string pathStr = entry.path().u8string();
+#        endif
+            std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
+#    else
+            std::string pathStr = entry.path().string();
+#    endif
+            if (isDir)
+            {
+                pathStr += '/';
+            }
+            files.emplace_back(std::move(pathStr));
+        }
+    }
+    return files;
+}
+
+void FileUtils::listFilesRecursively(std::string_view dirPath, std::vector<std::string>* files) const
+{
+    const auto fullPath = fullPathForDirectory(dirPath);
+    auto fsPath         = toFspath(fullPath);
+    if (!stdfs::is_directory(fsPath))
+    {
+        return;
+    }
+    for (const auto& entry : stdfs::recursive_directory_iterator(fsPath))
+    {
+        const auto isDir = entry.is_directory();
+        if (isDir || entry.is_regular_file())
+        {
+#    if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#        if defined(__cpp_lib_char8_t)
+            std::u8string u8path = entry.path().u8string();
+            std::string pathStr  = {u8path.begin(), u8path.end()};
+#        else
+            std::string pathStr = entry.path().u8string();
+#        endif
+            std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
+#    else
+            std::string pathStr = entry.path().string();
+#    endif
+            if (isDir)
+            {
+                pathStr += '/';
+            }
+            files->emplace_back(std::move(pathStr));
+        }
+    }
+}
+#else
+std::vector<std::string> FileUtils::listFiles(std::string_view dirPath) const
+{
+    std::vector<std::string> files;
+    std::string fullpath = fullPathForDirectory(dirPath);
+    if (!fullpath.empty() && isDirectoryExist(fullpath))
+    {
+        tinydir_dir dir;
+        std::string fullpathstr = fullpath;
+
+        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
+        {
+            while (dir.has_next)
+            {
+                tinydir_file file;
+                if (tinydir_readfile(&dir, &file) == -1)
+                {
+                    // Error getting file
+                    break;
+                }
+                std::string filepath = file.path;
+
+                if (strcmp(file.name, ".") != 0 && strcmp(file.name, "..") != 0)
+                {
+                    if (file.is_dir)
+                        filepath.push_back('/');
+
+                    files.push_back(std::move(filepath));
+                }
+
+                if (tinydir_next(&dir) == -1)
+                {
+                    // Error getting next file
+                    break;
+                }
+            }
+        }
+        tinydir_close(&dir);
+    }
+    return files;
+}
+
+void FileUtils::listFilesRecursively(std::string_view dirPath, std::vector<std::string>* files) const
+{
+    std::string fullpath = fullPathForDirectory(dirPath);
+    if (isDirectoryExist(fullpath))
+    {
+        tinydir_dir dir;
+        std::string fullpathstr = fullpath;
+
+        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
+        {
+            while (dir.has_next)
+            {
+                tinydir_file file;
+                if (tinydir_readfile(&dir, &file) == -1)
+                {
+                    // Error getting file
+                    break;
+                }
+
+                if (strcmp(file.name, ".") != 0 && strcmp(file.name, "..") != 0)
+                {
+                    std::string filepath = file.path;
+                    if (file.is_dir)
+                    {
+                        filepath.push_back('/');
+                        files->push_back(filepath);
+                        listFilesRecursively(filepath, files);
+                    }
+                    else
+                    {
+                        files->push_back(std::move(filepath));
+                    }
+                }
+
+                if (tinydir_next(&dir) == -1)
+                {
+                    // Error getting next file
+                    break;
+                }
+            }
+        }
+        tinydir_close(&dir);
+    }
+}
+#endif
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 // windows os implement should override in platform specific FileUtiles class
-bool FileUtils::isDirectoryExistInternal(const std::string& dirPath) const
+bool FileUtils::isDirectoryExistInternal(std::string_view dirPath) const
 {
     CCASSERT(false, "FileUtils not support isDirectoryExistInternal");
     return false;
 }
 
-bool FileUtils::createDirectory(const std::string& path) const
+bool FileUtils::createDirectory(std::string_view path) const
 {
     CCASSERT(false, "FileUtils not support createDirectory");
     return false;
 }
 
-bool FileUtils::removeDirectory(const std::string& path) const
+bool FileUtils::removeDirectory(std::string_view path) const
 {
     CCASSERT(false, "FileUtils not support removeDirectory");
     return false;
 }
 
-bool FileUtils::removeFile(const std::string& path) const
+bool FileUtils::removeFile(std::string_view path) const
 {
     CCASSERT(false, "FileUtils not support removeFile");
     return false;
 }
 
-bool FileUtils::renameFile(const std::string& oldfullpath, const std::string& newfullpath) const
+bool FileUtils::renameFile(std::string_view oldfullpath, std::string_view newfullpath) const
 {
     CCASSERT(false, "FileUtils not support renameFile");
     return false;
 }
 
-bool FileUtils::renameFile(const std::string& path, const std::string& oldname, const std::string& name) const
+bool FileUtils::renameFile(std::string_view path, std::string_view oldname, std::string_view name) const
 {
     CCASSERT(false, "FileUtils not support renameFile");
     return false;
 }
 
-int64_t FileUtils::getFileSize(const std::string& filepath) const
+int64_t FileUtils::getFileSize(std::string_view filepath) const
 {
     CCASSERT(false, "getFileSize should be override by platform FileUtils");
     return 0;
 }
 
-std::vector<std::string> FileUtils::listFiles(const std::string& dirPath) const
-{
-    CCASSERT(false, "FileUtils not support listFiles");
-    return std::vector<std::string>();
-}
-
-void FileUtils::listFilesRecursively(const std::string& dirPath, std::vector<std::string>* files) const
-{
-    CCASSERT(false, "FileUtils not support listFilesRecursively");
-    return;
-}
-
 #else
-#    include "tinydir/tinydir.h"
 // default implements for unix like os
 #    include <sys/types.h>
 #    include <errno.h>
@@ -1203,17 +1390,17 @@ void FileUtils::listFilesRecursively(const std::string& dirPath, std::vector<std
 #        include <ftw.h>
 #    endif
 
-bool FileUtils::isDirectoryExistInternal(const std::string& dirPath) const
+bool FileUtils::isDirectoryExistInternal(std::string_view dirPath) const
 {
     struct stat st;
-    if (stat(dirPath.c_str(), &st) == 0)
+    if (stat(dirPath.data(), &st) == 0)
     {
         return S_ISDIR(st.st_mode);
     }
     return false;
 }
 
-bool FileUtils::createDirectory(const std::string& path) const
+bool FileUtils::createDirectory(std::string_view path) const
 {
     CCASSERT(!path.empty(), "Invalid path");
 
@@ -1223,7 +1410,7 @@ bool FileUtils::createDirectory(const std::string& path) const
     // Split the path
     size_t start = 0;
     size_t found = path.find_first_of("/\\", start);
-    std::string subpath;
+    std::string_view subpath;
     std::vector<std::string> dirs;
 
     if (found != std::string::npos)
@@ -1232,14 +1419,14 @@ bool FileUtils::createDirectory(const std::string& path) const
         {
             subpath = path.substr(start, found - start + 1);
             if (!subpath.empty())
-                dirs.push_back(subpath);
+                dirs.push_back(std::string{subpath});
             start = found + 1;
             found = path.find_first_of("/\\", start);
             if (found == std::string::npos)
             {
                 if (start < path.length())
                 {
-                    dirs.push_back(path.substr(start));
+                    dirs.push_back(std::string{path.substr(start)});
                 }
                 break;
             }
@@ -1249,17 +1436,17 @@ bool FileUtils::createDirectory(const std::string& path) const
     DIR* dir = NULL;
 
     // Create path recursively
-    subpath = "";
+    std::string strSubpath;
     for (const auto& iter : dirs)
     {
-        subpath += iter;
-        dir = opendir(subpath.c_str());
+        strSubpath += iter;
+        dir = opendir(strSubpath.c_str());
 
         if (!dir)
         {
             // directory doesn't exist, should create a new one
 
-            int ret = mkdir(subpath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
+            int ret = mkdir(strSubpath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
             if (ret != 0 && (errno != EEXIST))
             {
                 // current directory can not be created, sub directories can not be created too
@@ -1291,19 +1478,19 @@ int unlink_cb(const char* fpath, const struct stat* sb, int typeflag, struct FTW
 #    endif
 }  // namespace
 
-bool FileUtils::removeDirectory(const std::string& path) const
+bool FileUtils::removeDirectory(std::string_view path) const
 {
 #    if !defined(CC_TARGET_OS_TVOS)
 
 #        if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
-    if (nftw(path.c_str(), unlink_cb, 64, FTW_DEPTH | FTW_PHYS) == -1)
+    if (nftw(path.data(), unlink_cb, 64, FTW_DEPTH | FTW_PHYS) == -1)
         return false;
     else
         return true;
 #        else
-    std::string command = "rm -r ";
+    std::string command = "rm -r \""s;
     // Path may include space.
-    command += "\"" + path + "\"";
+    command.append(path).append("\"", 1);
     if (system(command.c_str()) >= 0)
         return true;
     else
@@ -1315,9 +1502,9 @@ bool FileUtils::removeDirectory(const std::string& path) const
 #    endif  // !defined(CC_TARGET_OS_TVOS)
 }
 
-bool FileUtils::removeFile(const std::string& path) const
+bool FileUtils::removeFile(std::string_view path) const
 {
-    if (remove(path.c_str()))
+    if (remove(path.data()))
     {
         return false;
     }
@@ -1327,46 +1514,51 @@ bool FileUtils::removeFile(const std::string& path) const
     }
 }
 
-bool FileUtils::renameFile(const std::string& oldfullpath, const std::string& newfullpath) const
+bool FileUtils::renameFile(std::string_view oldfullpath, std::string_view newfullpath) const
 {
     CCASSERT(!oldfullpath.empty(), "Invalid path");
     CCASSERT(!newfullpath.empty(), "Invalid path");
 
-    int errorCode = rename(oldfullpath.c_str(), newfullpath.c_str());
+    int errorCode = rename(oldfullpath.data(), newfullpath.data());
 
     if (0 != errorCode)
     {
-        CCLOGERROR("Fail to rename file %s to %s !Error code is %d", oldfullpath.c_str(), newfullpath.c_str(),
-                   errorCode);
+        CCLOGERROR("Fail to rename file %s to %s !Error code is %d", oldfullpath.data(), newfullpath.data(), errorCode);
         return false;
     }
     return true;
 }
 
-bool FileUtils::renameFile(const std::string& path, const std::string& oldname, const std::string& name) const
+bool FileUtils::renameFile(std::string_view path, std::string_view oldname, std::string_view name) const
 {
     CCASSERT(!path.empty(), "Invalid path");
-    std::string oldPath = path + oldname;
-    std::string newPath = path + name;
+    std::string oldPath{path};
+    oldPath += oldname;
+    std::string newPath{path};
+    newPath += name;
 
     return this->renameFile(oldPath, newPath);
 }
 
-int64_t FileUtils::getFileSize(const std::string& filepath) const
+int64_t FileUtils::getFileSize(std::string_view filepath) const
 {
     CCASSERT(!filepath.empty(), "Invalid path");
 
-    std::string fullpath = filepath;
+    std::string_view path;
+    std::string fullpath;
     if (!isAbsolutePath(filepath))
     {
         fullpath = fullPathForFilename(filepath);
         if (fullpath.empty())
             return 0;
+        path = fullpath;
     }
+    else
+        path = filepath;
 
     struct stat info;
     // Get data associated with "crt_stat.c":
-    int result = ::stat(fullpath.c_str(), &info);
+    int result = ::stat(path.data(), &info);
 
     // Check if statistics are valid:
     if (result != 0)
@@ -1380,92 +1572,6 @@ int64_t FileUtils::getFileSize(const std::string& filepath) const
     }
 }
 
-std::vector<std::string> FileUtils::listFiles(const std::string& dirPath) const
-{
-    std::vector<std::string> files;
-    std::string fullpath = fullPathForDirectory(dirPath);
-    if (!fullpath.empty() && isDirectoryExist(fullpath))
-    {
-        tinydir_dir dir;
-        std::string fullpathstr = fullpath;
-
-        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
-        {
-            while (dir.has_next)
-            {
-                tinydir_file file;
-                if (tinydir_readfile(&dir, &file) == -1)
-                {
-                    // Error getting file
-                    break;
-                }
-                std::string filepath = file.path;
-
-                if (strcmp(file.name, ".") != 0 && strcmp(file.name, "..") != 0)
-                {
-                    if (file.is_dir)
-                        filepath.push_back('/');
-
-                    files.push_back(std::move(filepath));
-                }
-
-                if (tinydir_next(&dir) == -1)
-                {
-                    // Error getting next file
-                    break;
-                }
-            }
-        }
-        tinydir_close(&dir);
-    }
-    return files;
-}
-
-void FileUtils::listFilesRecursively(const std::string& dirPath, std::vector<std::string>* files) const
-{
-    std::string fullpath = fullPathForDirectory(dirPath);
-    if (isDirectoryExist(fullpath))
-    {
-        tinydir_dir dir;
-        std::string fullpathstr = fullpath;
-
-        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
-        {
-            while (dir.has_next)
-            {
-                tinydir_file file;
-                if (tinydir_readfile(&dir, &file) == -1)
-                {
-                    // Error getting file
-                    break;
-                }
-
-                if (strcmp(file.name, ".") != 0 && strcmp(file.name, "..") != 0)
-                {
-                    std::string filepath = file.path;
-                    if (file.is_dir)
-                    {
-                        filepath.push_back('/');
-                        files->push_back(filepath);
-                        listFilesRecursively(filepath, files);
-                    }
-                    else
-                    {
-                        files->push_back(std::move(filepath));
-                    }
-                }
-
-                if (tinydir_next(&dir) == -1)
-                {
-                    // Error getting next file
-                    break;
-                }
-            }
-        }
-        tinydir_close(&dir);
-    }
-}
-
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -1483,7 +1589,7 @@ bool FileUtils::isPopupNotify() const
     return s_popupNotify;
 }
 
-std::string FileUtils::getFileExtension(const std::string& filePath) const
+std::string FileUtils::getFileExtension(std::string_view filePath) const
 {
     std::string fileExtension;
     size_t pos = filePath.find_last_of('.');
@@ -1497,16 +1603,16 @@ std::string FileUtils::getFileExtension(const std::string& filePath) const
     return fileExtension;
 }
 
-std::string FileUtils::getFileShortName(const std::string& filePath)
+std::string FileUtils::getFileShortName(std::string_view filePath)
 {
-    std::string fileExtension;
+    // std::string fileExtension;
     size_t pos = filePath.find_last_of("/\\");
     if (pos != std::string::npos)
     {
-        return filePath.substr(pos + 1);
+        return std::string{filePath.substr(pos + 1)};
     }
 
-    return filePath;
+    return std::string{filePath};
 }
 
 void FileUtils::valueMapCompact(ValueMap& /*valueMap*/) const {}
diff --git a/cocos/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h
index 3376b9035d7f..0e82201e78f2 100644
--- a/cocos/platform/CCFileUtils.h
+++ b/cocos/platform/CCFileUtils.h
@@ -157,7 +157,7 @@ class CC_DLL FileUtils
     /**
      *  Gets string from a file.
      */
-    virtual std::string getStringFromFile(const std::string& filename) const;
+    virtual std::string getStringFromFile(std::string_view filename) const;
 
     /**
      * Gets string from a file, async off the main cocos thread
@@ -166,13 +166,13 @@ class CC_DLL FileUtils
      * @param callback Function that will be called when file is read. Will be called
      * on the main cocos thread.
      */
-    virtual void getStringFromFile(const std::string& path, std::function<void(std::string)> callback) const;
+    virtual void getStringFromFile(std::string_view path, std::function<void(std::string)> callback) const;
 
     /**
      *  Creates binary data from a file.
      *  @return A data object.
      */
-    virtual Data getDataFromFile(const std::string& filename) const;
+    virtual Data getDataFromFile(std::string_view filename) const;
 
     /**
      * Gets a binary data object from a file, async off the main cocos thread.
@@ -181,7 +181,7 @@ class CC_DLL FileUtils
      * @param callback Function that will be called when file is read. Will be called
      * on the main cocos thread.
      */
-    virtual void getDataFromFile(const std::string& filename, std::function<void(Data)> callback) const;
+    virtual void getDataFromFile(std::string_view filename, std::function<void(Data)> callback) const;
 
     enum class Status
     {
@@ -255,12 +255,12 @@ class CC_DLL FileUtils
     template <typename T,
               typename Enable =
                   typename std::enable_if<std::is_base_of<ResizableBuffer, ResizableBufferAdapter<T>>::value>::type>
-    Status getContents(const std::string& filename, T* buffer) const
+    Status getContents(std::string_view filename, T* buffer) const
     {
         ResizableBufferAdapter<T> buf(buffer);
         return getContents(filename, &buf);
     }
-    virtual Status getContents(const std::string& filename, ResizableBuffer* buffer) const;
+    virtual Status getContents(std::string_view filename, ResizableBuffer* buffer) const;
 
     /** Returns the fullpath for a given filename.
 
@@ -310,7 +310,7 @@ class CC_DLL FileUtils
 
      @since v2.1
      */
-    virtual std::string fullPathForFilename(const std::string& filename) const;
+    virtual std::string fullPathForFilename(std::string_view filename) const;
 
     /**
      * Loads the filenameLookup dictionary from the contents of a filename.
@@ -345,7 +345,7 @@ class CC_DLL FileUtils
      * @js loadFilenameLookup
      * @lua loadFilenameLookup
      */
-    virtual void loadFilenameLookupDictionaryFromFile(const std::string& filename);
+    virtual void loadFilenameLookupDictionaryFromFile(std::string_view filename);
 
     /**
      *  Sets the filenameLookup dictionary.
@@ -365,7 +365,7 @@ class CC_DLL FileUtils
      * dictionary. )
      *
      */
-    virtual std::string fullPathFromRelativeFile(const std::string& filename, const std::string& relativeFile) const;
+    virtual std::string fullPathFromRelativeFile(std::string_view filename, std::string_view relativeFile) const;
 
     /**
      *  Sets the array that contains the search order of the resources.
@@ -384,7 +384,7 @@ class CC_DLL FileUtils
      * @see setSearchResolutionsOrder(), fullPathForFilename().
      * @since v2.1
      */
-    virtual void addSearchResolutionsOrder(const std::string& order, const bool front = false);
+    virtual void addSearchResolutionsOrder(std::string_view order, const bool front = false);
 
     /**
      *  Gets the array that contains the search order of the resources.
@@ -424,14 +424,14 @@ class CC_DLL FileUtils
     /**
      * Set default resource root path.
      */
-    void setDefaultResourceRootPath(const std::string& path);
+    void setDefaultResourceRootPath(std::string_view path);
 
     /**
      * Add search path.
      *
      * @since v2.1
      */
-    void addSearchPath(const std::string& path, const bool front = false);
+    void addSearchPath(std::string_view path, const bool front = false);
 
     /**
      *  Gets the array of search paths.
@@ -468,7 +468,7 @@ class CC_DLL FileUtils
     /**
      *  Sets writable path.
      */
-    virtual void setWritablePath(const std::string& writablePath);
+    virtual void setWritablePath(std::string_view writablePath);
 
     /**
      *  Sets whether to pop-up a message box when failed to load an image.
@@ -486,7 +486,7 @@ class CC_DLL FileUtils
      *  @return ValueMap of the file contents.
      *  @note This method is used internally.
      */
-    virtual ValueMap getValueMapFromFile(const std::string& filename) const;
+    virtual ValueMap getValueMapFromFile(std::string_view filename) const;
 
     /** Converts the contents of a file to a ValueMap.
      *  This method is used internally.
@@ -500,7 +500,7 @@ class CC_DLL FileUtils
      *@param fullPath The full path to the file you want to save a string
      *@return bool
      */
-    virtual bool writeToFile(const ValueMap& dict, const std::string& fullPath) const;
+    virtual bool writeToFile(const ValueMap& dict, std::string_view fullPath) const;
 
     /**
      *  write a string into a file
@@ -509,7 +509,7 @@ class CC_DLL FileUtils
      * @param fullPath The full path to the file you want to save a string
      * @return bool True if write success
      */
-    virtual bool writeStringToFile(const std::string& dataStr, const std::string& fullPath) const;
+    virtual bool writeStringToFile(std::string_view dataStr, std::string_view fullPath) const;
 
     /**
      * Write a string to a file, done async off the main cocos thread
@@ -525,7 +525,7 @@ class CC_DLL FileUtils
      * signifying if the write was successful.
      */
     virtual void writeStringToFile(std::string dataStr,
-                                   const std::string& fullPath,
+                                   std::string_view fullPath,
                                    std::function<void(bool)> callback) const;
 
     /**
@@ -535,12 +535,12 @@ class CC_DLL FileUtils
      *@param fullPath The full path to the file you want to save a string
      *@return bool
      */
-    virtual bool writeDataToFile(const Data& data, const std::string& fullPath) const;
+    virtual bool writeDataToFile(const Data& data, std::string_view fullPath) const;
 
     /**
      * save data to file
      */
-    static bool writeBinaryToFile(const void* data, size_t dataSize, const std::string& fullPath);
+    static bool writeBinaryToFile(const void* data, size_t dataSize, std::string_view fullPath);
 
     /**
      * Write Data into a file, done async off the main cocos thread.
@@ -556,7 +556,7 @@ class CC_DLL FileUtils
      * function will be executed on the main cocos thread. It will have on boolean argument
      * signifying if the write was successful.
      */
-    virtual void writeDataToFile(Data data, const std::string& fullPath, std::function<void(bool)> callback) const;
+    virtual void writeDataToFile(Data data, std::string_view fullPath, std::function<void(bool)> callback) const;
 
     /**
      * write ValueMap into a plist file
@@ -565,7 +565,7 @@ class CC_DLL FileUtils
      *@param fullPath The full path to the file you want to save a string
      *@return bool
      */
-    virtual bool writeValueMapToFile(const ValueMap& dict, const std::string& fullPath) const;
+    virtual bool writeValueMapToFile(const ValueMap& dict, std::string_view fullPath) const;
 
     /**
      * Write a ValueMap into a file, done async off the main cocos thread.
@@ -582,7 +582,7 @@ class CC_DLL FileUtils
      * signifying if the write was successful.
      */
     virtual void writeValueMapToFile(ValueMap dict,
-                                     const std::string& fullPath,
+                                     std::string_view fullPath,
                                      std::function<void(bool)> callback) const;
 
     /**
@@ -592,7 +592,7 @@ class CC_DLL FileUtils
      *@param fullPath The full path to the file you want to save a string
      *@return bool
      */
-    virtual bool writeValueVectorToFile(const ValueVector& vecData, const std::string& fullPath) const;
+    virtual bool writeValueVectorToFile(const ValueVector& vecData, std::string_view fullPath) const;
 
     /**
      * Write a ValueVector into a file, done async off the main cocos thread.
@@ -609,12 +609,12 @@ class CC_DLL FileUtils
      * signifying if the write was successful.
      */
     virtual void writeValueVectorToFile(ValueVector vecData,
-                                        const std::string& fullPath,
+                                        std::string_view fullPath,
                                         std::function<void(bool)> callback) const;
 
     // Converts the contents of a file to a ValueVector.
     // This method is used internally.
-    virtual ValueVector getValueVectorFromFile(const std::string& filename) const;
+    virtual ValueVector getValueVectorFromFile(std::string_view filename) const;
 
     /**
      *  Checks whether a file exists.
@@ -623,7 +623,7 @@ class CC_DLL FileUtils
      *  @param filename The path of the file, it could be a relative or absolute path.
      *  @return True if the file exists, false if not.
      */
-    virtual bool isFileExist(const std::string& filename) const;
+    virtual bool isFileExist(std::string_view filename) const;
 
     /**
      * Checks if a file exists, done async off the main cocos thread.
@@ -635,7 +635,7 @@ class CC_DLL FileUtils
      *  @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the file exists, false otherwise.
      */
-    virtual void isFileExist(const std::string& filename, std::function<void(bool)> callback) const;
+    virtual void isFileExist(std::string_view filename, std::function<void(bool)> callback) const;
 
     /**
      *  Gets filename extension is a suffix (separated from the base filename by a dot) in lower case.
@@ -643,14 +643,14 @@ class CC_DLL FileUtils
      *  @param filePath The path of the file, it could be a relative or absolute path.
      *  @return suffix for filename in lower case or empty if a dot not found.
      */
-    virtual std::string getFileExtension(const std::string& filePath) const;
+    virtual std::string getFileExtension(std::string_view filePath) const;
 
     /**
      *  Gets filename shotName
      *  @param filePath The path of the file, it could be a relative or absolute path.
      *  @return fileName.Extension without path
      */
-    static std::string getFileShortName(const std::string& filePath);
+    static std::string getFileShortName(std::string_view filePath);
 
     /**
      *  Checks whether the path is an absolute path.
@@ -661,9 +661,9 @@ class CC_DLL FileUtils
      *  @param path The path that needs to be checked.
      *  @return True if it's an absolute path, false if not.
      */
-    virtual bool isAbsolutePath(const std::string& path) const;
+    virtual bool isAbsolutePath(std::string_view path) const;
 
-    static bool isAbsolutePathInternal(const std::string& path);
+    static bool isAbsolutePathInternal(std::string_view path);
 
     /**
      *  Checks whether the path is a directory.
@@ -671,7 +671,7 @@ class CC_DLL FileUtils
      *  @param dirPath The path of the directory, it could be a relative or an absolute path.
      *  @return True if the directory exists, false if not.
      */
-    virtual bool isDirectoryExist(const std::string& dirPath) const;
+    virtual bool isDirectoryExist(std::string_view dirPath) const;
 
     /**
      *  Checks whether the absoulate path is a directory, async off of the main cocos thread.
@@ -680,7 +680,7 @@ class CC_DLL FileUtils
      * @param callback that will accept a boolean, true if the file exists, false otherwise.
      * Callback will happen on the main cocos thread.
      */
-    virtual void isDirectoryExist(const std::string& fullPath, std::function<void(bool)> callback) const;
+    virtual void isDirectoryExist(std::string_view fullPath, std::function<void(bool)> callback) const;
 
     /**
      *  Creates a directory.
@@ -688,7 +688,7 @@ class CC_DLL FileUtils
      *  @param dirPath The path of the directory, it must be an absolute path.
      *  @return True if the directory have been created successfully, false if not.
      */
-    virtual bool createDirectory(const std::string& dirPath) const;
+    virtual bool createDirectory(std::string_view dirPath) const;
 
     /**
      * Create a directory, async off the main cocos thread.
@@ -697,7 +697,7 @@ class CC_DLL FileUtils
      * @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the directory was successfully, false otherwise.
      */
-    virtual void createDirectory(const std::string& dirPath, std::function<void(bool)> callback) const;
+    virtual void createDirectory(std::string_view dirPath, std::function<void(bool)> callback) const;
 
     /**
      *  Removes a directory.
@@ -705,7 +705,7 @@ class CC_DLL FileUtils
      *  @param dirPath  The full path of the directory, it must be an absolute path.
      *  @return True if the directory have been removed successfully, false if not.
      */
-    virtual bool removeDirectory(const std::string& dirPath) const;
+    virtual bool removeDirectory(std::string_view dirPath) const;
 
     /**
      * Removes a directory, async off the main cocos thread.
@@ -714,7 +714,7 @@ class CC_DLL FileUtils
      * @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the directory was successfully removed, false otherwise.
      */
-    virtual void removeDirectory(const std::string& dirPath, std::function<void(bool)> callback) const;
+    virtual void removeDirectory(std::string_view dirPath, std::function<void(bool)> callback) const;
 
     /**
      *  Removes a file.
@@ -722,7 +722,7 @@ class CC_DLL FileUtils
      *  @param filepath The full path of the file, it must be an absolute path.
      *  @return True if the file have been removed successfully, false if not.
      */
-    virtual bool removeFile(const std::string& filepath) const;
+    virtual bool removeFile(std::string_view filepath) const;
 
     /**
      * Removes a file, async off the main cocos thread.
@@ -731,7 +731,7 @@ class CC_DLL FileUtils
      * @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the file was successfully removed, false otherwise.
      */
-    virtual void removeFile(const std::string& filepath, std::function<void(bool)> callback) const;
+    virtual void removeFile(std::string_view filepath, std::function<void(bool)> callback) const;
 
     /**
      *  Renames a file under the given directory.
@@ -741,7 +741,7 @@ class CC_DLL FileUtils
      *  @param name     The new name of the file.
      *  @return True if the file have been renamed successfully, false if not.
      */
-    virtual bool renameFile(const std::string& path, const std::string& oldname, const std::string& name) const;
+    virtual bool renameFile(std::string_view path, std::string_view oldname, std::string_view name) const;
 
     /**
      *  Renames a file under the given directory, async off the main cocos thread.
@@ -752,9 +752,9 @@ class CC_DLL FileUtils
      *  @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the file was successfully renamed, false otherwise.
      */
-    virtual void renameFile(const std::string& path,
-                            const std::string& oldname,
-                            const std::string& name,
+    virtual void renameFile(std::string_view path,
+                            std::string_view oldname,
+                            std::string_view name,
                             std::function<void(bool)> callback) const;
 
     /**
@@ -764,7 +764,7 @@ class CC_DLL FileUtils
      *  @param newfullpath  The new fullpath of the file. Includes path and name.
      *  @return True if the file have been renamed successfully, false if not.
      */
-    virtual bool renameFile(const std::string& oldfullpath, const std::string& newfullpath) const;
+    virtual bool renameFile(std::string_view oldfullpath, std::string_view newfullpath) const;
 
     /**
      *  Renames a file under the given directory, async off the main cocos thread.
@@ -774,8 +774,8 @@ class CC_DLL FileUtils
      *  @param callback The function that will be called when the operation is complete. Will have one boolean
      * argument, true if the file was successfully renamed, false otherwise.
      */
-    virtual void renameFile(const std::string& oldfullpath,
-                            const std::string& newfullpath,
+    virtual void renameFile(std::string_view oldfullpath,
+                            std::string_view newfullpath,
                             std::function<void(bool)> callback) const;
 
     /**
@@ -785,7 +785,7 @@ class CC_DLL FileUtils
      *  @param filepath The path of the file, it could be a relative or absolute path.
      *  @return The file size.
      */
-    virtual int64_t getFileSize(const std::string& filepath) const;
+    virtual int64_t getFileSize(std::string_view filepath) const;
 
     /**
      *  Retrieve the file size, async off the main cocos thread.
@@ -795,7 +795,7 @@ class CC_DLL FileUtils
      *  @param callback The function that will be called when the operation is complete. Will have one long
      * argument, the file size.
      */
-    virtual void getFileSize(const std::string& filepath, std::function<void(int64_t)> callback) const;
+    virtual void getFileSize(std::string_view filepath, std::function<void(int64_t)> callback) const;
 
     /**
      *  List all files in a directory.
@@ -803,7 +803,7 @@ class CC_DLL FileUtils
      *  @param dirPath The path of the directory, it could be a relative or an absolute path.
      *  @return File paths in a string vector
      */
-    virtual std::vector<std::string> listFiles(const std::string& dirPath) const;
+    virtual std::vector<std::string> listFiles(std::string_view dirPath) const;
 
     /**
      * List all files in a directory async, off of the main cocos thread.
@@ -814,8 +814,7 @@ class CC_DLL FileUtils
      * @js NA
      * @lua NA
      */
-    virtual void listFilesAsync(const std::string& dirPath,
-                                std::function<void(std::vector<std::string>)> callback) const;
+    virtual void listFilesAsync(std::string_view dirPath, std::function<void(std::vector<std::string>)> callback) const;
 
     /**
      *  List all files recursively in a directory.
@@ -823,7 +822,7 @@ class CC_DLL FileUtils
      *  @param dirPath The path of the directory, it could be a relative or an absolute path.
      *  @return File paths in a string vector
      */
-    virtual void listFilesRecursively(const std::string& dirPath, std::vector<std::string>* files) const;
+    virtual void listFilesRecursively(std::string_view dirPath, std::vector<std::string>* files) const;
 
     /**
      *  List all files recursively in a directory, async off the main cocos thread.
@@ -834,11 +833,11 @@ class CC_DLL FileUtils
      * @js NA
      * @lua NA
      */
-    virtual void listFilesRecursivelyAsync(const std::string& dirPath,
+    virtual void listFilesRecursivelyAsync(std::string_view dirPath,
                                            std::function<void(std::vector<std::string>)> callback) const;
 
     /** Returns the full path cache. */
-    const std::unordered_map<std::string, std::string> getFullPathCache() const { return _fullPathCache; }
+    const hlookup::string_map<std::string> getFullPathCache() const { return _fullPathCache; }
 
     /**
      *  Gets the new filename from the filename lookup dictionary.
@@ -847,21 +846,21 @@ class CC_DLL FileUtils
      *  @return The new filename after searching in the filename lookup dictionary.
      *          If the original filename wasn't in the dictionary, it will return the original filename.
      */
-    virtual std::string getNewFilename(const std::string& filename) const;
+    virtual std::string getNewFilename(std::string_view filename) const;
 
     /**
      *  Checks whether a file exists without considering search paths and resolution orders.
      *  @param filename The file (with absolute path) to look up for
      *  @return Returns true if the file found at the given absolute path, otherwise returns false
      */
-    virtual bool isFileExistInternal(const std::string& filename) const = 0;
+    virtual bool isFileExistInternal(std::string_view filename) const = 0;
 
     /**
      *  Checks whether a directory exists without considering search paths and resolution orders.
      *  @param dirPath The directory (with absolute path) to look up for
      *  @return Returns true if the directory found at the given absolute path, otherwise returns false
      */
-    virtual bool isDirectoryExistInternal(const std::string& dirPath) const;
+    virtual bool isDirectoryExistInternal(std::string_view dirPath) const;
 
     /**
      *  Open a FileStream based on the implementation provided in openFileStream or its overrides
@@ -869,7 +868,7 @@ class CC_DLL FileUtils
      *  @param mode The mode to open the file in, being READ | WRITE | APPEND
      *  @return Returns a pointer to the file stream
      */
-    virtual std::unique_ptr<FileStream> openFileStream(const std::string& filePath, FileStream::Mode mode);
+    virtual std::unique_ptr<FileStream> openFileStream(std::string_view filePath, FileStream::Mode mode);
 
 protected:
     /**
@@ -897,13 +896,13 @@ class CC_DLL FileUtils
      *  @param searchPath The search path.
      *  @return The full path of the file. It will return an empty string if the full path of the file doesn't exist.
      */
-    virtual std::string getPathForFilename(const std::string& filename,
-                                           const std::string& resolutionDirectory,
-                                           const std::string& searchPath) const;
+    virtual std::string getPathForFilename(std::string_view filename,
+                                           std::string_view resolutionDirectory,
+                                           std::string_view searchPath) const;
 
-    virtual std::string getPathForDirectory(const std::string& dir,
-                                            const std::string& resolutionDiretory,
-                                            const std::string& searchPath) const;
+    virtual std::string getPathForDirectory(std::string_view dir,
+                                            std::string_view resolutionDiretory,
+                                            std::string_view searchPath) const;
 
     /**
      *  Gets full path for the directory and the filename.
@@ -915,14 +914,14 @@ class CC_DLL FileUtils
      *  @param filename  The name of the file.
      *  @return The full path of the file, if the file can't be found, it will return an empty string.
      */
-    virtual std::string getFullPathForFilenameWithinDirectory(const std::string& directory,
-                                                              const std::string& filename) const;
+    virtual std::string getFullPathForFilenameWithinDirectory(std::string_view directory,
+                                                              std::string_view filename) const;
 
     /**
      * Returns the fullpath for a given dirname.
      * @since 3.17.1
      */
-    virtual std::string fullPathForDirectory(const std::string& dirname) const;
+    virtual std::string fullPathForDirectory(std::string_view dirname) const;
 
     /**
      * mutex used to protect fields.
@@ -968,13 +967,13 @@ class CC_DLL FileUtils
      *  The full path cache for normal files. When a file is found, it will be added into this cache.
      *  This variable is used for improving the performance of file search.
      */
-    mutable std::unordered_map<std::string, std::string> _fullPathCache;
+    mutable hlookup::string_map<std::string> _fullPathCache;
 
     /**
      *  The full path cache for directories. When a diretory is found, it will be added into this cache.
      *  This variable is used for improving the performance of file search.
      */
-    mutable std::unordered_map<std::string, std::string> _fullPathCacheDir;
+    mutable hlookup::string_map<std::string> _fullPathCacheDir;
 
     /**
      * Writable path.
diff --git a/cocos/platform/CCGLView.cpp b/cocos/platform/CCGLView.cpp
index 5c8494362ae9..7ee97868afbf 100644
--- a/cocos/platform/CCGLView.cpp
+++ b/cocos/platform/CCGLView.cpp
@@ -279,12 +279,12 @@ Rect GLView::getScissorRect() const
     return Rect(x, y, w, h);
 }
 
-void GLView::setViewName(const std::string& viewname)
+void GLView::setViewName(std::string_view viewname)
 {
     _viewName = viewname;
 }
 
-const std::string& GLView::getViewName() const
+std::string_view GLView::getViewName() const
 {
     return _viewName;
 }
diff --git a/cocos/platform/CCGLView.h b/cocos/platform/CCGLView.h
index 6cd6c1568b77..f5bbc43547f6 100644
--- a/cocos/platform/CCGLView.h
+++ b/cocos/platform/CCGLView.h
@@ -308,13 +308,13 @@ class CC_DLL GLView : public Ref
      *
      * @param viewname A string will be set to the view as name.
      */
-    virtual void setViewName(const std::string& viewname);
+    virtual void setViewName(std::string_view viewname);
 
     /** Get the view name.
      *
      * @return The view name.
      */
-    const std::string& getViewName() const;
+    std::string_view getViewName() const;
 
     /** Touch events are handled by default; if you want to customize your handlers, please override this function.
      *
@@ -367,14 +367,14 @@ class CC_DLL GLView : public Ref
      *
      * @param filename A path to image file, e.g., "icons/cusom.png".
      */
-    virtual void setIcon(const std::string& filename) const {};
+    virtual void setIcon(std::string_view filename) const {};
 
     /** Set window icon (implemented for windows and linux).
      * Best icon (based on size) will be auto selected.
      *
      * @param filelist The array contains icons.
      */
-    virtual void setIcon(const std::vector<std::string>& filelist) const {};
+    virtual void setIcon(const std::vector<std::string_view>& filelist) const {};
 
     /** Set default window icon (implemented for windows and linux).
      * On windows it will use icon from .exe file (if included).
diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp
index 6f2340a153da..7296355cae2b 100644
--- a/cocos/platform/CCImage.cpp
+++ b/cocos/platform/CCImage.cpp
@@ -601,7 +601,7 @@ Image::~Image()
     }
 }
 
-bool Image::initWithImageFile(const std::string& path)
+bool Image::initWithImageFile(std::string_view path)
 {
     bool ret  = false;
     _filePath = FileUtils::getInstance()->fullPathForFilename(path);
@@ -618,7 +618,7 @@ bool Image::initWithImageFile(const std::string& path)
     return ret;
 }
 
-bool Image::initWithImageFileThreadSafe(const std::string& fullpath)
+bool Image::initWithImageFileThreadSafe(std::string_view fullpath)
 {
     bool ret  = false;
     _filePath = fullpath;
@@ -2193,7 +2193,7 @@ void Image::forwardPixels(uint8_t* data, ssize_t dataLen, int offset, bool ownDa
 }
 
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS)
-bool Image::saveToFile(const std::string& filename, bool isToRGB)
+bool Image::saveToFile(std::string_view filename, bool isToRGB)
 {
     // only support for backend::PixelFormat::RGB8 or backend::PixelFormat::RGBA8 uncompressed data
     if (isCompressed() || (_pixelFormat != backend::PixelFormat::RGB8 && _pixelFormat != backend::PixelFormat::RGBA8))
@@ -2216,13 +2216,13 @@ bool Image::saveToFile(const std::string& filename, bool isToRGB)
     }
     else
     {
-        CCLOG("cocos2d: Image: saveToFile no support file extension(only .png or .jpg) for file: %s", filename.c_str());
+        CCLOG("cocos2d: Image: saveToFile no support file extension(only .png or .jpg) for file: %s", filename.data());
         return false;
     }
 }
 #endif
 
-bool Image::saveImageToPNG(const std::string& filePath, bool isToRGB)
+bool Image::saveImageToPNG(std::string_view filePath, bool isToRGB)
 {
 #if CC_USE_PNG
     bool ret = false;
@@ -2365,7 +2365,7 @@ bool Image::saveImageToPNG(const std::string& filePath, bool isToRGB)
 #endif  // CC_USE_PNG
 }
 
-bool Image::saveImageToJPG(const std::string& filePath)
+bool Image::saveImageToJPG(std::string_view filePath)
 {
 #if CC_USE_JPEG
     bool ret = false;
diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h
index 3466dbe61744..ae1adc4ff3b9 100644
--- a/cocos/platform/CCImage.h
+++ b/cocos/platform/CCImage.h
@@ -148,7 +148,7 @@ class CC_DLL Image : public Ref
     @param path   the absolute file path.
     @return true if loaded correctly.
     */
-    bool initWithImageFile(const std::string& path);
+    bool initWithImageFile(std::string_view path);
 
     /**
     @brief Load image from stream buffer.
@@ -191,7 +191,7 @@ class CC_DLL Image : public Ref
      @param    filePath        the file's absolute path, including file suffix.
      @param    isToRGB        whether the image is saved as RGB format.
      */
-    bool saveToFile(const std::string& filename, bool isToRGB = true);
+    bool saveToFile(std::string_view filename, bool isToRGB = true);
     void premultiplyAlpha();
     void reversePremultipliedAlpha();
 
@@ -218,8 +218,8 @@ class CC_DLL Image : public Ref
     // fast forward pixels to GPU if ownData
     void forwardPixels(uint8_t* data, ssize_t dataLen, int offset, bool ownData);
 
-    bool saveImageToPNG(const std::string& filePath, bool isToRGB = true);
-    bool saveImageToJPG(const std::string& filePath);
+    bool saveImageToPNG(std::string_view filePath, bool isToRGB = true);
+    bool saveImageToJPG(std::string_view filePath);
 
 protected:
     /**
@@ -259,7 +259,7 @@ class CC_DLL Image : public Ref
      @param imageType the type of image, currently only supporting two types.
      @return  true if loaded correctly.
      */
-    bool initWithImageFileThreadSafe(const std::string& fullpath);
+    bool initWithImageFileThreadSafe(std::string_view fullpath);
 
     Format detectFormat(const uint8_t* data, ssize_t dataLen);
     bool isPng(const uint8_t* data, ssize_t dataLen);
diff --git a/cocos/platform/CCPlatformMacros.h b/cocos/platform/CCPlatformMacros.h
index 4f2a33e3e028..b8a6516c14d6 100644
--- a/cocos/platform/CCPlatformMacros.h
+++ b/cocos/platform/CCPlatformMacros.h
@@ -32,6 +32,7 @@ Copyright (c) 2021 Bytedance Inc.
  * Define some platform specific macros.
  */
 #include "base/ccConfig.h"
+#include "base/hlookup.h"
 #include "platform/CCPlatformConfig.h"
 #include "platform/CCPlatformDefine.h"
 
diff --git a/cocos/platform/CCPosixFileStream.cpp b/cocos/platform/CCPosixFileStream.cpp
index 6606cc594ceb..cdf1f76bee94 100644
--- a/cocos/platform/CCPosixFileStream.cpp
+++ b/cocos/platform/CCPosixFileStream.cpp
@@ -19,7 +19,7 @@ struct PXIoF
     long long (*size)(PXFileHandle& handle);
 };
 
-static int pfs_posix_open(const std::string& path, FileStream::Mode mode, PXFileHandle& handle)
+static int pfs_posix_open(std::string_view path, FileStream::Mode mode, PXFileHandle& handle)
 {
     switch (mode)
     {
@@ -127,7 +127,7 @@ PosixFileStream::~PosixFileStream()
     internalClose();
 }
 
-bool PosixFileStream::open(const std::string& path, FileStream::Mode mode)
+bool PosixFileStream::open(std::string_view path, FileStream::Mode mode)
 {
     bool ok = false;
 #if CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
diff --git a/cocos/platform/CCPosixFileStream.h b/cocos/platform/CCPosixFileStream.h
index 183f6d5dea43..02b668a616ce 100644
--- a/cocos/platform/CCPosixFileStream.h
+++ b/cocos/platform/CCPosixFileStream.h
@@ -54,7 +54,7 @@
 #    define O_APPEND_FLAGS O_APPEND | O_CREAT | O_RDWR, S_IRWXU
 
 #    define O_OVERLAP_FLAGS O_CREAT | O_RDWR, S_IRWXU
-#    define posix_open_cxx(path, ...) ::open(path.c_str(), ##__VA_ARGS__)
+#    define posix_open_cxx(path, ...) ::open(path.data(), ##__VA_ARGS__)
 #    define posix_open ::open
 #    define posix_close ::close
 #    define posix_lseek ::lseek
@@ -114,7 +114,7 @@ class CC_DLL PosixFileStream : public FileStream
         APPEND,
     };
 
-    bool open(const std::string& path, FileStream::Mode mode) override;
+    bool open(std::string_view path, FileStream::Mode mode) override;
     int close() override;
 
     int seek(int64_t offset, int origin) override;
diff --git a/cocos/platform/CCSAXParser.cpp b/cocos/platform/CCSAXParser.cpp
index 2629c6a856df..7af489f71f43 100644
--- a/cocos/platform/CCSAXParser.cpp
+++ b/cocos/platform/CCSAXParser.cpp
@@ -108,7 +108,7 @@ bool SAXParser::parse(const char* xmlData, size_t dataLength)
     return false;
 }
 
-bool SAXParser::parse(const std::string& filename)
+bool SAXParser::parse(std::string_view filename)
 {
     bool ret  = false;
     Data data = FileUtils::getInstance()->getDataFromFile(filename);
diff --git a/cocos/platform/CCSAXParser.h b/cocos/platform/CCSAXParser.h
index 7b948fc0711b..ecb4c7bbe5f5 100644
--- a/cocos/platform/CCSAXParser.h
+++ b/cocos/platform/CCSAXParser.h
@@ -90,7 +90,7 @@ class CC_DLL SAXParser
      * @js NA
      * @lua NA
      */
-    bool parse(const std::string& filename);
+    bool parse(std::string_view filename);
 
     /**
      * New API for performance.
diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt
index c91d63fdd5cf..1b60199c7b56 100644
--- a/cocos/platform/CMakeLists.txt
+++ b/cocos/platform/CMakeLists.txt
@@ -30,6 +30,14 @@ if(ANDROID)
         platform/android/CCGLViewImpl-android.cpp
         platform/android/CCFileUtils-android.cpp
         platform/android/CCEnhanceAPI-android.cpp
+        platform/android/CCDevice-android.cpp
+        platform/android/javaactivity-android.cpp
+        platform/android/jni/JniHelper.cpp
+        platform/android/jni/TouchesJni.cpp
+        platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp
+        platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
+        platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
+        platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
     )
 elseif(WINDOWS)
     set(COCOS_PLATFORM_SPECIFIC_HEADER
diff --git a/cocos/platform/android/CCApplication-android.cpp b/cocos/platform/android/CCApplication-android.cpp
index 08809fb6d7ad..16927d40d5c7 100644
--- a/cocos/platform/android/CCApplication-android.cpp
+++ b/cocos/platform/android/CCApplication-android.cpp
@@ -43,7 +43,7 @@ extern "C" size_t __ctype_get_mb_cur_max(void)
 }
 #endif
 
-static const std::string helperClassName = "org.cocos2dx.lib.Cocos2dxHelper";
+static const char* helperClassName = "org.cocos2dx.lib.Cocos2dxHelper";
 
 NS_CC_BEGIN
 
@@ -119,7 +119,7 @@ std::string Application::getVersion()
     return JniHelper::callStaticStringMethod(helperClassName, "getVersion");
 }
 
-bool Application::openURL(const std::string& url)
+bool Application::openURL(std::string_view url)
 {
     return JniHelper::callStaticBooleanMethod(helperClassName, "openURL", url);
 }
diff --git a/cocos/platform/android/CCApplication-android.h b/cocos/platform/android/CCApplication-android.h
index 42cf2dc28721..71f0e2146eee 100644
--- a/cocos/platform/android/CCApplication-android.h
+++ b/cocos/platform/android/CCApplication-android.h
@@ -90,7 +90,7 @@ class CC_DLL Application : public ApplicationProtocol
      @param String with url to open.
      @return true if the resource located by the URL was successfully opened; otherwise false.
      */
-    virtual bool openURL(const std::string& url) override;
+    virtual bool openURL(std::string_view url) override;
 
     /**
     @brief  This function will be called when the application screen size is changed.
diff --git a/cocos/platform/android/CCDevice-android.cpp b/cocos/platform/android/CCDevice-android.cpp
index ebfda66eb062..e5e994fc3a3d 100644
--- a/cocos/platform/android/CCDevice-android.cpp
+++ b/cocos/platform/android/CCDevice-android.cpp
@@ -33,7 +33,7 @@ THE SOFTWARE.
 #include "platform/CCFileUtils.h"
 #include "yasio/cxx17/string_view.hpp"
 
-static const std::string helperClassName = "org.cocos2dx.lib.Cocos2dxHelper";
+static const char* helperClassName = "org.cocos2dx.lib.Cocos2dxHelper";
 
 NS_CC_BEGIN
 
diff --git a/cocos/platform/android/CCFileUtils-android.cpp b/cocos/platform/android/CCFileUtils-android.cpp
index dabb0a4148c1..e9ca5b5639a5 100644
--- a/cocos/platform/android/CCFileUtils-android.cpp
+++ b/cocos/platform/android/CCFileUtils-android.cpp
@@ -36,6 +36,8 @@ THE SOFTWARE.
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "yasio/cxx17/string_view.hpp"
+
 #define LOG_TAG "CCFileUtils-android.cpp"
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
@@ -103,7 +105,7 @@ bool FileUtilsAndroid::init()
     return FileUtils::init();
 }
 
-std::string FileUtilsAndroid::getNewFilename(const std::string& filename) const
+std::string FileUtilsAndroid::getNewFilename(std::string_view filename) const
 {
     std::string newFileName = FileUtils::getNewFilename(filename);
     // ../xxx do not fix this path
@@ -156,7 +158,7 @@ std::string FileUtilsAndroid::getNewFilename(const std::string& filename) const
     return newFileName;
 }
 
-bool FileUtilsAndroid::isFileExistInternal(const std::string& strFilePath) const
+bool FileUtilsAndroid::isFileExistInternal(std::string_view strFilePath) const
 {
 
     DECLARE_GUARD;
@@ -171,7 +173,7 @@ bool FileUtilsAndroid::isFileExistInternal(const std::string& strFilePath) const
     // Check whether file exists in apk.
     if (strFilePath[0] != '/')
     {
-        const char* s = strFilePath.c_str();
+        const char* s = strFilePath.data();
 
         // Found "assets/" at the beginning of the path and we don't want it
         if (strFilePath.find(_defaultResRootPath) == 0)
@@ -198,26 +200,30 @@ bool FileUtilsAndroid::isFileExistInternal(const std::string& strFilePath) const
     else
     {
         struct stat st;
-        if (::stat(strFilePath.c_str(), &st) == 0)
+        if (::stat(strFilePath.data(), &st) == 0)
             bFound = S_ISREG(st.st_mode);
     }
     return bFound;
 }
 
-bool FileUtilsAndroid::isDirectoryExistInternal(const std::string& dirPath) const
+bool FileUtilsAndroid::isDirectoryExistInternal(std::string_view dirPath) const
 {
     if (dirPath.empty())
     {
         return false;
     }
 
-    std::string dirPathCopy = dirPath;
-    if (dirPathCopy[dirPathCopy.length() - 1] == '/')
+    std::string_view path;
+    std::string dirPathCopy;
+    if (dirPath[dirPath.length() - 1] == '/')
     {
-        dirPathCopy.erase(dirPathCopy.length() - 1);
+        dirPathCopy.assign(dirPath.data(), dirPath.length() - 1);
+        path = dirPathCopy;
     }
+    else
+        path = dirPath;
 
-    const char* s = dirPathCopy.c_str();
+    const char* s = path.data();
 
     // find absolute path in flash memory
     if (s[0] == '/')
@@ -254,7 +260,7 @@ bool FileUtilsAndroid::isDirectoryExistInternal(const std::string& dirPath) cons
     return false;
 }
 
-bool FileUtilsAndroid::isAbsolutePath(const std::string& strPath) const
+bool FileUtilsAndroid::isAbsolutePath(std::string_view strPath) const
 {
     DECLARE_GUARD;
     // On Android, there are two situations for full path.
@@ -264,7 +270,7 @@ bool FileUtilsAndroid::isAbsolutePath(const std::string& strPath) const
     return (strPath[0] == '/' || strPath.find(_defaultResRootPath) == 0);
 }
 
-int64_t FileUtilsAndroid::getFileSize(const std::string& filepath) const
+int64_t FileUtilsAndroid::getFileSize(std::string_view filepath) const
 {
     DECLARE_GUARD;
     int64_t size = FileUtils::getFileSize(filepath);
@@ -275,13 +281,16 @@ int64_t FileUtilsAndroid::getFileSize(const std::string& filepath) const
 
     if (FileUtilsAndroid::assetmanager)
     {
-        string relativePath = filepath;
-        if (filepath.find(_defaultResRootPath) == 0)
+        std::string_view path;
+        std::string relativePath;
+        if (cxx20::starts_with(filepath, _defaultResRootPath))
         {
-            relativePath = filepath.substr(_defaultResRootPath.size());
+            path = relativePath = filepath.substr(_defaultResRootPath.size());
         }
+        else
+            path = filepath;
 
-        AAsset* asset = AAssetManager_open(FileUtilsAndroid::assetmanager, relativePath.data(), AASSET_MODE_UNKNOWN);
+        AAsset* asset = AAssetManager_open(FileUtilsAndroid::assetmanager, path.data(), AASSET_MODE_UNKNOWN);
         if (asset)
         {
             size = AAsset_getLength(asset);
@@ -292,7 +301,7 @@ int64_t FileUtilsAndroid::getFileSize(const std::string& filepath) const
     return size;
 }
 
-std::vector<std::string> FileUtilsAndroid::listFiles(const std::string& dirPath) const
+std::vector<std::string> FileUtilsAndroid::listFiles(std::string_view dirPath) const
 {
 
     if (!dirPath.empty() && dirPath[0] == '/')
@@ -347,7 +356,7 @@ std::vector<std::string> FileUtilsAndroid::listFiles(const std::string& dirPath)
     return fileList;
 }
 
-FileUtils::Status FileUtilsAndroid::getContents(const std::string& filename, ResizableBuffer* buffer) const
+FileUtils::Status FileUtilsAndroid::getContents(std::string_view filename, ResizableBuffer* buffer) const
 {
     static const std::string apkprefix("assets/");
     if (filename.empty())
diff --git a/cocos/platform/android/CCFileUtils-android.h b/cocos/platform/android/CCFileUtils-android.h
index 44ef3864fb32..fc3c6c8577f6 100644
--- a/cocos/platform/android/CCFileUtils-android.h
+++ b/cocos/platform/android/CCFileUtils-android.h
@@ -64,20 +64,20 @@ class CC_DLL FileUtilsAndroid : public FileUtils
     /* override functions */
     bool init() override;
 
-    virtual std::string getNewFilename(const std::string& filename) const override;
+    virtual std::string getNewFilename(std::string_view filename) const override;
 
-    virtual FileUtils::Status getContents(const std::string& filename, ResizableBuffer* buffer) const override;
+    virtual FileUtils::Status getContents(std::string_view filename, ResizableBuffer* buffer) const override;
 
     virtual std::string getWritablePath() const override;
     std::string getNativeWritableAbsolutePath() const override;
-    virtual bool isAbsolutePath(const std::string& strPath) const override;
+    virtual bool isAbsolutePath(std::string_view strPath) const override;
 
-    virtual int64_t getFileSize(const std::string& filepath) const override;
-    virtual std::vector<std::string> listFiles(const std::string& dirPath) const override;
+    virtual int64_t getFileSize(std::string_view filepath) const override;
+    virtual std::vector<std::string> listFiles(std::string_view dirPath) const override;
 
 private:
-    virtual bool isFileExistInternal(const std::string& strFilePath) const override;
-    virtual bool isDirectoryExistInternal(const std::string& dirPath) const override;
+    virtual bool isFileExistInternal(std::string_view strFilePath) const override;
+    virtual bool isDirectoryExistInternal(std::string_view dirPath) const override;
 
     static AAssetManager* assetmanager;
     static ZipFile* obbfile;
diff --git a/cocos/platform/android/CCGLViewImpl-android.cpp b/cocos/platform/android/CCGLViewImpl-android.cpp
index b09471431223..8a0ff6eb3c6b 100644
--- a/cocos/platform/android/CCGLViewImpl-android.cpp
+++ b/cocos/platform/android/CCGLViewImpl-android.cpp
@@ -50,7 +50,7 @@ void initExtensions()
 
 NS_CC_BEGIN
 
-GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor)
+GLViewImpl* GLViewImpl::createWithRect(std::string_view viewName, Rect rect, float frameZoomFactor)
 {
     auto ret = new GLViewImpl;
     if (ret && ret->initWithRect(viewName, rect, frameZoomFactor))
@@ -62,7 +62,7 @@ GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, f
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName)
+GLViewImpl* GLViewImpl::create(std::string_view viewName)
 {
     auto ret = new GLViewImpl;
     if (ret && ret->initWithFullScreen(viewName))
@@ -74,7 +74,7 @@ GLViewImpl* GLViewImpl::create(const std::string& viewName)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName)
 {
     auto ret = new GLViewImpl();
     if (ret && ret->initWithFullScreen(viewName))
@@ -93,12 +93,12 @@ GLViewImpl::GLViewImpl()
 
 GLViewImpl::~GLViewImpl() {}
 
-bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor)
+bool GLViewImpl::initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor)
 {
     return true;
 }
 
-bool GLViewImpl::initWithFullScreen(const std::string& viewName)
+bool GLViewImpl::initWithFullScreen(std::string_view viewName)
 {
     return true;
 }
diff --git a/cocos/platform/android/CCGLViewImpl-android.h b/cocos/platform/android/CCGLViewImpl-android.h
index 0f7e2d539bab..fc421309649c 100644
--- a/cocos/platform/android/CCGLViewImpl-android.h
+++ b/cocos/platform/android/CCGLViewImpl-android.h
@@ -35,9 +35,9 @@ class CC_DLL GLViewImpl : public GLView
 {
 public:
     // static function
-    static GLViewImpl* create(const std::string& viewname);
-    static GLViewImpl* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f);
-    static GLViewImpl* createWithFullScreen(const std::string& viewName);
+    static GLViewImpl* create(std::string_view viewname);
+    static GLViewImpl* createWithRect(std::string_view viewName, Rect rect, float frameZoomFactor = 1.0f);
+    static GLViewImpl* createWithFullScreen(std::string_view viewName);
 
     bool isOpenGLReady() override;
     void end() override;
@@ -49,8 +49,8 @@ class CC_DLL GLViewImpl : public GLView
     GLViewImpl();
     virtual ~GLViewImpl();
 
-    bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor);
-    bool initWithFullScreen(const std::string& viewName);
+    bool initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor);
+    bool initWithFullScreen(std::string_view viewName);
 };
 
 NS_CC_END
diff --git a/cocos/platform/android/CMakeLists.txt b/cocos/platform/android/CMakeLists.txt
deleted file mode 100644
index fb10db45a146..000000000000
--- a/cocos/platform/android/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# need to whole-archive this lib
-set(target_name cpp_android_spec)
-
-project(${target_name})
-
-set(${target_name}_src
-  CCDevice-android.cpp
-  javaactivity-android.cpp
-  jni/JniHelper.cpp
-  jni/TouchesJni.cpp
-  jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp
-  jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
-  jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
-  jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
-)
-
-add_library(${target_name} STATIC
-  ${${target_name}_src}
-)
-
-target_include_directories(${target_name}
-  PRIVATE ..
-  PRIVATE ../..
-  PRIVATE ../../../thirdparty
-)  
-
diff --git a/cocos/platform/android/javaactivity-android.cpp b/cocos/platform/android/javaactivity-android.cpp
index 2865ba594206..cceffd07fc13 100644
--- a/cocos/platform/android/javaactivity-android.cpp
+++ b/cocos/platform/android/javaactivity-android.cpp
@@ -1,8 +1,9 @@
 /****************************************************************************
 Copyright (c) 2013-2016 Chukong Technologies Inc.
 Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+Copyright (c) Bytedance Inc.
 
-http://www.cocos2d-x.org
+https://adxeproject.github.io/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +36,8 @@ THE SOFTWARE.
 #include <android/api-level.h>
 #include <jni.h>
 
+#include "jni/jni.hpp"
+
 #define LOG_TAG "main"
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
index f89188ceb427..daad8b2d6dad 100644
--- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
+++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "platform/CCFileUtils.h"
 #include "base/ccUTF8.h"
 
-static const std::string className = "org.cocos2dx.lib.Cocos2dxBitmap";
+static const char* className = "org.cocos2dx.lib.Cocos2dxBitmap";
 
 using namespace cocos2d;
 
diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
index 0592dc404412..85bba0fe9097 100644
--- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
+++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #define LOG_TAG "Java_org_cocos2dx_lib_Cocos2dxHelper.cpp"
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-static const std::string className = "org.cocos2dx.lib.Cocos2dxHelper";
+static const char* className = "org.cocos2dx.lib.Cocos2dxHelper";
 
 static EditTextCallback s_editTextCallback = nullptr;
 static void* s_ctx                         = nullptr;
@@ -142,8 +142,7 @@ int getObbAssetFileDescriptorJNI(const char* path, int64_t* startOffset, int64_t
     JniMethodInfo methodInfo;
     int fd = 0;
 
-    if (JniHelper::getStaticMethodInfo(methodInfo, className.c_str(), "getObbAssetFileDescriptor",
-                                       "(Ljava/lang/String;)[J"))
+    if (JniHelper::getStaticMethodInfo(methodInfo, className, "getObbAssetFileDescriptor", "(Ljava/lang/String;)[J"))
     {
         jstring stringArg = methodInfo.env->NewStringUTF(path);
         jlongArray newArray =
@@ -181,7 +180,7 @@ void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharse
 {
     JniMethodInfo methodInfo;
 
-    if (JniHelper::getStaticMethodInfo(methodInfo, className.c_str(), "conversionEncoding",
+    if (JniHelper::getStaticMethodInfo(methodInfo, className, "conversionEncoding",
                                        "([BLjava/lang/String;Ljava/lang/String;)[B"))
     {
         jbyteArray strArray = methodInfo.env->NewByteArray(byteSize);
diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
index bf9de1f55e3c..ec5960b5694e 100644
--- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
+++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
@@ -84,7 +84,7 @@ JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeDeleteBackwa
 
 JNIEXPORT jstring JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeGetContentText(JNIEnv* env, jclass)
 {
-    std::string pszText = cocos2d::IMEDispatcher::sharedDispatcher()->getContentText();
+    auto pszText = cocos2d::IMEDispatcher::sharedDispatcher()->getContentText();
     return cocos2d::StringUtils::newStringUTFJNI(env, pszText);
 }
 }
diff --git a/cocos/platform/android/jni/JniHelper.cpp b/cocos/platform/android/jni/JniHelper.cpp
index bddad033dfc8..66dbf8e90a74 100644
--- a/cocos/platform/android/jni/JniHelper.cpp
+++ b/cocos/platform/android/jni/JniHelper.cpp
@@ -319,6 +319,11 @@ jstring JniHelper::convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t
     return ret;
 }
 
+jstring JniHelper::convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t, std::string_view x)
+{
+    return convert(localRefs, t, x.data());
+}
+
 jstring JniHelper::convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t, const std::string& x)
 {
     return convert(localRefs, t, x.c_str());
@@ -338,10 +343,10 @@ void JniHelper::deleteLocalRefs(JNIEnv* env, LocalRefMapType& localRefs)
     localRefs[env].clear();
 }
 
-void JniHelper::reportError(const std::string& className, const std::string& methodName, const std::string& signature)
+void JniHelper::reportError(const char* className, const char* methodName, const char* signature)
 {
-    LOGE("Failed to find static java method. Class name: %s, method name: %s, signature: %s ", className.c_str(),
-         methodName.c_str(), signature.c_str());
+    LOGE("Failed to find static java method. Class name: %s, method name: %s, signature: %s ", className, methodName,
+         signature);
 }
 
 }  // namespace cocos2d
diff --git a/cocos/platform/android/jni/JniHelper.h b/cocos/platform/android/jni/JniHelper.h
index 1367b95c5adc..60fa77e86d6d 100644
--- a/cocos/platform/android/jni/JniHelper.h
+++ b/cocos/platform/android/jni/JniHelper.h
@@ -2,8 +2,9 @@
 Copyright (c) 2010-2012 cocos2d-x.org
 Copyright (c) 2013-2016 Chukong Technologies Inc.
 Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+Copyright (c) 2021 Bytedance Inc.
 
-http://www.cocos2d-x.org
+https://adxeproject.github.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31,8 +32,34 @@ THE SOFTWARE.
 #include <vector>
 #include <unordered_map>
 #include <functional>
+#include <type_traits>
 #include "platform/CCPlatformMacros.h"
 #include "math/Vec3.h"
+#include "jni/jni.hpp"
+
+namespace jni
+{
+template <>
+struct TypeSignature<bool>
+{
+    constexpr auto operator()() const { return TypeSignature<jboolean>{}(); }
+};
+template <>
+struct TypeSignature<const char*>
+{
+    constexpr auto operator()() const { return TypeSignature<jni::String>{}(); }
+};
+template <>
+struct TypeSignature<std::string_view>
+{
+    constexpr auto operator()() const { return TypeSignature<jni::String>{}(); }
+};
+template <>
+struct TypeSignature<std::string>
+{
+    constexpr auto operator()() const { return TypeSignature<jni::String>{}(); }
+};
+}  // namespace jni
 
 NS_CC_BEGIN
 
@@ -74,11 +101,11 @@ class CC_DLL JniHelper
     @if no such method will log error
     */
     template <typename... Ts>
-    static void callStaticVoidMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static void callStaticVoidMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")V";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<void(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             t.env->CallStaticVoidMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -96,12 +123,12 @@ class CC_DLL JniHelper
     @return value from Java static boolean method if there are proper JniMethodInfo; otherwise false.
     */
     template <typename... Ts>
-    static bool callStaticBooleanMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static bool callStaticBooleanMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         jboolean jret = JNI_FALSE;
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")Z";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jboolean(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             jret = t.env->CallStaticBooleanMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -120,12 +147,12 @@ class CC_DLL JniHelper
     @return value from Java static int method if there are proper JniMethodInfo; otherwise 0.
     */
     template <typename... Ts>
-    static int callStaticIntMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static int callStaticIntMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         jint ret = 0;
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")I";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jint(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             ret = t.env->CallStaticIntMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -144,12 +171,12 @@ class CC_DLL JniHelper
     @return value from Java static float method if there are proper JniMethodInfo; otherwise 0.
     */
     template <typename... Ts>
-    static float callStaticFloatMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static float callStaticFloatMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         jfloat ret = 0.0;
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")F";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jfloat(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             ret = t.env->CallStaticFloatMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -168,12 +195,12 @@ class CC_DLL JniHelper
     @return address of JniMethodInfo if there are proper JniMethodInfo; otherwise nullptr.
     */
     template <typename... Ts>
-    static float* callStaticFloatArrayMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static float* callStaticFloatArrayMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         static float ret[32];
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")[F";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jni::Array<jfloat>(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             jfloatArray array =
@@ -204,12 +231,12 @@ class CC_DLL JniHelper
     @return address of JniMethodInfo if there are proper JniMethodInfo; otherwise nullptr.
     */
     template <typename... Ts>
-    static int* callStaticIntArrayMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static int* callStaticIntArrayMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         static int ret[32];
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")[I";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jni::Array<jint>(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             jintArray array =
@@ -240,12 +267,12 @@ class CC_DLL JniHelper
     @return JniMethodInfo of Vec3 type if there are proper JniMethodInfo; otherwise Vec3(0, 0, 0).
     */
     template <typename... Ts>
-    static Vec3 callStaticVec3Method(const std::string& className, const std::string& methodName, Ts... xs)
+    static Vec3 callStaticVec3Method(const char* className, const char* methodName, Ts&&... xs)
     {
         Vec3 ret;
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")[F";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jni::Array<jfloat>(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             jfloatArray array =
@@ -274,12 +301,12 @@ class CC_DLL JniHelper
     @return value from Java static double method if there are proper JniMethodInfo; otherwise 0.
     */
     template <typename... Ts>
-    static double callStaticDoubleMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static double callStaticDoubleMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         jdouble ret = 0.0;
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")D";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jdouble(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             ret = t.env->CallStaticDoubleMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -298,13 +325,13 @@ class CC_DLL JniHelper
     @return JniMethodInfo of string type if there are proper JniMethodInfo; otherwise empty string.
     */
     template <typename... Ts>
-    static std::string callStaticStringMethod(const std::string& className, const std::string& methodName, Ts... xs)
+    static std::string callStaticStringMethod(const char* className, const char* methodName, Ts&&... xs)
     {
         std::string ret;
 
         cocos2d::JniMethodInfo t;
-        std::string signature = "(" + std::string(getJNISignature(xs...)) + ")Ljava/lang/String;";
-        if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str()))
+        const char* signature = jni::TypeSignature<jni::String(std::decay_t<Ts>...)>{}();
+        if (cocos2d::JniHelper::getStaticMethodInfo(t, className, methodName, signature))
         {
             LocalRefMapType localRefs;
             jstring jret = (jstring)t.env->CallStaticObjectMethod(t.classID, t.methodID, convert(localRefs, t, xs)...);
@@ -334,6 +361,8 @@ class CC_DLL JniHelper
 
     static jstring convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t, const char* x);
 
+    static jstring convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t, std::string_view x);
+
     static jstring convert(LocalRefMapType& localRefs, cocos2d::JniMethodInfo& t, const std::string& x);
 
     inline static jint convert(LocalRefMapType&, cocos2d::JniMethodInfo&, int32_t value)
@@ -377,41 +406,7 @@ class CC_DLL JniHelper
 
     static void deleteLocalRefs(JNIEnv* env, LocalRefMapType& localRefs);
 
-    static std::string getJNISignature() { return ""; }
-
-    static std::string getJNISignature(bool) { return "Z"; }
-
-    static std::string getJNISignature(char) { return "C"; }
-
-    static std::string getJNISignature(short) { return "S"; }
-
-    static std::string getJNISignature(int) { return "I"; }
-
-    static std::string getJNISignature(long) { return "J"; }
-
-    static std::string getJNISignature(float) { return "F"; }
-
-    static std::string getJNISignature(double) { return "D"; }
-
-    static std::string getJNISignature(const char*) { return "Ljava/lang/String;"; }
-
-    static std::string getJNISignature(const std::string&) { return "Ljava/lang/String;"; }
-
-    template <typename T>
-    static std::string getJNISignature(T x)
-    {
-        // This template should never be instantiated
-        static_assert(sizeof(x) == 0, "Unsupported argument type");
-        return "";
-    }
-
-    template <typename T, typename... Ts>
-    static std::string getJNISignature(T x, Ts... xs)
-    {
-        return getJNISignature(x) + getJNISignature(xs...);
-    }
-
-    static void reportError(const std::string& className, const std::string& methodName, const std::string& signature);
+    static void reportError(const char* className, const char* methodName, const char* signature);
 };
 
 NS_CC_END
diff --git a/cocos/platform/apple/CCDevice-apple.mm b/cocos/platform/apple/CCDevice-apple.mm
index e4a72afd2f0b..fff35eb1bbb4 100644
--- a/cocos/platform/apple/CCDevice-apple.mm
+++ b/cocos/platform/apple/CCDevice-apple.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2012 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,51 +29,56 @@ of this software and associated documentation files (the "Software"), to deal
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC
 
-#include <Foundation/Foundation.h>
-#include <Cocoa/Cocoa.h>
-#include <string>
+#    include <Foundation/Foundation.h>
+#    include <Cocoa/Cocoa.h>
+#    include <string>
 
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
-#import <UIKit/UIKit.h>
+#    import <UIKit/UIKit.h>
 
 #endif
 
 #include "base/ccTypes.h"
 #include "platform/apple/CCDevice-apple.h"
 
-namespace FontUtils {
-    NSMutableParagraphStyle* _calculateParagraphStyle(bool enableWrap, int overflow)
-    {
-        NSMutableParagraphStyle* paragraphStyle = [[[NSMutableParagraphStyle alloc] init] autorelease];
-        paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping;
-        return paragraphStyle;
-    }
-    
-    NSTextAlignment _calculateTextAlignment(cocos2d::Device::TextAlign align)
-    {
-        unsigned uHoriFlag = (int)align & 0x0f;
-        NSTextAlignment nsAlign = (2 == uHoriFlag) ? NSTextAlignmentRight
-        : (3 == uHoriFlag) ? NSTextAlignmentCenter
-        : NSTextAlignmentLeft;
-        
-        return nsAlign;
-    }
-    
+namespace FontUtils
+{
+NSMutableParagraphStyle* _calculateParagraphStyle(bool enableWrap, int overflow)
+{
+    NSMutableParagraphStyle* paragraphStyle = [[[NSMutableParagraphStyle alloc] init] autorelease];
+    paragraphStyle.lineBreakMode            = NSLineBreakByWordWrapping;
+    return paragraphStyle;
+}
+
+NSTextAlignment _calculateTextAlignment(cocos2d::Device::TextAlign align)
+{
+    unsigned uHoriFlag      = (int)align & 0x0f;
+    NSTextAlignment nsAlign = (2 == uHoriFlag)   ? NSTextAlignmentRight
+                              : (3 == uHoriFlag) ? NSTextAlignmentCenter
+                                                 : NSTextAlignmentLeft;
 
-    
-    CGFloat _calculateTextDrawStartWidth(cocos2d::Device::TextAlign align, CGSize realDimensions, CGSize dimensions)
+    return nsAlign;
+}
+
+CGFloat _calculateTextDrawStartWidth(cocos2d::Device::TextAlign align, CGSize realDimensions, CGSize dimensions)
+{
+    CGFloat xPadding   = 0;
+    unsigned uHoriFlag = (int)align & 0x0f;
+    switch (uHoriFlag)
     {
-        CGFloat xPadding = 0;
-        unsigned uHoriFlag = (int)align & 0x0f;
-        switch (uHoriFlag) {
-                //center
-            case 3: xPadding = (dimensions.width - realDimensions.width) / 2.0f; break;
-                //right
-            case 2: xPadding = dimensions.width - realDimensions.width; break;
-            default: break;
-        }
-        return xPadding;
+        // center
+    case 3:
+        xPadding = (dimensions.width - realDimensions.width) / 2.0f;
+        break;
+        // right
+    case 2:
+        xPadding = dimensions.width - realDimensions.width;
+        break;
+    default:
+        break;
     }
+    return xPadding;
+}
 
 }
diff --git a/cocos/platform/apple/CCFileUtils-apple.h b/cocos/platform/apple/CCFileUtils-apple.h
index 8eff83505aea..14a3fb62e41f 100644
--- a/cocos/platform/apple/CCFileUtils-apple.h
+++ b/cocos/platform/apple/CCFileUtils-apple.h
@@ -51,21 +51,21 @@ class CC_DLL FileUtilsApple : public FileUtils
     /* override functions */
     virtual std::string getWritablePath() const override;
     virtual std::string getNativeWritableAbsolutePath() const override;
-    virtual std::string getFullPathForFilenameWithinDirectory(const std::string& directory,
-                                                              const std::string& filename) const override;
+    virtual std::string getFullPathForFilenameWithinDirectory(std::string_view directory,
+                                                              std::string_view filename) const override;
 
 #if CC_FILEUTILS_APPLE_ENABLE_OBJC
     void setBundle(NSBundle* bundle);
 #endif
 
-    virtual bool createDirectory(const std::string& path) const override;
-    virtual std::string getPathForDirectory(const std::string& dir,
-                                            const std::string& resolutionDiretory,
-                                            const std::string& searchPath) const override;
+    virtual bool createDirectory(std::string_view path) const override;
+    virtual std::string getPathForDirectory(std::string_view dir,
+                                            std::string_view resolutionDiretory,
+                                            std::string_view searchPath) const override;
 
 private:
-    virtual bool isFileExistInternal(const std::string& filePath) const override;
-    virtual bool removeDirectory(const std::string& dirPath) const override;
+    virtual bool isFileExistInternal(std::string_view filePath) const override;
+    virtual bool removeDirectory(std::string_view dirPath) const override;
 
     struct IMPL;
     std::unique_ptr<IMPL> pimpl_;
diff --git a/cocos/platform/apple/CCFileUtils-apple.mm b/cocos/platform/apple/CCFileUtils-apple.mm
index 75dabafb2131..3c4717884ccd 100644
--- a/cocos/platform/apple/CCFileUtils-apple.mm
+++ b/cocos/platform/apple/CCFileUtils-apple.mm
@@ -36,29 +36,27 @@ of this software and associated documentation files (the "Software"), to deal
 #include "base/CCDirector.h"
 #include "platform/CCFileUtils.h"
 
-#define DECLARE_GUARD (void)0 // std::lock_guard<std::recursive_mutex> mutexGuard(_mutex)
+#define DECLARE_GUARD (void)0  // std::lock_guard<std::recursive_mutex> mutexGuard(_mutex)
 
 NS_CC_BEGIN
 
-struct FileUtilsApple::IMPL {
-    IMPL(NSBundle* bundle):bundle_([NSBundle mainBundle]) {}
-    void setBundle(NSBundle* bundle) {
-        bundle_ = bundle;
-    }
-    NSBundle* getBundle() const {
-        return bundle_;
-    }
+struct FileUtilsApple::IMPL
+{
+    IMPL(NSBundle* bundle) : bundle_([NSBundle mainBundle]) {}
+    void setBundle(NSBundle* bundle) { bundle_ = bundle; }
+    NSBundle* getBundle() const { return bundle_; }
+
 private:
     NSBundle* bundle_;
 };
 
-FileUtilsApple::FileUtilsApple() : pimpl_(new IMPL([NSBundle mainBundle])) {
-}
+FileUtilsApple::FileUtilsApple() : pimpl_(new IMPL([NSBundle mainBundle])) {}
 
 FileUtilsApple::~FileUtilsApple() = default;
 
 #if CC_FILEUTILS_APPLE_ENABLE_OBJC
-void FileUtilsApple::setBundle(NSBundle* bundle) {
+void FileUtilsApple::setBundle(NSBundle* bundle)
+{
     pimpl_->setBundle(bundle);
 }
 #endif
@@ -72,17 +70,16 @@ void setBundle(NSBundle* bundle) {
     if (s_sharedFileUtils == nullptr)
     {
         s_sharedFileUtils = new FileUtilsApple();
-        if(!s_sharedFileUtils->init())
+        if (!s_sharedFileUtils->init())
         {
-          delete s_sharedFileUtils;
-          s_sharedFileUtils = nullptr;
-          CCLOG("ERROR: Could not init CCFileUtilsApple");
+            delete s_sharedFileUtils;
+            s_sharedFileUtils = nullptr;
+            CCLOG("ERROR: Could not init CCFileUtilsApple");
         }
     }
     return s_sharedFileUtils;
 }
 
-
 std::string FileUtilsApple::getWritablePath() const
 {
     DECLARE_GUARD;
@@ -98,14 +95,14 @@ void setBundle(NSBundle* bundle) {
     }
 
     // save to document folder
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documentsDirectory = [paths objectAtIndex:0];
-    std::string strRet = [documentsDirectory UTF8String];
+    NSArray* paths               = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString* documentsDirectory = [paths objectAtIndex:0];
+    std::string strRet           = [documentsDirectory UTF8String];
     strRet.append("/");
     return strRet;
 }
 
-bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const
+bool FileUtilsApple::isFileExistInternal(std::string_view filePath) const
 {
     if (filePath.empty())
     {
@@ -121,8 +118,8 @@ void setBundle(NSBundle* bundle) {
         size_t pos = filePath.find_last_of("/");
         if (pos != std::string::npos)
         {
-            file = filePath.substr(pos+1);
-            path = filePath.substr(0, pos+1);
+            file = filePath.substr(pos + 1);
+            path = filePath.substr(0, pos + 1);
         }
         else
         {
@@ -130,16 +127,18 @@ void setBundle(NSBundle* bundle) {
         }
 
         NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:file.c_str()]
-                                                             ofType:nil
-                                                        inDirectory:[NSString stringWithUTF8String:path.c_str()]];
-        if (fullpath != nil) {
+                                                           ofType:nil
+                                                      inDirectory:[NSString stringWithUTF8String:path.c_str()]];
+        if (fullpath != nil)
+        {
             ret = true;
         }
     }
     else
     {
         // Search path is an absolute path.
-        if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:filePath.c_str()]]) {
+        if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:filePath.data()]])
+        {
             ret = true;
         }
     }
@@ -147,18 +146,18 @@ void setBundle(NSBundle* bundle) {
     return ret;
 }
 
-static int unlink_cb(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
+static int unlink_cb(const char* fpath, const struct stat* sb, int typeflag, struct FTW* ftwbuf)
 {
     auto ret = remove(fpath);
     if (ret)
     {
-        log("Fail to remove: %s ",fpath);
+        log("Fail to remove: %s ", fpath);
     }
 
     return ret;
 }
 
-bool FileUtilsApple::removeDirectory(const std::string& path) const
+bool FileUtilsApple::removeDirectory(std::string_view path) const
 {
     if (path.empty())
     {
@@ -166,78 +165,89 @@ static int unlink_cb(const char *fpath, const struct stat *sb, int typeflag, str
         return false;
     }
 
-    if (nftw(path.c_str(),unlink_cb, 64, FTW_DEPTH | FTW_PHYS))
+    if (nftw(path.data(), unlink_cb, 64, FTW_DEPTH | FTW_PHYS))
         return false;
     else
         return true;
 }
 
-std::string FileUtilsApple::getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const
+std::string FileUtilsApple::getPathForDirectory(std::string_view dir,
+                                                std::string_view resolutionDiretory,
+                                                std::string_view searchPath) const
 {
-    auto path = searchPath + resolutionDiretory + dir;
-    
-    if(!path.empty() && path[path.length() -1] == '/') {
+    std::string path{searchPath};
+    path.append(resolutionDiretory).append(dir);
+
+    if (!path.empty() && path[path.length() - 1] == '/')
+    {
         path.erase(path.end() - 1);
     }
-    
-    if(path[0] == '/')
+
+    if (path[0] == '/')
     {
         BOOL isDir = false;
-        if([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:dir.c_str()]
-                               isDirectory:&isDir]) {
+        if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:dir.data()] isDirectory:&isDir])
+        {
             return isDir ? path : "";
         }
     }
     else
     {
-        NSString *fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:path.c_str()]
+        NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:path.c_str()]
                                                            ofType:nil];
-        if(fullpath != nil) {
+        if (fullpath != nil)
+        {
             return [fullpath UTF8String];
         }
     }
     return "";
 }
 
-
-std::string FileUtilsApple::getFullPathForFilenameWithinDirectory(const std::string& directory, const std::string& filename) const
+std::string FileUtilsApple::getFullPathForFilenameWithinDirectory(std::string_view directory,
+                                                                  std::string_view filename) const
 {
     if (directory[0] != '/')
     {
-        NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:filename.c_str()]
-                                                             ofType:nil
-                                                        inDirectory:[NSString stringWithUTF8String:directory.c_str()]];
-        if (fullpath != nil) {
+        NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:filename.data()]
+                                                           ofType:nil
+                                                      inDirectory:[NSString stringWithUTF8String:directory.data()]];
+        if (fullpath != nil)
+        {
             return [fullpath UTF8String];
         }
     }
     else
     {
-        std::string fullPath = directory+filename;
+        std::string fullPath{directory};
+        fullPath += filename;
         // Search path is an absolute path.
-        if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:fullPath.c_str()]]) {
+        if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:fullPath.c_str()]])
+        {
             return fullPath;
         }
     }
     return "";
 }
 
-bool FileUtilsApple::createDirectory(const std::string& path) const
+bool FileUtilsApple::createDirectory(std::string_view path) const
 {
     CCASSERT(!path.empty(), "Invalid path");
-    
+
     if (isDirectoryExist(path))
         return true;
-    
+
     NSError* error;
-    
-    bool result = [s_fileManager createDirectoryAtPath:[NSString stringWithUTF8String:path.c_str()] withIntermediateDirectories:YES attributes:nil error:&error];
-    
-    if(!result && error != nil)
+
+    bool result = [s_fileManager createDirectoryAtPath:[NSString stringWithUTF8String:path.data()]
+                           withIntermediateDirectories:YES
+                                            attributes:nil
+                                                 error:&error];
+
+    if (!result && error != nil)
     {
-        CCLOGERROR("Fail to create directory \"%s\": %s", path.c_str(), [error.localizedDescription UTF8String]);
+        CCLOGERROR("Fail to create directory \"%s\": %s", path.data(), [error.localizedDescription UTF8String]);
     }
-    
+
     return result;
 }
 
diff --git a/cocos/platform/desktop/CCGLViewImpl-desktop.cpp b/cocos/platform/desktop/CCGLViewImpl-desktop.cpp
index 7f18509643d9..d3183da959a7 100644
--- a/cocos/platform/desktop/CCGLViewImpl-desktop.cpp
+++ b/cocos/platform/desktop/CCGLViewImpl-desktop.cpp
@@ -326,12 +326,12 @@ GLViewImpl::~GLViewImpl()
 #endif
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName)
+GLViewImpl* GLViewImpl::create(std::string_view viewName)
 {
     return GLViewImpl::create(viewName, false);
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName, bool resizable)
+GLViewImpl* GLViewImpl::create(std::string_view viewName, bool resizable)
 {
     auto ret = new GLViewImpl;
     if (ret->initWithRect(viewName, Rect(0, 0, 960, 640), 1.0f, resizable))
@@ -343,7 +343,7 @@ GLViewImpl* GLViewImpl::create(const std::string& viewName, bool resizable)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable)
+GLViewImpl* GLViewImpl::createWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable)
 {
     auto ret = new GLViewImpl;
     if (ret->initWithRect(viewName, rect, frameZoomFactor, resizable))
@@ -355,7 +355,7 @@ GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, f
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName)
 {
     auto ret = new GLViewImpl();
     if (ret->initWithFullScreen(viewName))
@@ -367,7 +367,7 @@ GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName,
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName,
                                              const GLFWvidmode& videoMode,
                                              GLFWmonitor* monitor)
 {
@@ -381,7 +381,7 @@ GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName,
     return nullptr;
 }
 
-bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable)
+bool GLViewImpl::initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable)
 {
     setViewName(viewName);
 
@@ -509,7 +509,7 @@ bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float fram
     return true;
 }
 
-bool GLViewImpl::initWithFullScreen(const std::string& viewName)
+bool GLViewImpl::initWithFullScreen(std::string_view viewName)
 {
     // Create fullscreen window on primary monitor at its current video mode.
     _monitor = glfwGetPrimaryMonitor();
@@ -520,7 +520,7 @@ bool GLViewImpl::initWithFullScreen(const std::string& viewName)
     return initWithRect(viewName, Rect(0, 0, (float)videoMode->width, (float)videoMode->height), 1.0f, false);
 }
 
-bool GLViewImpl::initWithFullscreen(const std::string& viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor)
+bool GLViewImpl::initWithFullscreen(std::string_view viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor)
 {
     // Create fullscreen on specified monitor at the specified video mode.
     _monitor = monitor;
@@ -575,30 +575,29 @@ void GLViewImpl::pollEvents()
 
 void GLViewImpl::enableRetina(bool enabled)
 {  // official v4 comment follow sources
-    // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-    //     _isRetinaEnabled = enabled;
-    //     if (_isRetinaEnabled)
-    //     {
-    //         _retinaFactor = 1;
-    //     }
-    //     else
-    //     {
-    //         _retinaFactor = 2;
-    //     }
-    //     updateFrameSize();
-    // #endif
+   // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
+   //     _isRetinaEnabled = enabled;
+   //     if (_isRetinaEnabled)
+   //     {
+   //         _retinaFactor = 1;
+   //     }
+   //     else
+   //     {
+   //         _retinaFactor = 2;
+   //     }
+   //     updateFrameSize();
+   // #endif
 }
 
 void GLViewImpl::setIMEKeyboardState(bool /*bOpen*/) {}
 
 #if CC_ICON_SET_SUPPORT
-void GLViewImpl::setIcon(const std::string& filename) const
+void GLViewImpl::setIcon(std::string_view filename) const
 {
-    std::vector<std::string> vec = {filename};
-    this->setIcon(vec);
+    this->setIcon(std::vector<std::string_view>{filename});
 }
 
-void GLViewImpl::setIcon(const std::vector<std::string>& filelist) const
+void GLViewImpl::setIcon(const std::vector<std::string_view>& filelist) const
 {
     if (filelist.empty())
         return;
diff --git a/cocos/platform/desktop/CCGLViewImpl-desktop.h b/cocos/platform/desktop/CCGLViewImpl-desktop.h
index f46a0f0ec2a4..74c7d895fec9 100644
--- a/cocos/platform/desktop/CCGLViewImpl-desktop.h
+++ b/cocos/platform/desktop/CCGLViewImpl-desktop.h
@@ -60,14 +60,14 @@ class CC_DLL GLViewImpl : public GLView
     friend class GLFWEventHandler;
 
 public:
-    static GLViewImpl* create(const std::string& viewName);
-    static GLViewImpl* create(const std::string& viewName, bool resizable);
-    static GLViewImpl* createWithRect(const std::string& viewName,
+    static GLViewImpl* create(std::string_view viewName);
+    static GLViewImpl* create(std::string_view viewName, bool resizable);
+    static GLViewImpl* createWithRect(std::string_view viewName,
                                       Rect size,
                                       float frameZoomFactor = 1.0f,
                                       bool resizable        = false);
-    static GLViewImpl* createWithFullScreen(const std::string& viewName);
-    static GLViewImpl* createWithFullScreen(const std::string& viewName,
+    static GLViewImpl* createWithFullScreen(std::string_view viewName);
+    static GLViewImpl* createWithFullScreen(std::string_view viewName,
                                             const GLFWvidmode& videoMode,
                                             GLFWmonitor* monitor);
 
@@ -121,8 +121,8 @@ class CC_DLL GLViewImpl : public GLView
     virtual void setIMEKeyboardState(bool bOpen) override;
 
 #if CC_ICON_SET_SUPPORT
-    virtual void setIcon(const std::string& filename) const override;
-    virtual void setIcon(const std::vector<std::string>& filelist) const override;
+    virtual void setIcon(std::string_view filename) const override;
+    virtual void setIcon(const std::vector<std::string_view>& filelist) const override;
     virtual void setDefaultIcon() const override;
 #endif /* CC_ICON_SET_SUPPORT */
 
@@ -157,9 +157,9 @@ class CC_DLL GLViewImpl : public GLView
     GLViewImpl(bool initglfw = true);
     virtual ~GLViewImpl();
 
-    bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable);
-    bool initWithFullScreen(const std::string& viewName);
-    bool initWithFullscreen(const std::string& viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor);
+    bool initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable);
+    bool initWithFullScreen(std::string_view viewName);
+    bool initWithFullscreen(std::string_view viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor);
 
     bool loadGL();
 
diff --git a/cocos/platform/ios/CCApplication-ios.h b/cocos/platform/ios/CCApplication-ios.h
index bcced55ac190..d87e7a79bcf2 100644
--- a/cocos/platform/ios/CCApplication-ios.h
+++ b/cocos/platform/ios/CCApplication-ios.h
@@ -87,7 +87,7 @@ class CC_DLL Application : public ApplicationProtocol
      @param String with url to open.
      @return true if the resource located by the URL was successfully opened; otherwise false.
      */
-    virtual bool openURL(const std::string& url) override;
+    virtual bool openURL(std::string_view url) override;
 
     /**
     @brief  This function will be called when the application screen size is changed.
diff --git a/cocos/platform/ios/CCApplication-ios.mm b/cocos/platform/ios/CCApplication-ios.mm
index fbf2827c29e1..79d3576b03e3 100644
--- a/cocos/platform/ios/CCApplication-ios.mm
+++ b/cocos/platform/ios/CCApplication-ios.mm
@@ -37,7 +37,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 Application::Application()
 {
-    CC_ASSERT(! sm_pSharedApplication);
+    CC_ASSERT(!sm_pSharedApplication);
     sm_pSharedApplication = this;
 }
 
@@ -58,7 +58,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 void Application::setAnimationInterval(float interval)
 {
-    [[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
+    [[CCDirectorCaller sharedDirectorCaller] setAnimationInterval:interval];
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -71,39 +71,39 @@ of this software and associated documentation files (the "Software"), to deal
     return sm_pSharedApplication;
 }
 
-const char * Application::getCurrentLanguageCode()
+const char* Application::getCurrentLanguageCode()
 {
-    static char code[3]={0};
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *languages = [defaults objectForKey:@"AppleLanguages"];
-    NSString *currentLanguage = [languages objectAtIndex:0];
+    static char code[3]       = {0};
+    NSUserDefaults* defaults  = [NSUserDefaults standardUserDefaults];
+    NSArray* languages        = [defaults objectForKey:@"AppleLanguages"];
+    NSString* currentLanguage = [languages objectAtIndex:0];
 
     // get the current language code.(such as English is "en", Chinese is "zh" and so on)
-    NSDictionary* temp = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
-    NSString * languageCode = [temp objectForKey:NSLocaleLanguageCode];
+    NSDictionary* temp     = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
+    NSString* languageCode = [temp objectForKey:NSLocaleLanguageCode];
     [languageCode getCString:code maxLength:3 encoding:NSASCIIStringEncoding];
-    code[2]='\0';
+    code[2] = '\0';
     return code;
 }
 
 LanguageType Application::getCurrentLanguage()
 {
     // get the current language and country config
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *languages = [defaults objectForKey:@"AppleLanguages"];
-    NSString *currentLanguage = [languages objectAtIndex:0];
+    NSUserDefaults* defaults  = [NSUserDefaults standardUserDefaults];
+    NSArray* languages        = [defaults objectForKey:@"AppleLanguages"];
+    NSString* currentLanguage = [languages objectAtIndex:0];
 
     // get the current language code.(such as English is "en", Chinese is "zh" and so on)
-    NSDictionary* temp = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
-    NSString * languageCode = [temp objectForKey:NSLocaleLanguageCode];
+    NSDictionary* temp     = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
+    NSString* languageCode = [temp objectForKey:NSLocaleLanguageCode];
 
     return utils::getLanguageTypeByISO2([languageCode UTF8String]);
-
 }
 
 Application::Platform Application::getTargetPlatform()
 {
-    if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad) // idiom for iOS <= 3.2, otherwise: [UIDevice userInterfaceIdiom] is faster.
+    if ([UIDevice.currentDevice userInterfaceIdiom] ==
+        UIUserInterfaceIdiomPad)  // idiom for iOS <= 3.2, otherwise: [UIDevice userInterfaceIdiom] is faster.
     {
         return Platform::OS_IPAD;
     }
@@ -113,21 +113,23 @@ of this software and associated documentation files (the "Software"), to deal
     }
 }
 
-std::string Application::getVersion() {
+std::string Application::getVersion()
+{
     NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
-    if (version) {
+    if (version)
+    {
         return [version UTF8String];
     }
     return "";
 }
 
-bool Application::openURL(const std::string &url)
+bool Application::openURL(std::string_view url)
 {
-    NSString* msg = [NSString stringWithCString:url.c_str() encoding:NSUTF8StringEncoding];
-    NSURL* nsUrl = [NSURL URLWithString:msg];
-    
+    NSString* msg = [NSString stringWithCString:url.data() encoding:NSUTF8StringEncoding];
+    NSURL* nsUrl  = [NSURL URLWithString:msg];
+
     id application = [UIApplication sharedApplication];
-    if ([application respondsToSelector:@selector(openURL:options:completionHandler:)] )
+    if ([application respondsToSelector:@selector(openURL:options:completionHandler:)])
     {
         [application openURL:nsUrl options:@{} completionHandler:nil];
     }
@@ -137,8 +139,6 @@ of this software and associated documentation files (the "Software"), to deal
     }
 }
 
-void Application::applicationScreenSizeChanged(int newWidth, int newHeight) {
-
-}
+void Application::applicationScreenSizeChanged(int newWidth, int newHeight) {}
 
 NS_CC_END
diff --git a/cocos/platform/ios/CCCommon-ios.mm b/cocos/platform/ios/CCCommon-ios.mm
index 254978be54fb..fb2a462e6364 100644
--- a/cocos/platform/ios/CCCommon-ios.mm
+++ b/cocos/platform/ios/CCCommon-ios.mm
@@ -36,29 +36,30 @@ of this software and associated documentation files (the "Software"), to deal
 NS_CC_BEGIN
 
 // ios no MessageBox, use log instead
-void ccMessageBox(const char * msg, const char * title)
+void ccMessageBox(const char* msg, const char* title)
 {
     // only enable it on iOS.
     // FIXME: Implement it for tvOS
 #if !defined(CC_TARGET_OS_TVOS)
-    NSString * tmpTitle = (title) ? [NSString stringWithUTF8String : title] : nil;
-    NSString * tmpMsg = (msg) ? [NSString stringWithUTF8String : msg] : nil;
+    NSString* tmpTitle = (title) ? [NSString stringWithUTF8String:title] : nil;
+    NSString* tmpMsg   = (msg) ? [NSString stringWithUTF8String:msg] : nil;
 
     UIAlertController* alertController = [UIAlertController alertControllerWithTitle:tmpTitle
-                               message:tmpMsg
-                               preferredStyle:UIAlertControllerStyleAlert];
+                                                                             message:tmpMsg
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
 
-    UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault
-                                   handler:^(UIAlertAction * action) {}];
+    UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"OK"
+                                                            style:UIAlertActionStyleDefault
+                                                          handler:^(UIAlertAction* action){
+                                                          }];
 
     [alertController addAction:defaultAction];
     auto rootViewController = [UIApplication sharedApplication].windows[0].rootViewController;
     [rootViewController presentViewController:alertController animated:YES completion:nil];
 #endif
-
 }
 
-void LuaLog(const char * format)
+void LuaLog(const char* format)
 {
     puts(format);
 }
diff --git a/cocos/platform/ios/CCDevice-ios.mm b/cocos/platform/ios/CCDevice-ios.mm
index 9b3036fbc858..ae01148a19f8 100644
--- a/cocos/platform/ios/CCDevice-ios.mm
+++ b/cocos/platform/ios/CCDevice-ios.mm
@@ -34,29 +34,30 @@ of this software and associated documentation files (the "Software"), to deal
 
 // Accelerometer
 #if !defined(CC_TARGET_OS_TVOS)
-#import<CoreMotion/CoreMotion.h>
+#    import <CoreMotion/CoreMotion.h>
 #endif
-#import<CoreFoundation/CoreFoundation.h>
+#import <CoreFoundation/CoreFoundation.h>
 #import <CoreText/CoreText.h>
 // Vibrate
 #import <AudioToolbox/AudioToolbox.h>
 
 const float MAX_MEASURE_HEIGHT = 10000;
 
-
 static NSAttributedString* __attributedStringWithFontSize(NSMutableAttributedString* attributedString, CGFloat fontSize)
 {
     {
         [attributedString beginEditing];
 
-        [attributedString enumerateAttribute:NSFontAttributeName inRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
-
-            UIFont* font = value;
-            font = [font fontWithSize:fontSize];
+        [attributedString enumerateAttribute:NSFontAttributeName
+                                     inRange:NSMakeRange(0, attributedString.length)
+                                     options:0
+                                  usingBlock:^(id value, NSRange range, BOOL* stop) {
+                                    UIFont* font = value;
+                                    font         = [font fontWithSize:fontSize];
 
-            [attributedString removeAttribute:NSFontAttributeName range:range];
-            [attributedString addAttribute:NSFontAttributeName value:font range:range];
-        }];
+                                    [attributedString removeAttribute:NSFontAttributeName range:range];
+                                    [attributedString addAttribute:NSFontAttributeName value:font range:range];
+                                  }];
 
         [attributedString endEditing];
     }
@@ -69,97 +70,116 @@ static CGFloat _calculateTextDrawStartHeight(cocos2d::Device::TextAlign align, C
     float startH = 0;
     // vertical alignment
     unsigned int vAlignment = ((int)align >> 4) & 0x0F;
-    switch (vAlignment) {
-            //bottom
-        case 2:startH = dimensions.height - realDimensions.height;break;
-            //top
-        case 1:startH = 0;break;
-            //center
-        case 3: startH = (dimensions.height - realDimensions.height) / 2;break;
-        default:
-            break;
+    switch (vAlignment)
+    {
+        // bottom
+    case 2:
+        startH = dimensions.height - realDimensions.height;
+        break;
+        // top
+    case 1:
+        startH = 0;
+        break;
+        // center
+    case 3:
+        startH = (dimensions.height - realDimensions.height) / 2;
+        break;
+    default:
+        break;
     }
     return startH;
 }
 
-static CGSize _calculateShrinkedSizeForString(NSAttributedString **str,
+static CGSize _calculateShrinkedSizeForString(NSAttributedString** str,
                                               id font,
                                               CGSize constrainSize,
                                               bool enableWrap,
                                               int& newFontSize)
 {
     CGRect actualSize = CGRectMake(0, 0, constrainSize.width + 1, constrainSize.height + 1);
-    int fontSize = [font pointSize];
-    fontSize = fontSize + 1;
+    int fontSize      = [font pointSize];
+    fontSize          = fontSize + 1;
 
-    if (!enableWrap) {
-        while (actualSize.size.width > constrainSize.width ||
-               actualSize.size.height > constrainSize.height) {
+    if (!enableWrap)
+    {
+        while (actualSize.size.width > constrainSize.width || actualSize.size.height > constrainSize.height)
+        {
             fontSize = fontSize - 1;
 
-            if(fontSize < 0) {
+            if (fontSize < 0)
+            {
                 actualSize = CGRectMake(0, 0, 0, 0);
                 break;
             }
 
-            NSMutableAttributedString *mutableString = [[*str mutableCopy] autorelease];
-            *str = __attributedStringWithFontSize(mutableString, fontSize);
+            NSMutableAttributedString* mutableString = [[*str mutableCopy] autorelease];
+            *str                                     = __attributedStringWithFontSize(mutableString, fontSize);
 
-            CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString((__bridge CFAttributedStringRef)*str);
+            CTFramesetterRef framesetter =
+                CTFramesetterCreateWithAttributedString((__bridge CFAttributedStringRef) * str);
             CGSize targetSize = CGSizeMake(MAX_MEASURE_HEIGHT, MAX_MEASURE_HEIGHT);
-            CGSize fitSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, CFRangeMake(0, [(*str) length]), NULL, targetSize, NULL);
+            CGSize fitSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, CFRangeMake(0, [(*str) length]),
+                                                                          NULL, targetSize, NULL);
             CFRelease(framesetter);
-            if (fitSize.width == 0 || fitSize.height == 0) {
+            if (fitSize.width == 0 || fitSize.height == 0)
+            {
                 continue;
             }
-           
+
             actualSize.size = fitSize;
-            
-            if (constrainSize.width <= 0) {
+
+            if (constrainSize.width <= 0)
+            {
                 constrainSize.width = fitSize.width;
             }
-            if (constrainSize.height <= 0) {
+            if (constrainSize.height <= 0)
+            {
                 constrainSize.height = fitSize.height;
             }
-            if (fontSize <= 0) {
+            if (fontSize <= 0)
+            {
                 break;
             }
         }
-
     }
-    else {
-        while (actualSize.size.height > constrainSize.height ||
-               actualSize.size.width > constrainSize.width) {
+    else
+    {
+        while (actualSize.size.height > constrainSize.height || actualSize.size.width > constrainSize.width)
+        {
             fontSize = fontSize - 1;
-            if(fontSize < 0) {
+            if (fontSize < 0)
+            {
                 actualSize = CGRectMake(0, 0, 0, 0);
                 break;
             }
-            
-            NSMutableAttributedString *mutableString = [[*str mutableCopy] autorelease];
-            *str = __attributedStringWithFontSize(mutableString, fontSize);
-            
+
+            NSMutableAttributedString* mutableString = [[*str mutableCopy] autorelease];
+            *str                                     = __attributedStringWithFontSize(mutableString, fontSize);
+
             CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(constrainSize.width, MAX_MEASURE_HEIGHT)
-                                    options:(NSStringDrawingUsesLineFragmentOrigin)
-                                    context:nil].size;
+                                                options:(NSStringDrawingUsesLineFragmentOrigin)context:nil]
+                                 .size;
 
-            if (fitSize.width == 0 || fitSize.height == 0) {
+            if (fitSize.width == 0 || fitSize.height == 0)
+            {
                 continue;
             }
-            
+
             actualSize.size = fitSize;
-            
-            if (constrainSize.height <= 0) {
+
+            if (constrainSize.height <= 0)
+            {
                 constrainSize.height = fitSize.height;
             }
-            if (constrainSize.width <= 0) {
+            if (constrainSize.width <= 0)
+            {
                 constrainSize.width = fitSize.width;
             }
-            if (fontSize <= 0) {
+            if (fontSize <= 0)
+            {
                 break;
             }
         }
-
     }
 
     newFontSize = fontSize;
@@ -170,16 +190,15 @@ static CGSize _calculateShrinkedSizeForString(NSAttributedString **str,
 #define SENSOR_DELAY_GAME 0.02
 
 #if !defined(CC_TARGET_OS_TVOS)
-@interface CCAccelerometerDispatcher : NSObject
-{
-    cocos2d::Acceleration *_acceleration;
-    CMMotionManager *_motionManager;
+@interface CCAccelerometerDispatcher : NSObject {
+    cocos2d::Acceleration* _acceleration;
+    CMMotionManager* _motionManager;
 }
 
-+ (id) sharedAccelerometerDispatcher;
-- (id) init;
-- (void) setAccelerometerEnabled: (bool) isEnabled;
-- (void) setAccelerometerInterval:(float) interval;
++ (id)sharedAccelerometerDispatcher;
+- (id)init;
+- (void)setAccelerometerEnabled:(bool)isEnabled;
+- (void)setAccelerometerInterval:(float)interval;
 
 @end
 
@@ -187,26 +206,28 @@ @implementation CCAccelerometerDispatcher
 
 static CCAccelerometerDispatcher* s_pAccelerometerDispatcher;
 
-+ (id) sharedAccelerometerDispatcher
++ (id)sharedAccelerometerDispatcher
 {
-    if (s_pAccelerometerDispatcher == nil) {
+    if (s_pAccelerometerDispatcher == nil)
+    {
         s_pAccelerometerDispatcher = [[self alloc] init];
     }
 
     return s_pAccelerometerDispatcher;
 }
 
-- (id) init
+- (id)init
 {
-    if( (self = [super init]) ) {
-        _acceleration = new cocos2d::Acceleration();
-        _motionManager = [[CMMotionManager alloc] init];
+    if ((self = [super init]))
+    {
+        _acceleration                              = new cocos2d::Acceleration();
+        _motionManager                             = [[CMMotionManager alloc] init];
         _motionManager.accelerometerUpdateInterval = SENSOR_DELAY_GAME;
     }
     return self;
 }
 
-- (void) dealloc
+- (void)dealloc
 {
     s_pAccelerometerDispatcher = nullptr;
     delete _acceleration;
@@ -214,13 +235,14 @@ - (void) dealloc
     [super dealloc];
 }
 
-- (void) setAccelerometerEnabled: (bool) isEnabled
+- (void)setAccelerometerEnabled:(bool)isEnabled
 {
     if (isEnabled)
     {
-        [_motionManager startAccelerometerUpdatesToQueue:[NSOperationQueue currentQueue] withHandler:^(CMAccelerometerData *accelerometerData, NSError *error) {
-            [self accelerometer:accelerometerData];
-        }];
+        [_motionManager startAccelerometerUpdatesToQueue:[NSOperationQueue currentQueue]
+                                             withHandler:^(CMAccelerometerData* accelerometerData, NSError* error) {
+                                               [self accelerometer:accelerometerData];
+                                             }];
     }
     else
     {
@@ -228,16 +250,16 @@ - (void) setAccelerometerEnabled: (bool) isEnabled
     }
 }
 
--(void) setAccelerometerInterval:(float)interval
+- (void)setAccelerometerInterval:(float)interval
 {
     _motionManager.accelerometerUpdateInterval = interval;
 }
 
-- (void)accelerometer:(CMAccelerometerData *)accelerometerData
+- (void)accelerometer:(CMAccelerometerData*)accelerometerData
 {
-    _acceleration->x = accelerometerData.acceleration.x;
-    _acceleration->y = accelerometerData.acceleration.y;
-    _acceleration->z = accelerometerData.acceleration.z;
+    _acceleration->x         = accelerometerData.acceleration.x;
+    _acceleration->y         = accelerometerData.acceleration.y;
+    _acceleration->z         = accelerometerData.acceleration.z;
     _acceleration->timestamp = accelerometerData.timestamp;
 
     double tmp = _acceleration->x;
@@ -251,28 +273,28 @@ - (void)accelerometer:(CMAccelerometerData *)accelerometerData
         // Fallback on earlier versions
         orientation = [[UIApplication sharedApplication] statusBarOrientation];
     }
-    
+
     switch (orientation)
     {
-        case UIInterfaceOrientationLandscapeRight:
-            _acceleration->x = -_acceleration->y;
-            _acceleration->y = tmp;
-            break;
-            
-        case UIInterfaceOrientationLandscapeLeft:
-            _acceleration->x = _acceleration->y;
-            _acceleration->y = -tmp;
-            break;
-            
-        case UIInterfaceOrientationPortraitUpsideDown:
-            _acceleration->x = -_acceleration->y;
-            _acceleration->y = -tmp;
-            break;
-            
-        case UIInterfaceOrientationPortrait:
-            break;
-        default:
-            NSAssert(false, @"unknown orientation");
+    case UIInterfaceOrientationLandscapeRight:
+        _acceleration->x = -_acceleration->y;
+        _acceleration->y = tmp;
+        break;
+
+    case UIInterfaceOrientationLandscapeLeft:
+        _acceleration->x = _acceleration->y;
+        _acceleration->y = -tmp;
+        break;
+
+    case UIInterfaceOrientationPortraitUpsideDown:
+        _acceleration->x = -_acceleration->y;
+        _acceleration->y = -tmp;
+        break;
+
+    case UIInterfaceOrientationPortrait:
+        break;
+    default:
+        NSAssert(false, @"unknown orientation");
     }
 
     cocos2d::EventAcceleration event(*_acceleration);
@@ -280,8 +302,7 @@ - (void)accelerometer:(CMAccelerometerData *)accelerometerData
     dispatcher->dispatchEvent(&event);
 }
 @end
-#endif // !defined(CC_TARGET_OS_TVOS)
-
+#endif  // !defined(CC_TARGET_OS_TVOS)
 
 //
 
@@ -295,23 +316,28 @@ - (void)accelerometer:(CMAccelerometerData *)accelerometerData
     {
         float scale = 1.0f;
 
-        if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) {
+        if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
+        {
             scale = [[UIScreen mainScreen] scale];
         }
 
         UIUserInterfaceIdiom userInterfaceIdiom = [UIDevice.currentDevice userInterfaceIdiom];
-        if (userInterfaceIdiom == UIUserInterfaceIdiomPad) {
+        if (userInterfaceIdiom == UIUserInterfaceIdiomPad)
+        {
             dpi = 132 * scale;
-        } else if (userInterfaceIdiom == UIUserInterfaceIdiomPhone) {
+        }
+        else if (userInterfaceIdiom == UIUserInterfaceIdiomPhone)
+        {
             dpi = 163 * scale;
-        } else {
+        }
+        else
+        {
             dpi = 160 * scale;
         }
     }
     return dpi;
 }
 
-
 void Device::setAccelerometerEnabled(bool isEnabled)
 {
 #if !defined(CC_TARGET_OS_TVOS)
@@ -330,67 +356,74 @@ - (void)accelerometer:(CMAccelerometerData *)accelerometerData
 {
     unsigned int height;
     unsigned int width;
-    bool         isPremultipliedAlpha;
-    bool         hasShadow;
-    CGSize       shadowOffset;
-    float        shadowBlur;
-    float        shadowOpacity;
-    bool         hasStroke;
-    float        strokeColorR;
-    float        strokeColorG;
-    float        strokeColorB;
-    float        strokeColorA;
-    float        strokeSize;
-    float        tintColorR;
-    float        tintColorG;
-    float        tintColorB;
-    float        tintColorA;
-
-    unsigned char*  data;
+    bool isPremultipliedAlpha;
+    bool hasShadow;
+    CGSize shadowOffset;
+    float shadowBlur;
+    float shadowOpacity;
+    bool hasStroke;
+    float strokeColorR;
+    float strokeColorG;
+    float strokeColorB;
+    float strokeColorA;
+    float strokeSize;
+    float tintColorR;
+    float tintColorG;
+    float tintColorB;
+    float tintColorA;
+
+    unsigned char* data;
 
 } tImageInfo;
 
-static CGSize _calculateStringSize(NSAttributedString *str, id font, CGSize *constrainSize, bool enableWrap, int overflow)
+static CGSize _calculateStringSize(NSAttributedString* str,
+                                   id font,
+                                   CGSize* constrainSize,
+                                   bool enableWrap,
+                                   int overflow)
 {
     CGSize textRect = CGSizeZero;
-    textRect.width = constrainSize->width > 0 ? constrainSize->width
-    : MAX_MEASURE_HEIGHT;
-    textRect.height = constrainSize->height > 0 ? constrainSize->height
-    : MAX_MEASURE_HEIGHT;
-    
-    if (overflow == 1) {
-        if(!enableWrap) {
-            textRect.width = MAX_MEASURE_HEIGHT;
+    textRect.width  = constrainSize->width > 0 ? constrainSize->width : MAX_MEASURE_HEIGHT;
+    textRect.height = constrainSize->height > 0 ? constrainSize->height : MAX_MEASURE_HEIGHT;
+
+    if (overflow == 1)
+    {
+        if (!enableWrap)
+        {
+            textRect.width  = MAX_MEASURE_HEIGHT;
             textRect.height = MAX_MEASURE_HEIGHT;
-        } else {
+        }
+        else
+        {
             textRect.height = MAX_MEASURE_HEIGHT;
         }
     }
 
     CGSize dim;
     dim = [str boundingRectWithSize:CGSizeMake(textRect.width, textRect.height)
-                                 options:(NSStringDrawingUsesLineFragmentOrigin)
-                            context:nil].size;
+                            options:(NSStringDrawingUsesLineFragmentOrigin)context:nil]
+              .size;
 
-    dim.width = ceilf(dim.width);
+    dim.width  = ceilf(dim.width);
     dim.height = ceilf(dim.height);
 
     return dim;
 }
 
-static id _createSystemFont( const char * fontName, int size)
+static id _createSystemFont(const char* fontName, int size)
 {
-    NSString * fntName      = [NSString stringWithUTF8String:fontName];
-    // On iOS custom fonts must be listed beforehand in the App info.plist (in order to be usable) and referenced only the by the font family name itself when
-    // calling [UIFont fontWithName]. Therefore even if the developer adds 'SomeFont.ttf' or 'fonts/SomeFont.ttf' to the App .plist, the font must
-    // be referenced as 'SomeFont' when calling [UIFont fontWithName]. Hence we strip out the folder path components and the extension here in order to get just
-    // the font family name itself. This stripping step is required especially for references to user fonts stored in CCB files; CCB files appear to store
-    // the '.ttf' extensions when referring to custom fonts.
+    NSString* fntName = [NSString stringWithUTF8String:fontName];
+    // On iOS custom fonts must be listed beforehand in the App info.plist (in order to be usable) and referenced only
+    // the by the font family name itself when calling [UIFont fontWithName]. Therefore even if the developer adds
+    // 'SomeFont.ttf' or 'fonts/SomeFont.ttf' to the App .plist, the font must be referenced as 'SomeFont' when calling
+    // [UIFont fontWithName]. Hence we strip out the folder path components and the extension here in order to get just
+    // the font family name itself. This stripping step is required especially for references to user fonts stored in
+    // CCB files; CCB files appear to store the '.ttf' extensions when referring to custom fonts.
     fntName = [[fntName lastPathComponent] stringByDeletingPathExtension];
-    
+
     // create the font
     id font = [UIFont fontWithName:fntName size:size];
-    
+
     if (!font)
     {
         font = [UIFont systemFontOfSize:size];
@@ -398,86 +431,89 @@ static id _createSystemFont( const char * fontName, int size)
     return font;
 }
 
-static bool _initWithString(const char * text, cocos2d::Device::TextAlign align, const char * fontName, int size, tImageInfo* info, bool enableWrap, int overflow)
+static bool _initWithString(const char* text,
+                            cocos2d::Device::TextAlign align,
+                            const char* fontName,
+                            int size,
+                            tImageInfo* info,
+                            bool enableWrap,
+                            int overflow)
 {
 
     bool bRet = false;
     do
     {
-        CC_BREAK_IF(! text || ! info);
+        CC_BREAK_IF(!text || !info);
 
         id font = _createSystemFont(fontName, size);
-        
-        CC_BREAK_IF(! font);
-        
-        NSString * str          = [NSString stringWithUTF8String:text];
+
+        CC_BREAK_IF(!font);
+
+        NSString* str = [NSString stringWithUTF8String:text];
         CC_BREAK_IF(!str);
 
         CGSize dimensions;
-        dimensions.width     = info->width;
-        dimensions.height    = info->height;
+        dimensions.width  = info->width;
+        dimensions.height = info->height;
 
-        NSTextAlignment nsAlign = FontUtils::_calculateTextAlignment(align);
+        NSTextAlignment nsAlign                 = FontUtils::_calculateTextAlignment(align);
         NSMutableParagraphStyle* paragraphStyle = FontUtils::_calculateParagraphStyle(enableWrap, overflow);
-        paragraphStyle.alignment = nsAlign;
+        paragraphStyle.alignment                = nsAlign;
 
         // measure text size with specified font and determine the rectangle to draw text in
 
-        UIColor *foregroundColor = [UIColor colorWithRed:info->tintColorR
-                                                  green:info->tintColorG
-                                                   blue:info->tintColorB
-                                                  alpha:info->tintColorA];
+        UIColor* foregroundColor = [UIColor colorWithRed:info->tintColorR
+                                                   green:info->tintColorG
+                                                    blue:info->tintColorB
+                                                   alpha:info->tintColorA];
 
         // adjust text rect according to overflow
-        NSMutableDictionary* tokenAttributesDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                             foregroundColor,NSForegroundColorAttributeName,
-                                             font, NSFontAttributeName,
-                                             paragraphStyle, NSParagraphStyleAttributeName, nil];
+        NSMutableDictionary* tokenAttributesDict = [NSMutableDictionary
+            dictionaryWithObjectsAndKeys:foregroundColor, NSForegroundColorAttributeName, font, NSFontAttributeName,
+                                         paragraphStyle, NSParagraphStyleAttributeName, nil];
 
-        NSAttributedString *stringWithAttributes =[[[NSAttributedString alloc] initWithString:str
-                                                                                   attributes:tokenAttributesDict] autorelease];
+        NSAttributedString* stringWithAttributes =
+            [[[NSAttributedString alloc] initWithString:str attributes:tokenAttributesDict] autorelease];
 
         int shrinkFontSize = size;
         CGSize realDimensions;
-        if (overflow == 2) {
-            realDimensions = _calculateShrinkedSizeForString(&stringWithAttributes, font, dimensions, enableWrap, shrinkFontSize);
-        } else {
+        if (overflow == 2)
+        {
+            realDimensions =
+                _calculateShrinkedSizeForString(&stringWithAttributes, font, dimensions, enableWrap, shrinkFontSize);
+        }
+        else
+        {
             realDimensions = _calculateStringSize(stringWithAttributes, font, &dimensions, enableWrap, overflow);
         }
 
-        
         CC_BREAK_IF(realDimensions.width <= 0 || realDimensions.height <= 0);
-        if (dimensions.width <= 0) {
+        if (dimensions.width <= 0)
+        {
             dimensions.width = realDimensions.width;
         }
-        if (dimensions.height <= 0) {
+        if (dimensions.height <= 0)
+        {
             dimensions.height = realDimensions.height;
         }
 
         // compute start point
         CGFloat yPadding = _calculateTextDrawStartHeight(align, realDimensions, dimensions);
         CGFloat xPadding = FontUtils::_calculateTextDrawStartWidth(align, realDimensions, dimensions);
-        
+
         NSInteger POTWide = dimensions.width;
         NSInteger POTHigh = dimensions.height;
-        
-        CGRect textRect = CGRectMake(xPadding, yPadding,
-                                     realDimensions.width, realDimensions.height);
 
+        CGRect textRect = CGRectMake(xPadding, yPadding, realDimensions.width, realDimensions.height);
 
         NSUInteger textureSize = POTWide * POTHigh * 4;
-        unsigned char* data = (unsigned char*)malloc(sizeof(unsigned char) * textureSize);
+        unsigned char* data    = (unsigned char*)malloc(sizeof(unsigned char) * textureSize);
         memset(data, 0, textureSize);
 
         // draw text
-        CGColorSpaceRef colorSpace  = CGColorSpaceCreateDeviceRGB();
-        CGContextRef context        = CGBitmapContextCreate(data,
-                                                            POTWide,
-                                                            POTHigh,
-                                                            8,
-                                                            POTWide * 4,
-                                                            colorSpace,
-                                                            kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
+        CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+        CGContextRef context       = CGBitmapContextCreate(data, POTWide, POTHigh, 8, POTWide * 4, colorSpace,
+                                                           kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
         if (!context)
         {
             CGColorSpaceRelease(colorSpace);
@@ -486,16 +522,12 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
         }
 
         // text color
-        CGContextSetRGBFillColor(context,
-                                 info->tintColorR,
-                                 info->tintColorG,
-                                 info->tintColorB,
-                                 info->tintColorA);
+        CGContextSetRGBFillColor(context, info->tintColorR, info->tintColorG, info->tintColorB, info->tintColorA);
 
         // move Y rendering to the top of the image
         CGContextTranslateCTM(context, 0.0f, POTHigh);
-        
-        //NOTE: NSString draws in UIKit referential i.e. renders upside-down compared to CGBitmapContext referential
+
+        // NOTE: NSString draws in UIKit referential i.e. renders upside-down compared to CGBitmapContext referential
         CGContextScaleCTM(context, 1.0f, -1.0f);
         // store the current context
         UIGraphicsPushContext(context);
@@ -506,34 +538,30 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
 
         CGContextBeginTransparencyLayerWithRect(context, textRect, NULL);
 
-
-        if ( info->hasStroke )
+        if (info->hasStroke)
         {
             CGContextSetTextDrawingMode(context, kCGTextStroke);
-            UIColor *strokeColor = [UIColor colorWithRed:info->strokeColorR
-                                                  green:info->strokeColorG
-                                                   blue:info->strokeColorB
-                                                  alpha:info->strokeColorA];
-
-                
-            NSMutableDictionary* tokenAttributesDict2 = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                                        foregroundColor,NSForegroundColorAttributeName,
-                                                        font, NSFontAttributeName,
-                                                        paragraphStyle, NSParagraphStyleAttributeName, nil];
-            [tokenAttributesDict2 setObject:[NSNumber numberWithFloat: info->strokeSize / shrinkFontSize * 100]
+            UIColor* strokeColor = [UIColor colorWithRed:info->strokeColorR
+                                                   green:info->strokeColorG
+                                                    blue:info->strokeColorB
+                                                   alpha:info->strokeColorA];
+
+            NSMutableDictionary* tokenAttributesDict2 = [NSMutableDictionary
+                dictionaryWithObjectsAndKeys:foregroundColor, NSForegroundColorAttributeName, font, NSFontAttributeName,
+                                             paragraphStyle, NSParagraphStyleAttributeName, nil];
+            [tokenAttributesDict2 setObject:[NSNumber numberWithFloat:info->strokeSize / shrinkFontSize * 100]
                                      forKey:NSStrokeWidthAttributeName];
-             [tokenAttributesDict2 setObject:strokeColor forKey:NSStrokeColorAttributeName];
-            
-            NSAttributedString *strokeString =[[[NSAttributedString alloc] initWithString:str
-                                                                                       attributes:tokenAttributesDict2] autorelease];
-            
-            if(overflow == 2){
+            [tokenAttributesDict2 setObject:strokeColor forKey:NSStrokeColorAttributeName];
+
+            NSAttributedString* strokeString =
+                [[[NSAttributedString alloc] initWithString:str attributes:tokenAttributesDict2] autorelease];
+
+            if (overflow == 2)
+            {
                 _calculateShrinkedSizeForString(&strokeString, font, dimensions, enableWrap, shrinkFontSize);
             }
 
-
             [strokeString drawInRect:textRect];
-
         }
 
         CGContextSetTextDrawingMode(context, kCGTextFill);
@@ -548,51 +576,57 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
 
         // release the context
         CGContextRelease(context);
-       
+
         // output params
         info->data                 = data;
         info->isPremultipliedAlpha = true;
         info->width                = static_cast<int>(POTWide);
         info->height               = static_cast<int>(POTHigh);
-        bRet                        = true;
+        bRet                       = true;
 
     } while (0);
 
     return bRet;
 }
 
-
-Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
+Data Device::getTextureDataForText(const char* text,
+                                   const FontDefinition& textDefinition,
+                                   TextAlign align,
+                                   int& width,
+                                   int& height,
+                                   bool& hasPremultipliedAlpha)
 {
     Data ret;
 
-    do {
-        tImageInfo info = {0};
-        info.width                  = textDefinition._dimensions.width;
-        info.height                 = textDefinition._dimensions.height;
-        info.hasShadow              = textDefinition._shadow._shadowEnabled;
-        info.shadowOffset.width     = textDefinition._shadow._shadowOffset.width;
-        info.shadowOffset.height    = textDefinition._shadow._shadowOffset.height;
-        info.shadowBlur             = textDefinition._shadow._shadowBlur;
-        info.shadowOpacity          = textDefinition._shadow._shadowOpacity;
-        info.hasStroke              = textDefinition._stroke._strokeEnabled;
-        info.strokeColorR           = textDefinition._stroke._strokeColor.r / 255.0f;
-        info.strokeColorG           = textDefinition._stroke._strokeColor.g / 255.0f;
-        info.strokeColorB           = textDefinition._stroke._strokeColor.b / 255.0f;
-        info.strokeColorA           = textDefinition._stroke._strokeAlpha / 255.0f;
-        info.strokeSize             = textDefinition._stroke._strokeSize;
-        info.tintColorR             = textDefinition._fontFillColor.r / 255.0f;
-        info.tintColorG             = textDefinition._fontFillColor.g / 255.0f;
-        info.tintColorB             = textDefinition._fontFillColor.b / 255.0f;
-        info.tintColorA             = textDefinition._fontAlpha / 255.0f;
-
-        if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, textDefinition._enableWrap, textDefinition._overflow))
+    do
+    {
+        tImageInfo info          = {0};
+        info.width               = textDefinition._dimensions.width;
+        info.height              = textDefinition._dimensions.height;
+        info.hasShadow           = textDefinition._shadow._shadowEnabled;
+        info.shadowOffset.width  = textDefinition._shadow._shadowOffset.width;
+        info.shadowOffset.height = textDefinition._shadow._shadowOffset.height;
+        info.shadowBlur          = textDefinition._shadow._shadowBlur;
+        info.shadowOpacity       = textDefinition._shadow._shadowOpacity;
+        info.hasStroke           = textDefinition._stroke._strokeEnabled;
+        info.strokeColorR        = textDefinition._stroke._strokeColor.r / 255.0f;
+        info.strokeColorG        = textDefinition._stroke._strokeColor.g / 255.0f;
+        info.strokeColorB        = textDefinition._stroke._strokeColor.b / 255.0f;
+        info.strokeColorA        = textDefinition._stroke._strokeAlpha / 255.0f;
+        info.strokeSize          = textDefinition._stroke._strokeSize;
+        info.tintColorR          = textDefinition._fontFillColor.r / 255.0f;
+        info.tintColorG          = textDefinition._fontFillColor.g / 255.0f;
+        info.tintColorB          = textDefinition._fontFillColor.b / 255.0f;
+        info.tintColorA          = textDefinition._fontAlpha / 255.0f;
+
+        if (!_initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info,
+                             textDefinition._enableWrap, textDefinition._overflow))
         {
             break;
         }
         height = info.height;
-        width = info.width;
-        ret.fastSet(info.data,width * height * 4);
+        width  = info.width;
+        ret.fastSet(info.data, width * height * 4);
         hasPremultipliedAlpha = true;
     } while (0);
 
@@ -605,22 +639,23 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
 }
 
 /*!
- @brief Only works on iOS devices that support vibration (such as iPhone). Should only be used for important alerts. Use risks rejection in iTunes Store.
+ @brief Only works on iOS devices that support vibration (such as iPhone). Should only be used for important alerts. Use
+ risks rejection in iTunes Store.
  @param duration ignored for iOS
  */
 void Device::vibrate(float duration)
 {
     // See http://stackoverflow.com/questions/4724980/making-the-iphone-vibrate
     // should vibrate no matter it is silient or not
-    if([[UIDevice currentDevice].model isEqualToString:@"iPhone"])
+    if ([[UIDevice currentDevice].model isEqualToString:@"iPhone"])
     {
-        AudioServicesPlaySystemSound (1352); //works ALWAYS as of this post
+        AudioServicesPlaySystemSound(1352);  // works ALWAYS as of this post
     }
     else
     {
         // Not an iPhone, so doesn't have vibrate
         // play the less annoying tick noise or one of your own
-        AudioServicesPlayAlertSound (kSystemSoundID_Vibrate);
+        AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
     }
 }
 
diff --git a/cocos/platform/ios/CCDirectorCaller-ios.mm b/cocos/platform/ios/CCDirectorCaller-ios.mm
index 6b34dd90f105..53c4e249737b 100644
--- a/cocos/platform/ios/CCDirectorCaller-ios.mm
+++ b/cocos/platform/ios/CCDirectorCaller-ios.mm
@@ -35,50 +35,55 @@ of this software and associated documentation files (the "Software"), to deal
 
 static id s_sharedDirectorCaller;
 
-@interface NSObject(CADisplayLink)
-+(id) displayLinkWithTarget: (id)arg1 selector:(SEL)arg2;
--(void) addToRunLoop: (id)arg1 forMode: (id)arg2;
--(void) setFrameInterval: (NSInteger)interval;
--(void) invalidate;
+@interface NSObject (CADisplayLink)
++ (id)displayLinkWithTarget:(id)arg1 selector:(SEL)arg2;
+- (void)addToRunLoop:(id)arg1 forMode:(id)arg2;
+- (void)setFrameInterval:(NSInteger)interval;
+- (void)invalidate;
 @end
 
 @implementation CCDirectorCaller
 
 @synthesize interval;
 
-+(id) sharedDirectorCaller
++ (id)sharedDirectorCaller
 {
     if (s_sharedDirectorCaller == nil)
     {
         s_sharedDirectorCaller = [[CCDirectorCaller alloc] init];
     }
-    
+
     return s_sharedDirectorCaller;
 }
 
-+(void) destroy
++ (void)destroy
 {
     [s_sharedDirectorCaller stopMainLoop];
     [s_sharedDirectorCaller release];
     s_sharedDirectorCaller = nil;
 }
 
-
 - (instancetype)init
 {
     if (self = [super init])
     {
-        isAppActive = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
-        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-        [nc addObserver:self selector:@selector(appDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
-        [nc addObserver:self selector:@selector(appDidBecomeInactive) name:UIApplicationWillResignActiveNotification object:nil];
-        
+        isAppActive              = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
+        NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
+        [nc addObserver:self
+               selector:@selector(appDidBecomeActive)
+                   name:UIApplicationDidBecomeActiveNotification
+                 object:nil];
+        [nc addObserver:self
+               selector:@selector(appDidBecomeInactive)
+                   name:UIApplicationWillResignActiveNotification
+                 object:nil];
+
         self.interval = 1;
     }
     return self;
 }
 
--(void) dealloc
+- (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [displayLink release];
@@ -100,52 +105,53 @@ - (void)appDidBecomeInactive
     isAppActive = NO;
 }
 
--(void) startMainLoop
+- (void)startMainLoop
 {
     // Director::setAnimationInterval() is called, we should invalidate it first
     [self stopMainLoop];
-    
+
     displayLink = [NSClassFromString(@"CADisplayLink") displayLinkWithTarget:self selector:@selector(doCaller:)];
-    [displayLink setFrameInterval: self.interval];
+    [displayLink setFrameInterval:self.interval];
     [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 }
 
--(void) stopMainLoop
+- (void)stopMainLoop
 {
     [displayLink invalidate];
     displayLink = nil;
 }
 
--(void) setAnimationInterval:(double)intervalNew
+- (void)setAnimationInterval:(double)intervalNew
 {
     // Director::setAnimationInterval() is called, we should invalidate it first
     [self stopMainLoop];
-        
+
     self.interval = 60.0 * intervalNew;
-        
+
     displayLink = [NSClassFromString(@"CADisplayLink") displayLinkWithTarget:self selector:@selector(doCaller:)];
-    [displayLink setFrameInterval: self.interval];
+    [displayLink setFrameInterval:self.interval];
     [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 }
-                      
--(void) doCaller: (id) sender
+
+- (void)doCaller:(id)sender
 {
-    if (isAppActive) {
+    if (isAppActive)
+    {
         cocos2d::Director* director = cocos2d::Director::getInstance();
 #if defined(CC_USE_GLES)
         EAGLContext* cocos2dxContext = [(CCEAGLView*)director->getOpenGLView()->getEAGLView() context];
         if (cocos2dxContext != [EAGLContext currentContext])
             glFlush();
-        
-        [EAGLContext setCurrentContext: cocos2dxContext];
+
+        [EAGLContext setCurrentContext:cocos2dxContext];
 #endif
         CFTimeInterval dt = ((CADisplayLink*)displayLink).timestamp - lastDisplayTime;
-        lastDisplayTime = ((CADisplayLink*)displayLink).timestamp;
+        lastDisplayTime   = ((CADisplayLink*)displayLink).timestamp;
         director->mainLoop(dt);
     }
 }
 
--(void)initLastDisplayTime
+- (void)initLastDisplayTime
 {
     struct mach_timebase_info timeBaseInfo;
     mach_timebase_info(&timeBaseInfo);
diff --git a/cocos/platform/ios/CCEAGLView-ios.mm b/cocos/platform/ios/CCEAGLView-ios.mm
index 6cd9b6c270ec..ca1bccdadd3f 100644
--- a/cocos/platform/ios/CCEAGLView-ios.mm
+++ b/cocos/platform/ios/CCEAGLView-ios.mm
@@ -70,21 +70,21 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 #import "platform/ios/CCInputView-ios.h"
 
 #if defined(CC_USE_METAL)
-#import <Metal/Metal.h>
-#import "renderer/backend/metal/DeviceMTL.h"
-#import "renderer/backend/metal/UtilsMTL.h"
+#    import <Metal/Metal.h>
+#    import "renderer/backend/metal/DeviceMTL.h"
+#    import "renderer/backend/metal/UtilsMTL.h"
 #else
-#import "platform/ios/CCGLViewImpl-ios.h"
-#import "platform/ios/CCES2Renderer-ios.h"
-#import "platform/ios/OpenGL_Internal-ios.h"
+#    import "platform/ios/CCGLViewImpl-ios.h"
+#    import "platform/ios/CCES2Renderer-ios.h"
+#    import "platform/ios/OpenGL_Internal-ios.h"
 #endif
 
-//CLASS IMPLEMENTATIONS:
+// CLASS IMPLEMENTATIONS:
 
-#define IOS_MAX_TOUCHES_COUNT     10
+#define IOS_MAX_TOUCHES_COUNT 10
 
 @interface CCEAGLView ()
-@property (nonatomic) CCInputView* textInputView;
+@property(nonatomic) CCInputView* textInputView;
 @property(nonatomic, readwrite, assign) BOOL isKeyboardShown;
 @property(nonatomic, copy) NSNotification* keyboardShowNotification;
 @property(nonatomic, assign) CGRect originalRect;
@@ -92,17 +92,17 @@ @interface CCEAGLView ()
 
 @implementation CCEAGLView
 
-@synthesize surfaceSize=size_;
-@synthesize pixelFormat=pixelformat_, depthFormat=depthFormat_;
+@synthesize surfaceSize = size_;
+@synthesize pixelFormat = pixelformat_, depthFormat = depthFormat_;
 #if !defined(CC_USE_METAL)
-@synthesize context=context_;
+@synthesize context = context_;
 #endif
-@synthesize multiSampling=multiSampling_;
+@synthesize multiSampling            = multiSampling_;
 @synthesize keyboardShowNotification = keyboardShowNotification_;
 @synthesize isKeyboardShown;
 @synthesize originalRect = originalRect_;
 
-+ (Class) layerClass
++ (Class)layerClass
 {
 #if defined(CC_USE_METAL)
     return [CAMetalLayer class];
@@ -111,153 +111,191 @@ + (Class) layerClass
 #endif
 }
 
-+ (id) viewWithFrame:(CGRect)frame
++ (id)viewWithFrame:(CGRect)frame
 {
     return [[[self alloc] initWithFrame:frame] autorelease];
 }
 
-+ (id) viewWithFrame:(CGRect)frame pixelFormat:(NSString*)format
++ (id)viewWithFrame:(CGRect)frame pixelFormat:(NSString*)format
 {
-    return [[[self alloc]initWithFrame:frame pixelFormat:format] autorelease];
+    return [[[self alloc] initWithFrame:frame pixelFormat:format] autorelease];
 }
 
-+ (id) viewWithFrame:(CGRect)frame pixelFormat:(NSString*)format depthFormat:(GLuint)depth
++ (id)viewWithFrame:(CGRect)frame pixelFormat:(NSString*)format depthFormat:(GLuint)depth
 {
-    return [[[self alloc] initWithFrame:frame pixelFormat:format depthFormat:depth preserveBackbuffer:NO sharegroup:nil multiSampling:NO numberOfSamples:0] autorelease];
+    return [[[self alloc] initWithFrame:frame
+                            pixelFormat:format
+                            depthFormat:depth
+                     preserveBackbuffer:NO
+                             sharegroup:nil
+                          multiSampling:NO
+                        numberOfSamples:0] autorelease];
 }
 
-+ (id) viewWithFrame:(CGRect)frame pixelFormat:(NSString*)format depthFormat:(GLuint)depth preserveBackbuffer:(BOOL)retained sharegroup:(EAGLSharegroup*)sharegroup multiSampling:(BOOL)multisampling numberOfSamples:(unsigned int)samples
++ (id)viewWithFrame:(CGRect)frame
+           pixelFormat:(NSString*)format
+           depthFormat:(GLuint)depth
+    preserveBackbuffer:(BOOL)retained
+            sharegroup:(EAGLSharegroup*)sharegroup
+         multiSampling:(BOOL)multisampling
+       numberOfSamples:(unsigned int)samples
 {
-    return [[[self alloc]initWithFrame:frame pixelFormat:format depthFormat:depth preserveBackbuffer:retained sharegroup:sharegroup multiSampling:multisampling numberOfSamples:samples] autorelease];
+    return [[[self alloc] initWithFrame:frame
+                            pixelFormat:format
+                            depthFormat:depth
+                     preserveBackbuffer:retained
+                             sharegroup:sharegroup
+                          multiSampling:multisampling
+                        numberOfSamples:samples] autorelease];
 }
 
-- (id) initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
-    return [self initWithFrame:frame pixelFormat:kEAGLColorFormatRGB565 depthFormat:0 preserveBackbuffer:NO sharegroup:nil multiSampling:NO numberOfSamples:0];
+    return [self initWithFrame:frame
+                   pixelFormat:kEAGLColorFormatRGB565
+                   depthFormat:0
+            preserveBackbuffer:NO
+                    sharegroup:nil
+                 multiSampling:NO
+               numberOfSamples:0];
 }
 
-- (id) initWithFrame:(CGRect)frame pixelFormat:(NSString*)format 
+- (id)initWithFrame:(CGRect)frame pixelFormat:(NSString*)format
 {
-    return [self initWithFrame:frame pixelFormat:format depthFormat:0 preserveBackbuffer:NO sharegroup:nil multiSampling:NO numberOfSamples:0];
+    return [self initWithFrame:frame
+                   pixelFormat:format
+                   depthFormat:0
+            preserveBackbuffer:NO
+                    sharegroup:nil
+                 multiSampling:NO
+               numberOfSamples:0];
 }
 
-- (id) initWithFrame:(CGRect)frame pixelFormat:(NSString*)format depthFormat:(GLuint)depth preserveBackbuffer:(BOOL)retained sharegroup:(EAGLSharegroup*)sharegroup multiSampling:(BOOL)sampling numberOfSamples:(unsigned int)nSamples
+- (id)initWithFrame:(CGRect)frame
+           pixelFormat:(NSString*)format
+           depthFormat:(GLuint)depth
+    preserveBackbuffer:(BOOL)retained
+            sharegroup:(EAGLSharegroup*)sharegroup
+         multiSampling:(BOOL)sampling
+       numberOfSamples:(unsigned int)nSamples
 {
-    if((self = [super initWithFrame:frame]))
+    if ((self = [super initWithFrame:frame]))
     {
         self.textInputView = [[CCInputView alloc] initWithFrame:frame];
 
-        originalRect_ = self.frame;
+        originalRect_                 = self.frame;
         self.keyboardShowNotification = nil;
         if ([self respondsToSelector:@selector(setContentScaleFactor:)])
         {
             self.contentScaleFactor = [[UIScreen mainScreen] scale];
         }
-        
+
 #if defined(CC_USE_METAL)
         id<MTLDevice> device = MTLCreateSystemDefaultDevice();
         if (!device)
         {
-             CCLOG("Doesn't support metal.");
-             return nil;
+            CCLOG("Doesn't support metal.");
+            return nil;
         }
-        CAMetalLayer* metalLayer = (CAMetalLayer*)[self layer];
-        metalLayer.device = device;
-        metalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm;
+        CAMetalLayer* metalLayer   = (CAMetalLayer*)[self layer];
+        metalLayer.device          = device;
+        metalLayer.pixelFormat     = MTLPixelFormatBGRA8Unorm;
         metalLayer.framebufferOnly = YES;
         cocos2d::backend::DeviceMTL::setCAMetalLayer(metalLayer);
 #else
-        pixelformat_ = format;
-        depthFormat_ = depth;
-        multiSampling_ = sampling;
-        requestedSamples_ = nSamples;
+        pixelformat_        = format;
+        depthFormat_        = depth;
+        multiSampling_      = sampling;
+        requestedSamples_   = nSamples;
         preserveBackbuffer_ = retained;
-        if( ! [self setupSurfaceWithSharegroup:sharegroup] ) {
+        if (![self setupSurfaceWithSharegroup:sharegroup])
+        {
             [self release];
             return nil;
         }
 #endif
     }
-    
+
     return self;
 }
 
--(id) initWithCoder:(NSCoder *)aDecoder
+- (id)initWithCoder:(NSCoder*)aDecoder
 {
-    if ( (self = [super initWithCoder:aDecoder]) )
+    if ((self = [super initWithCoder:aDecoder]))
     {
         self.textInputView = [[CCInputView alloc] initWithCoder:aDecoder];
 #if defined(CC_USE_METAL)
         size_ = [self bounds].size;
 #else
         CAEAGLLayer* eaglLayer = (CAEAGLLayer*)[self layer];
-        
-        pixelformat_ = kEAGLColorFormatRGB565;
-        depthFormat_ = 0; // GL_DEPTH_COMPONENT24_OES;
-        multiSampling_= NO;
+
+        pixelformat_      = kEAGLColorFormatRGB565;
+        depthFormat_      = 0;  // GL_DEPTH_COMPONENT24_OES;
+        multiSampling_    = NO;
         requestedSamples_ = 0;
-        size_ = [eaglLayer bounds].size;
-        
-        if( ! [self setupSurfaceWithSharegroup:nil] ) {
+        size_             = [eaglLayer bounds].size;
+
+        if (![self setupSurfaceWithSharegroup:nil])
+        {
             [self release];
             return nil;
         }
 #endif
     }
-    
+
     return self;
 }
 
--(int) getWidth
+- (int)getWidth
 {
     CGSize bound = [self bounds].size;
     return (int)bound.width * self.contentScaleFactor;
 }
 
--(int) getHeight
+- (int)getHeight
 {
     CGSize bound = [self bounds].size;
     return (int)bound.height * self.contentScaleFactor;
 }
 
 #if !defined(CC_USE_METAL)
--(BOOL) setupSurfaceWithSharegroup:(EAGLSharegroup*)sharegroup
+- (BOOL)setupSurfaceWithSharegroup:(EAGLSharegroup*)sharegroup
 {
-    CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
-    
+    CAEAGLLayer* eaglLayer = (CAEAGLLayer*)self.layer;
+
     eaglLayer.opaque = YES;
-    eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
-                                    [NSNumber numberWithBool:preserveBackbuffer_], kEAGLDrawablePropertyRetainedBacking,
-                                    pixelformat_, kEAGLDrawablePropertyColorFormat, nil];
-    
-    
+    eaglLayer.drawableProperties =
+        [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:preserveBackbuffer_],
+                                                   kEAGLDrawablePropertyRetainedBacking, pixelformat_,
+                                                   kEAGLDrawablePropertyColorFormat, nil];
+
     renderer_ = [[CCES2Renderer alloc] initWithDepthFormat:depthFormat_
-                                         withPixelFormat:[self convertPixelFormat:pixelformat_]
-                                          withSharegroup:sharegroup
-                                       withMultiSampling:multiSampling_
-                                     withNumberOfSamples:requestedSamples_];
-    
+                                           withPixelFormat:[self convertPixelFormat:pixelformat_]
+                                            withSharegroup:sharegroup
+                                         withMultiSampling:multiSampling_
+                                       withNumberOfSamples:requestedSamples_];
+
     NSAssert(renderer_, @"OpenGL ES 2.O is required.");
     if (!renderer_)
         return NO;
-    
+
     context_ = [renderer_ context];
-    
-    #if GL_EXT_discard_framebuffer == 1
-        discardFramebufferSupported_ = YES;
-    #else
-        discardFramebufferSupported_ = NO;
-    #endif
-    
+
+#    if GL_EXT_discard_framebuffer == 1
+    discardFramebufferSupported_ = YES;
+#    else
+    discardFramebufferSupported_ = NO;
+#    endif
+
     CHECK_GL_ERROR();
-    
+
     return YES;
 }
 #endif
 
-- (void) dealloc
+- (void)dealloc
 {
-    [[NSNotificationCenter defaultCenter] removeObserver:self]; // remove keyboard notification
+    [[NSNotificationCenter defaultCenter] removeObserver:self];  // remove keyboard notification
 #if !defined(CC_USE_METAL)
     [renderer_ release];
 #endif
@@ -265,29 +303,29 @@ - (void) dealloc
     [super dealloc];
 }
 
-- (void) layoutSubviews
+- (void)layoutSubviews
 {
     if (!cocos2d::Director::getInstance()->isValid())
         return;
-    
+
 #if defined(CC_USE_METAL)
     size_ = [self bounds].size;
     size_.width *= self.contentScaleFactor;
     size_.height *= self.contentScaleFactor;
-    cocos2d::backend::UtilsMTL::resizeDefaultAttachmentTexture(size_.width, size_.height); 
+    cocos2d::backend::UtilsMTL::resizeDefaultAttachmentTexture(size_.width, size_.height);
 #else
     [renderer_ resizeFromLayer:(CAEAGLLayer*)self.layer];
     size_ = [renderer_ backingSize];
 
     // Issue #914 #924
-//     Director *director = [Director sharedDirector];
-//     [director reshapeProjection:size_];
+    //     Director *director = [Director sharedDirector];
+    //     [director reshapeProjection:size_];
     cocos2d::Size size;
-    size.width = size_.width;
+    size.width  = size_.width;
     size.height = size_.height;
-    //cocos2d::Director::getInstance()->reshapeProjection(size);
+    // cocos2d::Director::getInstance()->reshapeProjection(size);
 #endif
-    
+
     // Avoid flicker. Issue #350
     if ([NSThread isMainThread])
     {
@@ -296,29 +334,28 @@ - (void) layoutSubviews
 }
 
 #if defined(CC_USE_METAL)
-- (void) swapBuffers
-{
-}
+- (void)swapBuffers
+{}
 #else
-- (void) swapBuffers
+- (void)swapBuffers
 {
     // IMPORTANT:
-        // - preconditions
-        //    -> context_ MUST be the OpenGL context
-        //    -> renderbuffer_ must be the RENDER BUFFER
+    // - preconditions
+    //    -> context_ MUST be the OpenGL context
+    //    -> renderbuffer_ must be the RENDER BUFFER
+
+#    ifdef __IPHONE_4_0
 
-#ifdef __IPHONE_4_0
-    
     if (multiSampling_)
     {
         /* Resolve from msaaFramebuffer to resolveFramebuffer */
-        //glDisable(GL_SCISSOR_TEST);
+        // glDisable(GL_SCISSOR_TEST);
         glBindFramebuffer(GL_READ_FRAMEBUFFER_APPLE, [renderer_ msaaFrameBuffer]);
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER_APPLE, [renderer_ defaultFrameBuffer]);
         glResolveMultisampleFramebufferAPPLE();
     }
-    
-    if(discardFramebufferSupported_)
+
+    if (discardFramebufferSupported_)
     {
         if (multiSampling_)
         {
@@ -332,97 +369,98 @@ - (void) swapBuffers
                 GLenum attachments[] = {GL_COLOR_ATTACHMENT0};
                 glDiscardFramebufferEXT(GL_READ_FRAMEBUFFER_APPLE, 1, attachments);
             }
-            
+
             glBindRenderbuffer(GL_RENDERBUFFER, [renderer_ colorRenderBuffer]);
-    
         }
-        
+
         // not MSAA
-        else if (depthFormat_ ) {
-            GLenum attachments[] = { GL_DEPTH_ATTACHMENT};
+        else if (depthFormat_)
+        {
+            GLenum attachments[] = {GL_DEPTH_ATTACHMENT};
             glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, attachments);
         }
     }
-    
-#endif // __IPHONE_4_0
-    
-     if(![context_ presentRenderbuffer:GL_RENDERBUFFER])
-        {
-//         CCLOG(@"cocos2d: Failed to swap renderbuffer in %s\n", __FUNCTION__);
-        }
 
-#if COCOS2D_DEBUG
+#    endif  // __IPHONE_4_0
+
+    if (![context_ presentRenderbuffer:GL_RENDERBUFFER])
+    {
+        //         CCLOG(@"cocos2d: Failed to swap renderbuffer in %s\n", __FUNCTION__);
+    }
+
+#    if COCOS2D_DEBUG
     CHECK_GL_ERROR();
-#endif
-    
+#    endif
+
     // We can safely re-bind the framebuffer here, since this will be the
     // 1st instruction of the new main loop
-    if( multiSampling_ )
+    if (multiSampling_)
         glBindFramebuffer(GL_FRAMEBUFFER, [renderer_ msaaFrameBuffer]);
 }
 
-- (unsigned int) convertPixelFormat:(NSString*) pixelFormat
+- (unsigned int)convertPixelFormat:(NSString*)pixelFormat
 {
     // define the pixel format
     GLenum pFormat;
-    
-    
-    if([pixelFormat isEqualToString:@"EAGLColorFormat565"])
+
+    if ([pixelFormat isEqualToString:@"EAGLColorFormat565"])
         pFormat = GL_RGB565;
     else
         pFormat = GL_RGBA8_OES;
-    
+
     return pFormat;
 }
 #endif
 
 #pragma mark CCEAGLView - Point conversion
 
-- (CGPoint) convertPointFromViewToSurface:(CGPoint)point
+- (CGPoint)convertPointFromViewToSurface:(CGPoint)point
 {
     CGRect bounds = [self bounds];
-    
+
     CGPoint ret;
     ret.x = (point.x - bounds.origin.x) / bounds.size.width * size_.width;
-    ret.y =  (point.y - bounds.origin.y) / bounds.size.height * size_.height;
-    
+    ret.y = (point.y - bounds.origin.y) / bounds.size.height * size_.height;
+
     return ret;
 }
 
-- (CGRect) convertRectFromViewToSurface:(CGRect)rect
+- (CGRect)convertRectFromViewToSurface:(CGRect)rect
 {
     CGRect bounds = [self bounds];
-    
+
     CGRect ret;
-    ret.origin.x = (rect.origin.x - bounds.origin.x) / bounds.size.width * size_.width;
-    ret.origin.y = (rect.origin.y - bounds.origin.y) / bounds.size.height * size_.height;
-    ret.size.width = rect.size.width / bounds.size.width * size_.width;
+    ret.origin.x    = (rect.origin.x - bounds.origin.x) / bounds.size.width * size_.width;
+    ret.origin.y    = (rect.origin.y - bounds.origin.y) / bounds.size.height * size_.height;
+    ret.size.width  = rect.size.width / bounds.size.width * size_.width;
     ret.size.height = rect.size.height / bounds.size.height * size_.height;
-    
+
     return ret;
 }
 
 // Pass the touches to the superview
 #pragma mark CCEAGLView - Touch Delegate
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+- (void)touchesBegan:(NSSet*)touches withEvent:(UIEvent*)event
 {
     if (self.isKeyboardShown)
         [self closeKeyboardOpenedByEditBox];
-    
+
     UITouch* ids[IOS_MAX_TOUCHES_COUNT] = {0};
-    float xs[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float ys[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    
+    float xs[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float ys[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+
     int i = 0;
-    for (UITouch *touch in touches) {
-        if (i >= IOS_MAX_TOUCHES_COUNT) {
+    for (UITouch* touch in touches)
+    {
+        if (i >= IOS_MAX_TOUCHES_COUNT)
+        {
             CCLOG("warning: touches more than 10, should adjust IOS_MAX_TOUCHES_COUNT");
             break;
         }
 
         ids[i] = touch;
-        xs[i] = [touch locationInView: [touch view]].x * self.contentScaleFactor;
-        ys[i] = [touch locationInView: [touch view]].y * self.contentScaleFactor;
+        xs[i]  = [touch locationInView:[touch view]].x * self.contentScaleFactor;
+        ys[i]  = [touch locationInView:[touch view]].y * self.contentScaleFactor;
         ++i;
     }
 
@@ -430,27 +468,30 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
     glview->handleTouchesBegin(i, (intptr_t*)ids, xs, ys);
 }
 
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+- (void)touchesMoved:(NSSet*)touches withEvent:(UIEvent*)event
 {
     UITouch* ids[IOS_MAX_TOUCHES_COUNT] = {0};
-    float xs[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float ys[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float fs[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float ms[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    
+    float xs[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float ys[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float fs[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float ms[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+
     int i = 0;
-    for (UITouch *touch in touches) {
-        if (i >= IOS_MAX_TOUCHES_COUNT) {
+    for (UITouch* touch in touches)
+    {
+        if (i >= IOS_MAX_TOUCHES_COUNT)
+        {
             CCLOG("warning: touches more than 10, should adjust IOS_MAX_TOUCHES_COUNT");
             break;
         }
 
         ids[i] = touch;
-        xs[i] = [touch locationInView: [touch view]].x * self.contentScaleFactor;
-        ys[i] = [touch locationInView: [touch view]].y * self.contentScaleFactor;
+        xs[i]  = [touch locationInView:[touch view]].x * self.contentScaleFactor;
+        ys[i]  = [touch locationInView:[touch view]].y * self.contentScaleFactor;
 #if defined(__IPHONE_9_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
         // running on iOS 9.0 or higher version
-        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9.0f) {
+        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9.0f)
+        {
             fs[i] = touch.force;
             ms[i] = touch.maximumPossibleForce;
         }
@@ -462,45 +503,49 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
     glview->handleTouchesMove(i, (intptr_t*)ids, xs, ys, fs, ms);
 }
 
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+- (void)touchesEnded:(NSSet*)touches withEvent:(UIEvent*)event
 {
     UITouch* ids[IOS_MAX_TOUCHES_COUNT] = {0};
-    float xs[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float ys[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    
+    float xs[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float ys[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+
     int i = 0;
-    for (UITouch *touch in touches) {
-        if (i >= IOS_MAX_TOUCHES_COUNT) {
+    for (UITouch* touch in touches)
+    {
+        if (i >= IOS_MAX_TOUCHES_COUNT)
+        {
             CCLOG("warning: touches more than 10, should adjust IOS_MAX_TOUCHES_COUNT");
             break;
         }
 
         ids[i] = touch;
-        xs[i] = [touch locationInView: [touch view]].x * self.contentScaleFactor;
-        ys[i] = [touch locationInView: [touch view]].y * self.contentScaleFactor;
+        xs[i]  = [touch locationInView:[touch view]].x * self.contentScaleFactor;
+        ys[i]  = [touch locationInView:[touch view]].y * self.contentScaleFactor;
         ++i;
     }
 
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
     glview->handleTouchesEnd(i, (intptr_t*)ids, xs, ys);
 }
-    
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+
+- (void)touchesCancelled:(NSSet*)touches withEvent:(UIEvent*)event
 {
     UITouch* ids[IOS_MAX_TOUCHES_COUNT] = {0};
-    float xs[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    float ys[IOS_MAX_TOUCHES_COUNT] = {0.0f};
-    
+    float xs[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+    float ys[IOS_MAX_TOUCHES_COUNT]     = {0.0f};
+
     int i = 0;
-    for (UITouch *touch in touches) {
-        if (i >= IOS_MAX_TOUCHES_COUNT) {
+    for (UITouch* touch in touches)
+    {
+        if (i >= IOS_MAX_TOUCHES_COUNT)
+        {
             CCLOG("warning: touches more than 10, should adjust IOS_MAX_TOUCHES_COUNT");
             break;
         }
-        
+
         ids[i] = touch;
-        xs[i] = [touch locationInView: [touch view]].x * self.contentScaleFactor;
-        ys[i] = [touch locationInView: [touch view]].y * self.contentScaleFactor;
+        xs[i]  = [touch locationInView:[touch view]].x * self.contentScaleFactor;
+        ys[i]  = [touch locationInView:[touch view]].y * self.contentScaleFactor;
         ++i;
     }
 
@@ -508,83 +553,90 @@ - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
     glview->handleTouchesCancel(i, (intptr_t*)ids, xs, ys);
 }
 
-- (void) showKeyboard
+- (void)showKeyboard
 {
     [self addSubview:self.textInputView];
     [self.textInputView becomeFirstResponder];
 }
 
-- (void) hideKeyboard
+- (void)hideKeyboard
 {
     [self.textInputView resignFirstResponder];
     [self.textInputView removeFromSuperview];
 }
 
--(void) doAnimationWhenKeyboardMoveWithDuration:(float) duration distance:(float) dis
+- (void)doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)dis
 {
     [UIView beginAnimations:nil context:nullptr];
-        [UIView setAnimationDelegate:self];
-        [UIView setAnimationDuration:duration];
-        [UIView setAnimationBeginsFromCurrentState:YES];
-        
-        //NSLog(@"[animation] dis = %f, scale = %f \n", dis, cocos2d::GLView::getInstance()->getScaleY());
-        
-        if (dis < 0.0f) dis = 0.0f;
-
-        auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-        dis *= glview->getScaleY();
-        
-        dis /= self.contentScaleFactor;
-
-    #if defined(CC_TARGET_OS_TVOS)
-        self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y - dis, originalRect_.size.width, originalRect_.size.height);
-    #else
-        switch (getFixedOrientation([[UIApplication sharedApplication] statusBarOrientation]))
-        {
-            case UIInterfaceOrientationPortrait:
-                self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y - dis, originalRect_.size.width, originalRect_.size.height);
-                break;
-                
-            case UIInterfaceOrientationPortraitUpsideDown:
-                self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y + dis, originalRect_.size.width, originalRect_.size.height);
-                break;
-                
-            case UIInterfaceOrientationLandscapeLeft:
-                self.frame = CGRectMake(originalRect_.origin.x - dis, originalRect_.origin.y , originalRect_.size.width, originalRect_.size.height);
-                break;
-                
-            case UIInterfaceOrientationLandscapeRight:
-                self.frame = CGRectMake(originalRect_.origin.x + dis, originalRect_.origin.y , originalRect_.size.width, originalRect_.size.height);
-                break;
-                
-            default:
-                break;
-        }
-    #endif
-        
-        [UIView commitAnimations];
+    [UIView setAnimationDelegate:self];
+    [UIView setAnimationDuration:duration];
+    [UIView setAnimationBeginsFromCurrentState:YES];
+
+    // NSLog(@"[animation] dis = %f, scale = %f \n", dis, cocos2d::GLView::getInstance()->getScaleY());
+
+    if (dis < 0.0f)
+        dis = 0.0f;
+
+    auto glview = cocos2d::Director::getInstance()->getOpenGLView();
+    dis *= glview->getScaleY();
+
+    dis /= self.contentScaleFactor;
+
+#if defined(CC_TARGET_OS_TVOS)
+    self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y - dis, originalRect_.size.width,
+                            originalRect_.size.height);
+#else
+    switch (getFixedOrientation([[UIApplication sharedApplication] statusBarOrientation]))
+    {
+    case UIInterfaceOrientationPortrait:
+        self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y - dis, originalRect_.size.width,
+                                originalRect_.size.height);
+        break;
+
+    case UIInterfaceOrientationPortraitUpsideDown:
+        self.frame = CGRectMake(originalRect_.origin.x, originalRect_.origin.y + dis, originalRect_.size.width,
+                                originalRect_.size.height);
+        break;
+
+    case UIInterfaceOrientationLandscapeLeft:
+        self.frame = CGRectMake(originalRect_.origin.x - dis, originalRect_.origin.y, originalRect_.size.width,
+                                originalRect_.size.height);
+        break;
+
+    case UIInterfaceOrientationLandscapeRight:
+        self.frame = CGRectMake(originalRect_.origin.x + dis, originalRect_.origin.y, originalRect_.size.width,
+                                originalRect_.size.height);
+        break;
+
+    default:
+        break;
+    }
+#endif
+
+    [UIView commitAnimations];
 }
 
--(void) doAnimationWhenAnotherEditBeClicked
+- (void)doAnimationWhenAnotherEditBeClicked
 {
     if (self.keyboardShowNotification != nil)
     {
-        [[NSNotificationCenter defaultCenter]postNotification:self.keyboardShowNotification];
+        [[NSNotificationCenter defaultCenter] postNotification:self.keyboardShowNotification];
     }
 }
 
 #pragma UIKeyboard notification
 
 #if !defined(CC_TARGET_OS_TVOS)
-namespace {
-    UIInterfaceOrientation getFixedOrientation(UIInterfaceOrientation statusBarOrientation)
+namespace
+{
+UIInterfaceOrientation getFixedOrientation(UIInterfaceOrientation statusBarOrientation)
+{
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
     {
-        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
-        {
-            statusBarOrientation = UIInterfaceOrientationPortrait;
-        }
-        return statusBarOrientation;
+        statusBarOrientation = UIInterfaceOrientationPortrait;
     }
+    return statusBarOrientation;
+}
 }
 #endif
 
@@ -593,87 +645,89 @@ - (void)didMoveToWindow
 #if !defined(CC_TARGET_OS_TVOS)
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onUIKeyboardNotification:)
-                                                 name:UIKeyboardWillShowNotification object:nil];
+                                                 name:UIKeyboardWillShowNotification
+                                               object:nil];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onUIKeyboardNotification:)
-                                                 name:UIKeyboardDidShowNotification object:nil];
+                                                 name:UIKeyboardDidShowNotification
+                                               object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onUIKeyboardNotification:)
-                                                 name:UIKeyboardWillHideNotification object:nil];
+                                                 name:UIKeyboardWillHideNotification
+                                               object:nil];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onUIKeyboardNotification:)
-                                                 name:UIKeyboardDidHideNotification object:nil];
+                                                 name:UIKeyboardDidHideNotification
+                                               object:nil];
 #endif
 }
 
-- (void)onUIKeyboardNotification:(NSNotification *)notif
+- (void)onUIKeyboardNotification:(NSNotification*)notif
 {
-    NSString * type = notif.name;
-    
+    NSString* type = notif.name;
+
     NSDictionary* info = [notif userInfo];
-    CGRect begin = [self convertRect:
-                    [[info objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue]
-                            fromView:self];
-    CGRect end = [self convertRect:
-                  [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]
-                          fromView:self];
+    CGRect begin = [self convertRect:[[info objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue] fromView:self];
+    CGRect end   = [self convertRect:[[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue] fromView:self];
     double aniDuration = [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
-    
+
     CGSize viewSize = self.frame.size;
 
     CGFloat tmp;
     switch (getFixedOrientation([[UIApplication sharedApplication] statusBarOrientation]))
     {
-        case UIInterfaceOrientationPortrait:
-            begin.origin.y = viewSize.height - begin.origin.y - begin.size.height;
-            end.origin.y = viewSize.height - end.origin.y - end.size.height;
-            break;
-            
-        case UIInterfaceOrientationPortraitUpsideDown:
-            begin.origin.x = viewSize.width - (begin.origin.x + begin.size.width);
-            end.origin.x = viewSize.width - (end.origin.x + end.size.width);
-            break;
-            
-        case UIInterfaceOrientationLandscapeLeft:
-            std::swap(begin.size.width, begin.size.height);
-            std::swap(end.size.width, end.size.height);
-            std::swap(viewSize.width, viewSize.height);
-            
-            tmp = begin.origin.x;
-            begin.origin.x = begin.origin.y;
-            begin.origin.y = viewSize.height - tmp - begin.size.height;
-            tmp = end.origin.x;
-            end.origin.x = end.origin.y;
-            end.origin.y = viewSize.height - tmp - end.size.height;
-            break;
-            
-        case UIInterfaceOrientationLandscapeRight:
-            std::swap(begin.size.width, begin.size.height);
-            std::swap(end.size.width, end.size.height);
-            std::swap(viewSize.width, viewSize.height);
-            
-            tmp = begin.origin.x;
-            begin.origin.x = begin.origin.y;
-            begin.origin.y = tmp;
-            tmp = end.origin.x;
-            end.origin.x = end.origin.y;
-            end.origin.y = tmp;
-            break;
-            
-        default:
-            break;
+    case UIInterfaceOrientationPortrait:
+        begin.origin.y = viewSize.height - begin.origin.y - begin.size.height;
+        end.origin.y   = viewSize.height - end.origin.y - end.size.height;
+        break;
+
+    case UIInterfaceOrientationPortraitUpsideDown:
+        begin.origin.x = viewSize.width - (begin.origin.x + begin.size.width);
+        end.origin.x   = viewSize.width - (end.origin.x + end.size.width);
+        break;
+
+    case UIInterfaceOrientationLandscapeLeft:
+        std::swap(begin.size.width, begin.size.height);
+        std::swap(end.size.width, end.size.height);
+        std::swap(viewSize.width, viewSize.height);
+
+        tmp            = begin.origin.x;
+        begin.origin.x = begin.origin.y;
+        begin.origin.y = viewSize.height - tmp - begin.size.height;
+        tmp            = end.origin.x;
+        end.origin.x   = end.origin.y;
+        end.origin.y   = viewSize.height - tmp - end.size.height;
+        break;
+
+    case UIInterfaceOrientationLandscapeRight:
+        std::swap(begin.size.width, begin.size.height);
+        std::swap(end.size.width, end.size.height);
+        std::swap(viewSize.width, viewSize.height);
+
+        tmp            = begin.origin.x;
+        begin.origin.x = begin.origin.y;
+        begin.origin.y = tmp;
+        tmp            = end.origin.x;
+        end.origin.x   = end.origin.y;
+        end.origin.y   = tmp;
+        break;
+
+    default:
+        break;
     }
 
-    auto glview = cocos2d::Director::getInstance()->getOpenGLView();
+    auto glview  = cocos2d::Director::getInstance()->getOpenGLView();
     float scaleX = glview->getScaleX();
     float scaleY = glview->getScaleY();
-    
+
     // Convert to pixel coordinate
-    begin = CGRectApplyAffineTransform(begin, CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
-    end = CGRectApplyAffineTransform(end, CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
-    
+    begin = CGRectApplyAffineTransform(
+        begin, CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
+    end = CGRectApplyAffineTransform(
+        end, CGAffineTransformScale(CGAffineTransformIdentity, self.contentScaleFactor, self.contentScaleFactor));
+
     float offestY = glview->getViewPortRect().origin.y;
     if (offestY < 0.0f)
     {
@@ -681,23 +735,18 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif
         begin.size.height -= offestY;
         end.size.height -= offestY;
     }
-    
+
     // Convert to design coordinate
-    begin = CGRectApplyAffineTransform(begin, CGAffineTransformScale(CGAffineTransformIdentity, 1.0f/scaleX, 1.0f/scaleY));
-    end = CGRectApplyAffineTransform(end, CGAffineTransformScale(CGAffineTransformIdentity, 1.0f/scaleX, 1.0f/scaleY));
+    begin = CGRectApplyAffineTransform(begin,
+                                       CGAffineTransformScale(CGAffineTransformIdentity, 1.0f / scaleX, 1.0f / scaleY));
+    end   = CGRectApplyAffineTransform(end,
+                                       CGAffineTransformScale(CGAffineTransformIdentity, 1.0f / scaleX, 1.0f / scaleY));
 
-    
     cocos2d::IMEKeyboardNotificationInfo notiInfo;
-    notiInfo.begin = cocos2d::Rect(begin.origin.x,
-                                     begin.origin.y,
-                                     begin.size.width,
-                                     begin.size.height);
-    notiInfo.end = cocos2d::Rect(end.origin.x,
-                                   end.origin.y,
-                                   end.size.width,
-                                   end.size.height);
+    notiInfo.begin    = cocos2d::Rect(begin.origin.x, begin.origin.y, begin.size.width, begin.size.height);
+    notiInfo.end      = cocos2d::Rect(end.origin.x, end.origin.y, end.size.width, end.size.height);
     notiInfo.duration = (float)aniDuration;
-    
+
     cocos2d::IMEDispatcher* dispatcher = cocos2d::IMEDispatcher::sharedDispatcher();
     if (UIKeyboardWillShowNotification == type)
     {
@@ -720,14 +769,14 @@ - (void)onUIKeyboardNotification:(NSNotification *)notif
 }
 
 // Close the keyboard opened by EditBox
--(void) closeKeyboardOpenedByEditBox
+- (void)closeKeyboardOpenedByEditBox
 {
-    NSArray *subviews = self.subviews;
-    
-    for(UIView* view in subviews)
+    NSArray* subviews = self.subviews;
+
+    for (UIView* view in subviews)
     {
-        if([view isKindOfClass:NSClassFromString(@"UITextView")] ||
-           [view isKindOfClass:NSClassFromString(@"UITextField")])
+        if ([view isKindOfClass:NSClassFromString(@"UITextView")] ||
+            [view isKindOfClass:NSClassFromString(@"UITextField")])
         {
             if ([view isFirstResponder])
             {
diff --git a/cocos/platform/ios/CCES2Renderer-ios.h b/cocos/platform/ios/CCES2Renderer-ios.h
index d0ac908bb3cf..7aec434db774 100644
--- a/cocos/platform/ios/CCES2Renderer-ios.h
+++ b/cocos/platform/ios/CCES2Renderer-ios.h
@@ -37,7 +37,7 @@
 #    import <OpenGLES/ES2/gl.h>
 #    import <OpenGLES/ES2/glext.h>
 
-#    import "platform/CCPlatformMacros.h"
+//#    import "platform/CCPlatformMacros.h"
 
 @interface CCES2Renderer : NSObject <CCESRenderer> {
     // The pixel dimensions of the CAEAGLLayer
diff --git a/cocos/platform/ios/CCES2Renderer-ios.m b/cocos/platform/ios/CCES2Renderer-ios.m
index c1f04ab98e83..fd49e8f1f459 100644
--- a/cocos/platform/ios/CCES2Renderer-ios.m
+++ b/cocos/platform/ios/CCES2Renderer-ios.m
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
 #import "platform/ios/CCES2Renderer-ios.h"
-#import "platform/CCPlatformMacros.h"
+// #import "platform/CCPlatformMacros.h"
 #import "platform/ios/OpenGL_Internal-ios.h"
 
 #if !defined(COCOS2D_DEBUG) || COCOS2D_DEBUG == 0
diff --git a/cocos/platform/ios/CCESRenderer-ios.h b/cocos/platform/ios/CCESRenderer-ios.h
index 7498b3099170..c21fb928c578 100644
--- a/cocos/platform/ios/CCESRenderer-ios.h
+++ b/cocos/platform/ios/CCESRenderer-ios.h
@@ -32,7 +32,7 @@
 #include "platform/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
 
-#    include "platform/CCPlatformMacros.h"
+// #    include "platform/CCPlatformMacros.h"
 #    import <QuartzCore/QuartzCore.h>
 
 #    import <OpenGLES/EAGL.h>
diff --git a/cocos/platform/ios/CCGLViewImpl-ios.h b/cocos/platform/ios/CCGLViewImpl-ios.h
index 0aa8892865cd..f8ab60f75b2b 100644
--- a/cocos/platform/ios/CCGLViewImpl-ios.h
+++ b/cocos/platform/ios/CCGLViewImpl-ios.h
@@ -40,13 +40,13 @@ class CC_DLL GLViewImpl : public GLView
     static GLViewImpl* createWithEAGLView(void* eaGLView);
 
     /** creates a GLViewImpl with a title name in fullscreen mode */
-    static GLViewImpl* create(const std::string& viewName);
+    static GLViewImpl* create(std::string_view viewName);
 
     /** creates a GLViewImpl with a title name, a rect and the zoom factor */
-    static GLViewImpl* createWithRect(const std::string& viewName, const Rect& rect, float frameZoomFactor = 1.0f);
+    static GLViewImpl* createWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor = 1.0f);
 
     /** creates a GLViewImpl with a name in fullscreen mode */
-    static GLViewImpl* createWithFullScreen(const std::string& viewName);
+    static GLViewImpl* createWithFullScreen(std::string_view viewName);
 
     static void convertAttrs();
     static void* _pixelFormat;
@@ -78,8 +78,8 @@ class CC_DLL GLViewImpl : public GLView
     virtual ~GLViewImpl();
 
     bool initWithEAGLView(void* eaGLView);
-    bool initWithRect(const std::string& viewName, const Rect& rect, float frameZoomFactor);
-    bool initWithFullScreen(const std::string& viewName);
+    bool initWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor);
+    bool initWithFullScreen(std::string_view viewName);
 
     // the objective-c CCEAGLView instance
     void* _eaglview;
diff --git a/cocos/platform/ios/CCGLViewImpl-ios.mm b/cocos/platform/ios/CCGLViewImpl-ios.mm
index 53a1e78194d3..594680a9154b 100644
--- a/cocos/platform/ios/CCGLViewImpl-ios.mm
+++ b/cocos/platform/ios/CCGLViewImpl-ios.mm
@@ -33,14 +33,15 @@ of this software and associated documentation files (the "Software"), to deal
 
 NS_CC_BEGIN
 
-void* GLViewImpl::_pixelFormat = kEAGLColorFormatRGB565;
-int GLViewImpl::_depthFormat = GL_DEPTH_COMPONENT16;
+void* GLViewImpl::_pixelFormat      = kEAGLColorFormatRGB565;
+int GLViewImpl::_depthFormat        = GL_DEPTH_COMPONENT16;
 int GLViewImpl::_multisamplingCount = 0;
 
-GLViewImpl* GLViewImpl::createWithEAGLView(void *eaglview)
+GLViewImpl* GLViewImpl::createWithEAGLView(void* eaglview)
 {
     auto ret = new GLViewImpl;
-    if(ret->initWithEAGLView(eaglview)) {
+    if (ret->initWithEAGLView(eaglview))
+    {
         ret->autorelease();
         return ret;
     }
@@ -48,10 +49,11 @@ of this software and associated documentation files (the "Software"), to deal
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName)
+GLViewImpl* GLViewImpl::create(std::string_view viewName)
 {
     auto ret = new GLViewImpl;
-    if(ret->initWithFullScreen(viewName)) {
+    if (ret->initWithFullScreen(viewName))
+    {
         ret->autorelease();
         return ret;
     }
@@ -59,10 +61,11 @@ of this software and associated documentation files (the "Software"), to deal
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, const Rect& rect, float frameZoomFactor)
+GLViewImpl* GLViewImpl::createWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor)
 {
     auto ret = new GLViewImpl;
-    if(ret->initWithRect(viewName, rect, frameZoomFactor)) {
+    if (ret->initWithRect(viewName, rect, frameZoomFactor))
+    {
         ret->autorelease();
         return ret;
     }
@@ -70,10 +73,11 @@ of this software and associated documentation files (the "Software"), to deal
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName)
 {
     auto ret = new GLViewImpl();
-    if(ret->initWithFullScreen(viewName)) {
+    if (ret->initWithFullScreen(viewName))
+    {
         ret->autorelease();
         return ret;
     }
@@ -83,64 +87,68 @@ of this software and associated documentation files (the "Software"), to deal
 
 void GLViewImpl::convertAttrs()
 {
-    if(_glContextAttrs.redBits==8 && _glContextAttrs.greenBits==8 && _glContextAttrs.blueBits==8 && _glContextAttrs.alphaBits==8)
+    if (_glContextAttrs.redBits == 8 && _glContextAttrs.greenBits == 8 && _glContextAttrs.blueBits == 8 &&
+        _glContextAttrs.alphaBits == 8)
     {
         _pixelFormat = kEAGLColorFormatRGBA8;
-    } else if (_glContextAttrs.redBits==5 && _glContextAttrs.greenBits==6 && _glContextAttrs.blueBits==5 && _glContextAttrs.alphaBits==0)
+    }
+    else if (_glContextAttrs.redBits == 5 && _glContextAttrs.greenBits == 6 && _glContextAttrs.blueBits == 5 &&
+             _glContextAttrs.alphaBits == 0)
     {
         _pixelFormat = kEAGLColorFormatRGB565;
-    } else
+    }
+    else
     {
         CCASSERT(0, "Unsupported render buffer pixel format. Using default");
     }
 
-    if(_glContextAttrs.depthBits==24 && _glContextAttrs.stencilBits==8)
+    if (_glContextAttrs.depthBits == 24 && _glContextAttrs.stencilBits == 8)
     {
         _depthFormat = GL_DEPTH24_STENCIL8_OES;
-    } else if (_glContextAttrs.depthBits==0 && _glContextAttrs.stencilBits==0)
+    }
+    else if (_glContextAttrs.depthBits == 0 && _glContextAttrs.stencilBits == 0)
     {
         _depthFormat = 0;
-    } else
+    }
+    else
     {
         CCASSERT(0, "Unsupported format for depth and stencil buffers. Using default");
     }
-    
+
     _multisamplingCount = _glContextAttrs.multisamplingCount;
 }
 
-GLViewImpl::GLViewImpl()
-{
-}
+GLViewImpl::GLViewImpl() {}
 
 GLViewImpl::~GLViewImpl()
 {
-    //CCEAGLView *glview = (CCEAGLView*) _eaglview;
+    // CCEAGLView *glview = (CCEAGLView*) _eaglview;
     //[glview release];
 }
 
-bool GLViewImpl::initWithEAGLView(void *eaglview)
+bool GLViewImpl::initWithEAGLView(void* eaglview)
 {
-    _eaglview = eaglview;
-    CCEAGLView *glview = (CCEAGLView*) _eaglview;
+    _eaglview          = eaglview;
+    CCEAGLView* glview = (CCEAGLView*)_eaglview;
 
     _screenSize.width = _designResolutionSize.width = [glview getWidth];
     _screenSize.height = _designResolutionSize.height = [glview getHeight];
-//    _scaleX = _scaleY = [glview contentScaleFactor];
+    //    _scaleX = _scaleY = [glview contentScaleFactor];
 
     return true;
 }
 
-bool GLViewImpl::initWithRect(const std::string& viewName, const Rect& rect, float frameZoomFactor)
+bool GLViewImpl::initWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor)
 {
     CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
     convertAttrs();
-    CCEAGLView *eaglview = [CCEAGLView viewWithFrame: r
-                                       pixelFormat: (NSString*)_pixelFormat
-                                       depthFormat: _depthFormat
-                                preserveBackbuffer: NO
-                                        sharegroup: nil
-                                     multiSampling: NO
-                                   numberOfSamples: 0];
+    CCEAGLView* eaglview = [CCEAGLView viewWithFrame:r
+                                         pixelFormat:(NSString*)_pixelFormat
+                                         depthFormat:_depthFormat
+                                  preserveBackbuffer:NO
+                                          sharegroup:nil
+                                       multiSampling:NO
+                                     numberOfSamples:0];
 
     // Not available on tvOS
 #if !defined(CC_TARGET_OS_TVOS)
@@ -149,20 +157,20 @@ of this software and associated documentation files (the "Software"), to deal
 
     _screenSize.width = _designResolutionSize.width = [eaglview getWidth];
     _screenSize.height = _designResolutionSize.height = [eaglview getHeight];
-//    _scaleX = _scaleY = [eaglview contentScaleFactor];
+    //    _scaleX = _scaleY = [eaglview contentScaleFactor];
 
     _eaglview = eaglview;
 
     return true;
 }
 
-bool GLViewImpl::initWithFullScreen(const std::string& viewName)
+bool GLViewImpl::initWithFullScreen(std::string_view viewName)
 {
     CGRect rect = [[UIScreen mainScreen] bounds];
     Rect r;
-    r.origin.x = rect.origin.x;
-    r.origin.y = rect.origin.y;
-    r.size.width = rect.size.width;
+    r.origin.x    = rect.origin.x;
+    r.origin.y    = rect.origin.y;
+    r.size.width  = rect.size.width;
     r.size.height = rect.size.height;
 
     return initWithRect(viewName, r, 1);
@@ -175,10 +183,10 @@ of this software and associated documentation files (the "Software"), to deal
 
 bool GLViewImpl::setContentScaleFactor(float contentScaleFactor)
 {
-    CC_ASSERT(_resolutionPolicy == ResolutionPolicy::UNKNOWN); // cannot enable retina mode
+    CC_ASSERT(_resolutionPolicy == ResolutionPolicy::UNKNOWN);  // cannot enable retina mode
     _scaleX = _scaleY = contentScaleFactor;
 
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
     [eaglview setNeedsLayout];
 
     return true;
@@ -186,11 +194,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 float GLViewImpl::getContentScaleFactor() const
 {
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
 
     float scaleFactor = [eaglview contentScaleFactor];
 
-//    CCASSERT(scaleFactor == _scaleX == _scaleY, "Logic error in GLView::getContentScaleFactor");
+    //    CCASSERT(scaleFactor == _scaleX == _scaleY, "Logic error in GLView::getContentScaleFactor");
 
     return scaleFactor;
 }
@@ -200,23 +208,22 @@ of this software and associated documentation files (the "Software"), to deal
     [CCDirectorCaller destroy];
 
     // destroy EAGLView
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
 
     [eaglview removeFromSuperview];
     //[eaglview release];
     release();
 }
 
-
 void GLViewImpl::swapBuffers()
 {
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
     [eaglview swapBuffers];
 }
 
 void GLViewImpl::setIMEKeyboardState(bool open)
 {
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
 
     if (open)
     {
@@ -230,16 +237,16 @@ of this software and associated documentation files (the "Software"), to deal
 
 Rect GLViewImpl::getSafeAreaRect() const
 {
-    CCEAGLView *eaglview = (CCEAGLView*) _eaglview;
+    CCEAGLView* eaglview = (CCEAGLView*)_eaglview;
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
     float version = [[UIDevice currentDevice].systemVersion floatValue];
     if (version >= 11.0f)
     {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wpartial-availability"
         UIEdgeInsets safeAreaInsets = eaglview.safeAreaInsets;
-#pragma clang diagnostic pop
+#    pragma clang diagnostic pop
 
         // Multiply contentScaleFactor since safeAreaInsets return points.
         safeAreaInsets.left *= eaglview.contentScaleFactor;
@@ -249,23 +256,23 @@ of this software and associated documentation files (the "Software"), to deal
 
         // Get leftBottom and rightTop point in UI coordinates
         Vec2 leftBottom = Vec2(safeAreaInsets.left, _screenSize.height - safeAreaInsets.bottom);
-        Vec2 rightTop = Vec2(_screenSize.width - safeAreaInsets.right, safeAreaInsets.top);
+        Vec2 rightTop   = Vec2(_screenSize.width - safeAreaInsets.right, safeAreaInsets.top);
 
         // Convert a point from UI coordinates to which in design resolution coordinate.
         leftBottom.x = (leftBottom.x - _viewPortRect.origin.x) / _scaleX,
         leftBottom.y = (leftBottom.y - _viewPortRect.origin.y) / _scaleY;
-        rightTop.x = (rightTop.x - _viewPortRect.origin.x) / _scaleX,
-        rightTop.y = (rightTop.y - _viewPortRect.origin.y) / _scaleY;
+        rightTop.x   = (rightTop.x - _viewPortRect.origin.x) / _scaleX,
+        rightTop.y   = (rightTop.y - _viewPortRect.origin.y) / _scaleY;
 
         // Adjust points to make them inside design resolution
         leftBottom.x = MAX(leftBottom.x, 0);
         leftBottom.y = MIN(leftBottom.y, _designResolutionSize.height);
-        rightTop.x = MIN(rightTop.x, _designResolutionSize.width);
-        rightTop.y = MAX(rightTop.y, 0);
+        rightTop.x   = MIN(rightTop.x, _designResolutionSize.width);
+        rightTop.y   = MAX(rightTop.y, 0);
 
         // Convert to GL coordinates
         leftBottom = Director::getInstance()->convertToGL(leftBottom);
-        rightTop = Director::getInstance()->convertToGL(rightTop);
+        rightTop   = Director::getInstance()->convertToGL(rightTop);
 
         return Rect(leftBottom.x, leftBottom.y, rightTop.x - leftBottom.x, rightTop.y - leftBottom.y);
     }
diff --git a/cocos/platform/ios/CCImage-ios.mm b/cocos/platform/ios/CCImage-ios.mm
index b5b93879989d..372ed56fa131 100644
--- a/cocos/platform/ios/CCImage-ios.mm
+++ b/cocos/platform/ios/CCImage-ios.mm
@@ -35,15 +35,16 @@ of this software and associated documentation files (the "Software"), to deal
 
 NS_CC_BEGIN
 
-bool cocos2d::Image::saveToFile(const std::string& filename, bool isToRGB)
+bool cocos2d::Image::saveToFile(std::string_view filename, bool isToRGB)
 {
-    //only support for backend::PixelFormat::RGB8 or backend::PixelFormat::RGBA8 uncompressed data
+    // only support for backend::PixelFormat::RGB8 or backend::PixelFormat::RGBA8 uncompressed data
     if (isCompressed() || (_pixelFormat != backend::PixelFormat::RGB8 && _pixelFormat != backend::PixelFormat::RGBA8))
     {
-        CCLOG("cocos2d: Image: saveToFile is only support for backend::PixelFormat::RGB8 or backend::PixelFormat::RGBA8 uncompressed data for now");
+        CCLOG("cocos2d: Image: saveToFile is only support for backend::PixelFormat::RGB8 or "
+              "backend::PixelFormat::RGBA8 uncompressed data for now");
         return false;
     }
-    bool saveToPNG = false;
+    bool saveToPNG        = false;
     bool needToCopyPixels = false;
 
     std::string basename(filename);
@@ -52,64 +53,65 @@ of this software and associated documentation files (the "Software"), to deal
     {
         saveToPNG = true;
     }
-        
-    int bitsPerComponent = 8;            
-    int bitsPerPixel = hasAlpha() ? 32 : 24;
-    if ((! saveToPNG) || isToRGB)
+
+    int bitsPerComponent = 8;
+    int bitsPerPixel     = hasAlpha() ? 32 : 24;
+    if ((!saveToPNG) || isToRGB)
     {
         bitsPerPixel = 24;
-    }            
-    
-    int bytesPerRow    = (bitsPerPixel/8) * _width;
+    }
+
+    int bytesPerRow  = (bitsPerPixel / 8) * _width;
     int myDataLength = bytesPerRow * _height;
-    
-    unsigned char *pixels    = _data;
-    
+
+    unsigned char* pixels = _data;
+
     // The data has alpha channel, and want to save it with an RGB png file,
     // or want to save as jpg,  remove the alpha channel.
     if (hasAlpha() && bitsPerPixel == 24)
     {
         pixels = new unsigned char[myDataLength];
-        
+
         for (int i = 0; i < _height; ++i)
         {
             for (int j = 0; j < _width; ++j)
             {
-                pixels[(i * _width + j) * 3] = _data[(i * _width + j) * 4];
+                pixels[(i * _width + j) * 3]     = _data[(i * _width + j) * 4];
                 pixels[(i * _width + j) * 3 + 1] = _data[(i * _width + j) * 4 + 1];
                 pixels[(i * _width + j) * 3 + 2] = _data[(i * _width + j) * 4 + 2];
             }
         }
-        
+
         needToCopyPixels = true;
     }
-        
+
     // make data provider with data.
     CGBitmapInfo bitmapInfo = kCGBitmapByteOrderDefault;
-    if (saveToPNG && hasAlpha() && (! isToRGB))
+    if (saveToPNG && hasAlpha() && (!isToRGB))
     {
         bitmapInfo |= kCGImageAlphaLast;
     }
-    CGDataProviderRef provider        = CGDataProviderCreateWithData(nullptr, pixels, myDataLength, nullptr);
-    CGColorSpaceRef colorSpaceRef    = CGColorSpaceCreateDeviceRGB();
-    CGImageRef iref                    = CGImageCreate(_width, _height,
-                                                        bitsPerComponent, bitsPerPixel, bytesPerRow,
-                                                        colorSpaceRef, bitmapInfo, provider,
-                                                        nullptr, false,
-                                                        kCGRenderingIntentDefault);
-        
-    UIImage* image                    = [[UIImage alloc] initWithCGImage:iref];
-        
-    CGImageRelease(iref);    
+    CGDataProviderRef provider    = CGDataProviderCreateWithData(nullptr, pixels, myDataLength, nullptr);
+    CGColorSpaceRef colorSpaceRef = CGColorSpaceCreateDeviceRGB();
+    CGImageRef iref = CGImageCreate(_width, _height, bitsPerComponent, bitsPerPixel, bytesPerRow, colorSpaceRef,
+                                    bitmapInfo, provider, nullptr, false, kCGRenderingIntentDefault);
+
+    UIImage* image = [[UIImage alloc] initWithCGImage:iref];
+
+    CGImageRelease(iref);
     CGColorSpaceRelease(colorSpaceRef);
     CGDataProviderRelease(provider);
 
     // NOTE: Prevent memory leak. Requires ARC enabled.
-    @autoreleasepool {
-        NSData *data;
-        if (saveToPNG) {
+    @autoreleasepool
+    {
+        NSData* data;
+        if (saveToPNG)
+        {
             data = UIImagePNGRepresentation(image);
-        } else {
+        }
+        else
+        {
             data = UIImageJPEGRepresentation(image, 1.0f);
         }
 
@@ -121,9 +123,9 @@ of this software and associated documentation files (the "Software"), to deal
 
     if (needToCopyPixels)
     {
-        delete [] pixels;
+        delete[] pixels;
     }
-    
+
     return true;
 }
 
diff --git a/cocos/platform/ios/CCInputView-ios.mm b/cocos/platform/ios/CCInputView-ios.mm
index 8b131d54f5f9..aea326830e42 100644
--- a/cocos/platform/ios/CCInputView-ios.mm
+++ b/cocos/platform/ios/CCInputView-ios.mm
@@ -41,27 +41,31 @@ @implementation CCInputView
 @synthesize tokenizer;
 @synthesize autocorrectionType;
 
-- (instancetype) initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame] ) {
-        self.myMarkedText = nil;
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame])
+    {
+        self.myMarkedText       = nil;
         self.autocorrectionType = UITextAutocorrectionTypeNo;
     }
-    
+
     return self;
 }
 
-- (void) dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self]; // remove keyboard notification
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];  // remove keyboard notification
     [self.myMarkedText release];
     [self removeFromSuperview];
     [super dealloc];
 }
 
-- (BOOL) canBecomeFirstResponder {
+- (BOOL)canBecomeFirstResponder
+{
     return YES;
 }
 
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+- (void)touchesBegan:(NSSet*)touches withEvent:(UIEvent*)event
 {
     [self resignFirstResponder];
     [self removeFromSuperview];
@@ -69,159 +73,190 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 
 #pragma TextInput protocol
 
-- (id<UITextInputDelegate>)inputDelegate {
+- (id<UITextInputDelegate>)inputDelegate
+{
     return nil;
 }
 
-- (void)setInputDelegate:(id<UITextInputDelegate>)inputDelegate {
-    
-}
+- (void)setInputDelegate:(id<UITextInputDelegate>)inputDelegate
+{}
 
-- (void)setSelectedTextRange:(UITextRange *)aSelectedTextRange {
+- (void)setSelectedTextRange:(UITextRange*)aSelectedTextRange
+{
     CCLOG("UITextRange:setSelectedTextRange");
 }
 
-- (UITextRange *)selectedTextRange {
+- (UITextRange*)selectedTextRange
+{
     return [[[UITextRange alloc] init] autorelease];
 }
 
-- (void)deleteBackward {
-    if (nil != self.myMarkedText) {
+- (void)deleteBackward
+{
+    if (nil != self.myMarkedText)
+    {
         [self.myMarkedText release];
         self.myMarkedText = nil;
     }
     cocos2d::IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward();
 }
 
-- (void)insertText:(nonnull NSString *)text {
-    if (nil != self.myMarkedText) {
+- (void)insertText:(nonnull NSString*)text
+{
+    if (nil != self.myMarkedText)
+    {
         [self.myMarkedText release];
         self.myMarkedText = nil;
     }
-    const char * pszText = [text cStringUsingEncoding:NSUTF8StringEncoding];
+    const char* pszText = [text cStringUsingEncoding:NSUTF8StringEncoding];
     cocos2d::IMEDispatcher::sharedDispatcher()->dispatchInsertText(pszText, strlen(pszText));
 }
 
-- (NSWritingDirection)baseWritingDirectionForPosition:(nonnull UITextPosition *)position inDirection:(UITextStorageDirection)direction {
+- (NSWritingDirection)baseWritingDirectionForPosition:(nonnull UITextPosition*)position
+                                          inDirection:(UITextStorageDirection)direction
+{
     CCLOG("baseWritingDirectionForPosition");
     return NSWritingDirectionLeftToRight;
 }
 
-- (CGRect)caretRectForPosition:(nonnull UITextPosition *)position {
+- (CGRect)caretRectForPosition:(nonnull UITextPosition*)position
+{
     CCLOG("caretRectForPosition");
     return CGRectZero;
 }
 
-- (nullable UITextRange *)characterRangeAtPoint:(CGPoint)point {
+- (nullable UITextRange*)characterRangeAtPoint:(CGPoint)point
+{
     CCLOG("characterRangeAtPoint");
     return nil;
 }
 
-- (nullable UITextRange *)characterRangeByExtendingPosition:(nonnull UITextPosition *)position inDirection:(UITextLayoutDirection)direction {
+- (nullable UITextRange*)characterRangeByExtendingPosition:(nonnull UITextPosition*)position
+                                               inDirection:(UITextLayoutDirection)direction
+{
     CCLOG("characterRangeByExtendingPosition");
     return nil;
 }
 
-- (nullable UITextPosition *)closestPositionToPoint:(CGPoint)point {
+- (nullable UITextPosition*)closestPositionToPoint:(CGPoint)point
+{
     CCLOG("closestPositionToPoint");
     return nil;
 }
 
-- (nullable UITextPosition *)closestPositionToPoint:(CGPoint)point withinRange:(nonnull UITextRange *)range {
+- (nullable UITextPosition*)closestPositionToPoint:(CGPoint)point withinRange:(nonnull UITextRange*)range
+{
     CCLOG("closestPositionToPoint");
     return nil;
 }
 
-- (NSComparisonResult)comparePosition:(nonnull UITextPosition *)position toPosition:(nonnull UITextPosition *)other {
+- (NSComparisonResult)comparePosition:(nonnull UITextPosition*)position toPosition:(nonnull UITextPosition*)other
+{
     CCLOG("comparePosition");
     return (NSComparisonResult)0;
 }
 
-- (CGRect)firstRectForRange:(nonnull UITextRange *)range {
+- (CGRect)firstRectForRange:(nonnull UITextRange*)range
+{
     CCLOG("firstRectForRange");
     return CGRectNull;
 }
 
-- (NSInteger)offsetFromPosition:(nonnull UITextPosition *)from toPosition:(nonnull UITextPosition *)toPosition {
+- (NSInteger)offsetFromPosition:(nonnull UITextPosition*)from toPosition:(nonnull UITextPosition*)toPosition
+{
     CCLOG("offsetFromPosition");
     return 0;
 }
 
-- (nullable UITextPosition *)positionFromPosition:(nonnull UITextPosition *)position inDirection:(UITextLayoutDirection)direction offset:(NSInteger)offset {
+- (nullable UITextPosition*)positionFromPosition:(nonnull UITextPosition*)position
+                                     inDirection:(UITextLayoutDirection)direction
+                                          offset:(NSInteger)offset
+{
     CCLOG("positionFromPosition");
     return nil;
 }
 
-- (nullable UITextPosition *)positionFromPosition:(nonnull UITextPosition *)position offset:(NSInteger)offset {
+- (nullable UITextPosition*)positionFromPosition:(nonnull UITextPosition*)position offset:(NSInteger)offset
+{
     CCLOG("positionFromPosition");
     return nil;
 }
 
-- (nullable UITextPosition *)positionWithinRange:(nonnull UITextRange *)range farthestInDirection:(UITextLayoutDirection)direction {
+- (nullable UITextPosition*)positionWithinRange:(nonnull UITextRange*)range
+                            farthestInDirection:(UITextLayoutDirection)direction
+{
     CCLOG("positionWithinRange");
     return nil;
 }
 
-- (void)replaceRange:(nonnull UITextRange *)range withText:(nonnull NSString *)text {
-    
-}
+- (void)replaceRange:(nonnull UITextRange*)range withText:(nonnull NSString*)text
+{}
 
-- (nonnull NSArray<UITextSelectionRect *> *)selectionRectsForRange:(nonnull UITextRange *)range {
+- (nonnull NSArray<UITextSelectionRect*>*)selectionRectsForRange:(nonnull UITextRange*)range
+{
     CCLOG("selectionRectsForRange");
     return nil;
 }
 
-- (void)setBaseWritingDirection:(NSWritingDirection)writingDirection forRange:(nonnull UITextRange *)range {
-    
-}
+- (void)setBaseWritingDirection:(NSWritingDirection)writingDirection forRange:(nonnull UITextRange*)range
+{}
 
-- (void)setMarkedText:(nullable NSString *)markedText selectedRange:(NSRange)selectedRange {
+- (void)setMarkedText:(nullable NSString*)markedText selectedRange:(NSRange)selectedRange
+{
     CCLOG("setMarkedText");
-    if (markedText == self.myMarkedText) {
+    if (markedText == self.myMarkedText)
+    {
         return;
     }
-    if (nil != self.myMarkedText) {
+    if (nil != self.myMarkedText)
+    {
         [self.myMarkedText release];
     }
     self.myMarkedText = markedText;
     [self.myMarkedText retain];
 }
 
-- (UITextRange *)markedTextRange
+- (UITextRange*)markedTextRange
 {
     CCLOG("markedTextRange");
-    if (nil != self.myMarkedText) {
+    if (nil != self.myMarkedText)
+    {
         return [[[UITextRange alloc] init] autorelease];
     }
-    return nil; // Nil if no marked text.
+    return nil;  // Nil if no marked text.
 }
 
-- (nullable NSString *)textInRange:(nonnull UITextRange *)range {
+- (nullable NSString*)textInRange:(nonnull UITextRange*)range
+{
     CCLOG("textInRange");
-    if (nil != self.myMarkedText) {
+    if (nil != self.myMarkedText)
+    {
         return self.myMarkedText;
     }
     return nil;
 }
 
-- (nullable UITextRange *)textRangeFromPosition:(nonnull UITextPosition *)fromPosition toPosition:(nonnull UITextPosition *)toPosition {
+- (nullable UITextRange*)textRangeFromPosition:(nonnull UITextPosition*)fromPosition
+                                    toPosition:(nonnull UITextPosition*)toPosition
+{
     CCLOG("textRangeFromPosition");
     return nil;
 }
 
-- (void)unmarkText {
+- (void)unmarkText
+{
     CCLOG("unmarkText");
     if (nil == self.myMarkedText)
     {
         return;
     }
-    const char * pszText = [self.myMarkedText cStringUsingEncoding:NSUTF8StringEncoding];
+    const char* pszText = [self.myMarkedText cStringUsingEncoding:NSUTF8StringEncoding];
     cocos2d::IMEDispatcher::sharedDispatcher()->dispatchInsertText(pszText, strlen(pszText));
     [self.myMarkedText release];
     self.myMarkedText = nil;
 }
 
-- (void)encodeWithCoder:(nonnull NSCoder *)coder {
-}
+- (void)encodeWithCoder:(nonnull NSCoder*)coder
+{}
 
 @end
diff --git a/cocos/platform/linux/CCApplication-linux.cpp b/cocos/platform/linux/CCApplication-linux.cpp
index be903a2dabcf..fa98b686a6d6 100644
--- a/cocos/platform/linux/CCApplication-linux.cpp
+++ b/cocos/platform/linux/CCApplication-linux.cpp
@@ -110,7 +110,7 @@ void Application::setAnimationInterval(float interval)
     _animationInterval = interval * 1000.0f;
 }
 
-void Application::setResourceRootPath(const std::string& rootResDir)
+void Application::setResourceRootPath(std::string_view rootResDir)
 {
     _resourceRootPath = rootResDir;
     if (_resourceRootPath[_resourceRootPath.length() - 1] != '/')
@@ -123,7 +123,7 @@ void Application::setResourceRootPath(const std::string& rootResDir)
     pFileUtils->setSearchPaths(searchPaths);
 }
 
-const std::string& Application::getResourceRootPath()
+std::string_view Application::getResourceRootPath()
 {
     return _resourceRootPath;
 }
@@ -138,7 +138,7 @@ std::string Application::getVersion()
     return "";
 }
 
-bool Application::openURL(const std::string& url)
+bool Application::openURL(std::string_view url)
 {
     std::string op = std::string("xdg-open '").append(url).append("'");
     return system(op.c_str()) == 0;
diff --git a/cocos/platform/linux/CCApplication-linux.h b/cocos/platform/linux/CCApplication-linux.h
index 8f40f7ea0044..3d5c05e60217 100644
--- a/cocos/platform/linux/CCApplication-linux.h
+++ b/cocos/platform/linux/CCApplication-linux.h
@@ -84,19 +84,19 @@ class Application : public ApplicationProtocol
      @param String with url to open.
      @return true if the resource located by the URL was successfully opened; otherwise false.
      */
-    virtual bool openURL(const std::string& url) override;
+    virtual bool openURL(std::string_view url) override;
 
     /**
      *  Sets the Resource root path.
      *  @deprecated Please use FileUtils::getInstance()->setSearchPaths() instead.
      */
-    CC_DEPRECATED_ATTRIBUTE void setResourceRootPath(const std::string& rootResDir);
+    CC_DEPRECATED_ATTRIBUTE void setResourceRootPath(std::string_view rootResDir);
 
     /**
      *  Gets the Resource root path.
      *  @deprecated Please use FileUtils::getInstance()->getSearchPaths() instead.
      */
-    CC_DEPRECATED_ATTRIBUTE const std::string& getResourceRootPath();
+    CC_DEPRECATED_ATTRIBUTE std::string_view getResourceRootPath();
 
     /**
      @brief Get target platform
diff --git a/cocos/platform/linux/CCFileUtils-linux.cpp b/cocos/platform/linux/CCFileUtils-linux.cpp
index 0ec3a38d079f..31ab5ada2e1a 100644
--- a/cocos/platform/linux/CCFileUtils-linux.cpp
+++ b/cocos/platform/linux/CCFileUtils-linux.cpp
@@ -2,8 +2,9 @@
 Copyright (c) 2011      Laschweinski
 Copyright (c) 2013-2016 Chukong Technologies Inc.
 Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+Copyright (c) 2021 Bytedance Inc.
 
-http://www.cocos2d-x.org
+https://adxeproject.github.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -115,22 +116,23 @@ std::string FileUtilsLinux::getNativeWritableAbsolutePath() const
     return _writablePath;
 }
 
-bool FileUtilsLinux::isFileExistInternal(const std::string& strFilePath) const
+bool FileUtilsLinux::isFileExistInternal(std::string_view path) const
 {
     DECLARE_GUARD;
-    if (strFilePath.empty())
+    if (path.empty())
     {
         return false;
     }
 
-    std::string strPath = strFilePath;
-    if (!isAbsolutePath(strPath))
+    std::string strPath;
+    if (!isAbsolutePath(path))
     {  // Not absolute path, add the default root path at the beginning.
-        strPath.insert(0, _defaultResRootPath);
+        strPath.assign(_defaultResRootPath).append(path);
+        path = strPath;
     }
 
     struct stat sts;
-    return (stat(strPath.c_str(), &sts) == 0) && S_ISREG(sts.st_mode);
+    return (stat(path.data(), &sts) == 0) && S_ISREG(sts.st_mode);
 }
 
 NS_CC_END
diff --git a/cocos/platform/linux/CCFileUtils-linux.h b/cocos/platform/linux/CCFileUtils-linux.h
index 258ac96d99ac..1dc54ec21311 100644
--- a/cocos/platform/linux/CCFileUtils-linux.h
+++ b/cocos/platform/linux/CCFileUtils-linux.h
@@ -56,7 +56,7 @@ class CC_DLL FileUtilsLinux : public FileUtils
     std::string getNativeWritableAbsolutePath() const override;
 
 private:
-    virtual bool isFileExistInternal(const std::string& strFilePath) const override;
+    virtual bool isFileExistInternal(std::string_view strFilePath) const override;
 };
 
 // end of platform group
diff --git a/cocos/platform/mac/CCApplication-mac.h b/cocos/platform/mac/CCApplication-mac.h
index 9636b4af889a..fe6bbbff1a04 100644
--- a/cocos/platform/mac/CCApplication-mac.h
+++ b/cocos/platform/mac/CCApplication-mac.h
@@ -90,11 +90,11 @@ class CC_DLL Application : public ApplicationProtocol
      @param String with url to open.
      @return true if the resource located by the URL was successfully opened; otherwise false.
      */
-    virtual bool openURL(const std::string& url) override;
+    virtual bool openURL(std::string_view url) override;
 
-    void setStartupScriptFilename(const std::string& startupScriptFile);
+    void setStartupScriptFilename(std::string_view startupScriptFile);
 
-    const std::string& getStartupScriptFilename();
+    std::string_view getStartupScriptFilename();
 
 protected:
     static Application* sm_pSharedApplication;
diff --git a/cocos/platform/mac/CCApplication-mac.mm b/cocos/platform/mac/CCApplication-mac.mm
index 8d8a92b31329..b4fd1dc68414 100644
--- a/cocos/platform/mac/CCApplication-mac.mm
+++ b/cocos/platform/mac/CCApplication-mac.mm
@@ -40,18 +40,17 @@ static int32_t getCurrentMillSecond()
 {
     int32_t lLastTime = 0;
     struct timeval stCurrentTime;
-    
-    gettimeofday(&stCurrentTime,NULL);
-    lLastTime = stCurrentTime.tv_sec*1000+stCurrentTime.tv_usec*0.001; // milliseconds
+
+    gettimeofday(&stCurrentTime, NULL);
+    lLastTime = stCurrentTime.tv_sec * 1000 + stCurrentTime.tv_usec * 0.001;  // milliseconds
     return lLastTime;
 }
 
 Application* Application::sm_pSharedApplication = nullptr;
 
-Application::Application()
-: _animationInterval(1.0f/60.0f*1000.0f)
+Application::Application() : _animationInterval(1.0f / 60.0f * 1000.0f)
 {
-    CCASSERT(! sm_pSharedApplication, "sm_pSharedApplication already exist");
+    CCASSERT(!sm_pSharedApplication, "sm_pSharedApplication already exist");
     sm_pSharedApplication = this;
 }
 
@@ -64,53 +63,53 @@ static int32_t getCurrentMillSecond()
 int Application::run()
 {
     initGLContextAttrs();
-    if(!applicationDidFinishLaunching())
+    if (!applicationDidFinishLaunching())
     {
         return 1;
     }
-    
+
     int32_t lastTime = 0L;
-    int32_t curTime = 0L;
-    
+    int32_t curTime  = 0L;
+
     auto director = Director::getInstance();
-    auto glview = director->getOpenGLView();
-    
+    auto glview   = director->getOpenGLView();
+
     // Retain glview to avoid glview being released in the while loop
     glview->retain();
 
     while (!glview->windowShouldClose())
     {
         lastTime = getCurrentMillSecond();
-        
+
         director->mainLoop();
         glview->pollEvents();
 
         curTime = getCurrentMillSecond();
         if (curTime - lastTime < _animationInterval)
         {
-            usleep(static_cast<useconds_t>((_animationInterval - curTime + lastTime)*1000));
+            usleep(static_cast<useconds_t>((_animationInterval - curTime + lastTime) * 1000));
         }
     }
 
     /* Only work on Desktop
-    *  Director::mainLoop is really one frame logic
-    *  when we want to close the window, we should call Director::end();
-    *  then call Director::mainLoop to do release of internal resources
-    */
+     *  Director::mainLoop is really one frame logic
+     *  when we want to close the window, we should call Director::end();
+     *  then call Director::mainLoop to do release of internal resources
+     */
     if (glview->isOpenGLReady())
     {
         director->end();
         director->mainLoop();
     }
-    
+
     glview->release();
-    
+
     return 0;
 }
 
 void Application::setAnimationInterval(float interval)
 {
-    _animationInterval = interval*1000.0f;
+    _animationInterval = interval * 1000.0f;
 }
 
 Application::Platform Application::getTargetPlatform()
@@ -118,9 +117,11 @@ static int32_t getCurrentMillSecond()
     return Platform::OS_MAC;
 }
 
-std::string Application::getVersion() {
+std::string Application::getVersion()
+{
     NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
-    if (version) {
+    if (version)
+    {
         return [version UTF8String];
     }
     return "";
@@ -136,49 +137,49 @@ static int32_t getCurrentMillSecond()
     return sm_pSharedApplication;
 }
 
-const char * Application::getCurrentLanguageCode()
+const char* Application::getCurrentLanguageCode()
 {
-    static char code[3]={0};
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *languages = [defaults objectForKey:@"AppleLanguages"];
-    NSString *currentLanguage = [languages objectAtIndex:0];
-    
+    static char code[3]       = {0};
+    NSUserDefaults* defaults  = [NSUserDefaults standardUserDefaults];
+    NSArray* languages        = [defaults objectForKey:@"AppleLanguages"];
+    NSString* currentLanguage = [languages objectAtIndex:0];
+
     // get the current language code.(such as English is "en", Chinese is "zh" and so on)
-    NSDictionary* temp = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
-    NSString * languageCode = [temp objectForKey:NSLocaleLanguageCode];
+    NSDictionary* temp     = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
+    NSString* languageCode = [temp objectForKey:NSLocaleLanguageCode];
     [languageCode getCString:code maxLength:3 encoding:NSASCIIStringEncoding];
-    code[2]='\0';
+    code[2] = '\0';
     return code;
 }
 
 LanguageType Application::getCurrentLanguage()
 {
     // get the current language and country config
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *languages = [defaults objectForKey:@"AppleLanguages"];
-    NSString *currentLanguage = [languages objectAtIndex:0];
-    
+    NSUserDefaults* defaults  = [NSUserDefaults standardUserDefaults];
+    NSArray* languages        = [defaults objectForKey:@"AppleLanguages"];
+    NSString* currentLanguage = [languages objectAtIndex:0];
+
     // get the current language code.(such as English is "en", Chinese is "zh" and so on)
-    NSDictionary* temp = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
-    NSString * languageCode = [temp objectForKey:NSLocaleLanguageCode];
-    
+    NSDictionary* temp     = [NSLocale componentsFromLocaleIdentifier:currentLanguage];
+    NSString* languageCode = [temp objectForKey:NSLocaleLanguageCode];
+
     return utils::getLanguageTypeByISO2([languageCode UTF8String]);
 }
 
-bool Application::openURL(const std::string &url)
+bool Application::openURL(std::string_view url)
 {
-    NSString* msg = [NSString stringWithCString:url.c_str() encoding:NSUTF8StringEncoding];
-    NSURL* nsUrl = [NSURL URLWithString:msg];
+    NSString* msg = [NSString stringWithCString:url.data() encoding:NSUTF8StringEncoding];
+    NSURL* nsUrl  = [NSURL URLWithString:msg];
     return [[NSWorkspace sharedWorkspace] openURL:nsUrl];
 }
 
-void Application::setStartupScriptFilename(const std::string& startupScriptFile)
+void Application::setStartupScriptFilename(std::string_view startupScriptFile)
 {
     _startupScriptFilename = startupScriptFile;
     std::replace(_startupScriptFilename.begin(), _startupScriptFilename.end(), '\\', '/');
 }
 
-const std::string& Application::getStartupScriptFilename()
+std::string_view Application::getStartupScriptFilename()
 {
     return _startupScriptFilename;
 }
diff --git a/cocos/platform/mac/CCCommon-mac.mm b/cocos/platform/mac/CCCommon-mac.mm
index 3ce527eb5231..5e3be91e60d3 100644
--- a/cocos/platform/mac/CCCommon-mac.mm
+++ b/cocos/platform/mac/CCCommon-mac.mm
@@ -33,25 +33,25 @@ of this software and associated documentation files (the "Software"), to deal
 
 NS_CC_BEGIN
 
-void LuaLog(const char * format)
+void LuaLog(const char* format)
 {
     puts(format);
 }
 
 // ios no MessageBox, use log instead
-void ccMessageBox(const char * msg, const char * title)
+void ccMessageBox(const char* msg, const char* title)
 {
-    NSString * tmpTitle = (title) ? [NSString stringWithUTF8String : title] : nil;
-    NSString * tmpMsg = (msg) ? [NSString stringWithUTF8String : msg] : nil;
+    NSString* tmpTitle = (title) ? [NSString stringWithUTF8String:title] : nil;
+    NSString* tmpMsg   = (msg) ? [NSString stringWithUTF8String:msg] : nil;
 
-    NSAlert *alert = [[[NSAlert alloc] init] autorelease];
+    NSAlert* alert = [[[NSAlert alloc] init] autorelease];
     [alert addButtonWithTitle:@"OK"];
     [alert setMessageText:tmpMsg];
     [alert setInformativeText:tmpTitle];
     [alert setAlertStyle:NSAlertStyleWarning];
 
     auto glview = Director::getInstance()->getOpenGLView();
-    id window = glview->getCocoaWindow();
+    id window   = glview->getCocoaWindow();
     [alert beginSheetModalForWindow:window completionHandler:nil];
 }
 
diff --git a/cocos/platform/mac/CCDevice-mac.mm b/cocos/platform/mac/CCDevice-mac.mm
index 5a8b4e09c916..cf1b1ae014dd 100644
--- a/cocos/platform/mac/CCDevice-mac.mm
+++ b/cocos/platform/mac/CCDevice-mac.mm
@@ -36,41 +36,37 @@ of this software and associated documentation files (the "Software"), to deal
 {
     {
         [attributedString beginEditing];
-        
-        [attributedString enumerateAttribute:NSFontAttributeName inRange:NSMakeRange(0, attributedString.length) options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
-            
-            NSFont* font = value;
-            font = [[NSFontManager sharedFontManager] convertFont:font toSize:fontSize];
-            
-            [attributedString removeAttribute:NSFontAttributeName range:range];
-            [attributedString addAttribute:NSFontAttributeName value:font range:range];
-        }];
-        
+
+        [attributedString enumerateAttribute:NSFontAttributeName
+                                     inRange:NSMakeRange(0, attributedString.length)
+                                     options:0
+                                  usingBlock:^(id value, NSRange range, BOOL* stop) {
+                                    NSFont* font = value;
+                                    font         = [[NSFontManager sharedFontManager] convertFont:font toSize:fontSize];
+
+                                    [attributedString removeAttribute:NSFontAttributeName range:range];
+                                    [attributedString addAttribute:NSFontAttributeName value:font range:range];
+                                  }];
+
         [attributedString endEditing];
     }
-    
+
     return [[attributedString copy] autorelease];
 }
 
 int Device::getDPI()
 {
-    NSScreen *screen = [NSScreen mainScreen];
-    NSDictionary *description = [screen deviceDescription];
-    NSSize displayPixelSize = [[description objectForKey:NSDeviceSize] sizeValue];
+    NSScreen* screen           = [NSScreen mainScreen];
+    NSDictionary* description  = [screen deviceDescription];
+    NSSize displayPixelSize    = [[description objectForKey:NSDeviceSize] sizeValue];
     CGSize displayPhysicalSize = CGDisplayScreenSize([[description objectForKey:@"NSScreenNumber"] unsignedIntValue]);
-    
-    return ((displayPixelSize.width / displayPhysicalSize.width) * 25.4f);
-}
-
-void Device::setAccelerometerEnabled(bool isEnabled)
-{
 
+    return ((displayPixelSize.width / displayPhysicalSize.width) * 25.4f);
 }
 
-void Device::setAccelerometerInterval(float interval)
-{
+void Device::setAccelerometerEnabled(bool isEnabled) {}
 
-}
+void Device::setAccelerometerInterval(float interval) {}
 
 typedef struct
 {
@@ -81,305 +77,359 @@ of this software and associated documentation files (the "Software"), to deal
     unsigned char* data;
 } tImageInfo;
 
-static NSSize _calculateStringSize(NSAttributedString *str, id font, CGSize *constrainSize, bool enableWrap, int overflow)
+static NSSize _calculateStringSize(NSAttributedString* str,
+                                   id font,
+                                   CGSize* constrainSize,
+                                   bool enableWrap,
+                                   int overflow)
 {
     NSSize textRect = NSZeroSize;
-    textRect.width = constrainSize->width > 0 ? constrainSize->width
-    : CGFLOAT_MAX;
-    textRect.height = constrainSize->height > 0 ? constrainSize->height
-    : CGFLOAT_MAX;
-    
-    if (overflow == 1) {
-        if (!enableWrap) {
-            textRect.width = CGFLOAT_MAX;
+    textRect.width  = constrainSize->width > 0 ? constrainSize->width : CGFLOAT_MAX;
+    textRect.height = constrainSize->height > 0 ? constrainSize->height : CGFLOAT_MAX;
+
+    if (overflow == 1)
+    {
+        if (!enableWrap)
+        {
+            textRect.width  = CGFLOAT_MAX;
             textRect.height = CGFLOAT_MAX;
-        } else {
+        }
+        else
+        {
             textRect.height = CGFLOAT_MAX;
         }
     }
-    
+
     NSSize dim;
 #ifdef __MAC_10_11
-    #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
-    dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin) context:nil].size;
-    #else
-    dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin)].size;
-    #endif
+#    if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
+    dim = [str boundingRectWithSize:textRect
+                            options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin)context:nil]
+              .size;
+#    else
+    dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin)]
+              .size;
+#    endif
 #else
-    dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin)].size;
+    dim = [str boundingRectWithSize:textRect options:(NSStringDrawingOptions)(NSStringDrawingUsesLineFragmentOrigin)]
+              .size;
 #endif
-    
-    
-    dim.width = ceilf(dim.width);
+
+    dim.width  = ceilf(dim.width);
     dim.height = ceilf(dim.height);
 
     return dim;
 }
 
-static NSSize _calculateRealSizeForString(NSAttributedString **str, id font, NSSize constrainSize, bool enableWrap)
+static NSSize _calculateRealSizeForString(NSAttributedString** str, id font, NSSize constrainSize, bool enableWrap)
 {
     CGRect actualSize = CGRectMake(0, 0, constrainSize.width + 1, constrainSize.height + 1);
-    int fontSize = [font pointSize];
-    fontSize = fontSize + 1;
+    int fontSize      = [font pointSize];
+    fontSize          = fontSize + 1;
 
-    if (!enableWrap) {
-        while (actualSize.size.width > constrainSize.width ||
-               actualSize.size.height > constrainSize.height) {
+    if (!enableWrap)
+    {
+        while (actualSize.size.width > constrainSize.width || actualSize.size.height > constrainSize.height)
+        {
             fontSize = fontSize - 1;
-            if (fontSize < 0) {
+            if (fontSize < 0)
+            {
                 actualSize = CGRectMake(0, 0, 0, 0);
                 break;
             }
-            
-            NSMutableAttributedString *mutableString = [[*str mutableCopy] autorelease];
-            *str = __attributedStringWithFontSize(mutableString, fontSize);
+
+            NSMutableAttributedString* mutableString = [[*str mutableCopy] autorelease];
+            *str                                     = __attributedStringWithFontSize(mutableString, fontSize);
 
 #ifdef __MAC_10_11
-    #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( CGFLOAT_MAX, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size;
-    #else
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( CGFLOAT_MAX, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin].size;
-    #endif
+#    if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin
+                                                context:nil]
+                                 .size;
+#    else
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin]
+                                 .size;
+#    endif
 #else
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( CGFLOAT_MAX, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin].size;
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin]
+                                 .size;
 #endif
 
-            if(fitSize.width == 0 || fitSize.height == 0) continue;
+            if (fitSize.width == 0 || fitSize.height == 0)
+                continue;
             actualSize.size = fitSize;
 
-            if (constrainSize.width <= 0) {
+            if (constrainSize.width <= 0)
+            {
                 constrainSize.width = fitSize.width;
             }
-            if (constrainSize.height <= 0){
+            if (constrainSize.height <= 0)
+            {
                 constrainSize.height = fitSize.height;
             }
-            if(fontSize <= 0){
+            if (fontSize <= 0)
+            {
                 break;
             }
         }
-
     }
-    else {
-        while (actualSize.size.height > constrainSize.height
-               ||actualSize.size.width > constrainSize.width) {
+    else
+    {
+        while (actualSize.size.height > constrainSize.height || actualSize.size.width > constrainSize.width)
+        {
             fontSize = fontSize - 1;
-            if (fontSize < 0) {
+            if (fontSize < 0)
+            {
                 actualSize = CGRectMake(0, 0, 0, 0);
                 break;
             }
-            
-            NSMutableAttributedString *mutableString = [[*str mutableCopy] autorelease];
-            *str = __attributedStringWithFontSize(mutableString, fontSize);
+
+            NSMutableAttributedString* mutableString = [[*str mutableCopy] autorelease];
+            *str                                     = __attributedStringWithFontSize(mutableString, fontSize);
 
 #ifdef __MAC_10_11
-    #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( constrainSize.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size;
-    #else
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( constrainSize.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin].size;
-    #endif
+#    if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_11
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(constrainSize.width, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin
+                                                context:nil]
+                                 .size;
+#    else
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(constrainSize.width, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin]
+                                 .size;
+#    endif
 #else
-            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake( constrainSize.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin].size;
+            CGSize fitSize = [*str boundingRectWithSize:CGSizeMake(constrainSize.width, CGFLOAT_MAX)
+                                                options:NSStringDrawingUsesLineFragmentOrigin]
+                                 .size;
 #endif
-            
-            if(fitSize.width == 0 || fitSize.height == 0) continue;
+
+            if (fitSize.width == 0 || fitSize.height == 0)
+                continue;
             actualSize.size = fitSize;
-            
-            if (constrainSize.width <= 0) {
+
+            if (constrainSize.width <= 0)
+            {
                 constrainSize.width = fitSize.width;
             }
-            if (constrainSize.height <= 0){
+            if (constrainSize.height <= 0)
+            {
                 constrainSize.height = fitSize.height;
             }
-            if(fontSize <= 0){
+            if (fontSize <= 0)
+            {
                 break;
             }
         }
-
     }
     return CGSizeMake(actualSize.size.width, actualSize.size.height);
 }
 
 static NSFont* _createSystemFont(const char* fontName, int size)
 {
-    NSString * fntName = [NSString stringWithUTF8String:fontName];
-    fntName = [[fntName lastPathComponent] stringByDeletingPathExtension];
-    
+    NSString* fntName = [NSString stringWithUTF8String:fontName];
+    fntName           = [[fntName lastPathComponent] stringByDeletingPathExtension];
+
     // font
-    NSFont *font = [NSFont fontWithName:fntName size:size];
-    
-    if (font == nil) {
+    NSFont* font = [NSFont fontWithName:fntName size:size];
+
+    if (font == nil)
+    {
         font = [NSFont systemFontOfSize:size];
     }
     return font;
 }
 
-
 static CGFloat _calculateTextDrawStartHeight(cocos2d::Device::TextAlign align, CGSize realDimensions, CGSize dimensions)
 {
     float startH = 0;
     // vertical alignment
     unsigned int vAlignment = ((int)align >> 4) & 0x0F;
-    switch (vAlignment) {
-            //bottom
-        case 1:startH = dimensions.height - realDimensions.height;break;
-            //top
-        case 2:startH = 0;break;
-            //center
-        case 3: startH = (dimensions.height - realDimensions.height) / 2;break;
-        default:
-            break;
+    switch (vAlignment)
+    {
+        // bottom
+    case 1:
+        startH = dimensions.height - realDimensions.height;
+        break;
+        // top
+    case 2:
+        startH = 0;
+        break;
+        // center
+    case 3:
+        startH = (dimensions.height - realDimensions.height) / 2;
+        break;
+    default:
+        break;
     }
     return startH;
 }
 
-static bool _initWithString(const char * text, Device::TextAlign align, const char * fontName, int size, tImageInfo* info, const Color3B* fontColor, int fontAlpha, bool enableWrap, int overflow, const FontStroke &stroke)
+static bool _initWithString(const char* text,
+                            Device::TextAlign align,
+                            const char* fontName,
+                            int size,
+                            tImageInfo* info,
+                            const Color3B* fontColor,
+                            int fontAlpha,
+                            bool enableWrap,
+                            int overflow,
+                            const FontStroke& stroke)
 {
     bool ret = false;
-    
+
     CCASSERT(text, "Invalid text");
     CCASSERT(info, "Invalid info");
-    
-    do {
-        NSString * string  = [NSString stringWithUTF8String:text];
+
+    do
+    {
+        NSString* string = [NSString stringWithUTF8String:text];
         CC_BREAK_IF(!string);
-        
+
         id font = _createSystemFont(fontName, size);
         CC_BREAK_IF(!font);
-        
+
         // color
         NSColor* foregroundColor;
-        if (fontColor) {
-            foregroundColor = [NSColor colorWithDeviceRed:fontColor->r/255.0
-                                                    green:fontColor->g/255.0
-                                                     blue:fontColor->b/255.0
-                                                    alpha:fontAlpha/255.0];
-        } else {
+        if (fontColor)
+        {
+            foregroundColor = [NSColor colorWithDeviceRed:fontColor->r / 255.0
+                                                    green:fontColor->g / 255.0
+                                                     blue:fontColor->b / 255.0
+                                                    alpha:fontAlpha / 255.0];
+        }
+        else
+        {
             foregroundColor = [NSColor whiteColor];
         }
-        
+
         // alignment
-        NSTextAlignment textAlign = FontUtils::_calculateTextAlignment(align);
-        NSMutableParagraphStyle *paragraphStyle = FontUtils::_calculateParagraphStyle(enableWrap, overflow);
+        NSTextAlignment textAlign               = FontUtils::_calculateTextAlignment(align);
+        NSMutableParagraphStyle* paragraphStyle = FontUtils::_calculateParagraphStyle(enableWrap, overflow);
         [paragraphStyle setAlignment:textAlign];
-        
+
         // attribute
-        NSDictionary* tokenAttributesDict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                             foregroundColor,NSForegroundColorAttributeName,
-                                             font, NSFontAttributeName,
-                                             paragraphStyle, NSParagraphStyleAttributeName, nil];
-        NSAttributedString *stringWithAttributes =[[[NSAttributedString alloc] initWithString:string
-                                                                                   attributes:tokenAttributesDict] autorelease];
-        
+        NSDictionary* tokenAttributesDict = [NSDictionary
+            dictionaryWithObjectsAndKeys:foregroundColor, NSForegroundColorAttributeName, font, NSFontAttributeName,
+                                         paragraphStyle, NSParagraphStyleAttributeName, nil];
+        NSAttributedString* stringWithAttributes =
+            [[[NSAttributedString alloc] initWithString:string attributes:tokenAttributesDict] autorelease];
+
         CGSize dimensions = CGSizeMake(info->width, info->height);
 
         NSSize realDimensions;
-        
+
         if (overflow == 2)
             realDimensions = _calculateRealSizeForString(&stringWithAttributes, font, dimensions, enableWrap);
         else
-            realDimensions = _calculateStringSize(stringWithAttributes, font, &dimensions, enableWrap, overflow);        
+            realDimensions = _calculateStringSize(stringWithAttributes, font, &dimensions, enableWrap, overflow);
 
         // Mac crashes if the width or height is 0
         CC_BREAK_IF(realDimensions.width <= 0 || realDimensions.height <= 0);
-       
-        if(dimensions.width <= 0.f)
+
+        if (dimensions.width <= 0.f)
             dimensions.width = realDimensions.width;
         if (dimensions.height <= 0.f)
-            dimensions.height = realDimensions.height;      
-        
-        //Alignment
+            dimensions.height = realDimensions.height;
+
+        // Alignment
         CGFloat xPadding = FontUtils::_calculateTextDrawStartWidth(align, realDimensions, dimensions);
 
         CGFloat yPadding = _calculateTextDrawStartHeight(align, realDimensions, dimensions);
 
         NSInteger POTWide = dimensions.width;
         NSInteger POTHigh = dimensions.height;
-        NSRect textRect = NSMakeRect(xPadding, POTHigh - dimensions.height + yPadding,
-                                     realDimensions.width, realDimensions.height);
-
-        NSBitmapImageRep* offscreenRep = [[[NSBitmapImageRep alloc]
-            initWithBitmapDataPlanes:NULL
-            pixelsWide:POTWide
-            pixelsHigh:POTHigh
-            bitsPerSample:8
-            samplesPerPixel:4
-            hasAlpha:YES
-            isPlanar:NO
-            colorSpaceName:NSDeviceRGBColorSpace
-            bitmapFormat: 0
-            bytesPerRow:4 * POTWide
-            bitsPerPixel:32] autorelease];
+        NSRect textRect =
+            NSMakeRect(xPadding, POTHigh - dimensions.height + yPadding, realDimensions.width, realDimensions.height);
+
+        NSBitmapImageRep* offscreenRep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
+                                                                                  pixelsWide:POTWide
+                                                                                  pixelsHigh:POTHigh
+                                                                               bitsPerSample:8
+                                                                             samplesPerPixel:4
+                                                                                    hasAlpha:YES
+                                                                                    isPlanar:NO
+                                                                              colorSpaceName:NSDeviceRGBColorSpace
+                                                                                bitmapFormat:0
+                                                                                 bytesPerRow:4 * POTWide
+                                                                                bitsPerPixel:32] autorelease];
 
         NSGraphicsContext* g = [NSGraphicsContext graphicsContextWithBitmapImageRep:offscreenRep];
         [NSGraphicsContext saveGraphicsState];
         [NSGraphicsContext setCurrentContext:g];
-        
-        if (stroke._strokeSize > 0) {
-            NSColor *strokeColor = [NSColor colorWithDeviceRed:stroke._strokeColor.r/255.0
-                                                         green:stroke._strokeColor.g/255.0
-                                                          blue:stroke._strokeColor.b/255.0
-                                                         alpha:stroke._strokeAlpha/255.0];
-            NSNumber *strokeSize = [NSNumber numberWithFloat:stroke._strokeSize / size * 100.0];
-            NSDictionary *tokenAttributesDict2 = [NSDictionary dictionaryWithObjectsAndKeys:
-                                                  foregroundColor,NSForegroundColorAttributeName,
-                                                  font, NSFontAttributeName,
-                                                  paragraphStyle, NSParagraphStyleAttributeName,
-                                                  strokeSize, NSStrokeWidthAttributeName,
-                                                  strokeColor, NSStrokeColorAttributeName,
-                                                  nil];
-            NSAttributedString *strokeString = [[[NSAttributedString alloc] initWithString:string
-                                                                               attributes:tokenAttributesDict2] autorelease];
+
+        if (stroke._strokeSize > 0)
+        {
+            NSColor* strokeColor               = [NSColor colorWithDeviceRed:stroke._strokeColor.r / 255.0
+                                                         green:stroke._strokeColor.g / 255.0
+                                                          blue:stroke._strokeColor.b / 255.0
+                                                         alpha:stroke._strokeAlpha / 255.0];
+            NSNumber* strokeSize               = [NSNumber numberWithFloat:stroke._strokeSize / size * 100.0];
+            NSDictionary* tokenAttributesDict2 = [NSDictionary
+                dictionaryWithObjectsAndKeys:foregroundColor, NSForegroundColorAttributeName, font, NSFontAttributeName,
+                                             paragraphStyle, NSParagraphStyleAttributeName, strokeSize,
+                                             NSStrokeWidthAttributeName, strokeColor, NSStrokeColorAttributeName, nil];
+            NSAttributedString* strokeString =
+                [[[NSAttributedString alloc] initWithString:string attributes:tokenAttributesDict2] autorelease];
             [strokeString drawInRect:textRect];
         }
-        
+
         [stringWithAttributes drawInRect:textRect];
         [NSGraphicsContext restoreGraphicsState];
 
-        auto data = (unsigned char*) [offscreenRep bitmapData];  //Use the same buffer to improve the performance.
+        auto data = (unsigned char*)[offscreenRep bitmapData];  // Use the same buffer to improve the performance.
 
         NSUInteger textureSize = POTWide * POTHigh * 4;
-        auto dataNew = (unsigned char*)malloc(sizeof(unsigned char) * textureSize);
-        if (dataNew) {
+        auto dataNew           = (unsigned char*)malloc(sizeof(unsigned char) * textureSize);
+        if (dataNew)
+        {
             memcpy(dataNew, data, textureSize);
             // output params
-            info->width = static_cast<int>(POTWide);
-            info->height = static_cast<int>(POTHigh);
-            info->data = dataNew;
-            info->hasAlpha = true;
+            info->width                = static_cast<int>(POTWide);
+            info->height               = static_cast<int>(POTHigh);
+            info->data                 = dataNew;
+            info->hasAlpha             = true;
             info->isPremultipliedAlpha = true;
-            ret = true;
+            ret                        = true;
         }
     } while (0);
     return ret;
 }
 
-Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
+Data Device::getTextureDataForText(const char* text,
+                                   const FontDefinition& textDefinition,
+                                   TextAlign align,
+                                   int& width,
+                                   int& height,
+                                   bool& hasPremultipliedAlpha)
 {
     Data ret;
-    do {
+    do
+    {
         tImageInfo info = {0};
-        info.width = textDefinition._dimensions.width;
-        info.height = textDefinition._dimensions.height;
+        info.width      = textDefinition._dimensions.width;
+        info.height     = textDefinition._dimensions.height;
 
-        if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, &textDefinition._fontFillColor, textDefinition._fontAlpha, textDefinition._enableWrap, textDefinition._overflow, textDefinition._stroke))
+        if (!_initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info,
+                             &textDefinition._fontFillColor, textDefinition._fontAlpha, textDefinition._enableWrap,
+                             textDefinition._overflow, textDefinition._stroke))
         {
             break;
         }
         height = (short)info.height;
-        width = (short)info.width;
-        ret.fastSet(info.data,width * height * 4);
+        width  = (short)info.width;
+        ret.fastSet(info.data, width * height * 4);
         hasPremultipliedAlpha = true;
     } while (0);
-    
+
     return ret;
 }
 
-void Device::setKeepScreenOn(bool value)
-{
-}
+void Device::setKeepScreenOn(bool value) {}
 
-void Device::vibrate(float duration)
-{
-}
+void Device::vibrate(float duration) {}
 
 NS_CC_END
diff --git a/cocos/platform/mac/CCGLViewImpl-mac.h b/cocos/platform/mac/CCGLViewImpl-mac.h
index 7c2d480dfa3c..01317ae283ce 100644
--- a/cocos/platform/mac/CCGLViewImpl-mac.h
+++ b/cocos/platform/mac/CCGLViewImpl-mac.h
@@ -58,14 +58,14 @@ class CC_DLL GLViewImpl : public GLView
     friend class GLFWEventHandler;
 
 public:
-    static GLViewImpl* create(const std::string& viewName);
-    static GLViewImpl* create(const std::string& viewName, bool resizable);
-    static GLViewImpl* createWithRect(const std::string& viewName,
+    static GLViewImpl* create(std::string_view viewName);
+    static GLViewImpl* create(std::string_view viewName, bool resizable);
+    static GLViewImpl* createWithRect(std::string_view viewName,
                                       Rect size,
                                       float frameZoomFactor = 1.0f,
                                       bool resizable        = false);
-    static GLViewImpl* createWithFullScreen(const std::string& viewName);
-    static GLViewImpl* createWithFullScreen(const std::string& viewName,
+    static GLViewImpl* createWithFullScreen(std::string_view viewName);
+    static GLViewImpl* createWithFullScreen(std::string_view viewName,
                                             const GLFWvidmode& videoMode,
                                             GLFWmonitor* monitor);
 
@@ -119,7 +119,7 @@ class CC_DLL GLViewImpl : public GLView
     virtual void setIMEKeyboardState(bool bOpen) override;
 
 #if CC_ICON_SET_SUPPORT
-    virtual void setIcon(const std::string& filename) const override;
+    virtual void setIcon(std::string_view filename) const override;
     virtual void setIcon(const std::vector<std::string>& filelist) const override;
     virtual void setDefaultIcon() const override;
 #endif /* CC_ICON_SET_SUPPORT */
@@ -149,9 +149,9 @@ class CC_DLL GLViewImpl : public GLView
     GLViewImpl(bool initglfw = true);
     virtual ~GLViewImpl();
 
-    bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable);
-    bool initWithFullScreen(const std::string& viewName);
-    bool initWithFullscreen(const std::string& viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor);
+    bool initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable);
+    bool initWithFullScreen(std::string_view viewName);
+    bool initWithFullscreen(std::string_view viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor);
     /* update frame layout when enter/exit full screen mode */
     void updateWindowSize();
 
diff --git a/cocos/platform/mac/CCGLViewImpl-mac.mm b/cocos/platform/mac/CCGLViewImpl-mac.mm
index 8d47ababc9ca..dfd66ec28d3b 100644
--- a/cocos/platform/mac/CCGLViewImpl-mac.mm
+++ b/cocos/platform/mac/CCGLViewImpl-mac.mm
@@ -40,7 +40,7 @@ of this software and associated documentation files (the "Software"), to deal
 #include "base/ccUTF8.h"
 #include "2d/CCCamera.h"
 #if CC_ICON_SET_SUPPORT
-#include "platform/CCImage.h"
+#    include "platform/CCImage.h"
 #endif /* CC_ICON_SET_SUPPORT */
 #include "renderer/backend/metal/DeviceMTL.h"
 #include "renderer/CCRenderer.h"
@@ -100,16 +100,13 @@ static void onGLFWWindowPosCallback(GLFWwindow* windows, int x, int y)
     //         _view->onGLFWframebufferSize(window, w, h);
     // }
 
-    static void onGLFWWindowSizeCallback(GLFWwindow *window, int width, int height)
+    static void onGLFWWindowSizeCallback(GLFWwindow* window, int width, int height)
     {
         if (_view)
             _view->onGLFWWindowSizeCallback(window, width, height);
     }
 
-    static void setGLViewImpl(GLViewImpl* view)
-    {
-        _view = view;
-    }
+    static void setGLViewImpl(GLViewImpl* view) { _view = view; }
 
     static void onGLFWWindowIconifyCallback(GLFWwindow* window, int iconified)
     {
@@ -132,8 +129,8 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 };
 GLViewImpl* GLFWEventHandler::_view = nullptr;
 
-const std::string GLViewImpl::EVENT_WINDOW_RESIZED = "glview_window_resized";
-const std::string GLViewImpl::EVENT_WINDOW_FOCUSED = "glview_window_focused";
+const std::string GLViewImpl::EVENT_WINDOW_RESIZED   = "glview_window_resized";
+const std::string GLViewImpl::EVENT_WINDOW_FOCUSED   = "glview_window_focused";
 const std::string GLViewImpl::EVENT_WINDOW_UNFOCUSED = "glview_window_unfocused";
 
 ////////////////////////////////////////////////////
@@ -148,149 +145,147 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 
 static keyCodeItem g_keyCodeStructArray[] = {
     /* The unknown key */
-    { GLFW_KEY_UNKNOWN         , EventKeyboard::KeyCode::KEY_NONE          },
+    {GLFW_KEY_UNKNOWN, EventKeyboard::KeyCode::KEY_NONE},
 
     /* Printable keys */
-    { GLFW_KEY_SPACE           , EventKeyboard::KeyCode::KEY_SPACE         },
-    { GLFW_KEY_APOSTROPHE      , EventKeyboard::KeyCode::KEY_APOSTROPHE    },
-    { GLFW_KEY_COMMA           , EventKeyboard::KeyCode::KEY_COMMA         },
-    { GLFW_KEY_MINUS           , EventKeyboard::KeyCode::KEY_MINUS         },
-    { GLFW_KEY_PERIOD          , EventKeyboard::KeyCode::KEY_PERIOD        },
-    { GLFW_KEY_SLASH           , EventKeyboard::KeyCode::KEY_SLASH         },
-    { GLFW_KEY_0               , EventKeyboard::KeyCode::KEY_0             },
-    { GLFW_KEY_1               , EventKeyboard::KeyCode::KEY_1             },
-    { GLFW_KEY_2               , EventKeyboard::KeyCode::KEY_2             },
-    { GLFW_KEY_3               , EventKeyboard::KeyCode::KEY_3             },
-    { GLFW_KEY_4               , EventKeyboard::KeyCode::KEY_4             },
-    { GLFW_KEY_5               , EventKeyboard::KeyCode::KEY_5             },
-    { GLFW_KEY_6               , EventKeyboard::KeyCode::KEY_6             },
-    { GLFW_KEY_7               , EventKeyboard::KeyCode::KEY_7             },
-    { GLFW_KEY_8               , EventKeyboard::KeyCode::KEY_8             },
-    { GLFW_KEY_9               , EventKeyboard::KeyCode::KEY_9             },
-    { GLFW_KEY_SEMICOLON       , EventKeyboard::KeyCode::KEY_SEMICOLON     },
-    { GLFW_KEY_EQUAL           , EventKeyboard::KeyCode::KEY_EQUAL         },
-    { GLFW_KEY_A               , EventKeyboard::KeyCode::KEY_A             },
-    { GLFW_KEY_B               , EventKeyboard::KeyCode::KEY_B             },
-    { GLFW_KEY_C               , EventKeyboard::KeyCode::KEY_C             },
-    { GLFW_KEY_D               , EventKeyboard::KeyCode::KEY_D             },
-    { GLFW_KEY_E               , EventKeyboard::KeyCode::KEY_E             },
-    { GLFW_KEY_F               , EventKeyboard::KeyCode::KEY_F             },
-    { GLFW_KEY_G               , EventKeyboard::KeyCode::KEY_G             },
-    { GLFW_KEY_H               , EventKeyboard::KeyCode::KEY_H             },
-    { GLFW_KEY_I               , EventKeyboard::KeyCode::KEY_I             },
-    { GLFW_KEY_J               , EventKeyboard::KeyCode::KEY_J             },
-    { GLFW_KEY_K               , EventKeyboard::KeyCode::KEY_K             },
-    { GLFW_KEY_L               , EventKeyboard::KeyCode::KEY_L             },
-    { GLFW_KEY_M               , EventKeyboard::KeyCode::KEY_M             },
-    { GLFW_KEY_N               , EventKeyboard::KeyCode::KEY_N             },
-    { GLFW_KEY_O               , EventKeyboard::KeyCode::KEY_O             },
-    { GLFW_KEY_P               , EventKeyboard::KeyCode::KEY_P             },
-    { GLFW_KEY_Q               , EventKeyboard::KeyCode::KEY_Q             },
-    { GLFW_KEY_R               , EventKeyboard::KeyCode::KEY_R             },
-    { GLFW_KEY_S               , EventKeyboard::KeyCode::KEY_S             },
-    { GLFW_KEY_T               , EventKeyboard::KeyCode::KEY_T             },
-    { GLFW_KEY_U               , EventKeyboard::KeyCode::KEY_U             },
-    { GLFW_KEY_V               , EventKeyboard::KeyCode::KEY_V             },
-    { GLFW_KEY_W               , EventKeyboard::KeyCode::KEY_W             },
-    { GLFW_KEY_X               , EventKeyboard::KeyCode::KEY_X             },
-    { GLFW_KEY_Y               , EventKeyboard::KeyCode::KEY_Y             },
-    { GLFW_KEY_Z               , EventKeyboard::KeyCode::KEY_Z             },
-    { GLFW_KEY_LEFT_BRACKET    , EventKeyboard::KeyCode::KEY_LEFT_BRACKET  },
-    { GLFW_KEY_BACKSLASH       , EventKeyboard::KeyCode::KEY_BACK_SLASH    },
-    { GLFW_KEY_RIGHT_BRACKET   , EventKeyboard::KeyCode::KEY_RIGHT_BRACKET },
-    { GLFW_KEY_GRAVE_ACCENT    , EventKeyboard::KeyCode::KEY_GRAVE         },
-    { GLFW_KEY_WORLD_1         , EventKeyboard::KeyCode::KEY_GRAVE         },
-    { GLFW_KEY_WORLD_2         , EventKeyboard::KeyCode::KEY_NONE          },
+    {GLFW_KEY_SPACE, EventKeyboard::KeyCode::KEY_SPACE},
+    {GLFW_KEY_APOSTROPHE, EventKeyboard::KeyCode::KEY_APOSTROPHE},
+    {GLFW_KEY_COMMA, EventKeyboard::KeyCode::KEY_COMMA},
+    {GLFW_KEY_MINUS, EventKeyboard::KeyCode::KEY_MINUS},
+    {GLFW_KEY_PERIOD, EventKeyboard::KeyCode::KEY_PERIOD},
+    {GLFW_KEY_SLASH, EventKeyboard::KeyCode::KEY_SLASH},
+    {GLFW_KEY_0, EventKeyboard::KeyCode::KEY_0},
+    {GLFW_KEY_1, EventKeyboard::KeyCode::KEY_1},
+    {GLFW_KEY_2, EventKeyboard::KeyCode::KEY_2},
+    {GLFW_KEY_3, EventKeyboard::KeyCode::KEY_3},
+    {GLFW_KEY_4, EventKeyboard::KeyCode::KEY_4},
+    {GLFW_KEY_5, EventKeyboard::KeyCode::KEY_5},
+    {GLFW_KEY_6, EventKeyboard::KeyCode::KEY_6},
+    {GLFW_KEY_7, EventKeyboard::KeyCode::KEY_7},
+    {GLFW_KEY_8, EventKeyboard::KeyCode::KEY_8},
+    {GLFW_KEY_9, EventKeyboard::KeyCode::KEY_9},
+    {GLFW_KEY_SEMICOLON, EventKeyboard::KeyCode::KEY_SEMICOLON},
+    {GLFW_KEY_EQUAL, EventKeyboard::KeyCode::KEY_EQUAL},
+    {GLFW_KEY_A, EventKeyboard::KeyCode::KEY_A},
+    {GLFW_KEY_B, EventKeyboard::KeyCode::KEY_B},
+    {GLFW_KEY_C, EventKeyboard::KeyCode::KEY_C},
+    {GLFW_KEY_D, EventKeyboard::KeyCode::KEY_D},
+    {GLFW_KEY_E, EventKeyboard::KeyCode::KEY_E},
+    {GLFW_KEY_F, EventKeyboard::KeyCode::KEY_F},
+    {GLFW_KEY_G, EventKeyboard::KeyCode::KEY_G},
+    {GLFW_KEY_H, EventKeyboard::KeyCode::KEY_H},
+    {GLFW_KEY_I, EventKeyboard::KeyCode::KEY_I},
+    {GLFW_KEY_J, EventKeyboard::KeyCode::KEY_J},
+    {GLFW_KEY_K, EventKeyboard::KeyCode::KEY_K},
+    {GLFW_KEY_L, EventKeyboard::KeyCode::KEY_L},
+    {GLFW_KEY_M, EventKeyboard::KeyCode::KEY_M},
+    {GLFW_KEY_N, EventKeyboard::KeyCode::KEY_N},
+    {GLFW_KEY_O, EventKeyboard::KeyCode::KEY_O},
+    {GLFW_KEY_P, EventKeyboard::KeyCode::KEY_P},
+    {GLFW_KEY_Q, EventKeyboard::KeyCode::KEY_Q},
+    {GLFW_KEY_R, EventKeyboard::KeyCode::KEY_R},
+    {GLFW_KEY_S, EventKeyboard::KeyCode::KEY_S},
+    {GLFW_KEY_T, EventKeyboard::KeyCode::KEY_T},
+    {GLFW_KEY_U, EventKeyboard::KeyCode::KEY_U},
+    {GLFW_KEY_V, EventKeyboard::KeyCode::KEY_V},
+    {GLFW_KEY_W, EventKeyboard::KeyCode::KEY_W},
+    {GLFW_KEY_X, EventKeyboard::KeyCode::KEY_X},
+    {GLFW_KEY_Y, EventKeyboard::KeyCode::KEY_Y},
+    {GLFW_KEY_Z, EventKeyboard::KeyCode::KEY_Z},
+    {GLFW_KEY_LEFT_BRACKET, EventKeyboard::KeyCode::KEY_LEFT_BRACKET},
+    {GLFW_KEY_BACKSLASH, EventKeyboard::KeyCode::KEY_BACK_SLASH},
+    {GLFW_KEY_RIGHT_BRACKET, EventKeyboard::KeyCode::KEY_RIGHT_BRACKET},
+    {GLFW_KEY_GRAVE_ACCENT, EventKeyboard::KeyCode::KEY_GRAVE},
+    {GLFW_KEY_WORLD_1, EventKeyboard::KeyCode::KEY_GRAVE},
+    {GLFW_KEY_WORLD_2, EventKeyboard::KeyCode::KEY_NONE},
 
     /* Function keys */
-    { GLFW_KEY_ESCAPE          , EventKeyboard::KeyCode::KEY_ESCAPE        },
-    { GLFW_KEY_ENTER           , EventKeyboard::KeyCode::KEY_ENTER      },
-    { GLFW_KEY_TAB             , EventKeyboard::KeyCode::KEY_TAB           },
-    { GLFW_KEY_BACKSPACE       , EventKeyboard::KeyCode::KEY_BACKSPACE     },
-    { GLFW_KEY_INSERT          , EventKeyboard::KeyCode::KEY_INSERT        },
-    { GLFW_KEY_DELETE          , EventKeyboard::KeyCode::KEY_DELETE        },
-    { GLFW_KEY_RIGHT           , EventKeyboard::KeyCode::KEY_RIGHT_ARROW   },
-    { GLFW_KEY_LEFT            , EventKeyboard::KeyCode::KEY_LEFT_ARROW    },
-    { GLFW_KEY_DOWN            , EventKeyboard::KeyCode::KEY_DOWN_ARROW    },
-    { GLFW_KEY_UP              , EventKeyboard::KeyCode::KEY_UP_ARROW      },
-    { GLFW_KEY_PAGE_UP         , EventKeyboard::KeyCode::KEY_PG_UP      },
-    { GLFW_KEY_PAGE_DOWN       , EventKeyboard::KeyCode::KEY_PG_DOWN    },
-    { GLFW_KEY_HOME            , EventKeyboard::KeyCode::KEY_HOME       },
-    { GLFW_KEY_END             , EventKeyboard::KeyCode::KEY_END           },
-    { GLFW_KEY_CAPS_LOCK       , EventKeyboard::KeyCode::KEY_CAPS_LOCK     },
-    { GLFW_KEY_SCROLL_LOCK     , EventKeyboard::KeyCode::KEY_SCROLL_LOCK   },
-    { GLFW_KEY_NUM_LOCK        , EventKeyboard::KeyCode::KEY_NUM_LOCK      },
-    { GLFW_KEY_PRINT_SCREEN    , EventKeyboard::KeyCode::KEY_PRINT         },
-    { GLFW_KEY_PAUSE           , EventKeyboard::KeyCode::KEY_PAUSE         },
-    { GLFW_KEY_F1              , EventKeyboard::KeyCode::KEY_F1            },
-    { GLFW_KEY_F2              , EventKeyboard::KeyCode::KEY_F2            },
-    { GLFW_KEY_F3              , EventKeyboard::KeyCode::KEY_F3            },
-    { GLFW_KEY_F4              , EventKeyboard::KeyCode::KEY_F4            },
-    { GLFW_KEY_F5              , EventKeyboard::KeyCode::KEY_F5            },
-    { GLFW_KEY_F6              , EventKeyboard::KeyCode::KEY_F6            },
-    { GLFW_KEY_F7              , EventKeyboard::KeyCode::KEY_F7            },
-    { GLFW_KEY_F8              , EventKeyboard::KeyCode::KEY_F8            },
-    { GLFW_KEY_F9              , EventKeyboard::KeyCode::KEY_F9            },
-    { GLFW_KEY_F10             , EventKeyboard::KeyCode::KEY_F10           },
-    { GLFW_KEY_F11             , EventKeyboard::KeyCode::KEY_F11           },
-    { GLFW_KEY_F12             , EventKeyboard::KeyCode::KEY_F12           },
-    { GLFW_KEY_F13             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F14             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F15             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F16             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F17             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F18             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F19             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F20             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F21             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F22             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F23             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F24             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_F25             , EventKeyboard::KeyCode::KEY_NONE          },
-    { GLFW_KEY_KP_0            , EventKeyboard::KeyCode::KEY_0             },
-    { GLFW_KEY_KP_1            , EventKeyboard::KeyCode::KEY_1             },
-    { GLFW_KEY_KP_2            , EventKeyboard::KeyCode::KEY_2             },
-    { GLFW_KEY_KP_3            , EventKeyboard::KeyCode::KEY_3             },
-    { GLFW_KEY_KP_4            , EventKeyboard::KeyCode::KEY_4             },
-    { GLFW_KEY_KP_5            , EventKeyboard::KeyCode::KEY_5             },
-    { GLFW_KEY_KP_6            , EventKeyboard::KeyCode::KEY_6             },
-    { GLFW_KEY_KP_7            , EventKeyboard::KeyCode::KEY_7             },
-    { GLFW_KEY_KP_8            , EventKeyboard::KeyCode::KEY_8             },
-    { GLFW_KEY_KP_9            , EventKeyboard::KeyCode::KEY_9             },
-    { GLFW_KEY_KP_DECIMAL      , EventKeyboard::KeyCode::KEY_PERIOD        },
-    { GLFW_KEY_KP_DIVIDE       , EventKeyboard::KeyCode::KEY_KP_DIVIDE     },
-    { GLFW_KEY_KP_MULTIPLY     , EventKeyboard::KeyCode::KEY_KP_MULTIPLY   },
-    { GLFW_KEY_KP_SUBTRACT     , EventKeyboard::KeyCode::KEY_KP_MINUS      },
-    { GLFW_KEY_KP_ADD          , EventKeyboard::KeyCode::KEY_KP_PLUS       },
-    { GLFW_KEY_KP_ENTER        , EventKeyboard::KeyCode::KEY_KP_ENTER      },
-    { GLFW_KEY_KP_EQUAL        , EventKeyboard::KeyCode::KEY_EQUAL         },
-    { GLFW_KEY_LEFT_SHIFT      , EventKeyboard::KeyCode::KEY_LEFT_SHIFT         },
-    { GLFW_KEY_LEFT_CONTROL    , EventKeyboard::KeyCode::KEY_LEFT_CTRL          },
-    { GLFW_KEY_LEFT_ALT        , EventKeyboard::KeyCode::KEY_LEFT_ALT           },
-    { GLFW_KEY_LEFT_SUPER      , EventKeyboard::KeyCode::KEY_HYPER         },
-    { GLFW_KEY_RIGHT_SHIFT     , EventKeyboard::KeyCode::KEY_RIGHT_SHIFT         },
-    { GLFW_KEY_RIGHT_CONTROL   , EventKeyboard::KeyCode::KEY_RIGHT_CTRL          },
-    { GLFW_KEY_RIGHT_ALT       , EventKeyboard::KeyCode::KEY_RIGHT_ALT           },
-    { GLFW_KEY_RIGHT_SUPER     , EventKeyboard::KeyCode::KEY_HYPER         },
-    { GLFW_KEY_MENU            , EventKeyboard::KeyCode::KEY_MENU          },
-    { GLFW_KEY_LAST            , EventKeyboard::KeyCode::KEY_NONE          }
-};
+    {GLFW_KEY_ESCAPE, EventKeyboard::KeyCode::KEY_ESCAPE},
+    {GLFW_KEY_ENTER, EventKeyboard::KeyCode::KEY_ENTER},
+    {GLFW_KEY_TAB, EventKeyboard::KeyCode::KEY_TAB},
+    {GLFW_KEY_BACKSPACE, EventKeyboard::KeyCode::KEY_BACKSPACE},
+    {GLFW_KEY_INSERT, EventKeyboard::KeyCode::KEY_INSERT},
+    {GLFW_KEY_DELETE, EventKeyboard::KeyCode::KEY_DELETE},
+    {GLFW_KEY_RIGHT, EventKeyboard::KeyCode::KEY_RIGHT_ARROW},
+    {GLFW_KEY_LEFT, EventKeyboard::KeyCode::KEY_LEFT_ARROW},
+    {GLFW_KEY_DOWN, EventKeyboard::KeyCode::KEY_DOWN_ARROW},
+    {GLFW_KEY_UP, EventKeyboard::KeyCode::KEY_UP_ARROW},
+    {GLFW_KEY_PAGE_UP, EventKeyboard::KeyCode::KEY_PG_UP},
+    {GLFW_KEY_PAGE_DOWN, EventKeyboard::KeyCode::KEY_PG_DOWN},
+    {GLFW_KEY_HOME, EventKeyboard::KeyCode::KEY_HOME},
+    {GLFW_KEY_END, EventKeyboard::KeyCode::KEY_END},
+    {GLFW_KEY_CAPS_LOCK, EventKeyboard::KeyCode::KEY_CAPS_LOCK},
+    {GLFW_KEY_SCROLL_LOCK, EventKeyboard::KeyCode::KEY_SCROLL_LOCK},
+    {GLFW_KEY_NUM_LOCK, EventKeyboard::KeyCode::KEY_NUM_LOCK},
+    {GLFW_KEY_PRINT_SCREEN, EventKeyboard::KeyCode::KEY_PRINT},
+    {GLFW_KEY_PAUSE, EventKeyboard::KeyCode::KEY_PAUSE},
+    {GLFW_KEY_F1, EventKeyboard::KeyCode::KEY_F1},
+    {GLFW_KEY_F2, EventKeyboard::KeyCode::KEY_F2},
+    {GLFW_KEY_F3, EventKeyboard::KeyCode::KEY_F3},
+    {GLFW_KEY_F4, EventKeyboard::KeyCode::KEY_F4},
+    {GLFW_KEY_F5, EventKeyboard::KeyCode::KEY_F5},
+    {GLFW_KEY_F6, EventKeyboard::KeyCode::KEY_F6},
+    {GLFW_KEY_F7, EventKeyboard::KeyCode::KEY_F7},
+    {GLFW_KEY_F8, EventKeyboard::KeyCode::KEY_F8},
+    {GLFW_KEY_F9, EventKeyboard::KeyCode::KEY_F9},
+    {GLFW_KEY_F10, EventKeyboard::KeyCode::KEY_F10},
+    {GLFW_KEY_F11, EventKeyboard::KeyCode::KEY_F11},
+    {GLFW_KEY_F12, EventKeyboard::KeyCode::KEY_F12},
+    {GLFW_KEY_F13, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F14, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F15, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F16, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F17, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F18, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F19, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F20, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F21, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F22, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F23, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F24, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_F25, EventKeyboard::KeyCode::KEY_NONE},
+    {GLFW_KEY_KP_0, EventKeyboard::KeyCode::KEY_0},
+    {GLFW_KEY_KP_1, EventKeyboard::KeyCode::KEY_1},
+    {GLFW_KEY_KP_2, EventKeyboard::KeyCode::KEY_2},
+    {GLFW_KEY_KP_3, EventKeyboard::KeyCode::KEY_3},
+    {GLFW_KEY_KP_4, EventKeyboard::KeyCode::KEY_4},
+    {GLFW_KEY_KP_5, EventKeyboard::KeyCode::KEY_5},
+    {GLFW_KEY_KP_6, EventKeyboard::KeyCode::KEY_6},
+    {GLFW_KEY_KP_7, EventKeyboard::KeyCode::KEY_7},
+    {GLFW_KEY_KP_8, EventKeyboard::KeyCode::KEY_8},
+    {GLFW_KEY_KP_9, EventKeyboard::KeyCode::KEY_9},
+    {GLFW_KEY_KP_DECIMAL, EventKeyboard::KeyCode::KEY_PERIOD},
+    {GLFW_KEY_KP_DIVIDE, EventKeyboard::KeyCode::KEY_KP_DIVIDE},
+    {GLFW_KEY_KP_MULTIPLY, EventKeyboard::KeyCode::KEY_KP_MULTIPLY},
+    {GLFW_KEY_KP_SUBTRACT, EventKeyboard::KeyCode::KEY_KP_MINUS},
+    {GLFW_KEY_KP_ADD, EventKeyboard::KeyCode::KEY_KP_PLUS},
+    {GLFW_KEY_KP_ENTER, EventKeyboard::KeyCode::KEY_KP_ENTER},
+    {GLFW_KEY_KP_EQUAL, EventKeyboard::KeyCode::KEY_EQUAL},
+    {GLFW_KEY_LEFT_SHIFT, EventKeyboard::KeyCode::KEY_LEFT_SHIFT},
+    {GLFW_KEY_LEFT_CONTROL, EventKeyboard::KeyCode::KEY_LEFT_CTRL},
+    {GLFW_KEY_LEFT_ALT, EventKeyboard::KeyCode::KEY_LEFT_ALT},
+    {GLFW_KEY_LEFT_SUPER, EventKeyboard::KeyCode::KEY_HYPER},
+    {GLFW_KEY_RIGHT_SHIFT, EventKeyboard::KeyCode::KEY_RIGHT_SHIFT},
+    {GLFW_KEY_RIGHT_CONTROL, EventKeyboard::KeyCode::KEY_RIGHT_CTRL},
+    {GLFW_KEY_RIGHT_ALT, EventKeyboard::KeyCode::KEY_RIGHT_ALT},
+    {GLFW_KEY_RIGHT_SUPER, EventKeyboard::KeyCode::KEY_HYPER},
+    {GLFW_KEY_MENU, EventKeyboard::KeyCode::KEY_MENU},
+    {GLFW_KEY_LAST, EventKeyboard::KeyCode::KEY_NONE}};
 
 //////////////////////////////////////////////////////////////////////////
 // implement GLViewImpl
 //////////////////////////////////////////////////////////////////////////
 
-
 GLViewImpl::GLViewImpl(bool initglfw)
-: _captured(false)
-, _isInRetinaMonitor(false)
-, _isRetinaEnabled(false)
-, _retinaFactor(1)
-, _frameZoomFactor(1.0f)
-, _mainWindow(nullptr)
-, _monitor(nullptr)
-, _mouseX(0.0f)
-, _mouseY(0.0f)
+    : _captured(false)
+    , _isInRetinaMonitor(false)
+    , _isRetinaEnabled(false)
+    , _retinaFactor(1)
+    , _frameZoomFactor(1.0f)
+    , _mainWindow(nullptr)
+    , _monitor(nullptr)
+    , _mouseX(0.0f)
+    , _mouseY(0.0f)
 {
     _viewName = "cocos2dx";
     g_keyCodeMap.clear();
@@ -314,15 +309,16 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     glfwTerminate();
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName)
+GLViewImpl* GLViewImpl::create(std::string_view viewName)
 {
     return GLViewImpl::create(viewName, false);
 }
 
-GLViewImpl* GLViewImpl::create(const std::string& viewName, bool resizable)
+GLViewImpl* GLViewImpl::create(std::string_view viewName, bool resizable)
 {
     auto ret = new GLViewImpl;
-    if(ret->initWithRect(viewName, Rect(0, 0, 960, 640), 1.0f, resizable)) {
+    if (ret->initWithRect(viewName, Rect(0, 0, 960, 640), 1.0f, resizable))
+    {
         ret->autorelease();
         return ret;
     }
@@ -330,10 +326,11 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable)
+GLViewImpl* GLViewImpl::createWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable)
 {
     auto ret = new GLViewImpl;
-    if(ret->initWithRect(viewName, rect, frameZoomFactor, resizable)) {
+    if (ret->initWithRect(viewName, rect, frameZoomFactor, resizable))
+    {
         ret->autorelease();
         return ret;
     }
@@ -341,10 +338,11 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName)
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName)
 {
     auto ret = new GLViewImpl();
-    if(ret->initWithFullScreen(viewName)) {
+    if (ret->initWithFullScreen(viewName))
+    {
         ret->autorelease();
         return ret;
     }
@@ -352,10 +350,13 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return nullptr;
 }
 
-GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor)
+GLViewImpl* GLViewImpl::createWithFullScreen(std::string_view viewName,
+                                             const GLFWvidmode& videoMode,
+                                             GLFWmonitor* monitor)
 {
     auto ret = new GLViewImpl();
-    if(ret->initWithFullscreen(viewName, videoMode, monitor)) {
+    if (ret->initWithFullscreen(viewName, videoMode, monitor))
+    {
         ret->autorelease();
         return ret;
     }
@@ -363,28 +364,28 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return nullptr;
 }
 
-bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor, bool resizable)
+bool GLViewImpl::initWithRect(std::string_view viewName, Rect rect, float frameZoomFactor, bool resizable)
 {
     setViewName(viewName);
 
     _frameZoomFactor = frameZoomFactor;
 
-    glfwWindowHint(GLFW_RESIZABLE,resizable?GL_TRUE:GL_FALSE);
-    glfwWindowHint(GLFW_RED_BITS,_glContextAttrs.redBits);
-    glfwWindowHint(GLFW_GREEN_BITS,_glContextAttrs.greenBits);
-    glfwWindowHint(GLFW_BLUE_BITS,_glContextAttrs.blueBits);
-    glfwWindowHint(GLFW_ALPHA_BITS,_glContextAttrs.alphaBits);
-    glfwWindowHint(GLFW_DEPTH_BITS,_glContextAttrs.depthBits);
-    glfwWindowHint(GLFW_STENCIL_BITS,_glContextAttrs.stencilBits);
-    
+    glfwWindowHint(GLFW_RESIZABLE, resizable ? GL_TRUE : GL_FALSE);
+    glfwWindowHint(GLFW_RED_BITS, _glContextAttrs.redBits);
+    glfwWindowHint(GLFW_GREEN_BITS, _glContextAttrs.greenBits);
+    glfwWindowHint(GLFW_BLUE_BITS, _glContextAttrs.blueBits);
+    glfwWindowHint(GLFW_ALPHA_BITS, _glContextAttrs.alphaBits);
+    glfwWindowHint(GLFW_DEPTH_BITS, _glContextAttrs.depthBits);
+    glfwWindowHint(GLFW_STENCIL_BITS, _glContextAttrs.stencilBits);
+
     glfwWindowHint(GLFW_SAMPLES, _glContextAttrs.multisamplingCount);
-    
+
 #if defined(CC_USE_METAL)
     // Don't create gl context.
     glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
 #endif
 
-    int neededWidth = rect.size.width * _frameZoomFactor;
+    int neededWidth  = rect.size.width * _frameZoomFactor;
     int neededHeight = rect.size.height * _frameZoomFactor;
 
     _mainWindow = glfwCreateWindow(neededWidth, neededHeight, _viewName.c_str(), _monitor, nullptr);
@@ -401,13 +402,12 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
         ccMessageBox(message.c_str(), "Error launch application");
         return false;
     }
-    
+
     int fbWidth, fbHeight;
     glfwGetFramebufferSize(_mainWindow, &fbWidth, &fbHeight);
-    
-    
+
     CGSize size;
-    size.width = static_cast<CGFloat>(fbWidth);
+    size.width  = static_cast<CGFloat>(fbWidth);
     size.height = static_cast<CGFloat>(fbHeight);
 
 #if defined(CC_USE_METAL)
@@ -420,7 +420,7 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     }
 
     NSView* contentView = [getCocoaWindow() contentView];
-    [contentView setWantsLayer: YES];
+    [contentView setWantsLayer:YES];
     CAMetalLayer* layer = [CAMetalLayer layer];
     [layer setDevice:device];
     [layer setPixelFormat:MTLPixelFormatBGRA8Unorm];
@@ -431,15 +431,15 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 #endif
 
     /*
-    *  Note that the created window and context may differ from what you requested,
-    *  as not all parameters and hints are
-    *  [hard constraints](@ref window_hints_hard).  This includes the size of the
-    *  window, especially for full screen windows.  To retrieve the actual
-    *  attributes of the created window and context, use queries like @ref
-    *  glfwGetWindowAttrib and @ref glfwGetWindowSize.
-    *
-    *  see declaration glfwCreateWindow
-    */
+     *  Note that the created window and context may differ from what you requested,
+     *  as not all parameters and hints are
+     *  [hard constraints](@ref window_hints_hard).  This includes the size of the
+     *  window, especially for full screen windows.  To retrieve the actual
+     *  attributes of the created window and context, use queries like @ref
+     *  glfwGetWindowAttrib and @ref glfwGetWindowSize.
+     *
+     *  see declaration glfwCreateWindow
+     */
     int realW = 0, realH = 0;
     glfwGetWindowSize(_mainWindow, &realW, &realH);
     if (realW != neededWidth)
@@ -470,9 +470,9 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return true;
 }
 
-bool GLViewImpl::initWithFullScreen(const std::string& viewName)
+bool GLViewImpl::initWithFullScreen(std::string_view viewName)
 {
-    //Create fullscreen window on primary monitor at its current video mode.
+    // Create fullscreen window on primary monitor at its current video mode.
     _monitor = glfwGetPrimaryMonitor();
     if (nullptr == _monitor)
         return false;
@@ -481,19 +481,21 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return initWithRect(viewName, Rect(0, 0, (float)videoMode->width, (float)videoMode->height), 1.0f, false);
 }
 
-bool GLViewImpl::initWithFullscreen(const std::string &viewname, const GLFWvidmode &videoMode, GLFWmonitor *monitor)
+bool GLViewImpl::initWithFullscreen(std::string_view viewname, const GLFWvidmode& videoMode, GLFWmonitor* monitor)
 {
-    //Create fullscreen on specified monitor at the specified video mode.
+    // Create fullscreen on specified monitor at the specified video mode.
     _monitor = monitor;
     if (nullptr == _monitor)
         return false;
-    
-    //These are soft constraints. If the video mode is retrieved at runtime, the resulting window and context should match these exactly. If invalid attribs are passed (eg. from an outdated cache), window creation will NOT fail but the actual window/context may differ.
+
+    // These are soft constraints. If the video mode is retrieved at runtime, the resulting window and context should
+    // match these exactly. If invalid attribs are passed (eg. from an outdated cache), window creation will NOT fail
+    // but the actual window/context may differ.
     glfwWindowHint(GLFW_REFRESH_RATE, videoMode.refreshRate);
     glfwWindowHint(GLFW_RED_BITS, videoMode.redBits);
     glfwWindowHint(GLFW_BLUE_BITS, videoMode.blueBits);
     glfwWindowHint(GLFW_GREEN_BITS, videoMode.greenBits);
-    
+
     return initWithRect(viewname, Rect(0, 0, (float)videoMode.width, (float)videoMode.height), 1.0f, false);
 }
 
@@ -504,9 +506,9 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 
 void GLViewImpl::end()
 {
-    if(_mainWindow)
+    if (_mainWindow)
     {
-        glfwSetWindowShouldClose(_mainWindow,1);
+        glfwSetWindowShouldClose(_mainWindow, 1);
         _mainWindow = nullptr;
     }
     // Release self. Otherwise, GLViewImpl could not be freed.
@@ -516,14 +518,14 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 void GLViewImpl::swapBuffers()
 {
 #if defined(CC_USE_GL)
-    if(_mainWindow)
+    if (_mainWindow)
         glfwSwapBuffers(_mainWindow);
 #endif
 }
 
 bool GLViewImpl::windowShouldClose()
 {
-    if(_mainWindow)
+    if (_mainWindow)
         return glfwWindowShouldClose(_mainWindow) ? true : false;
     else
         return true;
@@ -536,49 +538,54 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 
 void GLViewImpl::enableRetina(bool enabled)
 {
-   _isRetinaEnabled = enabled;
-   if (_isRetinaEnabled)
-   {
-       _retinaFactor = 1;
-   }
-   else
-   {
-       _retinaFactor = 2;
-   }
-   updateFrameSize();
+    _isRetinaEnabled = enabled;
+    if (_isRetinaEnabled)
+    {
+        _retinaFactor = 1;
+    }
+    else
+    {
+        _retinaFactor = 2;
+    }
+    updateFrameSize();
 }
 
-
-void GLViewImpl::setIMEKeyboardState(bool /*bOpen*/)
-{
-
-}
+void GLViewImpl::setIMEKeyboardState(bool /*bOpen*/) {}
 
 #if CC_ICON_SET_SUPPORT
-void GLViewImpl::setIcon(const std::string& filename) const {
+void GLViewImpl::setIcon(std::string_view filename) const
+{
     std::vector<std::string> vec = {filename};
     this->setIcon(vec);
 }
 
-void GLViewImpl::setIcon(const std::vector<std::string>& filelist) const {
-    if (filelist.empty()) return;
+void GLViewImpl::setIcon(const std::vector<std::string>& filelist) const
+{
+    if (filelist.empty())
+        return;
     std::vector<Image*> icons;
-    for (auto const& filename: filelist) {
+    for (auto const& filename : filelist)
+    {
         Image* icon = new Image();
-        if (icon->initWithImageFile(filename)) {
+        if (icon->initWithImageFile(filename))
+        {
             icons.push_back(icon);
-        } else {
+        }
+        else
+        {
             CC_SAFE_DELETE(icon);
         }
     }
 
-    if (icons.empty()) return; // No valid images
+    if (icons.empty())
+        return;  // No valid images
     size_t iconsCount = icons.size();
-    auto images = new GLFWimage[iconsCount];
-    for (size_t i = 0; i < iconsCount; i++) {
-        auto& image = images[i];
-        auto& icon = icons[i];
-        image.width = icon->getWidth();
+    auto images       = new GLFWimage[iconsCount];
+    for (size_t i = 0; i < iconsCount; i++)
+    {
+        auto& image  = images[i];
+        auto& icon   = icons[i];
+        image.width  = icon->getWidth();
         image.height = icon->getHeight();
         image.pixels = icon->getData();
     };
@@ -587,23 +594,25 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     glfwSetWindowIcon(window, iconsCount, images);
 
     CC_SAFE_DELETE_ARRAY(images);
-    for (auto& icon: icons) {
+    for (auto& icon : icons)
+    {
         CC_SAFE_DELETE(icon);
     }
 }
 
-void GLViewImpl::setDefaultIcon() const {
+void GLViewImpl::setDefaultIcon() const
+{
     GLFWwindow* window = this->getWindow();
     glfwSetWindowIcon(window, 0, nullptr);
 }
 #endif /* CC_ICON_SET_SUPPORT */
 
-void GLViewImpl::setCursorVisible( bool isVisible )
+void GLViewImpl::setCursorVisible(bool isVisible)
 {
-    if( _mainWindow == NULL )
+    if (_mainWindow == NULL)
         return;
-    
-    if( isVisible )
+
+    if (isVisible)
         glfwSetInputMode(_mainWindow, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
     else
         glfwSetInputMode(_mainWindow, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
@@ -627,7 +636,8 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     return _frameZoomFactor;
 }
 
-bool GLViewImpl::isFullscreen() const {
+bool GLViewImpl::isFullscreen() const
+{
     return (_monitor != nullptr);
 }
 
@@ -636,9 +646,11 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     setFullscreen(-1, -1, -1);
 }
 
-void GLViewImpl::setFullscreen(int w, int h, int refreshRate) {
+void GLViewImpl::setFullscreen(int w, int h, int refreshRate)
+{
     auto monitor = glfwGetPrimaryMonitor();
-    if (nullptr == monitor || monitor == _monitor) {
+    if (nullptr == monitor || monitor == _monitor)
+    {
         return;
     }
     this->setFullscreen(monitor, w, h, refreshRate);
@@ -649,20 +661,24 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     setFullscreen(monitorIndex, -1, -1, -1);
 }
 
-void GLViewImpl::setFullscreen(int monitorIndex, int w, int h, int refreshRate) {
-    int count = 0;
+void GLViewImpl::setFullscreen(int monitorIndex, int w, int h, int refreshRate)
+{
+    int count              = 0;
     GLFWmonitor** monitors = glfwGetMonitors(&count);
-    if (monitorIndex < 0 || monitorIndex >= count) {
+    if (monitorIndex < 0 || monitorIndex >= count)
+    {
         return;
     }
     GLFWmonitor* monitor = monitors[monitorIndex];
-    if (nullptr == monitor || _monitor == monitor) {
+    if (nullptr == monitor || _monitor == monitor)
+    {
         return;
     }
     this->setFullscreen(monitor, w, h, refreshRate);
 }
 
-void GLViewImpl::setFullscreen(GLFWmonitor *monitor, int w, int h, int refreshRate) {
+void GLViewImpl::setFullscreen(GLFWmonitor* monitor, int w, int h, int refreshRate)
+{
     _monitor = monitor;
 
     const GLFWvidmode* videoMode = glfwGetVideoMode(_monitor);
@@ -678,10 +694,14 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     updateWindowSize();
 }
 
-void GLViewImpl::setWindowed(int width, int height) {
-    if (!this->isFullscreen()) {
+void GLViewImpl::setWindowed(int width, int height)
+{
+    if (!this->isFullscreen())
+    {
         this->setFrameSize((float)width, (float)height);
-    } else {
+    }
+    else
+    {
         const GLFWvidmode* videoMode = glfwGetVideoMode(_monitor);
         int xpos = 0, ypos = 0;
         glfwGetMonitorPos(_monitor, &xpos, &ypos);
@@ -702,31 +722,36 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 {
     int w = 0, h = 0;
     glfwGetFramebufferSize(_mainWindow, &w, &h);
-    int frameWidth = w / _frameZoomFactor;
+    int frameWidth  = w / _frameZoomFactor;
     int frameHeight = h / _frameZoomFactor;
     setFrameSize(frameWidth, frameHeight);
     updateDesignResolutionSize();
     Director::getInstance()->getEventDispatcher()->dispatchCustomEvent(GLViewImpl::EVENT_WINDOW_RESIZED, nullptr);
 }
 
-int GLViewImpl::getMonitorCount() const {
+int GLViewImpl::getMonitorCount() const
+{
     int count = 0;
     glfwGetMonitors(&count);
     return count;
 }
 
-Size GLViewImpl::getMonitorSize() const {
+Size GLViewImpl::getMonitorSize() const
+{
     GLFWmonitor* monitor = _monitor;
-    if (nullptr == monitor) {
+    if (nullptr == monitor)
+    {
         GLFWwindow* window = this->getWindow();
-        monitor = glfwGetWindowMonitor(window);
+        monitor            = glfwGetWindowMonitor(window);
     }
-    if (nullptr == monitor) {
+    if (nullptr == monitor)
+    {
         monitor = glfwGetPrimaryMonitor();
     }
-    if (nullptr != monitor) {
+    if (nullptr != monitor)
+    {
         const GLFWvidmode* videoMode = glfwGetVideoMode(monitor);
-        Size size = Size((float)videoMode->width, (float)videoMode->height);
+        Size size                    = Size((float)videoMode->width, (float)videoMode->height);
         return size;
     }
     return Size::ZERO;
@@ -752,7 +777,8 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
             {
                 _retinaFactor = 2;
             }
-            glfwSetWindowSize(_mainWindow, _screenSize.width/2 * _retinaFactor * _frameZoomFactor, _screenSize.height/2 * _retinaFactor * _frameZoomFactor);
+            glfwSetWindowSize(_mainWindow, _screenSize.width / 2 * _retinaFactor * _frameZoomFactor,
+                              _screenSize.height / 2 * _retinaFactor * _frameZoomFactor);
 
             _isInRetinaMonitor = true;
         }
@@ -762,7 +788,8 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
             {
                 _retinaFactor = 1;
             }
-            glfwSetWindowSize(_mainWindow, (int)(_screenSize.width * _retinaFactor * _frameZoomFactor), (int)(_screenSize.height *_retinaFactor * _frameZoomFactor));
+            glfwSetWindowSize(_mainWindow, (int)(_screenSize.width * _retinaFactor * _frameZoomFactor),
+                              (int)(_screenSize.height * _retinaFactor * _frameZoomFactor));
 
             _isInRetinaMonitor = false;
         }
@@ -775,22 +802,26 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     updateFrameSize();
 }
 
-void GLViewImpl::setViewPortInPoints(float x , float y , float w , float h)
+void GLViewImpl::setViewPortInPoints(float x, float y, float w, float h)
 {
     Viewport vp;
-    vp.x = (int)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor);
-    vp.y = (int)(y * _scaleY * _retinaFactor  * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor);
+    vp.x = (int)(x * _scaleX * _retinaFactor * _frameZoomFactor +
+                 _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor);
+    vp.y = (int)(y * _scaleY * _retinaFactor * _frameZoomFactor +
+                 _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor);
     vp.w = (unsigned int)(w * _scaleX * _retinaFactor * _frameZoomFactor);
     vp.h = (unsigned int)(h * _scaleY * _retinaFactor * _frameZoomFactor);
     Camera::setDefaultViewport(vp);
 }
 
-void GLViewImpl::setScissorInPoints(float x , float y , float w , float h)
+void GLViewImpl::setScissorInPoints(float x, float y, float w, float h)
 {
-    auto x1 = (int)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor);
-    auto y1 = (int)(y * _scaleY * _retinaFactor  * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor);
-    auto width1 = (unsigned int)(w * _scaleX * _retinaFactor * _frameZoomFactor);
-    auto height1 = (unsigned int)(h * _scaleY * _retinaFactor * _frameZoomFactor);
+    auto x1       = (int)(x * _scaleX * _retinaFactor * _frameZoomFactor +
+                    _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor);
+    auto y1       = (int)(y * _scaleY * _retinaFactor * _frameZoomFactor +
+                    _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor);
+    auto width1   = (unsigned int)(w * _scaleX * _retinaFactor * _frameZoomFactor);
+    auto height1  = (unsigned int)(h * _scaleY * _retinaFactor * _frameZoomFactor);
     auto renderer = Director::getInstance()->getRenderer();
     renderer->setScissorRect(x1, y1, width1, height1);
 }
@@ -798,12 +829,14 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 Rect GLViewImpl::getScissorRect() const
 {
     auto renderer = Director::getInstance()->getRenderer();
-    auto& rect = renderer->getScissorRect();
+    auto& rect    = renderer->getScissorRect();
 
-    float x = (rect.x - _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor) / (_scaleX * _retinaFactor * _frameZoomFactor);
-    float y = (rect.y - _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor) / (_scaleY * _retinaFactor  * _frameZoomFactor);
+    float x = (rect.x - _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor) /
+              (_scaleX * _retinaFactor * _frameZoomFactor);
+    float y = (rect.y - _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor) /
+              (_scaleY * _retinaFactor * _frameZoomFactor);
     float w = rect.width / (_scaleX * _retinaFactor * _frameZoomFactor);
-    float h = rect.height / (_scaleY * _retinaFactor  * _frameZoomFactor);
+    float h = rect.height / (_scaleY * _retinaFactor * _frameZoomFactor);
     return Rect(x, y, w, h);
 }
 
@@ -822,40 +855,41 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 
 void GLViewImpl::onGLFWMouseCallBack(GLFWwindow* /*window*/, int button, int action, int /*modify*/)
 {
-    if(GLFW_MOUSE_BUTTON_LEFT == button)
+    if (GLFW_MOUSE_BUTTON_LEFT == button)
     {
-        if(GLFW_PRESS == action)
+        if (GLFW_PRESS == action)
         {
             _captured = true;
-            if (this->getViewPortRect().equals(Rect::ZERO) || this->getViewPortRect().containsPoint(Vec2(_mouseX,_mouseY)))
+            if (this->getViewPortRect().equals(Rect::ZERO) ||
+                this->getViewPortRect().containsPoint(Vec2(_mouseX, _mouseY)))
             {
                 intptr_t id = 0;
                 this->handleTouchesBegin(1, &id, &_mouseX, &_mouseY);
             }
         }
-        else if(GLFW_RELEASE == action)
+        else if (GLFW_RELEASE == action)
         {
             if (_captured)
             {
-                _captured = false;
+                _captured   = false;
                 intptr_t id = 0;
                 this->handleTouchesEnd(1, &id, &_mouseX, &_mouseY);
             }
         }
     }
-    
-    //Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
+
+    // Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
     float cursorX = (_mouseX - _viewPortRect.origin.x) / _scaleX;
     float cursorY = (_viewPortRect.origin.y + _viewPortRect.size.height - _mouseY) / _scaleY;
 
-    if(GLFW_PRESS == action)
+    if (GLFW_PRESS == action)
     {
         EventMouse event(EventMouse::MouseEventType::MOUSE_DOWN);
         event.setCursorPosition(cursorX, cursorY);
         event.setMouseButton(static_cast<cocos2d::EventMouse::MouseButton>(button));
         Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
     }
-    else if(GLFW_RELEASE == action)
+    else if (GLFW_RELEASE == action)
     {
         EventMouse event(EventMouse::MouseEventType::MOUSE_UP);
         event.setCursorPosition(cursorX, cursorY);
@@ -886,8 +920,8 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
         intptr_t id = 0;
         this->handleTouchesMove(1, &id, &_mouseX, &_mouseY);
     }
-    
-    //Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
+
+    // Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
     float cursorX = (_mouseX - _viewPortRect.origin.x) / _scaleX;
     float cursorY = (_viewPortRect.origin.y + _viewPortRect.size.height - _mouseY) / _scaleY;
 
@@ -912,7 +946,7 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 void GLViewImpl::onGLFWMouseScrollCallback(GLFWwindow* /*window*/, double x, double y)
 {
     EventMouse event(EventMouse::MouseEventType::MOUSE_SCROLL);
-    //Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
+    // Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
     float cursorX = (_mouseX - _viewPortRect.origin.x) / _scaleX;
     float cursorY = (_viewPortRect.origin.y + _viewPortRect.size.height - _mouseY) / _scaleY;
     event.setScrollData((float)x, -(float)y);
@@ -952,26 +986,26 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 
 void GLViewImpl::onGLFWCharCallback(GLFWwindow* /*window*/, unsigned int character)
 {
-    char16_t wcharString[2] = { (char16_t) character, 0 };
+    char16_t wcharString[2] = {(char16_t)character, 0};
     std::string utf8String;
 
-    StringUtils::UTF16ToUTF8( wcharString, utf8String );
+    StringUtils::UTF16ToUTF8(wcharString, utf8String);
     static std::set<std::string> controlUnicode = {
-        "\xEF\x9C\x80", // up
-        "\xEF\x9C\x81", // down
-        "\xEF\x9C\x82", // left
-        "\xEF\x9C\x83", // right
-        "\xEF\x9C\xA8", // delete
-        "\xEF\x9C\xA9", // home
-        "\xEF\x9C\xAB", // end
-        "\xEF\x9C\xAC", // pageup
-        "\xEF\x9C\xAD", // pagedown
-        "\xEF\x9C\xB9"  // clear
+        "\xEF\x9C\x80",  // up
+        "\xEF\x9C\x81",  // down
+        "\xEF\x9C\x82",  // left
+        "\xEF\x9C\x83",  // right
+        "\xEF\x9C\xA8",  // delete
+        "\xEF\x9C\xA9",  // home
+        "\xEF\x9C\xAB",  // end
+        "\xEF\x9C\xAC",  // pageup
+        "\xEF\x9C\xAD",  // pagedown
+        "\xEF\x9C\xB9"   // clear
     };
     // Check for send control key
     if (controlUnicode.find(utf8String) == controlUnicode.end())
     {
-        IMEDispatcher::sharedDispatcher()->dispatchInsertText( utf8String.c_str(), utf8String.size() );
+        IMEDispatcher::sharedDispatcher()->dispatchInsertText(utf8String.c_str(), utf8String.size());
     }
 }
 
@@ -984,18 +1018,18 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
 {
     if (width && height && _resolutionPolicy != ResolutionPolicy::UNKNOWN)
     {
-        Size baseDesignSize = _designResolutionSize;
+        Size baseDesignSize                   = _designResolutionSize;
         ResolutionPolicy baseResolutionPolicy = _resolutionPolicy;
 
-        int frameWidth = width / _frameZoomFactor;
+        int frameWidth  = width / _frameZoomFactor;
         int frameHeight = height / _frameZoomFactor;
         setFrameSize(frameWidth, frameHeight);
         setDesignResolutionSize(baseDesignSize.width, baseDesignSize.height, baseResolutionPolicy);
         Director::getInstance()->setViewport();
         Director::getInstance()->getEventDispatcher()->dispatchCustomEvent(GLViewImpl::EVENT_WINDOW_RESIZED, nullptr);
-        
+
 #if defined(CC_USE_METAL)
-        //update metal attachment texture size.
+        // update metal attachment texture size.
         int fbWidth, fbHeight;
         glfwGetFramebufferSize(_mainWindow, &fbWidth, &fbHeight);
         backend::UtilsMTL::resizeDefaultAttachmentTexture(fbWidth, fbHeight);
@@ -1027,4 +1061,4 @@ static void onGLFWWindowFocusCallback(GLFWwindow* window, int focused)
     }
 }
 
-NS_CC_END // end of namespace cocos2d;
+NS_CC_END  // end of namespace cocos2d;
diff --git a/cocos/platform/win32/CCApplication-win32.cpp b/cocos/platform/win32/CCApplication-win32.cpp
index 3f51532ce9c0..ea159d973b98 100644
--- a/cocos/platform/win32/CCApplication-win32.cpp
+++ b/cocos/platform/win32/CCApplication-win32.cpp
@@ -287,14 +287,14 @@ std::string Application::getVersion()
     return verString;
 }
 
-bool Application::openURL(const std::string& url)
+bool Application::openURL(std::string_view url)
 {
     std::wstring wURL = ntcvt::from_chars(url, CP_UTF8);
     HINSTANCE r       = ShellExecuteW(NULL, L"open", wURL.c_str(), NULL, NULL, SW_SHOWNORMAL);
     return (size_t)r > 32;
 }
 
-void Application::setResourceRootPath(const std::string& rootResDir)
+void Application::setResourceRootPath(std::string_view rootResDir)
 {
     _resourceRootPath = rootResDir;
     std::replace(_resourceRootPath.begin(), _resourceRootPath.end(), '\\', '/');
@@ -308,12 +308,12 @@ void Application::setResourceRootPath(const std::string& rootResDir)
     pFileUtils->setSearchPaths(searchPaths);
 }
 
-const std::string& Application::getResourceRootPath(void)
+std::string_view Application::getResourceRootPath(void)
 {
     return _resourceRootPath;
 }
 
-void Application::setStartupScriptFilename(const std::string& startupScriptFile)
+void Application::setStartupScriptFilename(std::string_view startupScriptFile)
 {
     _startupScriptFilename = startupScriptFile;
     std::replace(_startupScriptFilename.begin(), _startupScriptFilename.end(), '\\', '/');
diff --git a/cocos/platform/win32/CCApplication-win32.h b/cocos/platform/win32/CCApplication-win32.h
index 011100a3f229..56fcc81e849c 100644
--- a/cocos/platform/win32/CCApplication-win32.h
+++ b/cocos/platform/win32/CCApplication-win32.h
@@ -78,23 +78,23 @@ class CC_DLL Application : public ApplicationProtocol
      @param String with url to open.
      @return true if the resource located by the URL was successfully opened; otherwise false.
      */
-    virtual bool openURL(const std::string& url);
+    virtual bool openURL(std::string_view url);
 
     /**
      *  Sets the Resource root path.
      *  @deprecated Please use FileUtils::getInstance()->setSearchPaths() instead.
      */
-    CC_DEPRECATED_ATTRIBUTE void setResourceRootPath(const std::string& rootResDir);
+    CC_DEPRECATED_ATTRIBUTE void setResourceRootPath(std::string_view rootResDir);
 
     /**
      *  Gets the Resource root path.
      *  @deprecated Please use FileUtils::getInstance()->getSearchPaths() instead.
      */
-    CC_DEPRECATED_ATTRIBUTE const std::string& getResourceRootPath();
+    CC_DEPRECATED_ATTRIBUTE std::string_view getResourceRootPath();
 
-    void setStartupScriptFilename(const std::string& startupScriptFile);
+    void setStartupScriptFilename(std::string_view startupScriptFile);
 
-    const std::string& getStartupScriptFilename() { return _startupScriptFilename; }
+    std::string_view getStartupScriptFilename() { return _startupScriptFilename; }
 
 protected:
     HINSTANCE _instance;
diff --git a/cocos/platform/win32/CCFileUtils-win32.cpp b/cocos/platform/win32/CCFileUtils-win32.cpp
index 1dd25374afe9..3b70dd413b66 100644
--- a/cocos/platform/win32/CCFileUtils-win32.cpp
+++ b/cocos/platform/win32/CCFileUtils-win32.cpp
@@ -26,7 +26,6 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "platform/win32/CCFileUtils-win32.h"
 #include "platform/CCCommon.h"
-#include "tinydir/tinydir.h"
 #include <Shlobj.h>
 #include <cstdlib>
 #include <regex>
@@ -45,14 +44,14 @@ NS_CC_BEGIN
 
 // The root path of resources, the character encoding is UTF-8.
 // UTF-8 is the only encoding supported by adxe API by default.
-static std::string s_workingPath = "";
-static std::string s_exePath     = "";
+static std::wstring s_workingPath;
+static std::string s_exePath;
 
 // D:\aaa\bbb\ccc\ddd\abc.txt --> D:/aaa/bbb/ccc/ddd/abc.txt
-static std::string convertPathFormatToUnixStyle(const std::string& path)
+static std::string convertPathFormatToUnixStyle(std::string_view path)
 {
-    std::string ret = path;
-    int len         = ret.length();
+    std::string ret{path};
+    int len = ret.length();
     for (int i = 0; i < len; ++i)
     {
         if (ret[i] == '\\')
@@ -63,6 +62,20 @@ static std::string convertPathFormatToUnixStyle(const std::string& path)
     return ret;
 }
 
+static std::string convertPathFormatToWinStyle(std::string_view path)
+{
+    std::string ret{path};
+    int len = ret.length();
+    for (int i = 0; i < len; ++i)
+    {
+        if (ret[i] == '/')
+        {
+            ret[i] = '\\';
+        }
+    }
+    return ret;
+}
+
 static void _checkWorkingPath()
 {
     if (s_workingPath.empty())
@@ -70,15 +83,9 @@ static void _checkWorkingPath()
         WCHAR utf16Path[CC_MAX_PATH] = {0};
         int nNum                     = GetCurrentDirectoryW(CC_MAX_PATH - 2, utf16Path);
 
-        char utf8WorkingDir[CC_MAX_PATH] = {0};
-        nNum =
-            WideCharToMultiByte(CP_UTF8, 0, utf16Path, nNum, utf8WorkingDir, sizeof(utf8WorkingDir), nullptr, nullptr);
-        if (nNum < (CC_MAX_PATH - 2))
-        {
-            utf8WorkingDir[nNum]     = '\\';
-            utf8WorkingDir[nNum + 1] = '\0';
-            s_workingPath            = convertPathFormatToUnixStyle(utf8WorkingDir);
-        }
+        s_workingPath.reserve(nNum + 1);
+        s_workingPath.assign(utf16Path, nNum);
+        s_workingPath.push_back('\\');
     }
 }
 
@@ -121,25 +128,26 @@ bool FileUtilsWin32::init()
     DECLARE_GUARD;
 
     _checkWorkingPath();
-    _defaultResRootPath = s_workingPath;
+    _defaultResRootPath      = ntcvt::from_chars(s_workingPath);
+    _defaultResRootPathUtf16 = s_workingPath;
 
     bool bRet = FileUtils::init();
 
     _checkExePath();
 
-    if (s_workingPath != s_exePath)
+    if (_defaultResRootPath != s_exePath)
         addSearchPath(s_exePath);
 
     return bRet;
 }
 
-bool FileUtilsWin32::isDirectoryExistInternal(const std::string& dirPath) const
+bool FileUtilsWin32::isDirectoryExistInternal(std::string_view dirPath) const
 {
     uint32_t fAttrib = GetFileAttributesW(ntcvt::from_chars(dirPath).c_str());
     return (fAttrib != INVALID_FILE_ATTRIBUTES && (fAttrib & FILE_ATTRIBUTE_DIRECTORY));
 }
 
-bool FileUtilsWin32::isFileExistInternal(const std::string& strFilePath) const
+bool FileUtilsWin32::isFileExistInternal(std::string_view strFilePath) const
 {
     DECLARE_GUARD;
     if (strFilePath.empty())
@@ -147,17 +155,19 @@ bool FileUtilsWin32::isFileExistInternal(const std::string& strFilePath) const
         return false;
     }
 
-    std::string strPath = strFilePath;
-    if (!isAbsolutePath(strPath))
+    std::wstring strPathUtf16;
+    if (!isAbsolutePath(strFilePath))
     {  // Not absolute path, add the default root path at the beginning.
-        strPath.insert(0, _defaultResRootPath);
+        strPathUtf16.insert(0, _defaultResRootPathUtf16);
     }
+    else
+        strPathUtf16 = ntcvt::from_chars(strFilePath);
 
-    DWORD attr = GetFileAttributesW(ntcvt::from_chars(strPath).c_str());
+    DWORD attr = GetFileAttributesW(strPathUtf16.c_str());
     return (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY));
 }
 
-FileUtils::Status FileUtilsWin32::getContents(const std::string& filename, ResizableBuffer* buffer) const
+FileUtils::Status FileUtilsWin32::getContents(std::string_view filename, ResizableBuffer* buffer) const
 {
     if (filename.empty())
         return FileUtils::Status::NotExists;
@@ -199,9 +209,9 @@ FileUtils::Status FileUtilsWin32::getContents(const std::string& filename, Resiz
     return FileUtils::Status::OK;
 }
 
-std::string FileUtilsWin32::getPathForFilename(const std::string& filename,
-                                               const std::string& resolutionDirectory,
-                                               const std::string& searchPath) const
+std::string FileUtilsWin32::getPathForFilename(std::string_view filename,
+                                               std::string_view resolutionDirectory,
+                                               std::string_view searchPath) const
 {
     std::string unixFileName            = convertPathFormatToUnixStyle(filename);
     std::string unixResolutionDirectory = convertPathFormatToUnixStyle(resolutionDirectory);
@@ -210,8 +220,8 @@ std::string FileUtilsWin32::getPathForFilename(const std::string& filename,
     return FileUtils::getPathForFilename(unixFileName, unixResolutionDirectory, unixSearchPath);
 }
 
-std::string FileUtilsWin32::getFullPathForFilenameWithinDirectory(const std::string& strDirectory,
-                                                                  const std::string& strFilename) const
+std::string FileUtilsWin32::getFullPathForFilenameWithinDirectory(std::string_view strDirectory,
+                                                                  std::string_view strFilename) const
 {
     std::string unixDirectory = convertPathFormatToUnixStyle(strDirectory);
     std::string unixFilename  = convertPathFormatToUnixStyle(strFilename);
@@ -219,53 +229,7 @@ std::string FileUtilsWin32::getFullPathForFilenameWithinDirectory(const std::str
     return FileUtils::getFullPathForFilenameWithinDirectory(unixDirectory, unixFilename);
 }
 
-void FileUtilsWin32::listFilesRecursively(const std::string& dirPath, std::vector<std::string>* files) const
-{
-    std::string fullpath = fullPathForDirectory(dirPath);
-    if (isDirectoryExist(fullpath))
-    {
-        tinydir_dir dir;
-        std::wstring fullpathstr = ntcvt::from_chars(fullpath);
-
-        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
-        {
-            while (dir.has_next)
-            {
-                tinydir_file file;
-                if (tinydir_readfile(&dir, &file) == -1)
-                {
-                    // Error getting file
-                    break;
-                }
-                std::string fileName = ntcvt::from_chars(file.name);
-
-                if (fileName != "." && fileName != "..")
-                {
-                    std::string filepath = ntcvt::from_chars(file.path);
-                    if (file.is_dir)
-                    {
-                        filepath.push_back('/');
-                        files->push_back(filepath);
-                        listFilesRecursively(filepath, files);
-                    }
-                    else
-                    {
-                        files->push_back(std::move(filepath));
-                    }
-                }
-
-                if (tinydir_next(&dir) == -1)
-                {
-                    // Error getting next file
-                    break;
-                }
-            }
-        }
-        tinydir_close(&dir);
-    }
-}
-
-int64_t FileUtilsWin32::getFileSize(const std::string& filepath) const
+int64_t FileUtilsWin32::getFileSize(std::string_view filepath) const
 {
     if (filepath.empty())
         return -1;
@@ -276,49 +240,6 @@ int64_t FileUtilsWin32::getFileSize(const std::string& filepath) const
     return -1;
 }
 
-std::vector<std::string> FileUtilsWin32::listFiles(const std::string& dirPath) const
-{
-    std::string fullpath = fullPathForDirectory(dirPath);
-    std::vector<std::string> files;
-    if (isDirectoryExist(fullpath))
-    {
-        tinydir_dir dir;
-        std::wstring fullpathstr = ntcvt::from_chars(fullpath);
-
-        if (tinydir_open(&dir, &fullpathstr[0]) != -1)
-        {
-            while (dir.has_next)
-            {
-                tinydir_file file;
-                if (tinydir_readfile(&dir, &file) == -1)
-                {
-                    // Error getting file
-                    break;
-                }
-
-                std::string fileName = ntcvt::from_chars(file.name);
-                if (fileName != "." && fileName != "..")
-                {
-                    std::string filepath = ntcvt::from_chars(file.path);
-                    if (file.is_dir)
-                    {
-                        filepath.push_back('/');
-                    }
-                    files.push_back(std::move(filepath));
-                }
-
-                if (tinydir_next(&dir) == -1)
-                {
-                    // Error getting next file
-                    break;
-                }
-            }
-        }
-        tinydir_close(&dir);
-    }
-    return files;
-}
-
 std::string FileUtilsWin32::getWritablePath() const
 {
     DECLARE_GUARD;
@@ -380,7 +301,7 @@ std::string FileUtilsWin32::getNativeWritableAbsolutePath() const
     return convertPathFormatToUnixStyle(ntcvt::from_chars(retPath));
 }
 
-bool FileUtilsWin32::renameFile(const std::string& oldfullpath, const std::string& newfullpath) const
+bool FileUtilsWin32::renameFile(std::string_view oldfullpath, std::string_view newfullpath) const
 {
     CCASSERT(!oldfullpath.empty(), "Invalid path");
     CCASSERT(!newfullpath.empty(), "Invalid path");
@@ -392,7 +313,7 @@ bool FileUtilsWin32::renameFile(const std::string& oldfullpath, const std::strin
     {
         if (!DeleteFile(_wNew.c_str()))
         {
-            CCLOGERROR("Fail to delete file %s !Error code is 0x%x", newfullpath.c_str(), GetLastError());
+            CCLOGERROR("Fail to delete file %s !Error code is 0x%x", newfullpath.data(), GetLastError());
         }
     }
 
@@ -402,17 +323,19 @@ bool FileUtilsWin32::renameFile(const std::string& oldfullpath, const std::strin
     }
     else
     {
-        CCLOGERROR("Fail to rename file %s to %s !Error code is 0x%x", oldfullpath.c_str(), newfullpath.c_str(),
+        CCLOGERROR("Fail to rename file %s to %s !Error code is 0x%x", oldfullpath.data(), newfullpath.data(),
                    GetLastError());
         return false;
     }
 }
 
-bool FileUtilsWin32::renameFile(const std::string& path, const std::string& oldname, const std::string& name) const
+bool FileUtilsWin32::renameFile(std::string_view path, std::string_view oldname, std::string_view name) const
 {
     CCASSERT(!path.empty(), "Invalid path");
-    std::string oldPath = path + oldname;
-    std::string newPath = path + name;
+    std::string oldPath{path};
+    oldPath += oldname;
+    std::string newPath{path};
+    newPath += name;
 
     std::regex pat("\\/");
     std::string _old = std::regex_replace(oldPath, pat, "\\");
@@ -421,7 +344,7 @@ bool FileUtilsWin32::renameFile(const std::string& path, const std::string& oldn
     return renameFile(_old, _new);
 }
 
-bool FileUtilsWin32::createDirectory(const std::string& dirPath) const
+bool FileUtilsWin32::createDirectory(std::string_view dirPath) const
 {
     CCASSERT(!dirPath.empty(), "Invalid path");
 
@@ -478,10 +401,9 @@ bool FileUtilsWin32::createDirectory(const std::string& dirPath) const
     return true;
 }
 
-bool FileUtilsWin32::removeFile(const std::string& filepath) const
+bool FileUtilsWin32::removeFile(std::string_view filepath) const
 {
-    std::regex pat("\\/");
-    std::string win32path = std::regex_replace(filepath, pat, "\\");
+    std::string win32path = convertPathFormatToWinStyle(filepath);
 
     if (DeleteFileW(ntcvt::from_chars(win32path).c_str()))
     {
@@ -489,14 +411,14 @@ bool FileUtilsWin32::removeFile(const std::string& filepath) const
     }
     else
     {
-        CCLOGERROR("Fail remove file %s !Error code is 0x%x", filepath.c_str(), GetLastError());
+        CCLOGERROR("Fail remove file %s !Error code is 0x%x", filepath.data(), GetLastError());
         return false;
     }
 }
 
-bool FileUtilsWin32::removeDirectory(const std::string& dirPath) const
+bool FileUtilsWin32::removeDirectory(std::string_view dirPath) const
 {
-    std::string dirPathCopy = dirPath;
+    std::string dirPathCopy{dirPath};
     if (!dirPath.empty() && dirPath[dirPath.length() - 1] != '/' && dirPath[dirPath.length() - 1] != '\\')
     {
         dirPathCopy.push_back('/');
diff --git a/cocos/platform/win32/CCFileUtils-win32.h b/cocos/platform/win32/CCFileUtils-win32.h
index 5188e7f83aea..d68f8c54aa93 100644
--- a/cocos/platform/win32/CCFileUtils-win32.h
+++ b/cocos/platform/win32/CCFileUtils-win32.h
@@ -53,7 +53,7 @@ class CC_DLL FileUtilsWin32 : public FileUtils
     virtual std::string getNativeWritableAbsolutePath() const override;
 
 protected:
-    virtual bool isFileExistInternal(const std::string& strFilePath) const override;
+    virtual bool isFileExistInternal(std::string_view strFilePath) const override;
 
     /**
      *  Renames a file under the given directory.
@@ -63,9 +63,7 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param name     The new name of the file.
      *  @return True if the file have been renamed successfully, false if not.
      */
-    virtual bool renameFile(const std::string& path,
-                            const std::string& oldname,
-                            const std::string& name) const override;
+    virtual bool renameFile(std::string_view path, std::string_view oldname, std::string_view name) const override;
 
     /**
      *  Renames a file under the given directory.
@@ -74,14 +72,14 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param newfullpath  The new path + name of the file.
      *  @return True if the file have been renamed successfully, false if not.
      */
-    virtual bool renameFile(const std::string& oldfullpath, const std::string& newfullpath) const override;
+    virtual bool renameFile(std::string_view oldfullpath, std::string_view newfullpath) const override;
 
     /**
      *  Checks whether a directory exists without considering search paths and resolution orders.
      *  @param dirPath The directory (with absolute path) to look up for
      *  @return Returns true if the directory found at the given absolute path, otherwise returns false
      */
-    virtual bool isDirectoryExistInternal(const std::string& dirPath) const override;
+    virtual bool isDirectoryExistInternal(std::string_view dirPath) const override;
 
     /**
      *  Removes a file.
@@ -89,7 +87,7 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param filepath The full path of the file, it must be an absolute path.
      *  @return True if the file have been removed successfully, false if not.
      */
-    virtual bool removeFile(const std::string& filepath) const override;
+    virtual bool removeFile(std::string_view filepath) const override;
 
     /**
      *  Creates a directory.
@@ -97,7 +95,7 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param dirPath The path of the directory, it must be an absolute path.
      *  @return True if the directory have been created successfully, false if not.
      */
-    virtual bool createDirectory(const std::string& dirPath) const override;
+    virtual bool createDirectory(std::string_view dirPath) const override;
 
     /**
      *  Removes a directory.
@@ -105,11 +103,11 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param dirPath  The full path of the directory, it must be an absolute path.
      *  @return True if the directory have been removed successfully, false if not.
      */
-    virtual bool removeDirectory(const std::string& dirPath) const override;
+    virtual bool removeDirectory(std::string_view dirPath) const override;
 
-    virtual FileUtils::Status getContents(const std::string& filename, ResizableBuffer* buffer) const override;
+    virtual FileUtils::Status getContents(std::string_view filename, ResizableBuffer* buffer) const override;
 
-    virtual int64_t getFileSize(const std::string& filepath) const override;
+    virtual int64_t getFileSize(std::string_view filepath) const override;
 
     /**
      *  Gets full path for filename, resolution directory and search path.
@@ -119,9 +117,9 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param searchPath The search path.
      *  @return The full path of the file. It will return an empty string if the full path of the file doesn't exist.
      */
-    virtual std::string getPathForFilename(const std::string& filename,
-                                           const std::string& resolutionDirectory,
-                                           const std::string& searchPath) const override;
+    virtual std::string getPathForFilename(std::string_view filename,
+                                           std::string_view resolutionDirectory,
+                                           std::string_view searchPath) const override;
 
     /**
      *  Gets full path for the directory and the filename.
@@ -133,24 +131,11 @@ class CC_DLL FileUtilsWin32 : public FileUtils
      *  @param filename  The name of the file.
      *  @return The full path of the file, if the file can't be found, it will return an empty string.
      */
-    virtual std::string getFullPathForFilenameWithinDirectory(const std::string& directory,
-                                                              const std::string& filename) const override;
+    virtual std::string getFullPathForFilenameWithinDirectory(std::string_view directory,
+                                                              std::string_view filename) const override;
 
-    /**
-     *  List all files in a directory.
-     *
-     *  @param dirPath The path of the directory, it could be a relative or an absolute path.
-     *  @return File paths in a string vector
-     */
-    virtual std::vector<std::string> listFiles(const std::string& dirPath) const override;
-
-    /**
-     *  List all files recursively in a directory.
-     *
-     *  @param dirPath The path of the directory, it could be a relative or an absolute path.
-     *  @return File paths in a string vector
-     */
-    virtual void listFilesRecursively(const std::string& dirPath, std::vector<std::string>* files) const override;
+private:
+    std::wstring_view _defaultResRootPathUtf16;
 };
 
 // end of platform group
diff --git a/cocos/renderer/CCMaterial.cpp b/cocos/renderer/CCMaterial.cpp
index 17a43f39b939..da4aeb7cf106 100644
--- a/cocos/renderer/CCMaterial.cpp
+++ b/cocos/renderer/CCMaterial.cpp
@@ -48,7 +48,7 @@ NS_CC_BEGIN
 
 namespace
 {
-std::string replaceDefines(const std::string& compileTimeDefines)
+std::string replaceDefines(std::string_view compileTimeDefines)
 {
 
     auto defineParts = Console::Utility::split(compileTimeDefines, ';');
@@ -72,7 +72,7 @@ std::string replaceDefines(const std::string& compileTimeDefines)
 static const char* getOptionalString(Properties* properties, const char* key, const char* defaultValue);
 static bool isValidUniform(const char* name);
 
-Material* Material::createWithFilename(const std::string& filepath)
+Material* Material::createWithFilename(std::string_view filepath)
 {
     auto validfilename = FileUtils::getInstance()->fullPathForFilename(filepath);
     if (!validfilename.empty())
@@ -130,7 +130,7 @@ bool Material::initWithProgramState(backend::ProgramState* state)
     return false;
 }
 
-bool Material::initWithFile(const std::string& validfilename)
+bool Material::initWithFile(std::string_view validfilename)
 {
     // Warning: properties is not a "Ref" object, must be manually deleted
     Properties* properties = Properties::createNonRefCounted(validfilename);
@@ -496,7 +496,7 @@ bool Material::parseRenderState(RenderState::StateBlock* state, Properties* prop
     return true;
 }
 
-void Material::setName(const std::string& name)
+void Material::setName(std::string_view name)
 {
     _name = name;
 }
@@ -542,7 +542,7 @@ const Vector<Technique*>& Material::getTechniques() const
     return _techniques;
 }
 
-Technique* Material::getTechniqueByName(const std::string& name)
+Technique* Material::getTechniqueByName(std::string_view name)
 {
     for (const auto& technique : _techniques)
     {
@@ -564,7 +564,7 @@ void Material::addTechnique(Technique* technique)
     _techniques.pushBack(technique);
 }
 
-void Material::setTechnique(const std::string& techniqueName)
+void Material::setTechnique(std::string_view techniqueName)
 {
     auto technique = getTechniqueByName(techniqueName);
     if (technique)
diff --git a/cocos/renderer/CCMaterial.h b/cocos/renderer/CCMaterial.h
index acc8ccdda2e8..bc94addc47cb 100644
--- a/cocos/renderer/CCMaterial.h
+++ b/cocos/renderer/CCMaterial.h
@@ -78,7 +78,7 @@ class CC_DLL Material : public Ref
      *
      * @return A new Material or NULL if there was an error.
      */
-    static Material* createWithFilename(const std::string& path);
+    static Material* createWithFilename(std::string_view path);
 
     /** Creates a Material with a GLProgramState.
      It will only contain one Technique and one Pass.
@@ -107,12 +107,12 @@ class CC_DLL Material : public Ref
     /// returns the material name
     std::string getName() const;
     /// sets the material name
-    void setName(const std::string& name);
+    void setName(std::string_view name);
 
     /** Returns a Technique by its name.
      returns `nullptr` if the Technique can't be found.
      */
-    Technique* getTechniqueByName(const std::string& name);
+    Technique* getTechniqueByName(std::string_view name);
 
     /** Returns a Technique by index.
      returns `nullptr` if the index is invalid.
@@ -132,7 +132,7 @@ class CC_DLL Material : public Ref
     void addTechnique(Technique* technique);
 
     /** Sets the current technique */
-    void setTechnique(const std::string& techniqueName);
+    void setTechnique(std::string_view techniqueName);
 
     /** returns a clone (deep-copy) of the material */
     virtual Material* clone() const;
@@ -147,7 +147,7 @@ class CC_DLL Material : public Ref
     Material();
     ~Material();
     bool initWithProgramState(backend::ProgramState* state);
-    bool initWithFile(const std::string& file);
+    bool initWithFile(std::string_view file);
     bool initWithProperties(Properties* materialProperties);
 
     void setTarget(Node* target);
diff --git a/cocos/renderer/CCPass.h b/cocos/renderer/CCPass.h
index ee095d854fae..483112611e64 100644
--- a/cocos/renderer/CCPass.h
+++ b/cocos/renderer/CCPass.h
@@ -94,8 +94,8 @@ class CC_DLL Pass : public Ref
      */
     VertexAttribBinding* getVertexAttributeBinding() const;
 
-    void setName(const std::string& name) { _name = name; }
-    const std::string& getName() const { return _name; }
+    void setName(std::string_view name) { _name = name; }
+    std::string_view getName() const { return _name; }
 
     inline RenderState::StateBlock& getStateBlock() { return _renderState._state; }
 
diff --git a/cocos/renderer/CCRenderState.cpp b/cocos/renderer/CCRenderState.cpp
index 4a1b8821d7a6..690af0e4595e 100644
--- a/cocos/renderer/CCRenderState.cpp
+++ b/cocos/renderer/CCRenderState.cpp
@@ -183,12 +183,12 @@ void RenderState::StateBlock::restoreUnmodifiedStates(int32_t overrideBits, Pipe
     }
 }
 
-static bool parseBoolean(const std::string& value)
+static bool parseBoolean(std::string_view value)
 {
     return (value.compare("true") == 0);
 }
 
-static backend::BlendFactor parseBlend(const std::string& value)
+static backend::BlendFactor parseBlend(std::string_view value)
 {
     // Convert the string to uppercase for comparison.
     std::string upper(value);
@@ -222,12 +222,12 @@ static backend::BlendFactor parseBlend(const std::string& value)
     else
     {
         CCLOG("Unsupported blend value (%s). (Will default to BLEND_ONE if errors are treated as warnings)",
-              value.c_str());
+              value.data());
         return backend::BlendFactor::ONE;
     }
 }
 
-static DepthFunction parseDepthFunc(const std::string& value)
+static DepthFunction parseDepthFunc(std::string_view value)
 {
     // Convert string to uppercase for comparison
     std::string upper(value);
@@ -251,12 +251,12 @@ static DepthFunction parseDepthFunc(const std::string& value)
     else
     {
         CCLOG("Unsupported depth function value (%s). Will default to DEPTH_LESS if errors are treated as warnings)",
-              value.c_str());
+              value.data());
         return DepthFunction::LESS;
     }
 }
 
-static CullFaceSide parseCullFaceSide(const std::string& value)
+static CullFaceSide parseCullFaceSide(std::string_view value)
 {
     // Convert string to uppercase for comparison
     std::string upper(value);
@@ -271,12 +271,12 @@ static CullFaceSide parseCullFaceSide(const std::string& value)
     else
     {
         CCLOG("Unsupported cull face side value (%s). Will default to BACK if errors are treated as warnings.",
-              value.c_str());
+              value.data());
         return CullFaceSide::BACK;
     }
 }
 
-static FrontFace parseFrontFace(const std::string& value)
+static FrontFace parseFrontFace(std::string_view value)
 {
     // Convert string to uppercase for comparison
     std::string upper(value);
@@ -288,12 +288,12 @@ static FrontFace parseFrontFace(const std::string& value)
     else
     {
         CCLOG("Unsupported front face side value (%s). Will default to CCW if errors are treated as warnings.",
-              value.c_str());
+              value.data());
         return FrontFace::COUNTER_CLOCK_WISE;
     }
 }
 
-void RenderState::StateBlock::setState(const std::string& name, const std::string& value)
+void RenderState::StateBlock::setState(std::string_view name, std::string_view value)
 {
     if (name.compare("blend") == 0)
     {
@@ -333,7 +333,7 @@ void RenderState::StateBlock::setState(const std::string& name, const std::strin
     }
     else
     {
-        CCLOG("Unsupported render state string '%s'.", name.c_str());
+        CCLOG("Unsupported render state string '%s'.", name.data());
     }
 }
 
diff --git a/cocos/renderer/CCRenderState.h b/cocos/renderer/CCRenderState.h
index 3e94b36afbee..27fd7c497394 100644
--- a/cocos/renderer/CCRenderState.h
+++ b/cocos/renderer/CCRenderState.h
@@ -194,7 +194,7 @@ class CC_DLL RenderState : public Ref
          * @param name Name of the render state to set.
          * @param value Value of the specified render state.
          */
-        void setState(const std::string& name, const std::string& value);
+        void setState(std::string_view name, std::string_view value);
 
         uint32_t getHash() const;
         bool isDirty() const;
diff --git a/cocos/renderer/CCTechnique.cpp b/cocos/renderer/CCTechnique.cpp
index 88e5ee9e8beb..bc7e20896aa6 100644
--- a/cocos/renderer/CCTechnique.cpp
+++ b/cocos/renderer/CCTechnique.cpp
@@ -98,7 +98,7 @@ std::string Technique::getName() const
     return _name;
 }
 
-void Technique::setName(const std::string& name)
+void Technique::setName(std::string_view name)
 {
     _name = name;
 }
diff --git a/cocos/renderer/CCTechnique.h b/cocos/renderer/CCTechnique.h
index aaf4c937d861..6c7641b557bb 100644
--- a/cocos/renderer/CCTechnique.h
+++ b/cocos/renderer/CCTechnique.h
@@ -91,7 +91,7 @@ class CC_DLL Technique : public Ref
     ~Technique();
     bool init(Material* parent);
 
-    void setName(const std::string& name);
+    void setName(std::string_view name);
     RenderState _renderState;
     std::string _name;
     Vector<Pass*> _passes;
diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp
index 55995f8d5a9b..a81f654cd320 100644
--- a/cocos/renderer/CCTexture2D.cpp
+++ b/cocos/renderer/CCTexture2D.cpp
@@ -460,7 +460,7 @@ bool Texture2D::initWithImage(Image* image, backend::PixelFormat format)
 
 // implementation Texture2D (Text)
 bool Texture2D::initWithString(const char* text,
-                               const std::string& fontName,
+                               std::string_view fontName,
                                float fontSize,
                                const Vec2& dimensions /* = Vec2(0, 0)*/,
                                TextHAlignment hAlignment /* =  TextHAlignment::CENTER */,
@@ -741,7 +741,7 @@ void Texture2D::initProgram()
 
     // setup vertex layout
     auto vertexLayout = _programState->getVertexLayout();
-    auto& attributes  = _programState->getProgram()->getActiveAttributes();
+    auto attributes   = _programState->getProgram()->getActiveAttributes();
     auto iter         = attributes.find("a_position");
     if (iter != attributes.end())
         vertexLayout->setAttribute("a_position", iter->second.location, backend::VertexFormat::FLOAT2, 0, false);
diff --git a/cocos/renderer/CCTexture2D.h b/cocos/renderer/CCTexture2D.h
index 19afa6192876..9d4fb89c8493 100644
--- a/cocos/renderer/CCTexture2D.h
+++ b/cocos/renderer/CCTexture2D.h
@@ -273,7 +273,7 @@ class CC_DLL Texture2D : public Ref
      @param overflow Whether shrink font size when content larger than the dimensions.
      */
     bool initWithString(const char* text,
-                        const std::string& fontName,
+                        std::string_view fontName,
                         float fontSize,
                         const Vec2& dimensions    = Vec2(0, 0),
                         TextHAlignment hAlignment = TextHAlignment::CENTER,
diff --git a/cocos/renderer/CCTextureAtlas.cpp b/cocos/renderer/CCTextureAtlas.cpp
index 5617481f5553..0810493c9f20 100644
--- a/cocos/renderer/CCTextureAtlas.cpp
+++ b/cocos/renderer/CCTextureAtlas.cpp
@@ -99,7 +99,7 @@ void TextureAtlas::setQuads(V3F_C4B_T2F_Quad* quads)
 
 // TextureAtlas - alloc & init
 
-TextureAtlas* TextureAtlas::create(const std::string& file, ssize_t capacity)
+TextureAtlas* TextureAtlas::create(std::string_view file, ssize_t capacity)
 {
     TextureAtlas* textureAtlas = new TextureAtlas();
     if (textureAtlas->initWithFile(file, capacity))
@@ -123,7 +123,7 @@ TextureAtlas* TextureAtlas::createWithTexture(Texture2D* texture, ssize_t capaci
     return nullptr;
 }
 
-bool TextureAtlas::initWithFile(const std::string& file, ssize_t capacity)
+bool TextureAtlas::initWithFile(std::string_view file, ssize_t capacity)
 {
     // retained in property
     Texture2D* texture = Director::getInstance()->getTextureCache()->addImage(file);
@@ -134,7 +134,7 @@ bool TextureAtlas::initWithFile(const std::string& file, ssize_t capacity)
     }
     else
     {
-        CCLOG("cocos2d: Could not open file: %s", file.c_str());
+        CCLOG("cocos2d: Could not open file: %s", file.data());
         return false;
     }
 }
diff --git a/cocos/renderer/CCTextureAtlas.h b/cocos/renderer/CCTextureAtlas.h
index 0f8abffd2621..e088f3e95ffd 100644
--- a/cocos/renderer/CCTextureAtlas.h
+++ b/cocos/renderer/CCTextureAtlas.h
@@ -68,7 +68,7 @@ class CC_DLL TextureAtlas : public Ref
      @param file The file path.
      @param capacity Capacity for Quads.
     */
-    static TextureAtlas* create(const std::string& file, ssize_t capacity);
+    static TextureAtlas* create(std::string_view file, ssize_t capacity);
 
     /** Creates a TextureAtlas with a previously initialized Texture2D object, and
      * with an initial capacity for n Quads.
@@ -95,7 +95,7 @@ class CC_DLL TextureAtlas : public Ref
      @param file The file path.
      @param capacity Capacity for Quads.
     */
-    bool initWithFile(const std::string& file, ssize_t capacity);
+    bool initWithFile(std::string_view file, ssize_t capacity);
 
     /** Initializes a TextureAtlas with a previously initialized Texture2D object, and
     * with an initial capacity for Quads.
diff --git a/cocos/renderer/CCTextureCache.cpp b/cocos/renderer/CCTextureCache.cpp
index 3315479d7b1d..f99bcfc4de20 100644
--- a/cocos/renderer/CCTextureCache.cpp
+++ b/cocos/renderer/CCTextureCache.cpp
@@ -52,7 +52,7 @@ std::string TextureCache::s_etc1AlphaFileSuffix = "@alpha";
 
 // implementation TextureCache
 
-void TextureCache::setETC1AlphaFileSuffix(const std::string& suffix)
+void TextureCache::setETC1AlphaFileSuffix(std::string_view suffix)
 {
     s_etc1AlphaFileSuffix = suffix;
 }
@@ -82,7 +82,7 @@ std::string TextureCache::getDescription() const
 struct TextureCache::AsyncStruct
 {
 public:
-    AsyncStruct(const std::string& fn, const std::function<void(Texture2D*)>& f, const std::string& key)
+    AsyncStruct(std::string_view fn, const std::function<void(Texture2D*)>& f, std::string_view key)
         : filename(fn)
         , callback(f)
         , callbackKey(key)
@@ -131,7 +131,7 @@ struct TextureCache::AsyncStruct
  Call unbindImageAsync(path) to prevent the call to the callback when the
  texture is loaded.
  */
-void TextureCache::addImageAsync(const std::string& path, const std::function<void(Texture2D*)>& callback)
+void TextureCache::addImageAsync(std::string_view path, const std::function<void(Texture2D*)>& callback)
 {
     addImageAsync(path, callback, path);
 }
@@ -170,9 +170,9 @@ void TextureCache::addImageAsync(const std::string& path, const std::function<vo
  unbind the callback independently as needed whilst a call to
  unbindImageAsync(path) would be ambiguous.
  */
-void TextureCache::addImageAsync(const std::string& path,
+void TextureCache::addImageAsync(std::string_view path,
                                  const std::function<void(Texture2D*)>& callback,
-                                 const std::string& callbackKey)
+                                 std::string_view callbackKey)
 {
     Texture2D* texture = nullptr;
 
@@ -223,7 +223,7 @@ void TextureCache::addImageAsync(const std::string& path,
     _sleepCondition.notify_one();
 }
 
-void TextureCache::unbindImageAsync(const std::string& callbackKey)
+void TextureCache::unbindImageAsync(std::string_view callbackKey)
 {
     if (_asyncStructQueue.empty())
     {
@@ -383,7 +383,7 @@ void TextureCache::addImageAsyncCallBack(float /*dt*/)
     }
 }
 
-Texture2D* TextureCache::addImage(const std::string& path)
+Texture2D* TextureCache::addImage(std::string_view path)
 {
     Texture2D* texture = nullptr;
     Image* image       = nullptr;
@@ -422,7 +422,8 @@ Texture2D* TextureCache::addImage(const std::string& path)
                 _textures.emplace(fullpath, texture);
 
                 //-- ANDROID ETC1 ALPHA SUPPORTS.
-                std::string alphaFullPath = path + s_etc1AlphaFileSuffix;
+                std::string alphaFullPath{path};
+                alphaFullPath += s_etc1AlphaFileSuffix;
                 if (image->getFileType() == Image::Format::ETC1 && !s_etc1AlphaFileSuffix.empty() &&
                     FileUtils::getInstance()->isFileExist(alphaFullPath))
                 {
@@ -438,7 +439,7 @@ Texture2D* TextureCache::addImage(const std::string& path)
             }
             else
             {
-                CCLOG("cocos2d: Couldn't create texture for file:%s in TextureCache", path.c_str());
+                CCLOG("cocos2d: Couldn't create texture for file:%s in TextureCache", path.data());
                 CC_SAFE_RELEASE(texture);
                 texture = nullptr;
             }
@@ -450,7 +451,7 @@ Texture2D* TextureCache::addImage(const std::string& path)
     return texture;
 }
 
-void TextureCache::parseNinePatchImage(cocos2d::Image* image, cocos2d::Texture2D* texture, const std::string& path)
+void TextureCache::parseNinePatchImage(cocos2d::Image* image, cocos2d::Texture2D* texture, std::string_view path)
 {
     if (NinePatchImageParser::isNinePatchImage(path))
     {
@@ -460,7 +461,7 @@ void TextureCache::parseNinePatchImage(cocos2d::Image* image, cocos2d::Texture2D
     }
 }
 
-Texture2D* TextureCache::addImage(Image* image, const std::string& key)
+Texture2D* TextureCache::addImage(Image* image, std::string_view key)
 {
     CCASSERT(image != nullptr, "TextureCache: image MUST not be nil");
     CCASSERT(image->getData() != nullptr, "TextureCache: image MUST not be nil");
@@ -497,7 +498,7 @@ Texture2D* TextureCache::addImage(Image* image, const std::string& key)
     return texture;
 }
 
-bool TextureCache::reloadTexture(const std::string& fileName)
+bool TextureCache::reloadTexture(std::string_view fileName)
 {
     Texture2D* texture = nullptr;
 
@@ -585,15 +586,14 @@ void TextureCache::removeTexture(Texture2D* texture)
     }
 }
 
-void TextureCache::removeTextureForKey(const std::string& textureKeyName)
+void TextureCache::removeTextureForKey(std::string_view textureKeyName)
 {
-    std::string key = textureKeyName;
-    auto it         = _textures.find(key);
+    auto it = _textures.find(textureKeyName);
 
     if (it == _textures.end())
     {
-        key = FileUtils::getInstance()->fullPathForFilename(textureKeyName);
-        it  = _textures.find(key);
+        auto key = FileUtils::getInstance()->fullPathForFilename(textureKeyName);
+        it       = _textures.find(key);
     }
 
     if (it != _textures.end())
@@ -603,15 +603,14 @@ void TextureCache::removeTextureForKey(const std::string& textureKeyName)
     }
 }
 
-Texture2D* TextureCache::getTextureForKey(const std::string& textureKeyName) const
+Texture2D* TextureCache::getTextureForKey(std::string_view textureKeyName) const
 {
-    std::string key = textureKeyName;
-    auto it         = _textures.find(key);
+    auto it = _textures.find(textureKeyName);
 
     if (it == _textures.end())
     {
-        key = FileUtils::getInstance()->fullPathForFilename(textureKeyName);
-        it  = _textures.find(key);
+        auto key = FileUtils::getInstance()->fullPathForFilename(textureKeyName);
+        it       = _textures.find(key);
     }
 
     if (it != _textures.end())
@@ -676,15 +675,14 @@ std::string TextureCache::getCachedTextureInfo() const
     return buffer;
 }
 
-void TextureCache::renameTextureWithKey(const std::string& srcName, const std::string& dstName)
+void TextureCache::renameTextureWithKey(std::string_view srcName, std::string_view dstName)
 {
-    std::string key = srcName;
-    auto it         = _textures.find(key);
+    auto it = _textures.find(srcName);
 
     if (it == _textures.end())
     {
-        key = FileUtils::getInstance()->fullPathForFilename(srcName);
-        it  = _textures.find(key);
+        auto key = FileUtils::getInstance()->fullPathForFilename(srcName);
+        it       = _textures.find(key);
     }
 
     if (it != _textures.end())
@@ -723,7 +721,7 @@ VolatileTexture::~VolatileTexture()
     CC_SAFE_RELEASE(_uiImage);
 }
 
-void VolatileTextureMgr::addImageTexture(Texture2D* tt, const std::string& imageFileName)
+void VolatileTextureMgr::addImageTexture(Texture2D* tt, std::string_view imageFileName)
 {
     if (_isReloading)
     {
@@ -866,9 +864,7 @@ void VolatileTextureMgr::reloadAllTextures()
     _isReloading = false;
 }
 
-void VolatileTextureMgr::reloadTexture(Texture2D* texture,
-                                       const std::string& filename,
-                                       backend::PixelFormat pixelFormat)
+void VolatileTextureMgr::reloadTexture(Texture2D* texture, std::string_view filename, backend::PixelFormat pixelFormat)
 {
     if (!texture)
         return;
diff --git a/cocos/renderer/CCTextureCache.h b/cocos/renderer/CCTextureCache.h
index 2aca398febfd..f06643675861 100644
--- a/cocos/renderer/CCTextureCache.h
+++ b/cocos/renderer/CCTextureCache.h
@@ -64,7 +64,7 @@ class CC_DLL TextureCache : public Ref
 {
 public:
     // ETC1 ALPHA supports.
-    static void setETC1AlphaFileSuffix(const std::string& suffix);
+    static void setETC1AlphaFileSuffix(std::string_view suffix);
     static std::string getETC1AlphaFileSuffix();
 
 public:
@@ -92,7 +92,7 @@ class CC_DLL TextureCache : public Ref
     * Supported image extensions: .png, .bmp, .jpeg, .pvr.
      @param filepath The file path.
     */
-    Texture2D* addImage(const std::string& filepath);
+    Texture2D* addImage(std::string_view filepath);
 
     /** Returns a Texture2D object given a file image.
     * If the file image was not previously loaded, it will create a new Texture2D object and it will return it.
@@ -104,11 +104,11 @@ class CC_DLL TextureCache : public Ref
      @param callback A callback function would be invoked after the image is loaded.
      @since v0.8
     */
-    virtual void addImageAsync(const std::string& filepath, const std::function<void(Texture2D*)>& callback);
+    virtual void addImageAsync(std::string_view filepath, const std::function<void(Texture2D*)>& callback);
 
-    void addImageAsync(const std::string& path,
+    void addImageAsync(std::string_view path,
                        const std::function<void(Texture2D*)>& callback,
-                       const std::string& callbackKey);
+                       std::string_view callbackKey);
 
     /** Unbind a specified bound image asynchronous callback.
      * In the case an object who was bound to an image asynchronous callback was destroyed before the callback is
@@ -116,7 +116,7 @@ class CC_DLL TextureCache : public Ref
      * @param filename It's the related/absolute path of the file image.
      * @since v3.1
      */
-    virtual void unbindImageAsync(const std::string& filename);
+    virtual void unbindImageAsync(std::string_view filename);
 
     /** Unbind all bound image asynchronous load callbacks.
      * @since v3.1
@@ -129,13 +129,13 @@ class CC_DLL TextureCache : public Ref
      * @param key The "key" parameter will be used as the "key" for the cache.
      * If "key" is nil, then a new texture will be created each time.
      */
-    Texture2D* addImage(Image* image, const std::string& key);
+    Texture2D* addImage(Image* image, std::string_view key);
 
     /** Returns an already created texture. Returns nil if the texture doesn't exist.
     @param key It's the related/absolute path of the file image.
     @since v0.99.5
     */
-    Texture2D* getTextureForKey(const std::string& key) const;
+    Texture2D* getTextureForKey(std::string_view key) const;
 
     /** Reload texture from the image file.
      * If the file image hasn't loaded before, load it.
@@ -143,7 +143,7 @@ class CC_DLL TextureCache : public Ref
      * @param fileName It's the related/absolute path of the file image.
      * @return True if the reloading is succeed, otherwise return false.
      */
-    bool reloadTexture(const std::string& fileName);
+    bool reloadTexture(std::string_view fileName);
 
     /** Purges the dictionary of loaded textures.
      * Call this method if you receive the "Memory Warning".
@@ -168,7 +168,7 @@ class CC_DLL TextureCache : public Ref
     @param key It's the related/absolute path of the file image.
     @since v0.99.4
     */
-    void removeTextureForKey(const std::string& key);
+    void removeTextureForKey(std::string_view key);
 
     /** Output to CCLOG the current contents of this TextureCache.
      * This will attempt to calculate the size of each texture, and the total texture memory in use.
@@ -198,12 +198,12 @@ class CC_DLL TextureCache : public Ref
      *
      * @since v3.10
      */
-    void renameTextureWithKey(const std::string& srcName, const std::string& dstName);
+    void renameTextureWithKey(std::string_view srcName, std::string_view dstName);
 
 private:
     void addImageAsyncCallBack(float dt);
     void loadImage();
-    void parseNinePatchImage(Image* image, Texture2D* texture, const std::string& path);
+    void parseNinePatchImage(Image* image, Texture2D* texture, std::string_view path);
 
 public:
 protected:
@@ -224,7 +224,7 @@ class CC_DLL TextureCache : public Ref
 
     int _asyncRefCount;
 
-    std::unordered_map<std::string, Texture2D*> _textures;
+    hlookup::string_map<Texture2D*> _textures;
 
     static std::string s_etc1AlphaFileSuffix;
 };
@@ -272,7 +272,7 @@ class VolatileTexture
 class CC_DLL VolatileTextureMgr
 {
 public:
-    static void addImageTexture(Texture2D* tt, const std::string& imageFileName);
+    static void addImageTexture(Texture2D* tt, std::string_view imageFileName);
     static void addStringTexture(Texture2D* tt, const char* text, const FontDefinition& fontDefinition);
     static void addDataTexture(Texture2D* tt,
                                void* data,
@@ -292,7 +292,7 @@ class CC_DLL VolatileTextureMgr
     static VolatileTexture* findVolotileTexture(Texture2D* tt);
 
 private:
-    static void reloadTexture(Texture2D* texture, const std::string& filename, backend::PixelFormat pixelFormat);
+    static void reloadTexture(Texture2D* texture, std::string_view filename, backend::PixelFormat pixelFormat);
 };
 
 #endif
diff --git a/cocos/renderer/CCTextureCube.cpp b/cocos/renderer/CCTextureCube.cpp
index d7a7929cb434..9a757b226423 100644
--- a/cocos/renderer/CCTextureCube.cpp
+++ b/cocos/renderer/CCTextureCube.cpp
@@ -119,7 +119,7 @@ unsigned char* getImageData(Image* img, backend::PixelFormat& ePixFmt)
     return pTmpData;
 }
 
-Image* createImage(const std::string& path)
+Image* createImage(std::string_view path)
 {
     // Split up directory and filename
     // MUTEX:
@@ -150,12 +150,12 @@ TextureCube::~TextureCube()
     CC_SAFE_RELEASE_NULL(_texture);
 }
 
-TextureCube* TextureCube::create(const std::string& positive_x,
-                                 const std::string& negative_x,
-                                 const std::string& positive_y,
-                                 const std::string& negative_y,
-                                 const std::string& positive_z,
-                                 const std::string& negative_z)
+TextureCube* TextureCube::create(std::string_view positive_x,
+                                 std::string_view negative_x,
+                                 std::string_view positive_y,
+                                 std::string_view negative_y,
+                                 std::string_view positive_z,
+                                 std::string_view negative_z)
 {
     auto ret = new TextureCube();
     if (ret->init(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z))
@@ -167,12 +167,12 @@ TextureCube* TextureCube::create(const std::string& positive_x,
     return nullptr;
 }
 
-bool TextureCube::init(const std::string& positive_x,
-                       const std::string& negative_x,
-                       const std::string& positive_y,
-                       const std::string& negative_y,
-                       const std::string& positive_z,
-                       const std::string& negative_z)
+bool TextureCube::init(std::string_view positive_x,
+                       std::string_view negative_x,
+                       std::string_view positive_y,
+                       std::string_view negative_y,
+                       std::string_view positive_z,
+                       std::string_view negative_z)
 {
     _imgPath[0] = positive_x;
     _imgPath[1] = negative_x;
diff --git a/cocos/renderer/CCTextureCube.h b/cocos/renderer/CCTextureCube.h
index 99ee3f1c3eb4..578c32eccac7 100644
--- a/cocos/renderer/CCTextureCube.h
+++ b/cocos/renderer/CCTextureCube.h
@@ -56,12 +56,12 @@ class CC_DLL TextureCube : public Ref
        @param negative_z texture for the rear side of the texture cube face.
        @return  A new texture cube inited with given parameters.
     */
-    static TextureCube* create(const std::string& positive_x,
-                               const std::string& negative_x,
-                               const std::string& positive_y,
-                               const std::string& negative_y,
-                               const std::string& positive_z,
-                               const std::string& negative_z);
+    static TextureCube* create(std::string_view positive_x,
+                               std::string_view negative_x,
+                               std::string_view positive_y,
+                               std::string_view negative_y,
+                               std::string_view positive_z,
+                               std::string_view negative_z);
 
     /** Sets the min filter, mag filter, wrap s and wrap t texture parameters.
     If the texture size is NPOT (non power of 2), then in can only use GL_CLAMP_TO_EDGE in GL_TEXTURE_WRAP_{S,T}.
@@ -86,12 +86,12 @@ class CC_DLL TextureCube : public Ref
     virtual ~TextureCube();
 
 protected:
-    bool init(const std::string& positive_x,
-              const std::string& negative_x,
-              const std::string& positive_y,
-              const std::string& negative_y,
-              const std::string& positive_z,
-              const std::string& negative_z);
+    bool init(std::string_view positive_x,
+              std::string_view negative_x,
+              std::string_view positive_y,
+              std::string_view negative_y,
+              std::string_view positive_z,
+              std::string_view negative_z);
 
 private:
     std::vector<std::string> _imgPath;
diff --git a/cocos/renderer/backend/Device.h b/cocos/renderer/backend/Device.h
index fbf8934bc597..27a498e334a7 100644
--- a/cocos/renderer/backend/Device.h
+++ b/cocos/renderer/backend/Device.h
@@ -125,7 +125,7 @@ class CC_DLL Device : public cocos2d::Ref
      * @param fragmentShader Specifes this is a fragment shader source.
      * @return A Program instance.
      */
-    virtual Program* newProgram(const std::string& vertexShader, const std::string& fragmentShader) = 0;
+    virtual Program* newProgram(std::string_view vertexShader, std::string_view fragmentShader) = 0;
 
     /**
      * Get a DeviceInfo object.
@@ -140,7 +140,7 @@ class CC_DLL Device : public cocos2d::Ref
      * @param source Specifies shader source.
      * @return A ShaderModule object.
      */
-    virtual ShaderModule* newShaderModule(ShaderStage stage, const std::string& source) = 0;
+    virtual ShaderModule* newShaderModule(ShaderStage stage, std::string_view source) = 0;
 
     DeviceInfo* _deviceInfo = nullptr;  ///< Device information.
 
diff --git a/cocos/renderer/backend/Program.cpp b/cocos/renderer/backend/Program.cpp
index 4c3da6cfaab0..b92ab3d0b24b 100644
--- a/cocos/renderer/backend/Program.cpp
+++ b/cocos/renderer/backend/Program.cpp
@@ -27,7 +27,7 @@
 
 CC_BACKEND_BEGIN
 
-Program::Program(const std::string& vs, const std::string& fs) : _vertexShader(vs), _fragmentShader(fs) {}
+Program::Program(std::string_view vs, std::string_view fs) : _vertexShader(vs), _fragmentShader(fs) {}
 
 void Program::setProgramType(uint32_t type)
 {
diff --git a/cocos/renderer/backend/Program.h b/cocos/renderer/backend/Program.h
index 3cc20bdf216c..fceb28f8f456 100644
--- a/cocos/renderer/backend/Program.h
+++ b/cocos/renderer/backend/Program.h
@@ -60,7 +60,7 @@ class CC_DLL Program : public Ref
      * @param uniform Specifies the uniform name.
      * @return The uniform location.
      */
-    virtual UniformLocation getUniformLocation(const std::string& uniform) const = 0;
+    virtual UniformLocation getUniformLocation(std::string_view uniform) const = 0;
 
     /**
      * Get uniform location by engine built-in uniform enum name.
@@ -74,7 +74,7 @@ class CC_DLL Program : public Ref
      * @param name Specifies the attribute name.
      * @return The attribute location.
      */
-    virtual int getAttributeLocation(const std::string& name) const = 0;
+    virtual int getAttributeLocation(std::string_view name) const = 0;
 
     /**
      * Get attribute location by engine built-in attribute enum name.
@@ -99,19 +99,19 @@ class CC_DLL Program : public Ref
      * Get active vertex attributes.
      * @return Active vertex attributes. key is active attribute name, Value is corresponding attribute info.
      */
-    virtual const std::unordered_map<std::string, AttributeBindInfo> getActiveAttributes() const = 0;
+    virtual const hlookup::string_map<AttributeBindInfo> getActiveAttributes() const = 0;
 
     /**
      * Get vertex shader.
      * @return Vertex shader.
      */
-    const std::string& getVertexShader() const { return _vertexShader; }
+    std::string_view getVertexShader() const { return _vertexShader; }
 
     /**
      * Get fragment shader.
      * @ Fragment shader.
      */
-    const std::string& getFragmentShader() const { return _fragmentShader; }
+    std::string_view getFragmentShader() const { return _fragmentShader; }
 
     /**
      * Get engine built-in program type.
@@ -138,7 +138,7 @@ class CC_DLL Program : public Ref
      * Get all uniformInfos.
      * @return The uniformInfos.
      */
-    virtual const std::unordered_map<std::string, UniformInfo>& getAllActiveUniformInfo(ShaderStage stage) const = 0;
+    virtual const hlookup::string_map<UniformInfo>& getAllActiveUniformInfo(ShaderStage stage) const = 0;
 
     /**
      * Set engin built-in program type.
@@ -151,7 +151,7 @@ class CC_DLL Program : public Ref
      * @param vs Specifes the vertex shader source.
      * @param fs Specifes the fragment shader source.
      */
-    Program(const std::string& vs, const std::string& fs);
+    Program(std::string_view vs, std::string_view fs);
 
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     /**
diff --git a/cocos/renderer/backend/ProgramState.cpp b/cocos/renderer/backend/ProgramState.cpp
index 8eacbc2bb658..79e036e3e08b 100644
--- a/cocos/renderer/backend/ProgramState.cpp
+++ b/cocos/renderer/backend/ProgramState.cpp
@@ -263,7 +263,7 @@ backend::UniformLocation ProgramState::getUniformLocation(backend::Uniform name)
     return _program->getUniformLocation(name);
 }
 
-backend::UniformLocation ProgramState::getUniformLocation(const std::string& uniform) const
+backend::UniformLocation ProgramState::getUniformLocation(std::string_view uniform) const
 {
     return _program->getUniformLocation(uniform);
 }
@@ -514,13 +514,13 @@ void ProgramState::setTextureArray(int location,
 #endif
 }
 
-void ProgramState::setParameterAutoBinding(const std::string& uniform, const std::string& autoBinding)
+void ProgramState::setParameterAutoBinding(std::string_view uniform, std::string_view autoBinding)
 {
     _autoBindings.emplace(uniform, autoBinding);
     applyAutoBinding(uniform, autoBinding);
 }
 
-void ProgramState::applyAutoBinding(const std::string& uniformName, const std::string& autoBinding)
+void ProgramState::applyAutoBinding(std::string_view uniformName, std::string_view autoBinding)
 {
     for (const auto resolver : _customAutoBindingResolvers)
     {
diff --git a/cocos/renderer/backend/ProgramState.h b/cocos/renderer/backend/ProgramState.h
index 7a5f756e616b..8c31ca96858a 100644
--- a/cocos/renderer/backend/ProgramState.h
+++ b/cocos/renderer/backend/ProgramState.h
@@ -124,7 +124,7 @@ class CC_DLL ProgramState : public Ref
      * @return Uniform location.
      * @see `backend::UniformLocation getUniformLocation(backend::Uniform name) const`
      */
-    backend::UniformLocation getUniformLocation(const std::string& uniform) const;
+    backend::UniformLocation getUniformLocation(std::string_view uniform) const;
 
     /**
      * Get uniform location in a more efficient way by the given built-in uniform name.
@@ -138,15 +138,15 @@ class CC_DLL ProgramState : public Ref
      * Get an attribute location by the actual attribute name.
      * @param name Specifies the attribute name.
      * @return Attribute location.
-     * @see `int getAttributeLocation(const std::string& name) const`
+     * @see `int getAttributeLocation(std::string_view name) const`
      */
-    inline int getAttributeLocation(const std::string& name) const { return _program->getAttributeLocation(name); }
+    inline int getAttributeLocation(std::string_view name) const { return _program->getAttributeLocation(name); }
 
     /**
      * Get an attribute location by the engine built-in attribute name.
      * @param name Specifies the built-in attribute name.
      * @return Attribute location.
-     * @see `int getAttributeLocation(const std::string& name) const`
+     * @see `int getAttributeLocation(std::string_view name) const`
      */
     inline int getAttributeLocation(Attribute name) const { return _program->getAttributeLocation(name); }
 
@@ -278,9 +278,7 @@ class CC_DLL ProgramState : public Ref
          * @return True if the auto binding is handled and the associated parameter is
          *      bound, false otherwise.
          */
-        virtual bool resolveAutoBinding(ProgramState*,
-                                        const std::string& uniformName,
-                                        const std::string& autoBinding) = 0;
+        virtual bool resolveAutoBinding(ProgramState*, std::string_view uniformName, std::string_view autoBinding) = 0;
     };
     /**
      * Sets a uniform auto-binding.
@@ -292,7 +290,7 @@ class CC_DLL ProgramState : public Ref
      * @param uniformName The name of the material parameter to store an auto-binding for.
      * @param autoBinding A string matching one of the built-in AutoBinding enum constants.
      */
-    void setParameterAutoBinding(const std::string& uniformName, const std::string& autoBinding);
+    void setParameterAutoBinding(std::string_view uniformName, std::string_view autoBinding);
 
     inline std::shared_ptr<VertexLayout> getVertexLayout() const { return _vertexLayout; }
 
@@ -379,7 +377,7 @@ class CC_DLL ProgramState : public Ref
      * @param uniformName Name of the shader uniform.
      * @param autoBinding Name of the auto binding.
      */
-    void applyAutoBinding(const std::string&, const std::string&);
+    void applyAutoBinding(std::string_view, std::string_view);
 
     backend::Program* _program = nullptr;
     std::unordered_map<UniformLocation, UniformCallback, UniformLocation> _callbackUniforms;
diff --git a/cocos/renderer/backend/ShaderCache.cpp b/cocos/renderer/backend/ShaderCache.cpp
index 7d92c21ba71d..149fc2fcb7e0 100644
--- a/cocos/renderer/backend/ShaderCache.cpp
+++ b/cocos/renderer/backend/ShaderCache.cpp
@@ -62,21 +62,21 @@ bool ShaderCache::init()
     return true;
 }
 
-backend::ShaderModule* ShaderCache::newVertexShaderModule(const std::string& shaderSource)
+backend::ShaderModule* ShaderCache::newVertexShaderModule(std::string_view shaderSource)
 {
     auto vertexShaderModule = newShaderModule(backend::ShaderStage::VERTEX, shaderSource);
     return vertexShaderModule;
 }
 
-backend::ShaderModule* ShaderCache::newFragmentShaderModule(const std::string& shaderSource)
+backend::ShaderModule* ShaderCache::newFragmentShaderModule(std::string_view shaderSource)
 {
     auto fragmenShaderModule = newShaderModule(backend::ShaderStage::FRAGMENT, shaderSource);
     return fragmenShaderModule;
 }
 
-backend::ShaderModule* ShaderCache::newShaderModule(backend::ShaderStage stage, const std::string& shaderSource)
+backend::ShaderModule* ShaderCache::newShaderModule(backend::ShaderStage stage, std::string_view shaderSource)
 {
-    std::size_t key = std::hash<std::string>{}(shaderSource);
+    std::size_t key = std::hash<std::string_view>{}(shaderSource);
     auto iter       = _cachedShaders.find(key);
     if (_cachedShaders.end() != iter)
         return iter->second;
diff --git a/cocos/renderer/backend/ShaderCache.h b/cocos/renderer/backend/ShaderCache.h
index d5daf870aeb7..87709042f598 100644
--- a/cocos/renderer/backend/ShaderCache.h
+++ b/cocos/renderer/backend/ShaderCache.h
@@ -54,14 +54,14 @@ class CC_DLL ShaderCache : public Ref
      * If it is created before, then just return the cached shader module.
      * @param shaderSource The source code of the shader.
      */
-    static backend::ShaderModule* newVertexShaderModule(const std::string& shaderSource);
+    static backend::ShaderModule* newVertexShaderModule(std::string_view shaderSource);
 
     /**
      * Create a fragment shader module.
      * If it is created before, then just return the cached shader module.
      * @param shaderSource The source code of the shader.
      */
-    static backend::ShaderModule* newFragmentShaderModule(const std::string& shaderSource);
+    static backend::ShaderModule* newFragmentShaderModule(std::string_view shaderSource);
 
     /**
      * Remove all unused shaders.
@@ -85,7 +85,7 @@ class CC_DLL ShaderCache : public Ref
      * @param source Specifies shader source.
      * @return A ShaderModule object.
      */
-    static backend::ShaderModule* newShaderModule(backend::ShaderStage stage, const std::string& shaderSource);
+    static backend::ShaderModule* newShaderModule(backend::ShaderStage stage, std::string_view shaderSource);
 
     static std::unordered_map<std::size_t, backend::ShaderModule*> _cachedShaders;
     static ShaderCache* _sharedShaderCache;
diff --git a/cocos/renderer/backend/VertexLayout.cpp b/cocos/renderer/backend/VertexLayout.cpp
index 044a2661c032..fbd4be4d3e8d 100644
--- a/cocos/renderer/backend/VertexLayout.cpp
+++ b/cocos/renderer/backend/VertexLayout.cpp
@@ -28,7 +28,7 @@
 
 CC_BACKEND_BEGIN
 
-void VertexLayout::setAttribute(const std::string& name,
+void VertexLayout::setAttribute(std::string_view name,
                                 std::size_t index,
                                 VertexFormat format,
                                 std::size_t offset,
@@ -37,7 +37,11 @@ void VertexLayout::setAttribute(const std::string& name,
     if (index == -1)
         return;
 
-    _attributes[name] = {name, index, format, offset, needToBeNormallized};
+    // FIXME 2021/12/25 TODO: store name key is enough
+    hlookup::set_item(
+        _attributes, name,
+        Attribute{name, index, format, offset,
+                  needToBeNormallized});  // _attributes[name] = {name, index, format, offset, needToBeNormallized};
 }
 
 void VertexLayout::setLayout(std::size_t stride)
diff --git a/cocos/renderer/backend/VertexLayout.h b/cocos/renderer/backend/VertexLayout.h
index e3b33746e45a..3c11bf49f38d 100644
--- a/cocos/renderer/backend/VertexLayout.h
+++ b/cocos/renderer/backend/VertexLayout.h
@@ -48,7 +48,7 @@ class CC_DLL VertexLayout
     struct Attribute
     {
         Attribute() = default;
-        Attribute(const std::string& _name,
+        Attribute(std::string_view _name,
                   std::size_t _index,
                   VertexFormat _format,
                   std::size_t _offset,
@@ -74,7 +74,7 @@ class CC_DLL VertexLayout
      * @param needToBeNormallized Specifies whether fixed-point data values should be normalized (true) or converted
      * directly as fixed-point values (false) when they are accessed.
      */
-    void setAttribute(const std::string& name,
+    void setAttribute(std::string_view name,
                       std::size_t index,
                       VertexFormat format,
                       std::size_t offset,
@@ -103,7 +103,7 @@ class CC_DLL VertexLayout
      * Get attribute informations
      * @return Atrribute informations.
      */
-    inline const std::unordered_map<std::string, Attribute>& getAttributes() const { return _attributes; }
+    inline const hlookup::string_map<Attribute>& getAttributes() const { return _attributes; }
 
     /**
      * Check if vertex layout has been set.
@@ -111,7 +111,7 @@ class CC_DLL VertexLayout
     inline bool isValid() const { return _stride != 0; }
 
 private:
-    std::unordered_map<std::string, Attribute> _attributes;
+    hlookup::string_map<Attribute> _attributes;
     std::size_t _stride      = 0;
     VertexStepMode _stepMode = VertexStepMode::VERTEX;
 };
diff --git a/cocos/renderer/backend/metal/BufferMTL.mm b/cocos/renderer/backend/metal/BufferMTL.mm
index 9abe3d62a4a4..fb336acfd5fc 100644
--- a/cocos/renderer/backend/metal/BufferMTL.mm
+++ b/cocos/renderer/backend/metal/BufferMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "BufferMTL.h"
 #include "../Macros.h"
 #include "BufferManager.h"
@@ -29,15 +29,15 @@ of this software and associated documentation files (the "Software"), to deal
 CC_BACKEND_BEGIN
 
 BufferMTL::BufferMTL(id<MTLDevice> mtlDevice, std::size_t size, BufferType type, BufferUsage usage)
-: Buffer(size, type, usage)
+    : Buffer(size, type, usage)
 {
     if (BufferUsage::DYNAMIC == usage)
     {
-        NSMutableArray *mutableDynamicDataBuffers = [NSMutableArray arrayWithCapacity:MAX_INFLIGHT_BUFFER];
+        NSMutableArray* mutableDynamicDataBuffers = [NSMutableArray arrayWithCapacity:MAX_INFLIGHT_BUFFER];
         for (int i = 0; i < MAX_INFLIGHT_BUFFER; ++i)
         {
             // Create a new buffer with enough capacity to store one instance of the dynamic buffer data
-            id <MTLBuffer> dynamicDataBuffer = [mtlDevice newBufferWithLength:size options:MTLResourceStorageModeShared];
+            id<MTLBuffer> dynamicDataBuffer = [mtlDevice newBufferWithLength:size options:MTLResourceStorageModeShared];
             [mutableDynamicDataBuffers addObject:dynamicDataBuffer];
         }
         _dynamicDataBuffers = [mutableDynamicDataBuffers copy];
@@ -97,8 +97,8 @@ of this software and associated documentation files (the "Software"), to deal
     if (BufferUsage::DYNAMIC == _usage && !_indexUpdated)
     {
         _currentFrameIndex = (_currentFrameIndex + 1) % MAX_INFLIGHT_BUFFER;
-        _mtlBuffer = _dynamicDataBuffers[_currentFrameIndex];
-        _indexUpdated = true;
+        _mtlBuffer         = _dynamicDataBuffers[_currentFrameIndex];
+        _indexUpdated      = true;
     }
 }
 
diff --git a/cocos/renderer/backend/metal/BufferManager.mm b/cocos/renderer/backend/metal/BufferManager.mm
index 22776b4799de..0fae9871b2a2 100644
--- a/cocos/renderer/backend/metal/BufferManager.mm
+++ b/cocos/renderer/backend/metal/BufferManager.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "BufferManager.h"
 #include "BufferMTL.h"
 
diff --git a/cocos/renderer/backend/metal/CommandBufferMTL.mm b/cocos/renderer/backend/metal/CommandBufferMTL.mm
index 0490fa56248d..3d881af178b7 100644
--- a/cocos/renderer/backend/metal/CommandBufferMTL.mm
+++ b/cocos/renderer/backend/metal/CommandBufferMTL.mm
@@ -22,7 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "CommandBufferMTL.h"
 #include "BufferMTL.h"
 #include "DeviceMTL.h"
@@ -39,130 +39,131 @@ of this software and associated documentation files (the "Software"), to deal
 namespace
 {
 
-#define byte(n) ((n) * 8)
+#define byte(n) ((n)*8)
 #define bit(n) (n)
-    static uint8_t getBitsPerElementMTL(MTLPixelFormat pixleFormat)
+static uint8_t getBitsPerElementMTL(MTLPixelFormat pixleFormat)
+{
+    switch (pixleFormat)
     {
-        switch (pixleFormat)
-        {
-            case MTLPixelFormatDepth32Float_Stencil8:
-                return byte(8);
-            case MTLPixelFormatBGRA8Unorm:
-            case MTLPixelFormatRGBA8Unorm:
-            case MTLPixelFormatDepth32Float:
-                return byte(4);
-    #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-            case MTLPixelFormatDepth24Unorm_Stencil8:
-                return byte(4);
-    #else
-            case MTLPixelFormatABGR4Unorm:
-            case MTLPixelFormatBGR5A1Unorm:
-            case MTLPixelFormatB5G6R5Unorm:
-            case MTLPixelFormatA1BGR5Unorm:
-                return byte(2);
-    #endif
-            case MTLPixelFormatA8Unorm:
-            case MTLPixelFormatR8Unorm:
-                return byte(1);
-            default:
-                assert(false);
-                break;
-        }
-        return 0;
+    case MTLPixelFormatDepth32Float_Stencil8:
+        return byte(8);
+    case MTLPixelFormatBGRA8Unorm:
+    case MTLPixelFormatRGBA8Unorm:
+    case MTLPixelFormatDepth32Float:
+        return byte(4);
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
+    case MTLPixelFormatDepth24Unorm_Stencil8:
+        return byte(4);
+#else
+    case MTLPixelFormatABGR4Unorm:
+    case MTLPixelFormatBGR5A1Unorm:
+    case MTLPixelFormatB5G6R5Unorm:
+    case MTLPixelFormatA1BGR5Unorm:
+        return byte(2);
+#endif
+    case MTLPixelFormatA8Unorm:
+    case MTLPixelFormatR8Unorm:
+        return byte(1);
+    default:
+        assert(false);
+        break;
     }
+    return 0;
+}
 
-    static MTLWinding toMTLWinding(Winding winding)
-    {
-        if (Winding::CLOCK_WISE == winding)
-            return MTLWindingClockwise;
-        else
-            return MTLWindingCounterClockwise;
-    }
+static MTLWinding toMTLWinding(Winding winding)
+{
+    if (Winding::CLOCK_WISE == winding)
+        return MTLWindingClockwise;
+    else
+        return MTLWindingCounterClockwise;
+}
 
-    static MTLPrimitiveType toMTLPrimitive(PrimitiveType primitiveType)
-    {
-        MTLPrimitiveType ret = MTLPrimitiveTypeTriangle;
-        switch (primitiveType)
-        {
-            case PrimitiveType::POINT:
-                ret = MTLPrimitiveTypePoint;
-                break;
-            case PrimitiveType::LINE:
-                ret = MTLPrimitiveTypeLine;
-                break;
-            case PrimitiveType::LINE_STRIP:
-                ret = MTLPrimitiveTypeLineStrip;
-                break;
-            case PrimitiveType::TRIANGLE:
-                ret = MTLPrimitiveTypeTriangle;
-                break;
-            case PrimitiveType::TRIANGLE_STRIP:
-                ret = MTLPrimitiveTypeTriangleStrip;
-                break;
-            default:
-                break;
-        }
-        return ret;
-    }
-    
-    static MTLIndexType toMTLIndexType(IndexFormat indexFormat)
-    {
-        if (IndexFormat::U_SHORT == indexFormat)
-            return MTLIndexTypeUInt16;
-        else
-            return MTLIndexTypeUInt32;
-    }
-    
-    static MTLCullMode toMTLCullMode(CullMode mode)
-    {
-        switch (mode) {
-            case CullMode::NONE:
-                return MTLCullModeNone;
-            case CullMode::FRONT:
-                return MTLCullModeFront;
-            case CullMode::BACK:
-                return MTLCullModeBack;
-        }
-    }
-    
-    static MTLRenderPassDescriptor* toMTLRenderPassDescriptor(const RenderTarget* rt, const RenderPassDescriptor& desc)
-    {
-        MTLRenderPassDescriptor* mtlDescritpor = [MTLRenderPassDescriptor renderPassDescriptor];
-        
-        auto rtMTL = static_cast<const RenderTargetMTL*>(rt);
-        rtMTL->applyRenderPassAttachments(desc, mtlDescritpor);
-        return mtlDescritpor;
-    }
-    
-    static id<MTLTexture> getMTLTexture(TextureBackend* texture, int index)
+static MTLPrimitiveType toMTLPrimitive(PrimitiveType primitiveType)
+{
+    MTLPrimitiveType ret = MTLPrimitiveTypeTriangle;
+    switch (primitiveType)
     {
-        return reinterpret_cast<id<MTLTexture>>(texture->getHandler(index));
+    case PrimitiveType::POINT:
+        ret = MTLPrimitiveTypePoint;
+        break;
+    case PrimitiveType::LINE:
+        ret = MTLPrimitiveTypeLine;
+        break;
+    case PrimitiveType::LINE_STRIP:
+        ret = MTLPrimitiveTypeLineStrip;
+        break;
+    case PrimitiveType::TRIANGLE:
+        ret = MTLPrimitiveTypeTriangle;
+        break;
+    case PrimitiveType::TRIANGLE_STRIP:
+        ret = MTLPrimitiveTypeTriangleStrip;
+        break;
+    default:
+        break;
     }
-    
-    static id<MTLSamplerState> getMTLSamplerState(TextureBackend* texture)
+    return ret;
+}
+
+static MTLIndexType toMTLIndexType(IndexFormat indexFormat)
+{
+    if (IndexFormat::U_SHORT == indexFormat)
+        return MTLIndexTypeUInt16;
+    else
+        return MTLIndexTypeUInt32;
+}
+
+static MTLCullMode toMTLCullMode(CullMode mode)
+{
+    switch (mode)
     {
-        switch (texture->getTextureType())
-        {
-            case TextureType::TEXTURE_2D:
-                return static_cast<TextureMTL*>(texture)->getMTLSamplerState();
-            case TextureType::TEXTURE_CUBE:
-                return static_cast<TextureCubeMTL*>(texture)->getMTLSamplerState();
-            default:
-                assert(false);
-                return nil;
-        }
+    case CullMode::NONE:
+        return MTLCullModeNone;
+    case CullMode::FRONT:
+        return MTLCullModeFront;
+    case CullMode::BACK:
+        return MTLCullModeBack;
     }
+}
 
-    inline int clamp(int value, int min, int max) {
-        return std::min(max, std::max(min, value));
+static MTLRenderPassDescriptor* toMTLRenderPassDescriptor(const RenderTarget* rt, const RenderPassDescriptor& desc)
+{
+    MTLRenderPassDescriptor* mtlDescritpor = [MTLRenderPassDescriptor renderPassDescriptor];
+
+    auto rtMTL = static_cast<const RenderTargetMTL*>(rt);
+    rtMTL->applyRenderPassAttachments(desc, mtlDescritpor);
+    return mtlDescritpor;
+}
+
+static id<MTLTexture> getMTLTexture(TextureBackend* texture, int index)
+{
+    return reinterpret_cast<id<MTLTexture>>(texture->getHandler(index));
+}
+
+static id<MTLSamplerState> getMTLSamplerState(TextureBackend* texture)
+{
+    switch (texture->getTextureType())
+    {
+    case TextureType::TEXTURE_2D:
+        return static_cast<TextureMTL*>(texture)->getMTLSamplerState();
+    case TextureType::TEXTURE_CUBE:
+        return static_cast<TextureCubeMTL*>(texture)->getMTLSamplerState();
+    default:
+        assert(false);
+        return nil;
     }
 }
 
-CommandBufferMTL::CommandBufferMTL(DeviceMTL* deviceMTL)
-: _mtlCommandQueue(deviceMTL->getMTLCommandQueue())
-, _frameBoundarySemaphore(dispatch_semaphore_create(MAX_INFLIGHT_BUFFER))
+inline int clamp(int value, int min, int max)
 {
+    return std::min(max, std::max(min, value));
 }
+}
+
+CommandBufferMTL::CommandBufferMTL(DeviceMTL* deviceMTL)
+    : _mtlCommandQueue(deviceMTL->getMTLCommandQueue())
+    , _frameBoundarySemaphore(dispatch_semaphore_create(MAX_INFLIGHT_BUFFER))
+{}
 
 CommandBufferMTL::~CommandBufferMTL()
 {
@@ -171,7 +172,7 @@ inline int clamp(int value, int min, int max) {
     id<MTLCommandBuffer> oneOffBuffer = [_mtlCommandQueue commandBuffer];
     [oneOffBuffer commit];
     [oneOffBuffer waitUntilCompleted];
-    
+
     dispatch_semaphore_signal(_frameBoundarySemaphore);
 }
 
@@ -199,38 +200,37 @@ inline int clamp(int value, int min, int max) {
     return true;
 }
 
-void CommandBufferMTL::updateRenderCommandEncoder(const RenderTarget* renderTarget, const RenderPassDescriptor& renderPassDesc)
+void CommandBufferMTL::updateRenderCommandEncoder(const RenderTarget* renderTarget,
+                                                  const RenderPassDescriptor& renderPassDesc)
 {
-    if(_mtlRenderEncoder != nil &&
-       _currentRenderPassDesc == renderPassDesc &&
-       _currentRenderTarget == renderTarget &&
-       _currentRenderTargetFlags == renderTarget->getTargetFlags())
+    if (_mtlRenderEncoder != nil && _currentRenderPassDesc == renderPassDesc && _currentRenderTarget == renderTarget &&
+        _currentRenderTargetFlags == renderTarget->getTargetFlags())
     {
         return _mtlRenderEncoder;
     }
-    
-    _currentRenderTarget = renderTarget;
-    _currentRenderPassDesc = renderPassDesc;
+
+    _currentRenderTarget      = renderTarget;
+    _currentRenderPassDesc    = renderPassDesc;
     _currentRenderTargetFlags = renderTarget->getTargetFlags();
-    
-    if(_mtlRenderEncoder != nil)
+
+    if (_mtlRenderEncoder != nil)
     {
         [_mtlRenderEncoder endEncoding];
         [_mtlRenderEncoder release];
         _mtlRenderEncoder = nil;
     }
 
-    auto mtlDescriptor = toMTLRenderPassDescriptor(renderTarget, renderPassDesc);
-    _renderTargetWidth = (unsigned int)mtlDescriptor.colorAttachments[0].texture.width;
+    auto mtlDescriptor  = toMTLRenderPassDescriptor(renderTarget, renderPassDesc);
+    _renderTargetWidth  = (unsigned int)mtlDescriptor.colorAttachments[0].texture.width;
     _renderTargetHeight = (unsigned int)mtlDescriptor.colorAttachments[0].texture.height;
-    _mtlRenderEncoder = [_mtlCommandBuffer renderCommandEncoderWithDescriptor:mtlDescriptor];
+    _mtlRenderEncoder   = [_mtlCommandBuffer renderCommandEncoderWithDescriptor:mtlDescriptor];
     [_mtlRenderEncoder retain];
 }
 
 void CommandBufferMTL::beginRenderPass(const RenderTarget* renderTarget, const RenderPassDescriptor& renderPassDesc)
 {
     updateRenderCommandEncoder(renderTarget, renderPassDesc);
-//    [_mtlRenderEncoder setFrontFacingWinding:MTLWindingCounterClockwise];
+    //    [_mtlRenderEncoder setFrontFacingWinding:MTLWindingCounterClockwise];
 }
 
 void CommandBufferMTL::updateDepthStencilState(const DepthStencilDescriptor& descriptor)
@@ -249,10 +249,10 @@ inline int clamp(int value, int min, int max) {
     MTLViewport viewport;
     viewport.originX = x;
     viewport.originY = (int)(_renderTargetHeight - y - h);
-    viewport.width = w;
-    viewport.height = h;
-    viewport.znear = 0;
-    viewport.zfar = 1;
+    viewport.width   = w;
+    viewport.height  = h;
+    viewport.znear   = 0;
+    viewport.zfar    = 1;
     [_mtlRenderEncoder setViewport:viewport];
 }
 
@@ -269,9 +269,7 @@ inline int clamp(int value, int min, int max) {
 void CommandBufferMTL::setVertexBuffer(Buffer* buffer)
 {
     // Vertex buffer is bound in index 0.
-    [_mtlRenderEncoder setVertexBuffer:static_cast<BufferMTL*>(buffer)->getMTLBuffer()
-                                offset:0
-                               atIndex:0];
+    [_mtlRenderEncoder setVertexBuffer:static_cast<BufferMTL*>(buffer)->getMTLBuffer() offset:0 atIndex:0];
 }
 
 void CommandBufferMTL::setProgramState(ProgramState* programState)
@@ -286,20 +284,21 @@ inline int clamp(int value, int min, int max) {
     assert(buffer != nullptr);
     if (!buffer)
         return;
-    
+
     _mtlIndexBuffer = static_cast<BufferMTL*>(buffer)->getMTLBuffer();
     [_mtlIndexBuffer retain];
 }
 
-void CommandBufferMTL::drawArrays(PrimitiveType primitiveType, std::size_t start,  std::size_t count)
+void CommandBufferMTL::drawArrays(PrimitiveType primitiveType, std::size_t start, std::size_t count)
 {
     prepareDrawing();
-    [_mtlRenderEncoder drawPrimitives:toMTLPrimitive(primitiveType)
-                          vertexStart:start
-                          vertexCount:count];
+    [_mtlRenderEncoder drawPrimitives:toMTLPrimitive(primitiveType) vertexStart:start vertexCount:count];
 }
 
-void CommandBufferMTL::drawElements(PrimitiveType primitiveType, IndexFormat indexType, std::size_t count, std::size_t offset)
+void CommandBufferMTL::drawElements(PrimitiveType primitiveType,
+                                    IndexFormat indexType,
+                                    std::size_t count,
+                                    std::size_t offset)
 {
     prepareDrawing();
     [_mtlRenderEncoder drawIndexedPrimitives:toMTLPrimitive(primitiveType)
@@ -307,7 +306,6 @@ inline int clamp(int value, int min, int max) {
                                    indexType:toMTLIndexType(indexType)
                                  indexBuffer:_mtlIndexBuffer
                            indexBufferOffset:offset];
-    
 }
 
 void CommandBufferMTL::endRenderPass()
@@ -318,7 +316,7 @@ inline int clamp(int value, int min, int max) {
 void CommandBufferMTL::readPixels(RenderTarget* rt, std::function<void(const PixelBufferDescriptor&)> callback)
 {
     auto rtMTL = static_cast<RenderTargetMTL*>(rt);
- 
+
     // we only read form color attachment 0
     // if it's nullptr, will regard as screen to perform capture
     auto texture = rtMTL->_color[0].texture;
@@ -331,14 +329,14 @@ inline int clamp(int value, int min, int max) {
     [_mtlRenderEncoder endEncoding];
     [_mtlRenderEncoder release];
     _mtlRenderEncoder = nil;
-    
+
     auto currentDrawable = DeviceMTL::getCurrentDrawable();
     [_mtlCommandBuffer presentDrawable:currentDrawable];
     _drawableTexture = currentDrawable.texture;
     [_mtlCommandBuffer addCompletedHandler:^(id<MTLCommandBuffer> commandBuffer) {
-        // GPU work is complete
-        // Signal the semaphore to start the CPU work
-        dispatch_semaphore_signal(_frameBoundarySemaphore);
+      // GPU work is complete
+      // Signal the semaphore to start the CPU work
+      dispatch_semaphore_signal(_frameBoundarySemaphore);
     }];
 
     flush();
@@ -349,12 +347,13 @@ inline int clamp(int value, int min, int max) {
 
 void CommandBufferMTL::flush()
 {
-    if(_mtlCommandBuffer) {
+    if (_mtlCommandBuffer)
+    {
         assert(_mtlCommandBuffer.status != MTLCommandBufferStatusCommitted);
         [_mtlCommandBuffer commit];
-        
+
         flushCaptureCommands();
-        
+
         [_mtlCommandBuffer release];
         _mtlCommandBuffer = nil;
     }
@@ -362,24 +361,30 @@ inline int clamp(int value, int min, int max) {
 
 void CommandBufferMTL::flushCaptureCommands()
 {
-    if(!_captureCallbacks.empty()) {
+    if (!_captureCallbacks.empty())
+    {
         // !!!important, if have capture request, must wait pending commandBuffer finish at this frame,
         // because readPixels require sync operation to get screen pixels properly without data race issue,
         // otherwise, will lead dead-lock
         // !!!Notes, MTL is mutli-threading, all GPU handler is dispatch at GPU threads
         [_mtlCommandBuffer waitUntilCompleted];
-        
+
         PixelBufferDescriptor screenPixelData;
-        for(auto& cb : _captureCallbacks) {
-            if(cb.first == nil) { // screen capture
-                if(!screenPixelData) {
-                    CommandBufferMTL::readPixels(_drawableTexture, 0, 0, [_drawableTexture width], [_drawableTexture height], screenPixelData);
+        for (auto& cb : _captureCallbacks)
+        {
+            if (cb.first == nil)
+            {  // screen capture
+                if (!screenPixelData)
+                {
+                    CommandBufferMTL::readPixels(_drawableTexture, 0, 0, [_drawableTexture width],
+                                                 [_drawableTexture height], screenPixelData);
                     // screen framebuffer copied, restore screen framebuffer only to true
                     backend::Device::getInstance()->setFrameBufferOnly(true);
                 }
                 cb.second(screenPixelData);
             }
-            else {
+            else
+            {
                 PixelBufferDescriptor pixelData;
                 auto texture = cb.first;
                 assert(texture != nullptr);
@@ -399,7 +404,7 @@ inline int clamp(int value, int min, int max) {
         [_mtlIndexBuffer release];
         _mtlIndexBuffer = nullptr;
     }
-    
+
     CC_SAFE_RELEASE_NULL(_programState);
 }
 
@@ -407,7 +412,7 @@ inline int clamp(int value, int min, int max) {
 {
     setUniformBuffer();
     setTextures();
-    
+
     auto mtlDepthStencilState = _depthStencilStateMTL->getMTLDepthStencilState();
     if (mtlDepthStencilState)
     {
@@ -428,36 +433,33 @@ inline int clamp(int value, int min, int max) {
 
 void CommandBufferMTL::doSetTextures(bool isVertex) const
 {
-    const auto& bindTextureInfos = (isVertex) ? _programState->getVertexTextureInfos() : _programState->getFragmentTextureInfos();
+    const auto& bindTextureInfos =
+        (isVertex) ? _programState->getVertexTextureInfos() : _programState->getFragmentTextureInfos();
 
-    for(const auto& iter : bindTextureInfos)
+    for (const auto& iter : bindTextureInfos)
     {
         /* About mutli textures support
-        *  a. TODO: sampler2DArray, not implemented in Metal Renderer currently
-        *  b. texture slot, one BackendTexture, multi GPU texture handlers, used by etc1, restrict: textures must have same size
-        *  c. Bind multi BackendTexture to 1 Shader Program, see the ShaderTest
-        *  d. iter.second.slots not used for Metal Renderer
-        */
-        auto location = iter.first;
+         *  a. TODO: sampler2DArray, not implemented in Metal Renderer currently
+         *  b. texture slot, one BackendTexture, multi GPU texture handlers, used by etc1, restrict: textures must have
+         * same size c. Bind multi BackendTexture to 1 Shader Program, see the ShaderTest d. iter.second.slots not used
+         * for Metal Renderer
+         */
+        auto location  = iter.first;
         auto& textures = iter.second.textures;
-        auto& indexs = iter.second.indexs;
-        
+        auto& indexs   = iter.second.indexs;
+
         auto texture = textures[0];
-        auto index = indexs[0];
+        auto index   = indexs[0];
 
         if (isVertex)
         {
-            [_mtlRenderEncoder setVertexTexture:getMTLTexture(texture, index)
-                                    atIndex:location];
-            [_mtlRenderEncoder setVertexSamplerState:getMTLSamplerState(texture)
-                                         atIndex:location];
+            [_mtlRenderEncoder setVertexTexture:getMTLTexture(texture, index) atIndex:location];
+            [_mtlRenderEncoder setVertexSamplerState:getMTLSamplerState(texture) atIndex:location];
         }
         else
         {
-            [_mtlRenderEncoder setFragmentTexture:getMTLTexture(texture, index)
-                                      atIndex:location];
-            [_mtlRenderEncoder setFragmentSamplerState:getMTLSamplerState(texture)
-                                           atIndex:location];
+            [_mtlRenderEncoder setFragmentTexture:getMTLTexture(texture, index) atIndex:location];
+            [_mtlRenderEncoder setFragmentSamplerState:getMTLSamplerState(texture) atIndex:location];
         }
     }
 }
@@ -466,108 +468,122 @@ inline int clamp(int value, int min, int max) {
 {
     if (_programState)
     {
-        auto& callbackUniforms = _programState->getCallbackUniforms();	
-        for(auto& cb : callbackUniforms)	
-            cb.second(_programState, cb.first);	
+        auto& callbackUniforms = _programState->getCallbackUniforms();
+        for (auto& cb : callbackUniforms)
+            cb.second(_programState, cb.first);
 
         // Uniform buffer is bound to index 1.
         std::size_t bufferSize = 0;
-        char* vertexBuffer = nullptr;
+        char* vertexBuffer     = nullptr;
         _programState->getVertexUniformBuffer(&vertexBuffer, bufferSize);
-        if(vertexBuffer)
+        if (vertexBuffer)
         {
-            [_mtlRenderEncoder setVertexBytes:vertexBuffer
-                                       length:bufferSize 
-                                       atIndex:1];
+            [_mtlRenderEncoder setVertexBytes:vertexBuffer length:bufferSize atIndex:1];
         }
-        
+
         char* fragmentBuffer = nullptr;
         _programState->getFragmentUniformBuffer(&fragmentBuffer, bufferSize);
-        if(fragmentBuffer)
+        if (fragmentBuffer)
         {
-            [_mtlRenderEncoder setFragmentBytes:fragmentBuffer
-                                         length:bufferSize
-                                        atIndex:1];
+            [_mtlRenderEncoder setFragmentBytes:fragmentBuffer length:bufferSize atIndex:1];
         }
     }
 }
 
-void CommandBufferMTL::setLineWidth(float lineWidth)
-{
-}
+void CommandBufferMTL::setLineWidth(float lineWidth) {}
 
 void CommandBufferMTL::setScissorRect(bool isEnabled, float x, float y, float width, float height)
 {
     MTLScissorRect scissorRect;
-    if(isEnabled)
+    if (isEnabled)
     {
-        y = _renderTargetHeight - height - y;
-        int minX = clamp((int)x, 0, (int)_renderTargetWidth);
-        int minY = clamp((int)y, 0, (int)_renderTargetHeight);
-        int maxX = clamp((int)(x + width), 0, (int)_renderTargetWidth);
-        int maxY = clamp((int)(y + height), 0, (int)_renderTargetHeight);
-        scissorRect.x = minX;
-        scissorRect.y = minY;
-        scissorRect.width = maxX - minX;
+        y                  = _renderTargetHeight - height - y;
+        int minX           = clamp((int)x, 0, (int)_renderTargetWidth);
+        int minY           = clamp((int)y, 0, (int)_renderTargetHeight);
+        int maxX           = clamp((int)(x + width), 0, (int)_renderTargetWidth);
+        int maxY           = clamp((int)(y + height), 0, (int)_renderTargetHeight);
+        scissorRect.x      = minX;
+        scissorRect.y      = minY;
+        scissorRect.width  = maxX - minX;
         scissorRect.height = maxY - minY;
-        if (scissorRect.width == 0 || scissorRect.height == 0) {
-            scissorRect.width = 0;
+        if (scissorRect.width == 0 || scissorRect.height == 0)
+        {
+            scissorRect.width  = 0;
             scissorRect.height = 0;
         }
     }
     else
     {
-        scissorRect.x = 0;
-        scissorRect.y = 0;
-        scissorRect.width = _renderTargetWidth;
+        scissorRect.x      = 0;
+        scissorRect.y      = 0;
+        scissorRect.width  = _renderTargetWidth;
         scissorRect.height = _renderTargetHeight;
     }
     [_mtlRenderEncoder setScissorRect:scissorRect];
 }
 
-void CommandBufferMTL::readPixels(TextureBackend* texture, std::size_t origX, std::size_t origY, std::size_t rectWidth, std::size_t rectHeight, PixelBufferDescriptor& pbd)
+void CommandBufferMTL::readPixels(TextureBackend* texture,
+                                  std::size_t origX,
+                                  std::size_t origY,
+                                  std::size_t rectWidth,
+                                  std::size_t rectHeight,
+                                  PixelBufferDescriptor& pbd)
 {
-    CommandBufferMTL::readPixels(reinterpret_cast<id<MTLTexture>>(texture->getHandler()), origX, origY, rectWidth, rectHeight, pbd);
+    CommandBufferMTL::readPixels(reinterpret_cast<id<MTLTexture>>(texture->getHandler()), origX, origY, rectWidth,
+                                 rectHeight, pbd);
 }
 
-void CommandBufferMTL::readPixels(id<MTLTexture> texture, std::size_t origX, std::size_t origY, std::size_t rectWidth, std::size_t rectHeight, PixelBufferDescriptor& pbd)
+void CommandBufferMTL::readPixels(id<MTLTexture> texture,
+                                  std::size_t origX,
+                                  std::size_t origY,
+                                  std::size_t rectWidth,
+                                  std::size_t rectHeight,
+                                  PixelBufferDescriptor& pbd)
 {
-    NSUInteger texWidth = texture.width;
-    NSUInteger texHeight = texture.height;
-    MTLRegion region = MTLRegionMake2D(0, 0, texWidth, texHeight);
+    NSUInteger texWidth   = texture.width;
+    NSUInteger texHeight  = texture.height;
+    MTLRegion region      = MTLRegionMake2D(0, 0, texWidth, texHeight);
     MTLRegion imageRegion = MTLRegionMake2D(origX, origY, rectWidth, rectHeight);
-    
+
     MTLTextureDescriptor* textureDescriptor =
-    [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:[texture pixelFormat]
-                                                       width:texWidth
-                                                      height:texHeight
-                                                   mipmapped:NO];
-    id<MTLDevice> device = static_cast<DeviceMTL*>(DeviceMTL::getInstance())->getMTLDevice();
+        [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:[texture pixelFormat]
+                                                           width:texWidth
+                                                          height:texHeight
+                                                       mipmapped:NO];
+    id<MTLDevice> device             = static_cast<DeviceMTL*>(DeviceMTL::getInstance())->getMTLDevice();
     id<MTLTexture> readPixelsTexture = [device newTextureWithDescriptor:textureDescriptor];
-    
+
     id<MTLCommandQueue> commandQueue = static_cast<DeviceMTL*>(DeviceMTL::getInstance())->getMTLCommandQueue();
-    auto commandBuffer = [commandQueue commandBuffer];
+    auto commandBuffer               = [commandQueue commandBuffer];
     // [commandBuffer enqueue];
-    
+
     id<MTLBlitCommandEncoder> blitCommandEncoder = [commandBuffer blitCommandEncoder];
-    [blitCommandEncoder copyFromTexture:texture sourceSlice:0 sourceLevel:0 sourceOrigin:region.origin sourceSize:region.size toTexture:readPixelsTexture destinationSlice:0 destinationLevel:0 destinationOrigin:region.origin];
-    
+    [blitCommandEncoder copyFromTexture:texture
+                            sourceSlice:0
+                            sourceLevel:0
+                           sourceOrigin:region.origin
+                             sourceSize:region.size
+                              toTexture:readPixelsTexture
+                       destinationSlice:0
+                       destinationLevel:0
+                      destinationOrigin:region.origin];
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
     [blitCommandEncoder synchronizeResource:readPixelsTexture];
 #endif
     [blitCommandEncoder endEncoding];
-   
+
     [commandBuffer addCompletedHandler:^(id<MTLCommandBuffer> commandBufferMTL) {
-       auto bytePerRow = rectWidth * getBitsPerElementMTL(texture.pixelFormat) / 8;
-       auto texelData = pbd._data.resize(bytePerRow * rectHeight);
-       if(texelData != nullptr)
-       {
+      auto bytePerRow = rectWidth * getBitsPerElementMTL(texture.pixelFormat) / 8;
+      auto texelData  = pbd._data.resize(bytePerRow * rectHeight);
+      if (texelData != nullptr)
+      {
           [readPixelsTexture getBytes:texelData bytesPerRow:bytePerRow fromRegion:imageRegion mipmapLevel:0];
           UtilsMTL::swizzleImage(texelData, rectWidth, rectHeight, readPixelsTexture.pixelFormat);
-          pbd._width = rectWidth;
+          pbd._width  = rectWidth;
           pbd._height = rectHeight;
-       }
-       [readPixelsTexture release];
+      }
+      [readPixelsTexture release];
     }];
     [commandBuffer commit];
     [commandBuffer waitUntilCompleted];
diff --git a/cocos/renderer/backend/metal/DepthStencilStateMTL.mm b/cocos/renderer/backend/metal/DepthStencilStateMTL.mm
index 9c84efcb7968..4b1e0955a969 100644
--- a/cocos/renderer/backend/metal/DepthStencilStateMTL.mm
+++ b/cocos/renderer/backend/metal/DepthStencilStateMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "DepthStencilStateMTL.h"
 #include "../RenderTarget.h"
 #include "xxhash.h"
@@ -30,108 +30,110 @@ of this software and associated documentation files (the "Software"), to deal
 
 namespace
 {
-    MTLCompareFunction toMTLCompareFunction(CompareFunction compareFunction)
-    {
-        MTLCompareFunction ret = MTLCompareFunctionNever;
-        switch (compareFunction) {
-            case CompareFunction::NEVER:
-                ret = MTLCompareFunctionNever;
-                break;
-            case CompareFunction::LESS:
-                ret = MTLCompareFunctionLess;
-                break;
-            case CompareFunction::LESS_EQUAL:
-                ret = MTLCompareFunctionLessEqual;
-                break;
-            case CompareFunction::GREATER:
-                ret = MTLCompareFunctionGreater;
-                break;
-            case CompareFunction::GREATER_EQUAL:
-                ret = MTLCompareFunctionGreaterEqual;
-                break;
-            case CompareFunction::EQUAL:
-                ret = MTLCompareFunctionEqual;
-                break;
-            case CompareFunction::NOT_EQUAL:
-                ret = MTLCompareFunctionNotEqual;
-                break;
-            case CompareFunction::ALWAYS:
-                ret = MTLCompareFunctionAlways;
-                break;
-            default:
-                assert(false);
-                break;
-        }
-        return ret;
-    }
-    
-    MTLStencilOperation toMTLStencilOperation(StencilOperation operation)
+MTLCompareFunction toMTLCompareFunction(CompareFunction compareFunction)
+{
+    MTLCompareFunction ret = MTLCompareFunctionNever;
+    switch (compareFunction)
     {
-        MTLStencilOperation ret = MTLStencilOperationKeep;
-        switch (operation) {
-            case StencilOperation::KEEP:
-                ret = MTLStencilOperationKeep;
-                break;
-            case StencilOperation::ZERO:
-                ret = MTLStencilOperationZero;
-                break;
-            case StencilOperation::REPLACE:
-                ret = MTLStencilOperationReplace;
-                break;
-            case StencilOperation::INVERT:
-                ret = MTLStencilOperationInvert;
-                break;
-            case StencilOperation::INCREMENT_WRAP:
-                ret = MTLStencilOperationIncrementWrap;
-                break;
-            case StencilOperation::DECREMENT_WRAP:
-                ret = MTLStencilOperationDecrementWrap;
-                break;
-            default:
-                assert(false);
-                break;
-        }
-        return ret;
+    case CompareFunction::NEVER:
+        ret = MTLCompareFunctionNever;
+        break;
+    case CompareFunction::LESS:
+        ret = MTLCompareFunctionLess;
+        break;
+    case CompareFunction::LESS_EQUAL:
+        ret = MTLCompareFunctionLessEqual;
+        break;
+    case CompareFunction::GREATER:
+        ret = MTLCompareFunctionGreater;
+        break;
+    case CompareFunction::GREATER_EQUAL:
+        ret = MTLCompareFunctionGreaterEqual;
+        break;
+    case CompareFunction::EQUAL:
+        ret = MTLCompareFunctionEqual;
+        break;
+    case CompareFunction::NOT_EQUAL:
+        ret = MTLCompareFunctionNotEqual;
+        break;
+    case CompareFunction::ALWAYS:
+        ret = MTLCompareFunctionAlways;
+        break;
+    default:
+        assert(false);
+        break;
     }
-    
-    void setMTLStencilDescriptor(MTLStencilDescriptor* stencilDescriptor, const StencilDescriptor& descriptor)
+    return ret;
+}
+
+MTLStencilOperation toMTLStencilOperation(StencilOperation operation)
+{
+    MTLStencilOperation ret = MTLStencilOperationKeep;
+    switch (operation)
     {
-        stencilDescriptor.stencilFailureOperation = toMTLStencilOperation(descriptor.stencilFailureOperation);
-        stencilDescriptor.depthFailureOperation = toMTLStencilOperation(descriptor.depthFailureOperation);
-        stencilDescriptor.depthStencilPassOperation = toMTLStencilOperation(descriptor.depthStencilPassOperation);
-        stencilDescriptor.stencilCompareFunction = toMTLCompareFunction(descriptor.stencilCompareFunction);
-        stencilDescriptor.readMask = descriptor.readMask;
-        stencilDescriptor.writeMask = descriptor.writeMask;
+    case StencilOperation::KEEP:
+        ret = MTLStencilOperationKeep;
+        break;
+    case StencilOperation::ZERO:
+        ret = MTLStencilOperationZero;
+        break;
+    case StencilOperation::REPLACE:
+        ret = MTLStencilOperationReplace;
+        break;
+    case StencilOperation::INVERT:
+        ret = MTLStencilOperationInvert;
+        break;
+    case StencilOperation::INCREMENT_WRAP:
+        ret = MTLStencilOperationIncrementWrap;
+        break;
+    case StencilOperation::DECREMENT_WRAP:
+        ret = MTLStencilOperationDecrementWrap;
+        break;
+    default:
+        assert(false);
+        break;
     }
+    return ret;
 }
 
-DepthStencilStateMTL::DepthStencilStateMTL(id<MTLDevice> mtlDevice) : _mtlDevice(mtlDevice)
+void setMTLStencilDescriptor(MTLStencilDescriptor* stencilDescriptor, const StencilDescriptor& descriptor)
 {
+    stencilDescriptor.stencilFailureOperation   = toMTLStencilOperation(descriptor.stencilFailureOperation);
+    stencilDescriptor.depthFailureOperation     = toMTLStencilOperation(descriptor.depthFailureOperation);
+    stencilDescriptor.depthStencilPassOperation = toMTLStencilOperation(descriptor.depthStencilPassOperation);
+    stencilDescriptor.stencilCompareFunction    = toMTLCompareFunction(descriptor.stencilCompareFunction);
+    stencilDescriptor.readMask                  = descriptor.readMask;
+    stencilDescriptor.writeMask                 = descriptor.writeMask;
+}
 }
 
+DepthStencilStateMTL::DepthStencilStateMTL(id<MTLDevice> mtlDevice) : _mtlDevice(mtlDevice) {}
+
 void DepthStencilStateMTL::update(const DepthStencilDescriptor& dsDesc)
 {
     DepthStencilState::update(dsDesc);
-    
-    if(!isEnabled()) {
+
+    if (!isEnabled())
+    {
         _mtlDepthStencilState = nil;
         return;
     }
-    
+
     DepthStencilDescriptor hashMe;
     memset(&hashMe, 0, sizeof(hashMe));
     hashMe.depthCompareFunction = dsDesc.depthCompareFunction;
-    hashMe.backFaceStencil = dsDesc.backFaceStencil;
-    hashMe.frontFaceStencil = dsDesc.frontFaceStencil;
-    hashMe.flags = dsDesc.flags;
-    
+    hashMe.backFaceStencil      = dsDesc.backFaceStencil;
+    hashMe.frontFaceStencil     = dsDesc.frontFaceStencil;
+    hashMe.flags                = dsDesc.flags;
+
     auto key = XXH32((const void*)&hashMe, sizeof(hashMe), 0);
-    auto it = _mtlStateCache.find(key);
-    if(it != _mtlStateCache.end()) {
+    auto it  = _mtlStateCache.find(key);
+    if (it != _mtlStateCache.end())
+    {
         _mtlDepthStencilState = it->second;
         return;
     }
-    
+
     MTLDepthStencilDescriptor* mtlDescriptor = [[MTLDepthStencilDescriptor alloc] init];
 
     if (bitmask::any(dsDesc.flags, DepthStencilFlags::DEPTH_TEST))
@@ -149,7 +151,7 @@ void setMTLStencilDescriptor(MTLStencilDescriptor* stencilDescriptor, const Sten
 
     _mtlDepthStencilState = [_mtlDevice newDepthStencilStateWithDescriptor:mtlDescriptor];
     [mtlDescriptor release];
-    
+
     // emplace to state cache
     _mtlStateCache.emplace(key, _mtlDepthStencilState);
 }
@@ -157,7 +159,7 @@ void setMTLStencilDescriptor(MTLStencilDescriptor* stencilDescriptor, const Sten
 DepthStencilStateMTL::~DepthStencilStateMTL()
 {
     _mtlDepthStencilState = nullptr;
-    for(auto& stateItem : _mtlStateCache)
+    for (auto& stateItem : _mtlStateCache)
         [stateItem.second release];
     _mtlStateCache.clear();
 }
diff --git a/cocos/renderer/backend/metal/DeviceInfoMTL.mm b/cocos/renderer/backend/metal/DeviceInfoMTL.mm
index 87d0e6a65e33..18208a5e8ab7 100644
--- a/cocos/renderer/backend/metal/DeviceInfoMTL.mm
+++ b/cocos/renderer/backend/metal/DeviceInfoMTL.mm
@@ -22,367 +22,367 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
 
 #include "DeviceInfoMTL.h"
 #include "base/ccMacros.h"
 #include "UtilsMTL.h"
 CC_BACKEND_BEGIN
 
-namespace {
-    int getMaxVertexAttributes(FeatureSet featureSet)
+namespace
+{
+int getMaxVertexAttributes(FeatureSet featureSet)
+{
+    int maxAttributes = 0;
+    switch (featureSet)
     {
-        int maxAttributes = 0;
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                maxAttributes = 31;
-                break;
-            default:
-                break;
-        }
-        return maxAttributes;
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        maxAttributes = 31;
+        break;
+    default:
+        break;
     }
-    
-    int getMaxTextureEntries(FeatureSet featureSet)
+    return maxAttributes;
+}
+
+int getMaxTextureEntries(FeatureSet featureSet)
+{
+    int maxTextureEntries = 0;
+    switch (featureSet)
     {
-        int maxTextureEntries = 0;
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                maxTextureEntries = 31;
-                break;
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                maxTextureEntries = 128;
-                break;
-            default:
-                break;
-        }
-        return maxTextureEntries;
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+        maxTextureEntries = 31;
+        break;
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        maxTextureEntries = 128;
+        break;
+    default:
+        break;
     }
-    
-    int getMaxSamplerEntries(FeatureSet featureSet)
+    return maxTextureEntries;
+}
+
+int getMaxSamplerEntries(FeatureSet featureSet)
+{
+    int maxSamplerEntries = 0;
+    switch (featureSet)
     {
-        int maxSamplerEntries = 0;
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                maxSamplerEntries = 16;
-                break;
-            default:
-                break;
-        }
-        return maxSamplerEntries;
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        maxSamplerEntries = 16;
+        break;
+    default:
+        break;
     }
-    
-    int getMaxTextureWidthHeight(FeatureSet featureSet)
+    return maxSamplerEntries;
+}
+
+int getMaxTextureWidthHeight(FeatureSet featureSet)
+{
+    int maxTextureSize = 0;
+    switch (featureSet)
     {
-        int maxTextureSize = 0;
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-                maxTextureSize = 4096;
-                break;
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-                maxTextureSize = 8192;
-                break;
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                maxTextureSize = 16384;
-                break;
-            default:
-                break;
-        }
-        return maxTextureSize;
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+        maxTextureSize = 4096;
+        break;
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+        maxTextureSize = 8192;
+        break;
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        maxTextureSize = 16384;
+        break;
+    default:
+        break;
     }
-    
-    const char* featureSetToString(FeatureSet featureSet)
+    return maxTextureSize;
+}
+
+const char* featureSetToString(FeatureSet featureSet)
+{
+    switch (featureSet)
     {
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-                return "iOS_GPUFamily1_v1";
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-                return "iOS_GPUFamily2_v1";
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-                return "iOS_GPUFamily1_v2";
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-                return "iOS_GPUFamily2_v2";
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-                return "iOS_GPUFamily1_v3";
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-                return "iOS_GPUFamily2_v3";
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-                return "iOS_GPUFamily1_v4";
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-                return "iOS_GPUFamily2_v4";
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-                return "iOS_GPUFamily1_v5";
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-                return "iOS_GPUFamily2_v5";
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-                return "iOS_GPUFamily3_v1";
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-                return "iOS_GPUFamily3_v2";
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-                return "iOS_GPUFamily3_v3";
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-                return "iOS_GPUFamily4_v1";
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-                return "iOS_GPUFamily3_v4";
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                return "iOS_GPUFamily4_v2";
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-                return "macOS_GPUFamily1_v1";
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-                return "macOS_GPUFamily1_v2";
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-                return "macOS_ReadWriteTextureTier2";
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-                return "macOS_GPUFamily1_v3";
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-                return "macOS_GPUFamily1_v4";
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                return "macOS_GPUFamily2_v1";
-            default:
-                break;
-        }
-        return "";
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+        return "iOS_GPUFamily1_v1";
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+        return "iOS_GPUFamily2_v1";
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+        return "iOS_GPUFamily1_v2";
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+        return "iOS_GPUFamily2_v2";
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+        return "iOS_GPUFamily1_v3";
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+        return "iOS_GPUFamily2_v3";
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+        return "iOS_GPUFamily1_v4";
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+        return "iOS_GPUFamily2_v4";
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+        return "iOS_GPUFamily1_v5";
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+        return "iOS_GPUFamily2_v5";
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+        return "iOS_GPUFamily3_v1";
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+        return "iOS_GPUFamily3_v2";
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+        return "iOS_GPUFamily3_v3";
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+        return "iOS_GPUFamily4_v1";
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+        return "iOS_GPUFamily3_v4";
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+        return "iOS_GPUFamily4_v2";
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+        return "macOS_GPUFamily1_v1";
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+        return "macOS_GPUFamily1_v2";
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+        return "macOS_ReadWriteTextureTier2";
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+        return "macOS_GPUFamily1_v3";
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+        return "macOS_GPUFamily1_v4";
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        return "macOS_GPUFamily2_v1";
+    default:
+        break;
     }
-    
-    bool supportPVRTC(FeatureSet featureSet)
+    return "";
+}
+
+bool supportPVRTC(FeatureSet featureSet)
+{
+    switch (featureSet)
     {
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                return true;
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                return false;
-            default:
-                break;
-        }
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+        return true;
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
         return false;
+    default:
+        break;
     }
-    
-    bool supportEACETC(FeatureSet featureSet)
+    return false;
+}
+
+bool supportEACETC(FeatureSet featureSet)
+{
+    switch (featureSet)
     {
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                return true;
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                return false;
-            default:
-                break;
-        }
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+        return true;
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
         return false;
+    default:
+        break;
     }
-    
-    bool supportASTC(FeatureSet featureSet)
+    return false;
+}
+
+bool supportASTC(FeatureSet featureSet)
+{
+    switch (featureSet)
     {
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-                return false;
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                return true;
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                return false;
-            default:
-                break;
-        }
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+        return false;
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
+        return true;
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
         return false;
+    default:
+        break;
     }
-    
-    bool supportS3TC(FeatureSet featureSet)
+    return false;
+}
+
+bool supportS3TC(FeatureSet featureSet)
+{
+    switch (featureSet)
     {
-        switch (featureSet)
-        {
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
-            case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
-            case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
-                return false;
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
-            case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
-            case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
-            case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
-                return true;
-            default:
-                break;
-        }
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily1_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily2_v5:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v2:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v3:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v1:
+    case FeatureSet::FeatureSet_iOS_GPUFamily3_v4:
+    case FeatureSet::FeatureSet_iOS_GPUFamily4_v2:
         return false;
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v1:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v2:
+    case FeatureSet::FeatureSet_macOS_ReadWriteTextureTier2:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v3:
+    case FeatureSet::FeatureSet_macOS_GPUFamily1_v4:
+    case FeatureSet::FeatureSet_macOS_GPUFamily2_v1:
+        return true;
+    default:
+        break;
     }
+    return false;
+}
 }
 
 bool DeviceInfoMTL::_isDepth24Stencil8PixelFormatSupported = false;
 
 DeviceInfoMTL::DeviceInfoMTL(id<MTLDevice> device)
 {
-   _deviceName = [device.name UTF8String];
-    
+    _deviceName = [device.name UTF8String];
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
     const FeatureSet minRequiredFeatureSet = FeatureSet::FeatureSet_iOS_GPUFamily1_v1;
-    const FeatureSet maxKnownFeatureSet = FeatureSet::FeatureSet_iOS_GPUFamily4_v2;
+    const FeatureSet maxKnownFeatureSet    = FeatureSet::FeatureSet_iOS_GPUFamily4_v2;
 #else
     const FeatureSet minRequiredFeatureSet = FeatureSet::FeatureSet_macOS_GPUFamily1_v1;
-    const FeatureSet maxKnownFeatureSet = FeatureSet::FeatureSet_macOS_GPUFamily2_v1;
+    const FeatureSet maxKnownFeatureSet    = FeatureSet::FeatureSet_macOS_GPUFamily2_v1;
     _isDepth24Stencil8PixelFormatSupported = [device isDepth24Stencil8PixelFormatSupported];
 #endif
-    
+
     for (auto featureSet = maxKnownFeatureSet; featureSet >= minRequiredFeatureSet; --featureSet)
     {
         if ([device supportsFeatureSet:MTLFeatureSet(featureSet)])
@@ -391,17 +391,17 @@ bool supportS3TC(FeatureSet featureSet)
             break;
         }
     }
-    
+
     UtilsMTL::initGPUTextureFormats();
 }
 
 bool DeviceInfoMTL::init()
 {
-    _maxAttributes = getMaxVertexAttributes(_featureSet);
+    _maxAttributes     = getMaxVertexAttributes(_featureSet);
     _maxSamplesAllowed = getMaxSamplerEntries(_featureSet);
-    _maxTextureUnits = getMaxTextureEntries(_featureSet);
-    _maxTextureSize = getMaxTextureWidthHeight(_featureSet);
-    
+    _maxTextureUnits   = getMaxTextureEntries(_featureSet);
+    _maxTextureSize    = getMaxTextureWidthHeight(_featureSet);
+
     return true;
 }
 
diff --git a/cocos/renderer/backend/metal/DeviceMTL.h b/cocos/renderer/backend/metal/DeviceMTL.h
index fac8be126d0c..10cfdd30f23a 100644
--- a/cocos/renderer/backend/metal/DeviceMTL.h
+++ b/cocos/renderer/backend/metal/DeviceMTL.h
@@ -133,7 +133,7 @@ class DeviceMTL : public Device
      * @param fragmentShader Specifes this is a fragment shader source.
      * @return A Program instance.
      */
-    virtual Program* newProgram(const std::string& vertexShader, const std::string& fragmentShader) override;
+    virtual Program* newProgram(std::string_view vertexShader, std::string_view fragmentShader) override;
 
     /**
      * Get a MTLDevice object.
@@ -154,7 +154,7 @@ class DeviceMTL : public Device
      * @param source Specifies shader source.
      * @return A ShaderModule object.
      */
-    virtual ShaderModule* newShaderModule(ShaderStage stage, const std::string& source) override;
+    virtual ShaderModule* newShaderModule(ShaderStage stage, std::string_view source) override;
 
 private:
     static CAMetalLayer* _metalLayer;
diff --git a/cocos/renderer/backend/metal/DeviceMTL.mm b/cocos/renderer/backend/metal/DeviceMTL.mm
index 174e2807a921..fddde3997e10 100644
--- a/cocos/renderer/backend/metal/DeviceMTL.mm
+++ b/cocos/renderer/backend/metal/DeviceMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "DeviceMTL.h"
 #include "CommandBufferMTL.h"
 #include "BufferMTL.h"
@@ -37,12 +37,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 CC_BACKEND_BEGIN
 
-CAMetalLayer* DeviceMTL::_metalLayer = nil;
+CAMetalLayer* DeviceMTL::_metalLayer            = nil;
 id<CAMetalDrawable> DeviceMTL::_currentDrawable = nil;
 
 Device* Device::getInstance()
 {
-    if (! Device::_instance)
+    if (!Device::_instance)
         Device::_instance = new DeviceMTL();
 
     return Device::_instance;
@@ -55,9 +55,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 id<CAMetalDrawable> DeviceMTL::getCurrentDrawable()
 {
-    if (! DeviceMTL::_currentDrawable)
+    if (!DeviceMTL::_currentDrawable)
         DeviceMTL::_currentDrawable = [DeviceMTL::_metalLayer nextDrawable];
-    
+
     return DeviceMTL::_currentDrawable;
 }
 
@@ -68,10 +68,10 @@ of this software and associated documentation files (the "Software"), to deal
 
 DeviceMTL::DeviceMTL()
 {
-    _mtlDevice = DeviceMTL::_metalLayer.device;
+    _mtlDevice       = DeviceMTL::_metalLayer.device;
     _mtlCommandQueue = [_mtlDevice newCommandQueue];
-    _deviceInfo = new DeviceInfoMTL(_mtlDevice);
-    if(!_deviceInfo->init())
+    _deviceInfo      = new DeviceInfoMTL(_mtlDevice);
+    if (!_deviceInfo->init())
     {
         delete _deviceInfo;
         _deviceInfo = nullptr;
@@ -97,15 +97,15 @@ of this software and associated documentation files (the "Software"), to deal
 
 TextureBackend* DeviceMTL::newTexture(const TextureDescriptor& descriptor)
 {
-    switch(descriptor.textureType)
+    switch (descriptor.textureType)
     {
-        case TextureType::TEXTURE_2D:
-            return new TextureMTL(_mtlDevice, descriptor);
-        case TextureType::TEXTURE_CUBE:
-            return new TextureCubeMTL(_mtlDevice, descriptor);
-        default:
-            CCASSERT(false, "invalidate texture type");
-            return nullptr;
+    case TextureType::TEXTURE_2D:
+        return new TextureMTL(_mtlDevice, descriptor);
+    case TextureType::TEXTURE_CUBE:
+        return new TextureCubeMTL(_mtlDevice, descriptor);
+    default:
+        CCASSERT(false, "invalidate texture type");
+        return nullptr;
     }
 }
 
@@ -117,21 +117,21 @@ of this software and associated documentation files (the "Software"), to deal
 }
 
 RenderTarget* DeviceMTL::newRenderTarget(TargetBufferFlags rtf,
-    TextureBackend* colorAttachment,
-    TextureBackend* depthAttachment,
-    TextureBackend* stencilAttachhment)
+                                         TextureBackend* colorAttachment,
+                                         TextureBackend* depthAttachment,
+                                         TextureBackend* stencilAttachhment)
 {
     auto rtGL = new RenderTargetMTL(false);
     rtGL->setTargetFlags(rtf);
     rtGL->bindFrameBuffer();
-    RenderTarget::ColorAttachment colors{ {colorAttachment, 0} };
+    RenderTarget::ColorAttachment colors{{colorAttachment, 0}};
     rtGL->setColorAttachment(colors);
     rtGL->setDepthAttachment(depthAttachment);
     rtGL->setStencilAttachment(stencilAttachhment);
     return rtGL;
 }
 
-ShaderModule* DeviceMTL::newShaderModule(ShaderStage stage, const std::string& source)
+ShaderModule* DeviceMTL::newShaderModule(ShaderStage stage, std::string_view source)
 {
     return new ShaderModuleMTL(_mtlDevice, stage, source);
 }
@@ -146,7 +146,7 @@ of this software and associated documentation files (the "Software"), to deal
     return new RenderPipelineMTL(_mtlDevice);
 }
 
-Program* DeviceMTL::newProgram(const std::string& vertexShader, const std::string& fragmentShader)
+Program* DeviceMTL::newProgram(std::string_view vertexShader, std::string_view fragmentShader)
 {
     return new ProgramMTL(vertexShader, fragmentShader);
 }
diff --git a/cocos/renderer/backend/metal/ProgramMTL.h b/cocos/renderer/backend/metal/ProgramMTL.h
index 0b014941bd18..c6c0be6b9595 100644
--- a/cocos/renderer/backend/metal/ProgramMTL.h
+++ b/cocos/renderer/backend/metal/ProgramMTL.h
@@ -47,7 +47,7 @@ class ProgramMTL : public Program
      * @param vertexShader Specifes the vertex shader source.
      * @param fragmentShader Specifes the fragment shader source.
      */
-    ProgramMTL(const std::string& vertexShader, const std::string& fragmentShader);
+    ProgramMTL(std::string_view vertexShader, std::string_view fragmentShader);
     virtual ~ProgramMTL();
 
     /**
@@ -55,7 +55,7 @@ class ProgramMTL : public Program
      * @param uniform Specifies the uniform name.
      * @return The uniform location.
      */
-    virtual UniformLocation getUniformLocation(const std::string& uniform) const override;
+    virtual UniformLocation getUniformLocation(std::string_view uniform) const override;
 
     /**
      * Get uniform location by engine built-in uniform enum name.
@@ -69,7 +69,7 @@ class ProgramMTL : public Program
      * @param name Specifies the attribute name.
      * @return The attribute location.
      */
-    virtual int getAttributeLocation(const std::string& name) const override;
+    virtual int getAttributeLocation(std::string_view name) const override;
 
     /**
      * Get attribute location by engine built-in attribute enum name.
@@ -94,7 +94,7 @@ class ProgramMTL : public Program
      * Get active vertex attributes.
      * @return Active vertex attributes. key is active attribute name, Value is corresponding attribute info.
      */
-    const std::unordered_map<std::string, AttributeBindInfo> getActiveAttributes() const override;
+    const hlookup::string_map<AttributeBindInfo> getActiveAttributes() const override;
 
     /**
      * Get maximum vertex location.
@@ -127,8 +127,7 @@ class ProgramMTL : public Program
      * Get all uniformInfos.
      * @return The uniformInfos.
      */
-    virtual const std::unordered_map<std::string, UniformInfo>& getAllActiveUniformInfo(
-        ShaderStage stage) const override;
+    virtual const hlookup::string_map<UniformInfo>& getAllActiveUniformInfo(ShaderStage stage) const override;
 
 private:
     ShaderModuleMTL* _vertexShader   = nullptr;
diff --git a/cocos/renderer/backend/metal/ProgramMTL.mm b/cocos/renderer/backend/metal/ProgramMTL.mm
index d1f2cb7a86bc..3bbe43cae42e 100644
--- a/cocos/renderer/backend/metal/ProgramMTL.mm
+++ b/cocos/renderer/backend/metal/ProgramMTL.mm
@@ -21,21 +21,24 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "ProgramMTL.h"
 #include "ShaderModuleMTL.h"
 #include "base/ccMacros.h"
 
 CC_BACKEND_BEGIN
-namespace {
-    const std::string metalSpecificDefine = "#define METAL\n";
+namespace
+{
+constexpr std::string_view metalSpecificDefine = "#define METAL\n"sv;
 }
 
-ProgramMTL::ProgramMTL(const std::string& vertexShader, const std::string& fragmentShader)
-: Program(vertexShader, fragmentShader)
+ProgramMTL::ProgramMTL(std::string_view vertexShader, std::string_view fragmentShader)
+    : Program(vertexShader, fragmentShader)
 {
     _vertexShader = static_cast<ShaderModuleMTL*>(ShaderCache::newVertexShaderModule(vertexShader));
-    _fragmentShader = static_cast<ShaderModuleMTL*>(ShaderCache::newFragmentShaderModule(std::move(metalSpecificDefine + fragmentShader)));
+    std::string combinedSource{metalSpecificDefine};
+    combinedSource += fragmentShader;
+    _fragmentShader = static_cast<ShaderModuleMTL*>(ShaderCache::newFragmentShaderModule(std::move(combinedSource)));
 
     CC_SAFE_RETAIN(_vertexShader);
     CC_SAFE_RETAIN(_fragmentShader);
@@ -52,7 +55,7 @@ of this software and associated documentation files (the "Software"), to deal
     return _vertexShader->getAttributeLocation(name);
 }
 
-int ProgramMTL::getAttributeLocation(const std::string &name) const
+int ProgramMTL::getAttributeLocation(std::string_view name) const
 {
     return _vertexShader->getAttributeLocation(name);
 }
@@ -62,13 +65,13 @@ of this software and associated documentation files (the "Software"), to deal
     UniformLocation uniformLocation;
     auto vsLocation = _vertexShader->getUniformLocation(name);
     auto fsLocation = _fragmentShader->getUniformLocation(name);
-    if(vsLocation != -1 && fsLocation != -1)
+    if (vsLocation != -1 && fsLocation != -1)
     {
         uniformLocation.shaderStage = ShaderStage::VERTEX_AND_FRAGMENT;
         uniformLocation.location[0] = vsLocation;
         uniformLocation.location[1] = fsLocation;
     }
-    else if( vsLocation != -1)
+    else if (vsLocation != -1)
     {
         uniformLocation.shaderStage = ShaderStage::VERTEX;
         uniformLocation.location[0] = vsLocation;
@@ -81,18 +84,18 @@ of this software and associated documentation files (the "Software"), to deal
     return uniformLocation;
 }
 
-UniformLocation ProgramMTL::getUniformLocation(const std::string& uniform) const
+UniformLocation ProgramMTL::getUniformLocation(std::string_view uniform) const
 {
     UniformLocation uniformLocation;
     auto vsLocation = _vertexShader->getUniformLocation(uniform);
     auto fsLocation = _fragmentShader->getUniformLocation(uniform);
-    if(vsLocation != -1 && fsLocation != -1)
+    if (vsLocation != -1 && fsLocation != -1)
     {
         uniformLocation.shaderStage = ShaderStage::VERTEX_AND_FRAGMENT;
         uniformLocation.location[0] = vsLocation;
         uniformLocation.location[1] = fsLocation;
     }
-    else if( vsLocation != -1)
+    else if (vsLocation != -1)
     {
         uniformLocation.shaderStage = ShaderStage::VERTEX;
         uniformLocation.location[0] = vsLocation;
@@ -115,63 +118,64 @@ of this software and associated documentation files (the "Software"), to deal
     return _fragmentShader->getMaxLocation();
 }
 
-const std::unordered_map<std::string, AttributeBindInfo> ProgramMTL::getActiveAttributes() const
+const hlookup::string_map<AttributeBindInfo> ProgramMTL::getActiveAttributes() const
 {
     return _vertexShader->getAttributeInfo();
 }
 
-//const std::vector<char>& ProgramMTL::cloneUniformBuffer(ShaderStage stage) const
+// const std::vector<char>& ProgramMTL::cloneUniformBuffer(ShaderStage stage) const
 //{
-//    switch (stage) {
-//        case ShaderStage::VERTEX:
-//            return _vertexShader->cloneUniformBuffer();
-//            break;
-//        case ShaderStage::FRAGMENT:
-//            return _fragmentShader->cloneUniformBuffer();
-//        default:
-//            CCASSERT(false, "Invalid shader stage.");
-//            break;
-//    }
-//}
+//     switch (stage) {
+//         case ShaderStage::VERTEX:
+//             return _vertexShader->cloneUniformBuffer();
+//             break;
+//         case ShaderStage::FRAGMENT:
+//             return _fragmentShader->cloneUniformBuffer();
+//         default:
+//             CCASSERT(false, "Invalid shader stage.");
+//             break;
+//     }
+// }
 
 const UniformInfo& ProgramMTL::getActiveUniformInfo(ShaderStage stage, int location) const
 {
-    switch (stage) {
-        case ShaderStage::VERTEX:
-            return _vertexShader->getActiveUniform(location);
-        case ShaderStage::FRAGMENT:
-            return _fragmentShader->getActiveUniform(location);
-        default:
-            CCASSERT(false, "Invalid shader stage.");
+    switch (stage)
+    {
+    case ShaderStage::VERTEX:
+        return _vertexShader->getActiveUniform(location);
+    case ShaderStage::FRAGMENT:
+        return _fragmentShader->getActiveUniform(location);
+    default:
+        CCASSERT(false, "Invalid shader stage.");
         break;
     }
 }
 
-
 std::size_t ProgramMTL::getUniformBufferSize(ShaderStage stage) const
 {
-    switch (stage) {
-        case ShaderStage::VERTEX:
-            return _vertexShader->getUniformBufferSize();
-        case ShaderStage::FRAGMENT:
-            return _fragmentShader->getUniformBufferSize();
-        default:
-            CCASSERT(false, "Invalid shader stage.");
-            break;
+    switch (stage)
+    {
+    case ShaderStage::VERTEX:
+        return _vertexShader->getUniformBufferSize();
+    case ShaderStage::FRAGMENT:
+        return _fragmentShader->getUniformBufferSize();
+    default:
+        CCASSERT(false, "Invalid shader stage.");
+        break;
     }
     return 0;
 }
 
-const std::unordered_map<std::string, UniformInfo>& ProgramMTL::getAllActiveUniformInfo(ShaderStage stage) const
+const hlookup::string_map<UniformInfo>& ProgramMTL::getAllActiveUniformInfo(ShaderStage stage) const
 {
-    switch (stage) {
-        case ShaderStage::VERTEX:
-            return _vertexShader->getAllActiveUniformInfo();
-        case ShaderStage::FRAGMENT:
-            return _fragmentShader->getAllActiveUniformInfo();
-        default:
-            CCASSERT(false, "Invalid shader stage.");
-            break;
+    switch (stage)
+    {
+    case ShaderStage::VERTEX:
+        return _vertexShader->getAllActiveUniformInfo();
+    case ShaderStage::FRAGMENT:
+        return _fragmentShader->getAllActiveUniformInfo();
+    default:
+        CCASSERT(false, "Invalid shader stage.");
     }
 }
 
diff --git a/cocos/renderer/backend/metal/RenderPipelineMTL.mm b/cocos/renderer/backend/metal/RenderPipelineMTL.mm
index 14f3e65bf320..30ed67d0087c 100644
--- a/cocos/renderer/backend/metal/RenderPipelineMTL.mm
+++ b/cocos/renderer/backend/metal/RenderPipelineMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "RenderPipelineMTL.h"
 #include "DeviceMTL.h"
 #include "RenderTargetMTL.h"
@@ -35,133 +35,133 @@ of this software and associated documentation files (the "Software"), to deal
 
 namespace
 {
-    MTLVertexStepFunction toMTLVertexStepFunction(VertexStepMode vertexStepMode)
+MTLVertexStepFunction toMTLVertexStepFunction(VertexStepMode vertexStepMode)
+{
+    if (VertexStepMode::VERTEX == vertexStepMode)
+        return MTLVertexStepFunctionPerVertex;
+    else
+        return MTLVertexStepFunctionPerInstance;
+}
+
+MTLVertexFormat toMTLVertexFormat(VertexFormat vertexFormat, bool needNormalize)
+{
+    MTLVertexFormat ret = MTLVertexFormatFloat4;
+    switch (vertexFormat)
     {
-        if (VertexStepMode::VERTEX == vertexStepMode)
-            return MTLVertexStepFunctionPerVertex;
+    case VertexFormat::FLOAT4:
+        ret = MTLVertexFormatFloat4;
+        break;
+    case VertexFormat::FLOAT3:
+        ret = MTLVertexFormatFloat3;
+        break;
+    case VertexFormat::FLOAT2:
+        ret = MTLVertexFormatFloat2;
+        break;
+    case VertexFormat::FLOAT:
+        ret = MTLVertexFormatFloat;
+        break;
+    case VertexFormat::INT4:
+        ret = MTLVertexFormatInt4;
+        break;
+    case VertexFormat::INT3:
+        ret = MTLVertexFormatInt3;
+        break;
+    case VertexFormat::INT2:
+        ret = MTLVertexFormatInt2;
+        break;
+    case VertexFormat::INT:
+        ret = MTLVertexFormatInt;
+        break;
+    case VertexFormat::USHORT4:
+        ret = MTLVertexFormatUShort4;
+        break;
+    case VertexFormat::USHORT2:
+        ret = MTLVertexFormatUShort2;
+        break;
+    case VertexFormat::UBYTE4:
+        if (needNormalize)
+            ret = MTLVertexFormatUChar4Normalized;
         else
-            return MTLVertexStepFunctionPerInstance;
-    }
-    
-    MTLVertexFormat toMTLVertexFormat(VertexFormat vertexFormat, bool needNormalize)
-    {
-        MTLVertexFormat ret = MTLVertexFormatFloat4;
-        switch (vertexFormat)
-        {
-            case VertexFormat::FLOAT4:
-                ret = MTLVertexFormatFloat4;
-                break;
-            case VertexFormat::FLOAT3:
-                ret = MTLVertexFormatFloat3;
-                break;
-            case VertexFormat::FLOAT2:
-                ret = MTLVertexFormatFloat2;
-                break;
-            case VertexFormat::FLOAT:
-                ret = MTLVertexFormatFloat;
-                break;
-            case VertexFormat::INT4:
-                ret = MTLVertexFormatInt4;
-                break;
-            case VertexFormat::INT3:
-                ret = MTLVertexFormatInt3;
-                break;
-            case VertexFormat::INT2:
-                ret = MTLVertexFormatInt2;
-                break;
-            case VertexFormat::INT:
-                ret = MTLVertexFormatInt;
-                break;
-            case VertexFormat::USHORT4:
-                ret = MTLVertexFormatUShort4;
-                break;
-            case VertexFormat::USHORT2:
-                ret = MTLVertexFormatUShort2;
-                break;
-            case VertexFormat::UBYTE4:
-                if (needNormalize)
-                    ret = MTLVertexFormatUChar4Normalized;
-                else
-                    ret = MTLVertexFormatUChar4;
-                break;
-            default:
-                assert(false);
-                break;
-        }
-        return ret;
-    }
-    
-    MTLColorWriteMask toMTLColorWriteMask(ColorWriteMask mask)
-    {
-        switch (mask) {
-            case ColorWriteMask::NONE:
-                return MTLColorWriteMaskNone;
-            case ColorWriteMask::RED:
-                return MTLColorWriteMaskRed;
-            case ColorWriteMask::GREEN:
-                return MTLColorWriteMaskGreen;
-            case ColorWriteMask::BLUE:
-                return MTLColorWriteMaskBlue;
-            case ColorWriteMask::ALPHA:
-                return MTLColorWriteMaskAlpha;
-            case ColorWriteMask::ALL:
-                return MTLColorWriteMaskAll;
-        }
+            ret = MTLVertexFormatUChar4;
+        break;
+    default:
+        assert(false);
+        break;
     }
-    
-    MTLBlendFactor toMTLBlendFactor(BlendFactor factor)
+    return ret;
+}
+
+MTLColorWriteMask toMTLColorWriteMask(ColorWriteMask mask)
+{
+    switch (mask)
     {
-        switch (factor) {
-            case BlendFactor::ZERO:
-                return MTLBlendFactorZero;
-            case BlendFactor::ONE:
-                return MTLBlendFactorOne;
-            case BlendFactor::SRC_COLOR:
-                return MTLBlendFactorSourceColor;
-            case BlendFactor::ONE_MINUS_SRC_COLOR:
-                return MTLBlendFactorOneMinusSourceColor;
-            case BlendFactor::SRC_ALPHA:
-                return MTLBlendFactorSourceAlpha;
-            case BlendFactor::ONE_MINUS_SRC_ALPHA:
-                return MTLBlendFactorOneMinusSourceAlpha;
-            case BlendFactor::DST_COLOR:
-                return MTLBlendFactorDestinationColor;
-            case BlendFactor::ONE_MINUS_DST_COLOR:
-                return MTLBlendFactorOneMinusDestinationColor;
-            case BlendFactor::DST_ALPHA:
-                return MTLBlendFactorDestinationAlpha;
-            case BlendFactor::ONE_MINUS_DST_ALPHA:
-                return MTLBlendFactorOneMinusDestinationAlpha;
-            case BlendFactor::SRC_ALPHA_SATURATE:
-                return MTLBlendFactorSourceAlphaSaturated;
-            case BlendFactor::BLEND_CLOLOR:
-                return MTLBlendFactorBlendColor;
-            default:
-                return MTLBlendFactorZero;
-        }
+    case ColorWriteMask::NONE:
+        return MTLColorWriteMaskNone;
+    case ColorWriteMask::RED:
+        return MTLColorWriteMaskRed;
+    case ColorWriteMask::GREEN:
+        return MTLColorWriteMaskGreen;
+    case ColorWriteMask::BLUE:
+        return MTLColorWriteMaskBlue;
+    case ColorWriteMask::ALPHA:
+        return MTLColorWriteMaskAlpha;
+    case ColorWriteMask::ALL:
+        return MTLColorWriteMaskAll;
     }
-    
-    MTLBlendOperation toMTLBlendOperation(BlendOperation operation)
+}
+
+MTLBlendFactor toMTLBlendFactor(BlendFactor factor)
+{
+    switch (factor)
     {
-        switch (operation) {
-            case BlendOperation::ADD:
-                return MTLBlendOperationAdd;
-            case BlendOperation::SUBTRACT:
-                return MTLBlendOperationSubtract;
-            case BlendOperation::RESERVE_SUBTRACT:
-                return MTLBlendOperationReverseSubtract;
-            default:
-                return MTLBlendOperationAdd;
-        }
+    case BlendFactor::ZERO:
+        return MTLBlendFactorZero;
+    case BlendFactor::ONE:
+        return MTLBlendFactorOne;
+    case BlendFactor::SRC_COLOR:
+        return MTLBlendFactorSourceColor;
+    case BlendFactor::ONE_MINUS_SRC_COLOR:
+        return MTLBlendFactorOneMinusSourceColor;
+    case BlendFactor::SRC_ALPHA:
+        return MTLBlendFactorSourceAlpha;
+    case BlendFactor::ONE_MINUS_SRC_ALPHA:
+        return MTLBlendFactorOneMinusSourceAlpha;
+    case BlendFactor::DST_COLOR:
+        return MTLBlendFactorDestinationColor;
+    case BlendFactor::ONE_MINUS_DST_COLOR:
+        return MTLBlendFactorOneMinusDestinationColor;
+    case BlendFactor::DST_ALPHA:
+        return MTLBlendFactorDestinationAlpha;
+    case BlendFactor::ONE_MINUS_DST_ALPHA:
+        return MTLBlendFactorOneMinusDestinationAlpha;
+    case BlendFactor::SRC_ALPHA_SATURATE:
+        return MTLBlendFactorSourceAlphaSaturated;
+    case BlendFactor::BLEND_CLOLOR:
+        return MTLBlendFactorBlendColor;
+    default:
+        return MTLBlendFactorZero;
     }
 }
 
-RenderPipelineMTL::RenderPipelineMTL(id<MTLDevice> mtlDevice)
-: _mtlDevice(mtlDevice)
+MTLBlendOperation toMTLBlendOperation(BlendOperation operation)
 {
+    switch (operation)
+    {
+    case BlendOperation::ADD:
+        return MTLBlendOperationAdd;
+    case BlendOperation::SUBTRACT:
+        return MTLBlendOperationSubtract;
+    case BlendOperation::RESERVE_SUBTRACT:
+        return MTLBlendOperationReverseSubtract;
+    default:
+        return MTLBlendOperationAdd;
+    }
+}
 }
 
-void RenderPipelineMTL::update(const RenderTarget* renderTarget, const PipelineDescriptor & pipelineDescirptor)
+RenderPipelineMTL::RenderPipelineMTL(id<MTLDevice> mtlDevice) : _mtlDevice(mtlDevice) {}
+
+void RenderPipelineMTL::update(const RenderTarget* renderTarget, const PipelineDescriptor& pipelineDescirptor)
 {
     struct
     {
@@ -179,135 +179,140 @@ MTLBlendOperation toMTLBlendOperation(BlendOperation operation)
         unsigned int destinationRGBBlendFactor;
         unsigned int sourceAlphaBlendFactor;
         unsigned int destinationAlphaBlendFactor;
-    }hashMe;
-    
+    } hashMe;
+
     memset(&hashMe, 0, sizeof(hashMe));
     const auto& blendDescriptor = pipelineDescirptor.blendDescriptor;
     chooseAttachmentFormat(renderTarget, _colorAttachmentsFormat, _depthAttachmentFormat, _stencilAttachmentFormat);
-    auto program = static_cast<ProgramMTL*>(pipelineDescirptor.programState->getProgram());
-    hashMe.vertexShaderHash = program->getVertexShader()->getHashValue();
+    auto program              = static_cast<ProgramMTL*>(pipelineDescirptor.programState->getProgram());
+    hashMe.vertexShaderHash   = program->getVertexShader()->getHashValue();
     hashMe.fragmentShaderHash = program->getFragmentShader()->getHashValue();
     memcpy(&hashMe.colorAttachment, &_colorAttachmentsFormat, sizeof(_colorAttachmentsFormat));
-    hashMe.depthAttachment = _depthAttachmentFormat;
-    hashMe.stencilAttachment =_stencilAttachmentFormat;
-    hashMe.blendEnabled = blendDescriptor.blendEnabled;
-    hashMe.writeMask = (unsigned int)blendDescriptor.writeMask;
-    hashMe.rgbBlendOperation = (unsigned int)blendDescriptor.rgbBlendOperation;
-    hashMe.alphaBlendOperation = (unsigned int)blendDescriptor.alphaBlendOperation;
-    hashMe.sourceRGBBlendFactor = (unsigned int)blendDescriptor.sourceRGBBlendFactor;
-    hashMe.destinationRGBBlendFactor = (unsigned int)blendDescriptor.destinationRGBBlendFactor;
-    hashMe.sourceAlphaBlendFactor = (unsigned int)blendDescriptor.sourceAlphaBlendFactor;
+    hashMe.depthAttachment             = _depthAttachmentFormat;
+    hashMe.stencilAttachment           = _stencilAttachmentFormat;
+    hashMe.blendEnabled                = blendDescriptor.blendEnabled;
+    hashMe.writeMask                   = (unsigned int)blendDescriptor.writeMask;
+    hashMe.rgbBlendOperation           = (unsigned int)blendDescriptor.rgbBlendOperation;
+    hashMe.alphaBlendOperation         = (unsigned int)blendDescriptor.alphaBlendOperation;
+    hashMe.sourceRGBBlendFactor        = (unsigned int)blendDescriptor.sourceRGBBlendFactor;
+    hashMe.destinationRGBBlendFactor   = (unsigned int)blendDescriptor.destinationRGBBlendFactor;
+    hashMe.sourceAlphaBlendFactor      = (unsigned int)blendDescriptor.sourceAlphaBlendFactor;
     hashMe.destinationAlphaBlendFactor = (unsigned int)blendDescriptor.destinationAlphaBlendFactor;
-    int index = 0;
-    auto vertexLayout = pipelineDescirptor.programState->getVertexLayout();
-    const auto& attributes = vertexLayout->getAttributes();
+    int index                          = 0;
+    auto vertexLayout                  = pipelineDescirptor.programState->getVertexLayout();
+    const auto& attributes             = vertexLayout->getAttributes();
     for (const auto& it : attributes)
     {
-        auto &attribute = it.second;
+        auto& attribute = it.second;
         /*
          stepFunction:1     stride:15       offest:10       format:5        needNormalized:1
          bit31           bit30 ~ bit16   bit15 ~ bit6    bit5 ~ bit1     bit0
          */
         hashMe.vertexLayoutInfo[index++] =
-        ((unsigned int)vertexLayout->getVertexStepMode() & 0x1) << 31 |
-        ((unsigned int)(vertexLayout->getStride() & 0x7FFF)) << 16 |
-        ((unsigned int)attribute.offset & 0x3FF) << 6 |
-        ((unsigned int)attribute.format & 0x1F) << 1 |
-        ((unsigned int)attribute.needToBeNormallized & 0x1);
+            ((unsigned int)vertexLayout->getVertexStepMode() & 0x1) << 31 |
+            ((unsigned int)(vertexLayout->getStride() & 0x7FFF)) << 16 | ((unsigned int)attribute.offset & 0x3FF) << 6 |
+            ((unsigned int)attribute.format & 0x1F) << 1 | ((unsigned int)attribute.needToBeNormallized & 0x1);
     }
-    
+
     unsigned int hash = XXH32((const void*)&hashMe, sizeof(hashMe), 0);
-    auto it = _mtlStateCache.find(hash);
-    if(it != _mtlStateCache.end()) {
+    auto it           = _mtlStateCache.find(hash);
+    if (it != _mtlStateCache.end())
+    {
         _mtlRenderPipelineState = it->second;
         return;
     }
-    
+
     _mtlRenderPipelineDescriptor = [[MTLRenderPipelineDescriptor alloc] init];
-    
+
     setShaderModules(pipelineDescirptor);
     setVertexLayout(_mtlRenderPipelineDescriptor, pipelineDescirptor);
-    
+
     setBlendStateAndFormat(pipelineDescirptor.blendDescriptor);
-    
-    NSError *error = nil;
-    _mtlRenderPipelineState = [_mtlDevice newRenderPipelineStateWithDescriptor:_mtlRenderPipelineDescriptor error:&error];
+
+    NSError* error          = nil;
+    _mtlRenderPipelineState = [_mtlDevice newRenderPipelineStateWithDescriptor:_mtlRenderPipelineDescriptor
+                                                                         error:&error];
     if (error)
         NSLog(@"Can not create renderpipeline state: %@", error);
-    
+
     [_mtlRenderPipelineDescriptor release];
-    
+
     _mtlStateCache.emplace(hash, _mtlRenderPipelineState);
 }
 
 RenderPipelineMTL::~RenderPipelineMTL()
 {
-    for(auto& item : _mtlStateCache)
+    for (auto& item : _mtlStateCache)
         [item.second release];
 }
 
-void RenderPipelineMTL::setVertexLayout(MTLRenderPipelineDescriptor* mtlDescriptor, const PipelineDescriptor& descriptor)
+void RenderPipelineMTL::setVertexLayout(MTLRenderPipelineDescriptor* mtlDescriptor,
+                                        const PipelineDescriptor& descriptor)
 {
-    int vertexIndex = 0;
+    int vertexIndex   = 0;
     auto vertexLayout = descriptor.programState->getVertexLayout();
     if (!vertexLayout->isValid())
         return;
-    
+
     mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stride = vertexLayout->getStride();
-    mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stepFunction = toMTLVertexStepFunction(vertexLayout->getVertexStepMode());
-    
+    mtlDescriptor.vertexDescriptor.layouts[vertexIndex].stepFunction =
+        toMTLVertexStepFunction(vertexLayout->getVertexStepMode());
+
     const auto& attributes = vertexLayout->getAttributes();
     for (const auto& it : attributes)
     {
         auto attribute = it.second;
-        mtlDescriptor.vertexDescriptor.attributes[attribute.index].format = toMTLVertexFormat(attribute.format, attribute.needToBeNormallized);
+        mtlDescriptor.vertexDescriptor.attributes[attribute.index].format =
+            toMTLVertexFormat(attribute.format, attribute.needToBeNormallized);
         mtlDescriptor.vertexDescriptor.attributes[attribute.index].offset = attribute.offset;
         // Buffer index will always be 0;
         mtlDescriptor.vertexDescriptor.attributes[attribute.index].bufferIndex = 0;
     }
-     
 }
 
 void RenderPipelineMTL::setBlendState(MTLRenderPipelineColorAttachmentDescriptor* colorAttachmentDescriptor,
                                       const BlendDescriptor& blendDescriptor)
 {
     colorAttachmentDescriptor.blendingEnabled = blendDescriptor.blendEnabled;
-    colorAttachmentDescriptor.writeMask = toMTLColorWriteMask(blendDescriptor.writeMask);
-    
-    colorAttachmentDescriptor.rgbBlendOperation = toMTLBlendOperation(blendDescriptor.rgbBlendOperation);
+    colorAttachmentDescriptor.writeMask       = toMTLColorWriteMask(blendDescriptor.writeMask);
+
+    colorAttachmentDescriptor.rgbBlendOperation   = toMTLBlendOperation(blendDescriptor.rgbBlendOperation);
     colorAttachmentDescriptor.alphaBlendOperation = toMTLBlendOperation(blendDescriptor.alphaBlendOperation);
-    
-    colorAttachmentDescriptor.sourceRGBBlendFactor = toMTLBlendFactor(blendDescriptor.sourceRGBBlendFactor);
+
+    colorAttachmentDescriptor.sourceRGBBlendFactor      = toMTLBlendFactor(blendDescriptor.sourceRGBBlendFactor);
     colorAttachmentDescriptor.destinationRGBBlendFactor = toMTLBlendFactor(blendDescriptor.destinationRGBBlendFactor);
-    colorAttachmentDescriptor.sourceAlphaBlendFactor = toMTLBlendFactor(blendDescriptor.sourceAlphaBlendFactor);
-    colorAttachmentDescriptor.destinationAlphaBlendFactor = toMTLBlendFactor(blendDescriptor.destinationAlphaBlendFactor);
+    colorAttachmentDescriptor.sourceAlphaBlendFactor    = toMTLBlendFactor(blendDescriptor.sourceAlphaBlendFactor);
+    colorAttachmentDescriptor.destinationAlphaBlendFactor =
+        toMTLBlendFactor(blendDescriptor.destinationAlphaBlendFactor);
 }
 
 void RenderPipelineMTL::setShaderModules(const PipelineDescriptor& descriptor)
 {
     auto vertexShaderModule = static_cast<ProgramMTL*>(descriptor.programState->getProgram())->getVertexShader();
     _mtlRenderPipelineDescriptor.vertexFunction = vertexShaderModule->getMTLFunction();
-    
+
     auto fragShaderModule = static_cast<ProgramMTL*>(descriptor.programState->getProgram())->getFragmentShader();
     _mtlRenderPipelineDescriptor.fragmentFunction = fragShaderModule->getMTLFunction();
 }
 
 void RenderPipelineMTL::chooseAttachmentFormat(const RenderTarget* renderTarget,
-                                            PixelFormat colorAttachmentsFormat[MAX_COLOR_ATTCHMENT],
-                                            PixelFormat& depthFormat,
-                                            PixelFormat& stencilFormat)
+                                               PixelFormat colorAttachmentsFormat[MAX_COLOR_ATTCHMENT],
+                                               PixelFormat& depthFormat,
+                                               PixelFormat& stencilFormat)
 {
     // Choose color attachment format
-    auto rtMTL = static_cast<const RenderTargetMTL*>(renderTarget);
+    auto rtMTL   = static_cast<const RenderTargetMTL*>(renderTarget);
     auto rtflags = rtMTL->getTargetFlags();
-    for(auto i = 0; i < MAX_COLOR_ATTCHMENT; ++i) {
-        colorAttachmentsFormat[i] = bitmask::any(rtflags, getMRTColorFlag(i)) ? rtMTL->getColorAttachmentPixelFormat(i) : PixelFormat::NONE;
+    for (auto i = 0; i < MAX_COLOR_ATTCHMENT; ++i)
+    {
+        colorAttachmentsFormat[i] =
+            bitmask::any(rtflags, getMRTColorFlag(i)) ? rtMTL->getColorAttachmentPixelFormat(i) : PixelFormat::NONE;
     }
-    
+
     if (bitmask::any(rtflags, RenderTargetFlag::DEPTH_AND_STENCIL))
     {
-        depthFormat = rtMTL->getDepthAttachmentPixelFormat();
-        stencilFormat =rtMTL->getStencilAttachmentPixelFormat();
+        depthFormat   = rtMTL->getDepthAttachmentPixelFormat();
+        stencilFormat = rtMTL->getStencilAttachmentPixelFormat();
     }
     else
     {
@@ -319,15 +324,17 @@ MTLBlendOperation toMTLBlendOperation(BlendOperation operation)
 {
     for (int i = 0; i < MAX_COLOR_ATTCHMENT; ++i)
     {
-        if (PixelFormat::NONE == _colorAttachmentsFormat[i]) {
+        if (PixelFormat::NONE == _colorAttachmentsFormat[i])
+        {
             _mtlRenderPipelineDescriptor.colorAttachments[i].pixelFormat = MTLPixelFormat::MTLPixelFormatInvalid;
             continue;
         }
-        
-        _mtlRenderPipelineDescriptor.colorAttachments[i].pixelFormat = UtilsMTL::toMTLPixelFormat(_colorAttachmentsFormat[i]);
+
+        _mtlRenderPipelineDescriptor.colorAttachments[i].pixelFormat =
+            UtilsMTL::toMTLPixelFormat(_colorAttachmentsFormat[i]);
         setBlendState(_mtlRenderPipelineDescriptor.colorAttachments[i], blendDescriptor);
     }
-    _mtlRenderPipelineDescriptor.depthAttachmentPixelFormat = UtilsMTL::toMTLPixelFormat(_depthAttachmentFormat);
+    _mtlRenderPipelineDescriptor.depthAttachmentPixelFormat   = UtilsMTL::toMTLPixelFormat(_depthAttachmentFormat);
     _mtlRenderPipelineDescriptor.stencilAttachmentPixelFormat = UtilsMTL::toMTLPixelFormat(_stencilAttachmentFormat);
 }
 
diff --git a/cocos/renderer/backend/metal/RenderTargetMTL.mm b/cocos/renderer/backend/metal/RenderTargetMTL.mm
index cd9b46e1618b..d909f2efff5a 100644
--- a/cocos/renderer/backend/metal/RenderTargetMTL.mm
+++ b/cocos/renderer/backend/metal/RenderTargetMTL.mm
@@ -3,83 +3,77 @@
 
 CC_BACKEND_BEGIN
 
-static MTLLoadAction getLoadAction(const RenderPassDescriptor& params,
-                                   TargetBufferFlags buffer) {
-    const auto clearFlags = (TargetBufferFlags) params.flags.clear;
+static MTLLoadAction getLoadAction(const RenderPassDescriptor& params, TargetBufferFlags buffer)
+{
+    const auto clearFlags        = (TargetBufferFlags)params.flags.clear;
     const auto discardStartFlags = params.flags.discardStart;
-    if (bitmask::any(clearFlags, buffer)) {
+    if (bitmask::any(clearFlags, buffer))
+    {
         return MTLLoadActionClear;
-    } else if (bitmask::any(discardStartFlags, buffer)) {
+    }
+    else if (bitmask::any(discardStartFlags, buffer))
+    {
         return MTLLoadActionDontCare;
     }
     return MTLLoadActionLoad;
 }
 
-static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
-                                     TargetBufferFlags buffer) {
+static MTLStoreAction getStoreAction(const RenderPassDescriptor& params, TargetBufferFlags buffer)
+{
     const auto discardEndFlags = params.flags.discardEnd;
-    if (bitmask::any(discardEndFlags, buffer)) {
+    if (bitmask::any(discardEndFlags, buffer))
+    {
         return MTLStoreActionDontCare;
     }
     return MTLStoreActionStore;
 }
 
-RenderTargetMTL::RenderTargetMTL(bool defaultRenderTarget) : RenderTarget(defaultRenderTarget)
-{
-    
-}
-RenderTargetMTL::~RenderTargetMTL()
-{
-}
+RenderTargetMTL::RenderTargetMTL(bool defaultRenderTarget) : RenderTarget(defaultRenderTarget) {}
+RenderTargetMTL::~RenderTargetMTL() {}
 
-void RenderTargetMTL::bindFrameBuffer() const
-{
-}
+void RenderTargetMTL::bindFrameBuffer() const {}
 
-void RenderTargetMTL::unbindFrameBuffer() const
-{
-}
+void RenderTargetMTL::unbindFrameBuffer() const {}
 void RenderTargetMTL::setColorAttachment(ColorAttachment attachment)
 {
     RenderTarget::setColorAttachment(attachment);
-    
-    
 }
 
 void RenderTargetMTL::setDepthAttachment(TextureBackend* attachment, int level)
 {
     RenderTarget::setDepthAttachment(attachment, level);
-    
-    
 }
 
 void RenderTargetMTL::setStencilAttachment(TextureBackend* attachment, int level)
 {
     RenderTarget::setStencilAttachment(attachment, level);
-    
 }
 
-void RenderTargetMTL::applyRenderPassAttachments(const RenderPassDescriptor& params, MTLRenderPassDescriptor* descriptor) const
+void RenderTargetMTL::applyRenderPassAttachments(const RenderPassDescriptor& params,
+                                                 MTLRenderPassDescriptor* descriptor) const
 {
     // const auto discardFlags = params.flags.discardEnd;
     auto clearFlags = params.flags.clear;
-    
-    for (size_t i = 0; i < MAX_COLOR_ATTCHMENT; i++) {
+
+    for (size_t i = 0; i < MAX_COLOR_ATTCHMENT; i++)
+    {
         auto attachment = getColorAttachment(i);
-        if (!attachment) {
+        if (!attachment)
+        {
             continue;
         }
-        
+
         const auto MRTColorFlag = getMRTColorFlag(i);
-        
+
         descriptor.colorAttachments[i].texture = attachment.texture;
-        descriptor.colorAttachments[i].level = attachment.level;
+        descriptor.colorAttachments[i].level   = attachment.level;
         // descriptor.colorAttachments[i].slice = attachment.layer;
-        descriptor.colorAttachments[i].loadAction = getLoadAction(params, MRTColorFlag);
-        descriptor.colorAttachments[i].storeAction = getStoreAction(params,MRTColorFlag);
-        if(bitmask::any(clearFlags, MRTColorFlag))
-            descriptor.colorAttachments[i].clearColor = MTLClearColorMake(
-                                                                      params.clearColorValue[0], params.clearColorValue[1], params.clearColorValue[2], params.clearColorValue[3]);
+        descriptor.colorAttachments[i].loadAction  = getLoadAction(params, MRTColorFlag);
+        descriptor.colorAttachments[i].storeAction = getStoreAction(params, MRTColorFlag);
+        if (bitmask::any(clearFlags, MRTColorFlag))
+            descriptor.colorAttachments[i].clearColor =
+                MTLClearColorMake(params.clearColorValue[0], params.clearColorValue[1], params.clearColorValue[2],
+                                  params.clearColorValue[3]);
 #if 0
         if (multisampledColor[i]) {
             // We're rendering into our temporary MSAA texture and doing an automatic resolve.
@@ -99,32 +93,35 @@ static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
         }
 #endif
     }
-    
+
     // Sets descriptor depth and stencil params, should match RenderTargetMTL::chooseAttachmentFormat
-    if(bitmask::any(this->_flags, RenderTargetFlag::DEPTH_AND_STENCIL)) {
+    if (bitmask::any(this->_flags, RenderTargetFlag::DEPTH_AND_STENCIL))
+    {
         auto depthAttachment = getDepthAttachment();
-        if(depthAttachment){
+        if (depthAttachment)
+        {
             descriptor.depthAttachment.texture = depthAttachment.texture;
-            descriptor.depthAttachment.level = depthAttachment.level;
+            descriptor.depthAttachment.level   = depthAttachment.level;
             // descriptor.depthAttachment.slice = depthAttachment.layer;
-            descriptor.depthAttachment.loadAction = getLoadAction(params, TargetBufferFlags::DEPTH);
+            descriptor.depthAttachment.loadAction  = getLoadAction(params, TargetBufferFlags::DEPTH);
             descriptor.depthAttachment.storeAction = getStoreAction(params, TargetBufferFlags::DEPTH);
-            if(bitmask::any(clearFlags, TargetBufferFlags::DEPTH))
+            if (bitmask::any(clearFlags, TargetBufferFlags::DEPTH))
                 descriptor.depthAttachment.clearDepth = params.clearDepthValue;
         }
-        
+
         auto stencilAttachment = getStencilAttachment();
-        if(stencilAttachment) {
+        if (stencilAttachment)
+        {
             descriptor.stencilAttachment.texture = stencilAttachment.texture;
-            descriptor.stencilAttachment.level = stencilAttachment.level;
+            descriptor.stencilAttachment.level   = stencilAttachment.level;
             // descriptor.stencilAttachment.slice = depthAttachment.layer;
-            descriptor.stencilAttachment.loadAction = getLoadAction(params, TargetBufferFlags::STENCIL);
+            descriptor.stencilAttachment.loadAction  = getLoadAction(params, TargetBufferFlags::STENCIL);
             descriptor.stencilAttachment.storeAction = getStoreAction(params, TargetBufferFlags::STENCIL);
-            if(bitmask::any(clearFlags, TargetBufferFlags::STENCIL))
+            if (bitmask::any(clearFlags, TargetBufferFlags::STENCIL))
                 descriptor.stencilAttachment.clearStencil = params.clearStencilValue;
         }
     }
-    
+
 #if 0
     if (multisampledDepth) {
         // We're rendering into our temporary MSAA texture and doing an automatic resolve.
@@ -147,15 +144,16 @@ static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
 
 RenderTargetMTL::Attachment RenderTargetMTL::getColorAttachment(int index) const
 {
-    if(isDefaultRenderTarget() && index == 0)
+    if (isDefaultRenderTarget() && index == 0)
         return {DeviceMTL::getCurrentDrawable().texture, 0};
     auto& rb = this->_color[index];
-    return RenderTargetMTL::Attachment{static_cast<bool>(rb) ? (id<MTLTexture>)(rb.texture->getHandler()) : nil, rb.level};
+    return RenderTargetMTL::Attachment{static_cast<bool>(rb) ? (id<MTLTexture>)(rb.texture->getHandler()) : nil,
+                                       rb.level};
 }
 
 RenderTargetMTL::Attachment RenderTargetMTL::getDepthAttachment() const
 {
-    if(isDefaultRenderTarget())
+    if (isDefaultRenderTarget())
         return {UtilsMTL::getDefaultDepthStencilTexture(), 0};
     auto& rb = this->_depth;
     return RenderTargetMTL::Attachment{!!rb ? (id<MTLTexture>)(rb.texture->getHandler()) : nil, rb.level};
@@ -163,7 +161,7 @@ static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
 
 RenderTargetMTL::Attachment RenderTargetMTL::getStencilAttachment() const
 {
-    if(isDefaultRenderTarget())
+    if (isDefaultRenderTarget())
         return RenderTargetMTL::Attachment{UtilsMTL::getDefaultDepthStencilTexture(), 0};
     auto& rb = this->_stencil;
     return RenderTargetMTL::Attachment{!!rb ? (id<MTLTexture>)(rb.texture->getHandler()) : nil, rb.level};
@@ -173,16 +171,17 @@ static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
 {
     // !!!important
     // the default framebuffer pixel format is: MTLPixelFormatBGRA8Unorm
-    if(isDefaultRenderTarget() && index == 0)
+    if (isDefaultRenderTarget() && index == 0)
         return PixelFormat::BGRA8;
     auto& rb = this->_color[index];
     return rb ? rb.texture->getTextureFormat() : PixelFormat::NONE;
 }
 
 PixelFormat RenderTargetMTL::getDepthAttachmentPixelFormat() const
-{ // FIXME: adxe only support D24S8
-    if(bitmask::any(_flags, TargetBufferFlags::DEPTH_AND_STENCIL)) {
-        if(isDefaultRenderTarget() || !_depth)
+{  // FIXME: adxe only support D24S8
+    if (bitmask::any(_flags, TargetBufferFlags::DEPTH_AND_STENCIL))
+    {
+        if (isDefaultRenderTarget() || !_depth)
             return PixelFormat::D24S8;
         return _depth.texture->getTextureFormat();
     }
@@ -190,9 +189,10 @@ static MTLStoreAction getStoreAction(const RenderPassDescriptor& params,
 }
 
 PixelFormat RenderTargetMTL::getStencilAttachmentPixelFormat() const
-{ // FIXME: adxe only support D24S8
-    if(bitmask::any(_flags, TargetBufferFlags::DEPTH_AND_STENCIL)) {
-        if(isDefaultRenderTarget() || !_stencil)
+{  // FIXME: adxe only support D24S8
+    if (bitmask::any(_flags, TargetBufferFlags::DEPTH_AND_STENCIL))
+    {
+        if (isDefaultRenderTarget() || !_stencil)
             return PixelFormat::D24S8;
         return _stencil.texture->getTextureFormat();
     }
diff --git a/cocos/renderer/backend/metal/ShaderModuleMTL.h b/cocos/renderer/backend/metal/ShaderModuleMTL.h
index 1272c3b409a3..d8fe9df735da 100644
--- a/cocos/renderer/backend/metal/ShaderModuleMTL.h
+++ b/cocos/renderer/backend/metal/ShaderModuleMTL.h
@@ -52,7 +52,7 @@ class ShaderModuleMTL : public ShaderModule
      * @param stage Specify what kinds of shader to be created.
      * @param source Specify the shader source.
      */
-    ShaderModuleMTL(id<MTLDevice> mtlDevice, ShaderStage stage, const std::string& source);
+    ShaderModuleMTL(id<MTLDevice> mtlDevice, ShaderStage stage, std::string_view source);
     ~ShaderModuleMTL();
 
     /**
@@ -71,7 +71,7 @@ class ShaderModuleMTL : public ShaderModule
      * Get all uniformInfos.
      * @return The uniformInfos.
      */
-    inline const std::unordered_map<std::string, UniformInfo>& getAllActiveUniformInfo() const { return _uniformInfos; }
+    inline const hlookup::string_map<UniformInfo>& getAllActiveUniformInfo() const { return _uniformInfos; }
 
     /**
      * Get maximum uniform location.
@@ -83,7 +83,7 @@ class ShaderModuleMTL : public ShaderModule
      * Get active attribute informations.
      * @return Active attribute informations. key is attribute name and Value is corresponding attribute info.
      */
-    inline const std::unordered_map<std::string, AttributeBindInfo> getAttributeInfo() const { return _attributeInfo; }
+    inline const hlookup::string_map<AttributeBindInfo> getAttributeInfo() const { return _attributeInfo; }
 
     /**
      * Get uniform location by engine built-in uniform enum name.
@@ -97,7 +97,7 @@ class ShaderModuleMTL : public ShaderModule
      * @param uniform Specifies the uniform name.
      * @return The uniform location.
      */
-    int getUniformLocation(const std::string& name) const;
+    int getUniformLocation(std::string_view name) const;
 
     /**
      * Get attribute location by engine built-in attribute enum name.
@@ -111,7 +111,7 @@ class ShaderModuleMTL : public ShaderModule
      * @param name Specifies the attribute name.
      * @return The attribute location.
      */
-    int getAttributeLocation(std::string name);
+    int getAttributeLocation(std::string_view name);
 
     /**
      * Get uniform buffer size in bytes that holds all the uniforms.
@@ -128,9 +128,9 @@ class ShaderModuleMTL : public ShaderModule
 
     id<MTLFunction> _mtlFunction = nil;
 
-    std::unordered_map<std::string, UniformInfo> _uniformInfos;
+    hlookup::string_map<UniformInfo> _uniformInfos;
     std::unordered_map<int, UniformInfo> _activeUniformInfos;
-    std::unordered_map<std::string, AttributeBindInfo> _attributeInfo;
+    hlookup::string_map<AttributeBindInfo> _attributeInfo;
 
     int _maxLocation = -1;
     int _uniformLocation[UNIFORM_MAX];
diff --git a/cocos/renderer/backend/metal/ShaderModuleMTL.mm b/cocos/renderer/backend/metal/ShaderModuleMTL.mm
index d0f8291a41cd..f52e414a7868 100644
--- a/cocos/renderer/backend/metal/ShaderModuleMTL.mm
+++ b/cocos/renderer/backend/metal/ShaderModuleMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "ShaderModuleMTL.h"
 #include "DeviceMTL.h"
 
@@ -29,43 +29,41 @@ of this software and associated documentation files (the "Software"), to deal
 
 CC_BACKEND_BEGIN
 
-ShaderModuleMTL::ShaderModuleMTL(id<MTLDevice> mtlDevice, ShaderStage stage, const std::string& source)
-: ShaderModule(stage)
+ShaderModuleMTL::ShaderModuleMTL(id<MTLDevice> mtlDevice, ShaderStage stage, std::string_view source)
+    : ShaderModule(stage)
 {
     // Convert GLSL shader to metal shader
-    //TODO: don't crreate/destroy ctx every time.
-    glslopt_ctx* ctx = glslopt_initialize(kGlslTargetMetal);
+    // TODO: don't crreate/destroy ctx every time.
+    glslopt_ctx* ctx               = glslopt_initialize(kGlslTargetMetal);
     glslopt_shader_type shaderType = stage == ShaderStage::VERTEX ? kGlslOptShaderVertex : kGlslOptShaderFragment;
-    glslopt_shader* glslShader = glslopt_optimize(ctx, shaderType, source.c_str(), 0);
+    glslopt_shader* glslShader     = glslopt_optimize(ctx, shaderType, source.data(), 0);
     if (!glslShader)
     {
         NSLog(@"Can not translate GLSL shader to metal shader:");
-        NSLog(@"%s", source.c_str());
+        NSLog(@"%s", source.data());
         return;
     }
-    
+
     const char* metalShader = glslopt_get_output(glslShader);
     if (!metalShader)
     {
         NSLog(@"Can not get metal shader:");
-        NSLog(@"%s", source.c_str());
+        NSLog(@"%s", source.data());
         glslopt_cleanup(ctx);
         return;
     }
-    
-//    NSLog(@"%s", metalShader);
-    
+
+    //    NSLog(@"%s", metalShader);
+
     parseAttibute(mtlDevice, glslShader);
     parseUniform(mtlDevice, glslShader);
     parseTexture(mtlDevice, glslShader);
     setBuiltinUniformLocation();
     setBuiltinAttributeLocation();
-    
+
     NSString* shader = [NSString stringWithUTF8String:metalShader];
     NSError* error;
-    id<MTLLibrary> library = [mtlDevice newLibraryWithSource:shader
-                                                     options:nil
-                                                       error:&error];
+    id<MTLLibrary> library = [mtlDevice newLibraryWithSource:shader options:nil error:&error];
     if (!library)
     {
         NSLog(@"Can not compile metal shader: %@", error);
@@ -74,7 +72,7 @@ of this software and associated documentation files (the "Software"), to deal
         glslopt_cleanup(ctx);
         return;
     }
-    
+
     if (ShaderStage::VERTEX == stage)
         _mtlFunction = [library newFunctionWithName:@"xlatMtlMain1"];
     else
@@ -85,7 +83,7 @@ of this software and associated documentation files (the "Software"), to deal
         NSLog(@"%s", metalShader);
         assert(false);
     }
-    
+
     glslopt_shader_delete(glslShader);
     glslopt_cleanup(ctx);
     [library release];
@@ -99,26 +97,27 @@ of this software and associated documentation files (the "Software"), to deal
 void ShaderModuleMTL::parseAttibute(id<MTLDevice> mtlDevice, glslopt_shader* shader)
 {
     const int attributeCount = glslopt_shader_get_input_count(shader);
-    for(int i = 0; i < attributeCount; i++)
+    for (int i = 0; i < attributeCount; i++)
     {
         const char* parName;
         glslopt_basic_type parType;
         glslopt_precision parPrec;
         int parVecSize, parMatSize, parArrSize, location;
-         glslopt_shader_get_input_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize, &location);
-        
+        glslopt_shader_get_input_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize,
+                                      &location);
+
         AttributeBindInfo attributeInfo;
         attributeInfo.attributeName = parName;
-        attributeInfo.location = location;
-        _attributeInfo[parName] = attributeInfo;
+        attributeInfo.location      = location;
+        _attributeInfo[parName]     = attributeInfo;
     }
 }
 
 void ShaderModuleMTL::parseUniform(id<MTLDevice> mtlDevice, glslopt_shader* shader)
 {
     const int uniformCount = glslopt_shader_get_uniform_count(shader);
-    _uniformBufferSize = glslopt_shader_get_uniform_total_size(shader);
-    
+    _uniformBufferSize     = glslopt_shader_get_uniform_total_size(shader);
+
     for (int i = 0; i < uniformCount; ++i)
     {
         int nextLocation = -1;
@@ -126,31 +125,33 @@ of this software and associated documentation files (the "Software"), to deal
         glslopt_basic_type parType;
         glslopt_precision parPrec;
         int parVecSize, parMatSize, parArrSize, location;
-        if( i+1 < uniformCount)
+        if (i + 1 < uniformCount)
         {
-            glslopt_shader_get_uniform_desc(shader, i+1, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize, &location);
+            glslopt_shader_get_uniform_desc(shader, i + 1, &parName, &parType, &parPrec, &parVecSize, &parMatSize,
+                                            &parArrSize, &location);
             nextLocation = location;
         }
         else
         {
             nextLocation = static_cast<int>(_uniformBufferSize);
         }
-        
-        glslopt_shader_get_uniform_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize, &location);
-        
+
+        glslopt_shader_get_uniform_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize,
+                                        &location);
+
         parArrSize = (parArrSize > 0) ? parArrSize : 1;
         UniformInfo uniform;
-        uniform.count = parArrSize;
-        uniform.location = location;
-        uniform.isArray = parArrSize;
-        uniform.size = nextLocation - location;
-        uniform.bufferOffset = location;
-        uniform.needConvert = (parVecSize == 3) ? true : false;
-        uniform.type = static_cast<unsigned int>(parType);
-        uniform.isMatrix = (parMatSize > 1) ? true : false;
-        _uniformInfos[parName] = uniform;
+        uniform.count                 = parArrSize;
+        uniform.location              = location;
+        uniform.isArray               = parArrSize;
+        uniform.size                  = nextLocation - location;
+        uniform.bufferOffset          = location;
+        uniform.needConvert           = (parVecSize == 3) ? true : false;
+        uniform.type                  = static_cast<unsigned int>(parType);
+        uniform.isMatrix              = (parMatSize > 1) ? true : false;
+        _uniformInfos[parName]        = uniform;
         _activeUniformInfos[location] = uniform;
-        _maxLocation = _maxLocation < location ? (location + 1) : _maxLocation;
+        _maxLocation                  = _maxLocation < location ? (location + 1) : _maxLocation;
     }
 }
 
@@ -159,12 +160,12 @@ of this software and associated documentation files (the "Software"), to deal
     return _uniformLocation[name];
 }
 
-int ShaderModuleMTL::getUniformLocation(const std::string& name) const
+int ShaderModuleMTL::getUniformLocation(std::string_view name) const
 {
-    const auto& iter = _uniformInfos.find(name);
-    if(iter != _uniformInfos.end())
+    auto iter = _uniformInfos.find(name);
+    if (iter != _uniformInfos.end())
     {
-        return _uniformInfos.at(name).location;
+        return iter->second.location;
     }
     else
         return -1;
@@ -173,44 +174,44 @@ of this software and associated documentation files (the "Software"), to deal
 void ShaderModuleMTL::setBuiltinUniformLocation()
 {
     std::fill(_uniformLocation, _uniformLocation + UNIFORM_MAX, -1);
-    ///u_mvpMatrix
+    /// u_mvpMatrix
     auto iter = _uniformInfos.find(UNIFORM_NAME_MVP_MATRIX);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::MVP_MATRIX] = iter->second.location;
     }
-    
-    ///u_textColor
+
+    /// u_textColor
     iter = _uniformInfos.find(UNIFORM_NAME_TEXT_COLOR);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::TEXT_COLOR] = iter->second.location;
     }
-    
-    ///u_effectColor
+
+    /// u_effectColor
     iter = _uniformInfos.find(UNIFORM_NAME_EFFECT_COLOR);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::EFFECT_COLOR] = iter->second.location;
     }
-    
-    ///u_effectType
+
+    /// u_effectType
     iter = _uniformInfos.find(UNIFORM_NAME_EFFECT_TYPE);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::EFFECT_TYPE] = iter->second.location;
     }
-    
-    ///u_texture
+
+    /// u_texture
     iter = _uniformInfos.find(UNIFORM_NAME_TEXTURE);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::TEXTURE] = iter->second.location;
     }
-    
-    ///u_texture1
+
+    /// u_texture1
     iter = _uniformInfos.find(UNIFORM_NAME_TEXTURE1);
-    if(iter != _uniformInfos.end())
+    if (iter != _uniformInfos.end())
     {
         _uniformLocation[Uniform::TEXTURE1] = iter->second.location;
     }
@@ -221,10 +222,10 @@ of this software and associated documentation files (the "Software"), to deal
     return _attributeLocation[name];
 }
 
-int ShaderModuleMTL::getAttributeLocation(std::string name)
+int ShaderModuleMTL::getAttributeLocation(std::string_view name)
 {
     auto iter = _attributeInfo.find(name);
-    if(iter != _attributeInfo.end())
+    if (iter != _attributeInfo.end())
         return _attributeInfo[name].location;
     else
         return -1;
@@ -233,23 +234,23 @@ of this software and associated documentation files (the "Software"), to deal
 void ShaderModuleMTL::setBuiltinAttributeLocation()
 {
     std::fill(_attributeLocation, _attributeLocation + ATTRIBUTE_MAX, -1);
-    ///a_position
+    /// a_position
     auto iter = _attributeInfo.find(ATTRIBUTE_NAME_POSITION);
-    if(iter != _attributeInfo.end())
+    if (iter != _attributeInfo.end())
     {
         _attributeLocation[Attribute::POSITION] = iter->second.location;
     }
-    
-    ///a_color
+
+    /// a_color
     iter = _attributeInfo.find(ATTRIBUTE_NAME_COLOR);
-    if(iter != _attributeInfo.end())
+    if (iter != _attributeInfo.end())
     {
         _attributeLocation[Attribute::COLOR] = iter->second.location;
     }
-    
-    ///a_texCoord
+
+    /// a_texCoord
     iter = _attributeInfo.find(ATTRIBUTE_NAME_TEXCOORD);
-    if(iter != _attributeInfo.end())
+    if (iter != _attributeInfo.end())
     {
         _attributeLocation[Attribute::TEXCOORD] = iter->second.location;
     }
@@ -264,12 +265,13 @@ of this software and associated documentation files (the "Software"), to deal
         glslopt_basic_type parType;
         glslopt_precision parPrec;
         int parVecSize, parMatSize, parArrSize, location;
-        glslopt_shader_get_texture_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize, &location);
-        
+        glslopt_shader_get_texture_desc(shader, i, &parName, &parType, &parPrec, &parVecSize, &parMatSize, &parArrSize,
+                                        &location);
+
         UniformInfo uniform;
-        uniform.count = parArrSize;
-        uniform.location = location;
-        uniform.isArray = parArrSize > 0;
+        uniform.count          = parArrSize;
+        uniform.location       = location;
+        uniform.isArray        = parArrSize > 0;
         _uniformInfos[parName] = uniform;
     }
 }
diff --git a/cocos/renderer/backend/metal/TextureMTL.mm b/cocos/renderer/backend/metal/TextureMTL.mm
index ff1929f104cd..332aa6f1e08a 100644
--- a/cocos/renderer/backend/metal/TextureMTL.mm
+++ b/cocos/renderer/backend/metal/TextureMTL.mm
@@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "TextureMTL.h"
 #include "UtilsMTL.h"
 #include "base/ccMacros.h"
@@ -31,78 +31,86 @@ of this software and associated documentation files (the "Software"), to deal
 
 namespace
 {
-    MTLSamplerAddressMode toMTLSamplerAddressMode(SamplerAddressMode mode)
+MTLSamplerAddressMode toMTLSamplerAddressMode(SamplerAddressMode mode)
+{
+    MTLSamplerAddressMode ret = MTLSamplerAddressModeRepeat;
+    switch (mode)
     {
-        MTLSamplerAddressMode ret = MTLSamplerAddressModeRepeat;
-        switch (mode) {
-            case SamplerAddressMode::REPEAT:
-                ret = MTLSamplerAddressModeRepeat;
-                break;
-            case SamplerAddressMode::MIRROR_REPEAT:
-                ret = MTLSamplerAddressModeMirrorRepeat;
-                break;
-            case SamplerAddressMode::CLAMP_TO_EDGE:
-                ret = MTLSamplerAddressModeClampToEdge;
-                break;
-            default:
-                CCASSERT(false, "Not supported sampler address mode!");
-                break;
-        }
-        return ret;
+    case SamplerAddressMode::REPEAT:
+        ret = MTLSamplerAddressModeRepeat;
+        break;
+    case SamplerAddressMode::MIRROR_REPEAT:
+        ret = MTLSamplerAddressModeMirrorRepeat;
+        break;
+    case SamplerAddressMode::CLAMP_TO_EDGE:
+        ret = MTLSamplerAddressModeClampToEdge;
+        break;
+    default:
+        CCASSERT(false, "Not supported sampler address mode!");
+        break;
     }
-    
-    MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(SamplerFilter mode)
+    return ret;
+}
+
+MTLSamplerMinMagFilter toMTLSamplerMinMagFilter(SamplerFilter mode)
+{
+    switch (mode)
     {
-        switch (mode) {
-            case SamplerFilter::NEAREST:
-            case SamplerFilter::NEAREST_MIPMAP_LINEAR:
-            case SamplerFilter::NEAREST_MIPMAP_NEAREST:
-                return MTLSamplerMinMagFilterNearest;
-            case SamplerFilter::LINEAR:
-            case SamplerFilter::LINEAR_MIPMAP_LINEAR:
-            case SamplerFilter::LINEAR_MIPMAP_NEAREST:
-                return MTLSamplerMinMagFilterLinear;
-            case SamplerFilter::DONT_CARE:
-                return MTLSamplerMinMagFilterNearest;
-        }
+    case SamplerFilter::NEAREST:
+    case SamplerFilter::NEAREST_MIPMAP_LINEAR:
+    case SamplerFilter::NEAREST_MIPMAP_NEAREST:
+        return MTLSamplerMinMagFilterNearest;
+    case SamplerFilter::LINEAR:
+    case SamplerFilter::LINEAR_MIPMAP_LINEAR:
+    case SamplerFilter::LINEAR_MIPMAP_NEAREST:
+        return MTLSamplerMinMagFilterLinear;
+    case SamplerFilter::DONT_CARE:
+        return MTLSamplerMinMagFilterNearest;
     }
-    
-    bool isColorRenderable(PixelFormat textureFormat)
+}
+
+bool isColorRenderable(PixelFormat textureFormat)
+{
+    switch (textureFormat)
     {
-        switch (textureFormat)
-        {
-            case PixelFormat::RGBA8:
-            case PixelFormat::RGBA4:
-            case PixelFormat::RGB565:
-            case PixelFormat::RGB5A1:
-                return true;
-            default:
-                return false;
-        }
+    case PixelFormat::RGBA8:
+    case PixelFormat::RGBA4:
+    case PixelFormat::RGB565:
+    case PixelFormat::RGB5A1:
+        return true;
+    default:
+        return false;
     }
 }
+}
 
 /// CLASS TextureInfoMTL
 id<MTLTexture> TextureInfoMTL::ensure(int index, int target)
 {
-    if(index < CC_META_TEXTURES) {
+    if (index < CC_META_TEXTURES)
+    {
         id<MTLTexture>& mtlTexture = _mtlTextures[index];
-        if(mtlTexture) return mtlTexture;
+        if (mtlTexture)
+            return mtlTexture;
         mtlTexture = createTexture(_mtlDevice, _descriptor, target);
-        if(_maxIdx < index) _maxIdx = index;
+        if (_maxIdx < index)
+            _maxIdx = index;
         return mtlTexture;
     }
     return nil;
 }
 
-void TextureInfoMTL::destroy() {
-    if(_maxIdx == -1) return;
+void TextureInfoMTL::destroy()
+{
+    if (_maxIdx == -1)
+        return;
     id<MTLTexture> texture;
     int i = 0;
-    while((texture = _mtlTextures[i++]))
+    while ((texture = _mtlTextures[i++]))
         [texture release];
 
-    if(_mtlSamplerState) {
+    if (_mtlSamplerState)
+    {
         [_mtlSamplerState release];
         _mtlSamplerState = nil;
     }
@@ -112,120 +120,143 @@ bool isColorRenderable(PixelFormat textureFormat)
 id<MTLTexture> TextureInfoMTL::createTexture(id<MTLDevice> mtlDevice, const TextureDescriptor& descriptor, int target)
 {
     MTLPixelFormat pixelFormat = UtilsMTL::toMTLPixelFormat(descriptor.textureFormat);
-    if(pixelFormat == MTLPixelFormatInvalid)
+    if (pixelFormat == MTLPixelFormatInvalid)
         return nil;
-    
+
     MTLTextureDescriptor* textureDescriptor = nil;
-    switch(target) {
+    switch (target)
+    {
     case MTL_TEXTURE_2D:
         textureDescriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:pixelFormat
-                                                              width:descriptor.width
-                                                             height:descriptor.height
-                                                          mipmapped:YES];
+                                                                               width:descriptor.width
+                                                                              height:descriptor.height
+                                                                           mipmapped:YES];
         break;
     case MTL_TEXTURE_CUBE:
-        textureDescriptor = [MTLTextureDescriptor textureCubeDescriptorWithPixelFormat:pixelFormat size:descriptor.width mipmapped:YES];
+        textureDescriptor = [MTLTextureDescriptor textureCubeDescriptorWithPixelFormat:pixelFormat
+                                                                                  size:descriptor.width
+                                                                             mipmapped:YES];
         break;
-        default: return nil;
+    default:
+        return nil;
     }
-    
+
     if (TextureUsage::RENDER_TARGET == descriptor.textureUsage)
     {
-        //DepthStencil, and Multisample textures must be allocated with the MTLResourceStorageModePrivate resource option
-        if(PixelFormat::D24S8 == descriptor.textureFormat && target == MTL_TEXTURE_2D)
+        // DepthStencil, and Multisample textures must be allocated with the MTLResourceStorageModePrivate resource
+        // option
+        if (PixelFormat::D24S8 == descriptor.textureFormat && target == MTL_TEXTURE_2D)
             textureDescriptor.resourceOptions = MTLResourceStorageModePrivate;
         textureDescriptor.usage = MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead;
     }
-    
+
     return [mtlDevice newTextureWithDescriptor:textureDescriptor];
 }
 
-void TextureInfoMTL::recreateSampler(const SamplerDescriptor &descriptor)
+void TextureInfoMTL::recreateSampler(const SamplerDescriptor& descriptor)
 {
-    MTLSamplerDescriptor *mtlDescriptor = [MTLSamplerDescriptor new];
-    mtlDescriptor.sAddressMode = descriptor.sAddressMode == SamplerAddressMode::DONT_CARE ? _sAddressMode : toMTLSamplerAddressMode(descriptor.sAddressMode);
-    mtlDescriptor.tAddressMode = descriptor.tAddressMode == SamplerAddressMode::DONT_CARE ? _tAddressMode : toMTLSamplerAddressMode(descriptor.tAddressMode);
-    
-    mtlDescriptor.minFilter = descriptor.minFilter == SamplerFilter::DONT_CARE ? _minFilter : toMTLSamplerMinMagFilter(descriptor.minFilter);
-    mtlDescriptor.magFilter = descriptor.magFilter == SamplerFilter::DONT_CARE ? _magFilter : toMTLSamplerMinMagFilter(descriptor.magFilter);
-    
-    if(_mtlSamplerState)
+    MTLSamplerDescriptor* mtlDescriptor = [MTLSamplerDescriptor new];
+    mtlDescriptor.sAddressMode          = descriptor.sAddressMode == SamplerAddressMode::DONT_CARE
+                                              ? _sAddressMode
+                                              : toMTLSamplerAddressMode(descriptor.sAddressMode);
+    mtlDescriptor.tAddressMode          = descriptor.tAddressMode == SamplerAddressMode::DONT_CARE
+                                              ? _tAddressMode
+                                              : toMTLSamplerAddressMode(descriptor.tAddressMode);
+
+    mtlDescriptor.minFilter =
+        descriptor.minFilter == SamplerFilter::DONT_CARE ? _minFilter : toMTLSamplerMinMagFilter(descriptor.minFilter);
+    mtlDescriptor.magFilter =
+        descriptor.magFilter == SamplerFilter::DONT_CARE ? _magFilter : toMTLSamplerMinMagFilter(descriptor.magFilter);
+
+    if (_mtlSamplerState)
     {
         [_mtlSamplerState release];
         _mtlSamplerState = nil;
     }
-    
+
     _sAddressMode = mtlDescriptor.sAddressMode;
     _tAddressMode = mtlDescriptor.tAddressMode;
-    _minFilter = mtlDescriptor.minFilter;
-    _magFilter = mtlDescriptor.magFilter;
-    _mipFilter = mtlDescriptor.mipFilter;
-    
+    _minFilter    = mtlDescriptor.minFilter;
+    _magFilter    = mtlDescriptor.magFilter;
+    _mipFilter    = mtlDescriptor.mipFilter;
+
     _mtlSamplerState = [_mtlDevice newSamplerStateWithDescriptor:mtlDescriptor];
-    
+
     [mtlDescriptor release];
 }
 
 /// CLASS TextureMTL
-TextureMTL::TextureMTL(id<MTLDevice> mtlDevice, const TextureDescriptor& descriptor)
-: _textureInfo(mtlDevice)
+TextureMTL::TextureMTL(id<MTLDevice> mtlDevice, const TextureDescriptor& descriptor) : _textureInfo(mtlDevice)
 {
     updateTextureDescriptor(descriptor);
 }
 
-TextureMTL::~TextureMTL()
-{
-}
+TextureMTL::~TextureMTL() {}
 
-void TextureMTL::updateSamplerDescriptor(const SamplerDescriptor &sampler)
+void TextureMTL::updateSamplerDescriptor(const SamplerDescriptor& sampler)
 {
     _textureInfo.recreateSampler(sampler);
 }
 
-void TextureMTL::updateTextureDescriptor(const cocos2d::backend::TextureDescriptor &descriptor, int index)
+void TextureMTL::updateTextureDescriptor(const cocos2d::backend::TextureDescriptor& descriptor, int index)
 {
     TextureBackend::updateTextureDescriptor(descriptor, index);
 
     _textureInfo._descriptor = descriptor;
     _textureInfo.ensure(index, MTL_TEXTURE_2D);
     updateSamplerDescriptor(descriptor.samplerDescriptor);
-    
+
     _textureInfo._bytesPerRow = PixelFormatUtils::computeRowPitch(descriptor.textureFormat, descriptor.width);
 }
 
-void TextureMTL::updateData(uint8_t* data, std::size_t width , std::size_t height, std::size_t level, int index)
+void TextureMTL::updateData(uint8_t* data, std::size_t width, std::size_t height, std::size_t level, int index)
 {
     updateSubData(0, 0, width, height, level, data, index);
 }
 
-void TextureMTL::updateSubData(std::size_t xoffset, std::size_t yoffset, std::size_t width, std::size_t height, std::size_t level, uint8_t* data, int index)
+void TextureMTL::updateSubData(std::size_t xoffset,
+                               std::size_t yoffset,
+                               std::size_t width,
+                               std::size_t height,
+                               std::size_t level,
+                               uint8_t* data,
+                               int index)
 {
     auto mtlTexture = _textureInfo.ensure(index, MTL_TEXTURE_2D);
-    if(!mtlTexture) return;
-    
-    MTLRegion region =
-    {
+    if (!mtlTexture)
+        return;
+
+    MTLRegion region = {
         {xoffset, yoffset, 0},  // MTLOrigin
         {width, height, 1}      // MTLSize
     };
-    
+
     auto bytesPerRow = PixelFormatUtils::computeRowPitch(_textureFormat, width);
-    
-    [mtlTexture replaceRegion:region
-                   mipmapLevel:level
-                     withBytes:data
-                   bytesPerRow:bytesPerRow];
-    
-    if(!_hasMipmaps && level > 0)
+
+    [mtlTexture replaceRegion:region mipmapLevel:level withBytes:data bytesPerRow:bytesPerRow];
+
+    if (!_hasMipmaps && level > 0)
         _hasMipmaps = true;
 }
 
-void TextureMTL::updateCompressedData(uint8_t *data, std::size_t width, std::size_t height, std::size_t dataLen, std::size_t level, int index)
+void TextureMTL::updateCompressedData(uint8_t* data,
+                                      std::size_t width,
+                                      std::size_t height,
+                                      std::size_t dataLen,
+                                      std::size_t level,
+                                      int index)
 {
     updateCompressedSubData(0, 0, width, height, dataLen, level, data, index);
 }
 
-void TextureMTL::updateCompressedSubData(std::size_t xoffset, std::size_t yoffset, std::size_t width, std::size_t height, std::size_t dataLen, std::size_t level, uint8_t *data, int index)
+void TextureMTL::updateCompressedSubData(std::size_t xoffset,
+                                         std::size_t yoffset,
+                                         std::size_t width,
+                                         std::size_t height,
+                                         std::size_t dataLen,
+                                         std::size_t level,
+                                         uint8_t* data,
+                                         int index)
 {
     updateSubData(xoffset, yoffset, width, height, level, data, index);
 }
@@ -234,8 +265,8 @@ bool isColorRenderable(PixelFormat textureFormat)
 {
     if (TextureUsage::RENDER_TARGET == _textureUsage || isColorRenderable(_textureFormat) == false)
         return;
-    
-    if(!_hasMipmaps)
+
+    if (!_hasMipmaps)
     {
         _hasMipmaps = true;
         UtilsMTL::generateMipmaps(reinterpret_cast<id<MTLTexture>>(this->getHandler()));
@@ -243,54 +274,52 @@ bool isColorRenderable(PixelFormat textureFormat)
 }
 
 /// CLASS TextureCubeMTL
-TextureCubeMTL::TextureCubeMTL(id<MTLDevice> mtlDevice, const TextureDescriptor& descriptor)
-: _textureInfo(mtlDevice)
+TextureCubeMTL::TextureCubeMTL(id<MTLDevice> mtlDevice, const TextureDescriptor& descriptor) : _textureInfo(mtlDevice)
 {
     updateTextureDescriptor(descriptor);
 }
 
-TextureCubeMTL::~TextureCubeMTL()
-{
-}
+TextureCubeMTL::~TextureCubeMTL() {}
 
-void TextureCubeMTL::updateTextureDescriptor(const cocos2d::backend::TextureDescriptor &descriptor, int index)
+void TextureCubeMTL::updateTextureDescriptor(const cocos2d::backend::TextureDescriptor& descriptor, int index)
 {
     TextureBackend::updateTextureDescriptor(descriptor, index);
 
     _textureInfo._descriptor = descriptor;
     _textureInfo.ensure(index, MTL_TEXTURE_CUBE);
     updateSamplerDescriptor(descriptor.samplerDescriptor);
-    
+
     _textureInfo._bytesPerRow = PixelFormatUtils::computeRowPitch(descriptor.textureFormat, descriptor.width);
-    _bytesPerImage = _textureInfo._bytesPerRow * descriptor.width;
-    _region = MTLRegionMake2D(0, 0, descriptor.width, descriptor.height);
+    _bytesPerImage            = _textureInfo._bytesPerRow * descriptor.width;
+    _region                   = MTLRegionMake2D(0, 0, descriptor.width, descriptor.height);
 }
 
-void TextureCubeMTL::updateSamplerDescriptor(const SamplerDescriptor &sampler)
+void TextureCubeMTL::updateSamplerDescriptor(const SamplerDescriptor& sampler)
 {
     _textureInfo.recreateSampler(sampler);
 }
 
-void TextureCubeMTL::updateFaceData(TextureCubeFace side, void *data, int index)
+void TextureCubeMTL::updateFaceData(TextureCubeFace side, void* data, int index)
 {
     NSUInteger slice = static_cast<int>(side);
-    auto mtlTexture = _textureInfo.ensure(index, MTL_TEXTURE_CUBE);
-    if(!mtlTexture) return;
+    auto mtlTexture  = _textureInfo.ensure(index, MTL_TEXTURE_CUBE);
+    if (!mtlTexture)
+        return;
 
     [mtlTexture replaceRegion:_region
-                   mipmapLevel:0
-                         slice:slice
-                     withBytes:data
-                   bytesPerRow:_textureInfo._bytesPerRow
-                 bytesPerImage:_bytesPerImage];
+                  mipmapLevel:0
+                        slice:slice
+                    withBytes:data
+                  bytesPerRow:_textureInfo._bytesPerRow
+                bytesPerImage:_bytesPerImage];
 }
 
 void TextureCubeMTL::generateMipmaps()
 {
     if (TextureUsage::RENDER_TARGET == _textureUsage || isColorRenderable(_textureFormat) == false)
         return;
-    
-    if(!_hasMipmaps)
+
+    if (!_hasMipmaps)
     {
         _hasMipmaps = true;
         UtilsMTL::generateMipmaps(reinterpret_cast<id<MTLTexture>>(this->getHandler()));
diff --git a/cocos/renderer/backend/metal/UtilsMTL.mm b/cocos/renderer/backend/metal/UtilsMTL.mm
index f37389d967f6..7b5ac87a265a 100644
--- a/cocos/renderer/backend/metal/UtilsMTL.mm
+++ b/cocos/renderer/backend/metal/UtilsMTL.mm
@@ -22,7 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
- 
+
 #include "UtilsMTL.h"
 #include "DeviceMTL.h"
 #include "DeviceInfoMTL.h"
@@ -32,20 +32,21 @@ of this software and associated documentation files (the "Software"), to deal
 
 CC_BACKEND_BEGIN
 
-id<MTLTexture> UtilsMTL::_defaultColorAttachmentTexture = nil;
+id<MTLTexture> UtilsMTL::_defaultColorAttachmentTexture        = nil;
 id<MTLTexture> UtilsMTL::_defaultDepthStencilAttachmentTexture = nil;
 
-namespace {
-    MTLPixelFormat getSupportedDepthStencilFormat()
-    {
-        MTLPixelFormat pixelFormat = MTLPixelFormatDepth32Float_Stencil8;
+namespace
+{
+MTLPixelFormat getSupportedDepthStencilFormat()
+{
+    MTLPixelFormat pixelFormat = MTLPixelFormatDepth32Float_Stencil8;
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-        bool isDepth24Stencil8PixelFormatSupported = DeviceInfoMTL::supportD24S8();
-        if(isDepth24Stencil8PixelFormatSupported)
-            pixelFormat = MTLPixelFormatDepth24Unorm_Stencil8;
+    bool isDepth24Stencil8PixelFormatSupported = DeviceInfoMTL::supportD24S8();
+    if (isDepth24Stencil8PixelFormatSupported)
+        pixelFormat = MTLPixelFormatDepth24Unorm_Stencil8;
 #endif
-        return pixelFormat;
-    }
+    return pixelFormat;
+}
 }
 
 struct GPUTextureFormatInfo
@@ -54,76 +55,77 @@ MTLPixelFormat getSupportedDepthStencilFormat()
     MTLPixelFormat fmtSrgb;
 };
 
-static GPUTextureFormatInfo s_textureFormats[] =
-{
+static GPUTextureFormatInfo s_textureFormats[] = {
     /* pvrtc v1 */
-    { MTLPixelFormat(162/*PVRTC_RGB_4BPP*/),        MTLPixelFormat(163/*PVRTC_RGB_4BPP_sRGB*/)  }, // PTC14
-    { MTLPixelFormat(166/*PVRTC_RGBA_4BPP*/),       MTLPixelFormat(167/*PVRTC_RGBA_4BPP_sRGB*/) }, // PTC14A
-    { MTLPixelFormat(160/*PVRTC_RGB_2BPP*/),        MTLPixelFormat(161/*PVRTC_RGB_2BPP_sRGB*/)  }, // PTC12
-    { MTLPixelFormat(164/*PVRTC_RGBA_2BPP*/),       MTLPixelFormat(165/*PVRTC_RGBA_2BPP_sRGB*/) }, // PTC12A
-    
+    {MTLPixelFormat(162 /*PVRTC_RGB_4BPP*/), MTLPixelFormat(163 /*PVRTC_RGB_4BPP_sRGB*/)},    // PTC14
+    {MTLPixelFormat(166 /*PVRTC_RGBA_4BPP*/), MTLPixelFormat(167 /*PVRTC_RGBA_4BPP_sRGB*/)},  // PTC14A
+    {MTLPixelFormat(160 /*PVRTC_RGB_2BPP*/), MTLPixelFormat(161 /*PVRTC_RGB_2BPP_sRGB*/)},    // PTC12
+    {MTLPixelFormat(164 /*PVRTC_RGBA_2BPP*/), MTLPixelFormat(165 /*PVRTC_RGBA_2BPP_sRGB*/)},  // PTC12A
+
     /* etc */
-    { MTLPixelFormat(180/*ETC2_RGB8*/),             MTLPixelFormat(181/*ETC2_RGB8_sRGB*/)       }, // ETC1
-    { MTLPixelFormat(180/*ETC2_RGB8*/),             MTLPixelFormat(181/*ETC2_RGB8_sRGB*/)       }, // ETC2
-    { MTLPixelFormat(178/*EAC_RGBA8*/),             MTLPixelFormat(179/*EAC_RGBA8_sRGB*/)       }, // ETC2A
-    
+    {MTLPixelFormat(180 /*ETC2_RGB8*/), MTLPixelFormat(181 /*ETC2_RGB8_sRGB*/)},  // ETC1
+    {MTLPixelFormat(180 /*ETC2_RGB8*/), MTLPixelFormat(181 /*ETC2_RGB8_sRGB*/)},  // ETC2
+    {MTLPixelFormat(178 /*EAC_RGBA8*/), MTLPixelFormat(179 /*EAC_RGBA8_sRGB*/)},  // ETC2A
+
     /* s3tc */
-    { MTLPixelFormat(130/*BC1_RGBA*/),              MTLPixelFormat(131/*BC1_RGBA_sRGB*/)        }, // S3TC_DXT1/BC1
-    { MTLPixelFormat(132/*BC2_RGBA*/),              MTLPixelFormat(133/*BC2_RGBA_sRGB*/)        }, // S3TC_DXT3/BC2
-    { MTLPixelFormat(134/*BC3_RGBA*/),              MTLPixelFormat(135/*BC3_RGBA_sRGB*/)        }, // S3TC_DXT5/BC3
-    
+    {MTLPixelFormat(130 /*BC1_RGBA*/), MTLPixelFormat(131 /*BC1_RGBA_sRGB*/)},  // S3TC_DXT1/BC1
+    {MTLPixelFormat(132 /*BC2_RGBA*/), MTLPixelFormat(133 /*BC2_RGBA_sRGB*/)},  // S3TC_DXT3/BC2
+    {MTLPixelFormat(134 /*BC3_RGBA*/), MTLPixelFormat(135 /*BC3_RGBA_sRGB*/)},  // S3TC_DXT5/BC3
+
     /* atc */
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATC_RGB
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATC_EXPLICIT_ALPHA
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ATC_INTERPOLATED_ALPHA
-    
-    /* astc */
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ATC_RGB
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ATC_EXPLICIT_ALPHA
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ATC_INTERPOLATED_ALPHA
+
+/* astc */
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
-    { MTLPixelFormatASTC_4x4_LDR,                   MTLPixelFormatASTC_4x4_sRGB                 }, // ASTC4x4
-    { MTLPixelFormatASTC_5x5_LDR,                   MTLPixelFormatASTC_5x5_sRGB                 }, // ASTC5x5
-    { MTLPixelFormatASTC_6x6_LDR,                   MTLPixelFormatASTC_6x6_sRGB                 }, // ASTC6x6
-    { MTLPixelFormatASTC_8x5_LDR,                   MTLPixelFormatASTC_8x5_sRGB                 }, // ASTC8x5
-    { MTLPixelFormatASTC_8x6_LDR,                   MTLPixelFormatASTC_8x6_sRGB                 }, // ASTC8x6
-    { MTLPixelFormatASTC_8x8_LDR,                   MTLPixelFormatASTC_8x8_sRGB                 }, // ASTC8x8
-    { MTLPixelFormatASTC_10x5_LDR,                  MTLPixelFormatASTC_10x5_sRGB                }, // ASTC10x5
+    {MTLPixelFormatASTC_4x4_LDR, MTLPixelFormatASTC_4x4_sRGB},    // ASTC4x4
+    {MTLPixelFormatASTC_5x5_LDR, MTLPixelFormatASTC_5x5_sRGB},    // ASTC5x5
+    {MTLPixelFormatASTC_6x6_LDR, MTLPixelFormatASTC_6x6_sRGB},    // ASTC6x6
+    {MTLPixelFormatASTC_8x5_LDR, MTLPixelFormatASTC_8x5_sRGB},    // ASTC8x5
+    {MTLPixelFormatASTC_8x6_LDR, MTLPixelFormatASTC_8x6_sRGB},    // ASTC8x6
+    {MTLPixelFormatASTC_8x8_LDR, MTLPixelFormatASTC_8x8_sRGB},    // ASTC8x8
+    {MTLPixelFormatASTC_10x5_LDR, MTLPixelFormatASTC_10x5_sRGB},  // ASTC10x5
 #else
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC4x4
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC5x5
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC6x6
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x5
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x6
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC8x8
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // ASTC10x5
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC4x4
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC5x5
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC6x6
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC8x5
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC8x6
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC8x8
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},  // ASTC10x5
 #endif
-    
+
     /* normal */
-    { MTLPixelFormatRGBA8Unorm,                     MTLPixelFormatRGBA8Unorm_sRGB               }, // RGBA8
-    { MTLPixelFormatBGRA8Unorm,                     MTLPixelFormatBGRA8Unorm_sRGB               }, // BGRA8
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // RGB8
-    { MTLPixelFormat(40/*B5G6R5Unorm*/),            MTLPixelFormatInvalid                       }, // R5G6B5
-    { MTLPixelFormat(42/*ABGR4Unorm*/),             MTLPixelFormatInvalid                       }, // RGBA4
-    { MTLPixelFormat(41/*A1BGR5Unorm*/),            MTLPixelFormatInvalid                       }, // RGB5A1
-    { MTLPixelFormatA8Unorm,                        MTLPixelFormatInvalid                       }, // A8
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // L8
-    { MTLPixelFormatInvalid,                        MTLPixelFormatInvalid                       }, // LA8
-   
+    {MTLPixelFormatRGBA8Unorm, MTLPixelFormatRGBA8Unorm_sRGB},    // RGBA8
+    {MTLPixelFormatBGRA8Unorm, MTLPixelFormatBGRA8Unorm_sRGB},    // BGRA8
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},               // RGB8
+    {MTLPixelFormat(40 /*B5G6R5Unorm*/), MTLPixelFormatInvalid},  // R5G6B5
+    {MTLPixelFormat(42 /*ABGR4Unorm*/), MTLPixelFormatInvalid},   // RGBA4
+    {MTLPixelFormat(41 /*A1BGR5Unorm*/), MTLPixelFormatInvalid},  // RGB5A1
+    {MTLPixelFormatA8Unorm, MTLPixelFormatInvalid},               // A8
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},               // L8
+    {MTLPixelFormatInvalid, MTLPixelFormatInvalid},               // LA8
+
     /* depth stencil */
-    { MTLPixelFormat(255/*Depth24Unorm_Stencil8*/), MTLPixelFormatInvalid                       }, // D24S8
+    {MTLPixelFormat(255 /*Depth24Unorm_Stencil8*/), MTLPixelFormatInvalid},  // D24S8
 };
-static_assert(CC_ARRAYSIZE(s_textureFormats) == (int)PixelFormat::COUNT, "The OpenGL GPU texture format info table incomplete!");
+static_assert(CC_ARRAYSIZE(s_textureFormats) == (int)PixelFormat::COUNT,
+              "The OpenGL GPU texture format info table incomplete!");
 
 void UtilsMTL::initGPUTextureFormats()
 {
-    //on mac, D24S8 means MTLPixelFormatDepth24Unorm_Stencil8, while on ios it means MTLPixelFormatDepth32Float_Stencil8
+    // on mac, D24S8 means MTLPixelFormatDepth24Unorm_Stencil8, while on ios it means
+    // MTLPixelFormatDepth32Float_Stencil8
     auto& info = s_textureFormats[(int)PixelFormat::D24S8];
-    info.fmt = getSupportedDepthStencilFormat();
+    info.fmt   = getSupportedDepthStencilFormat();
 }
 
 id<MTLTexture> UtilsMTL::getDefaultDepthStencilTexture()
 {
-    if (! _defaultDepthStencilAttachmentTexture)
+    if (!_defaultDepthStencilAttachmentTexture)
         _defaultDepthStencilAttachmentTexture = UtilsMTL::createDepthStencilAttachmentTexture();
-    
+
     return _defaultDepthStencilAttachmentTexture;
 }
 
@@ -134,7 +136,8 @@ MTLPixelFormat getSupportedDepthStencilFormat()
 
 MTLPixelFormat UtilsMTL::toMTLPixelFormat(PixelFormat textureFormat)
 {
-    if (UTILS_LIKELY(textureFormat < PixelFormat::COUNT)) {
+    if (UTILS_LIKELY(textureFormat < PixelFormat::COUNT))
+    {
         return s_textureFormats[(int)textureFormat].fmt;
     }
     return MTLPixelFormatInvalid;
@@ -149,48 +152,49 @@ MTLPixelFormat getSupportedDepthStencilFormat()
 
 id<MTLTexture> UtilsMTL::createDepthStencilAttachmentTexture()
 {
-    auto CAMetalLayer = DeviceMTL::getCAMetalLayer();
+    auto CAMetalLayer                       = DeviceMTL::getCAMetalLayer();
     MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init];
-    textureDescriptor.width = CAMetalLayer.drawableSize.width;
-    textureDescriptor.height = CAMetalLayer.drawableSize.height;
-    textureDescriptor.pixelFormat = s_textureFormats[(int)PixelFormat::D24S8].fmt;
-    textureDescriptor.resourceOptions = MTLResourceStorageModePrivate;
-    textureDescriptor.usage = MTLTextureUsageRenderTarget;
-    auto ret = [CAMetalLayer.device newTextureWithDescriptor:textureDescriptor];
+    textureDescriptor.width                 = CAMetalLayer.drawableSize.width;
+    textureDescriptor.height                = CAMetalLayer.drawableSize.height;
+    textureDescriptor.pixelFormat           = s_textureFormats[(int)PixelFormat::D24S8].fmt;
+    textureDescriptor.resourceOptions       = MTLResourceStorageModePrivate;
+    textureDescriptor.usage                 = MTLTextureUsageRenderTarget;
+    auto ret                                = [CAMetalLayer.device newTextureWithDescriptor:textureDescriptor];
     [textureDescriptor release];
-    
+
     return ret;
 }
 
 void UtilsMTL::generateMipmaps(id<MTLTexture> texture)
 {
-    auto commandQueue = static_cast<DeviceMTL*>(DeviceMTL::getInstance())->getMTLCommandQueue();
-    auto commandBuffer = [commandQueue commandBuffer];
+    auto commandQueue                        = static_cast<DeviceMTL*>(DeviceMTL::getInstance())->getMTLCommandQueue();
+    auto commandBuffer                       = [commandQueue commandBuffer];
     id<MTLBlitCommandEncoder> commandEncoder = [commandBuffer blitCommandEncoder];
     [commandEncoder generateMipmapsForTexture:texture];
     [commandEncoder endEncoding];
     [commandBuffer commit];
 }
 
-void UtilsMTL::swizzleImage(unsigned char *image, std::size_t width, std::size_t height, MTLPixelFormat format)
+void UtilsMTL::swizzleImage(unsigned char* image, std::size_t width, std::size_t height, MTLPixelFormat format)
 {
-    if(!image)
+    if (!image)
         return;
-    
+
     auto len = width * height;
-    switch (format) {
-        //convert to RGBA
-        case MTLPixelFormatBGRA8Unorm:
-            for(int i=0; i<len; i++)
-            {
-                unsigned char temp = image[i*4];
-                image[i*4] = image[i*4+2];
-                image[i*4+2] = temp;
-            }
-            break;
-            
-        default:
-            break;
+    switch (format)
+    {
+    // convert to RGBA
+    case MTLPixelFormatBGRA8Unorm:
+        for (int i = 0; i < len; i++)
+        {
+            unsigned char temp = image[i * 4];
+            image[i * 4]       = image[i * 4 + 2];
+            image[i * 4 + 2]   = temp;
+        }
+        break;
+
+    default:
+        break;
     }
 }
 
diff --git a/cocos/renderer/backend/opengl/DeviceGL.cpp b/cocos/renderer/backend/opengl/DeviceGL.cpp
index 0be7eab52c99..6f7b8b07b663 100644
--- a/cocos/renderer/backend/opengl/DeviceGL.cpp
+++ b/cocos/renderer/backend/opengl/DeviceGL.cpp
@@ -112,7 +112,7 @@ RenderTarget* DeviceGL::newRenderTarget(TargetBufferFlags rtf,
     return rtGL;
 }
 
-ShaderModule* DeviceGL::newShaderModule(ShaderStage stage, const std::string& source)
+ShaderModule* DeviceGL::newShaderModule(ShaderStage stage, std::string_view source)
 {
     return new ShaderModuleGL(stage, source);
 }
@@ -127,7 +127,7 @@ RenderPipeline* DeviceGL::newRenderPipeline()
     return new RenderPipelineGL();
 }
 
-Program* DeviceGL::newProgram(const std::string& vertexShader, const std::string& fragmentShader)
+Program* DeviceGL::newProgram(std::string_view vertexShader, std::string_view fragmentShader)
 {
     return new ProgramGL(vertexShader, fragmentShader);
 }
diff --git a/cocos/renderer/backend/opengl/DeviceGL.h b/cocos/renderer/backend/opengl/DeviceGL.h
index edf20369c9a6..80ea34835059 100644
--- a/cocos/renderer/backend/opengl/DeviceGL.h
+++ b/cocos/renderer/backend/opengl/DeviceGL.h
@@ -92,7 +92,7 @@ class DeviceGL : public Device
      * @param fragmentShader Specifes this is a fragment shader source.
      * @return A Program instance.
      */
-    virtual Program* newProgram(const std::string& vertexShader, const std::string& fragmentShader) override;
+    virtual Program* newProgram(std::string_view vertexShader, std::string_view fragmentShader) override;
 
 protected:
     /**
@@ -101,7 +101,7 @@ class DeviceGL : public Device
      * @param source Specifies shader source.
      * @return A ShaderModule object.
      */
-    virtual ShaderModule* newShaderModule(ShaderStage stage, const std::string& source) override;
+    virtual ShaderModule* newShaderModule(ShaderStage stage, std::string_view source) override;
 
     GLint _defaultFBO = 0;  // The value gets from glGetIntegerv, so need to use GLint
 };
diff --git a/cocos/renderer/backend/opengl/DeviceInfoGL.cpp b/cocos/renderer/backend/opengl/DeviceInfoGL.cpp
index 1c2e5b89c1da..1c68c04c6fa5 100644
--- a/cocos/renderer/backend/opengl/DeviceInfoGL.cpp
+++ b/cocos/renderer/backend/opengl/DeviceInfoGL.cpp
@@ -169,7 +169,7 @@ bool DeviceInfoGL::checkForFeatureSupported(FeatureType feature)
     return featureSupported;
 }
 
-bool DeviceInfoGL::checkForGLExtension(const std::string& searchName) const
+bool DeviceInfoGL::checkForGLExtension(std::string_view searchName) const
 {
     return _glExtensions.find(searchName) != std::string::npos;
 }
diff --git a/cocos/renderer/backend/opengl/DeviceInfoGL.h b/cocos/renderer/backend/opengl/DeviceInfoGL.h
index 23c56727bca1..ec11777c48ce 100644
--- a/cocos/renderer/backend/opengl/DeviceInfoGL.h
+++ b/cocos/renderer/backend/opengl/DeviceInfoGL.h
@@ -79,7 +79,7 @@ class DeviceInfoGL : public DeviceInfo
     virtual bool checkForFeatureSupported(FeatureType feature) override;
 
 private:
-    bool checkForGLExtension(const std::string& searchName) const;
+    bool checkForGLExtension(std::string_view searchName) const;
 
     static bool checkSupportsCompressedFormat(int compressedFormat);
 
diff --git a/cocos/renderer/backend/opengl/ProgramGL.cpp b/cocos/renderer/backend/opengl/ProgramGL.cpp
index e1908f2ad08b..1c2f8b431707 100644
--- a/cocos/renderer/backend/opengl/ProgramGL.cpp
+++ b/cocos/renderer/backend/opengl/ProgramGL.cpp
@@ -39,7 +39,7 @@ namespace
 static const std::string SHADER_PREDEFINE = "#version 100\n precision highp float;\n precision highp int;\n";
 }
 
-ProgramGL::ProgramGL(const std::string& vertexShader, const std::string& fragmentShader)
+ProgramGL::ProgramGL(std::string_view vertexShader, std::string_view fragmentShader)
     : Program(vertexShader, fragmentShader)
 {
 #if defined(CC_USE_GLES)
@@ -197,12 +197,12 @@ void ProgramGL::computeLocations()
     _builtinUniformLocation[Uniform::TEXTURE1].location[0] = location;
 }
 
-bool ProgramGL::getAttributeLocation(const std::string& attributeName, unsigned int& location) const
+bool ProgramGL::getAttributeLocation(std::string_view attributeName, unsigned int& location) const
 {
-    GLint loc = glGetAttribLocation(_program, attributeName.c_str());
+    GLint loc = glGetAttribLocation(_program, attributeName.data());
     if (-1 == loc)
     {
-        CCLOG("Cocos2d: %s: can not find vertex attribute of %s", __FUNCTION__, attributeName.c_str());
+        CCLOG("Cocos2d: %s: can not find vertex attribute of %s", __FUNCTION__, attributeName.data());
         return false;
     }
 
@@ -210,9 +210,9 @@ bool ProgramGL::getAttributeLocation(const std::string& attributeName, unsigned
     return true;
 }
 
-const std::unordered_map<std::string, AttributeBindInfo> ProgramGL::getActiveAttributes() const
+const hlookup::string_map<AttributeBindInfo> ProgramGL::getActiveAttributes() const
 {
-    std::unordered_map<std::string, AttributeBindInfo> attributes;
+    hlookup::string_map<AttributeBindInfo> attributes;
 
     if (!_program)
         return attributes;
@@ -293,9 +293,9 @@ int ProgramGL::getAttributeLocation(Attribute name) const
     return _builtinAttributeLocation[name];
 }
 
-int ProgramGL::getAttributeLocation(const std::string& name) const
+int ProgramGL::getAttributeLocation(std::string_view name) const
 {
-    return glGetAttribLocation(_program, name.c_str());
+    return glGetAttribLocation(_program, name.data());
 }
 
 UniformLocation ProgramGL::getUniformLocation(backend::Uniform name) const
@@ -303,7 +303,7 @@ UniformLocation ProgramGL::getUniformLocation(backend::Uniform name) const
     return _builtinUniformLocation[name];
 }
 
-UniformLocation ProgramGL::getUniformLocation(const std::string& uniform) const
+UniformLocation ProgramGL::getUniformLocation(std::string_view uniform) const
 {
     UniformLocation uniformLocation;
     if (_activeUniformInfos.find(uniform) != _activeUniformInfos.end())
@@ -352,7 +352,7 @@ const UniformInfo& ProgramGL::getActiveUniformInfo(ShaderStage stage, int locati
     return s_emptyInfo;
 }
 
-const std::unordered_map<std::string, UniformInfo>& ProgramGL::getAllActiveUniformInfo(ShaderStage stage) const
+const hlookup::string_map<UniformInfo>& ProgramGL::getAllActiveUniformInfo(ShaderStage stage) const
 {
     return _activeUniformInfos;
 }
diff --git a/cocos/renderer/backend/opengl/ProgramGL.h b/cocos/renderer/backend/opengl/ProgramGL.h
index 25be64d6f5aa..d433e94c7d16 100644
--- a/cocos/renderer/backend/opengl/ProgramGL.h
+++ b/cocos/renderer/backend/opengl/ProgramGL.h
@@ -68,7 +68,7 @@ class ProgramGL : public Program
      * @param vertexShader Specifes the vertex shader source.
      * @param fragmentShader Specifes the fragment shader source.
      */
-    ProgramGL(const std::string& vertexShader, const std::string& fragmentShader);
+    ProgramGL(std::string_view vertexShader, std::string_view fragmentShader);
 
     ~ProgramGL();
 
@@ -89,7 +89,7 @@ class ProgramGL : public Program
      * @param uniform Specifies the uniform name.
      * @return The uniform location.
      */
-    virtual UniformLocation getUniformLocation(const std::string& uniform) const override;
+    virtual UniformLocation getUniformLocation(std::string_view uniform) const override;
 
     /**
      * Get uniform location by engine built-in uniform enum name.
@@ -103,7 +103,7 @@ class ProgramGL : public Program
      * @param name Specifies the attribute name.
      * @return The attribute location.
      */
-    virtual int getAttributeLocation(const std::string& name) const override;
+    virtual int getAttributeLocation(std::string_view name) const override;
 
     /**
      * Get attribute location by engine built-in attribute enum name.
@@ -128,7 +128,7 @@ class ProgramGL : public Program
      * Get active vertex attributes.
      * @return Active vertex attributes. key is active attribute name, Value is corresponding attribute info.
      */
-    virtual const std::unordered_map<std::string, AttributeBindInfo> getActiveAttributes() const override;
+    virtual const hlookup::string_map<AttributeBindInfo> getActiveAttributes() const override;
 
     /**
      * Get uniform buffer size in bytes that can hold all the uniforms.
@@ -149,12 +149,11 @@ class ProgramGL : public Program
      * Get all uniformInfos.
      * @return The uniformInfos.
      */
-    virtual const std::unordered_map<std::string, UniformInfo>& getAllActiveUniformInfo(
-        ShaderStage stage) const override;
+    virtual const hlookup::string_map<UniformInfo>& getAllActiveUniformInfo(ShaderStage stage) const override;
 
 private:
     void compileProgram();
-    bool getAttributeLocation(const std::string& attributeName, unsigned int& location) const;
+    bool getAttributeLocation(std::string_view attributeName, unsigned int& location) const;
     void computeUniformInfos();
     void computeLocations();
 #if CC_ENABLE_CACHE_TEXTURE_DATA
@@ -172,7 +171,7 @@ class ProgramGL : public Program
     ShaderModuleGL* _fragmentShaderModule = nullptr;
 
     std::vector<AttributeInfo> _attributeInfos;
-    std::unordered_map<std::string, UniformInfo> _activeUniformInfos;
+    hlookup::string_map<UniformInfo> _activeUniformInfos;
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     std::unordered_map<std::string, int>
         _originalUniformLocations;  ///< record the uniform location when shader was first created.
diff --git a/cocos/renderer/backend/opengl/ShaderModuleGL.cpp b/cocos/renderer/backend/opengl/ShaderModuleGL.cpp
index 23c1a1629b6e..3b6f49e6dd8c 100644
--- a/cocos/renderer/backend/opengl/ShaderModuleGL.cpp
+++ b/cocos/renderer/backend/opengl/ShaderModuleGL.cpp
@@ -31,7 +31,7 @@
 
 CC_BACKEND_BEGIN
 
-ShaderModuleGL::ShaderModuleGL(ShaderStage stage, const std::string& source) : ShaderModule(stage)
+ShaderModuleGL::ShaderModuleGL(ShaderStage stage, std::string_view source) : ShaderModule(stage)
 {
     compileShader(stage, source);
 }
@@ -41,10 +41,10 @@ ShaderModuleGL::~ShaderModuleGL()
     deleteShader();
 }
 
-void ShaderModuleGL::compileShader(ShaderStage stage, const std::string& source)
+void ShaderModuleGL::compileShader(ShaderStage stage, std::string_view source)
 {
     GLenum shaderType       = stage == ShaderStage::VERTEX ? GL_VERTEX_SHADER : GL_FRAGMENT_SHADER;
-    const GLchar* sourcePtr = reinterpret_cast<const GLchar*>(source.c_str());
+    const GLchar* sourcePtr = reinterpret_cast<const GLchar*>(source.data());
     _shader                 = glCreateShader(shaderType);
     if (!_shader)
         return;
@@ -64,7 +64,7 @@ void ShaderModuleGL::compileShader(ShaderStage stage, const std::string& source)
             cocos2d::Data errorLog{};
             glGetShaderInfoLog(_shader, logLength, nullptr, (GLchar*)errorLog.resize(logLength));
             cocos2d::log("cocos2d: ERROR: Failed to compile shader, detail: %s\n%s", errorLog.getBytes(),
-                         source.c_str());
+                         source.data());
         }
         else
         {
diff --git a/cocos/renderer/backend/opengl/ShaderModuleGL.h b/cocos/renderer/backend/opengl/ShaderModuleGL.h
index 5bae6962bbc9..81ea52691ad2 100644
--- a/cocos/renderer/backend/opengl/ShaderModuleGL.h
+++ b/cocos/renderer/backend/opengl/ShaderModuleGL.h
@@ -44,7 +44,7 @@ class ShaderModuleGL : public ShaderModule
      * @param stage Specifies whether is vertex shader or fragment shader.
      * @param source Specifies shader source.
      */
-    ShaderModuleGL(ShaderStage stage, const std::string& source);
+    ShaderModuleGL(ShaderStage stage, std::string_view source);
     ~ShaderModuleGL();
 
     /**
@@ -54,7 +54,7 @@ class ShaderModuleGL : public ShaderModule
     inline GLuint getShader() const { return _shader; }
 
 private:
-    void compileShader(ShaderStage stage, const std::string& source);
+    void compileShader(ShaderStage stage, std::string_view source);
     void deleteShader();
 
     GLuint _shader = 0;
diff --git a/cocos/renderer/shaders/label_sdf.frag b/cocos/renderer/shaders/label_sdf.frag
new file mode 100644
index 000000000000..00d9133694c8
--- /dev/null
+++ b/cocos/renderer/shaders/label_sdf.frag
@@ -0,0 +1,52 @@
+/****************************************************************************
+ Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+ 
+const char* label_distanceNormal_frag = R"(
+
+#ifdef GL_ES
+precision lowp float;
+#endif
+
+varying vec4 v_fragmentColor;
+varying vec2 v_texCoord;
+
+uniform vec4 u_textColor;
+uniform sampler2D u_texture;
+
+void main()
+{
+    vec4 color = texture2D(u_texture, v_texCoord);
+    //the texture use dual channel 16-bit output for distance_map
+    //float dist = color.b+color.g/256.0;
+    // the texture use single channel 8-bit output for distance_map
+    float dist = color.a;
+    //TODO: Implementation 'fwidth' for glsl 1.0
+    float width = fwidth(dist);
+    //assign width for constant will lead to a little bit fuzzy,it's temporary measure.
+    //float width = 0.04;
+    //float width = 1.0/16.0;
+    float alpha = smoothstep(0.5-width, 0.5+width, dist) * u_textColor.a;
+    gl_FragColor = v_fragmentColor * vec4(u_textColor.rgb,alpha);
+}
+)";
diff --git a/cocos/ui/CMakeLists.txt b/cocos/ui/CMakeLists.txt
index 607206af8638..af648011fef2 100644
--- a/cocos/ui/CMakeLists.txt
+++ b/cocos/ui/CMakeLists.txt
@@ -1,14 +1,23 @@
 if(WINDOWS)
-    set(COCOS_UI_SPECIFIC_HEADER
-        ui/UIEditBox/UIEditBoxImpl-win32.h
-        ui/UIWebView/UIWebViewImpl-win32.h
-        ui/UIWebView/UIWebView.h
-        )
-    set(COCOS_UI_SPECIFIC_SRC
-        ui/UIEditBox/UIEditBoxImpl-win32.cpp
-        ui/UIWebView/UIWebViewImpl-win32.cpp
-        ui/UIWebView/UIWebView.cpp
-        )
+    if(ADXE_ENABLE_WEBVIEW2)
+        set(COCOS_UI_SPECIFIC_HEADER
+            ui/UIEditBox/UIEditBoxImpl-win32.h
+            ui/UIWebView/UIWebViewImpl-win32.h
+            ui/UIWebView/UIWebView.h
+            )
+        set(COCOS_UI_SPECIFIC_SRC
+            ui/UIEditBox/UIEditBoxImpl-win32.cpp
+            ui/UIWebView/UIWebViewImpl-win32.cpp
+            ui/UIWebView/UIWebView.cpp
+            )
+    else()
+        set(COCOS_UI_SPECIFIC_HEADER
+            ui/UIEditBox/UIEditBoxImpl-win32.h
+            )
+        set(COCOS_UI_SPECIFIC_SRC
+            ui/UIEditBox/UIEditBoxImpl-win32.cpp
+            )
+    endif()
 elseif(APPLE)
     if(MACOSX)
         set(COCOS_UI_SPECIFIC_HEADER
diff --git a/cocos/ui/UIAbstractCheckButton.cpp b/cocos/ui/UIAbstractCheckButton.cpp
index aec8a369deb8..412a33b46b29 100644
--- a/cocos/ui/UIAbstractCheckButton.cpp
+++ b/cocos/ui/UIAbstractCheckButton.cpp
@@ -73,11 +73,11 @@ AbstractCheckButton::AbstractCheckButton()
 
 AbstractCheckButton::~AbstractCheckButton() {}
 
-bool AbstractCheckButton::init(const std::string& backGround,
-                               const std::string& backGroundSelected,
-                               const std::string& cross,
-                               const std::string& backGroundDisabled,
-                               const std::string& frontCrossDisabled,
+bool AbstractCheckButton::init(std::string_view backGround,
+                               std::string_view backGroundSelected,
+                               std::string_view cross,
+                               std::string_view backGroundDisabled,
+                               std::string_view frontCrossDisabled,
                                TextureResType texType)
 {
     bool ret = true;
@@ -120,11 +120,11 @@ void AbstractCheckButton::initRenderer()
     addProtectedChild(_frontCrossDisabledRenderer, FRONTCROSSDISABLED_RENDERER_Z, -1);
 }
 
-void AbstractCheckButton::loadTextures(const std::string& backGround,
-                                       const std::string& backGroundSelected,
-                                       const std::string& cross,
-                                       const std::string& backGroundDisabled,
-                                       const std::string& frontCrossDisabled,
+void AbstractCheckButton::loadTextures(std::string_view backGround,
+                                       std::string_view backGroundSelected,
+                                       std::string_view cross,
+                                       std::string_view backGroundDisabled,
+                                       std::string_view frontCrossDisabled,
                                        TextureResType texType)
 {
     loadTextureBackGround(backGround, texType);
@@ -134,7 +134,7 @@ void AbstractCheckButton::loadTextures(const std::string& backGround,
     loadTextureFrontCrossDisabled(frontCrossDisabled, texType);
 }
 
-void AbstractCheckButton::loadTextureBackGround(const std::string& backGround, TextureResType texType)
+void AbstractCheckButton::loadTextureBackGround(std::string_view backGround, TextureResType texType)
 {
     _backGroundFileName = backGround;
 
@@ -169,7 +169,7 @@ void AbstractCheckButton::loadTextureBackGround(SpriteFrame* spriteFrame)
     this->setupBackgroundTexture();
 }
 
-void AbstractCheckButton::loadTextureBackGroundSelected(const std::string& backGroundSelected, TextureResType texType)
+void AbstractCheckButton::loadTextureBackGroundSelected(std::string_view backGroundSelected, TextureResType texType)
 {
     _backGroundSelectedFileName        = backGroundSelected;
     _isBackgroundSelectedTextureLoaded = !backGroundSelected.empty();
@@ -203,7 +203,7 @@ void AbstractCheckButton::setupBackgroundSelectedTexture()
     _backGroundSelectedBoxRendererAdaptDirty = true;
 }
 
-void AbstractCheckButton::loadTextureFrontCross(const std::string& cross, TextureResType texType)
+void AbstractCheckButton::loadTextureFrontCross(std::string_view cross, TextureResType texType)
 {
     _frontCrossFileName = cross;
 
@@ -234,7 +234,7 @@ void AbstractCheckButton::setupFrontCrossTexture()
     _frontCrossRendererAdaptDirty = true;
 }
 
-void AbstractCheckButton::loadTextureBackGroundDisabled(const std::string& backGroundDisabled, TextureResType texType)
+void AbstractCheckButton::loadTextureBackGroundDisabled(std::string_view backGroundDisabled, TextureResType texType)
 {
     _backGroundDisabledFileName        = backGroundDisabled;
     _isBackgroundDisabledTextureLoaded = !backGroundDisabled.empty();
@@ -269,7 +269,7 @@ void AbstractCheckButton::setupBackgroundDisable()
     _backGroundBoxDisabledRendererAdaptDirty = true;
 }
 
-void AbstractCheckButton::loadTextureFrontCrossDisabled(const std::string& frontCrossDisabled, TextureResType texType)
+void AbstractCheckButton::loadTextureFrontCrossDisabled(std::string_view frontCrossDisabled, TextureResType texType)
 {
     _frontCrossDisabledFileName        = frontCrossDisabled;
     _isFrontCrossDisabledTextureLoaded = !frontCrossDisabled.empty();
diff --git a/cocos/ui/UIAbstractCheckButton.h b/cocos/ui/UIAbstractCheckButton.h
index 38f97b046ab8..7d801dba7630 100644
--- a/cocos/ui/UIAbstractCheckButton.h
+++ b/cocos/ui/UIAbstractCheckButton.h
@@ -57,11 +57,11 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      * @param frontCrossDisabled    The front cross disabled state image name.
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTextures(const std::string& background,
-                      const std::string& backgroundSelected,
-                      const std::string& cross,
-                      const std::string& backgroundDisabled,
-                      const std::string& frontCrossDisabled,
+    void loadTextures(std::string_view background,
+                      std::string_view backgroundSelected,
+                      std::string_view cross,
+                      std::string_view backgroundDisabled,
+                      std::string_view frontCrossDisabled,
                       TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -70,7 +70,7 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      * @param backGround   The background image name.
      * @param type    @see `Widget::TextureResType`
      */
-    void loadTextureBackGround(const std::string& backGround, TextureResType type = TextureResType::LOCAL);
+    void loadTextureBackGround(std::string_view backGround, TextureResType type = TextureResType::LOCAL);
 
     /**
      * Load background selected state texture for check button.
@@ -78,7 +78,7 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      * @param backGroundSelected    The background selected state image name.
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTextureBackGroundSelected(const std::string& backGroundSelected,
+    void loadTextureBackGroundSelected(std::string_view backGroundSelected,
                                        TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -87,7 +87,7 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      * @param crossTextureName    The cross texture name.
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTextureFrontCross(const std::string& crossTextureName, TextureResType texType = TextureResType::LOCAL);
+    void loadTextureFrontCross(std::string_view crossTextureName, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load background disabled state texture for checkbox.
@@ -96,7 +96,7 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      *
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTextureBackGroundDisabled(const std::string& backGroundDisabled,
+    void loadTextureBackGroundDisabled(std::string_view backGroundDisabled,
                                        TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -105,7 +105,7 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
      * @param frontCrossDisabled    The front cross disabled state texture name.
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTextureFrontCrossDisabled(const std::string& frontCrossDisabled,
+    void loadTextureFrontCrossDisabled(std::string_view frontCrossDisabled,
                                        TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -174,11 +174,11 @@ class CC_GUI_DLL AbstractCheckButton : public Widget
     ResourceData getCrossDisabledFile();
 
     CC_CONSTRUCTOR_ACCESS : virtual bool init() override;
-    virtual bool init(const std::string& backGround,
-                      const std::string& backGroundSelected,
-                      const std::string& cross,
-                      const std::string& backGroundDisabled,
-                      const std::string& frontCrossDisabled,
+    virtual bool init(std::string_view backGround,
+                      std::string_view backGroundSelected,
+                      std::string_view cross,
+                      std::string_view backGroundDisabled,
+                      std::string_view frontCrossDisabled,
                       TextureResType texType = TextureResType::LOCAL);
 
 protected:
diff --git a/cocos/ui/UIButton.cpp b/cocos/ui/UIButton.cpp
index 8b2025a1a784..195bdde8ebe4 100644
--- a/cocos/ui/UIButton.cpp
+++ b/cocos/ui/UIButton.cpp
@@ -92,9 +92,9 @@ Button* Button::create()
     return nullptr;
 }
 
-Button* Button::create(const std::string& normalImage,
-                       const std::string& selectedImage,
-                       const std::string& disableImage,
+Button* Button::create(std::string_view normalImage,
+                       std::string_view selectedImage,
+                       std::string_view disableImage,
                        TextureResType texType)
 {
     Button* btn = new Button;
@@ -107,9 +107,9 @@ Button* Button::create(const std::string& normalImage,
     return nullptr;
 }
 
-bool Button::init(const std::string& normalImage,
-                  const std::string& selectedImage,
-                  const std::string& disableImage,
+bool Button::init(std::string_view normalImage,
+                  std::string_view selectedImage,
+                  std::string_view disableImage,
                   TextureResType texType)
 {
 
@@ -250,9 +250,9 @@ void Button::ignoreContentAdaptWithSize(bool ignore)
     }
 }
 
-void Button::loadTextures(const std::string& normal,
-                          const std::string& selected,
-                          const std::string& disabled,
+void Button::loadTextures(std::string_view normal,
+                          std::string_view selected,
+                          std::string_view disabled,
                           TextureResType texType)
 {
     loadTextureNormal(normal, texType);
@@ -260,7 +260,7 @@ void Button::loadTextures(const std::string& normal,
     loadTextureDisabled(disabled, texType);
 }
 
-void Button::loadTextureNormal(const std::string& normal, TextureResType texType)
+void Button::loadTextureNormal(std::string_view normal, TextureResType texType)
 {
     _normalFileName    = normal;
     _normalTexType     = texType;
@@ -319,7 +319,7 @@ void Button::loadTextureNormal(SpriteFrame* normalSpriteFrame)
     this->setupNormalTexture(nullptr != normalSpriteFrame);
 }
 
-void Button::loadTexturePressed(const std::string& selected, TextureResType texType)
+void Button::loadTexturePressed(std::string_view selected, TextureResType texType)
 {
     _clickedFileName   = selected;
     _pressedTexType    = texType;
@@ -362,7 +362,7 @@ void Button::loadTexturePressed(SpriteFrame* pressedSpriteFrame)
     this->setupPressedTexture(nullptr != pressedSpriteFrame);
 }
 
-void Button::loadTextureDisabled(const std::string& disabled, TextureResType texType)
+void Button::loadTextureDisabled(std::string_view disabled, TextureResType texType)
 {
     _disabledFileName  = disabled;
     _disabledTexType   = texType;
@@ -718,7 +718,7 @@ void Button::setTitleAlignment(TextHAlignment hAlignment, TextVAlignment vAlignm
     _titleRenderer->setAlignment(hAlignment, vAlignment);
 }
 
-void Button::setTitleText(const std::string& text)
+void Button::setTitleText(std::string_view text)
 {
     if (text.compare(getTitleText()) == 0)
     {
@@ -737,7 +737,7 @@ void Button::setTitleText(const std::string& text)
     updateTitleLocation();
 }
 
-std::string Button::getTitleText() const
+std::string_view Button::getTitleText() const
 {
     if (!_titleRenderer)
     {
@@ -806,13 +806,13 @@ float Button::getZoomScale() const
     return _zoomScale;
 }
 
-void Button::setTitleFontName(const std::string& fontName)
+void Button::setTitleFontName(std::string_view fontName)
 {
     createTitleRendererIfNull();
 
     if (FileUtils::getInstance()->isFileExist(fontName))
     {
-        std::string lowerCasedFontName = fontName;
+        std::string lowerCasedFontName{fontName};
         std::transform(lowerCasedFontName.begin(), lowerCasedFontName.end(), lowerCasedFontName.begin(), ::tolower);
         if (lowerCasedFontName.find(".fnt") != std::string::npos)
         {
@@ -838,7 +838,7 @@ Label* Button::getTitleRenderer() const
     return _titleRenderer;
 }
 
-std::string Button::getTitleFontName() const
+std::string_view Button::getTitleFontName() const
 {
     if (_titleRenderer)
     {
@@ -857,7 +857,7 @@ std::string Button::getTitleFontName() const
         }
     }
 
-    return "";
+    return ""sv;
 }
 
 std::string Button::getDescription() const
diff --git a/cocos/ui/UIButton.h b/cocos/ui/UIButton.h
index 3db6e5c1231a..ad881f2d392a 100644
--- a/cocos/ui/UIButton.h
+++ b/cocos/ui/UIButton.h
@@ -80,10 +80,10 @@ class CC_GUI_DLL Button : public Widget
      * @param texType    @see `TextureResType`
      * @return a Button instance.
      */
-    static Button* create(const std::string& normalImage,
-                          const std::string& selectedImage = "",
-                          const std::string& disableImage  = "",
-                          TextureResType texType           = TextureResType::LOCAL);
+    static Button* create(std::string_view normalImage,
+                          std::string_view selectedImage = "",
+                          std::string_view disableImage  = "",
+                          TextureResType texType         = TextureResType::LOCAL);
 
     /**
      * Load textures for button.
@@ -93,10 +93,10 @@ class CC_GUI_DLL Button : public Widget
      * @param disabled    disabled state texture name.
      * @param texType    @see `TextureResType`
      */
-    void loadTextures(const std::string& normal,
-                      const std::string& selected,
-                      const std::string& disabled = "",
-                      TextureResType texType      = TextureResType::LOCAL);
+    void loadTextures(std::string_view normal,
+                      std::string_view selected,
+                      std::string_view disabled = "",
+                      TextureResType texType    = TextureResType::LOCAL);
 
     /**
      * Load normal state texture for button.
@@ -104,7 +104,7 @@ class CC_GUI_DLL Button : public Widget
      * @param normal    normal state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTextureNormal(const std::string& normal, TextureResType texType = TextureResType::LOCAL);
+    void loadTextureNormal(std::string_view normal, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load selected state texture for button.
@@ -112,7 +112,7 @@ class CC_GUI_DLL Button : public Widget
      * @param selected    selected state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTexturePressed(const std::string& selected, TextureResType texType = TextureResType::LOCAL);
+    void loadTexturePressed(std::string_view selected, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load disabled state texture for button.
@@ -120,7 +120,7 @@ class CC_GUI_DLL Button : public Widget
      * @param disabled    dark state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTextureDisabled(const std::string& disabled, TextureResType texType = TextureResType::LOCAL);
+    void loadTextureDisabled(std::string_view disabled, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Sets capInsets for button.
@@ -206,13 +206,13 @@ class CC_GUI_DLL Button : public Widget
      * Change the content of button's title.
      *@param text The title in std::string.
      */
-    void setTitleText(const std::string& text);
+    void setTitleText(std::string_view text);
 
     /**
      * Query the button title content.
      *@return Get the button's title content.
      */
-    std::string getTitleText() const;
+    std::string_view getTitleText() const;
 
     /**
      * Change the color of button's title.
@@ -242,13 +242,13 @@ class CC_GUI_DLL Button : public Widget
      * Change the font name of button's title
      *@param fontName a font name string.
      */
-    void setTitleFontName(const std::string& fontName);
+    void setTitleFontName(std::string_view fontName);
 
     /**
      * Query the font name of button's title
      *@return font name in std::string
      */
-    std::string getTitleFontName() const;
+    std::string_view getTitleFontName() const;
 
     /**
      * Sets the title's text horizontal alignment.
@@ -314,10 +314,10 @@ class CC_GUI_DLL Button : public Widget
     ResourceData getDisabledFile();
 
     CC_CONSTRUCTOR_ACCESS : virtual bool init() override;
-    virtual bool init(const std::string& normalImage,
-                      const std::string& selectedImage = "",
-                      const std::string& disableImage  = "",
-                      TextureResType texType           = TextureResType::LOCAL);
+    virtual bool init(std::string_view normalImage,
+                      std::string_view selectedImage = "",
+                      std::string_view disableImage  = "",
+                      TextureResType texType         = TextureResType::LOCAL);
 
     virtual Vec2 getNormalTextureSize() const;
 
diff --git a/cocos/ui/UICheckBox.cpp b/cocos/ui/UICheckBox.cpp
index 6cce622d6f73..c98813b25166 100644
--- a/cocos/ui/UICheckBox.cpp
+++ b/cocos/ui/UICheckBox.cpp
@@ -48,11 +48,11 @@ CheckBox* CheckBox::create()
     return nullptr;
 }
 
-CheckBox* CheckBox::create(const std::string& backGround,
-                           const std::string& backGroundSelected,
-                           const std::string& cross,
-                           const std::string& backGroundDisabled,
-                           const std::string& frontCrossDisabled,
+CheckBox* CheckBox::create(std::string_view backGround,
+                           std::string_view backGroundSelected,
+                           std::string_view cross,
+                           std::string_view backGroundDisabled,
+                           std::string_view frontCrossDisabled,
                            TextureResType texType)
 {
     CheckBox* pWidget = new CheckBox;
@@ -65,7 +65,7 @@ CheckBox* CheckBox::create(const std::string& backGround,
     return nullptr;
 }
 
-CheckBox* CheckBox::create(const std::string& backGround, const std::string& cross, TextureResType texType)
+CheckBox* CheckBox::create(std::string_view backGround, std::string_view cross, TextureResType texType)
 {
     CheckBox* pWidget = new CheckBox;
     if (pWidget->init(backGround, "", cross, "", "", texType))
diff --git a/cocos/ui/UICheckBox.h b/cocos/ui/UICheckBox.h
index ec29f433b162..5d3d43d02cc3 100644
--- a/cocos/ui/UICheckBox.h
+++ b/cocos/ui/UICheckBox.h
@@ -93,11 +93,11 @@ class CC_GUI_DLL CheckBox : public AbstractCheckButton
      *
      * @return A CheckBox instance pointer.
      */
-    static CheckBox* create(const std::string& backGround,
-                            const std::string& backGroundSelected,
-                            const std::string& cross,
-                            const std::string& backGroundDisabled,
-                            const std::string& frontCrossDisabled,
+    static CheckBox* create(std::string_view backGround,
+                            std::string_view backGroundSelected,
+                            std::string_view cross,
+                            std::string_view backGroundDisabled,
+                            std::string_view frontCrossDisabled,
                             TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -108,8 +108,8 @@ class CC_GUI_DLL CheckBox : public AbstractCheckButton
      * @param texType  The texture's resource type in `Widget::TextureResType`.
      * @return A CheckBox instance pointer
      */
-    static CheckBox* create(const std::string& backGround,
-                            const std::string& cross,
+    static CheckBox* create(std::string_view backGround,
+                            std::string_view cross,
                             TextureResType texType = TextureResType::LOCAL);
 
     /**
diff --git a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm
index bd2cf3d9d2f5..36411c3fd349 100644
--- a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm
+++ b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2012 cocos2d-x.org
  Copyright (c) 2013-2016 zilongshanren
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,92 +30,94 @@ of this software and associated documentation files (the "Software"), to deal
 #include "ui/UIEditBox/Mac/CCUIPasswordTextField.h"
 #include "ui/UIEditBox/Mac/CCUIMultilineTextField.h"
 
-#define getEditBoxImplMac() ((cocos2d::ui::EditBoxImplMac *)_editBox)
-
+#define getEditBoxImplMac() ((cocos2d::ui::EditBoxImplMac*)_editBox)
 
 @implementation UIEditBoxImplMac
 
-- (instancetype)initWithFrame:(NSRect)frameRect editBox:(void *)editBox
+- (instancetype)initWithFrame:(NSRect)frameRect editBox:(void*)editBox
 {
     self = [super init];
-    
-    if (self) {
-        
-        _editState = NO;
+
+    if (self)
+    {
+
+        _editState     = NO;
         self.frameRect = frameRect;
-        
-        self.editBox = editBox;
-        self.dataInputMode = cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS;
+
+        self.editBox            = editBox;
+        self.dataInputMode      = cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS;
         self.keyboardReturnType = cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT;
-        
+
         [self createMultiLineTextField];
     }
-    
+
     return self;
 }
 
 - (void)createSingleLineTextField
 {
-    CCUISingleLineTextField *textField = [[[CCUISingleLineTextField alloc] initWithFrame:self.frameRect] autorelease];
-    
+    CCUISingleLineTextField* textField = [[[CCUISingleLineTextField alloc] initWithFrame:self.frameRect] autorelease];
+
     self.textInput = textField;
 }
 
 - (void)createMultiLineTextField
 {
-    CCUIMultilineTextField *textView = [[[CCUIMultilineTextField alloc] initWithFrame:self.frameRect] autorelease];
+    CCUIMultilineTextField* textView = [[[CCUIMultilineTextField alloc] initWithFrame:self.frameRect] autorelease];
     [textView setVerticallyResizable:NO];
     self.textInput = textView;
 }
 
 - (void)createPasswordTextField
 {
-    CCUIPasswordTextField *textField = [[[CCUIPasswordTextField alloc] initWithFrame:self.frameRect] autorelease];
-    
+    CCUIPasswordTextField* textField = [[[CCUIPasswordTextField alloc] initWithFrame:self.frameRect] autorelease];
+
     self.textInput = textField;
 }
 
-- (void)setTextInput:(NSView<CCUITextInput> *)textInput
+- (void)setTextInput:(NSView<CCUITextInput>*)textInput
 {
-    if (_textInput == textInput) {
+    if (_textInput == textInput)
+    {
         return;
     }
 
     // Migrate properties
-    textInput.ccui_textColor = _textInput.ccui_textColor ?: [NSColor whiteColor];
-    textInput.ccui_text = _textInput.ccui_text ?: @"";
+    textInput.ccui_textColor   = _textInput.ccui_textColor ?: [NSColor whiteColor];
+    textInput.ccui_text        = _textInput.ccui_text ?: @"";
     textInput.ccui_placeholder = _textInput.ccui_placeholder ?: @"";
-    textInput.ccui_font = _textInput.ccui_font ?: [NSFont systemFontOfSize:self.frameRect.size.height*3/2];
-    textInput.ccui_maxLength = getEditBoxImplMac()->getMaxLength();
-    textInput.ccui_alignment = _textInput.ccui_alignment;
-    
+    textInput.ccui_font        = _textInput.ccui_font ?: [NSFont systemFontOfSize:self.frameRect.size.height * 3 / 2];
+    textInput.ccui_maxLength   = getEditBoxImplMac()->getMaxLength();
+    textInput.ccui_alignment   = _textInput.ccui_alignment;
+
     [_textInput removeFromSuperview];
     [_textInput release];
-    
+
     _textInput = [textInput retain];
-    
+
     [_textInput performSelector:@selector(setTextColor:) withObject:_textInput.ccui_textColor];
     [_textInput performSelector:@selector(setBackgroundColor:) withObject:[NSColor clearColor]];
- 
-    if (![_textInput isKindOfClass:[NSTextView class]]) {
+
+    if (![_textInput isKindOfClass:[NSTextView class]])
+    {
         [_textInput performSelector:@selector(setBordered:) withObject:nil];
     }
-    _textInput.hidden = NO;
+    _textInput.hidden     = NO;
     _textInput.wantsLayer = YES;
-    
+
     [_textInput ccui_setDelegate:self];
-    
+
     [self setInputFlag:self.dataInputMode];
     [self setReturnType:self.keyboardReturnType];
 }
 
 - (void)updateFrame:(CGRect)rect
 {
-    NSRect frame = self.textInput.frame;
-    frame.origin.x = rect.origin.x;
-    frame.origin.y = rect.origin.y;
+    NSRect frame      = self.textInput.frame;
+    frame.origin.x    = rect.origin.x;
+    frame.origin.y    = rect.origin.y;
     frame.size.height = rect.size.height;
-    frame.size.width = rect.size.width;
+    frame.size.width  = rect.size.width;
 
     self.textInput.frame = frame;
 }
@@ -123,11 +125,11 @@ - (void)updateFrame:(CGRect)rect
 - (void)dealloc
 {
     self.textInput = nil;
-    
+
     [super dealloc];
 }
 
-- (NSWindow *)window
+- (NSWindow*)window
 {
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
     return glview->getCocoaWindow();
@@ -137,41 +139,44 @@ - (void)openKeyboard
 {
     [self.window.contentView addSubview:self.textInput];
 
-    if (![self.textInput isKindOfClass:[NSTextView class]]) {
+    if (![self.textInput isKindOfClass:[NSTextView class]])
+    {
         [self.textInput becomeFirstResponder];
-    }else {
+    }
+    else
+    {
         [self.window makeFirstResponder:self.textInput];
     }
-    
+
     auto editbox = getEditBoxImplMac()->getEditBox();
-    auto oldPos = editbox->getPosition();
-    editbox->setPosition(oldPos + cocos2d::Vec2(10,20));
+    auto oldPos  = editbox->getPosition();
+    editbox->setPosition(oldPos + cocos2d::Vec2(10, 20));
     editbox->setPosition(oldPos);
 }
 
 - (void)closeKeyboard
 {
-    if (![self.textInput isKindOfClass:[NSTextView class]]) {
+    if (![self.textInput isKindOfClass:[NSTextView class]])
+    {
         [self.textInput resignFirstResponder];
     }
 
     [self.textInput removeFromSuperview];
 }
 
-
-- (const char*) getText
+- (const char*)getText
 {
     return [self.textInput.ccui_text UTF8String];
 }
 
-- (void)controlTextDidBeginEditing:(NSNotification *)notification
+- (void)controlTextDidBeginEditing:(NSNotification*)notification
 {
     _editState = YES;
-    
+
     getEditBoxImplMac()->editBoxEditingDidBegin();
 }
 
-- (void)controlTextDidEndEditing:(NSNotification *)notification
+- (void)controlTextDidEndEditing:(NSNotification*)notification
 {
     _editState = NO;
 
@@ -186,27 +191,32 @@ - (void)setMaxLength:(int)length
 /**
  * Called each time when the text field's text has changed.
  */
-- (void)controlTextDidChange:(NSNotification *)notification
+- (void)controlTextDidChange:(NSNotification*)notification
 {
     getEditBoxImplMac()->editBoxEditingChanged([self getText]);
 }
 
-- (NSString *)getDefaultFontName
+- (NSString*)getDefaultFontName
 {
     return self.textInput.ccui_font.fontName ?: @"";
 }
 
 - (void)setInputMode:(cocos2d::ui::EditBox::InputMode)inputMode
 {
-    //multiline input
-    if (inputMode == cocos2d::ui::EditBox::InputMode::ANY) {
-        if (![self.textInput isKindOfClass:[NSTextView class]]) {
+    // multiline input
+    if (inputMode == cocos2d::ui::EditBox::InputMode::ANY)
+    {
+        if (![self.textInput isKindOfClass:[NSTextView class]])
+        {
             [self createMultiLineTextField];
         }
     }
-    else {
-        if (self.dataInputMode != cocos2d::ui::EditBox::InputFlag::PASSWORD) {
-            if (![self.textInput isKindOfClass:[NSTextField class]]) {
+    else
+    {
+        if (self.dataInputMode != cocos2d::ui::EditBox::InputFlag::PASSWORD)
+        {
+            if (![self.textInput isKindOfClass:[NSTextField class]])
+            {
                 [self createSingleLineTextField];
             }
         }
@@ -215,42 +225,45 @@ - (void)setInputMode:(cocos2d::ui::EditBox::InputMode)inputMode
 
 - (void)setInputFlag:(cocos2d::ui::EditBox::InputFlag)inputFlag
 {
-    if (self.dataInputMode == inputFlag) {
+    if (self.dataInputMode == inputFlag)
+    {
         return;
     }
-    
-    if (self.dataInputMode == cocos2d::ui::EditBox::InputFlag::PASSWORD
-        && inputFlag != cocos2d::ui::EditBox::InputFlag::PASSWORD) {
+
+    if (self.dataInputMode == cocos2d::ui::EditBox::InputFlag::PASSWORD &&
+        inputFlag != cocos2d::ui::EditBox::InputFlag::PASSWORD)
+    {
         [self createSingleLineTextField];
     }
-    
-    if (self.dataInputMode != cocos2d::ui::EditBox::InputFlag::PASSWORD
-        && inputFlag == cocos2d::ui::EditBox::InputFlag::PASSWORD) {
+
+    if (self.dataInputMode != cocos2d::ui::EditBox::InputFlag::PASSWORD &&
+        inputFlag == cocos2d::ui::EditBox::InputFlag::PASSWORD)
+    {
         [self createPasswordTextField];
     }
 
     switch (inputFlag)
     {
-        case cocos2d::ui::EditBox::InputFlag::PASSWORD:
-            self.dataInputMode = inputFlag;
-            break;
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_WORD:
-            CCLOG("INITIAL_CAPS_WORD not implemented");
-            break;
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
-            CCLOG("INITIAL_CAPS_SENTENCE not implemented");
-            break;
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
-            CCLOG("INITIAL_CAPS_ALL_CHARACTERS not implemented");
-            break;
-        case cocos2d::ui::EditBox::InputFlag::SENSITIVE:
-            CCLOG("SENSITIVE not implemented");
-            break;
-        case cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS:
-            CCLOG("LOWERCASE_ALL_CHARACTERS not implemented");
-            break;
-        default:
-            break;
+    case cocos2d::ui::EditBox::InputFlag::PASSWORD:
+        self.dataInputMode = inputFlag;
+        break;
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_WORD:
+        CCLOG("INITIAL_CAPS_WORD not implemented");
+        break;
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
+        CCLOG("INITIAL_CAPS_SENTENCE not implemented");
+        break;
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
+        CCLOG("INITIAL_CAPS_ALL_CHARACTERS not implemented");
+        break;
+    case cocos2d::ui::EditBox::InputFlag::SENSITIVE:
+        CCLOG("SENSITIVE not implemented");
+        break;
+    case cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS:
+        CCLOG("LOWERCASE_ALL_CHARACTERS not implemented");
+        break;
+    default:
+        break;
     }
 }
 
@@ -262,12 +275,14 @@ - (void)setReturnType:(cocos2d::ui::EditBox::KeyboardReturnType)returnType
 - (void)setTextHorizontalAlignment:(cocos2d::TextHAlignment)alignment
 {
     // swizzle center & right, for some reason they're backwards on !TARGET_OS_IPHONE
-    if (alignment == cocos2d::TextHAlignment::CENTER) alignment = cocos2d::TextHAlignment::RIGHT;
-    else if (alignment == cocos2d::TextHAlignment::RIGHT) alignment = cocos2d::TextHAlignment::CENTER;
+    if (alignment == cocos2d::TextHAlignment::CENTER)
+        alignment = cocos2d::TextHAlignment::RIGHT;
+    else if (alignment == cocos2d::TextHAlignment::RIGHT)
+        alignment = cocos2d::TextHAlignment::CENTER;
     self.textInput.ccui_alignment = static_cast<NSTextAlignment>(alignment);
 }
 
-- (void)setPlaceHolder:(const char *)text
+- (void)setPlaceHolder:(const char*)text
 {
     self.textInput.ccui_placeholder = [NSString stringWithUTF8String:text];
 }
@@ -282,14 +297,15 @@ - (void)setTextColor:(NSColor*)color
     self.textInput.ccui_textColor = color;
 }
 
-- (void)setFont:(NSFont *)font
+- (void)setFont:(NSFont*)font
 {
-    if (font != nil) {
+    if (font != nil)
+    {
         self.textInput.ccui_font = font;
     }
 }
 
-- (void)setPlaceholderFontColor:(NSColor *)color
+- (void)setPlaceholderFontColor:(NSColor*)color
 {
     self.textInput.ccui_placeholderColor = color;
 }
@@ -299,70 +315,76 @@ - (void)setPlaceholderFont:(NSFont*)font
     self.textInput.ccui_placeholderFont = font;
 }
 
-- (void)setText:(NSString *)text
+- (void)setText:(NSString*)text
 {
     self.textInput.ccui_text = text;
 }
 
-- (BOOL)textShouldBeginEditing:(NSText *)textObject        // YES means do it
+- (BOOL)textShouldBeginEditing:(NSText*)textObject  // YES means do it
 {
     _editState = YES;
-    
+
     getEditBoxImplMac()->editBoxEditingDidBegin();
     return YES;
 }
 
-- (void)textDidEndEditing:(NSNotification *)notification
+- (void)textDidEndEditing:(NSNotification*)notification
 {
     _editState = NO;
 
     getEditBoxImplMac()->editBoxEditingDidEnd([self getText], [self getEndAction:notification]);
 }
 
-- (cocos2d::ui::EditBoxDelegate::EditBoxEndAction)getEndAction:(NSNotification *)notification
+- (cocos2d::ui::EditBoxDelegate::EditBoxEndAction)getEndAction:(NSNotification*)notification
 {
-    auto type = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::UNKNOWN;
+    auto type                  = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::UNKNOWN;
     NSUInteger reasonForEnding = [[[notification userInfo] objectForKey:@"NSTextMovement"] unsignedIntValue];
-    if (reasonForEnding == NSTabTextMovement) {
+    if (reasonForEnding == NSTabTextMovement)
+    {
         type = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::TAB_TO_NEXT;
-    } else if (reasonForEnding == NSBacktabTextMovement) {
+    }
+    else if (reasonForEnding == NSBacktabTextMovement)
+    {
         type = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::TAB_TO_PREVIOUS;
-    } else if (reasonForEnding == NSReturnTextMovement) {
+    }
+    else if (reasonForEnding == NSReturnTextMovement)
+    {
         type = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::RETURN;
     }
     return type;
 }
 
-- (void)textDidChange:(NSNotification *)notification
+- (void)textDidChange:(NSNotification*)notification
 {
     NSTextView* textView = notification.object;
-    
+
     const char* inputText = [textView.string UTF8String];
-    
+
     getEditBoxImplMac()->editBoxEditingChanged(inputText);
 }
 
-- (BOOL)textView:(NSTextView *)textView shouldChangeTextInRange:(NSRange)affectedCharRange replacementString:(NSString *)replacementString
+- (BOOL)textView:(NSTextView*)textView
+    shouldChangeTextInRange:(NSRange)affectedCharRange
+          replacementString:(NSString*)replacementString
 {
     int maxLength = getEditBoxImplMac()->getMaxLength();
     if (maxLength < 0)
     {
         return YES;
     }
-    
-    if (affectedCharRange.length + affectedCharRange.location > textView.string.length) {
+
+    if (affectedCharRange.length + affectedCharRange.location > textView.string.length)
+    {
         return NO;
     }
-    
-    NSUInteger oldLength = textView.string.length;
+
+    NSUInteger oldLength         = textView.string.length;
     NSUInteger replacementLength = replacementString.length;
-    NSUInteger rangeLength = affectedCharRange.length;
-    
+    NSUInteger rangeLength       = affectedCharRange.length;
+
     NSUInteger newLength = oldLength - rangeLength + replacementLength;
-    
+
     return newLength <= maxLength;
 }
 
-
-
 @end
diff --git a/cocos/ui/UIEditBox/UIEditBox.cpp b/cocos/ui/UIEditBox/UIEditBox.cpp
index 78c7eb1c0460..fefa1cdcb303 100644
--- a/cocos/ui/UIEditBox/UIEditBox.cpp
+++ b/cocos/ui/UIEditBox/UIEditBox.cpp
@@ -56,15 +56,15 @@ void EditBox::openKeyboard() const
     _editBoxImpl->openKeyboard();
 }
 
-EditBox* EditBox::create(const Vec2& size, const std::string& normalImage, TextureResType texType)
+EditBox* EditBox::create(const Vec2& size, std::string_view normalImage, TextureResType texType)
 {
     return EditBox::create(size, normalImage, "", "", texType);
 }
 
 EditBox* EditBox::create(const Vec2& size,
-                         const std::string& normalImage,
-                         const std::string& pressedImage /* = "" */,
-                         const std::string& disabledImage /* = "" */,
+                         std::string_view normalImage,
+                         std::string_view pressedImage /* = "" */,
+                         std::string_view disabledImage /* = "" */,
                          TextureResType texType /* = TextureResType::LOCAL */)
 {
     EditBox* pRet = new EditBox();
@@ -136,16 +136,16 @@ bool EditBox::initWithSizeAndBackgroundSprite(const Vec2& size,
 }
 
 bool EditBox::initWithSizeAndBackgroundSprite(const Vec2& size,
-                                              const std::string& pNormal9SpriteBg,
+                                              std::string_view pNormal9SpriteBg,
                                               TextureResType texType)
 {
     return initWithSizeAndTexture(size, pNormal9SpriteBg, "", "", texType);
 }
 
 bool EditBox::initWithSizeAndTexture(const Vec2& size,
-                                     const std::string& normalImage,
-                                     const std::string& pressedImage /* = "" */,
-                                     const std::string& disabledImage /* = "" */,
+                                     std::string_view normalImage,
+                                     std::string_view pressedImage /* = "" */,
+                                     std::string_view disabledImage /* = "" */,
                                      TextureResType texType /* = TextureResType::LOCAL */)
 {
     if (Widget::init())
@@ -178,9 +178,9 @@ void EditBox::initRenderer()
     addProtectedChild(_disabledRenderer, DISABLED_RENDERER_Z, -1);
 }
 
-void EditBox::loadTextures(const std::string& normal,
-                           const std::string& pressed,
-                           const std::string& disabled,
+void EditBox::loadTextures(std::string_view normal,
+                           std::string_view pressed,
+                           std::string_view disabled,
                            TextureResType texType)
 {
     loadTextureNormal(normal, texType);
@@ -188,7 +188,7 @@ void EditBox::loadTextures(const std::string& normal,
     loadTextureDisabled(disabled, texType);
 }
 
-void EditBox::loadTextureNormal(const std::string& normal, TextureResType texType)
+void EditBox::loadTextureNormal(std::string_view normal, TextureResType texType)
 {
     _normalFileName    = normal;
     _normalTexType     = texType;
@@ -236,7 +236,7 @@ void EditBox::loadTextureNormal(SpriteFrame* normalSpriteFrame)
     this->setupNormalTexture(nullptr != normalSpriteFrame);
 }
 
-void EditBox::loadTexturePressed(const std::string& pressed, TextureResType texType)
+void EditBox::loadTexturePressed(std::string_view pressed, TextureResType texType)
 {
     _pressedFileName   = pressed;
     _pressedTexType    = texType;
@@ -279,7 +279,7 @@ void EditBox::loadTexturePressed(SpriteFrame* pressedSpriteFrame)
     this->setupPressedTexture(nullptr != pressedSpriteFrame);
 }
 
-void EditBox::loadTextureDisabled(const std::string& disabled, TextureResType texType)
+void EditBox::loadTextureDisabled(std::string_view disabled, TextureResType texType)
 {
     _disabledFileName  = disabled;
     _disabledTexType   = texType;
diff --git a/cocos/ui/UIEditBox/UIEditBox.h b/cocos/ui/UIEditBox/UIEditBox.h
index 9d76b3bf785a..990e4ab84358 100644
--- a/cocos/ui/UIEditBox/UIEditBox.h
+++ b/cocos/ui/UIEditBox/UIEditBox.h
@@ -78,7 +78,7 @@ class CC_GUI_DLL EditBoxDelegate
      * @param editBox The edit box object that generated the event.
      * @param text The new text.
      */
-    virtual void editBoxTextChanged(EditBox* /*editBox*/, const std::string& /*text*/) {}
+    virtual void editBoxTextChanged(EditBox* /*editBox*/, std::string_view /*text*/) {}
 
     /**
      * This method is called when the return button was pressed or the outside area of keyboard was touched.
@@ -214,17 +214,17 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * create a edit box with size.
      * @return An autorelease pointer of EditBox, you don't need to release it only if you retain it again.
      */
-    static EditBox* create(const Size& size, const std::string& normalImage, TextureResType texType);
+    static EditBox* create(const Size& size, std::string_view normalImage, TextureResType texType);
 
     /**
      * create a edit box with size.
      * @return An autorelease pointer of EditBox, you don't need to release it only if you retain it again.
      */
     static EditBox* create(const Size& size,
-                           const std::string& normalImage,
-                           const std::string& pressedImage  = "",
-                           const std::string& disabledImage = "",
-                           TextureResType texType           = TextureResType::LOCAL);
+                           std::string_view normalImage,
+                           std::string_view pressedImage  = "",
+                           std::string_view disabledImage = "",
+                           TextureResType texType         = TextureResType::LOCAL);
 
     /**
      * Constructor.
@@ -248,7 +248,7 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @return Whether initialization is successfully or not.
      */
     bool initWithSizeAndBackgroundSprite(const Size& size,
-                                         const std::string& normal9SpriteBg,
+                                         std::string_view normal9SpriteBg,
                                          TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -281,10 +281,10 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @return Whether initialization is successfully or not.
      */
     bool initWithSizeAndTexture(const Size& size,
-                                const std::string& normalImage,
-                                const std::string& pressedImage  = "",
-                                const std::string& disabledImage = "",
-                                TextureResType texType           = TextureResType::LOCAL);
+                                std::string_view normalImage,
+                                std::string_view pressedImage  = "",
+                                std::string_view disabledImage = "",
+                                TextureResType texType         = TextureResType::LOCAL);
 
     /**
      * Load textures for edit box.
@@ -294,10 +294,10 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @param disabled    disabled state texture name.
      * @param texType    @see `TextureResType`
      */
-    void loadTextures(const std::string& normal,
-                      const std::string& pressed,
-                      const std::string& disabled = "",
-                      TextureResType texType      = TextureResType::LOCAL);
+    void loadTextures(std::string_view normal,
+                      std::string_view pressed,
+                      std::string_view disabled = "",
+                      TextureResType texType    = TextureResType::LOCAL);
 
     /**
      * Load normal state texture for edit box.
@@ -305,7 +305,7 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @param normal    normal state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTextureNormal(const std::string& normal, TextureResType texType = TextureResType::LOCAL);
+    void loadTextureNormal(std::string_view normal, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load pressed state texture for edit box.
@@ -313,7 +313,7 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @param pressed    pressed state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTexturePressed(const std::string& pressed, TextureResType texType = TextureResType::LOCAL);
+    void loadTexturePressed(std::string_view pressed, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load disabled state texture for edit box.
@@ -321,7 +321,7 @@ class CC_GUI_DLL EditBox : public Widget, public IMEDelegate
      * @param disabled    dark state texture.
      * @param texType    @see `TextureResType`
      */
-    void loadTextureDisabled(const std::string& disabled, TextureResType texType = TextureResType::LOCAL);
+    void loadTextureDisabled(std::string_view disabled, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Sets capInsets for edit box.
diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp
index f23a4345c0aa..d99aaea1cd38 100644
--- a/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp
+++ b/cocos/ui/UIEditBox/UIEditBoxImpl-android.cpp
@@ -43,15 +43,15 @@
 
 NS_CC_BEGIN
 
-static const std::string editBoxClassName = "org.cocos2dx.lib.Cocos2dxEditBoxHelper";
+static const char* editBoxClassName = "org.cocos2dx.lib.Cocos2dxEditBoxHelper";
 
 namespace ui
 {
 
 #    define LOGD(...) __android_log_print(ANDROID_LOG_ERROR, "", __VA_ARGS__)
 static void editBoxEditingDidBegin(int index);
-static void editBoxEditingDidChanged(int index, const std::string& text);
-static void editBoxEditingDidEnd(int index, const std::string& text, int action);
+static void editBoxEditingDidChanged(int index, std::string_view text);
+static void editBoxEditingDidEnd(int index, std::string_view text, int action);
 extern "C" {
 JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxEditBoxHelper_editBoxEditingDidBegin(JNIEnv*, jclass, jint index)
 {
@@ -221,7 +221,7 @@ void editBoxEditingDidBegin(int index)
         s_allEditBoxes[index]->editBoxEditingDidBegin();
     }
 }
-void editBoxEditingDidChanged(int index, const std::string& text)
+void editBoxEditingDidChanged(int index, std::string_view text)
 {
     auto it = s_allEditBoxes.find(index);
     if (it != s_allEditBoxes.end())
@@ -230,7 +230,7 @@ void editBoxEditingDidChanged(int index, const std::string& text)
     }
 }
 
-void editBoxEditingDidEnd(int index, const std::string& text, int action)
+void editBoxEditingDidEnd(int index, std::string_view text, int action)
 {
     auto it = s_allEditBoxes.find(index);
     if (it != s_allEditBoxes.end())
diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp
index bf99aa2f5db2..bd3fe9ba63a8 100644
--- a/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp
+++ b/cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp
@@ -346,7 +346,7 @@ void EditBoxImplCommon::closeKeyboard()
     _editingMode = false;
 }
 
-void EditBoxImplCommon::onEndEditing(const std::string& /*text*/)
+void EditBoxImplCommon::onEndEditing(std::string_view /*text*/)
 {
     _editBox->setBrightStyle(Widget::BrightStyle::NORMAL);
     _editingMode = false;
@@ -374,7 +374,7 @@ void EditBoxImplCommon::editBoxEditingDidBegin()
 #endif
 }
 
-void EditBoxImplCommon::editBoxEditingDidEnd(const std::string& text, EditBoxDelegate::EditBoxEndAction action)
+void EditBoxImplCommon::editBoxEditingDidEnd(std::string_view text, EditBoxDelegate::EditBoxEndAction action)
 {
     // LOGD("textFieldShouldEndEditing...");
     _text = text;
@@ -405,7 +405,7 @@ void EditBoxImplCommon::editBoxEditingDidEnd(const std::string& text, EditBoxDel
     }
 }
 
-void EditBoxImplCommon::editBoxEditingChanged(const std::string& text)
+void EditBoxImplCommon::editBoxEditingChanged(std::string_view text)
 {
     // LOGD("editBoxTextChanged...");
     cocos2d::ui::EditBoxDelegate* pDelegate = _editBox->getDelegate();
diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-common.h b/cocos/ui/UIEditBox/UIEditBoxImpl-common.h
index 419ce7a0c923..b14e41fe6b4b 100644
--- a/cocos/ui/UIEditBox/UIEditBoxImpl-common.h
+++ b/cocos/ui/UIEditBox/UIEditBoxImpl-common.h
@@ -107,11 +107,11 @@ class CC_GUI_DLL EditBoxImplCommon : public EditBoxImpl
     virtual void openKeyboard() override;
     virtual void closeKeyboard() override;
 
-    virtual void onEndEditing(const std::string& text);
+    virtual void onEndEditing(std::string_view text);
 
     void editBoxEditingDidBegin();
-    void editBoxEditingChanged(const std::string& text);
-    void editBoxEditingDidEnd(const std::string& text,
+    void editBoxEditingChanged(std::string_view text);
+    void editBoxEditingDidEnd(std::string_view text,
                               EditBoxDelegate::EditBoxEndAction action = EditBoxDelegate::EditBoxEndAction::UNKNOWN);
 
     virtual bool isEditing() override                                                = 0;
diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm
index 9ac548fd8398..862e73f88b23 100644
--- a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm
+++ b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm
@@ -3,19 +3,19 @@
  Copyright (c) 2012 James Chen
  Copyright (c) 2013-2015 zilongshanren
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,43 +28,38 @@ of this software and associated documentation files (the "Software"), to deal
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
 
-#define kLabelZOrder  9999
+#    define kLabelZOrder 9999
 
-#include "ui/UIEditBox/UIEditBox.h"
-#include "base/CCDirector.h"
-#include "2d/CCLabel.h"
-#import "platform/ios/CCEAGLView-ios.h"
+#    include "ui/UIEditBox/UIEditBox.h"
+#    include "base/CCDirector.h"
+#    include "2d/CCLabel.h"
+#    import "platform/ios/CCEAGLView-ios.h"
 
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
+#    import <Foundation/Foundation.h>
+#    import <UIKit/UIKit.h>
 
-#import "ui/UIEditBox/iOS/CCUIEditBoxIOS.h"
-
-#define getEditBoxImplIOS() ((cocos2d::ui::EditBoxImplIOS *)_editBox)
+#    import "ui/UIEditBox/iOS/CCUIEditBoxIOS.h"
 
+#    define getEditBoxImplIOS() ((cocos2d::ui::EditBoxImplIOS*)_editBox)
 
 NS_CC_BEGIN
 
-namespace ui {
+namespace ui
+{
 
 EditBoxImpl* __createSystemEditBox(EditBox* pEditBox)
 {
     return new EditBoxImplIOS(pEditBox);
 }
 
-EditBoxImplIOS::EditBoxImplIOS(EditBox* pEditText)
-: EditBoxImplCommon(pEditText)
-, _systemControl(nullptr)
-{
-    
-}
+EditBoxImplIOS::EditBoxImplIOS(EditBox* pEditText) : EditBoxImplCommon(pEditText), _systemControl(nullptr) {}
 
 EditBoxImplIOS::~EditBoxImplIOS()
 {
     [_systemControl release];
     _systemControl = nil;
 }
-    
+
 void EditBoxImplIOS::createNativeControl(const Rect& frame)
 {
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
@@ -75,13 +70,10 @@ of this software and associated documentation files (the "Software"), to deal
 
     rect.size.width /= factor;
     rect.size.height /= factor;
-    
-    _systemControl = [[UIEditBoxImplIOS_objc alloc] initWithFrame:CGRectMake(rect.origin.x,
-                                                                             rect.origin.y,
-                                                                             rect.size.width,
-                                                                             rect.size.height)
-                                                          editBox:this];
 
+    _systemControl = [[UIEditBoxImplIOS_objc alloc]
+        initWithFrame:CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height)
+              editBox:this];
 }
 
 bool EditBoxImplIOS::isEditing()
@@ -91,32 +83,34 @@ of this software and associated documentation files (the "Software"), to deal
 
 void EditBoxImplIOS::doAnimationWhenKeyboardMove(float duration, float distance)
 {
-    if ([_systemControl isEditState] || distance < 0.0f) {
+    if ([_systemControl isEditState] || distance < 0.0f)
+    {
         [_systemControl doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
     }
 }
-    
+
 void EditBoxImplIOS::setNativeFont(const char* pFontName, int fontSize)
 {
     UIFont* textFont = constructFont(pFontName, fontSize);
-    if (textFont != nil) {
+    if (textFont != nil)
+    {
         [_systemControl setFont:textFont];
     }
 }
-    
+
 void EditBoxImplIOS::setNativeFontColor(const Color4B& color)
 {
     _systemControl.textColor = [UIColor colorWithRed:color.r / 255.0f
-                                                         green:color.g / 255.0f
-                                                          blue:color.b / 255.0f
-                                                         alpha:color.a / 255.f];
-
+                                               green:color.g / 255.0f
+                                                blue:color.b / 255.0f
+                                               alpha:color.a / 255.f];
 }
 
 void EditBoxImplIOS::setNativePlaceholderFont(const char* pFontName, int fontSize)
 {
     UIFont* textFont = constructFont(pFontName, fontSize);
-    if (textFont != nil) {
+    if (textFont != nil)
+    {
         [_systemControl setPlaceholderFont:textFont];
     }
 }
@@ -124,9 +118,9 @@ of this software and associated documentation files (the "Software"), to deal
 void EditBoxImplIOS::setNativePlaceholderFontColor(const Color4B& color)
 {
     [_systemControl setPlaceholderTextColor:[UIColor colorWithRed:color.r / 255.0f
-                                                         green:color.g / 255.0f
-                                                          blue:color.b / 255.0f
-                                                         alpha:color.a / 255.f]];
+                                                            green:color.g / 255.0f
+                                                             blue:color.b / 255.0f
+                                                            alpha:color.a / 255.f]];
 }
 
 void EditBoxImplIOS::setNativeInputMode(EditBox::InputMode inputMode)
@@ -134,7 +128,7 @@ of this software and associated documentation files (the "Software"), to deal
     [_systemControl setInputMode:inputMode];
 
     auto oldPos = _editBox->getPosition();
-    _editBox->setPosition(oldPos + Vec2(10,10));
+    _editBox->setPosition(oldPos + Vec2(10, 10));
     _editBox->setPosition(oldPos);
 }
 
@@ -142,7 +136,7 @@ of this software and associated documentation files (the "Software"), to deal
 {
     [_systemControl setInputFlag:inputFlag];
 }
-    
+
 NSString* removeSiriString(NSString* str)
 {
     NSString* siriString = @"\xef\xbf\xbc";
@@ -154,7 +148,6 @@ of this software and associated documentation files (the "Software"), to deal
     return [removeSiriString(_systemControl.text) UTF8String];
 }
 
-
 void EditBoxImplIOS::setNativeReturnType(EditBox::KeyboardReturnType returnType)
 {
     [_systemControl setReturnType:returnType];
@@ -167,8 +160,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 void EditBoxImplIOS::setNativeText(const char* pText)
 {
-    NSString* nsText =[NSString stringWithUTF8String:pText];
-    if ([nsText compare:_systemControl.text] != NSOrderedSame) {
+    NSString* nsText = [NSString stringWithUTF8String:pText];
+    if ([nsText compare:_systemControl.text] != NSOrderedSame)
+    {
         _systemControl.text = nsText;
     }
 }
@@ -185,16 +179,13 @@ of this software and associated documentation files (the "Software"), to deal
 
 void EditBoxImplIOS::updateNativeFrame(const Rect& rect)
 {
-    auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *) glview->getEAGLView();
+    auto glview          = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)glview->getEAGLView();
 
     float factor = eaglview.contentScaleFactor;
-    
-    [_systemControl updateFrame:CGRectMake(rect.origin.x / factor,
-                                           rect.origin.y / factor,
-                                           rect.size.width / factor,
-                                           rect.size.height / factor)];
 
+    [_systemControl updateFrame:CGRectMake(rect.origin.x / factor, rect.origin.y / factor, rect.size.width / factor,
+                                           rect.size.height / factor)];
 }
 
 const char* EditBoxImplIOS::getNativeDefaultFontName()
@@ -213,33 +204,34 @@ of this software and associated documentation files (the "Software"), to deal
 {
     [_systemControl closeKeyboard];
 }
-    
-UIFont* EditBoxImplIOS::constructFont(const char *fontName, int fontSize)
+
+UIFont* EditBoxImplIOS::constructFont(const char* fontName, int fontSize)
 {
     CCASSERT(fontName != nullptr, "fontName can't be nullptr");
-    CCEAGLView *eaglview = static_cast<CCEAGLView *>(cocos2d::Director::getInstance()->getOpenGLView()->getEAGLView());
-    float retinaFactor = eaglview.contentScaleFactor;
-    NSString * fntName = [NSString stringWithUTF8String:fontName];
-    
+    CCEAGLView* eaglview = static_cast<CCEAGLView*>(cocos2d::Director::getInstance()->getOpenGLView()->getEAGLView());
+    float retinaFactor   = eaglview.contentScaleFactor;
+    NSString* fntName    = [NSString stringWithUTF8String:fontName];
+
     fntName = [[fntName lastPathComponent] stringByDeletingPathExtension];
-    
-    auto glview = cocos2d::Director::getInstance()->getOpenGLView();
+
+    auto glview       = cocos2d::Director::getInstance()->getOpenGLView();
     float scaleFactor = glview->getScaleX();
-    
+
     if (fontSize == -1)
     {
-        fontSize = _systemControl.frameRect.size.height*2/3;
+        fontSize = _systemControl.frameRect.size.height * 2 / 3;
     }
     else
     {
         fontSize = fontSize * scaleFactor / retinaFactor;
     }
-    
-    UIFont *textFont = nil;
+
+    UIFont* textFont = nil;
     if (strlen(fontName) > 0)
     {
         textFont = [UIFont fontWithName:fntName size:fontSize];
-        if (textFont == nil) {
+        if (textFont == nil)
+        {
             textFont = [UIFont systemFontOfSize:fontSize];
         }
     }
@@ -254,5 +246,3 @@ of this software and associated documentation files (the "Software"), to deal
 NS_CC_END
 
 #endif /* #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) */
-
-
diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
index 50099ae059a2..800f9c916bf7 100644
--- a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
+++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2012 cocos2d-x.org
  Copyright (c) 2012 Jozef Pridavok
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,24 +27,23 @@ of this software and associated documentation files (the "Software"), to deal
 #include "platform/CCPlatformConfig.h"
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
 
-#include "ui/UIEditBox/UIEditBoxImpl-mac.h"
-#include "base/CCDirector.h"
-#include "base/ccUTF8.h"
-#include "ui/UIEditBox/UIEditBox.h"
-#include "ui/UIEditBox/Mac/CCUIEditBoxMac.h"
+#    include "ui/UIEditBox/UIEditBoxImpl-mac.h"
+#    include "base/CCDirector.h"
+#    include "base/ccUTF8.h"
+#    include "ui/UIEditBox/UIEditBox.h"
+#    include "ui/UIEditBox/Mac/CCUIEditBoxMac.h"
 
 NS_CC_BEGIN
 
-namespace ui {
+namespace ui
+{
 
 EditBoxImpl* __createSystemEditBox(EditBox* pEditBox)
 {
     return new EditBoxImplMac(pEditBox);
 }
 
-EditBoxImplMac::EditBoxImplMac(EditBox* pEditText)
-: EditBoxImplCommon(pEditText)
-, _sysEdit(nullptr)
+EditBoxImplMac::EditBoxImplMac(EditBox* pEditText) : EditBoxImplCommon(pEditText), _sysEdit(nullptr)
 {
     //! TODO: Retina on Mac
     //! _inRetinaMode = [[CCEAGLView sharedEGLView] contentScaleFactor] == 2.0f ? true : false;
@@ -56,42 +55,40 @@ of this software and associated documentation files (the "Software"), to deal
     [_sysEdit release];
 }
 
-void EditBoxImplMac::createNativeControl(const cocos2d::Rect &frame)
+void EditBoxImplMac::createNativeControl(const cocos2d::Rect& frame)
 {
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-    Size size = frame.size;
-    NSRect rect = NSMakeRect(0, 0,
-                             size.width * glview->getScaleX(),
-                             size.height * glview->getScaleY());
-    
+    Size size   = frame.size;
+    NSRect rect = NSMakeRect(0, 0, size.width * glview->getScaleX(), size.height * glview->getScaleY());
+
     float factor = cocos2d::Director::getInstance()->getContentScaleFactor();
-    
+
     rect.size.width /= factor;
     rect.size.height /= factor;
-    
+
     _sysEdit = [[UIEditBoxImplMac alloc] initWithFrame:rect editBox:this];
     this->setNativeVisible(false);
 }
-    
-NSFont* EditBoxImplMac::constructFont(const char *fontName, int fontSize)
+
+NSFont* EditBoxImplMac::constructFont(const char* fontName, int fontSize)
 {
-    NSString * fntName = [NSString stringWithUTF8String:fontName];
-    fntName = [[fntName lastPathComponent] stringByDeletingPathExtension];
+    NSString* fntName  = [NSString stringWithUTF8String:fontName];
+    fntName            = [[fntName lastPathComponent] stringByDeletingPathExtension];
     float retinaFactor = _inRetinaMode ? 2.0f : 1.0f;
-    auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-    float scaleFactor = glview->getScaleX();
-    
+    auto glview        = cocos2d::Director::getInstance()->getOpenGLView();
+    float scaleFactor  = glview->getScaleX();
+
     if (fontSize == -1)
     {
         NSRect frameRect = [_sysEdit.textInput frame];
-        fontSize = frameRect.size.height*2/3;
+        fontSize         = frameRect.size.height * 2 / 3;
     }
     else
     {
         fontSize = fontSize * scaleFactor / retinaFactor;
     }
-    
-    NSFont *textFont = nil;
+
+    NSFont* textFont = nil;
     if (strlen(fontName) == 0)
     {
         textFont = [NSFont systemFontOfSize:fontSize];
@@ -99,47 +96,49 @@ of this software and associated documentation files (the "Software"), to deal
     else
     {
         textFont = [NSFont fontWithName:fntName size:fontSize];
-        if (textFont == nil) {
+        if (textFont == nil)
+        {
             textFont = [NSFont systemFontOfSize:fontSize];
         }
     }
-    
+
     return textFont;
 }
 
-void EditBoxImplMac::setNativeFont(const char *pFontName, int fontSize)
+void EditBoxImplMac::setNativeFont(const char* pFontName, int fontSize)
 {
     NSFont* textFont = constructFont(pFontName, fontSize);
     [_sysEdit setFont:textFont];
 }
 
-void EditBoxImplMac::setNativePlaceholderFont(const char *pFontName, int fontSize)
+void EditBoxImplMac::setNativePlaceholderFont(const char* pFontName, int fontSize)
 {
-    NSFont *textFont = constructFont(pFontName, fontSize);
-    
-    if (!textFont) {
+    NSFont* textFont = constructFont(pFontName, fontSize);
+
+    if (!textFont)
+    {
         CCLOGWARN("Font not found: %s", pFontName);
         return;
     }
     [_sysEdit setPlaceholderFont:textFont];
 }
 
-void EditBoxImplMac::setNativeFontColor(const cocos2d::Color4B &color)
+void EditBoxImplMac::setNativeFontColor(const cocos2d::Color4B& color)
 {
-    NSColor *newColor = [NSColor colorWithCalibratedRed:color.r / 255.0f
+    NSColor* newColor = [NSColor colorWithCalibratedRed:color.r / 255.0f
                                                   green:color.g / 255.0f
                                                    blue:color.b / 255.0f
                                                   alpha:color.a / 255.f];
 
     [_sysEdit setTextColor:newColor];
 }
-    
-void EditBoxImplMac::setNativePlaceholderFontColor(const cocos2d::Color4B &color)
+
+void EditBoxImplMac::setNativePlaceholderFontColor(const cocos2d::Color4B& color)
 {
-    NSColor *newColor = [NSColor colorWithCalibratedRed:color.r/255.f
-                                                 green:color.g / 255.f
-                                                  blue:color.b / 255.f
-                                                 alpha:color.a / 255.f];
+    NSColor* newColor = [NSColor colorWithCalibratedRed:color.r / 255.f
+                                                  green:color.g / 255.f
+                                                   blue:color.b / 255.f
+                                                  alpha:color.a / 255.f];
     [_sysEdit setPlaceholderFontColor:newColor];
 }
 
@@ -147,7 +146,7 @@ of this software and associated documentation files (the "Software"), to deal
 {
     [_sysEdit setInputMode:inputMode];
     auto oldPosition = _editBox->getPosition();
-    _editBox->setPosition(_editBox->getPosition() + Vec2(10,10));
+    _editBox->setPosition(_editBox->getPosition() + Vec2(10, 10));
     _editBox->setPosition(oldPosition);
 }
 
@@ -156,7 +155,6 @@ of this software and associated documentation files (the "Software"), to deal
     [_sysEdit setMaxLength:maxLength];
 }
 
-
 void EditBoxImplMac::setNativeInputFlag(EditBox::InputFlag inputFlag)
 {
     [_sysEdit setInputFlag:inputFlag];
@@ -177,12 +175,12 @@ of this software and associated documentation files (the "Software"), to deal
     return [_sysEdit isEditState] ? true : false;
 }
 
-void EditBoxImplMac::setNativeText(const char *pText)
+void EditBoxImplMac::setNativeText(const char* pText)
 {
-    NSString *text = [NSString stringWithUTF8String:pText];
+    NSString* text = [NSString stringWithUTF8String:pText];
     [_sysEdit setText:text];
 }
-    
+
 void EditBoxImplMac::setNativePlaceHolder(const char* pText)
 {
     [_sysEdit setPlaceHolder:pText];
@@ -193,24 +191,21 @@ of this software and associated documentation files (the "Software"), to deal
     [_sysEdit setVisible:visible];
 }
 
-void EditBoxImplMac::updateNativeFrame(const cocos2d::Rect &rect)
+void EditBoxImplMac::updateNativeFrame(const cocos2d::Rect& rect)
 {
     GLView* eglView = Director::getInstance()->getOpenGLView();
-    auto frameSize = eglView->getFrameSize();
+    auto frameSize  = eglView->getFrameSize();
     // Coordinate System on OSX has its origin at the lower left corner.
-//    https://developer.apple.com/library/ios/documentation/General/Conceptual/Devpedia-CocoaApp/CoordinateSystem.html
+    //    https://developer.apple.com/library/ios/documentation/General/Conceptual/Devpedia-CocoaApp/CoordinateSystem.html
     auto screenPosY = frameSize.height - rect.origin.y - rect.size.height;
-    [_sysEdit updateFrame:CGRectMake(rect.origin.x,
-                                     screenPosY,
-                                     rect.size.width, rect.size.height)];
+    [_sysEdit updateFrame:CGRectMake(rect.origin.x, screenPosY, rect.size.width, rect.size.height)];
 }
-    
+
 const char* EditBoxImplMac::getNativeDefaultFontName()
 {
     return [[_sysEdit getDefaultFontName] UTF8String];
 }
 
-
 void EditBoxImplMac::nativeOpenKeyboard()
 {
     [_sysEdit setVisible:YES];
@@ -226,6 +221,4 @@ of this software and associated documentation files (the "Software"), to deal
 
 NS_CC_END
 
-#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-
-
+#endif  // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
diff --git a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm
index eb33fd0a2bdd..134e0a540f7f 100644
--- a/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm
+++ b/cocos/ui/UIEditBox/iOS/CCUIEditBoxIOS.mm
@@ -4,19 +4,19 @@
  Copyright (c) 2013-2015 zilongshanren
  Copyright (c) 2015 Mazyad Alabduljaleel
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,8 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "platform/ios/CCEAGLView-ios.h"
 #include "base/CCDirector.h"
 
-#define getEditBoxImplIOS() ((cocos2d::ui::EditBoxImplIOS *)_editBox)
-
+#define getEditBoxImplIOS() ((cocos2d::ui::EditBoxImplIOS*)_editBox)
 
 @implementation UIEditBoxImplIOS_objc
 
@@ -43,27 +42,28 @@ @implementation UIEditBoxImplIOS_objc
 + (void)initialize
 {
     [super initialize];
-    
+
     LoadUITextViewCCUITextInputCategory();
     LoadUITextFieldCCUITextInputCategory();
 }
 
 #pragma mark - Init & Dealloc
 
-- (instancetype)initWithFrame:(CGRect)frameRect editBox:(void *)editBox
+- (instancetype)initWithFrame:(CGRect)frameRect editBox:(void*)editBox
 {
     self = [super init];
-    if (self) {
-        
-        _editState = NO;
-        self.frameRect = frameRect;
-        self.editBox = editBox;
-        self.dataInputMode = cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS;
+    if (self)
+    {
+
+        _editState              = NO;
+        self.frameRect          = frameRect;
+        self.editBox            = editBox;
+        self.dataInputMode      = cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS;
         self.keyboardReturnType = cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT;
-        
+
         [self createMultiLineTextField];
     }
-    
+
     return self;
 }
 
@@ -71,38 +71,39 @@ - (void)dealloc
 {
     // custom setter cleanup
     self.textInput = nil;
-    
+
     [super dealloc];
 }
 
 #pragma mark - Properties
 
-- (void)setTextInput:(UIView<UITextInput,CCUITextInput> *)textInput
+- (void)setTextInput:(UIView<UITextInput, CCUITextInput>*)textInput
 {
-    if (_textInput == textInput) {
+    if (_textInput == textInput)
+    {
         return;
     }
-    
+
     // common init
     textInput.backgroundColor = [UIColor clearColor];
-    textInput.hidden = true;
-    textInput.returnKeyType = UIReturnKeyDefault;
+    textInput.hidden          = true;
+    textInput.returnKeyType   = UIReturnKeyDefault;
     [textInput ccui_setDelegate:self];
-    
+
     // Migrate properties
-    textInput.ccui_textColor = _textInput.ccui_textColor ?: [UIColor whiteColor];
-    textInput.ccui_text = _textInput.ccui_text ?: @"";
+    textInput.ccui_textColor   = _textInput.ccui_textColor ?: [UIColor whiteColor];
+    textInput.ccui_text        = _textInput.ccui_text ?: @"";
     textInput.ccui_placeholder = _textInput.ccui_placeholder ?: @"";
-    textInput.ccui_font = _textInput.ccui_font ?: [UIFont systemFontOfSize:self.frameRect.size.height*2/3];
-    textInput.ccui_placeholderFont = _textInput.ccui_placeholderFont ?: textInput.ccui_font;
+    textInput.ccui_font        = _textInput.ccui_font ?: [UIFont systemFontOfSize:self.frameRect.size.height * 2 / 3];
+    textInput.ccui_placeholderFont      = _textInput.ccui_placeholderFont ?: textInput.ccui_font;
     textInput.ccui_placeholderTextColor = _textInput.ccui_placeholderTextColor ?: [UIColor lightGrayColor];
-    
+
     [_textInput resignFirstResponder];
     [_textInput removeFromSuperview];
     [_textInput release];
-    
+
     _textInput = [textInput retain];
-    
+
     [self setInputFlag:self.dataInputMode];
     [self setReturnType:self.keyboardReturnType];
 }
@@ -111,24 +112,24 @@ - (void)setTextInput:(UIView<UITextInput,CCUITextInput> *)textInput
 
 - (void)createSingleLineTextField
 {
-    CCUISingleLineTextField *textField = [[[CCUISingleLineTextField alloc] initWithFrame:self.frameRect] autorelease];
+    CCUISingleLineTextField* textField = [[[CCUISingleLineTextField alloc] initWithFrame:self.frameRect] autorelease];
     textField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-    textField.borderStyle = UITextBorderStyleNone;
-    
+    textField.borderStyle              = UITextBorderStyleNone;
+
     [textField addTarget:self action:@selector(textChanged:) forControlEvents:UIControlEventEditingChanged];
-    
+
     self.textInput = textField;
 }
 
 - (void)createMultiLineTextField
 {
-    CCUIMultilineTextField *textView = [[[CCUIMultilineTextField alloc] initWithFrame:self.frameRect] autorelease];
-    self.textInput = textView;
+    CCUIMultilineTextField* textView = [[[CCUIMultilineTextField alloc] initWithFrame:self.frameRect] autorelease];
+    self.textInput                   = textView;
 }
 
 #pragma mark - Public methods
 
-- (void)setFont:(UIFont *)font
+- (void)setFont:(UIFont*)font
 {
     self.textInput.ccui_font = font;
 }
@@ -138,53 +139,57 @@ - (void)setTextColor:(UIColor*)color
     self.textInput.ccui_textColor = color;
 }
 
-- (void)setPlaceholderFont:(UIFont *)font
+- (void)setPlaceholderFont:(UIFont*)font
 {
     self.textInput.ccui_placeholderFont = font;
 }
 
-- (void)setPlaceholderTextColor:(UIColor *)color
+- (void)setPlaceholderTextColor:(UIColor*)color
 {
     self.textInput.ccui_placeholderTextColor = color;
 }
 
 - (void)setInputMode:(cocos2d::ui::EditBox::InputMode)inputMode
 {
-    //multiline input
-    if (inputMode == cocos2d::ui::EditBox::InputMode::ANY) {
-        if (![self.textInput isKindOfClass:[UITextView class]]) {
+    // multiline input
+    if (inputMode == cocos2d::ui::EditBox::InputMode::ANY)
+    {
+        if (![self.textInput isKindOfClass:[UITextView class]])
+        {
             [self createMultiLineTextField];
         }
     }
-    else {
-        if (![self.textInput isKindOfClass:[UITextField class]]) {
+    else
+    {
+        if (![self.textInput isKindOfClass:[UITextField class]])
+        {
             [self createSingleLineTextField];
         }
     }
-    
+
     switch (inputMode)
     {
-        case cocos2d::ui::EditBox::InputMode::EMAIL_ADDRESS:
-            self.keyboardType = UIKeyboardTypeEmailAddress;
-            break;
-        case cocos2d::ui::EditBox::InputMode::NUMERIC:
-            self.keyboardType = UIKeyboardTypeDecimalPad;
-            break;
-        case cocos2d::ui::EditBox::InputMode::PHONE_NUMBER:
-            self.keyboardType = UIKeyboardTypePhonePad;
-            break;
-        case cocos2d::ui::EditBox::InputMode::URL:
-            self.keyboardType = UIKeyboardTypeURL;
-            break;
-        case cocos2d::ui::EditBox::InputMode::DECIMAL:
-            self.keyboardType = UIKeyboardTypeDecimalPad;
-            break;
-        case cocos2d::ui::EditBox::InputMode::SINGLE_LINE:
-            self.keyboardType = UIKeyboardTypeDefault;
-            break;
-        default:
-            self.keyboardType = UIKeyboardTypeDefault;
-            break;
+    case cocos2d::ui::EditBox::InputMode::EMAIL_ADDRESS:
+        self.keyboardType = UIKeyboardTypeEmailAddress;
+        break;
+    case cocos2d::ui::EditBox::InputMode::NUMERIC:
+        self.keyboardType = UIKeyboardTypeDecimalPad;
+        break;
+    case cocos2d::ui::EditBox::InputMode::PHONE_NUMBER:
+        self.keyboardType = UIKeyboardTypePhonePad;
+        break;
+    case cocos2d::ui::EditBox::InputMode::URL:
+        self.keyboardType = UIKeyboardTypeURL;
+        break;
+    case cocos2d::ui::EditBox::InputMode::DECIMAL:
+        self.keyboardType = UIKeyboardTypeDecimalPad;
+        break;
+    case cocos2d::ui::EditBox::InputMode::SINGLE_LINE:
+        self.keyboardType = UIKeyboardTypeDefault;
+        break;
+    default:
+        self.keyboardType = UIKeyboardTypeDefault;
+        break;
     }
 }
 
@@ -198,67 +203,68 @@ - (void)setInputFlag:(cocos2d::ui::EditBox::InputFlag)flag
     self.dataInputMode = flag;
     switch (flag)
     {
-        case cocos2d::ui::EditBox::InputFlag::PASSWORD:
-            //textView can't be used for input password
-            self.textInput.ccui_secureTextEntry = YES;
-            break;
-            
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_WORD:
-            self.textInput.autocapitalizationType = UITextAutocapitalizationTypeWords;
-            break;
-            
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
-            self.textInput.autocapitalizationType = UITextAutocapitalizationTypeSentences;
-            break;
-            
-        case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
-            self.textInput.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters;
-            break;
-            
-        case cocos2d::ui::EditBox::InputFlag::SENSITIVE:
-            self.textInput.autocorrectionType = UITextAutocorrectionTypeNo;
-            break;
-            
-        case cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS:
-            self.textInput.autocapitalizationType = UITextAutocapitalizationTypeNone;
-            break;
-            
-        default:
-            break;
+    case cocos2d::ui::EditBox::InputFlag::PASSWORD:
+        // textView can't be used for input password
+        self.textInput.ccui_secureTextEntry = YES;
+        break;
+
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_WORD:
+        self.textInput.autocapitalizationType = UITextAutocapitalizationTypeWords;
+        break;
+
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_SENTENCE:
+        self.textInput.autocapitalizationType = UITextAutocapitalizationTypeSentences;
+        break;
+
+    case cocos2d::ui::EditBox::InputFlag::INITIAL_CAPS_ALL_CHARACTERS:
+        self.textInput.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters;
+        break;
+
+    case cocos2d::ui::EditBox::InputFlag::SENSITIVE:
+        self.textInput.autocorrectionType = UITextAutocorrectionTypeNo;
+        break;
+
+    case cocos2d::ui::EditBox::InputFlag::LOWERCASE_ALL_CHARACTERS:
+        self.textInput.autocapitalizationType = UITextAutocapitalizationTypeNone;
+        break;
+
+    default:
+        break;
     }
 }
 
 - (void)setReturnType:(cocos2d::ui::EditBox::KeyboardReturnType)returnType
 {
     self.keyboardReturnType = returnType;
-    switch (returnType) {
-        case cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT:
-            self.textInput.returnKeyType = UIReturnKeyDefault;
-            break;
-            
-        case cocos2d::ui::EditBox::KeyboardReturnType::DONE:
-            self.textInput.returnKeyType = UIReturnKeyDone;
-            break;
-            
-        case cocos2d::ui::EditBox::KeyboardReturnType::SEND:
-            self.textInput.returnKeyType = UIReturnKeySend;
-            break;
-            
-        case cocos2d::ui::EditBox::KeyboardReturnType::SEARCH:
-            self.textInput.returnKeyType = UIReturnKeySearch;
-            break;
-            
-        case cocos2d::ui::EditBox::KeyboardReturnType::GO:
-            self.textInput.returnKeyType = UIReturnKeyGo;
-            break;
-            
-        case cocos2d::ui::EditBox::KeyboardReturnType::NEXT:
-            self.textInput.returnKeyType = UIReturnKeyNext;
-            break;
-
-        default:
-            self.textInput.returnKeyType = UIReturnKeyDefault;
-            break;
+    switch (returnType)
+    {
+    case cocos2d::ui::EditBox::KeyboardReturnType::DEFAULT:
+        self.textInput.returnKeyType = UIReturnKeyDefault;
+        break;
+
+    case cocos2d::ui::EditBox::KeyboardReturnType::DONE:
+        self.textInput.returnKeyType = UIReturnKeyDone;
+        break;
+
+    case cocos2d::ui::EditBox::KeyboardReturnType::SEND:
+        self.textInput.returnKeyType = UIReturnKeySend;
+        break;
+
+    case cocos2d::ui::EditBox::KeyboardReturnType::SEARCH:
+        self.textInput.returnKeyType = UIReturnKeySearch;
+        break;
+
+    case cocos2d::ui::EditBox::KeyboardReturnType::GO:
+        self.textInput.returnKeyType = UIReturnKeyGo;
+        break;
+
+    case cocos2d::ui::EditBox::KeyboardReturnType::NEXT:
+        self.textInput.returnKeyType = UIReturnKeyNext;
+        break;
+
+    default:
+        self.textInput.returnKeyType = UIReturnKeyDefault;
+        break;
     }
 }
 
@@ -267,12 +273,12 @@ - (void)setTextHorizontalAlignment:(cocos2d::TextHAlignment)alignment
     self.textInput.ccui_alignment = static_cast<NSTextAlignment>(alignment);
 }
 
-- (void)setText:(NSString *)text
+- (void)setText:(NSString*)text
 {
     self.textInput.ccui_text = text;
 }
 
-- (NSString *)text
+- (NSString*)text
 {
     return self.textInput.ccui_text ?: @"";
 }
@@ -282,7 +288,7 @@ - (void)setVisible:(BOOL)visible
     self.textInput.hidden = !visible;
 }
 
-- (NSString *)getDefaultFontName
+- (NSString*)getDefaultFontName
 {
     return self.textInput.ccui_font.fontName ?: @"";
 }
@@ -290,28 +296,32 @@ - (NSString *)getDefaultFontName
 - (cocos2d::ui::EditBoxDelegate::EditBoxEndAction)getEndAction
 {
     cocos2d::ui::EditBoxDelegate::EditBoxEndAction action = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::UNKNOWN;
-    if (self.returnPressed) {
-        if (self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::NEXT) {
+    if (self.returnPressed)
+    {
+        if (self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::NEXT)
+        {
             action = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::TAB_TO_NEXT;
-        } else if (self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::GO ||
-                   self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::SEND ||
-                   self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::SEARCH) {
+        }
+        else if (self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::GO ||
+                 self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::SEND ||
+                 self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::SEARCH)
+        {
             action = cocos2d::ui::EditBoxDelegate::EditBoxEndAction::RETURN;
         }
     }
     return action;
 }
 
-- (void)setPlaceHolder:(NSString *)text
+- (void)setPlaceHolder:(NSString*)text
 {
     self.textInput.ccui_placeholder = text;
 }
 
 - (void)doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance
 {
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *)view->getEAGLView();
-    
+    auto view            = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)view->getEAGLView();
+
     [eaglview doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
 }
 
@@ -319,16 +329,16 @@ - (void)updateFrame:(CGRect)rect
 {
     CGRect frame = self.textInput.frame;
     frame.origin = rect.origin;
-    frame.size = rect.size;
-    
+    frame.size   = rect.size;
+
     self.textInput.frame = frame;
 }
 
 - (void)openKeyboard
 {
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *)view->getEAGLView();
-    
+    auto view            = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)view->getEAGLView();
+
     [eaglview addSubview:self.textInput];
     [self.textInput becomeFirstResponder];
 }
@@ -339,9 +349,10 @@ - (void)closeKeyboard
     [self.textInput removeFromSuperview];
 }
 
-- (BOOL)textFieldShouldReturn:(UITextField *)sender
+- (BOOL)textFieldShouldReturn:(UITextField*)sender
 {
-    if (sender == self.textInput) {
+    if (sender == self.textInput)
+    {
         self.returnPressed = YES;
         [sender resignFirstResponder];
     }
@@ -350,32 +361,33 @@ - (BOOL)textFieldShouldReturn:(UITextField *)sender
 
 - (void)animationSelector
 {
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *)view->getEAGLView();
-    
+    auto view            = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)view->getEAGLView();
+
     [eaglview doAnimationWhenAnotherEditBeClicked];
 }
 
 #pragma mark - UITextView delegate methods
 
-- (BOOL)textViewShouldBeginEditing:(UITextView *)textView
+- (BOOL)textViewShouldBeginEditing:(UITextView*)textView
 {
     CCLOG("textFieldShouldBeginEditing...");
-    _editState = YES;
+    _editState     = YES;
     _returnPressed = NO;
-    
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *) view->getEAGLView();
-    
-    if ([eaglview isKeyboardShown]) {
+
+    auto view            = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)view->getEAGLView();
+
+    if ([eaglview isKeyboardShown])
+    {
         [self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];
     }
-    
+
     getEditBoxImplIOS()->editBoxEditingDidBegin();
     return YES;
 }
 
-- (BOOL)textViewShouldEndEditing:(UITextView *)textView
+- (BOOL)textViewShouldEndEditing:(UITextView*)textView
 {
     CCLOG("textFieldShouldEndEditing...");
     _editState = NO;
@@ -383,94 +395,99 @@ - (BOOL)textViewShouldEndEditing:(UITextView *)textView
 
     const char* inputText = [textView.text UTF8String];
     getEditBoxImplIOS()->editBoxEditingDidEnd(inputText, [self getEndAction]);
-    
+
     return YES;
 }
 
-- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
+- (BOOL)textView:(UITextView*)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString*)text
 {
-    if ( self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::DONE &&
-        [text isEqualToString: @"\n"] )
+    if (self.keyboardReturnType == cocos2d::ui::EditBox::KeyboardReturnType::DONE && [text isEqualToString:@"\n"])
     {
         [self closeKeyboard];
     }
-    
+
     int maxLength = getEditBoxImplIOS()->getMaxLength();
     if (maxLength < 0)
     {
         return YES;
     }
-    
-    // Prevent crashing undo bug http://stackoverflow.com/questions/433337/set-the-maximum-character-length-of-a-uitextfield
-    if (range.length + range.location > textView.text.length) {
+
+    // Prevent crashing undo bug
+    // http://stackoverflow.com/questions/433337/set-the-maximum-character-length-of-a-uitextfield
+    if (range.length + range.location > textView.text.length)
+    {
         return NO;
     }
-    
-    NSUInteger oldLength = textView.text.length;
+
+    NSUInteger oldLength         = textView.text.length;
     NSUInteger replacementLength = text.length;
-    NSUInteger rangeLength = range.length;
-    
+    NSUInteger rangeLength       = range.length;
+
     NSUInteger newLength = oldLength - rangeLength + replacementLength;
-    
+
     return newLength <= maxLength;
 }
 
-- (void)textViewDidChange:(UITextView *)textView
+- (void)textViewDidChange:(UITextView*)textView
 {
     int maxLength = getEditBoxImplIOS()->getMaxLength();
-    if (textView.markedTextRange == nil) {
-        if (textView.text.length > maxLength) {
+    if (textView.markedTextRange == nil)
+    {
+        if (textView.text.length > maxLength)
+        {
             textView.text = [textView.text substringToIndex:maxLength];
         }
-        
+
         const char* inputText = [textView.text UTF8String];
         getEditBoxImplIOS()->editBoxEditingChanged(inputText);
     }
 }
 
-
 #pragma mark - UITextField delegate methods
 /**
  * Called each time when the text field's text has changed.
  */
-- (void)textChanged:(UITextField *)textField
+- (void)textChanged:(UITextField*)textField
 {
     int maxLength = getEditBoxImplIOS()->getMaxLength();
-    if (textField.markedTextRange == nil) {
-        if (textField.text.length > maxLength) {
+    if (textField.markedTextRange == nil)
+    {
+        if (textField.text.length > maxLength)
+        {
             textField.text = [textField.text substringToIndex:maxLength];
         }
-        
+
         const char* inputText = [textField.text UTF8String];
         getEditBoxImplIOS()->editBoxEditingChanged(inputText);
     }
 }
 
-- (BOOL)textFieldShouldBeginEditing:(UITextField *)sender        // return NO to disallow editing.
+- (BOOL)textFieldShouldBeginEditing:(UITextField*)sender  // return NO to disallow editing.
 {
     CCLOG("textFieldShouldBeginEditing...");
-    _editState = YES;
+    _editState     = YES;
     _returnPressed = NO;
-    
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    CCEAGLView *eaglview = (CCEAGLView *)view->getEAGLView();
-    
-    if ([eaglview isKeyboardShown]) {
+
+    auto view            = cocos2d::Director::getInstance()->getOpenGLView();
+    CCEAGLView* eaglview = (CCEAGLView*)view->getEAGLView();
+
+    if ([eaglview isKeyboardShown])
+    {
         [self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];
     }
-    
+
     getEditBoxImplIOS()->editBoxEditingDidBegin();
     return YES;
 }
 
-- (BOOL)textFieldShouldEndEditing:(UITextField *)sender
+- (BOOL)textFieldShouldEndEditing:(UITextField*)sender
 {
     CCLOG("textFieldShouldEndEditing...");
-    _editState = NO;
+    _editState            = NO;
     const char* inputText = [sender.text UTF8String];
 
     getEditBoxImplIOS()->editBoxEditingDidEnd(inputText, [self getEndAction]);
-    
+
     return YES;
 }
 
@@ -481,24 +498,29 @@ - (BOOL)textFieldShouldEndEditing:(UITextField *)sender
  * @param string The replacement string.
  * @return YES if the specified text range should be replaced; otherwise, NO to keep the old text.
  */
-- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+- (BOOL)textField:(UITextField*)textField
+    shouldChangeCharactersInRange:(NSRange)range
+                replacementString:(NSString*)string
 {
     int maxLength = getEditBoxImplIOS()->getMaxLength();
-    if (maxLength < 0) {
+    if (maxLength < 0)
+    {
         return YES;
     }
-    
-    // Prevent crashing undo bug http://stackoverflow.com/questions/433337/set-the-maximum-character-length-of-a-uitextfield
-    if (range.length + range.location > textField.text.length) {
+
+    // Prevent crashing undo bug
+    // http://stackoverflow.com/questions/433337/set-the-maximum-character-length-of-a-uitextfield
+    if (range.length + range.location > textField.text.length)
+    {
         return NO;
     }
-    
-    NSUInteger oldLength = textField.text.length;
+
+    NSUInteger oldLength         = textField.text.length;
     NSUInteger replacementLength = string.length;
-    NSUInteger rangeLength = range.length;
-    
+    NSUInteger rangeLength       = range.length;
+
     NSUInteger newLength = oldLength - rangeLength + replacementLength;
-    
+
     return newLength <= maxLength;
 }
 
diff --git a/cocos/ui/UIEditBox/iOS/CCUIMultilineTextField.mm b/cocos/ui/UIEditBox/iOS/CCUIMultilineTextField.mm
index 0f84f752dc9c..d574b8269b4f 100644
--- a/cocos/ui/UIEditBox/iOS/CCUIMultilineTextField.mm
+++ b/cocos/ui/UIEditBox/iOS/CCUIMultilineTextField.mm
@@ -3,19 +3,19 @@
  Copyright (c) 2012 James Chen
  Copyright (c) 2015 Mazyad Alabduljaleel
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,6 @@ of this software and associated documentation files (the "Software"), to deal
  */
 CGFloat const UI_PLACEHOLDER_TEXT_CHANGED_ANIMATION_DURATION = 0.25;
 
-
 @implementation CCUIMultilineTextField
 
 #pragma mark - Init & Dealloc
@@ -42,8 +41,9 @@ @implementation CCUIMultilineTextField
 - (instancetype)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
-    if (self) {
-        
+    if (self)
+    {
+
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(textChanged:)
                                                      name:UITextViewTextDidChangeNotification
@@ -55,51 +55,50 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    
+
     [_placeHolderLabel release];
-    
+
     [super dealloc];
 }
 
 #pragma mark - Properties
 
-- (NSString *)placeholder
+- (NSString*)placeholder
 {
     return self.placeHolderLabel.text;
 }
 
-- (void)setPlaceholder:(NSString *)placeholder
+- (void)setPlaceholder:(NSString*)placeholder
 {
     self.placeHolderLabel.text = placeholder;
     [self.placeHolderLabel sizeToFit];
 }
 
-- (void)setText:(NSString *)text
+- (void)setText:(NSString*)text
 {
     [super setText:text];
     [self textChanged:nil];
 }
 
-- (UILabel *)placeHolderLabel
+- (UILabel*)placeHolderLabel
 {
-    if (_placeHolderLabel == nil) {
-        auto glview = cocos2d::Director::getInstance()->getOpenGLView();
+    if (_placeHolderLabel == nil)
+    {
+        auto glview   = cocos2d::Director::getInstance()->getOpenGLView();
         float padding = CC_EDIT_BOX_PADDING * glview->getScaleX() / glview->getContentScaleFactor();
 
-        _placeHolderLabel = [[UILabel alloc] initWithFrame:CGRectMake(padding,
-                                                                      padding,
-                                                                      self.bounds.size.width - padding * 2,
-                                                                      0)];
-        _placeHolderLabel.lineBreakMode = NSLineBreakByWordWrapping;
-        _placeHolderLabel.numberOfLines = 0;
-        _placeHolderLabel.font = self.font;
+        _placeHolderLabel =
+            [[UILabel alloc] initWithFrame:CGRectMake(padding, padding, self.bounds.size.width - padding * 2, 0)];
+        _placeHolderLabel.lineBreakMode   = NSLineBreakByWordWrapping;
+        _placeHolderLabel.numberOfLines   = 0;
+        _placeHolderLabel.font            = self.font;
         _placeHolderLabel.backgroundColor = [UIColor clearColor];
-        _placeHolderLabel.textColor = [UIColor lightGrayColor];
-        _placeHolderLabel.alpha = 0;
-        
+        _placeHolderLabel.textColor       = [UIColor lightGrayColor];
+        _placeHolderLabel.alpha           = 0;
+
         [self addSubview:_placeHolderLabel];
     }
-    
+
     return _placeHolderLabel;
 }
 
@@ -108,7 +107,7 @@ - (UILabel *)placeHolderLabel
 - (CGRect)textRectForBounds:(CGRect)bounds
 {
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-    
+
     float padding = CC_EDIT_BOX_PADDING * glview->getScaleX() / glview->getContentScaleFactor();
     return CGRectInset(bounds, padding, padding);
 }
@@ -121,34 +120,37 @@ - (CGRect)editingRectForBounds:(CGRect)bounds
 - (void)layoutSubviews
 {
     [super layoutSubviews];
-    
-    if (self.placeholder.length > 0) {
+
+    if (self.placeholder.length > 0)
+    {
         [self sendSubviewToBack:self.placeHolderLabel];
     }
 }
 
 - (void)drawRect:(CGRect)rect
 {
-    if (self.text.length == 0 && self.placeholder.length > 0) {
+    if (self.text.length == 0 && self.placeholder.length > 0)
+    {
         self.placeHolderLabel.alpha = 1;
     }
-    
+
     [super drawRect:rect];
 }
 
 #pragma mark - NSNotification Observers
 
-- (void)textChanged:(NSNotification *)notification
+- (void)textChanged:(NSNotification*)notification
 {
-    if (self.placeholder.length == 0) {
+    if (self.placeholder.length == 0)
+    {
         return;
     }
-    
-    [UIView animateWithDuration:UI_PLACEHOLDER_TEXT_CHANGED_ANIMATION_DURATION animations:^{
-        
-        CGFloat alpha = (self.text.length == 0 ? 1 : 0);
-        self.placeHolderLabel.alpha = alpha;
-    }];
+
+    [UIView animateWithDuration:UI_PLACEHOLDER_TEXT_CHANGED_ANIMATION_DURATION
+                     animations:^{
+                       CGFloat alpha               = (self.text.length == 0 ? 1 : 0);
+                       self.placeHolderLabel.alpha = alpha;
+                     }];
 }
 
 @end
diff --git a/cocos/ui/UIEditBox/iOS/CCUISingleLineTextField.mm b/cocos/ui/UIEditBox/iOS/CCUISingleLineTextField.mm
index 2c4b28e624cb..6a4e1b3f3c4c 100644
--- a/cocos/ui/UIEditBox/iOS/CCUISingleLineTextField.mm
+++ b/cocos/ui/UIEditBox/iOS/CCUISingleLineTextField.mm
@@ -3,19 +3,19 @@
  Copyright (c) 2012 James Chen
  Copyright (c) 2015 Mazyad Alabduljaleel
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,6 @@ of this software and associated documentation files (the "Software"), to deal
  * http://stackoverflow.com/questions/18244790/changing-uitextfield-placeholder-font
  */
 
-
 @implementation CCUISingleLineTextField
 
 #pragma mark - Init & Dealloc
@@ -49,29 +48,28 @@ - (void)dealloc
 
 #pragma mark - Properties
 
-- (UIColor *)placeholderTextColor
+- (UIColor*)placeholderTextColor
 {
     return _placeholderTextColor;
 }
 
-- (UIFont *)placeholderFont
+- (UIFont*)placeholderFont
 {
     return _placeholderFont;
 }
 
 #pragma mark - Public methods
 
-- (void)drawPlaceholderInRect:(CGRect)rect {
-	NSDictionary *attributes = @{
-		NSForegroundColorAttributeName:_placeholderTextColor,
-		NSFontAttributeName:_placeholderFont
-	};
-    
+- (void)drawPlaceholderInRect:(CGRect)rect
+{
+    NSDictionary* attributes =
+        @{NSForegroundColorAttributeName : _placeholderTextColor, NSFontAttributeName : _placeholderFont};
+
     // center vertically
     CGSize textSize = [self.placeholder sizeWithAttributes:attributes];
-    CGFloat hdif = rect.size.height - textSize.height;
-    hdif = MAX(0, hdif);
-    rect.origin.y += ceil(hdif/2.0);
+    CGFloat hdif    = rect.size.height - textSize.height;
+    hdif            = MAX(0, hdif);
+    rect.origin.y += ceil(hdif / 2.0);
 
     [[self placeholder] drawInRect:rect withAttributes:attributes];
 }
@@ -79,7 +77,7 @@ - (void)drawPlaceholderInRect:(CGRect)rect {
 - (CGRect)textRectForBounds:(CGRect)bounds
 {
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
-    
+
     float padding = CC_EDIT_BOX_PADDING * glview->getScaleX() / glview->getContentScaleFactor();
     return CGRectInset(bounds, padding, padding);
 }
diff --git a/cocos/ui/UIEditBox/iOS/UITextField+CCUITextInput.mm b/cocos/ui/UIEditBox/iOS/UITextField+CCUITextInput.mm
index 07fdd0a955c7..77f51f2a3c9d 100644
--- a/cocos/ui/UIEditBox/iOS/UITextField+CCUITextInput.mm
+++ b/cocos/ui/UIEditBox/iOS/UITextField+CCUITextInput.mm
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2015 Mazyad Alabduljaleel
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,86 +27,90 @@ of this software and associated documentation files (the "Software"), to deal
 
 @implementation UITextField (CCUITextInput)
 
-- (NSString *)ccui_text
+- (NSString*)ccui_text
 {
     return self.text;
 }
 
-- (void)ccui_setText:(NSString *)ccui_text
+- (void)ccui_setText:(NSString*)ccui_text
 {
     self.text = ccui_text;
 }
 
-- (NSString *)ccui_placeholder
+- (NSString*)ccui_placeholder
 {
     return self.placeholder;
 }
 
-- (void)ccui_setPlaceholder:(NSString *)ccui_placeholder
+- (void)ccui_setPlaceholder:(NSString*)ccui_placeholder
 {
     self.placeholder = ccui_placeholder;
 }
 
-- (UIColor *)ccui_textColor
+- (UIColor*)ccui_textColor
 {
     return self.textColor;
 }
 
-- (void)ccui_setTextColor:(UIColor *)ccui_textColor
+- (void)ccui_setTextColor:(UIColor*)ccui_textColor
 {
     self.textColor = ccui_textColor;
 }
 
-- (UIFont *)ccui_font
+- (UIFont*)ccui_font
 {
     return self.font;
 }
 
-- (void)ccui_setFont:(UIFont *)ccui_font
+- (void)ccui_setFont:(UIFont*)ccui_font
 {
     self.font = ccui_font;
 }
 
 - (NSTextAlignment)ccui_alignment
 {
-  return self.textAlignment;
+    return self.textAlignment;
 }
 
 - (void)ccui_setTextHorizontalAlignment:(NSTextAlignment)ccui_alignment
 {
-  self.textAlignment = ccui_alignment;
+    self.textAlignment = ccui_alignment;
 }
 
-- (UIColor *)ccui_placeholderTextColor
+- (UIColor*)ccui_placeholderTextColor
 {
     SEL selector = NSSelectorFromString(@"placeholderTextColor");
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         return [self performSelector:selector];
     }
     return nil;
 }
 
-- (void)ccui_setPlaceholderTextColor:(UIColor *)ccui_placeholderTextColor
+- (void)ccui_setPlaceholderTextColor:(UIColor*)ccui_placeholderTextColor
 {
     SEL selector = NSSelectorFromString(@"setPlaceholderTextColor:");
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         [self performSelector:selector withObject:ccui_placeholderTextColor];
     }
 }
 
-- (UIFont *)ccui_placeholderFont
+- (UIFont*)ccui_placeholderFont
 {
     SEL selector = NSSelectorFromString(@"placeholderFont");
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         return [self performSelector:selector];
     }
     return nil;
 }
 
-- (void)ccui_setPlaceholderFont:(UIFont *)ccui_placeholderFont
+- (void)ccui_setPlaceholderFont:(UIFont*)ccui_placeholderFont
 {
     SEL selector = NSSelectorFromString(@"setPlaceholderFont:");
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         [self performSelector:selector withObject:ccui_placeholderFont];
     }
 }
@@ -121,14 +125,14 @@ - (void)ccui_setSecureTextEntry:(BOOL)ccui_secureTextEntry
     self.secureTextEntry = ccui_secureTextEntry;
 }
 
-- (void)ccui_setDelegate:(id<UITextFieldDelegate,UITextViewDelegate>)delegate
+- (void)ccui_setDelegate:(id<UITextFieldDelegate, UITextViewDelegate>)delegate
 {
     self.delegate = delegate;
 }
 
 @end
 
-
-void LoadUITextFieldCCUITextInputCategory() {
+void LoadUITextFieldCCUITextInputCategory()
+{
     // noop
 }
diff --git a/cocos/ui/UIEditBox/iOS/UITextView+CCUITextInput.mm b/cocos/ui/UIEditBox/iOS/UITextView+CCUITextInput.mm
index 04fc84d87f4e..94ce69956aed 100644
--- a/cocos/ui/UIEditBox/iOS/UITextView+CCUITextInput.mm
+++ b/cocos/ui/UIEditBox/iOS/UITextView+CCUITextInput.mm
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2015 Mazyad Alabduljaleel
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,52 +25,53 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "ui/UIEditBox/iOS/UITextView+CCUITextInput.h"
 
-
 @implementation UITextView (CCUITextInput)
 
-- (NSString *)ccui_text
+- (NSString*)ccui_text
 {
     return self.text;
 }
 
-- (void)ccui_setText:(NSString *)ccui_text
+- (void)ccui_setText:(NSString*)ccui_text
 {
     self.text = ccui_text;
 }
 
-- (NSString *)ccui_placeholder
+- (NSString*)ccui_placeholder
 {
     SEL selector = @selector(placeholder);
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         return [self performSelector:selector];
     }
     return nil;
 }
 
-- (void)ccui_setPlaceholder:(NSString *)ccui_placeholder
+- (void)ccui_setPlaceholder:(NSString*)ccui_placeholder
 {
     SEL selector = @selector(setPlaceholder:);
-    if ([self respondsToSelector:selector]) {
+    if ([self respondsToSelector:selector])
+    {
         [self performSelector:selector withObject:ccui_placeholder];
     }
 }
 
-- (UIColor *)ccui_textColor
+- (UIColor*)ccui_textColor
 {
     return self.textColor;
 }
 
-- (void)ccui_setTextColor:(UIColor *)ccui_textColor
+- (void)ccui_setTextColor:(UIColor*)ccui_textColor
 {
     self.textColor = ccui_textColor;
 }
 
-- (UIFont *)ccui_font
+- (UIFont*)ccui_font
 {
     return self.font;
 }
 
-- (void)ccui_setFont:(UIFont *)ccui_font
+- (void)ccui_setFont:(UIFont*)ccui_font
 {
     self.font = ccui_font;
 }
@@ -85,37 +86,41 @@ - (void)ccui_setTextHorizontalAlignment:(NSTextAlignment)ccui_alignment
     self.textAlignment = ccui_alignment;
 }
 
-- (UIColor *)ccui_placeholderTextColor
+- (UIColor*)ccui_placeholderTextColor
 {
     SEL selector = NSSelectorFromString(@"placeHolderLabel");
-    if ([self respondsToSelector:selector]) {
-        return ((UILabel *)[self performSelector:selector]).textColor;
+    if ([self respondsToSelector:selector])
+    {
+        return ((UILabel*)[self performSelector:selector]).textColor;
     }
     return nil;
 }
 
-- (void)ccui_setPlaceholderTextColor:(UIColor *)ccui_placeholderTextColor
+- (void)ccui_setPlaceholderTextColor:(UIColor*)ccui_placeholderTextColor
 {
     SEL selector = NSSelectorFromString(@"placeHolderLabel");
-    if ([self respondsToSelector:selector]) {
-        ((UILabel *)[self performSelector:selector]).textColor = ccui_placeholderTextColor;
+    if ([self respondsToSelector:selector])
+    {
+        ((UILabel*)[self performSelector:selector]).textColor = ccui_placeholderTextColor;
     }
 }
 
-- (UIFont *)ccui_placeholderFont
+- (UIFont*)ccui_placeholderFont
 {
     SEL selector = NSSelectorFromString(@"placeHolderLabel");
-    if ([self respondsToSelector:selector]) {
-        return ((UILabel *)[self performSelector:selector]).font;
+    if ([self respondsToSelector:selector])
+    {
+        return ((UILabel*)[self performSelector:selector]).font;
     }
     return nil;
 }
 
-- (void)ccui_setPlaceholderFont:(UIFont *)ccui_placeholderFont
+- (void)ccui_setPlaceholderFont:(UIFont*)ccui_placeholderFont
 {
     SEL selector = NSSelectorFromString(@"placeHolderLabel");
-    if ([self respondsToSelector:selector]) {
-        ((UILabel *)[self performSelector:selector]).font = ccui_placeholderFont;
+    if ([self respondsToSelector:selector])
+    {
+        ((UILabel*)[self performSelector:selector]).font = ccui_placeholderFont;
     }
 }
 
@@ -129,14 +134,11 @@ - (void)ccui_setSecureTextEntry:(BOOL)ccui_secureTextEntry
     self.secureTextEntry = ccui_secureTextEntry;
 }
 
-- (void)ccui_setDelegate:(id<UITextFieldDelegate,UITextViewDelegate>)delegate
+- (void)ccui_setDelegate:(id<UITextFieldDelegate, UITextViewDelegate>)delegate
 {
     self.delegate = delegate;
 }
 
 @end
 
-
-void LoadUITextViewCCUITextInputCategory() {
-    
-}
+void LoadUITextViewCCUITextInputCategory() {}
diff --git a/cocos/ui/UIHelper.cpp b/cocos/ui/UIHelper.cpp
index 60f3a98ebbc1..eaa645c707b7 100644
--- a/cocos/ui/UIHelper.cpp
+++ b/cocos/ui/UIHelper.cpp
@@ -63,7 +63,7 @@ Widget* Helper::seekWidgetByTag(Widget* root, int tag)
     return nullptr;
 }
 
-Widget* Helper::seekWidgetByName(Widget* root, const std::string& name)
+Widget* Helper::seekWidgetByName(Widget* root, std::string_view name)
 {
     if (!root)
     {
@@ -116,25 +116,25 @@ Widget* Helper::seekActionWidgetByActionTag(Widget* root, int tag)
     return nullptr;
 }
 
-std::string Helper::getSubStringOfUTF8String(const std::string& str,
+std::string Helper::getSubStringOfUTF8String(std::string_view str,
                                              std::string::size_type start,
                                              std::string::size_type length)
 {
     std::u32string utf32;
     if (!StringUtils::UTF8ToUTF32(str, utf32))
     {
-        CCLOGERROR("Can't convert string to UTF-32: %s", str.c_str());
+        CCLOGERROR("Can't convert string to UTF-32: %s", str.data());
         return "";
     }
     if (utf32.size() < start)
     {
-        CCLOGERROR("'start' is out of range: %d, %s", static_cast<int32_t>(start), str.c_str());
+        CCLOGERROR("'start' is out of range: %d, %s", static_cast<int32_t>(start), str.data());
         return "";
     }
     std::string result;
     if (!StringUtils::UTF32ToUTF8(utf32.substr(start, length), result))
     {
-        CCLOGERROR("Can't convert internal UTF-32 string to UTF-8: %s", str.c_str());
+        CCLOGERROR("Can't convert internal UTF-32 string to UTF-8: %s", str.data());
         return "";
     }
     return result;
diff --git a/cocos/ui/UIHelper.h b/cocos/ui/UIHelper.h
index 9f833bef1884..9d49b129c7b8 100644
--- a/cocos/ui/UIHelper.h
+++ b/cocos/ui/UIHelper.h
@@ -66,7 +66,7 @@ class CC_GUI_DLL Helper
      * @param name      The widget name.
      * @return Widget instance pointer.
      */
-    static Widget* seekWidgetByName(Widget* root, const std::string& name);
+    static Widget* seekWidgetByName(Widget* root, std::string_view name);
 
     /**
      * Find a widget with a specific action tag from root widget
@@ -87,7 +87,7 @@ class CC_GUI_DLL Helper
      * @return a UTF8 substring
      * @js NA
      */
-    static std::string getSubStringOfUTF8String(const std::string& str,
+    static std::string getSubStringOfUTF8String(std::string_view str,
                                                 std::string::size_type start,
                                                 std::string::size_type length);
 
diff --git a/cocos/ui/UIImageView.cpp b/cocos/ui/UIImageView.cpp
index da9ed8c515d1..ffa039153654 100644
--- a/cocos/ui/UIImageView.cpp
+++ b/cocos/ui/UIImageView.cpp
@@ -50,7 +50,7 @@ ImageView::ImageView()
 
 ImageView::~ImageView() {}
 
-ImageView* ImageView::create(const std::string& imageFileName, TextureResType texType)
+ImageView* ImageView::create(std::string_view imageFileName, TextureResType texType)
 {
     ImageView* widget = new ImageView();
     if (widget->init(imageFileName, texType))
@@ -89,7 +89,7 @@ bool ImageView::init()
     return ret;
 }
 
-bool ImageView::init(const std::string& imageFileName, TextureResType texType)
+bool ImageView::init(std::string_view imageFileName, TextureResType texType)
 {
     bool bRet = true;
     do
@@ -113,7 +113,7 @@ void ImageView::initRenderer()
     addProtectedChild(_imageRenderer, IMAGE_RENDERER_Z, -1);
 }
 
-void ImageView::loadTexture(const std::string& fileName, TextureResType texType)
+void ImageView::loadTexture(std::string_view fileName, TextureResType texType)
 {
     if (fileName.empty())
     {
diff --git a/cocos/ui/UIImageView.h b/cocos/ui/UIImageView.h
index 525cdd2195a3..5fbb2cbde5fd 100644
--- a/cocos/ui/UIImageView.h
+++ b/cocos/ui/UIImageView.h
@@ -75,7 +75,7 @@ class CC_GUI_DLL ImageView : public Widget, public cocos2d::BlendProtocol
      * @param texType    @see `Widget::TextureResType`
      * @return A ImageView instance.
      */
-    static ImageView* create(const std::string& imageFileName, TextureResType texType = TextureResType::LOCAL);
+    static ImageView* create(std::string_view imageFileName, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Load texture for imageview.
@@ -83,7 +83,7 @@ class CC_GUI_DLL ImageView : public Widget, public cocos2d::BlendProtocol
      * @param fileName   file name of texture.
      * @param texType    @see `Widget::TextureResType`
      */
-    void loadTexture(const std::string& fileName, TextureResType texType = TextureResType::LOCAL);
+    void loadTexture(std::string_view fileName, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Updates the texture rect of the ImageView in points.
@@ -150,7 +150,7 @@ class CC_GUI_DLL ImageView : public Widget, public cocos2d::BlendProtocol
         // initializes state of widget.
         virtual bool
         init() override;
-    virtual bool init(const std::string& imageFileName, TextureResType texType = TextureResType::LOCAL);
+    virtual bool init(std::string_view imageFileName, TextureResType texType = TextureResType::LOCAL);
 
 protected:
     virtual void initRenderer() override;
diff --git a/cocos/ui/UILayout.cpp b/cocos/ui/UILayout.cpp
index d3c914d1ebcb..a8444a5d644f 100644
--- a/cocos/ui/UILayout.cpp
+++ b/cocos/ui/UILayout.cpp
@@ -166,7 +166,7 @@ void Layout::addChild(Node* child, int zOrder, int tag)
     _doLayoutDirty = true;
 }
 
-void Layout::addChild(Node* child, int zOrder, const std::string& name)
+void Layout::addChild(Node* child, int zOrder, std::string_view name)
 {
     if (dynamic_cast<Widget*>(child))
     {
@@ -566,7 +566,7 @@ bool Layout::isBackGroundImageScale9Enabled() const
     return _backGroundScale9Enabled;
 }
 
-void Layout::setBackGroundImage(const std::string& fileName, TextureResType texType)
+void Layout::setBackGroundImage(std::string_view fileName, TextureResType texType)
 {
     if (fileName.empty())
     {
diff --git a/cocos/ui/UILayout.h b/cocos/ui/UILayout.h
index 33c8903a3da9..d1dba4fbceff 100644
--- a/cocos/ui/UILayout.h
+++ b/cocos/ui/UILayout.h
@@ -171,7 +171,7 @@ class CC_GUI_DLL Layout : public Widget, public LayoutProtocol
      * @param fileName image file path.
      * @param texType @see TextureResType.
      */
-    void setBackGroundImage(const std::string& fileName, TextureResType texType = TextureResType::LOCAL);
+    void setBackGroundImage(std::string_view fileName, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Sets a background image capinsets for layout, it only affects the scale9 enabled background image
@@ -371,7 +371,7 @@ class CC_GUI_DLL Layout : public Widget, public LayoutProtocol
      * @param tag       A integer to identify the node easily. Please refer to setTag(int)
      */
     virtual void addChild(Node* child, int localZOrder, int tag) override;
-    virtual void addChild(Node* child, int localZOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int localZOrder, std::string_view name) override;
 
     virtual void visit(Renderer* renderer, const Mat4& parentTransform, uint32_t parentFlags) override;
 
diff --git a/cocos/ui/UILayoutManager.cpp b/cocos/ui/UILayoutManager.cpp
index 6c40796bae3d..7213065df7da 100644
--- a/cocos/ui/UILayoutManager.cpp
+++ b/cocos/ui/UILayoutManager.cpp
@@ -236,7 +236,7 @@ Widget* RelativeLayoutManager::getRelativeWidget(Widget* widget)
 {
     Widget* relativeWidget                   = nullptr;
     RelativeLayoutParameter* layoutParameter = dynamic_cast<RelativeLayoutParameter*>(widget->getLayoutParameter());
-    const std::string relativeName           = layoutParameter->getRelativeToWidgetName();
+    auto relativeName                        = layoutParameter->getRelativeToWidgetName();
 
     if (!relativeName.empty())
     {
diff --git a/cocos/ui/UILayoutParameter.cpp b/cocos/ui/UILayoutParameter.cpp
index 0bf409a4dc1f..d80d751a16ed 100644
--- a/cocos/ui/UILayoutParameter.cpp
+++ b/cocos/ui/UILayoutParameter.cpp
@@ -146,22 +146,22 @@ RelativeLayoutParameter::RelativeAlign RelativeLayoutParameter::getAlign() const
     return _relativeAlign;
 }
 
-void RelativeLayoutParameter::setRelativeToWidgetName(const std::string& name)
+void RelativeLayoutParameter::setRelativeToWidgetName(std::string_view name)
 {
     _relativeWidgetName = name;
 }
 
-const std::string& RelativeLayoutParameter::getRelativeToWidgetName() const
+std::string_view RelativeLayoutParameter::getRelativeToWidgetName() const
 {
     return _relativeWidgetName;
 }
 
-void RelativeLayoutParameter::setRelativeName(const std::string& name)
+void RelativeLayoutParameter::setRelativeName(std::string_view name)
 {
     _relativeLayoutName = name;
 }
 
-const std::string& RelativeLayoutParameter::getRelativeName() const
+std::string_view RelativeLayoutParameter::getRelativeName() const
 {
     return _relativeLayoutName;
 }
diff --git a/cocos/ui/UILayoutParameter.h b/cocos/ui/UILayoutParameter.h
index 1a2615da8fda..9e6b92a5d816 100644
--- a/cocos/ui/UILayoutParameter.h
+++ b/cocos/ui/UILayoutParameter.h
@@ -363,27 +363,27 @@ class CC_GUI_DLL RelativeLayoutParameter : public LayoutParameter
      *
      * @param name Relative widget name.
      */
-    void setRelativeToWidgetName(const std::string& name);
+    void setRelativeToWidgetName(std::string_view name);
 
     /**
      * Get the relative widget name.
      * @return name A relative widget name in string.
      */
-    const std::string& getRelativeToWidgetName() const;
+    std::string_view getRelativeToWidgetName() const;
 
     /**
      * Set a name for LayoutParameter in Relative Layout.
      *
      * @param name A string name.
      */
-    void setRelativeName(const std::string& name);
+    void setRelativeName(std::string_view name);
 
     /**
      * Get a name of LayoutParameter in Relative Layout.
      *
      * @return name Relative name in string.
      */
-    const std::string& getRelativeName() const;
+    std::string_view getRelativeName() const;
 
     // override functions.
     virtual LayoutParameter* createCloneInstance() override;
diff --git a/cocos/ui/UIListView.cpp b/cocos/ui/UIListView.cpp
index 32616f2bb58f..68b62f2c1722 100644
--- a/cocos/ui/UIListView.cpp
+++ b/cocos/ui/UIListView.cpp
@@ -292,7 +292,7 @@ void ListView::addChild(cocos2d::Node* child, int zOrder)
     ListView::addChild(child, zOrder, child->getName());
 }
 
-void ListView::addChild(Node* child, int zOrder, const std::string& name)
+void ListView::addChild(Node* child, int zOrder, std::string_view name)
 {
     ScrollView::addChild(child, zOrder, name);
 
diff --git a/cocos/ui/UIListView.h b/cocos/ui/UIListView.h
index b1b54b8e5632..2b961b2a9b77 100644
--- a/cocos/ui/UIListView.h
+++ b/cocos/ui/UIListView.h
@@ -309,7 +309,7 @@ class CC_GUI_DLL ListView : public ScrollView
     virtual void addChild(Node* child) override;
     virtual void addChild(Node* child, int localZOrder) override;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
     virtual void removeAllChildren() override;
     virtual void removeAllChildrenWithCleanup(bool cleanup) override;
     virtual void removeChild(Node* child, bool cleanup = true) override;
diff --git a/cocos/ui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp
index e1a9e518dfb5..b3518941ce98 100644
--- a/cocos/ui/UILoadingBar.cpp
+++ b/cocos/ui/UILoadingBar.cpp
@@ -71,12 +71,12 @@ LoadingBar* LoadingBar::create()
     return nullptr;
 }
 
-LoadingBar* LoadingBar::create(const std::string& textureName, float percentage)
+LoadingBar* LoadingBar::create(std::string_view textureName, float percentage)
 {
     return LoadingBar::create(textureName, TextureResType::LOCAL, percentage);
 }
 
-LoadingBar* LoadingBar::create(const std::string& textureName, TextureResType texType, float percentage)
+LoadingBar* LoadingBar::create(std::string_view textureName, TextureResType texType, float percentage)
 {
     LoadingBar* widget = new LoadingBar;
     if (widget->init())
@@ -125,7 +125,7 @@ LoadingBar::Direction LoadingBar::getDirection() const
     return _direction;
 }
 
-void LoadingBar::loadTexture(const std::string& texture, TextureResType texType)
+void LoadingBar::loadTexture(std::string_view texture, TextureResType texType)
 {
     if (texture.empty())
     {
diff --git a/cocos/ui/UILoadingBar.h b/cocos/ui/UILoadingBar.h
index b83b298db69c..6206bf32f1dc 100644
--- a/cocos/ui/UILoadingBar.h
+++ b/cocos/ui/UILoadingBar.h
@@ -88,7 +88,7 @@ class CC_GUI_DLL LoadingBar : public Widget
      * @param percentage A percentage in float.
      * @return A LoadingBar instance.
      */
-    static LoadingBar* create(const std::string& textureName, float percentage = 0);
+    static LoadingBar* create(std::string_view textureName, float percentage = 0);
 
     /**
      * @brief Create a LoadingBar with a texture name along with its texture type and a predefined progress value.
@@ -98,7 +98,7 @@ class CC_GUI_DLL LoadingBar : public Widget
      * @param percentage A percentage in float, default value is 0.
      * @return A LoadingBar instance.
      */
-    static LoadingBar* create(const std::string& textureName, TextureResType texType, float percentage = 0);
+    static LoadingBar* create(std::string_view textureName, TextureResType texType, float percentage = 0);
 
     /**
      * Change the progress direction of LoadingBar.
@@ -122,7 +122,7 @@ class CC_GUI_DLL LoadingBar : public Widget
      * @param texture   File name of texture.
      * @param texType   Texture resource type,@see TextureResType.
      */
-    void loadTexture(const std::string& texture, TextureResType texType = TextureResType::LOCAL);
+    void loadTexture(std::string_view texture, TextureResType texType = TextureResType::LOCAL);
 
     /**
      * Changes the progress value of LoadingBar.
diff --git a/cocos/ui/UIPageView.cpp b/cocos/ui/UIPageView.cpp
index 06a56f3258f6..b92f56a7b6a4 100644
--- a/cocos/ui/UIPageView.cpp
+++ b/cocos/ui/UIPageView.cpp
@@ -465,7 +465,7 @@ float PageView::getIndicatorIndexNodesScale() const
     return _indicator->getIndexNodesScale();
 }
 
-void PageView::setIndicatorIndexNodesTexture(const std::string& texName, Widget::TextureResType texType)
+void PageView::setIndicatorIndexNodesTexture(std::string_view texName, Widget::TextureResType texType)
 {
     if (_indicator != nullptr)
     {
diff --git a/cocos/ui/UIPageView.h b/cocos/ui/UIPageView.h
index 97d8320ddf37..6325e9561c86 100644
--- a/cocos/ui/UIPageView.h
+++ b/cocos/ui/UIPageView.h
@@ -314,7 +314,7 @@ class CC_GUI_DLL PageView : public ListView
      * @param fileName   File name of texture.
      * @param resType    @see TextureResType .
      */
-    void setIndicatorIndexNodesTexture(const std::string& texName,
+    void setIndicatorIndexNodesTexture(std::string_view texName,
                                        Widget::TextureResType texType = Widget::TextureResType::LOCAL);
 
     /**
diff --git a/cocos/ui/UIPageViewIndicator.cpp b/cocos/ui/UIPageViewIndicator.cpp
index 530df5a82ce2..94590ced01fe 100644
--- a/cocos/ui/UIPageViewIndicator.cpp
+++ b/cocos/ui/UIPageViewIndicator.cpp
@@ -195,7 +195,7 @@ void PageViewIndicator::setIndexNodesScale(float indexNodesScale)
     rearrange();
 }
 
-void PageViewIndicator::setIndexNodesTexture(const std::string& texName, Widget::TextureResType texType)
+void PageViewIndicator::setIndexNodesTexture(std::string_view texName, Widget::TextureResType texType)
 {
     _useDefaultTexture     = false;
     _indexNodesTextureFile = texName;
diff --git a/cocos/ui/UIPageViewIndicator.h b/cocos/ui/UIPageViewIndicator.h
index d498c4cdfdd6..21c0360b04a1 100644
--- a/cocos/ui/UIPageViewIndicator.h
+++ b/cocos/ui/UIPageViewIndicator.h
@@ -74,8 +74,7 @@ class PageViewIndicator : public ProtectedNode
      * @param fileName   File name of texture.
      * @param resType    @see TextureResType .
      */
-    void setIndexNodesTexture(const std::string& texName,
-                              Widget::TextureResType texType = Widget::TextureResType::LOCAL);
+    void setIndexNodesTexture(std::string_view texName, Widget::TextureResType texType = Widget::TextureResType::LOCAL);
 
 protected:
     bool init() override;
diff --git a/cocos/ui/UIRadioButton.cpp b/cocos/ui/UIRadioButton.cpp
index 14d9e639d974..ff1ad49f1dca 100644
--- a/cocos/ui/UIRadioButton.cpp
+++ b/cocos/ui/UIRadioButton.cpp
@@ -52,11 +52,11 @@ RadioButton* RadioButton::create()
     return nullptr;
 }
 
-RadioButton* RadioButton::create(const std::string& backGround,
-                                 const std::string& backGroundSelected,
-                                 const std::string& cross,
-                                 const std::string& backGroundDisabled,
-                                 const std::string& frontCrossDisabled,
+RadioButton* RadioButton::create(std::string_view backGround,
+                                 std::string_view backGroundSelected,
+                                 std::string_view cross,
+                                 std::string_view backGroundDisabled,
+                                 std::string_view frontCrossDisabled,
                                  TextureResType texType)
 {
     RadioButton* pWidget = new RadioButton();
@@ -69,7 +69,7 @@ RadioButton* RadioButton::create(const std::string& backGround,
     return nullptr;
 }
 
-RadioButton* RadioButton::create(const std::string& backGround, const std::string& cross, TextureResType texType)
+RadioButton* RadioButton::create(std::string_view backGround, std::string_view cross, TextureResType texType)
 {
     RadioButton* pWidget = new RadioButton();
     if (pWidget->init(backGround, "", cross, "", "", texType))
diff --git a/cocos/ui/UIRadioButton.h b/cocos/ui/UIRadioButton.h
index 9adb3c83577f..43deb3b92e02 100644
--- a/cocos/ui/UIRadioButton.h
+++ b/cocos/ui/UIRadioButton.h
@@ -98,11 +98,11 @@ class CC_GUI_DLL RadioButton : public AbstractCheckButton
      *
      * @return A RadioButton instance pointer.
      */
-    static RadioButton* create(const std::string& backGround,
-                               const std::string& backGroundSelected,
-                               const std::string& cross,
-                               const std::string& backGroundDisabled,
-                               const std::string& frontCrossDisabled,
+    static RadioButton* create(std::string_view backGround,
+                               std::string_view backGroundSelected,
+                               std::string_view cross,
+                               std::string_view backGroundDisabled,
+                               std::string_view frontCrossDisabled,
                                TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -113,8 +113,8 @@ class CC_GUI_DLL RadioButton : public AbstractCheckButton
      * @param texType  The texture's resource type in `Widget::TextureResType`.
      * @return A RadioButton instance pointer
      */
-    static RadioButton* create(const std::string& backGround,
-                               const std::string& cross,
+    static RadioButton* create(std::string_view backGround,
+                               std::string_view cross,
                                TextureResType texType = TextureResType::LOCAL);
 
     /**
diff --git a/cocos/ui/UIRichText.cpp b/cocos/ui/UIRichText.cpp
index e46456085bba..a65700cc4ea2 100644
--- a/cocos/ui/UIRichText.cpp
+++ b/cocos/ui/UIRichText.cpp
@@ -1,8 +1,9 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2021 Bytedance Inc.
 
- http://www.cocos2d-x.org
+ https://adxeproject.github.io
 
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +52,7 @@ class ListenerComponent : public Component
     static const std::string COMPONENT_NAME; /*!< component name */
 
     static ListenerComponent* create(Node* parent,
-                                     const std::string& url,
+                                     std::string_view url,
                                      const RichText::OpenUrlHandler handleOpenUrl = nullptr)
     {
         auto component = new ListenerComponent(parent, url, std::move(handleOpenUrl));
@@ -59,7 +60,7 @@ class ListenerComponent : public Component
         return component;
     }
 
-    explicit ListenerComponent(Node* parent, const std::string& url, const RichText::OpenUrlHandler handleOpenUrl)
+    explicit ListenerComponent(Node* parent, std::string_view url, const RichText::OpenUrlHandler handleOpenUrl)
         : _parent(parent), _url(url), _handleOpenUrl(std::move(handleOpenUrl))
     {
         setName(ListenerComponent::COMPONENT_NAME);
@@ -124,11 +125,11 @@ void RichElement::setColor(const Color3B& color)
 RichElementText* RichElementText::create(int tag,
                                          const Color3B& color,
                                          uint8_t opacity,
-                                         const std::string& text,
-                                         const std::string& fontName,
+                                         std::string_view text,
+                                         std::string_view fontName,
                                          float fontSize,
                                          uint32_t flags,
-                                         const std::string& url,
+                                         std::string_view url,
                                          const Color3B& outlineColor,
                                          int outlineSize,
                                          const Color3B& shadowColor,
@@ -150,11 +151,11 @@ RichElementText* RichElementText::create(int tag,
 bool RichElementText::init(int tag,
                            const Color3B& color,
                            uint8_t opacity,
-                           const std::string& text,
-                           const std::string& fontName,
+                           std::string_view text,
+                           std::string_view fontName,
                            float fontSize,
                            uint32_t flags,
-                           const std::string& url,
+                           std::string_view url,
                            const Color3B& outlineColor,
                            int outlineSize,
                            const Color3B& shadowColor,
@@ -183,8 +184,8 @@ bool RichElementText::init(int tag,
 RichElementImage* RichElementImage::create(int tag,
                                            const Color3B& color,
                                            uint8_t opacity,
-                                           const std::string& filePath,
-                                           const std::string& url,
+                                           std::string_view filePath,
+                                           std::string_view url,
                                            Widget::TextureResType texType)
 {
     RichElementImage* element = new RichElementImage();
@@ -200,8 +201,8 @@ RichElementImage* RichElementImage::create(int tag,
 bool RichElementImage::init(int tag,
                             const Color3B& color,
                             uint8_t opacity,
-                            const std::string& filePath,
-                            const std::string& url,
+                            std::string_view filePath,
+                            std::string_view url,
                             Widget::TextureResType texType)
 {
     if (RichElement::init(tag, color, opacity))
@@ -226,7 +227,7 @@ void RichElementImage::setHeight(int height)
     _height = height;
 }
 
-void RichElementImage::setUrl(const std::string& url)
+void RichElementImage::setUrl(std::string_view url)
 {
     _url = url;
 }
@@ -334,7 +335,7 @@ class MyXMLVisitor : public SAXDelegator
         bool isFontElement;
         RichText::VisitEnterHandler handleVisitEnter;
     };
-    typedef std::unordered_map<std::string, TagBehavior> TagTables;
+    typedef hlookup::string_map<TagBehavior> TagTables;
 
     static TagTables _tagTables;
 
@@ -376,11 +377,11 @@ class MyXMLVisitor : public SAXDelegator
 
     void pushBackElement(RichElement* element);
 
-    static void setTagDescription(const std::string& tag,
+    static void setTagDescription(std::string_view tag,
                                   bool isFontElement,
                                   RichText::VisitEnterHandler&& handleVisitEnter);
 
-    static void removeTagDescription(const std::string& tag);
+    static void removeTagDescription(std::string_view tag);
 
 private:
     ValueMap tagAttrMapWithXMLElement(const char** attrs);
@@ -907,14 +908,19 @@ void MyXMLVisitor::pushBackElement(RichElement* element)
     _richText->pushBackElement(element);
 }
 
-void MyXMLVisitor::setTagDescription(const std::string& tag,
+void MyXMLVisitor::setTagDescription(std::string_view tag,
                                      bool isFontElement,
                                      RichText::VisitEnterHandler&& handleVisitEnter)
 {
-    MyXMLVisitor::_tagTables[tag] = {isFontElement, std::move(handleVisitEnter)};
+    hlookup::set_item(
+        MyXMLVisitor::_tagTables, tag,
+        TagBehavior{
+            isFontElement,
+            std::move(
+                handleVisitEnter)});  // MyXMLVisitor::_tagTables[tag] = {isFontElement, std::move(handleVisitEnter)};
 }
 
-void MyXMLVisitor::removeTagDescription(const std::string& tag)
+void MyXMLVisitor::removeTagDescription(std::string_view tag)
 {
     MyXMLVisitor::_tagTables.erase(tag);
 }
@@ -1004,7 +1010,7 @@ RichText* RichText::create()
     return nullptr;
 }
 
-RichText* RichText::createWithXML(const std::string& xml, const ValueMap& defaults, const OpenUrlHandler& handleOpenUrl)
+RichText* RichText::createWithXML(std::string_view xml, const ValueMap& defaults, const OpenUrlHandler& handleOpenUrl)
 {
     RichText* widget = new RichText();
     if (widget->initWithXML(xml, defaults, handleOpenUrl))
@@ -1025,7 +1031,7 @@ bool RichText::init()
     return false;
 }
 
-bool RichText::initWithXML(const std::string& origxml, const ValueMap& defaults, const OpenUrlHandler& handleOpenUrl)
+bool RichText::initWithXML(std::string_view origxml, const ValueMap& defaults, const OpenUrlHandler& handleOpenUrl)
 {
     static std::function<std::string(RichText*)> startTagFont = [](RichText* richText) {
         std::string fontFace = richText->getFontFace();
@@ -1109,7 +1115,7 @@ void RichText::setHorizontalAlignment(cocos2d::ui::RichText::HorizontalAlignment
     }
 }
 
-void RichText::setFontColor(const std::string& color)
+void RichText::setFontColor(std::string_view color)
 {
     _defaults[KEY_FONT_COLOR_STRING] = color;
 }
@@ -1134,7 +1140,7 @@ float RichText::getFontSize()
     return _defaults.at(KEY_FONT_SIZE).asFloat();
 }
 
-void RichText::setFontFace(const std::string& face)
+void RichText::setFontFace(std::string_view face)
 {
     _defaults[KEY_FONT_FACE] = face;
 }
@@ -1144,7 +1150,7 @@ std::string RichText::getFontFace()
     return _defaults.at(KEY_FONT_FACE).asString();
 }
 
-void RichText::setAnchorFontColor(const std::string& color)
+void RichText::setAnchorFontColor(std::string_view color)
 {
     _defaults[KEY_ANCHOR_FONT_COLOR_STRING] = color;
 }
@@ -1393,12 +1399,12 @@ ValueMap RichText::getDefaults() const
     return defaults;
 }
 
-cocos2d::Color3B RichText::color3BWithString(const std::string& color)
+cocos2d::Color3B RichText::color3BWithString(std::string_view color)
 {
     if (color.length() == 4)
     {
-        int r, g, b;
-        sscanf(color.c_str(), "%*c%1x%1x%1x", &r, &g, &b);
+        unsigned int r, g, b;
+        sscanf(color.data(), "%*c%1x%1x%1x", &r, &g, &b);
         r += r * 16;
         g += g * 16;
         b += b * 16;
@@ -1406,14 +1412,14 @@ cocos2d::Color3B RichText::color3BWithString(const std::string& color)
     }
     else if (color.length() == 7)
     {
-        int r, g, b;
-        sscanf(color.c_str(), "%*c%2x%2x%2x", &r, &g, &b);
+        unsigned int r, g, b;
+        sscanf(color.data(), "%*c%2x%2x%2x", &r, &g, &b);
         return Color3B(r, g, b);
     }
     else if (color.length() == 9)
     {
-        int r, g, b, a;
-        sscanf(color.c_str(), "%*c%2x%2x%2x%2x", &r, &g, &b, &a);
+        unsigned int r, g, b, a;
+        sscanf(color.data(), "%*c%2x%2x%2x%2x", &r, &g, &b, &a);
         return Color3B(r, g, b);
     }
     return Color3B::WHITE;
@@ -1440,17 +1446,17 @@ std::string RichText::stringWithColor4B(const cocos2d::Color4B& color4b)
     return std::string(buf, 9);
 }
 
-void RichText::setTagDescription(const std::string& tag, bool isFontElement, VisitEnterHandler handleVisitEnter)
+void RichText::setTagDescription(std::string_view tag, bool isFontElement, VisitEnterHandler handleVisitEnter)
 {
     MyXMLVisitor::setTagDescription(tag, isFontElement, std::move(handleVisitEnter));
 }
 
-void RichText::removeTagDescription(const std::string& tag)
+void RichText::removeTagDescription(std::string_view tag)
 {
     MyXMLVisitor::removeTagDescription(tag);
 }
 
-void RichText::openUrl(const std::string& url)
+void RichText::openUrl(std::string_view url)
 {
     if (_handleOpenUrl)
     {
@@ -1767,13 +1773,13 @@ int findSplitPositionForChar(Label* label,
 }
 }  // namespace
 
-void RichText::handleTextRenderer(const std::string& text,
-                                  const std::string& fontName,
+void RichText::handleTextRenderer(std::string_view text,
+                                  std::string_view fontName,
                                   float fontSize,
                                   const Color3B& color,
                                   uint8_t opacity,
                                   uint32_t flags,
-                                  const std::string& url,
+                                  std::string_view url,
                                   const Color3B& outlineColor,
                                   int outlineSize,
                                   const Color3B& shadowColor,
@@ -1785,7 +1791,8 @@ void RichText::handleTextRenderer(const std::string& text,
     RichText::WrapMode wrapMode = static_cast<RichText::WrapMode>(_defaults.at(KEY_WRAP_MODE).asInt());
 
     // split text by \n
-    std::stringstream ss(text);
+    std::stringstream ss;
+    ss << text;
     std::string currentText;
     size_t realLines = 0;
     while (std::getline(ss, currentText, '\n'))
@@ -1877,13 +1884,13 @@ void RichText::handleTextRenderer(const std::string& text,
     }
 }
 
-void RichText::handleImageRenderer(const std::string& filePath,
+void RichText::handleImageRenderer(std::string_view filePath,
                                    Widget::TextureResType textureType,
                                    const Color3B& /*color*/,
                                    uint8_t /*opacity*/,
                                    int width,
                                    int height,
-                                   const std::string& url)
+                                   std::string_view url)
 {
     Sprite* imageRenderer;
     if (textureType == Widget::TextureResType::LOCAL)
@@ -2062,10 +2069,9 @@ bool isWhitespace(char c)
 {
     return std::isspace(c, std::locale());
 }
-std::string rtrim(std::string s)
+void rtrim(std::string& s)
 {
     s.erase(std::find_if_not(s.rbegin(), s.rend(), isWhitespace).base(), s.end());
-    return s;
 }
 }  // namespace
 
@@ -2075,8 +2081,9 @@ float RichText::stripTrailingWhitespace(const Vector<cocos2d::Node*>& row)
     {
         if (auto label = dynamic_cast<Label*>(row.back()))
         {
-            const auto width         = label->getContentSize().width;
-            const auto trimmedString = rtrim(label->getString());
+            const auto width = label->getContentSize().width;
+            std::string trimmedString{label->getString()};
+            rtrim(trimmedString);
             if (label->getString() != trimmedString)
             {
                 label->setString(trimmedString);
diff --git a/cocos/ui/UIRichText.h b/cocos/ui/UIRichText.h
index 4c694c8af9c2..7428a38bc1c3 100644
--- a/cocos/ui/UIRichText.h
+++ b/cocos/ui/UIRichText.h
@@ -148,11 +148,11 @@ class CC_GUI_DLL RichElementText : public RichElement
     bool init(int tag,
               const Color3B& color,
               uint8_t opacity,
-              const std::string& text,
-              const std::string& fontName,
+              std::string_view text,
+              std::string_view fontName,
               float fontSize,
               uint32_t flags,
-              const std::string& url,
+              std::string_view url,
               const Color3B& outlineColor = Color3B::WHITE,
               int outlineSize             = -1,
               const Color3B& shadowColor  = Color3B::BLACK,
@@ -182,11 +182,11 @@ class CC_GUI_DLL RichElementText : public RichElement
     static RichElementText* create(int tag,
                                    const Color3B& color,
                                    uint8_t opacity,
-                                   const std::string& text,
-                                   const std::string& fontName,
+                                   std::string_view text,
+                                   std::string_view fontName,
                                    float fontSize,
                                    uint32_t flags              = 0,
-                                   const std::string& url      = "",
+                                   std::string_view url        = "",
                                    const Color3B& outlineColor = Color3B::WHITE,
                                    int outlineSize             = -1,
                                    const Color3B& shadowColor  = Color3B::BLACK,
@@ -244,8 +244,8 @@ class CC_GUI_DLL RichElementImage : public RichElement
     bool init(int tag,
               const Color3B& color,
               uint8_t opacity,
-              const std::string& filePath,
-              const std::string& url         = "",
+              std::string_view filePath,
+              std::string_view url           = "",
               Widget::TextureResType texType = Widget::TextureResType::LOCAL);
 
     /**
@@ -262,13 +262,13 @@ class CC_GUI_DLL RichElementImage : public RichElement
     static RichElementImage* create(int tag,
                                     const Color3B& color,
                                     uint8_t opacity,
-                                    const std::string& filePath,
-                                    const std::string& url         = "",
+                                    std::string_view filePath,
+                                    std::string_view url           = "",
                                     Widget::TextureResType texType = Widget::TextureResType::LOCAL);
 
     void setWidth(int width);
     void setHeight(int height);
-    void setUrl(const std::string& url);
+    void setUrl(std::string_view url);
 
 protected:
     std::string _filePath;
@@ -386,7 +386,7 @@ class CC_GUI_DLL RichText : public Widget
      * @brief call to open a resource specified by a URL
      * @param url a URL
      */
-    typedef std::function<void(const std::string& url)> OpenUrlHandler;
+    typedef std::function<void(std::string_view url)> OpenUrlHandler;
 
     /**
      * @brief called on the specified tag
@@ -461,7 +461,7 @@ class CC_GUI_DLL RichText : public Widget
      *
      * @return RichText instance.
      */
-    static RichText* createWithXML(const std::string& xml,
+    static RichText* createWithXML(std::string_view xml,
                                    const ValueMap& defaults            = ValueMap(),
                                    const OpenUrlHandler& handleOpenUrl = nullptr);
 
@@ -517,24 +517,24 @@ class CC_GUI_DLL RichText : public Widget
         HorizontalAlignment a); /*!< sets the horizontal alignment mode: LEFT, CENTER, or RIGHT */
     HorizontalAlignment getHorizontalAlignment() const; /*!< returns the current horizontal alignment mode */
     void setFontColor(
-        const std::string& color); /*!< Set the font color. @param color the #RRGGBB hexadecimal notation. */
-    std::string getFontColor();    /*!< return the current font color */
-    Color3B getFontColor3B();      /*!< return the current font color */
-    void setFontSize(float size);  /*!< Set the font size. @param size the font size. */
-    float getFontSize();           /*!< return the current font size */
-    void setFontFace(const std::string& face);         /*!< Set the font face. @param face the font face. */
-    std::string getFontFace();                         /*!< return the current font face */
-    void setAnchorFontColor(const std::string& color); /*!< Set the font color of a-tag. @param face the font color. */
-    std::string getAnchorFontColor();                  /*!< return the current font color of a-tag */
-    cocos2d::Color3B getAnchorFontColor3B();           /*!< return the current font color of a-tag */
-    void setAnchorTextBold(bool enable);               /*!< enable bold text of a-tag */
-    bool isAnchorTextBoldEnabled();                    /*!< valid style is bold text of a-tag? */
-    void setAnchorTextItalic(bool enable);             /*!< enable italic text of a-tag */
-    bool isAnchorTextItalicEnabled();                  /*!< valid style is italic text of a-tag? */
-    void setAnchorTextDel(bool enable);                /*!< enable the strikethrough of a-tag */
-    bool isAnchorTextDelEnabled();                     /*!< valid strikethrough of a-tag? */
-    void setAnchorTextUnderline(bool enable);          /*!< enable the underline of a-tag */
-    bool isAnchorTextUnderlineEnabled();               /*!< valid underline of a-tag? */
+        std::string_view color);             /*!< Set the font color. @param color the #RRGGBB hexadecimal notation. */
+    std::string getFontColor();              /*!< return the current font color */
+    Color3B getFontColor3B();                /*!< return the current font color */
+    void setFontSize(float size);            /*!< Set the font size. @param size the font size. */
+    float getFontSize();                     /*!< return the current font size */
+    void setFontFace(std::string_view face); /*!< Set the font face. @param face the font face. */
+    std::string getFontFace();               /*!< return the current font face */
+    void setAnchorFontColor(std::string_view color); /*!< Set the font color of a-tag. @param face the font color. */
+    std::string getAnchorFontColor();                /*!< return the current font color of a-tag */
+    cocos2d::Color3B getAnchorFontColor3B();         /*!< return the current font color of a-tag */
+    void setAnchorTextBold(bool enable);             /*!< enable bold text of a-tag */
+    bool isAnchorTextBoldEnabled();                  /*!< valid style is bold text of a-tag? */
+    void setAnchorTextItalic(bool enable);           /*!< enable italic text of a-tag */
+    bool isAnchorTextItalicEnabled();                /*!< valid style is italic text of a-tag? */
+    void setAnchorTextDel(bool enable);              /*!< enable the strikethrough of a-tag */
+    bool isAnchorTextDelEnabled();                   /*!< valid strikethrough of a-tag? */
+    void setAnchorTextUnderline(bool enable);        /*!< enable the underline of a-tag */
+    bool isAnchorTextUnderlineEnabled();             /*!< valid underline of a-tag? */
     /** @brief enable the outline of a-tag */
     void setAnchorTextOutline(bool enable, const Color3B& outlineColor = Color3B::WHITE, int outlineSize = -1);
     bool isAnchorTextOutlineEnabled();     /*!< valid outline of a-tag? */
@@ -555,7 +555,7 @@ class CC_GUI_DLL RichText : public Widget
     void setDefaults(const ValueMap& defaults); /*!< set the default values */
     ValueMap getDefaults() const;               /*!< returns the default values */
 
-    cocos2d::Color3B color3BWithString(const std::string& color);   /*!< convert a color string into a Color3B. */
+    cocos2d::Color3B color3BWithString(std::string_view color);     /*!< convert a color string into a Color3B. */
     std::string stringWithColor3B(const cocos2d::Color3B& color3b); /*!< convert a Color3B into a color string. */
     std::string stringWithColor4B(const cocos2d::Color4B& color4b); /*!< convert a Color4B into a color string. */
 
@@ -565,15 +565,15 @@ class CC_GUI_DLL RichText : public Widget
      * @param isFontElement use attributes of text tag
      * @param handleVisitEnter callback
      */
-    static void setTagDescription(const std::string& tag, bool isFontElement, VisitEnterHandler handleVisitEnter);
+    static void setTagDescription(std::string_view tag, bool isFontElement, VisitEnterHandler handleVisitEnter);
 
     /**
      * @brief remove a callback to own tag.
      * @param tag tag's name
      */
-    static void removeTagDescription(const std::string& tag);
+    static void removeTagDescription(std::string_view tag);
 
-    void openUrl(const std::string& url);
+    void openUrl(std::string_view url);
 
     /**
      * @brief Asks the callback to open a resource specified by a URL.
@@ -584,7 +584,7 @@ class CC_GUI_DLL RichText : public Widget
 
     CC_CONSTRUCTOR_ACCESS : virtual bool init() override;
 
-    bool initWithXML(const std::string& xml,
+    bool initWithXML(std::string_view xml,
                      const ValueMap& defaults            = ValueMap(),
                      const OpenUrlHandler& handleOpenUrl = nullptr);
 
@@ -593,26 +593,26 @@ class CC_GUI_DLL RichText : public Widget
 
     virtual void initRenderer() override;
     void pushToContainer(Node* renderer);
-    void handleTextRenderer(const std::string& text,
-                            const std::string& fontName,
+    void handleTextRenderer(std::string_view text,
+                            std::string_view fontName,
                             float fontSize,
                             const Color3B& color,
                             uint8_t opacity,
                             uint32_t flags,
-                            const std::string& url      = "",
+                            std::string_view url        = "",
                             const Color3B& outlineColor = Color3B::WHITE,
                             int outlineSize             = -1,
                             const Color3B& shadowColor  = Color3B::BLACK,
                             const Vec2& shadowOffset    = Vec2(2.0, -2.0),
                             int shadowBlurRadius        = 0,
                             const Color3B& glowColor    = Color3B::WHITE);
-    void handleImageRenderer(const std::string& filePath,
+    void handleImageRenderer(std::string_view filePath,
                              Widget::TextureResType textureType,
                              const Color3B& color,
                              uint8_t opacity,
                              int width,
                              int height,
-                             const std::string& url);
+                             std::string_view url);
     void handleCustomRenderer(Node* renderer);
     void formatRenderers();
     void addNewLine();
diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp
index dba22480e45f..eedb3152d40c 100644
--- a/cocos/ui/UIScale9Sprite.cpp
+++ b/cocos/ui/UIScale9Sprite.cpp
@@ -53,7 +53,7 @@ Scale9Sprite* Scale9Sprite::create()
     return nullptr;
 }
 
-Scale9Sprite* Scale9Sprite::create(const std::string& filename, const Rect& rect, const Rect& capInsets)
+Scale9Sprite* Scale9Sprite::create(std::string_view filename, const Rect& rect, const Rect& capInsets)
 {
     Scale9Sprite* ret = new Scale9Sprite();
     if (ret->initWithFile(filename, rect, capInsets))
@@ -65,12 +65,12 @@ Scale9Sprite* Scale9Sprite::create(const std::string& filename, const Rect& rect
     return nullptr;
 }
 
-Scale9Sprite* Scale9Sprite::create(const std::string& filename, const Rect& rect)
+Scale9Sprite* Scale9Sprite::create(std::string_view filename, const Rect& rect)
 {
     return create(filename, rect, Rect::ZERO);
 }
 
-Scale9Sprite* Scale9Sprite::create(const Rect& capInsets, const std::string& file)
+Scale9Sprite* Scale9Sprite::create(const Rect& capInsets, std::string_view file)
 {
     Scale9Sprite* ret = new Scale9Sprite();
     if (ret->initWithFile(capInsets, file))
@@ -82,7 +82,7 @@ Scale9Sprite* Scale9Sprite::create(const Rect& capInsets, const std::string& fil
     return nullptr;
 }
 
-Scale9Sprite* Scale9Sprite::create(const std::string& fileaname)
+Scale9Sprite* Scale9Sprite::create(std::string_view fileaname)
 {
     return create(Rect::ZERO, fileaname);
 }
@@ -104,7 +104,7 @@ Scale9Sprite* Scale9Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame)
     return createWithSpriteFrame(spriteFrame, Rect::ZERO);
 }
 
-Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets)
+Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(std::string_view spriteFrameName, const Rect& capInsets)
 {
     Scale9Sprite* ret = new Scale9Sprite();
     if (ret->initWithSpriteFrameName(spriteFrameName, capInsets))
@@ -116,7 +116,7 @@ Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteF
     return nullptr;
 }
 
-Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName)
+Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(std::string_view spriteFrameName)
 {
     Scale9Sprite* ret = new Scale9Sprite();
     if (ret->initWithSpriteFrameName(spriteFrameName, Rect::ZERO))
@@ -142,7 +142,7 @@ Scale9Sprite::Scale9Sprite()
 
 Scale9Sprite::~Scale9Sprite() {}
 
-bool Scale9Sprite::initWithFile(const Rect& capInsets, const std::string& file)
+bool Scale9Sprite::initWithFile(const Rect& capInsets, std::string_view file)
 {
     // calls super
     bool ret = Sprite::initWithFile(file);
@@ -150,7 +150,7 @@ bool Scale9Sprite::initWithFile(const Rect& capInsets, const std::string& file)
     return ret;
 }
 
-bool Scale9Sprite::initWithFile(const std::string& filename)
+bool Scale9Sprite::initWithFile(std::string_view filename)
 {
     // calls super
     auto originalCapInsets = this->getCapInsets();
@@ -159,7 +159,7 @@ bool Scale9Sprite::initWithFile(const std::string& filename)
     return ret;
 }
 
-bool Scale9Sprite::initWithFile(const std::string& filename, const Rect& rect)
+bool Scale9Sprite::initWithFile(std::string_view filename, const Rect& rect)
 {
     // calls super
     auto originalCapInsets = this->getCapInsets();
@@ -176,7 +176,7 @@ bool Scale9Sprite::initWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& cap
     return ret;
 }
 
-bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets)
+bool Scale9Sprite::initWithSpriteFrameName(std::string_view spriteFrameName, const Rect& capInsets)
 {
     // calls super
     bool ret = Sprite::initWithSpriteFrameName(spriteFrameName);
@@ -184,7 +184,7 @@ bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName, c
     return ret;
 }
 
-bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName)
+bool Scale9Sprite::initWithSpriteFrameName(std::string_view spriteFrameName)
 {
     // calls super
     auto originalCapInsets = this->getCapInsets();
@@ -242,7 +242,7 @@ bool Scale9Sprite::init(Sprite* sprite,
     return ret;
 }
 
-bool Scale9Sprite::initWithFile(const std::string& filename, const Rect& rect, const Rect& capInsets)
+bool Scale9Sprite::initWithFile(std::string_view filename, const Rect& rect, const Rect& capInsets)
 {
     // calls super
     bool ret = false;
diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h
index 94c4226d5839..3e11d0743ca8 100644
--- a/cocos/ui/UIScale9Sprite.h
+++ b/cocos/ui/UIScale9Sprite.h
@@ -108,7 +108,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param capInsets A specified cap insets.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* create(const std::string& file, const Rect& rect, const Rect& capInsets);
+    static Scale9Sprite* create(std::string_view file, const Rect& rect, const Rect& capInsets);
 
     /**
      * Creates a 9-slice sprite with a texture file. The whole texture will be
@@ -119,7 +119,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param file A texture file name.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* create(const Rect& capInsets, const std::string& file);
+    static Scale9Sprite* create(const Rect& capInsets, std::string_view file);
 
     /**
      * Creates a 9-slice sprite with a texture file and a delimitation zone. The
@@ -130,7 +130,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param rect A delimitation zone.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* create(const std::string& file, const Rect& rect);
+    static Scale9Sprite* create(std::string_view file, const Rect& rect);
 
     /**
      * Creates a 9-slice sprite with a texture file. The whole texture will be
@@ -140,7 +140,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param file A texture file name.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* create(const std::string& file);
+    static Scale9Sprite* create(std::string_view file);
 
     /**
      * Creates a 9-slice sprite with an sprite frame.
@@ -177,7 +177,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param spriteFrameName A sprite frame name.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName);
+    static Scale9Sprite* createWithSpriteFrameName(std::string_view spriteFrameName);
 
     /**
      * Creates a 9-slice sprite with an sprite frame name and the centre of its zone.
@@ -190,7 +190,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param capInsets A delimitation zone.
      * @return A Scale9Sprite instance.
      */
-    static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets);
+    static Scale9Sprite* createWithSpriteFrameName(std::string_view spriteFrameName, const Rect& capInsets);
 
     // overridden methods that takes different parameters
     using Sprite::initWithFile;
@@ -212,7 +212,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param capInsets The values to use for the cap insets.
      * @return True if initialize success, false otherwise.
      */
-    virtual bool initWithFile(const std::string& file, const Rect& rect, const Rect& capInsets);
+    virtual bool initWithFile(std::string_view file, const Rect& rect, const Rect& capInsets);
 
     /**
      * Initializes a 9-slice sprite with a texture file and with the specified cap
@@ -225,7 +225,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param capInsets The values to use for the cap insets.
      * @return True if initializes success, false otherwise.
      */
-    virtual bool initWithFile(const Rect& capInsets, const std::string& file);
+    virtual bool initWithFile(const Rect& capInsets, std::string_view file);
 
     /**
      * Initializes a 9-slice sprite with an sprite frame and with the specified
@@ -251,7 +251,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param capInsets The values to use for the cap insets.
      * @return True if initializes success, false otherwise.
      */
-    virtual bool initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets);
+    virtual bool initWithSpriteFrameName(std::string_view spriteFrameName, const Rect& capInsets);
 
     // override function
 
@@ -268,7 +268,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * texture's full rect.
      * @return True if initializes success, false otherwise.
      */
-    virtual bool initWithFile(const std::string& file, const Rect& rect) override;
+    virtual bool initWithFile(std::string_view file, const Rect& rect) override;
 
     /**
      * Initializes a 9-slice sprite with a texture file. The whole texture will be
@@ -280,7 +280,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param file The name of the texture file.
      * @return True if initializes success, false otherwise.
      */
-    virtual bool initWithFile(const std::string& file) override;
+    virtual bool initWithFile(std::string_view file) override;
 
     /**
      * Initializes a 9-slice sprite with an sprite frame name.
@@ -291,7 +291,7 @@ class CC_GUI_DLL Scale9Sprite : public Sprite
      * @param spriteFrameName The sprite frame name.
      * @return True if initializes success, false otherwise.
      */
-    virtual bool initWithSpriteFrameName(const std::string& spriteFrameName) override;
+    virtual bool initWithSpriteFrameName(std::string_view spriteFrameName) override;
 
     virtual bool init() override;
 
diff --git a/cocos/ui/UIScrollView.cpp b/cocos/ui/UIScrollView.cpp
index ae12b010d55a..b0df2ffd9ebc 100644
--- a/cocos/ui/UIScrollView.cpp
+++ b/cocos/ui/UIScrollView.cpp
@@ -287,7 +287,7 @@ void ScrollView::addChild(Node* child, int zOrder, int tag)
     _innerContainer->addChild(child, zOrder, tag);
 }
 
-void ScrollView::addChild(Node* child, int zOrder, const std::string& name)
+void ScrollView::addChild(Node* child, int zOrder, std::string_view name)
 {
     child->setGlobalZOrder(_globalZOrder);
     _innerContainer->addChild(child, zOrder, name);
@@ -328,7 +328,7 @@ Node* ScrollView::getChildByTag(int tag) const
     return _innerContainer->getChildByTag(tag);
 }
 
-Node* ScrollView::getChildByName(const std::string& name) const
+Node* ScrollView::getChildByName(std::string_view name) const
 {
     return _innerContainer->getChildByName(name);
 }
diff --git a/cocos/ui/UIScrollView.h b/cocos/ui/UIScrollView.h
index 96d9949a77b6..c1cbe9ba8cba 100644
--- a/cocos/ui/UIScrollView.h
+++ b/cocos/ui/UIScrollView.h
@@ -343,7 +343,7 @@ class CC_GUI_DLL ScrollView : public Layout
     virtual void addChild(Node* child) override;
     virtual void addChild(Node* child, int localZOrder) override;
     virtual void addChild(Node* child, int localZOrder, int tag) override;
-    virtual void addChild(Node* child, int localZOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int localZOrder, std::string_view name) override;
     virtual void removeAllChildren() override;
     virtual void removeAllChildrenWithCleanup(bool cleanup) override;
     virtual void removeChild(Node* child, bool cleanup = true) override;
@@ -351,7 +351,7 @@ class CC_GUI_DLL ScrollView : public Layout
     virtual const Vector<Node*>& getChildren() const override;
     virtual ssize_t getChildrenCount() const override;
     virtual Node* getChildByTag(int tag) const override;
-    virtual Node* getChildByName(const std::string& name) const override;
+    virtual Node* getChildByName(std::string_view name) const override;
     // touch event callback
     virtual bool onTouchBegan(Touch* touch, Event* unusedEvent) override;
     virtual void onTouchMoved(Touch* touch, Event* unusedEvent) override;
diff --git a/cocos/ui/UISlider.cpp b/cocos/ui/UISlider.cpp
index c28cfbbca51e..2baeabcf2726 100644
--- a/cocos/ui/UISlider.cpp
+++ b/cocos/ui/UISlider.cpp
@@ -103,9 +103,7 @@ Slider* Slider::create()
     return nullptr;
 }
 
-Slider* Slider::create(const std::string& barTextureName,
-                       const std::string& normalBallTextureName,
-                       TextureResType resType)
+Slider* Slider::create(std::string_view barTextureName, std::string_view normalBallTextureName, TextureResType resType)
 {
     Slider* widget = new Slider();
     if (widget->init())
@@ -157,7 +155,7 @@ void Slider::initRenderer()
     addProtectedChild(_slidBallRenderer, SLIDBALL_RENDERER_Z, -1);
 }
 
-void Slider::loadBarTexture(const std::string& fileName, TextureResType texType)
+void Slider::loadBarTexture(std::string_view fileName, TextureResType texType)
 {
     _textureFile = fileName;
     _barTexType  = texType;
@@ -202,7 +200,7 @@ void Slider::setupBarTexture()
     _originalBarRect = _barRenderer->getTextureRect();
 }
 
-void Slider::loadProgressBarTexture(const std::string& fileName, TextureResType texType)
+void Slider::loadProgressBarTexture(std::string_view fileName, TextureResType texType)
 {
     _progressBarTextureFile = fileName;
     _progressBarTexType     = texType;
@@ -330,9 +328,9 @@ const Rect& Slider::getCapInsetsProgressBarRenderer() const
     return _capInsetsProgressBarRenderer;
 }
 
-void Slider::loadSlidBallTextures(const std::string& normal,
-                                  const std::string& pressed,
-                                  const std::string& disabled,
+void Slider::loadSlidBallTextures(std::string_view normal,
+                                  std::string_view pressed,
+                                  std::string_view disabled,
                                   TextureResType texType)
 {
     loadSlidBallTextureNormal(normal, texType);
@@ -340,7 +338,7 @@ void Slider::loadSlidBallTextures(const std::string& normal,
     loadSlidBallTextureDisabled(disabled, texType);
 }
 
-void Slider::loadSlidBallTextureNormal(const std::string& normal, TextureResType texType)
+void Slider::loadSlidBallTextureNormal(std::string_view normal, TextureResType texType)
 {
     _slidBallNormalTextureFile = normal;
     _ballNTexType              = texType;
@@ -370,7 +368,7 @@ void Slider::loadSlidBallTextureNormal(SpriteFrame* spriteframe)
     this->updateChildrenDisplayedRGBA();
 }
 
-void Slider::loadSlidBallTexturePressed(const std::string& pressed, TextureResType texType)
+void Slider::loadSlidBallTexturePressed(std::string_view pressed, TextureResType texType)
 {
     _slidBallPressedTextureFile       = pressed;
     _isSliderBallPressedTextureLoaded = !pressed.empty();
@@ -402,7 +400,7 @@ void Slider::loadSlidBallTexturePressed(SpriteFrame* spriteframe)
     this->updateChildrenDisplayedRGBA();
 }
 
-void Slider::loadSlidBallTextureDisabled(const std::string& disabled, TextureResType texType)
+void Slider::loadSlidBallTextureDisabled(std::string_view disabled, TextureResType texType)
 {
     _slidBallDisabledTextureFile        = disabled;
     _isSliderBallDisabledTexturedLoaded = !disabled.empty();
diff --git a/cocos/ui/UISlider.h b/cocos/ui/UISlider.h
index b0b30ad0c94b..63a3e62bad56 100644
--- a/cocos/ui/UISlider.h
+++ b/cocos/ui/UISlider.h
@@ -98,8 +98,8 @@ class CC_GUI_DLL Slider : public Widget
      * @param resType Texture resource type.
      * @return An autoreleased Slider object.
      */
-    static Slider* create(const std::string& barTextureName,
-                          const std::string& normalBallTextureName,
+    static Slider* create(std::string_view barTextureName,
+                          std::string_view normalBallTextureName,
                           TextureResType resType = TextureResType::LOCAL);
 
     /**
@@ -108,7 +108,7 @@ class CC_GUI_DLL Slider : public Widget
      * @param fileName   File name of texture.
      * @param resType    @see TextureResType .
      */
-    void loadBarTexture(const std::string& fileName, TextureResType resType = TextureResType::LOCAL);
+    void loadBarTexture(std::string_view fileName, TextureResType resType = TextureResType::LOCAL);
 
     /**
      * Sets if slider is using scale9 renderer.
@@ -162,10 +162,10 @@ class CC_GUI_DLL Slider : public Widget
      * @param disabled    Disabled state texture.
      * @param texType    @see TextureResType .
      */
-    void loadSlidBallTextures(const std::string& normal,
-                              const std::string& pressed  = "",
-                              const std::string& disabled = "",
-                              TextureResType texType      = TextureResType::LOCAL);
+    void loadSlidBallTextures(std::string_view normal,
+                              std::string_view pressed  = "",
+                              std::string_view disabled = "",
+                              TextureResType texType    = TextureResType::LOCAL);
 
     /**
      * Load normal state texture for slider ball.
@@ -173,7 +173,7 @@ class CC_GUI_DLL Slider : public Widget
      * @param normal    Normal state texture.
      * @param resType    @see TextureResType .
      */
-    void loadSlidBallTextureNormal(const std::string& normal, TextureResType resType = TextureResType::LOCAL);
+    void loadSlidBallTextureNormal(std::string_view normal, TextureResType resType = TextureResType::LOCAL);
 
     /**
      * Load pressed state texture for slider ball.
@@ -181,7 +181,7 @@ class CC_GUI_DLL Slider : public Widget
      * @param pressed    Pressed state texture.
      * @param resType    @see TextureResType .
      */
-    void loadSlidBallTexturePressed(const std::string& pressed, TextureResType resType = TextureResType::LOCAL);
+    void loadSlidBallTexturePressed(std::string_view pressed, TextureResType resType = TextureResType::LOCAL);
 
     /**
      * Load disabled state texture for slider ball.
@@ -189,7 +189,7 @@ class CC_GUI_DLL Slider : public Widget
      * @param disabled   Disabled state texture.
      * @param resType    @see TextureResType .
      */
-    void loadSlidBallTextureDisabled(const std::string& disabled, TextureResType resType = TextureResType::LOCAL);
+    void loadSlidBallTextureDisabled(std::string_view disabled, TextureResType resType = TextureResType::LOCAL);
 
     /**
      * Load dark state texture for slider progress bar.
@@ -197,7 +197,7 @@ class CC_GUI_DLL Slider : public Widget
      * @param fileName   File path of texture.
      * @param resType    @see TextureResType .
      */
-    void loadProgressBarTexture(const std::string& fileName, TextureResType resType = TextureResType::LOCAL);
+    void loadProgressBarTexture(std::string_view fileName, TextureResType resType = TextureResType::LOCAL);
 
     /**
      * Changes the progress direction of slider.
diff --git a/cocos/ui/UITabControl.cpp b/cocos/ui/UITabControl.cpp
index 65c9b54f9aee..37e9c39614e5 100644
--- a/cocos/ui/UITabControl.cpp
+++ b/cocos/ui/UITabControl.cpp
@@ -487,9 +487,9 @@ TabHeader* TabHeader::create()
     return nullptr;
 }
 
-TabHeader* TabHeader::create(const std::string& titleStr,
-                             const std::string& backGround,
-                             const std::string& cross,
+TabHeader* TabHeader::create(std::string_view titleStr,
+                             std::string_view backGround,
+                             std::string_view cross,
                              TextureResType texType)
 {
     TabHeader* tabcell = new TabHeader;
@@ -505,12 +505,12 @@ TabHeader* TabHeader::create(const std::string& titleStr,
     return nullptr;
 }
 
-TabHeader* TabHeader::create(const std::string& titleStr,
-                             const std::string& backGround,
-                             const std::string& backGroundSelected,
-                             const std::string& cross,
-                             const std::string& backGroundDisabled,
-                             const std::string& frontCrossDisabled,
+TabHeader* TabHeader::create(std::string_view titleStr,
+                             std::string_view backGround,
+                             std::string_view backGroundSelected,
+                             std::string_view cross,
+                             std::string_view backGroundDisabled,
+                             std::string_view frontCrossDisabled,
                              TextureResType texType /*= TextureResType::LOCAL*/)
 {
     TabHeader* tabcell = new TabHeader;
@@ -543,7 +543,7 @@ void TabHeader::initRenderer()
     addProtectedChild(_tabLabelRender, -1, -1);
 }
 
-void TabHeader::setTitleText(const std::string& text)
+void TabHeader::setTitleText(std::string_view text)
 {
     if (text == getTitleText())
     {
@@ -555,11 +555,11 @@ void TabHeader::setTitleText(const std::string& text)
     _tabLabelRender->setPosition(_contentSize * 0.5f);
 }
 
-std::string TabHeader::getTitleText() const
+std::string_view TabHeader::getTitleText() const
 {
     if (nullptr == _tabLabelRender)
     {
-        return "";
+        return ""sv;
     }
     return _tabLabelRender->getString();
 }
@@ -609,11 +609,11 @@ void TabHeader::updateContentSize()
     onSizeChanged();
 }
 
-void TabHeader::setTitleFontName(const std::string& fontName)
+void TabHeader::setTitleFontName(std::string_view fontName)
 {
     if (FileUtils::getInstance()->isFileExist(fontName))
     {
-        std::string lowerCasedFontName = fontName;
+        std::string lowerCasedFontName{fontName};
         std::transform(lowerCasedFontName.begin(), lowerCasedFontName.end(), lowerCasedFontName.begin(), ::tolower);
         if (lowerCasedFontName.find(".fnt") != std::string::npos)
         {
@@ -647,7 +647,7 @@ Label* TabHeader::getTitleRenderer() const
     return _tabLabelRender;
 }
 
-std::string TabHeader::getTitleFontName() const
+std::string_view TabHeader::getTitleFontName() const
 {
     if (this->_fontType == FontType::SYSTEM)
     {
@@ -661,7 +661,7 @@ std::string TabHeader::getTitleFontName() const
     {
         return _tabLabelRender->getBMFontFilePath();
     }
-    return "";
+    return ""sv;
 }
 
 void TabHeader::onSizeChanged()
diff --git a/cocos/ui/UITabControl.h b/cocos/ui/UITabControl.h
index 7da800751dea..98765bdde408 100644
--- a/cocos/ui/UITabControl.h
+++ b/cocos/ui/UITabControl.h
@@ -70,9 +70,9 @@ class CC_GUI_DLL TabHeader : public AbstractCheckButton
      * @param texType  The texture's resource type in `Widget::TextureResType`.
      * @return A TabHeader instance pointer
      */
-    static TabHeader* create(const std::string& titleStr,
-                             const std::string& backGround,
-                             const std::string& cross,
+    static TabHeader* create(std::string_view titleStr,
+                             std::string_view backGround,
+                             std::string_view cross,
                              TextureResType texType = TextureResType::LOCAL);
 
     /**
@@ -87,12 +87,12 @@ class CC_GUI_DLL TabHeader : public AbstractCheckButton
      *
      * @return A TabHeader instance pointer.
      */
-    static TabHeader* create(const std::string& titleStr,
-                             const std::string& backGround,
-                             const std::string& backGroundSelected,
-                             const std::string& cross,
-                             const std::string& backGroundDisabled,
-                             const std::string& frontCrossDisabled,
+    static TabHeader* create(std::string_view titleStr,
+                             std::string_view backGround,
+                             std::string_view backGroundSelected,
+                             std::string_view cross,
+                             std::string_view backGroundDisabled,
+                             std::string_view frontCrossDisabled,
                              TextureResType texType = TextureResType::LOCAL);
     /**
      * Return the inner Label renderer of TabHeader.
@@ -104,13 +104,13 @@ class CC_GUI_DLL TabHeader : public AbstractCheckButton
      * Change the content of Header's text.
      *@param text The Header's text.
      */
-    void setTitleText(const std::string& text);
+    void setTitleText(std::string_view text);
 
     /**
      * get the TabHeader text
      *@return he TabHeader text
      */
-    std::string getTitleText() const;
+    std::string_view getTitleText() const;
 
     /**
      * Change the color of he TabHeader text
@@ -140,13 +140,13 @@ class CC_GUI_DLL TabHeader : public AbstractCheckButton
      * Change the font name of TabHeader text
      *@param fontName a font name string.
      */
-    void setTitleFontName(const std::string& fontName);
+    void setTitleFontName(std::string_view fontName);
 
     /**
      * get the font name of TabHeader text
      *@return font name in std::string
      */
-    std::string getTitleFontName() const;
+    std::string_view getTitleFontName() const;
 
     /**
      * get the index this header in the TabControl
diff --git a/cocos/ui/UIText.cpp b/cocos/ui/UIText.cpp
index db2457e21610..554e02429263 100644
--- a/cocos/ui/UIText.cpp
+++ b/cocos/ui/UIText.cpp
@@ -71,7 +71,7 @@ bool Text::init()
     return false;
 }
 
-Text* Text::create(const std::string& textContent, const std::string& fontName, float fontSize)
+Text* Text::create(std::string_view textContent, std::string_view fontName, float fontSize)
 {
     Text* text = new Text();
     if (text->init(textContent, fontName, fontSize))
@@ -83,7 +83,7 @@ Text* Text::create(const std::string& textContent, const std::string& fontName,
     return nullptr;
 }
 
-bool Text::init(const std::string& textContent, const std::string& fontName, float fontSize)
+bool Text::init(std::string_view textContent, std::string_view fontName, float fontSize)
 {
     bool ret = true;
     do
@@ -117,7 +117,7 @@ void Text::setString(std::string_view text)
     _labelRendererAdaptDirty = true;
 }
 
-const std::string& Text::getString() const
+std::string_view Text::getString() const
 {
     return _labelRenderer->getString();
 }
@@ -149,7 +149,7 @@ float Text::getFontSize() const
     return _fontSize;
 }
 
-void Text::setFontName(const std::string& name)
+void Text::setFontName(std::string_view name)
 {
     if (FileUtils::getInstance()->isFileExist(name))
     {
@@ -173,7 +173,7 @@ void Text::setFontName(const std::string& name)
     _labelRendererAdaptDirty = true;
 }
 
-const std::string& Text::getFontName() const
+std::string_view Text::getFontName() const
 {
     return _fontName;
 }
diff --git a/cocos/ui/UIText.h b/cocos/ui/UIText.h
index 39721ef6973b..10b980a381d4 100644
--- a/cocos/ui/UIText.h
+++ b/cocos/ui/UIText.h
@@ -96,7 +96,7 @@ class CC_GUI_DLL Text : public Widget, public cocos2d::BlendProtocol
      * @param fontSize A given font size.
      * @return An autoreleased Text object.
      */
-    static Text* create(const std::string& textContent, const std::string& fontName, float fontSize);
+    static Text* create(std::string_view textContent, std::string_view fontName, float fontSize);
 
     /**
      * Changes the string value of label.
@@ -110,7 +110,7 @@ class CC_GUI_DLL Text : public Widget, public cocos2d::BlendProtocol
      *
      * @return String value.
      */
-    const std::string& getString() const;
+    std::string_view getString() const;
 
     /**
      * Gets the string length of the label.
@@ -151,13 +151,13 @@ class CC_GUI_DLL Text : public Widget, public cocos2d::BlendProtocol
      * @endcode
      * @param name Font name.
      */
-    void setFontName(const std::string& name);
+    void setFontName(std::string_view name);
 
     /** Gets the font name.
      *
      * @return Font name.
      */
-    const std::string& getFontName() const;
+    std::string_view getFontName() const;
 
     /** Gets the font type.
      * @return The font type.
@@ -342,7 +342,7 @@ class CC_GUI_DLL Text : public Widget, public cocos2d::BlendProtocol
     virtual const BlendFunc& getBlendFunc() const override;
 
     CC_CONSTRUCTOR_ACCESS : virtual bool init() override;
-    virtual bool init(const std::string& textContent, const std::string& fontName, float fontSize);
+    virtual bool init(std::string_view textContent, std::string_view fontName, float fontSize);
 
 protected:
     virtual void initRenderer() override;
diff --git a/cocos/ui/UITextAtlas.cpp b/cocos/ui/UITextAtlas.cpp
index 98eb85c0e801..e6ab8300fedd 100644
--- a/cocos/ui/UITextAtlas.cpp
+++ b/cocos/ui/UITextAtlas.cpp
@@ -66,11 +66,11 @@ void TextAtlas::initRenderer()
     addProtectedChild(_labelAtlasRenderer, LABELATLAS_RENDERER_Z, -1);
 }
 
-TextAtlas* TextAtlas::create(const std::string& stringValue,
-                             const std::string& charMapFile,
+TextAtlas* TextAtlas::create(std::string_view stringValue,
+                             std::string_view charMapFile,
                              int itemWidth,
                              int itemHeight,
-                             const std::string& startCharMap)
+                             std::string_view startCharMap)
 {
     TextAtlas* widget = new TextAtlas();
     if (widget->init())
@@ -83,11 +83,11 @@ TextAtlas* TextAtlas::create(const std::string& stringValue,
     return nullptr;
 }
 
-void TextAtlas::setProperty(const std::string& stringValue,
-                            const std::string& charMapFile,
+void TextAtlas::setProperty(std::string_view stringValue,
+                            std::string_view charMapFile,
                             int itemWidth,
                             int itemHeight,
-                            const std::string& startCharMap)
+                            std::string_view startCharMap)
 {
     _stringValue     = stringValue;
     _charMapFileName = charMapFile;
@@ -116,7 +116,7 @@ void TextAtlas::setString(std::string_view value)
     //    CCLOG("cssss w %f, h %f", _contentSize.width, _contentSize.height);
 }
 
-const std::string& TextAtlas::getString() const
+std::string_view TextAtlas::getString() const
 {
     return _labelAtlasRenderer->getString();
 }
diff --git a/cocos/ui/UITextAtlas.h b/cocos/ui/UITextAtlas.h
index f84739ada084..25b9817f570c 100644
--- a/cocos/ui/UITextAtlas.h
+++ b/cocos/ui/UITextAtlas.h
@@ -82,11 +82,11 @@ class CC_GUI_DLL TextAtlas : public Widget
      * @param startCharMap The starting char of the atlas.
      * @return An autoreleased TextAtlas object.
      */
-    static TextAtlas* create(const std::string& stringValue,
-                             const std::string& charMapFile,
+    static TextAtlas* create(std::string_view stringValue,
+                             std::string_view charMapFile,
                              int itemWidth,
                              int itemHeight,
-                             const std::string& startCharMap);
+                             std::string_view startCharMap);
 
     /** Initializes the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and
      * the starting char of the atlas.
@@ -98,11 +98,11 @@ class CC_GUI_DLL TextAtlas : public Widget
      * @param startCharMap The starting char of the atlas.
      */
 
-    void setProperty(const std::string& stringValue,
-                     const std::string& charMapFile,
+    void setProperty(std::string_view stringValue,
+                     std::string_view charMapFile,
                      int itemWidth,
                      int itemHeight,
-                     const std::string& startCharMap);
+                     std::string_view startCharMap);
 
     /**Set string value for labelatlas.
      *
@@ -114,7 +114,7 @@ class CC_GUI_DLL TextAtlas : public Widget
      *
      * @return The string value of TextAtlas.
      */
-    const std::string& getString() const;
+    std::string_view getString() const;
 
     /**
      * Gets the string length of the label.
diff --git a/cocos/ui/UITextBMFont.cpp b/cocos/ui/UITextBMFont.cpp
index 125f921598cc..28de90891b2e 100644
--- a/cocos/ui/UITextBMFont.cpp
+++ b/cocos/ui/UITextBMFont.cpp
@@ -53,7 +53,7 @@ TextBMFont* TextBMFont::create()
     return nullptr;
 }
 
-TextBMFont* TextBMFont::create(const std::string& text, const std::string& filename)
+TextBMFont* TextBMFont::create(std::string_view text, std::string_view filename)
 {
     TextBMFont* widget = new TextBMFont();
     if (widget->init())
@@ -73,7 +73,7 @@ void TextBMFont::initRenderer()
     addProtectedChild(_labelBMFontRenderer, LABELBMFONT_RENDERER_Z, -1);
 }
 
-void TextBMFont::setFntFile(const std::string& fileName)
+void TextBMFont::setFntFile(std::string_view fileName)
 {
     if (fileName.empty())
     {
@@ -86,7 +86,7 @@ void TextBMFont::setFntFile(const std::string& fileName)
     _labelBMFontRendererAdaptDirty = true;
 }
 
-void TextBMFont::setString(const std::string& value)
+void TextBMFont::setString(std::string_view value)
 {
     if (value == _labelBMFontRenderer->getString())
     {
@@ -98,7 +98,7 @@ void TextBMFont::setString(const std::string& value)
     _labelBMFontRendererAdaptDirty = true;
 }
 
-const std::string& TextBMFont::getString() const
+std::string_view TextBMFont::getString() const
 {
     return _stringValue;
 }
diff --git a/cocos/ui/UITextBMFont.h b/cocos/ui/UITextBMFont.h
index 70fb5564d1fd..eb3f16fc6756 100644
--- a/cocos/ui/UITextBMFont.h
+++ b/cocos/ui/UITextBMFont.h
@@ -69,16 +69,16 @@ class CC_GUI_DLL TextBMFont : public Widget
      */
     static TextBMFont* create();
 
-    static TextBMFont* create(const std::string& text, const std::string& filename);
+    static TextBMFont* create(std::string_view text, std::string_view filename);
 
     /** init a bitmap font atlas with an initial string and the FNT file */
-    void setFntFile(const std::string& fileName);
+    void setFntFile(std::string_view fileName);
 
     /** set string value for labelbmfont*/
-    void setString(const std::string& value);
+    void setString(std::string_view value);
 
     /** get string value for labelbmfont*/
-    const std::string& getString() const;
+    std::string_view getString() const;
 
     /**
      * Gets the string length of the label.
diff --git a/cocos/ui/UITextField.cpp b/cocos/ui/UITextField.cpp
index 25b75a61e23b..8e16b2a83a8a 100644
--- a/cocos/ui/UITextField.cpp
+++ b/cocos/ui/UITextField.cpp
@@ -52,7 +52,7 @@ UICCTextField::UICCTextField()
 
 UICCTextField::~UICCTextField() {}
 
-UICCTextField* UICCTextField::create(const std::string& placeholder, const std::string& fontName, float fontSize)
+UICCTextField* UICCTextField::create(std::string_view placeholder, std::string_view fontName, float fontSize)
 {
     UICCTextField* pRet = new UICCTextField();
 
@@ -191,12 +191,12 @@ bool UICCTextField::isPasswordEnabled() const
     return this->isSecureTextEntry();
 }
 
-void UICCTextField::setPasswordStyleText(const std::string& styleText)
+void UICCTextField::setPasswordStyleText(std::string_view styleText)
 {
     this->setPasswordTextStyle(styleText);
 }
 
-void UICCTextField::setPasswordText(const std::string& text)
+void UICCTextField::setPasswordText(std::string_view text)
 {
     std::string tempStr = "";
     int32_t text_count  = StringUtils::getCharacterCountInUTF8String(text);
@@ -292,7 +292,7 @@ TextField* TextField::create()
     return nullptr;
 }
 
-TextField* TextField::create(const std::string& placeholder, const std::string& fontName, int fontSize)
+TextField* TextField::create(std::string_view placeholder, std::string_view fontName, int fontSize)
 {
     TextField* widget = new TextField();
     if (widget->init())
@@ -358,7 +358,7 @@ Vec2 TextField::getTouchSize() const
     return Vec2(_touchWidth, _touchHeight);
 }
 
-void TextField::setString(const std::string& text)
+void TextField::setString(std::string_view text)
 {
     std::string strText(text);
 
@@ -386,14 +386,14 @@ void TextField::setString(const std::string& text)
     updateContentSizeWithTextureSize(_textFieldRenderer->getContentSize());
 }
 
-void TextField::setPlaceHolder(const std::string& value)
+void TextField::setPlaceHolder(std::string_view value)
 {
     _textFieldRenderer->setPlaceHolder(value);
     _textFieldRendererAdaptDirty = true;
     updateContentSizeWithTextureSize(_textFieldRenderer->getContentSize());
 }
 
-const std::string& TextField::getPlaceHolder() const
+std::string_view TextField::getPlaceHolder() const
 {
     return _textFieldRenderer->getPlaceHolder();
 }
@@ -449,11 +449,11 @@ int TextField::getFontSize() const
     return _fontSize;
 }
 
-void TextField::setFontName(const std::string& name)
+void TextField::setFontName(std::string_view name)
 {
     if (FileUtils::getInstance()->isFileExist(name))
     {
-        std::string lcName = name;
+        std::string lcName{name};
         std::transform(lcName.begin(), lcName.end(), lcName.begin(), ::tolower);
         if (lcName.substr(lcName.length() - 4) == ".fnt")
         {
@@ -483,7 +483,7 @@ void TextField::setFontName(const std::string& name)
     updateContentSizeWithTextureSize(_textFieldRenderer->getContentSize());
 }
 
-const std::string& TextField::getFontName() const
+std::string_view TextField::getFontName() const
 {
     return _fontName;
 }
@@ -493,7 +493,7 @@ void TextField::didNotSelectSelf()
     _textFieldRenderer->detachWithIME();
 }
 
-const std::string& TextField::getString() const
+std::string_view TextField::getString() const
 {
     return _textFieldRenderer->getString();
 }
@@ -563,7 +563,7 @@ void TextField::setPasswordStyleText(const char* styleText)
 
 const char* TextField::getPasswordStyleText() const
 {
-    return _textFieldRenderer->getPasswordTextStyle().c_str();
+    return _textFieldRenderer->getPasswordTextStyle().data();
 }
 
 void TextField::update(float /*dt*/)
diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h
index 2e9c8a8362fc..c39bcc410b6d 100644
--- a/cocos/ui/UITextField.h
+++ b/cocos/ui/UITextField.h
@@ -74,7 +74,7 @@ class CC_GUI_DLL UICCTextField : public TextFieldTTF, public TextFieldDelegate
      *@param fontSize Font size in float.
      *@return A UICCTextField instance.
      */
-    static UICCTextField* create(const std::string& placeholder, const std::string& fontName, float fontSize);
+    static UICCTextField* create(std::string_view placeholder, std::string_view fontName, float fontSize);
 
     // override functions
     virtual bool onTextFieldAttachWithIME(TextFieldTTF* pSender) override;
@@ -142,14 +142,14 @@ class CC_GUI_DLL UICCTextField : public TextFieldTTF, public TextFieldDelegate
      *
      * @param styleText The styleText for password mask, the default value is "*".
      */
-    void setPasswordStyleText(const std::string& styleText);
+    void setPasswordStyleText(std::string_view styleText);
 
     /**
      * @brief Set the password text content.
      *
      * @param text The content of password.
      */
-    void setPasswordText(const std::string& text);
+    void setPasswordText(std::string_view text);
 
     /**
      * @brief Toggle attach with IME.
@@ -270,7 +270,7 @@ class CC_GUI_DLL TextField : public Widget
      * @param fontSize The font size.
      * @return A TextField instance.
      */
-    static TextField* create(const std::string& placeholder, const std::string& fontName, int fontSize);
+    static TextField* create(std::string_view placeholder, std::string_view fontName, int fontSize);
 
     /**
      * @brief Set the touch size
@@ -300,14 +300,14 @@ class CC_GUI_DLL TextField : public Widget
      *
      * @param value The string value of placeholder.
      */
-    void setPlaceHolder(const std::string& value);
+    void setPlaceHolder(std::string_view value);
 
     /**
      * @brief Get the placeholder of TextField.
      *
      * @return A placeholder string.
      */
-    const std::string& getPlaceHolder() const;
+    std::string_view getPlaceHolder() const;
 
     /**
      * @brief Query the placeholder string color.
@@ -363,14 +363,14 @@ class CC_GUI_DLL TextField : public Widget
      *
      * @param name The font name string.
      */
-    void setFontName(const std::string& name);
+    void setFontName(std::string_view name);
 
     /**
      * @brief Query the TextField's font name.
      *
      * @return The font name string.
      */
-    const std::string& getFontName() const;
+    std::string_view getFontName() const;
 
     /**
      * @brief Detach the IME.
@@ -381,13 +381,13 @@ class CC_GUI_DLL TextField : public Widget
      *Change content of TextField.
      *@param text A string content.
      */
-    void setString(const std::string& text);
+    void setString(std::string_view text);
 
     /**
      *Query the content of TextField.
      *@return The string value of TextField.
      */
-    const std::string& getString() const;
+    std::string_view getString() const;
 
     virtual bool onTouchBegan(Touch* touch, Event* unusedEvent) override;
 
diff --git a/cocos/ui/UITextFieldEx.cpp b/cocos/ui/UITextFieldEx.cpp
index 90e45b4a2854..a14258c1b8c3 100644
--- a/cocos/ui/UITextFieldEx.cpp
+++ b/cocos/ui/UITextFieldEx.cpp
@@ -28,8 +28,8 @@ NS_CC_BEGIN
 #    define nxbeep(t)
 #endif
 
-static Label* createLabel(const std::string& text,
-                          const std::string& font,
+static Label* createLabel(std::string_view text,
+                          std::string_view font,
                           float fontSize,
                           const Vec2& dimensions    = Vec2::ZERO,
                           TextHAlignment hAlignment = TextHAlignment::LEFT,
@@ -161,7 +161,7 @@ static int _truncateUTF8String(const char* text, int limit, int& nb)
     return n;
 }
 
-static void internalSetLableFont(Label* l, const std::string& fontName, float fontSize)
+static void internalSetLableFont(Label* l, std::string_view fontName, float fontSize)
 {
     if (FileUtils::getInstance()->isFileExist(fontName))
     {
@@ -178,7 +178,7 @@ static void internalSetLableFont(Label* l, const std::string& fontName, float fo
     }
 }
 
-static float internalCalcStringWidth(std::string_view s, const std::string& fontName, float fontSize)
+static float internalCalcStringWidth(std::string_view s, std::string_view fontName, float fontSize)
 {
     auto label = createLabel(std::string{s}, fontName, fontSize);
     return label->getContentSize().width;
@@ -269,8 +269,8 @@ TextFieldEx::~TextFieldEx()
 //////////////////////////////////////////////////////////////////////////
 // static constructor
 //////////////////////////////////////////////////////////////////////////
-TextFieldEx* TextFieldEx::create(const std::string& placeholder,
-                                 const std::string& fontName,
+TextFieldEx* TextFieldEx::create(std::string_view placeholder,
+                                 std::string_view fontName,
                                  float fontSize,
                                  float cursorWidth,
                                  const Color4B& cursorColor)
@@ -292,8 +292,8 @@ TextFieldEx* TextFieldEx::create(const std::string& placeholder,
 //////////////////////////////////////////////////////////////////////////
 // initialize
 //////////////////////////////////////////////////////////////////////////
-bool TextFieldEx::initWithPlaceHolder(const std::string& placeholder,
-                                      const std::string& fontName,
+bool TextFieldEx::initWithPlaceHolder(std::string_view placeholder,
+                                      std::string_view fontName,
                                       float fontSize,
                                       float cursorWidth,
                                       const Color4B& cursorColor)
@@ -316,12 +316,12 @@ bool TextFieldEx::initWithPlaceHolder(const std::string& placeholder,
     return true;
 }
 
-const std::string& TextFieldEx::getTextFontName() const
+std::string_view TextFieldEx::getTextFontName() const
 {
     return this->fontName;
 }
 
-void TextFieldEx::setTextFontName(const std::string& fontName)
+void TextFieldEx::setTextFontName(std::string_view fontName)
 {
     if (FileUtils::getInstance()->isFileExist(fontName))
     {
@@ -740,7 +740,7 @@ void TextFieldEx::handleDeleteKeyEvent()
         this->onTextModify();
 }
 
-const std::string& TextFieldEx::getContentText()
+std::string_view TextFieldEx::getContentText()
 {
     return inputText;
 }
@@ -784,7 +784,7 @@ void TextFieldEx::setPlaceholderColor(const Color4B& color)
 //////////////////////////////////////////////////////////////////////////
 
 // input text property
-void TextFieldEx::setString(const std::string& text)
+void TextFieldEx::setString(std::string_view text)
 {
     static char bulletString[] = {(char)0xe2, (char)0x80, (char)0xa2, (char)0x00};
 
@@ -838,13 +838,13 @@ void TextFieldEx::updateContentSize(void)
     this->setContentSize(renderLabel->getContentSize());
 }
 
-const std::string& TextFieldEx::getString() const
+std::string_view TextFieldEx::getString() const
 {
     return inputText;
 }
 
 // place holder text property
-void TextFieldEx::setPlaceholderText(const std::string& text)
+void TextFieldEx::setPlaceholderText(std::string_view text)
 {
     placeHolder = text;
     if (inputText.empty())
@@ -854,7 +854,7 @@ void TextFieldEx::setPlaceholderText(const std::string& text)
     }
 }
 
-const std::string& TextFieldEx::getPlaceholderText() const
+std::string_view TextFieldEx::getPlaceholderText() const
 {
     return placeHolder;
 }
diff --git a/cocos/ui/UITextFieldEx.h b/cocos/ui/UITextFieldEx.h
index b94a7c7a2b65..a337388c0f94 100644
--- a/cocos/ui/UITextFieldEx.h
+++ b/cocos/ui/UITextFieldEx.h
@@ -29,14 +29,14 @@ class CC_DLL TextFieldEx : public cocos2d::Node, public IMEDelegate
      */
     virtual ~TextFieldEx();
 
-    static TextFieldEx* create(const std::string& placeholder,
-                               const std::string& fontName,
+    static TextFieldEx* create(std::string_view placeholder,
+                               std::string_view fontName,
                                float fontSize,
                                float cursorWidth    = 2,
                                const Color4B& color = Color4B::WHITE);
 
-    bool initWithPlaceHolder(const std::string& placeholder,
-                             const std::string& fontName,
+    bool initWithPlaceHolder(std::string_view placeholder,
+                             std::string_view fontName,
                              float fontSize,
                              float cursorWidth    = 2,
                              const Color4B& color = Color4B::WHITE);
@@ -58,8 +58,8 @@ class CC_DLL TextFieldEx : public cocos2d::Node, public IMEDelegate
     const Color3B& getCursorColor(void) const;
 
     // input text property
-    virtual void setString(const std::string& text);
-    virtual const std::string& getString() const;
+    virtual void setString(std::string_view text);
+    virtual std::string_view getString() const;
 
     // Continuous touch event trigger support.
     void setContinuousTouchDelayTime(float delay) { _continuousTouchDelayTime = delay; }
@@ -71,8 +71,8 @@ class CC_DLL TextFieldEx : public cocos2d::Node, public IMEDelegate
 
     // place holder text property
     // place holder text displayed when there is no text in the text field.
-    virtual void setPlaceholderText(const std::string& text);
-    virtual const std::string& getPlaceholderText(void) const;
+    virtual void setPlaceholderText(std::string_view text);
+    virtual std::string_view getPlaceholderText(void) const;
 
     virtual void setPasswordEnabled(bool value);
     virtual bool isPasswordEnabled() const;
@@ -97,8 +97,8 @@ class CC_DLL TextFieldEx : public cocos2d::Node, public IMEDelegate
     /// fonts
     void setTextFontSize(float size);
     float getTextFontSize() const;
-    void setTextFontName(const std::string& fontName);
-    const std::string& getTextFontName() const;
+    void setTextFontName(std::string_view fontName);
+    std::string_view getTextFontName() const;
 
     CC_SYNTHESIZE(size_t, charLimit, CharLimit);
 
@@ -122,7 +122,7 @@ class CC_DLL TextFieldEx : public cocos2d::Node, public IMEDelegate
     virtual bool canDetachWithIME() override;
 
     virtual void deleteBackward() override;
-    virtual const std::string& getContentText() override;
+    virtual std::string_view getContentText() override;
 
     void handleDeleteKeyEvent();
 
diff --git a/cocos/ui/UIVideoPlayer-android.cpp b/cocos/ui/UIVideoPlayer-android.cpp
index dab2aafc7be2..0f61d490fc31 100644
--- a/cocos/ui/UIVideoPlayer-android.cpp
+++ b/cocos/ui/UIVideoPlayer-android.cpp
@@ -38,7 +38,7 @@
 
 //-----------------------------------------------------------------------------------------------------------
 
-static const std::string videoHelperClassName = "org.cocos2dx.lib.Cocos2dxVideoHelper";
+static const char* videoHelperClassName = "org.cocos2dx.lib.Cocos2dxVideoHelper";
 
 USING_NS_CC;
 
@@ -60,7 +60,7 @@ int createVideoWidgetJNI()
 {
     JniMethodInfo t;
     int ret = -1;
-    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName.c_str(), "createVideoWidget", "()I"))
+    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName, "createVideoWidget", "()I"))
     {
         ret = t.env->CallStaticIntMethod(t.classID, t.methodID);
 
@@ -73,7 +73,7 @@ int createVideoWidgetJNI()
 void setLoopingJNI(int index, bool looping)
 {
     JniMethodInfo t;
-    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName.c_str(), "setLooping", "(IZ)V"))
+    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName, "setLooping", "(IZ)V"))
     {
         t.env->CallStaticVoidMethod(t.classID, t.methodID, index, looping);
 
@@ -84,7 +84,7 @@ void setLoopingJNI(int index, bool looping)
 void setUserInputEnabledJNI(int index, bool enableInput)
 {
     JniMethodInfo t;
-    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName.c_str(), "setUserInputEnabled", "(IZ)V"))
+    if (JniHelper::getStaticMethodInfo(t, videoHelperClassName, "setUserInputEnabled", "(IZ)V"))
     {
         t.env->CallStaticVoidMethod(t.classID, t.methodID, index, enableInput);
 
@@ -124,7 +124,7 @@ VideoPlayer::~VideoPlayer()
     JniHelper::callStaticVoidMethod(videoHelperClassName, "removeVideoWidget", _videoPlayerIndex);
 }
 
-void VideoPlayer::setFileName(const std::string& fileName)
+void VideoPlayer::setFileName(std::string_view fileName)
 {
     _videoURL    = FileUtils::getInstance()->fullPathForFilename(fileName);
     _videoSource = VideoPlayer::Source::FILENAME;
@@ -132,7 +132,7 @@ void VideoPlayer::setFileName(const std::string& fileName)
                                     _videoURL);
 }
 
-void VideoPlayer::setURL(const std::string& videoUrl)
+void VideoPlayer::setURL(std::string_view videoUrl)
 {
     _videoURL    = videoUrl;
     _videoSource = VideoPlayer::Source::URL;
diff --git a/cocos/ui/UIVideoPlayer-ios.mm b/cocos/ui/UIVideoPlayer-ios.mm
index f41d63a57f75..c1494ed51161 100644
--- a/cocos/ui/UIVideoPlayer-ios.mm
+++ b/cocos/ui/UIVideoPlayer-ios.mm
@@ -31,11 +31,11 @@ of this software and associated documentation files (the "Software"), to deal
 using namespace cocos2d::ui;
 //-------------------------------------------------------------------------------------
 
-#include "platform/ios/CCEAGLView-ios.h"
-#import <AVKit/AVPlayerViewController.h>
-#import <CoreMedia/CMTime.h>
-#include "base/CCDirector.h"
-#include "platform/CCFileUtils.h"
+#    include "platform/ios/CCEAGLView-ios.h"
+#    import <AVKit/AVPlayerViewController.h>
+#    import <CoreMedia/CMTime.h>
+#    include "base/CCDirector.h"
+#    include "platform/CCFileUtils.h"
 
 @interface UIVideoViewWrapperIos : NSObject
 
@@ -47,31 +47,29 @@ typedef NS_ENUM(NSInteger, PlayerbackState) {
     PlayerbackStateCompleted
 };
 
-@property (assign, nonatomic) AVPlayerViewController * playerController;
-
-- (void) setFrame:(int) left :(int) top :(int) width :(int) height;
-- (void) setURL:(int) videoSource :(std::string&) videoUrl;
-- (void) play;
-- (void) pause;
-- (void) resume;
-- (void) stop;
-- (void) seekTo:(float) sec;
-- (void) setVisible:(BOOL) visible;
-- (void) setKeepRatioEnabled:(BOOL) enabled;
-- (void) setFullScreenEnabled:(BOOL) enabled;
-- (BOOL) isFullScreenEnabled;
-- (void) showPlaybackControls:(BOOL) value;
-- (void) setRepeatEnabled:(BOOL)enabled;
-- (void) setUserInteractionEnabled:(BOOL)userInteractionEnabled;
-
-
--(id) init:(void*) videoPlayer;
--(void) videoFinished:(NSNotification*) notification;
+@property(assign, nonatomic) AVPlayerViewController* playerController;
+
+- (void)setFrame:(int)left:(int)top:(int)width:(int)height;
+- (void)setURL:(int)videoSource:(std::string&)videoUrl;
+- (void)play;
+- (void)pause;
+- (void)resume;
+- (void)stop;
+- (void)seekTo:(float)sec;
+- (void)setVisible:(BOOL)visible;
+- (void)setKeepRatioEnabled:(BOOL)enabled;
+- (void)setFullScreenEnabled:(BOOL)enabled;
+- (BOOL)isFullScreenEnabled;
+- (void)showPlaybackControls:(BOOL)value;
+- (void)setRepeatEnabled:(BOOL)enabled;
+- (void)setUserInteractionEnabled:(BOOL)userInteractionEnabled;
+
+- (id)init:(void*)videoPlayer;
+- (void)videoFinished:(NSNotification*)notification;
 
 @end
 
-@implementation UIVideoViewWrapperIos
-{
+@implementation UIVideoViewWrapperIos {
     int _left;
     int _top;
     int _width;
@@ -84,24 +82,25 @@ @implementation UIVideoViewWrapperIos
     VideoPlayer* _videoPlayer;
 }
 
--(id)init:(void*)videoPlayer
+- (id)init:(void*)videoPlayer
 {
-    if (self = [super init]) {
+    if (self = [super init])
+    {
         self.playerController = [AVPlayerViewController new];
 
         [self setRepeatEnabled:FALSE];
         [self showPlaybackControls:TRUE];
         [self setUserInteractionEnabled:TRUE];
         [self setKeepRatioEnabled:FALSE];
-        
+
         _videoPlayer = (VideoPlayer*)videoPlayer;
-        _state = PlayerbackStateUnknown;
+        _state       = PlayerbackStateUnknown;
     }
 
     return self;
 }
 
--(void) dealloc
+- (void)dealloc
 {
     _videoPlayer = nullptr;
     [self clean];
@@ -109,44 +108,44 @@ -(void) dealloc
     [super dealloc];
 }
 
--(void) clean
+- (void)clean
 {
     [self stop];
     [self removePlayerEventListener];
     [self.playerController.view removeFromSuperview];
 }
 
--(void) setFrame:(int)left :(int)top :(int)width :(int)height
+- (void)setFrame:(int)left:(int)top:(int)width:(int)height
 {
-    _left = left;
-    _width = width;
-    _top = top;
+    _left   = left;
+    _width  = width;
+    _top    = top;
     _height = height;
     [self.playerController.view setFrame:CGRectMake(left, top, width, height)];
 }
 
--(void) setFullScreenEnabled:(BOOL) enabled
+- (void)setFullScreenEnabled:(BOOL)enabled
 {
     // AVPlayerViewController doesn't provide API to enable fullscreen. But you can toggle
     // fullsreen by the playback controllers.
 }
 
--(BOOL) isFullScreenEnabled
+- (BOOL)isFullScreenEnabled
 {
     return false;
 }
 
-
--(void) showPlaybackControls:(BOOL)value
+- (void)showPlaybackControls:(BOOL)value
 {
-    _showPlaybackControls = value;
+    _showPlaybackControls                       = value;
     self.playerController.showsPlaybackControls = value;
 }
 
--(void) setRepeatEnabled:(BOOL)enabled
+- (void)setRepeatEnabled:(BOOL)enabled
 {
     _repeatEnabled = enabled;
-    if (self.playerController.player) {
+    if (self.playerController.player)
+    {
         if (_repeatEnabled)
             self.playerController.player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
         else
@@ -154,57 +153,61 @@ -(void) setRepeatEnabled:(BOOL)enabled
     }
 }
 
--(void) setUserInteractionEnabled:(BOOL)userInteractionEnabled
+- (void)setUserInteractionEnabled:(BOOL)userInteractionEnabled
 {
-    _userInteractionEnabled = userInteractionEnabled;
+    _userInteractionEnabled                           = userInteractionEnabled;
     self.playerController.view.userInteractionEnabled = _userInteractionEnabled;
 }
 
--(void) setURL:(int)videoSource :(std::string &)videoUrl
+- (void)setURL:(int)videoSource:(std::string&)videoUrl
 {
     [self clean];
 
     if (videoSource == 1)
-        self.playerController.player = [[[AVPlayer alloc] initWithURL:[NSURL URLWithString:@(videoUrl.c_str())]] autorelease];
+        self.playerController.player =
+            [[[AVPlayer alloc] initWithURL:[NSURL URLWithString:@(videoUrl.c_str())]] autorelease];
     else
-        self.playerController.player = [[[AVPlayer alloc] initWithURL:[NSURL fileURLWithPath:@(videoUrl.c_str())]] autorelease];
+        self.playerController.player =
+            [[[AVPlayer alloc] initWithURL:[NSURL fileURLWithPath:@(videoUrl.c_str())]] autorelease];
 
     [self setRepeatEnabled:_repeatEnabled];
     [self setKeepRatioEnabled:_keepRatioEnabled];
     [self setUserInteractionEnabled:_userInteractionEnabled];
     [self showPlaybackControls:_showPlaybackControls];
 
-    auto view = cocos2d::Director::getInstance()->getOpenGLView();
-    auto eaglview = (CCEAGLView *) view->getEAGLView();
+    auto view     = cocos2d::Director::getInstance()->getOpenGLView();
+    auto eaglview = (CCEAGLView*)view->getEAGLView();
     [eaglview addSubview:self.playerController.view];
     [self registerPlayerEventListener];
 }
 
--(void) videoFinished:(NSNotification *)notification
+- (void)videoFinished:(NSNotification*)notification
 {
-    if(_videoPlayer != nullptr) {
+    if (_videoPlayer != nullptr)
+    {
         _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::COMPLETED);
         _state = PlayerbackStateCompleted;
 
-        if (_repeatEnabled) {
+        if (_repeatEnabled)
+        {
             [self seekTo:0];
             [self play];
         }
     }
 }
 
--(void) seekTo:(float)sec
+- (void)seekTo:(float)sec
 {
     if (self.playerController.player)
         [self.playerController.player seekToTime:CMTimeMake(sec, 1)];
 }
 
--(void) setVisible:(BOOL)visible
+- (void)setVisible:(BOOL)visible
 {
     [self.playerController.view setHidden:!visible];
 }
 
--(void) setKeepRatioEnabled:(BOOL)enabled
+- (void)setKeepRatioEnabled:(BOOL)enabled
 {
     _keepRatioEnabled = enabled;
     if (_keepRatioEnabled)
@@ -213,38 +216,41 @@ -(void) setKeepRatioEnabled:(BOOL)enabled
         self.playerController.videoGravity = AVLayerVideoGravityResizeAspectFill;
 }
 
--(void) play
+- (void)play
 {
-    if (self.playerController.player && _state != PlayerbackStatePlaying) {
+    if (self.playerController.player && _state != PlayerbackStatePlaying)
+    {
         [self.playerController.player play];
         _state = PlayerbackStatePlaying;
         _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::PLAYING);
     }
 }
 
--(void) pause
+- (void)pause
 {
-    if (self.playerController.player && _state == PlayerbackStatePlaying) {
+    if (self.playerController.player && _state == PlayerbackStatePlaying)
+    {
         [self.playerController.player pause];
         _state = PlayerbackStatePaused;
         _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::PAUSED);
     }
 }
 
--(void) resume
+- (void)resume
 {
     if (self.playerController.player && _state == PlayerbackStatePaused)
         [self play];
 }
 
--(void) stop
+- (void)stop
 {
     // AVPlayer doesn't have stop, so just pause it, and seek time to 0.
-    if (self.playerController.player && _state != PlayerbackStopped) {
+    if (self.playerController.player && _state != PlayerbackStopped)
+    {
         [self seekTo:0];
         [self.playerController.player pause];
         _state = PlayerbackStopped;
-        
+
         // stop() will be invoked in dealloc, which is invoked by _videoPlayer's destructor,
         // so do't send the message when _videoPlayer is being deleted.
         if (_videoPlayer)
@@ -252,21 +258,21 @@ -(void) stop
     }
 }
 
--(void) registerPlayerEventListener
+- (void)registerPlayerEventListener
 {
     if (self.playerController.player)
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(videoFinished:)
-                                                 name:AVPlayerItemDidPlayToEndTimeNotification
-                                                 object:self.playerController.player.currentItem];
+                                                     name:AVPlayerItemDidPlayToEndTimeNotification
+                                                   object:self.playerController.player.currentItem];
 }
 
--(void) removePlayerEventListener
+- (void)removePlayerEventListener
 {
     if (self.playerController.player)
         [[NSNotificationCenter defaultCenter] removeObserver:self
-                                              name:AVPlayerItemDidPlayToEndTimeNotification
-                                              object:self.playerController.player.currentItem];
+                                                        name:AVPlayerItemDidPlayToEndTimeNotification
+                                                      object:self.playerController.player.currentItem];
 }
 
 @end
@@ -276,32 +282,32 @@ -(void) removePlayerEventListener
 {
     _videoView = [[UIVideoViewWrapperIos alloc] init:this];
 
-#if CC_VIDEOPLAYER_DEBUG_DRAW
+#    if CC_VIDEOPLAYER_DEBUG_DRAW
     _debugDrawNode = DrawNode::create();
     addChild(_debugDrawNode);
-#endif
+#    endif
 }
 
 VideoPlayer::~VideoPlayer()
 {
-    if(_videoView)
+    if (_videoView)
     {
         [((UIVideoViewWrapperIos*)_videoView) dealloc];
     }
 }
 
-void VideoPlayer::setFileName(const std::string& fileName)
+void VideoPlayer::setFileName(std::string_view fileName)
 {
-    _videoURL = FileUtils::getInstance()->fullPathForFilename(fileName);
+    _videoURL    = FileUtils::getInstance()->fullPathForFilename(fileName);
     _videoSource = VideoPlayer::Source::FILENAME;
-    [((UIVideoViewWrapperIos*)_videoView) setURL:(int)_videoSource :_videoURL];
+    [((UIVideoViewWrapperIos*)_videoView) setURL:(int) _videoSource:_videoURL];
 }
 
-void VideoPlayer::setURL(const std::string& videoUrl)
+void VideoPlayer::setURL(std::string_view videoUrl)
 {
-    _videoURL = videoUrl;
+    _videoURL    = videoUrl;
     _videoSource = VideoPlayer::Source::URL;
-    [((UIVideoViewWrapperIos*)_videoView) setURL:(int)_videoSource :_videoURL];
+    [((UIVideoViewWrapperIos*)_videoView) setURL:(int) _videoSource:_videoURL];
 }
 
 void VideoPlayer::setLooping(bool looping)
@@ -320,56 +326,52 @@ -(void) removePlayerEventListener
 {
     _styleType = style;
 
-    switch (style) {
-        case StyleType::DEFAULT:
-            [((UIVideoViewWrapperIos*)_videoView) showPlaybackControls:TRUE];
-            break;
+    switch (style)
+    {
+    case StyleType::DEFAULT:
+        [((UIVideoViewWrapperIos*)_videoView) showPlaybackControls:TRUE];
+        break;
 
-        case StyleType::NONE:
-            [((UIVideoViewWrapperIos*)_videoView) showPlaybackControls:FALSE];
-            break;
+    case StyleType::NONE:
+        [((UIVideoViewWrapperIos*)_videoView) showPlaybackControls:FALSE];
+        break;
     }
 }
 
-void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags)
+void VideoPlayer::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
-    cocos2d::ui::Widget::draw(renderer,transform,flags);
+    cocos2d::ui::Widget::draw(renderer, transform, flags);
 
     if (flags & FLAGS_TRANSFORM_DIRTY)
     {
         auto directorInstance = Director::getInstance();
-        auto glView = directorInstance->getOpenGLView();
-        auto frameSize = glView->getFrameSize();
-        auto scaleFactor = [static_cast<CCEAGLView *>(glView->getEAGLView()) contentScaleFactor];
+        auto glView           = directorInstance->getOpenGLView();
+        auto frameSize        = glView->getFrameSize();
+        auto scaleFactor      = [static_cast<CCEAGLView*>(glView->getEAGLView()) contentScaleFactor];
 
         auto winSize = directorInstance->getWinSize();
 
         auto leftBottom = convertToWorldSpace(Vec2::ZERO);
-        auto rightTop = convertToWorldSpace(Vec2(_contentSize.width,_contentSize.height));
+        auto rightTop   = convertToWorldSpace(Vec2(_contentSize.width, _contentSize.height));
 
-        auto uiLeft = (frameSize.width / 2 + (leftBottom.x - winSize.width / 2 ) * glView->getScaleX()) / scaleFactor;
-        auto uiTop = (frameSize.height /2 - (rightTop.y - winSize.height / 2) * glView->getScaleY()) / scaleFactor;
+        auto uiLeft = (frameSize.width / 2 + (leftBottom.x - winSize.width / 2) * glView->getScaleX()) / scaleFactor;
+        auto uiTop  = (frameSize.height / 2 - (rightTop.y - winSize.height / 2) * glView->getScaleY()) / scaleFactor;
 
-        [((UIVideoViewWrapperIos*)_videoView) setFrame :uiLeft :uiTop
-                                                          :(rightTop.x - leftBottom.x) * glView->getScaleX() / scaleFactor
-                                                          :( (rightTop.y - leftBottom.y) * glView->getScaleY()/scaleFactor)];
+        [((UIVideoViewWrapperIos*)_videoView) setFrame:
+                                                uiLeft:uiTop:(rightTop.x - leftBottom.x) * glView->getScaleX() /
+                                           scaleFactor:((rightTop.y - leftBottom.y) * glView->getScaleY() /
+                                                        scaleFactor)];
     }
 
-#if CC_VIDEOPLAYER_DEBUG_DRAW
+#    if CC_VIDEOPLAYER_DEBUG_DRAW
     _debugDrawNode->clear();
-    auto size = getContentSize();
-    Point vertices[4]=
-    {
-        Point::ZERO,
-        Point(size.width, 0),
-        Point(size.width, size.height),
-        Point(0, size.height)
-    };
+    auto size         = getContentSize();
+    Point vertices[4] = {Point::ZERO, Point(size.width, 0), Point(size.width, size.height), Point(0, size.height)};
     _debugDrawNode->drawPoly(vertices, 4, true, Color4F(1.0, 1.0, 1.0, 1.0));
-#endif
+#    endif
 }
 
-bool VideoPlayer::isFullScreenEnabled()const
+bool VideoPlayer::isFullScreenEnabled() const
 {
     return [((UIVideoViewWrapperIos*)_videoView) isFullScreenEnabled];
 }
@@ -390,7 +392,7 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::play()
 {
-    if (! _videoURL.empty())
+    if (!_videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) play];
     }
@@ -398,7 +400,7 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::pause()
 {
-    if (! _videoURL.empty())
+    if (!_videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) pause];
     }
@@ -406,7 +408,7 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::resume()
 {
-    if (! _videoURL.empty())
+    if (!_videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) resume];
     }
@@ -414,7 +416,7 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::stop()
 {
-    if (! _videoURL.empty())
+    if (!_videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) stop];
     }
@@ -422,7 +424,7 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::seekTo(float sec)
 {
-    if (! _videoURL.empty())
+    if (!_videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) seekTo:sec];
     }
@@ -451,7 +453,7 @@ -(void) removePlayerEventListener
     {
         [((UIVideoViewWrapperIos*)_videoView) setVisible:NO];
     }
-    else if(isRunning())
+    else if (isRunning())
     {
         [((UIVideoViewWrapperIos*)_videoView) setVisible:YES];
     }
@@ -462,14 +464,14 @@ -(void) removePlayerEventListener
     Widget::onEnter();
     if (isVisible())
     {
-        [((UIVideoViewWrapperIos*)_videoView) setVisible: YES];
+        [((UIVideoViewWrapperIos*)_videoView) setVisible:YES];
     }
 }
 
 void VideoPlayer::onExit()
 {
     Widget::onExit();
-    [((UIVideoViewWrapperIos*)_videoView) setVisible: NO];
+    [((UIVideoViewWrapperIos*)_videoView) setVisible:NO];
 }
 
 void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& callback)
@@ -479,9 +481,12 @@ -(void) removePlayerEventListener
 
 void VideoPlayer::onPlayEvent(int event)
 {
-    if (event == (int)VideoPlayer::EventType::PLAYING) {
+    if (event == (int)VideoPlayer::EventType::PLAYING)
+    {
         _isPlaying = true;
-    } else {
+    }
+    else
+    {
         _isPlaying = false;
     }
 
@@ -496,23 +501,23 @@ -(void) removePlayerEventListener
     return VideoPlayer::create();
 }
 
-void VideoPlayer::copySpecialProperties(Widget *widget)
+void VideoPlayer::copySpecialProperties(Widget* widget)
 {
     VideoPlayer* videoPlayer = dynamic_cast<VideoPlayer*>(widget);
     if (videoPlayer)
     {
-        _isPlaying = videoPlayer->_isPlaying;
-        _isLooping = videoPlayer->_isLooping;
-        _isUserInputEnabled = videoPlayer->_isUserInputEnabled;
-        _styleType = videoPlayer->_styleType;
-        _fullScreenEnabled = videoPlayer->_fullScreenEnabled;
-        _fullScreenDirty = videoPlayer->_fullScreenDirty;
-        _videoURL = videoPlayer->_videoURL;
+        _isPlaying              = videoPlayer->_isPlaying;
+        _isLooping              = videoPlayer->_isLooping;
+        _isUserInputEnabled     = videoPlayer->_isUserInputEnabled;
+        _styleType              = videoPlayer->_styleType;
+        _fullScreenEnabled      = videoPlayer->_fullScreenEnabled;
+        _fullScreenDirty        = videoPlayer->_fullScreenDirty;
+        _videoURL               = videoPlayer->_videoURL;
         _keepAspectRatioEnabled = videoPlayer->_keepAspectRatioEnabled;
-        _videoSource = videoPlayer->_videoSource;
-        _videoPlayerIndex = videoPlayer->_videoPlayerIndex;
-        _eventCallback = videoPlayer->_eventCallback;
-        _videoView = videoPlayer->_videoView;
+        _videoSource            = videoPlayer->_videoSource;
+        _videoPlayerIndex       = videoPlayer->_videoPlayerIndex;
+        _eventCallback          = videoPlayer->_eventCallback;
+        _videoView              = videoPlayer->_videoView;
     }
 }
 
diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h
index c97d5c3b7bae..76e82663f23f 100644
--- a/cocos/ui/UIVideoPlayer.h
+++ b/cocos/ui/UIVideoPlayer.h
@@ -86,26 +86,26 @@ class VideoPlayer : public cocos2d::ui::Widget
     /**
      * Sets a file path as a video source for VideoPlayer.
      */
-    virtual void setFileName(const std::string& videoPath);
+    virtual void setFileName(std::string_view videoPath);
 
     /**
      * @brief Get the local video file name.
      *
      * @return The video file name.
      */
-    virtual const std::string& getFileName() const { return _videoURL; }
+    virtual std::string_view getFileName() const { return _videoURL; }
 
     /**
      * Sets a URL as a video source for VideoPlayer.
      */
-    virtual void setURL(const std::string& _videoURL);
+    virtual void setURL(std::string_view _videoURL);
 
     /**
      * @brief Get the URL of remoting video source.
      *
      * @return A remoting URL address.
      */
-    virtual const std::string& getURL() const { return _videoURL; }
+    virtual std::string_view getURL() const { return _videoURL; }
 
     /**
      * @brief Set if playback is done in loop mode
diff --git a/cocos/ui/UIWebView/UIWebView-inl.h b/cocos/ui/UIWebView/UIWebView-inl.h
index 586aecc8e58f..8f510b017723 100644
--- a/cocos/ui/UIWebView/UIWebView-inl.h
+++ b/cocos/ui/UIWebView/UIWebView-inl.h
@@ -53,35 +53,35 @@ WebView* WebView::create()
     return nullptr;
 }
 
-void WebView::setJavascriptInterfaceScheme(const std::string& scheme)
+void WebView::setJavascriptInterfaceScheme(std::string_view scheme)
 {
     _impl->setJavascriptInterfaceScheme(scheme);
 }
 
 void WebView::loadData(const cocos2d::Data& data,
-                       const std::string& MIMEType,
-                       const std::string& encoding,
-                       const std::string& baseURL)
+                       std::string_view MIMEType,
+                       std::string_view encoding,
+                       std::string_view baseURL)
 {
     _impl->loadData(data, MIMEType, encoding, baseURL);
 }
 
-void WebView::loadHTMLString(const std::string& string, const std::string& baseURL)
+void WebView::loadHTMLString(std::string_view string, std::string_view baseURL)
 {
     _impl->loadHTMLString(string, baseURL);
 }
 
-void WebView::loadURL(const std::string& url)
+void WebView::loadURL(std::string_view url)
 {
     this->loadURL(url, false);
 }
 
-void WebView::loadURL(const std::string& url, bool cleanCachedData)
+void WebView::loadURL(std::string_view url, bool cleanCachedData)
 {
     _impl->loadURL(url, cleanCachedData);
 }
 
-void WebView::loadFile(const std::string& fileName)
+void WebView::loadFile(std::string_view fileName)
 {
     _impl->loadFile(fileName);
 }
@@ -116,7 +116,7 @@ void WebView::goForward()
     _impl->goForward();
 }
 
-void WebView::evaluateJS(const std::string& js)
+void WebView::evaluateJS(std::string_view js)
 {
     _impl->evaluateJS(js);
 }
@@ -204,7 +204,7 @@ void WebView::setOnDidFinishLoading(const ccWebViewCallback& callback)
     _onDidFinishLoading = callback;
 }
 
-void WebView::setOnShouldStartLoading(const std::function<bool(WebView* sender, const std::string& url)>& callback)
+void WebView::setOnShouldStartLoading(const std::function<bool(WebView* sender, std::string_view url)>& callback)
 {
     _onShouldStartLoading = callback;
 }
@@ -214,7 +214,7 @@ void WebView::setOnJSCallback(const ccWebViewCallback& callback)
     _onJSCallback = callback;
 }
 
-std::function<bool(WebView* sender, const std::string& url)> WebView::getOnShouldStartLoading() const
+std::function<bool(WebView* sender, std::string_view url)> WebView::getOnShouldStartLoading() const
 {
     return _onShouldStartLoading;
 }
diff --git a/cocos/ui/UIWebView/UIWebView.h b/cocos/ui/UIWebView/UIWebView.h
index bc37e130d2ff..a685f7af7309 100644
--- a/cocos/ui/UIWebView/UIWebView.h
+++ b/cocos/ui/UIWebView/UIWebView.h
@@ -59,7 +59,7 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
      *
      * @see WebView::setOnJSCallback()
      */
-    void setJavascriptInterfaceScheme(const std::string& scheme);
+    void setJavascriptInterfaceScheme(std::string_view scheme);
 
     /**
      * Sets the main page contents, MIME type, content encoding, and base URL.
@@ -70,9 +70,9 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
      * @param baseURL The base URL for the content.
      */
     void loadData(const cocos2d::Data& data,
-                  const std::string& MIMEType,
-                  const std::string& encoding,
-                  const std::string& baseURL);
+                  std::string_view MIMEType,
+                  std::string_view encoding,
+                  std::string_view baseURL);
 
     /**
      * Sets the main page content and base URL.
@@ -80,28 +80,28 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
      * @param string The content for the main page.
      * @param baseURL The base URL for the content.
      */
-    void loadHTMLString(const std::string& string, const std::string& baseURL = "");
+    void loadHTMLString(std::string_view string, std::string_view baseURL = "");
 
     /**
      * Loads the given URL. It doesn't clean cached data.
      *
      * @param url Content URL.
      */
-    void loadURL(const std::string& url);
+    void loadURL(std::string_view url);
 
     /**
      * Loads the given URL with cleaning cached data or not.
      * @param url Content URL.
      * @cleanCachedData Whether to clean cached data.
      */
-    void loadURL(const std::string& url, bool cleanCachedData);
+    void loadURL(std::string_view url, bool cleanCachedData);
 
     /**
      * Loads the given fileName.
      *
      * @param fileName Content fileName.
      */
-    void loadFile(const std::string& fileName);
+    void loadFile(std::string_view fileName);
 
     /**
      * Stops the current load.
@@ -140,7 +140,7 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
     /**
      * Evaluates JavaScript in the context of the currently displayed page.
      */
-    void evaluateJS(const std::string& js);
+    void evaluateJS(std::string_view js);
 
     /**
      * Set WebView should support zooming. The default value is false.
@@ -153,12 +153,12 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
      * @param callback The web view that is about to load new content.
      * @return YES if the web view should begin loading content; otherwise, NO.
      */
-    void setOnShouldStartLoading(const std::function<bool(WebView* sender, const std::string& url)>& callback);
+    void setOnShouldStartLoading(const std::function<bool(WebView* sender, std::string_view url)>& callback);
 
     /**
      * A callback which will be called when a WebView event happens.
      */
-    typedef std::function<void(WebView* sender, const std::string& url)> ccWebViewCallback;
+    typedef std::function<void(WebView* sender, std::string_view url)> ccWebViewCallback;
 
     /**
      * Call after a web view finishes loading.
@@ -182,7 +182,7 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
     /**
      * Get the callback when WebView is about to start.
      */
-    std::function<bool(WebView* sender, const std::string& url)> getOnShouldStartLoading() const;
+    std::function<bool(WebView* sender, std::string_view url)> getOnShouldStartLoading() const;
 
     /**
      * Get the callback when WebView has finished loading.
@@ -231,10 +231,10 @@ class CC_GUI_DLL WebView : public cocos2d::ui::Widget
     virtual cocos2d::ui::Widget* createCloneInstance() override;
     virtual void copySpecialProperties(Widget* model) override;
 
-    std::function<bool(WebView* sender, const std::string& url)> _onShouldStartLoading = nullptr;
-    ccWebViewCallback _onDidFinishLoading                                              = nullptr;
-    ccWebViewCallback _onDidFailLoading                                                = nullptr;
-    ccWebViewCallback _onJSCallback                                                    = nullptr;
+    std::function<bool(WebView* sender, std::string_view url)> _onShouldStartLoading = nullptr;
+    ccWebViewCallback _onDidFinishLoading                                            = nullptr;
+    ccWebViewCallback _onDidFailLoading                                              = nullptr;
+    ccWebViewCallback _onJSCallback                                                  = nullptr;
 
     CC_CONSTRUCTOR_ACCESS :
         /**
diff --git a/cocos/ui/UIWebView/UIWebView.mm b/cocos/ui/UIWebView/UIWebView.mm
index 31a5694674cb..a80e16512cdf 100644
--- a/cocos/ui/UIWebView/UIWebView.mm
+++ b/cocos/ui/UIWebView/UIWebView.mm
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-android.cpp b/cocos/ui/UIWebView/UIWebViewImpl-android.cpp
index cd61a73d6e45..b5ec6cac0f9c 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-android.cpp
+++ b/cocos/ui/UIWebView/UIWebViewImpl-android.cpp
@@ -37,14 +37,14 @@
 #include "ui/UIHelper.h"
 #include "yasio/cxx17/string_view.hpp"
 
-static const std::string className = "org.cocos2dx.lib.Cocos2dxWebViewHelper";
+static const char* className = "org.cocos2dx.lib.Cocos2dxWebViewHelper";
 
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "", __VA_ARGS__)
 
-static const std::string s_defaultBaseUrl = "file:///android_asset/";
-static const std::string s_sdRootBaseUrl  = "file://";
+static constexpr std::string_view s_defaultBaseUrl = "file:///android_asset/"sv;
+static constexpr std::string_view s_sdRootBaseUrl  = "file://"sv;
 
-static std::string getFixedBaseUrl(const std::string& baseUrl)
+static std::string getFixedBaseUrl(std::string_view baseUrl)
 {
     std::string fixedBaseUrl;
     if (baseUrl.empty())
@@ -55,26 +55,26 @@ static std::string getFixedBaseUrl(const std::string& baseUrl)
     {
         fixedBaseUrl = baseUrl;
     }
-    else if (baseUrl.c_str()[0] != '/')
+    else if (baseUrl[0] != '/')
     {
         using namespace cxx17;  // for cxx17::string_view literal
-        if (cxx20::starts_with(cxx17::string_view{baseUrl}, "assets/"_sv))
+        if (cxx20::starts_with(baseUrl, "assets/"_sv))
         {
-            fixedBaseUrl = s_defaultBaseUrl + baseUrl.c_str()[7];
+            fixedBaseUrl.assign(s_defaultBaseUrl).push_back(baseUrl[7]);
         }
         else
         {
-            fixedBaseUrl = s_defaultBaseUrl + baseUrl;
+            fixedBaseUrl.assign(s_defaultBaseUrl).append(baseUrl);
         }
     }
     else
     {
-        fixedBaseUrl = s_sdRootBaseUrl + baseUrl;
+        fixedBaseUrl.assign(s_sdRootBaseUrl).append(baseUrl);
     }
 
     if (fixedBaseUrl.c_str()[fixedBaseUrl.length() - 1] != '/')
     {
-        fixedBaseUrl += "/";
+        fixedBaseUrl.push_back('/');
     }
 
     return fixedBaseUrl;
@@ -155,7 +155,7 @@ namespace
 int createWebViewJNI()
 {
     cocos2d::JniMethodInfo t;
-    if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), "createWebView", "()I"))
+    if (cocos2d::JniHelper::getStaticMethodInfo(t, className, "createWebView", "()I"))
     {
         // LOGD("error: %s,%d",__func__,__LINE__);
         jint viewTag = t.env->CallStaticIntMethod(t.classID, t.methodID);
@@ -165,7 +165,7 @@ int createWebViewJNI()
     return -1;
 }
 
-std::string getUrlStringByFileName(const std::string& fileName)
+std::string getUrlStringByFileName(std::string_view fileName)
 {
     // LOGD("error: %s,%d",__func__,__LINE__);
     const std::string basePath("file:///android_asset/");
@@ -214,31 +214,31 @@ WebViewImpl::~WebViewImpl()
 }
 
 void WebViewImpl::loadData(const Data& data,
-                           const std::string& MIMEType,
-                           const std::string& encoding,
-                           const std::string& baseURL)
+                           std::string_view MIMEType,
+                           std::string_view encoding,
+                           std::string_view baseURL)
 {
     std::string dataString(reinterpret_cast<char*>(data.getBytes()), static_cast<unsigned int>(data.getSize()));
     JniHelper::callStaticVoidMethod(className, "setJavascriptInterfaceScheme", _viewTag, dataString, MIMEType, encoding,
                                     baseURL);
 }
 
-void WebViewImpl::loadHTMLString(const std::string& string, const std::string& baseURL)
+void WebViewImpl::loadHTMLString(std::string_view string, std::string_view baseURL)
 {
     JniHelper::callStaticVoidMethod(className, "loadHTMLString", _viewTag, string, getFixedBaseUrl(baseURL));
 }
 
-void WebViewImpl::loadURL(const std::string& url)
+void WebViewImpl::loadURL(std::string_view url)
 {
     this->loadURL(url, false);
 }
 
-void WebViewImpl::loadURL(const std::string& url, bool cleanCachedData)
+void WebViewImpl::loadURL(std::string_view url, bool cleanCachedData)
 {
     JniHelper::callStaticVoidMethod(className, "loadUrl", _viewTag, url, cleanCachedData);
 }
 
-void WebViewImpl::loadFile(const std::string& fileName)
+void WebViewImpl::loadFile(std::string_view fileName)
 {
     auto fullPath = getUrlStringByFileName(fileName);
     JniHelper::callStaticVoidMethod(className, "loadFile", _viewTag, fullPath);
@@ -274,12 +274,12 @@ void WebViewImpl::goForward()
     JniHelper::callStaticVoidMethod(className, "goForward", _viewTag);
 }
 
-void WebViewImpl::setJavascriptInterfaceScheme(const std::string& scheme)
+void WebViewImpl::setJavascriptInterfaceScheme(std::string_view scheme)
 {
     JniHelper::callStaticVoidMethod(className, "setJavascriptInterfaceScheme", _viewTag, scheme);
 }
 
-void WebViewImpl::evaluateJS(const std::string& js)
+void WebViewImpl::evaluateJS(std::string_view js)
 {
     JniHelper::callStaticVoidMethod(className, "evaluateJS", _viewTag, js);
 }
@@ -289,7 +289,7 @@ void WebViewImpl::setScalesPageToFit(const bool scalesPageToFit)
     JniHelper::callStaticVoidMethod(className, "setScalesPageToFit", _viewTag, scalesPageToFit);
 }
 
-bool WebViewImpl::shouldStartLoading(const int viewTag, const std::string& url)
+bool WebViewImpl::shouldStartLoading(const int viewTag, std::string_view url)
 {
     bool allowLoad = true;
     auto it        = s_WebViewImpls.find(viewTag);
@@ -304,7 +304,7 @@ bool WebViewImpl::shouldStartLoading(const int viewTag, const std::string& url)
     return allowLoad;
 }
 
-void WebViewImpl::didFinishLoading(const int viewTag, const std::string& url)
+void WebViewImpl::didFinishLoading(const int viewTag, std::string_view url)
 {
     auto it = s_WebViewImpls.find(viewTag);
     if (it != s_WebViewImpls.end())
@@ -317,7 +317,7 @@ void WebViewImpl::didFinishLoading(const int viewTag, const std::string& url)
     }
 }
 
-void WebViewImpl::didFailLoading(const int viewTag, const std::string& url)
+void WebViewImpl::didFailLoading(const int viewTag, std::string_view url)
 {
     auto it = s_WebViewImpls.find(viewTag);
     if (it != s_WebViewImpls.end())
@@ -330,7 +330,7 @@ void WebViewImpl::didFailLoading(const int viewTag, const std::string& url)
     }
 }
 
-void WebViewImpl::onJsCallback(const int viewTag, const std::string& message)
+void WebViewImpl::onJsCallback(const int viewTag, std::string_view message)
 {
     auto it = s_WebViewImpls.find(viewTag);
     if (it != s_WebViewImpls.end())
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-android.h b/cocos/ui/UIWebView/UIWebViewImpl-android.h
index 653078cc28ab..9f1a178a5afe 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-android.h
+++ b/cocos/ui/UIWebView/UIWebViewImpl-android.h
@@ -28,6 +28,8 @@
 
 #include <iosfwd>
 #include <stdint.h>
+#include <string>
+#include <string_view>
 
 namespace cocos2d
 {
@@ -53,19 +55,19 @@ class WebViewImpl
 
     virtual ~WebViewImpl();
 
-    void setJavascriptInterfaceScheme(const std::string& scheme);
+    void setJavascriptInterfaceScheme(std::string_view scheme);
 
     void loadData(const cocos2d::Data& data,
-                  const std::string& MIMEType,
-                  const std::string& encoding,
-                  const std::string& baseURL);
+                  std::string_view MIMEType,
+                  std::string_view encoding,
+                  std::string_view baseURL);
 
-    void loadHTMLString(const std::string& string, const std::string& baseURL);
+    void loadHTMLString(std::string_view string, std::string_view baseURL);
 
-    void loadURL(const std::string& url);
-    void loadURL(const std::string& url, bool cleanCachedData);
+    void loadURL(std::string_view url);
+    void loadURL(std::string_view url, bool cleanCachedData);
 
-    void loadFile(const std::string& fileName);
+    void loadFile(std::string_view fileName);
 
     void stopLoading();
 
@@ -79,7 +81,7 @@ class WebViewImpl
 
     void goForward();
 
-    void evaluateJS(const std::string& js);
+    void evaluateJS(std::string_view js);
 
     void setScalesPageToFit(const bool scalesPageToFit);
 
@@ -95,10 +97,10 @@ class WebViewImpl
 
     void setBackgroundTransparent();
 
-    static bool shouldStartLoading(const int viewTag, const std::string& url);
-    static void didFinishLoading(const int viewTag, const std::string& url);
-    static void didFailLoading(const int viewTag, const std::string& url);
-    static void onJsCallback(const int viewTag, const std::string& message);
+    static bool shouldStartLoading(const int viewTag, std::string_view url);
+    static void didFinishLoading(const int viewTag, std::string_view url);
+    static void didFailLoading(const int viewTag, std::string_view url);
+    static void onJsCallback(const int viewTag, std::string_view message);
 
 private:
     int _viewTag;
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-ios.h b/cocos/ui/UIWebView/UIWebViewImpl-ios.h
index 03fe18cc860b..0d9294fd541c 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-ios.h
+++ b/cocos/ui/UIWebView/UIWebViewImpl-ios.h
@@ -27,6 +27,8 @@
 
 #include <stdint.h>
 #include <iosfwd>
+#include <string>
+#include <string_view>
 
 @class UIWebViewWrapper;
 
@@ -49,19 +51,19 @@ class WebViewImpl
 
     virtual ~WebViewImpl();
 
-    void setJavascriptInterfaceScheme(const std::string& scheme);
+    void setJavascriptInterfaceScheme(std::string_view scheme);
 
     void loadData(const cocos2d::Data& data,
-                  const std::string& MIMEType,
-                  const std::string& encoding,
-                  const std::string& baseURL);
+                  std::string_view MIMEType,
+                  std::string_view encoding,
+                  std::string_view baseURL);
 
-    void loadHTMLString(const std::string& string, const std::string& baseURL);
+    void loadHTMLString(std::string_view string, std::string_view baseURL);
 
-    void loadURL(const std::string& url);
-    void loadURL(const std::string& url, bool cleanCachedData);
+    void loadURL(std::string_view url);
+    void loadURL(std::string_view url, bool cleanCachedData);
 
-    void loadFile(const std::string& fileName);
+    void loadFile(std::string_view fileName);
 
     void stopLoading();
 
@@ -75,7 +77,7 @@ class WebViewImpl
 
     void goForward();
 
-    void evaluateJS(const std::string& js);
+    void evaluateJS(std::string_view js);
 
     void setScalesPageToFit(const bool scalesPageToFit);
 
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-ios.mm b/cocos/ui/UIWebView/UIWebViewImpl-ios.mm
index e2c448249e3f..7c1979f0a6de 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-ios.mm
+++ b/cocos/ui/UIWebView/UIWebViewImpl-ios.mm
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,10 +35,10 @@ of this software and associated documentation files (the "Software"), to deal
 #include "platform/CCFileUtils.h"
 
 @interface UIWebViewWrapper : NSObject
-@property (nonatomic) std::function<bool(std::string url)> shouldStartLoading;
-@property (nonatomic) std::function<void(std::string url)> didFinishLoading;
-@property (nonatomic) std::function<void(std::string url)> didFailLoading;
-@property (nonatomic) std::function<void(std::string url)> onJsCallback;
+@property(nonatomic) std::function<bool(std::string url)> shouldStartLoading;
+@property(nonatomic) std::function<void(std::string url)> didFinishLoading;
+@property(nonatomic) std::function<void(std::string url)> didFailLoading;
+@property(nonatomic) std::function<void(std::string url)> onJsCallback;
 
 @property(nonatomic, readonly, getter=canGoBack) BOOL canGoBack;
 @property(nonatomic, readonly, getter=canGoForward) BOOL canGoForward;
@@ -57,21 +57,24 @@ - (void)setBackgroundTransparent;
 
 - (void)setFrameWithX:(float)x y:(float)y width:(float)width height:(float)height;
 
-- (void)setJavascriptInterfaceScheme:(const std::string &)scheme;
+- (void)setJavascriptInterfaceScheme:(std::string_view)scheme;
 
-- (void)loadData:(const std::string &)data MIMEType:(const std::string &)MIMEType textEncodingName:(const std::string &)encodingName baseURL:(const std::string &)baseURL;
+- (void)loadData:(std::string_view)data
+            MIMEType:(std::string_view)MIMEType
+    textEncodingName:(std::string_view)encodingName
+             baseURL:(std::string_view)baseURL;
 
-- (void)loadHTMLString:(const std::string &)string baseURL:(const std::string &)baseURL;
+- (void)loadHTMLString:(std::string_view)string baseURL:(std::string_view)baseURL;
 
-- (void)loadUrl:(const std::string &)urlString cleanCachedData:(BOOL) needCleanCachedData;
+- (void)loadUrl:(std::string_view)urlString cleanCachedData:(BOOL)needCleanCachedData;
 
-- (void)loadFile:(const std::string &)filePath;
+- (void)loadFile:(std::string_view)filePath;
 
 - (void)stopLoading;
 
 - (void)reload;
 
-- (void)evaluateJS:(const std::string &)js;
+- (void)evaluateJS:(std::string_view)js;
 
 - (void)goBack;
 
@@ -80,178 +83,236 @@ - (void)goForward;
 - (void)setScalesPageToFit:(const bool)scalesPageToFit;
 @end
 
-
 @interface UIWebViewWrapper () <WKUIDelegate, WKNavigationDelegate>
-@property(nonatomic) WKWebView *wkWebView;
+@property(nonatomic) WKWebView* wkWebView;
 
-@property(nonatomic, copy) NSString *jsScheme;
+@property(nonatomic, copy) NSString* jsScheme;
 @end
 
 @implementation UIWebViewWrapper {
-    
 }
 
-+ (instancetype) newWebViewWrapper {
++ (instancetype)newWebViewWrapper
+{
     return [[self alloc] init];
 }
 
-- (instancetype)init {
+- (instancetype)init
+{
     self = [super init];
-    if (self) {
-        self.wkWebView = nil;
+    if (self)
+    {
+        self.wkWebView          = nil;
         self.shouldStartLoading = nullptr;
-        self.didFinishLoading = nullptr;
-        self.didFailLoading = nullptr;
+        self.didFinishLoading   = nullptr;
+        self.didFailLoading     = nullptr;
     }
     return self;
 }
 
-- (void)dealloc {
-    self.wkWebView.UIDelegate = nil;
+- (void)dealloc
+{
+    self.wkWebView.UIDelegate         = nil;
     self.wkWebView.navigationDelegate = nil;
     [self.wkWebView removeFromSuperview];
     [self.wkWebView release];
     self.wkWebView = nil;
-    self.jsScheme = nil;
+    self.jsScheme  = nil;
     [super dealloc];
 }
 
-- (void)setupWebView {
-    if (!self.wkWebView) {
-        self.wkWebView = [[WKWebView alloc] init];
-        self.wkWebView.UIDelegate = self;
+- (void)setupWebView
+{
+    if (!self.wkWebView)
+    {
+        self.wkWebView                    = [[WKWebView alloc] init];
+        self.wkWebView.UIDelegate         = self;
         self.wkWebView.navigationDelegate = self;
     }
-    if (!self.wkWebView.superview) {
-        auto view = cocos2d::Director::getInstance()->getOpenGLView();
-        auto eaglview = (CCEAGLView *) view->getEAGLView();
+    if (!self.wkWebView.superview)
+    {
+        auto view     = cocos2d::Director::getInstance()->getOpenGLView();
+        auto eaglview = (CCEAGLView*)view->getEAGLView();
         [eaglview addSubview:self.wkWebView];
     }
 }
 
-- (void)setVisible:(bool)visible {
-    if (!self.wkWebView) {[self setupWebView];}
+- (void)setVisible:(bool)visible
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
     self.wkWebView.hidden = !visible;
 }
 
-- (void)setBounces:(bool)bounces {
-  self.wkWebView.scrollView.bounces = bounces;
+- (void)setBounces:(bool)bounces
+{
+    self.wkWebView.scrollView.bounces = bounces;
 }
 
-- (void)setOpacityWebView:(float)opacity {
-    if (!self.wkWebView) { [self setupWebView]; }
+- (void)setOpacityWebView:(float)opacity
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
     self.wkWebView.alpha = opacity;
     [self.wkWebView setOpaque:YES];
 }
 
--(float) getOpacityWebView{
+- (float)getOpacityWebView
+{
     return self.wkWebView.alpha;
 }
 
--(void) setBackgroundTransparent{
-    if (!self.wkWebView) {[self setupWebView];}
+- (void)setBackgroundTransparent
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
     [self.wkWebView setOpaque:NO];
     [self.wkWebView setBackgroundColor:[UIColor clearColor]];
 }
 
-- (void)setFrameWithX:(float)x y:(float)y width:(float)width height:(float)height {
-    if (!self.wkWebView) {[self setupWebView];}
+- (void)setFrameWithX:(float)x y:(float)y width:(float)width height:(float)height
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
     CGRect newFrame = CGRectMake(x, y, width, height);
-    if (!CGRectEqualToRect(self.wkWebView.frame, newFrame)) {
+    if (!CGRectEqualToRect(self.wkWebView.frame, newFrame))
+    {
         self.wkWebView.frame = CGRectMake(x, y, width, height);
     }
 }
 
-- (void)setJavascriptInterfaceScheme:(const std::string &)scheme {
-    self.jsScheme = @(scheme.c_str());
+- (void)setJavascriptInterfaceScheme:(std::string_view)scheme
+{
+    self.jsScheme = @(scheme.data());
 }
 
-- (void)loadData:(const std::string &)data MIMEType:(const std::string &)MIMEType textEncodingName:(const std::string &)encodingName baseURL:(const std::string &)baseURL {
+- (void)loadData:(std::string_view)data
+            MIMEType:(std::string_view)MIMEType
+    textEncodingName:(std::string_view)encodingName
+             baseURL:(std::string_view)baseURL
+{
     auto path = [[NSBundle mainBundle] resourcePath];
-    path = [path stringByAppendingPathComponent:@(baseURL.c_str() )];
-    auto url = [NSURL fileURLWithPath:path];
+    path      = [path stringByAppendingPathComponent:@(baseURL.data())];
+    auto url  = [NSURL fileURLWithPath:path];
 
-    [self.wkWebView loadData:[NSData dataWithBytes:data.c_str() length:data.length()]
-                    MIMEType:@(MIMEType.c_str())
-       characterEncodingName:@(encodingName.c_str())
-                     baseURL:url];
+    [self.wkWebView loadData:[NSData dataWithBytes:data.data() length:data.length()]
+                     MIMEType:@(MIMEType.data())
+        characterEncodingName:@(encodingName.data())
+                      baseURL:url];
 }
 
-- (void)loadHTMLString:(const std::string &)string baseURL:(const std::string &)baseURL {
-    if (!self.wkWebView) {[self setupWebView];}
+- (void)loadHTMLString:(std::string_view)string baseURL:(std::string_view)baseURL
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
     auto path = [[NSBundle mainBundle] resourcePath];
-    path = [path stringByAppendingPathComponent:@(baseURL.c_str() )];
-    auto url = [NSURL fileURLWithPath:path];
-    [self.wkWebView loadHTMLString:@(string.c_str()) baseURL:url];
+    path      = [path stringByAppendingPathComponent:@(baseURL.data())];
+    auto url  = [NSURL fileURLWithPath:path];
+    [self.wkWebView loadHTMLString:@(string.data()) baseURL:url];
 }
 
-- (void)loadUrl:(const std::string &)urlString cleanCachedData:(BOOL) needCleanCachedData {
-    if (!self.wkWebView) {[self setupWebView];}
-    NSURL *url = [NSURL URLWithString:@(urlString.c_str())];
+- (void)loadUrl:(std::string_view)urlString cleanCachedData:(BOOL)needCleanCachedData
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
+    NSURL* url = [NSURL URLWithString:@(urlString.data())];
 
-    NSURLRequest *request = nil;
+    NSURLRequest* request = nil;
     if (needCleanCachedData)
-        request = [NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:60];
+        request = [NSURLRequest requestWithURL:url
+                                   cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
+                               timeoutInterval:60];
     else
         request = [NSURLRequest requestWithURL:url];
 
     [self.wkWebView loadRequest:request];
 }
 
-- (void)loadFile:(const std::string &)filePath {
-    if (!self.wkWebView) {[self setupWebView];}
-    NSURL *url = [NSURL fileURLWithPath:@(filePath.c_str())];
-    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+- (void)loadFile:(std::string_view)filePath
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
+    NSURL* url            = [NSURL fileURLWithPath:@(filePath.data())];
+    NSURLRequest* request = [NSURLRequest requestWithURL:url];
     [self.wkWebView loadRequest:request];
 }
 
-- (void)stopLoading {
+- (void)stopLoading
+{
     [self.wkWebView stopLoading];
 }
 
-- (void)reload {
+- (void)reload
+{
     [self.wkWebView reload];
 }
 
-- (BOOL)canGoForward {
+- (BOOL)canGoForward
+{
     return self.wkWebView.canGoForward;
 }
 
-- (BOOL)canGoBack {
+- (BOOL)canGoBack
+{
     return self.wkWebView.canGoBack;
 }
 
-- (void)goBack {
+- (void)goBack
+{
     [self.wkWebView goBack];
 }
 
-- (void)goForward {
+- (void)goForward
+{
     [self.wkWebView goForward];
 }
 
-- (void)evaluateJS:(const std::string &)js {
-    if (!self.wkWebView) {[self setupWebView];}
-    [self.wkWebView evaluateJavaScript:@(js.c_str()) completionHandler:nil];
+- (void)evaluateJS:(std::string_view)js
+{
+    if (!self.wkWebView)
+    {
+        [self setupWebView];
+    }
+    [self.wkWebView evaluateJavaScript:@(js.data()) completionHandler:nil];
 }
 
-- (void)setScalesPageToFit:(const bool)scalesPageToFit {
-// TODO: there is not corresponding API in WK.
-// https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit/43048514 seems has a solution,
-// but it doesn't support setting it dynamically. If we want to set this feature dynamically, then it will be too complex.
+- (void)setScalesPageToFit:(const bool)scalesPageToFit
+{
+    // TODO: there is not corresponding API in WK.
+    // https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit/43048514 seems
+    // has a solution, but it doesn't support setting it dynamically. If we want to set this feature dynamically, then
+    // it will be too complex.
 }
 
-
-
 #pragma mark - WKNavigationDelegate
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
-    NSString *url = [[[navigationAction request] URL] absoluteString];
-    if ([[webView.URL scheme] isEqualToString:self.jsScheme]) {
+- (void)webView:(WKWebView*)webView
+    decidePolicyForNavigationAction:(WKNavigationAction*)navigationAction
+                    decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    NSString* url = [[[navigationAction request] URL] absoluteString];
+    if ([[webView.URL scheme] isEqualToString:self.jsScheme])
+    {
         self.onJsCallback([url UTF8String]);
         decisionHandler(WKNavigationActionPolicyCancel);
         return;
     }
-    if (self.shouldStartLoading && url) {
-        if (self.shouldStartLoading([url UTF8String]) )
+    if (self.shouldStartLoading && url)
+    {
+        if (self.shouldStartLoading([url UTF8String]))
             decisionHandler(WKNavigationActionPolicyAllow);
         else
             decisionHandler(WKNavigationActionPolicyCancel);
@@ -262,17 +323,22 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
     decisionHandler(WKNavigationActionPolicyAllow);
 }
 
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    if (self.didFinishLoading) {
-        NSString *url = [webView.URL absoluteString];
+- (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation
+{
+    if (self.didFinishLoading)
+    {
+        NSString* url = [webView.URL absoluteString];
         self.didFinishLoading([url UTF8String]);
     }
 }
 
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
-    if (self.didFailLoading) {
-        NSString *errorInfo = error.userInfo[NSURLErrorFailingURLStringErrorKey];
-        if (errorInfo) {
+- (void)webView:(WKWebView*)webView didFailProvisionalNavigation:(WKNavigation*)navigation withError:(NSError*)error
+{
+    if (self.didFailLoading)
+    {
+        NSString* errorInfo = error.userInfo[NSURLErrorFailingURLStringErrorKey];
+        if (errorInfo)
+        {
             self.didFailLoading([errorInfo UTF8String]);
         }
     }
@@ -281,168 +347,196 @@ - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation
 #pragma WKUIDelegate
 
 // Implement js alert function.
-- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
+- (void)webView:(WKWebView*)webView
+    runJavaScriptAlertPanelWithMessage:(NSString*)message
+                      initiatedByFrame:(WKFrameInfo*)frame
+                     completionHandler:(void (^)())completionHandler
 {
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:message
+    UIAlertController* alertController = [UIAlertController alertControllerWithTitle:message
                                                                              message:nil
                                                                       preferredStyle:UIAlertControllerStyleAlert];
     [alertController addAction:[UIAlertAction actionWithTitle:@"Ok"
                                                         style:UIAlertActionStyleCancel
-                                                      handler:^(UIAlertAction *action) {
-                                                          completionHandler();
+                                                      handler:^(UIAlertAction* action) {
+                                                        completionHandler();
                                                       }]];
 
     auto rootViewController = [UIApplication sharedApplication].windows[0].rootViewController;
-    [rootViewController presentViewController:alertController animated:YES completion:^{}];
+    [rootViewController presentViewController:alertController
+                                     animated:YES
+                                   completion:^{
+                                   }];
 }
 
 @end
 
+namespace cocos2d
+{
+namespace ui
+{
 
+WebViewImpl::WebViewImpl(WebView* webView) : _uiWebViewWrapper([UIWebViewWrapper newWebViewWrapper]), _webView(webView)
+{
 
-namespace cocos2d {
-namespace ui{
-
-WebViewImpl::WebViewImpl(WebView *webView)
-        : _uiWebViewWrapper([UIWebViewWrapper newWebViewWrapper]),
-        _webView(webView) {
-            
     _uiWebViewWrapper.shouldStartLoading = [this](std::string url) {
-        if (this->_webView->_onShouldStartLoading) {
+        if (this->_webView->_onShouldStartLoading)
+        {
             return this->_webView->_onShouldStartLoading(this->_webView, url);
         }
         return true;
     };
     _uiWebViewWrapper.didFinishLoading = [this](std::string url) {
-        if (this->_webView->_onDidFinishLoading) {
+        if (this->_webView->_onDidFinishLoading)
+        {
             this->_webView->_onDidFinishLoading(this->_webView, url);
         }
     };
     _uiWebViewWrapper.didFailLoading = [this](std::string url) {
-        if (this->_webView->_onDidFailLoading) {
+        if (this->_webView->_onDidFailLoading)
+        {
             this->_webView->_onDidFailLoading(this->_webView, url);
         }
     };
     _uiWebViewWrapper.onJsCallback = [this](std::string url) {
-        if (this->_webView->_onJSCallback) {
+        if (this->_webView->_onJSCallback)
+        {
             this->_webView->_onJSCallback(this->_webView, url);
         }
     };
 }
 
-WebViewImpl::~WebViewImpl(){
+WebViewImpl::~WebViewImpl()
+{
     [_uiWebViewWrapper release];
     _uiWebViewWrapper = nullptr;
 }
 
-void WebViewImpl::setJavascriptInterfaceScheme(const std::string &scheme) {
+void WebViewImpl::setJavascriptInterfaceScheme(std::string_view scheme)
+{
     [_uiWebViewWrapper setJavascriptInterfaceScheme:scheme];
 }
 
-void WebViewImpl::loadData(const Data &data,
-                           const std::string &MIMEType,
-                           const std::string &encoding,
-                           const std::string &baseURL) {
-    
-    std::string dataString(reinterpret_cast<char *>(data.getBytes()), static_cast<unsigned int>(data.getSize()));
+void WebViewImpl::loadData(const Data& data,
+                           std::string_view MIMEType,
+                           std::string_view encoding,
+                           std::string_view baseURL)
+{
+
+    std::string dataString(reinterpret_cast<char*>(data.getBytes()), static_cast<unsigned int>(data.getSize()));
     [_uiWebViewWrapper loadData:dataString MIMEType:MIMEType textEncodingName:encoding baseURL:baseURL];
 }
 
-void WebViewImpl::loadHTMLString(const std::string &string, const std::string &baseURL) {
+void WebViewImpl::loadHTMLString(std::string_view string, std::string_view baseURL)
+{
     [_uiWebViewWrapper loadHTMLString:string baseURL:baseURL];
 }
 
-void WebViewImpl::loadURL(const std::string &url) {
+void WebViewImpl::loadURL(std::string_view url)
+{
     this->loadURL(url, false);
 }
 
-void WebViewImpl::loadURL(const std::string &url, bool cleanCachedData) {
+void WebViewImpl::loadURL(std::string_view url, bool cleanCachedData)
+{
     [_uiWebViewWrapper loadUrl:url cleanCachedData:cleanCachedData];
 }
 
-void WebViewImpl::loadFile(const std::string &fileName) {
+void WebViewImpl::loadFile(std::string_view fileName)
+{
     auto fullPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(fileName);
     [_uiWebViewWrapper loadFile:fullPath];
 }
 
-void WebViewImpl::stopLoading() {
+void WebViewImpl::stopLoading()
+{
     [_uiWebViewWrapper stopLoading];
 }
 
-void WebViewImpl::reload() {
+void WebViewImpl::reload()
+{
     [_uiWebViewWrapper reload];
 }
 
-bool WebViewImpl::canGoBack() {
+bool WebViewImpl::canGoBack()
+{
     return _uiWebViewWrapper.canGoBack;
 }
 
-bool WebViewImpl::canGoForward() {
+bool WebViewImpl::canGoForward()
+{
     return _uiWebViewWrapper.canGoForward;
 }
 
-void WebViewImpl::goBack() {
+void WebViewImpl::goBack()
+{
     [_uiWebViewWrapper goBack];
 }
 
-void WebViewImpl::goForward() {
+void WebViewImpl::goForward()
+{
     [_uiWebViewWrapper goForward];
 }
 
-void WebViewImpl::evaluateJS(const std::string &js) {
+void WebViewImpl::evaluateJS(std::string_view js)
+{
     [_uiWebViewWrapper evaluateJS:js];
 }
 
-void WebViewImpl::setBounces(bool bounces) {
+void WebViewImpl::setBounces(bool bounces)
+{
     [_uiWebViewWrapper setBounces:bounces];
 }
 
-void WebViewImpl::setScalesPageToFit(const bool scalesPageToFit) {
+void WebViewImpl::setScalesPageToFit(const bool scalesPageToFit)
+{
     [_uiWebViewWrapper setScalesPageToFit:scalesPageToFit];
 }
 
-void WebViewImpl::draw(cocos2d::Renderer *renderer, cocos2d::Mat4 const &transform, uint32_t flags) {
-    if (flags & cocos2d::Node::FLAGS_TRANSFORM_DIRTY) {
-        
-        auto director = cocos2d::Director::getInstance();
-        auto glView = director->getOpenGLView();
+void WebViewImpl::draw(cocos2d::Renderer* renderer, cocos2d::Mat4 const& transform, uint32_t flags)
+{
+    if (flags & cocos2d::Node::FLAGS_TRANSFORM_DIRTY)
+    {
+
+        auto director  = cocos2d::Director::getInstance();
+        auto glView    = director->getOpenGLView();
         auto frameSize = glView->getFrameSize();
-        
-        auto scaleFactor = [static_cast<CCEAGLView *>(glView->getEAGLView()) contentScaleFactor];
+
+        auto scaleFactor = [static_cast<CCEAGLView*>(glView->getEAGLView()) contentScaleFactor];
 
         auto winSize = director->getWinSize();
 
         auto leftBottom = this->_webView->convertToWorldSpace(cocos2d::Vec2::ZERO);
-        auto rightTop = this->_webView->convertToWorldSpace(cocos2d::Vec2(this->_webView->getContentSize().width, this->_webView->getContentSize().height));
+        auto rightTop   = this->_webView->convertToWorldSpace(
+              cocos2d::Vec2(this->_webView->getContentSize().width, this->_webView->getContentSize().height));
 
-        auto x = (frameSize.width / 2 + (leftBottom.x - winSize.width / 2) * glView->getScaleX()) / scaleFactor;
-        auto y = (frameSize.height / 2 - (rightTop.y - winSize.height / 2) * glView->getScaleY()) / scaleFactor;
-        auto width = (rightTop.x - leftBottom.x) * glView->getScaleX() / scaleFactor;
+        auto x      = (frameSize.width / 2 + (leftBottom.x - winSize.width / 2) * glView->getScaleX()) / scaleFactor;
+        auto y      = (frameSize.height / 2 - (rightTop.y - winSize.height / 2) * glView->getScaleY()) / scaleFactor;
+        auto width  = (rightTop.x - leftBottom.x) * glView->getScaleX() / scaleFactor;
         auto height = (rightTop.y - leftBottom.y) * glView->getScaleY() / scaleFactor;
 
-        [_uiWebViewWrapper setFrameWithX:x
-                                      y:y
-                                  width:width
-                                 height:height];
+        [_uiWebViewWrapper setFrameWithX:x y:y width:width height:height];
     }
 }
 
-void WebViewImpl::setVisible(bool visible){
+void WebViewImpl::setVisible(bool visible)
+{
     [_uiWebViewWrapper setVisible:visible];
 }
-        
-void WebViewImpl::setOpacityWebView(float opacity){
-    [_uiWebViewWrapper setOpacityWebView: opacity];
+
+void WebViewImpl::setOpacityWebView(float opacity)
+{
+    [_uiWebViewWrapper setOpacityWebView:opacity];
 }
-        
-float WebViewImpl::getOpacityWebView() const{
+
+float WebViewImpl::getOpacityWebView() const
+{
     return [_uiWebViewWrapper getOpacityWebView];
 }
 
-void WebViewImpl::setBackgroundTransparent(){
+void WebViewImpl::setBackgroundTransparent()
+{
     [_uiWebViewWrapper setBackgroundTransparent];
 }
 
-        
-} // namespace ui
-} //namespace cocos2d
+}  // namespace ui
+}  // namespace cocos2d
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-win32.cpp b/cocos/ui/UIWebView/UIWebViewImpl-win32.cpp
index 89ecd6d0522f..4ec42ecfb08d 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-win32.cpp
+++ b/cocos/ui/UIWebView/UIWebViewImpl-win32.cpp
@@ -24,7 +24,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 && defined(ADXE_HAVE_WEBVIEW2)
 
 #    include "UIWebViewImpl-win32.h"
 #    include "UIWebView.h"
@@ -57,9 +57,9 @@
 USING_NS_CC;
 using namespace rapidjson;
 
-using msg_cb_t = std::function<void(const std::string)>;
+using msg_cb_t = std::function<void(std::string_view)>;
 
-inline std::string htmlFromUri(const std::string& s)
+inline std::string htmlFromUri(std::string_view s)
 {
     if (s.substr(0, 15) == "data:text/html,")
     {
@@ -139,14 +139,14 @@ inline int jsonUnescape(const char* s, size_t n, char* out)
 // The following is a special case, where the exact json string is not returned due
 // to how rapidjson re-creates the nested object, original: "{"bar": 1}", parsed result: "{"bar":1}"
 // assert(jsonParse(R"({"foo": {"bar": 1}})", "foo", -1) == R"({"bar":1})");
-inline std::string jsonParse(const std::string& s, const std::string& key, const int index)
+inline std::string jsonParse(std::string_view s, std::string_view key, const int index)
 {
     const char* value = nullptr;
     size_t value_sz{};
     StringBuffer sb;
     Writer<StringBuffer> writer(sb);
     Document d;
-    d.Parse(s.c_str());
+    d.Parse(s.data());
     if (key.empty() && index > -1)
     {
         if (d.IsArray())
@@ -162,7 +162,7 @@ inline std::string jsonParse(const std::string& s, const std::string& key, const
     }
     else
     {
-        auto&& fieldItr = d.FindMember(key.c_str());
+        auto&& fieldItr = d.FindMember(key.data());
         if (fieldItr != d.MemberEnd())
         {
             auto&& jsonValue = fieldItr->value;
@@ -214,12 +214,12 @@ static std::string getUriStringFromArgs(ArgType* args)
     return {};
 }
 
-static std::string getDataURI(const std::string& data, const std::string& mime_type)
+static std::string getDataURI(std::string_view data, std::string_view mime_type)
 {
     char* encodedData;
     cocos2d::base64Encode(reinterpret_cast<const unsigned char*>(data.data()), static_cast<unsigned>(data.size()),
                           &encodedData);
-    return "data:" + mime_type + ";base64," + utils::urlEncode(encodedData);
+    return std::string{"data:"}.append(mime_type).append(";base64,").append(utils::urlEncode(encodedData));
 }
 
 static double getDeviceScaleFactor()
@@ -250,24 +250,24 @@ class Win32WebControl
 public:
     Win32WebControl();
 
-    bool createWebView(const std::function<bool(const std::string&)>& shouldStartLoading,
-                       const std::function<void(const std::string&)>& didFinishLoading,
-                       const std::function<void(const std::string&)>& didFailLoading,
-                       const std::function<void(const std::string&)>& onJsCallback);
+    bool createWebView(const std::function<bool(std::string_view)>& shouldStartLoading,
+                       const std::function<void(std::string_view)>& didFinishLoading,
+                       const std::function<void(std::string_view)>& didFailLoading,
+                       const std::function<void(std::string_view)>& onJsCallback);
     void removeWebView();
 
     void setWebViewRect(const int left, const int top, const int width, const int height);
-    void setJavascriptInterfaceScheme(const std::string& scheme);
-    void loadHTMLString(const std::string& html, const std::string& baseURL);
-    void loadURL(const std::string& url, bool cleanCachedData);
-    void loadFile(const std::string& filePath);
+    void setJavascriptInterfaceScheme(std::string_view scheme);
+    void loadHTMLString(std::string_view html, std::string_view baseURL);
+    void loadURL(std::string_view url, bool cleanCachedData);
+    void loadFile(std::string_view filePath);
     void stopLoading();
     void reload() const;
     bool canGoBack() const;
     bool canGoForward() const;
     void goBack() const;
     void goForward() const;
-    void evaluateJS(const std::string& js);
+    void evaluateJS(std::string_view js);
     void setScalesPageToFit(const bool scalesPageToFit);
     void setWebViewVisible(const bool visible) const;
     void setBounces(bool bounces);
@@ -286,19 +286,19 @@ class Win32WebControl
     std::string m_jsScheme;
     bool _scalesPageToFit{};
 
-    std::function<bool(const std::string&)> _shouldStartLoading;
-    std::function<void(const std::string&)> _didFinishLoading;
-    std::function<void(const std::string&)> _didFailLoading;
-    std::function<void(const std::string&)> _onJsCallback;
+    std::function<bool(std::string_view)> _shouldStartLoading;
+    std::function<void(std::string_view)> _didFinishLoading;
+    std::function<void(std::string_view)> _didFailLoading;
+    std::function<void(std::string_view)> _onJsCallback;
 
     static bool s_isInitialized;
     static void lazyInit();
 
-    static LPWSTR to_lpwstr(const std::string s)
+    static LPWSTR to_lpwstr(std::string_view s)
     {
-        const int n = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0);
+        const int n = MultiByteToWideChar(CP_UTF8, 0, s.data(), -1, NULL, 0);
         auto* ws    = new wchar_t[n];
-        MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, ws, n);
+        MultiByteToWideChar(CP_UTF8, 0, s.data(), -1, ws, n);
         return ws;
     }
 
@@ -325,7 +325,7 @@ class Win32WebControl
                     m_webview->AddRef();
                     flag.clear();
                 },
-                [this](const std::string& url) -> bool {
+                [this](std::string_view url) -> bool {
                     const auto scheme = url.substr(0, url.find_first_of(':'));
                     if (scheme == m_jsScheme)
                     {
@@ -358,7 +358,7 @@ class Win32WebControl
                     if (_didFailLoading)
                         _didFailLoading(result);
                 },
-                [this](const std::string& url) { loadURL(url, false); }));
+                [this](std::string_view url) { loadURL(url, false); }));
 
         if (res != S_OK)
         {
@@ -386,28 +386,28 @@ class Win32WebControl
         m_controller->put_Bounds(bounds);
     }
 
-    void navigate(const std::string url)
+    void navigate(std::string_view url)
     {
         auto wurl = to_lpwstr(url);
         m_webview->Navigate(wurl);
         delete[] wurl;
     }
 
-    void init(const std::string js)
+    void init(std::string_view js)
     {
         LPCWSTR wjs = to_lpwstr(js);
         m_webview->AddScriptToExecuteOnDocumentCreated(wjs, nullptr);
         delete[] wjs;
     }
 
-    void eval(const std::string js)
+    void eval(std::string_view js)
     {
         LPCWSTR wjs = to_lpwstr(js);
         m_webview->ExecuteScript(wjs, nullptr);
         delete[] wjs;
     }
 
-    void on_message(const std::string msg)
+    void on_message(std::string_view msg)
     {
         const auto seq  = jsonParse(msg, "id", 0);
         const auto name = jsonParse(msg, "method", 0);
@@ -440,10 +440,10 @@ class Win32WebControl
         webview2_com_handler(HWND hwnd,
                              msg_cb_t msgCb,
                              webview2_com_handler_cb_t cb,
-                             std::function<bool(const std::string&)> navStartingCallback,
+                             std::function<bool(std::string_view)> navStartingCallback,
                              std::function<void()> navCompleteCallback,
                              std::function<void()> navErrorCallback,
-                             std::function<void(const std::string& url)> loadUrlCallback)
+                             std::function<void(std::string_view url)> loadUrlCallback)
             : m_window(hwnd)
             , m_msgCb(std::move(msgCb))
             , m_cb(std::move(cb))
@@ -587,10 +587,10 @@ class Win32WebControl
         HWND m_window;
         msg_cb_t m_msgCb;
         webview2_com_handler_cb_t m_cb;
-        std::function<bool(const std::string&)> m_navStartingCallback;
+        std::function<bool(std::string_view)> m_navStartingCallback;
         std::function<void()> m_navCompleteCallback;
         std::function<void()> m_navErrorCallback;
-        std::function<void(const std::string& url)> m_loadUrlCallback;
+        std::function<void(std::string_view url)> m_loadUrlCallback;
     };
 };
 
@@ -607,7 +607,7 @@ WebViewImpl::WebViewImpl(WebView* webView) : _createSucceeded(false), _systemWeb
     }
 
     _createSucceeded = _systemWebControl->createWebView(
-        [this](const std::string& url) -> bool {
+        [this](std::string_view url) -> bool {
             const auto shouldStartLoading = _webView->getOnShouldStartLoading();
             if (shouldStartLoading != nullptr)
             {
@@ -615,21 +615,21 @@ WebViewImpl::WebViewImpl(WebView* webView) : _createSucceeded(false), _systemWeb
             }
             return true;
         },
-        [this](const std::string& url) {
+        [this](std::string_view url) {
             WebView::ccWebViewCallback didFinishLoading = _webView->getOnDidFinishLoading();
             if (didFinishLoading != nullptr)
             {
                 didFinishLoading(_webView, url);
             }
         },
-        [this](const std::string& url) {
+        [this](std::string_view url) {
             WebView::ccWebViewCallback didFailLoading = _webView->getOnDidFailLoading();
             if (didFailLoading != nullptr)
             {
                 didFailLoading(_webView, url);
             }
         },
-        [this](const std::string& url) {
+        [this](std::string_view url) {
             WebView::ccWebViewCallback onJsCallback = _webView->getOnJSCallback();
             if (onJsCallback != nullptr)
             {
@@ -649,9 +649,9 @@ WebViewImpl::~WebViewImpl()
 }
 
 void WebViewImpl::loadData(const Data& data,
-                           const std::string& MIMEType,
-                           const std::string& encoding,
-                           const std::string& baseURL)
+                           std::string_view MIMEType,
+                           std::string_view encoding,
+                           std::string_view baseURL)
 {
     if (_createSucceeded)
     {
@@ -662,7 +662,7 @@ void WebViewImpl::loadData(const Data& data,
     }
 }
 
-void WebViewImpl::loadHTMLString(const std::string& string, const std::string& baseURL)
+void WebViewImpl::loadHTMLString(std::string_view string, std::string_view baseURL)
 {
     if (_createSucceeded)
     {
@@ -684,7 +684,7 @@ void WebViewImpl::loadHTMLString(const std::string& string, const std::string& b
     }
 }
 
-void WebViewImpl::loadURL(const std::string& url, bool cleanCachedData)
+void WebViewImpl::loadURL(std::string_view url, bool cleanCachedData)
 {
     if (_createSucceeded)
     {
@@ -692,7 +692,7 @@ void WebViewImpl::loadURL(const std::string& url, bool cleanCachedData)
     }
 }
 
-void WebViewImpl::loadFile(const std::string& fileName)
+void WebViewImpl::loadFile(std::string_view fileName)
 {
     if (_createSucceeded)
     {
@@ -751,7 +751,7 @@ void WebViewImpl::goForward()
     }
 }
 
-void WebViewImpl::setJavascriptInterfaceScheme(const std::string& scheme)
+void WebViewImpl::setJavascriptInterfaceScheme(std::string_view scheme)
 {
     if (_createSucceeded)
     {
@@ -759,7 +759,7 @@ void WebViewImpl::setJavascriptInterfaceScheme(const std::string& scheme)
     }
 }
 
-void WebViewImpl::evaluateJS(const std::string& js)
+void WebViewImpl::evaluateJS(std::string_view js)
 {
     if (_createSucceeded)
     {
@@ -838,10 +838,10 @@ Win32WebControl::Win32WebControl() : _shouldStartLoading(nullptr), _didFinishLoa
     }
 }
 
-bool Win32WebControl::createWebView(const std::function<bool(const std::string&)>& shouldStartLoading,
-                                    const std::function<void(const std::string&)>& didFinishLoading,
-                                    const std::function<void(const std::string&)>& didFailLoading,
-                                    const std::function<void(const std::string&)>& onJsCallback)
+bool Win32WebControl::createWebView(const std::function<bool(std::string_view)>& shouldStartLoading,
+                                    const std::function<void(std::string_view)>& didFinishLoading,
+                                    const std::function<void(std::string_view)>& didFailLoading,
+                                    const std::function<void(std::string_view)>& onJsCallback)
 {
     bool ret = false;
     do
@@ -905,7 +905,7 @@ bool Win32WebControl::createWebView(const std::function<bool(const std::string&)
         UpdateWindow(m_window);
         SetFocus(m_window);
 
-        auto cb = [this](const std::string msg) { on_message(msg); };
+        auto cb = [this](std::string_view msg) { on_message(msg); };
 
         if (!embed(m_window, false, cb))
         {
@@ -956,12 +956,12 @@ void Win32WebControl::setWebViewRect(const int left, const int top, const int wi
     m_controller->put_ZoomFactor(_scalesPageToFit ? getDeviceScaleFactor() : 1.0);
 }
 
-void Win32WebControl::setJavascriptInterfaceScheme(const std::string& scheme)
+void Win32WebControl::setJavascriptInterfaceScheme(std::string_view scheme)
 {
     m_jsScheme = scheme;
 }
 
-void Win32WebControl::loadHTMLString(const std::string& html, const std::string& baseURL)
+void Win32WebControl::loadHTMLString(std::string_view html, std::string_view baseURL)
 {
     if (!html.empty())
     {
@@ -971,7 +971,7 @@ void Win32WebControl::loadHTMLString(const std::string& html, const std::string&
     }
 }
 
-void Win32WebControl::loadURL(const std::string& url, bool cleanCachedData)
+void Win32WebControl::loadURL(std::string_view url, bool cleanCachedData)
 {
     if (cleanCachedData)
     {
@@ -980,7 +980,7 @@ void Win32WebControl::loadURL(const std::string& url, bool cleanCachedData)
     navigate(url);
 }
 
-void Win32WebControl::loadFile(const std::string& filePath)
+void Win32WebControl::loadFile(std::string_view filePath)
 {
     auto fullPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(filePath);
     if (fullPath.find("file:///") != 0)
@@ -1029,7 +1029,7 @@ void Win32WebControl::goForward() const
     m_webview->GoForward();
 }
 
-void Win32WebControl::evaluateJS(const std::string& js)
+void Win32WebControl::evaluateJS(std::string_view js)
 {
     eval(js);
 }
diff --git a/cocos/ui/UIWebView/UIWebViewImpl-win32.h b/cocos/ui/UIWebView/UIWebViewImpl-win32.h
index b963ba4a868a..4f56727d1756 100644
--- a/cocos/ui/UIWebView/UIWebViewImpl-win32.h
+++ b/cocos/ui/UIWebView/UIWebViewImpl-win32.h
@@ -28,7 +28,7 @@
 
 #include "platform/CCPlatformConfig.h"
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 && defined(ADXE_HAVE_WEBVIEW2)
 
 #    include <string>
 #    include "CCStdC.h"
@@ -58,21 +58,21 @@ class WebViewImpl
     WebViewImpl(cocos2d::ui::WebView* webView);
     virtual ~WebViewImpl();
 
-    void setJavascriptInterfaceScheme(const std::string& scheme);
+    void setJavascriptInterfaceScheme(std::string_view scheme);
     void loadData(const cocos2d::Data& data,
-                  const std::string& MIMEType,
-                  const std::string& encoding,
-                  const std::string& baseURL);
-    void loadHTMLString(const std::string& string, const std::string& baseURL);
-    void loadURL(const std::string& url, bool cleanCachedData);
-    void loadFile(const std::string& fileName);
+                  std::string_view MIMEType,
+                  std::string_view encoding,
+                  std::string_view baseURL);
+    void loadHTMLString(std::string_view string, std::string_view baseURL);
+    void loadURL(std::string_view url, bool cleanCachedData);
+    void loadFile(std::string_view fileName);
     void stopLoading();
     void reload();
     bool canGoBack();
     bool canGoForward();
     void goBack();
     void goForward();
-    void evaluateJS(const std::string& js);
+    void evaluateJS(std::string_view js);
     void setScalesPageToFit(const bool scalesPageToFit);
 
     virtual void draw(cocos2d::Renderer* renderer, cocos2d::Mat4 const& transform, uint32_t flags);
diff --git a/cocos/ui/UIWidget.h b/cocos/ui/UIWidget.h
index 98e841c53863..29c9a3786fcd 100644
--- a/cocos/ui/UIWidget.h
+++ b/cocos/ui/UIWidget.h
@@ -684,25 +684,25 @@ class CC_GUI_DLL Widget : public ProtectedNode, public LayoutParameterProtocol
      * Set callback name.
      *@param callbackName A string representation of callback name.
      */
-    void setCallbackName(const std::string& callbackName) { _callbackName = callbackName; }
+    void setCallbackName(std::string_view callbackName) { _callbackName = callbackName; }
 
     /**
      * Query callback name.
      *@return The callback name.
      */
-    const std::string& getCallbackName() const { return _callbackName; }
+    std::string_view getCallbackName() const { return _callbackName; }
 
     /**
      * Set callback type.
      * @param callbackType A string representation of callback type.
      */
-    void setCallbackType(const std::string& callbackType) { _callbackType = callbackType; }
+    void setCallbackType(std::string_view callbackType) { _callbackType = callbackType; }
 
     /**
      * Query callback type.
      *@return Callback type string.
      */
-    const std::string& getCallbackType() const { return _callbackType; }
+    std::string_view getCallbackType() const { return _callbackType; }
 
     /**
      * Toggle layout component enable.
diff --git a/extensions/DragonBones/CCArmatureDisplay.cpp b/extensions/DragonBones/CCArmatureDisplay.cpp
index 5f11f16381d7..81c12b564e6c 100644
--- a/extensions/DragonBones/CCArmatureDisplay.cpp
+++ b/extensions/DragonBones/CCArmatureDisplay.cpp
@@ -1,4 +1,4 @@
-#include "CCArmatureDisplay.h"
+#include "CCArmatureDisplay.h"
 #include "CCSlot.h"
 
 DRAGONBONES_NAMESPACE_BEGIN
@@ -56,7 +56,7 @@ void CCArmatureDisplay::dbUpdate()
     }
 }
 
-void CCArmatureDisplay::addDBEventListener(const std::string& type, const std::function<void(EventObject*)>& callback)
+void CCArmatureDisplay::addDBEventListener(std::string_view type, const std::function<void(EventObject*)>& callback)
 {
     auto lambda = [callback](cocos2d::EventCustom* event) -> void {
         callback(static_cast<EventObject*>(event->getUserData()));
@@ -64,13 +64,12 @@ void CCArmatureDisplay::addDBEventListener(const std::string& type, const std::f
     _dispatcher->addCustomEventListener(type, lambda);
 }
 
-void CCArmatureDisplay::dispatchDBEvent(const std::string& type, EventObject* value)
+void CCArmatureDisplay::dispatchDBEvent(std::string_view type, EventObject* value)
 {
     _dispatcher->dispatchCustomEvent(type, value);
 }
 
-void CCArmatureDisplay::removeDBEventListener(const std::string& type,
-                                              const std::function<void(EventObject*)>& callback)
+void CCArmatureDisplay::removeDBEventListener(std::string_view type, const std::function<void(EventObject*)>& callback)
 {
     // TODO
     _dispatcher->removeCustomEventListeners(type);
diff --git a/extensions/DragonBones/CCArmatureDisplay.h b/extensions/DragonBones/CCArmatureDisplay.h
index 2e594a566c23..a055e6add01f 100644
--- a/extensions/DragonBones/CCArmatureDisplay.h
+++ b/extensions/DragonBones/CCArmatureDisplay.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -83,20 +83,19 @@ class CCArmatureDisplay : public cocos2d::Node, public virtual IArmatureProxy
     /**
      * @inheritDoc
      */
-    inline virtual bool hasDBEventListener(const std::string& type) const override { return _dispatcher->isEnabled(); }
+    inline virtual bool hasDBEventListener(std::string_view type) const override { return _dispatcher->isEnabled(); }
     /**
      * @inheritDoc
      */
-    virtual void dispatchDBEvent(const std::string& type, EventObject* value) override;
+    virtual void dispatchDBEvent(std::string_view type, EventObject* value) override;
     /**
      * @inheritDoc
      */
-    virtual void addDBEventListener(const std::string& type,
-                                    const std::function<void(EventObject*)>& listener) override;
+    virtual void addDBEventListener(std::string_view type, const std::function<void(EventObject*)>& listener) override;
     /**
      * @inheritDoc
      */
-    virtual void removeDBEventListener(const std::string& type,
+    virtual void removeDBEventListener(std::string_view type,
                                        const std::function<void(EventObject*)>& listener) override;
     /**
      * @inheritDoc
diff --git a/extensions/DragonBones/CCFactory.cpp b/extensions/DragonBones/CCFactory.cpp
index 85c8565d040b..ee24fc555c92 100644
--- a/extensions/DragonBones/CCFactory.cpp
+++ b/extensions/DragonBones/CCFactory.cpp
@@ -1,4 +1,4 @@
-#include "CCFactory.h"
+#include "CCFactory.h"
 #include "CCTextureAtlasData.h"
 #include "CCArmatureDisplay.h"
 #include "CCSlot.h"
@@ -144,7 +144,7 @@ Slot* CCFactory::_buildSlot(const BuildArmaturePackage& dataPackage, const SlotD
     return slot;
 }
 
-DragonBonesData* CCFactory::loadDragonBonesData(const std::string& filePath, const std::string& name, float scale)
+DragonBonesData* CCFactory::loadDragonBonesData(std::string_view filePath, std::string_view name, float scale)
 {
     if (!name.empty())
     {
@@ -185,7 +185,7 @@ DragonBonesData* CCFactory::loadDragonBonesData(const std::string& filePath, con
     return nullptr;
 }
 
-TextureAtlasData* CCFactory::loadTextureAtlasData(const std::string& filePath, const std::string& name, float scale)
+TextureAtlasData* CCFactory::loadTextureAtlasData(std::string_view filePath, std::string_view name, float scale)
 {
     _prevPath       = cocos2d::FileUtils::getInstance()->fullPathForFilename(filePath);
     const auto data = cocos2d::FileUtils::getInstance()->getStringFromFile(_prevPath);
@@ -197,10 +197,10 @@ TextureAtlasData* CCFactory::loadTextureAtlasData(const std::string& filePath, c
     return static_cast<CCTextureAtlasData*>(BaseFactory::parseTextureAtlasData(data.c_str(), nullptr, name, scale));
 }
 
-CCArmatureDisplay* CCFactory::buildArmatureDisplay(const std::string& armatureName,
-                                                   const std::string& dragonBonesName,
-                                                   const std::string& skinName,
-                                                   const std::string& textureAtlasName) const
+CCArmatureDisplay* CCFactory::buildArmatureDisplay(std::string_view armatureName,
+                                                   std::string_view dragonBonesName,
+                                                   std::string_view skinName,
+                                                   std::string_view textureAtlasName) const
 {
     const auto armature = buildArmature(armatureName, dragonBonesName, skinName, textureAtlasName);
     if (armature != nullptr)
@@ -213,7 +213,7 @@ CCArmatureDisplay* CCFactory::buildArmatureDisplay(const std::string& armatureNa
     return nullptr;
 }
 
-cocos2d::Sprite* CCFactory::getTextureDisplay(const std::string& textureName, const std::string& dragonBonesName) const
+cocos2d::Sprite* CCFactory::getTextureDisplay(std::string_view textureName, std::string_view dragonBonesName) const
 {
     const auto textureData = static_cast<CCTextureData*>(_getTextureData(dragonBonesName, textureName));
     if (textureData != nullptr && textureData->spriteFrame != nullptr)
diff --git a/extensions/DragonBones/CCFactory.h b/extensions/DragonBones/CCFactory.h
index 4ffa18400803..d4fbfdc4eb4d 100644
--- a/extensions/DragonBones/CCFactory.h
+++ b/extensions/DragonBones/CCFactory.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -102,9 +102,9 @@ class CCFactory : public BaseFactory
                              Armature* armature) const override;
 
 public:
-    virtual DragonBonesData* loadDragonBonesData(const std::string& filePath,
-                                                 const std::string& name = "",
-                                                 float scale             = 1.0f);
+    virtual DragonBonesData* loadDragonBonesData(std::string_view filePath,
+                                                 std::string_view name = "",
+                                                 float scale           = 1.0f);
     /**
      * - Load and parse a texture atlas data and texture from the local and cache them to the factory.
      * @param  filePath - The file path of texture atlas data.
@@ -132,9 +132,9 @@ class CCFactory : public BaseFactory
      * </pre>
      * @language zh_CN
      */
-    virtual TextureAtlasData* loadTextureAtlasData(const std::string& filePath,
-                                                   const std::string& name = "",
-                                                   float scale             = 1.0f);
+    virtual TextureAtlasData* loadTextureAtlasData(std::string_view filePath,
+                                                   std::string_view name = "",
+                                                   float scale           = 1.0f);
     /**
      * - Create a armature from cached DragonBonesData instances and TextureAtlasData instances, then use the {@link
      * #clock} to update it. The difference is that the armature created by {@link #buildArmature} is not WorldClock
@@ -168,10 +168,10 @@ class CCFactory : public BaseFactory
      * </pre>
      * @language zh_CN
      */
-    virtual CCArmatureDisplay* buildArmatureDisplay(const std::string& armatureName,
-                                                    const std::string& dragonBonesName  = "",
-                                                    const std::string& skinName         = "",
-                                                    const std::string& textureAtlasName = "") const;
+    virtual CCArmatureDisplay* buildArmatureDisplay(std::string_view armatureName,
+                                                    std::string_view dragonBonesName  = "",
+                                                    std::string_view skinName         = "",
+                                                    std::string_view textureAtlasName = "") const;
     /**
      * - Create the display object with the specified texture.
      * @param textureName - The texture data name.
@@ -186,8 +186,8 @@ class CCFactory : public BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual cocos2d::Sprite* getTextureDisplay(const std::string& textureName,
-                                               const std::string& dragonBonesName = "") const;
+    virtual cocos2d::Sprite* getTextureDisplay(std::string_view textureName,
+                                               std::string_view dragonBonesName = "") const;
     /**
      * - A global sound event manager.
      * Sound events can be listened to uniformly from the manager.
diff --git a/extensions/DragonBones/animation/Animation.cpp b/extensions/DragonBones/animation/Animation.cpp
index 56de8389225a..20dd91bafd9a 100644
--- a/extensions/DragonBones/animation/Animation.cpp
+++ b/extensions/DragonBones/animation/Animation.cpp
@@ -1,4 +1,4 @@
-#include "Animation.h"
+#include "Animation.h"
 #include "../model/DisplayData.h"
 #include "../model/AnimationConfig.h"
 #include "../model/AnimationData.h"
@@ -216,7 +216,7 @@ void Animation::reset()
     _lastAnimationState = nullptr;
 }
 
-void Animation::stop(const std::string& animationName)
+void Animation::stop(std::string_view animationName)
 {
     if (!animationName.empty())
     {
@@ -384,7 +384,7 @@ AnimationState* Animation::playConfig(AnimationConfig* animationConfig)
     return animationState;
 }
 
-AnimationState* Animation::play(const std::string& animationName, int playTimes)
+AnimationState* Animation::play(std::string_view animationName, int playTimes)
 {
     _animationConfig->clear();
     _animationConfig->resetToPose = true;
@@ -418,18 +418,18 @@ AnimationState* Animation::play(const std::string& animationName, int playTimes)
     return _lastAnimationState;
 }
 #ifdef EGRET_WASM
-AnimationState* Animation::fadeIn(const std::string& animationName,
+AnimationState* Animation::fadeIn(std::string_view animationName,
                                   float fadeInTime,
                                   int playTimes,
                                   int layer,
-                                  const std::string& group,
+                                  std::string_view group,
                                   int fadeOutMode /*AnimationFadeOutMode*/
 #else
-AnimationState* Animation::fadeIn(const std::string& animationName,
+AnimationState* Animation::fadeIn(std::string_view animationName,
                                   float fadeInTime,
                                   int playTimes,
                                   int layer,
-                                  const std::string& group,
+                                  std::string_view group,
                                   AnimationFadeOutMode fadeOutMode
 #endif  // EGRET_WASM
 )
@@ -445,7 +445,7 @@ AnimationState* Animation::fadeIn(const std::string& animationName,
     return playConfig(_animationConfig);
 }
 
-AnimationState* Animation::gotoAndPlayByTime(const std::string& animationName, float time, int playTimes)
+AnimationState* Animation::gotoAndPlayByTime(std::string_view animationName, float time, int playTimes)
 {
     _animationConfig->clear();
     _animationConfig->resetToPose = true;
@@ -457,7 +457,7 @@ AnimationState* Animation::gotoAndPlayByTime(const std::string& animationName, f
     return playConfig(_animationConfig);
 }
 
-AnimationState* Animation::gotoAndPlayByFrame(const std::string& animationName, unsigned frame, int playTimes)
+AnimationState* Animation::gotoAndPlayByFrame(std::string_view animationName, unsigned frame, int playTimes)
 {
     _animationConfig->clear();
     _animationConfig->resetToPose = true;
@@ -474,7 +474,7 @@ AnimationState* Animation::gotoAndPlayByFrame(const std::string& animationName,
     return playConfig(_animationConfig);
 }
 
-AnimationState* Animation::gotoAndPlayByProgress(const std::string& animationName, float progress, int playTimes)
+AnimationState* Animation::gotoAndPlayByProgress(std::string_view animationName, float progress, int playTimes)
 {
     _animationConfig->clear();
     _animationConfig->resetToPose = true;
@@ -491,7 +491,7 @@ AnimationState* Animation::gotoAndPlayByProgress(const std::string& animationNam
     return playConfig(_animationConfig);
 }
 
-AnimationState* Animation::gotoAndStopByTime(const std::string& animationName, float time)
+AnimationState* Animation::gotoAndStopByTime(std::string_view animationName, float time)
 {
     const auto animationState = gotoAndPlayByTime(animationName, time, 1);
     if (animationState != nullptr)
@@ -502,7 +502,7 @@ AnimationState* Animation::gotoAndStopByTime(const std::string& animationName, f
     return animationState;
 }
 
-AnimationState* Animation::gotoAndStopByFrame(const std::string& animationName, unsigned frame)
+AnimationState* Animation::gotoAndStopByFrame(std::string_view animationName, unsigned frame)
 {
     const auto animationState = gotoAndPlayByFrame(animationName, frame, 1);
     if (animationState != nullptr)
@@ -513,7 +513,7 @@ AnimationState* Animation::gotoAndStopByFrame(const std::string& animationName,
     return animationState;
 }
 
-AnimationState* Animation::gotoAndStopByProgress(const std::string& animationName, float progress)
+AnimationState* Animation::gotoAndStopByProgress(std::string_view animationName, float progress)
 {
     const auto animationState = gotoAndPlayByProgress(animationName, progress, 1);
     if (animationState != nullptr)
@@ -524,7 +524,7 @@ AnimationState* Animation::gotoAndStopByProgress(const std::string& animationNam
     return animationState;
 }
 
-AnimationState* Animation::getState(const std::string& animationName) const
+AnimationState* Animation::getState(std::string_view animationName) const
 {
     int i = _animationStates.size();
     while (i--)
@@ -539,7 +539,7 @@ AnimationState* Animation::getState(const std::string& animationName) const
     return nullptr;
 }
 
-bool Animation::hasAnimation(const std::string& animationName) const
+bool Animation::hasAnimation(std::string_view animationName) const
 {
     return _animations.find(animationName) != _animations.end();
 }
@@ -570,7 +570,7 @@ bool Animation::isCompleted() const
     return !_animationStates.empty();
 }
 
-const std::string& Animation::getLastAnimationName() const
+std::string_view Animation::getLastAnimationName() const
 {
     if (_lastAnimationState != nullptr)
     {
@@ -581,7 +581,7 @@ const std::string& Animation::getLastAnimationName() const
     return DEFAULT_NAME;
 }
 
-void Animation::setAnimations(const std::map<std::string, AnimationData*>& value)
+void Animation::setAnimations(const hlookup::string_map<AnimationData*>& value)
 {
     if (_animations == value)
     {
diff --git a/extensions/DragonBones/animation/Animation.h b/extensions/DragonBones/animation/Animation.h
index 33927b75ab66..524ade25fbd3 100644
--- a/extensions/DragonBones/animation/Animation.h
+++ b/extensions/DragonBones/animation/Animation.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -64,7 +64,7 @@ class Animation final : public BaseObject
     float _inheritTimeScale;
     std::vector<std::string> _animationNames;
     std::vector<AnimationState*> _animationStates;
-    std::map<std::string, AnimationData*> _animations;
+    hlookup::string_map<AnimationData*> _animations;
     Armature* _armature;
     AnimationConfig* _animationConfig;
     AnimationState* _lastAnimationState;
@@ -115,7 +115,7 @@ class Animation final : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    void stop(const std::string& animationName);
+    void stop(std::string_view animationName);
     /**
      * - Play animation with a specific animation config.
      * The API is still in the experimental phase and may encounter bugs or stability or compatibility issues when used.
@@ -166,7 +166,7 @@ class Animation final : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    AnimationState* play(const std::string& animationName = "", int playTimes = -1);
+    AnimationState* play(std::string_view animationName = "", int playTimes = -1);
     /**
      * - Fade in a specific animation.
      * @param animationName - The name of animation data.
@@ -211,11 +211,11 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* fadeIn(const std::string& animationName,
+    AnimationState* fadeIn(std::string_view animationName,
                            float fadeInTime                 = -1.f,
                            int playTimes                    = -1,
                            int layer                        = 0,
-                           const std::string& group         = "",
+                           std::string_view group           = "",
                            AnimationFadeOutMode fadeOutMode = AnimationFadeOutMode::SameLayerAndGroup);
     /**
      * - Play a specific animation from the specific time.
@@ -236,7 +236,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndPlayByTime(const std::string& animationName, float time = 0.f, int playTimes = -1);
+    AnimationState* gotoAndPlayByTime(std::string_view animationName, float time = 0.f, int playTimes = -1);
     /**
      * - Play a specific animation from the specific frame.
      * @param animationName - The name of animation data.
@@ -256,7 +256,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndPlayByFrame(const std::string& animationName, unsigned frame = 0, int playTimes = -1);
+    AnimationState* gotoAndPlayByFrame(std::string_view animationName, unsigned frame = 0, int playTimes = -1);
     /**
      * - Play a specific animation from the specific progress.
      * @param animationName - The name of animation data.
@@ -276,7 +276,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndPlayByProgress(const std::string& animationName, float progress = 0.f, int playTimes = -1);
+    AnimationState* gotoAndPlayByProgress(std::string_view animationName, float progress = 0.f, int playTimes = -1);
     /**
      * - Stop a specific animation at the specific time.
      * @param animationName - The name of animation data.
@@ -293,7 +293,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndStopByTime(const std::string& animationName, float time = 0.f);
+    AnimationState* gotoAndStopByTime(std::string_view animationName, float time = 0.f);
     /**
      * - Stop a specific animation at the specific frame.
      * @param animationName - The name of animation data.
@@ -310,7 +310,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndStopByFrame(const std::string& animationName, unsigned frame = 0);
+    AnimationState* gotoAndStopByFrame(std::string_view animationName, unsigned frame = 0);
     /**
      * - Stop a specific animation at the specific progress.
      * @param animationName - The name of animation data.
@@ -327,7 +327,7 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    AnimationState* gotoAndStopByProgress(const std::string& animationName, float progress = 0.f);
+    AnimationState* gotoAndStopByProgress(std::string_view animationName, float progress = 0.f);
     /**
      * - Get a specific animation state.
      * @param animationName - The name of animation state.
@@ -354,7 +354,7 @@ class Animation final : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    AnimationState* getState(const std::string& animationName) const;
+    AnimationState* getState(std::string_view animationName) const;
     /**
      * - Check whether a specific animation data is included.
      * @param animationName - The name of animation data.
@@ -369,7 +369,7 @@ class Animation final : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    bool hasAnimation(const std::string& animationName) const;
+    bool hasAnimation(std::string_view animationName) const;
     /**
      * - Get all the animation states.
      * @version DragonBones 5.1
@@ -419,7 +419,7 @@ class Animation final : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    const std::string& getLastAnimationName() const;
+    std::string_view getLastAnimationName() const;
     /**
      * - The name of all animation data
      * @version DragonBones 4.5
@@ -441,8 +441,8 @@ class Animation final : public BaseObject
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    inline const std::map<std::string, AnimationData*>& getAnimations() const { return _animations; }
-    void setAnimations(const std::map<std::string, AnimationData*>& value);
+    inline const hlookup::string_map<AnimationData*>& getAnimations() const { return _animations; }
+    void setAnimations(const hlookup::string_map<AnimationData*>& value);
     /**
      * - An AnimationConfig instance that can be used quickly.
      * @see dragonBones.AnimationConfig
diff --git a/extensions/DragonBones/animation/AnimationState.cpp b/extensions/DragonBones/animation/AnimationState.cpp
index 48274df1946b..0540ce842f2d 100644
--- a/extensions/DragonBones/animation/AnimationState.cpp
+++ b/extensions/DragonBones/animation/AnimationState.cpp
@@ -1,4 +1,4 @@
-#include "AnimationState.h"
+#include "AnimationState.h"
 #include "WorldClock.h"
 #include "../model/DisplayData.h"
 #include "../model/AnimationConfig.h"
@@ -83,7 +83,7 @@ void AnimationState::_onClear()
 void AnimationState::_updateTimelines()
 {
     {  // Update constraint timelines.
-        std::map<std::string, std::vector<ConstraintTimelineState*>> constraintTimelines;
+        hlookup::string_map<std::vector<ConstraintTimelineState*>> constraintTimelines;
         for (const auto timeline : _constraintTimelines)  // Create constraint timelines map.
         {
             constraintTimelines[timeline->constraint->getName()].push_back(timeline);
@@ -137,7 +137,7 @@ void AnimationState::_updateTimelines()
 void AnimationState::_updateBoneAndSlotTimelines()
 {
     {  // Update bone timelines.
-        std::map<std::string, std::vector<BoneTimelineState*>> boneTimelines;
+        hlookup::string_map<std::vector<BoneTimelineState*>> boneTimelines;
         for (const auto timeline : _boneTimelines)  // Create bone timelines map.
         {
             boneTimelines[timeline->bone->getName()].push_back(timeline);
@@ -238,7 +238,7 @@ void AnimationState::_updateBoneAndSlotTimelines()
     }
 
     {  // Update slot timelines.
-        std::map<std::string, std::vector<SlotTimelineState*>> slotTimelines;
+        hlookup::string_map<std::vector<SlotTimelineState*>> slotTimelines;
         std::vector<unsigned> ffdFlags;
         for (const auto timeline : _slotTimelines)  // Create slot timelines map.
         {
@@ -745,12 +745,12 @@ void AnimationState::fadeOut(float fadeOutTime, bool pausePlayhead)
     _fadeTime      = fadeTotalTime * (1.0f - _fadeProgress);
 }
 
-bool AnimationState::containsBoneMask(const std::string& boneName) const
+bool AnimationState::containsBoneMask(std::string_view boneName) const
 {
     return _boneMask.empty() || std::find(_boneMask.cbegin(), _boneMask.cend(), boneName) != _boneMask.cend();
 }
 
-void AnimationState::addBoneMask(const std::string& boneName, bool recursive)
+void AnimationState::addBoneMask(std::string_view boneName, bool recursive)
 {
     const auto currentBone = _armature->getBone(boneName);
     if (currentBone == nullptr)
@@ -760,7 +760,7 @@ void AnimationState::addBoneMask(const std::string& boneName, bool recursive)
 
     if (std::find(_boneMask.cbegin(), _boneMask.cend(), boneName) == _boneMask.cend())
     {
-        _boneMask.push_back(boneName);
+        _boneMask.push_back(std::string{boneName});
     }
 
     if (recursive)  // Add recursive mixing.
@@ -770,7 +770,7 @@ void AnimationState::addBoneMask(const std::string& boneName, bool recursive)
             if (std::find(_boneMask.cbegin(), _boneMask.cend(), bone->getName()) == _boneMask.cend() &&
                 currentBone->contains(bone))
             {
-                _boneMask.push_back(bone->getName());
+                _boneMask.push_back(std::string{bone->getName()});
             }
         }
     }
@@ -778,7 +778,7 @@ void AnimationState::addBoneMask(const std::string& boneName, bool recursive)
     _timelineDirty = 1;
 }
 
-void AnimationState::removeBoneMask(const std::string& boneName, bool recursive)
+void AnimationState::removeBoneMask(std::string_view boneName, bool recursive)
 {
     {
         auto iterator = std::find(_boneMask.begin(), _boneMask.end(), boneName);
@@ -816,7 +816,7 @@ void AnimationState::removeBoneMask(const std::string& boneName, bool recursive)
 
                     if (!currentBone->contains(bone))
                     {
-                        _boneMask.push_back(bone->getName());
+                        _boneMask.push_back(std::string{bone->getName()});
                     }
                 }
             }
diff --git a/extensions/DragonBones/animation/AnimationState.h b/extensions/DragonBones/animation/AnimationState.h
index a99da36f0e58..faf9d3ab1763 100644
--- a/extensions/DragonBones/animation/AnimationState.h
+++ b/extensions/DragonBones/animation/AnimationState.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -251,7 +251,7 @@ class AnimationState : public BaseObject
     std::vector<SlotTimelineState*> _slotTimelines;
     std::vector<ConstraintTimelineState*> _constraintTimelines;
     std::vector<std::pair<TimelineState*, BaseTimelineType>> _poseTimelines;
-    std::map<std::string, BonePose*> _bonePoses;
+    hlookup::string_map<BonePose*> _bonePoses;
     Armature* _armature;
     ZOrderTimelineState* _zOrderTimeline;
 
@@ -325,7 +325,7 @@ class AnimationState : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    bool containsBoneMask(const std::string& boneName) const;
+    bool containsBoneMask(std::string_view boneName) const;
     /**
      * - Add a specific bone mask.
      * @param boneName - The bone name.
@@ -340,7 +340,7 @@ class AnimationState : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    void addBoneMask(const std::string& boneName, bool recursive = true);
+    void addBoneMask(std::string_view boneName, bool recursive = true);
     /**
      * - Remove the mask of a specific bone.
      * @param boneName - The bone name.
@@ -355,7 +355,7 @@ class AnimationState : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    void removeBoneMask(const std::string& boneName, bool recursive = true);
+    void removeBoneMask(std::string_view boneName, bool recursive = true);
     /**
      * - Remove all bone masks.
      * @version DragonBones 3.0
@@ -456,7 +456,7 @@ class AnimationState : public BaseObject
      */
     float getCurrentTime() const;
     void setCurrentTime(float value);
-    inline const std::string& getName() const { return name; }
+    inline std::string_view getName() const { return name; }
 
     /**
      * - The animation data.
diff --git a/extensions/DragonBones/armature/Armature.cpp b/extensions/DragonBones/armature/Armature.cpp
index 7e6cc57b9544..e4aabc2763d0 100644
--- a/extensions/DragonBones/armature/Armature.cpp
+++ b/extensions/DragonBones/armature/Armature.cpp
@@ -1,4 +1,4 @@
-#include "Armature.h"
+#include "Armature.h"
 #include "../model/TextureAtlasData.h"
 #include "../model/UserData.h"
 #include "../animation/WorldClock.h"
@@ -275,7 +275,7 @@ void Armature::advanceTime(float passedTime)
     _proxy->dbUpdate();
 }
 
-void Armature::invalidUpdate(const std::string& boneName, bool updateSlot)
+void Armature::invalidUpdate(std::string_view boneName, bool updateSlot)
 {
     if (!boneName.empty())
     {
@@ -431,7 +431,7 @@ Slot* Armature::intersectsSegment(float xA,
     return intSlotA;
 }
 
-Bone* Armature::getBone(const std::string& name) const
+Bone* Armature::getBone(std::string_view name) const
 {
     for (const auto& bone : _bones)
     {
@@ -451,7 +451,7 @@ Bone* Armature::getBoneByDisplay(void* display) const
     return slot != nullptr ? slot->getParent() : nullptr;
 }
 
-Slot* Armature::getSlot(const std::string& name) const
+Slot* Armature::getSlot(std::string_view name) const
 {
     for (const auto slot : _slots)
     {
diff --git a/extensions/DragonBones/armature/Armature.h b/extensions/DragonBones/armature/Armature.h
index 6f6f5f7bbecb..c78d0fe9a232 100644
--- a/extensions/DragonBones/armature/Armature.h
+++ b/extensions/DragonBones/armature/Armature.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -201,7 +201,7 @@ class Armature : public virtual IAnimatable, public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    void invalidUpdate(const std::string& boneName = "", bool updateSlot = false);
+    void invalidUpdate(std::string_view boneName = "", bool updateSlot = false);
     /**
      * - Check whether a specific point is inside a custom bounding box in a slot.
      * The coordinate system of the point is the inner coordinate system of the armature.
@@ -278,7 +278,7 @@ class Armature : public virtual IAnimatable, public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    Bone* getBone(const std::string& name) const;
+    Bone* getBone(std::string_view name) const;
     /**
      * - Get a specific bone by the display.
      * @param display - The display object.
@@ -308,7 +308,7 @@ class Armature : public virtual IAnimatable, public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    Slot* getSlot(const std::string& name) const;
+    Slot* getSlot(std::string_view name) const;
     /**
      * - Get a specific slot by the display.
      * @param display - The display object.
@@ -426,7 +426,7 @@ class Armature : public virtual IAnimatable, public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline const std::string& getName() const { return _armatureData->name; }
+    inline std::string_view getName() const { return _armatureData->name; }
     /**
      * - The armature data.
      * @see dragonBones.ArmatureData
diff --git a/extensions/DragonBones/armature/Bone.h b/extensions/DragonBones/armature/Bone.h
index cba7c2d65068..3541143b0b58 100644
--- a/extensions/DragonBones/armature/Bone.h
+++ b/extensions/DragonBones/armature/Bone.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -198,7 +198,7 @@ class Bone final : public TransformObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline const std::string& getName() const { return _boneData->name; }
+    inline std::string_view getName() const { return _boneData->name; }
     /**
      * - The parent bone to which it belongs.
      * @version DragonBones 3.0
diff --git a/extensions/DragonBones/armature/Constraint.h b/extensions/DragonBones/armature/Constraint.h
index 92ba6e9f5041..99d38b15ec14 100644
--- a/extensions/DragonBones/armature/Constraint.h
+++ b/extensions/DragonBones/armature/Constraint.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -75,7 +75,7 @@ class Constraint : public BaseObject
     virtual void update()                                                 = 0;
     virtual void invalidUpdate()                                          = 0;
 
-    inline const std::string& getName() { return _constraintData->name; }
+    inline std::string_view getName() { return _constraintData->name; }
 };
 /**
  * @internal
diff --git a/extensions/DragonBones/armature/Slot.h b/extensions/DragonBones/armature/Slot.h
index 234e2f79c687..6700737b08b9 100644
--- a/extensions/DragonBones/armature/Slot.h
+++ b/extensions/DragonBones/armature/Slot.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -343,7 +343,7 @@ class Slot : public TransformObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline const std::string& getName() const { return _slotData->name; }
+    inline std::string_view getName() const { return _slotData->name; }
     /**
      * - Contains a display list of display objects or child armatures.
      * @version DragonBones 3.0
diff --git a/extensions/DragonBones/core/DragonBones.h b/extensions/DragonBones/core/DragonBones.h
index 9ddab3b97aaf..336357fecfbd 100644
--- a/extensions/DragonBones/core/DragonBones.h
+++ b/extensions/DragonBones/core/DragonBones.h
@@ -33,6 +33,7 @@
 #include <functional>
 #include <sstream>
 #include <assert.h>
+#include "base/hlookup.h"
 // dragonBones assert
 #define DRAGONBONES_ASSERT(cond, msg) \
     do                                \
@@ -359,15 +360,15 @@ inline int indexOf(const std::vector<T>& vector, const T& value)
     return -1;
 }
 
-template <class T>
-inline T* mapFind(const std::map<std::string, T*>& map, const std::string& key)
+template <class Cont>
+inline auto mapFind(Cont& map, std::string_view key)
 {
     auto iterator = map.find(key);
     return (iterator != map.end()) ? iterator->second : nullptr;
 }
 
-template <class T>
-inline T* mapFindB(std::map<std::string, T>& map, const std::string& key)
+template <class Cont>
+inline auto mapFindB(Cont& map, std::string_view key)
 {
     auto iterator = map.find(key);
     return (iterator != map.end()) ? &iterator->second : nullptr;
diff --git a/extensions/DragonBones/event/IEventDispatcher.h b/extensions/DragonBones/event/IEventDispatcher.h
index ded91d92db61..26476941ee3a 100644
--- a/extensions/DragonBones/event/IEventDispatcher.h
+++ b/extensions/DragonBones/event/IEventDispatcher.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -56,7 +56,7 @@ class IEventDispatcher
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual bool hasDBEventListener(const std::string& type) const = 0;
+    virtual bool hasDBEventListener(std::string_view type) const = 0;
     /**
      * - Dispatches an event into the event flow.
      * @param type - Event type.
@@ -73,7 +73,7 @@ class IEventDispatcher
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual void dispatchDBEvent(const std::string& type, EventObject* value) = 0;
+    virtual void dispatchDBEvent(std::string_view type, EventObject* value) = 0;
     /**
      * - Add an event listener object so that the listener receives notification of an event.
      * @param type - Event type.
@@ -90,7 +90,7 @@ class IEventDispatcher
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual void addDBEventListener(const std::string& type, const std::function<void(EventObject*)>& listener) = 0;
+    virtual void addDBEventListener(std::string_view type, const std::function<void(EventObject*)>& listener) = 0;
     /**
      * - Removes a listener from the object.
      * @param type - Event type.
@@ -107,7 +107,7 @@ class IEventDispatcher
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual void removeDBEventListener(const std::string& type, const std::function<void(EventObject*)>& listener) = 0;
+    virtual void removeDBEventListener(std::string_view type, const std::function<void(EventObject*)>& listener) = 0;
 };
 
 DRAGONBONES_NAMESPACE_END
diff --git a/extensions/DragonBones/factory/BaseFactory.cpp b/extensions/DragonBones/factory/BaseFactory.cpp
index c7eb5242e242..afa0b9fa13c4 100644
--- a/extensions/DragonBones/factory/BaseFactory.cpp
+++ b/extensions/DragonBones/factory/BaseFactory.cpp
@@ -1,11 +1,11 @@
-#include "BaseFactory.h"
+#include "BaseFactory.h"
 
 DRAGONBONES_NAMESPACE_BEGIN
 
 JSONDataParser BaseFactory::_jsonParser;
 BinaryDataParser BaseFactory::_binaryParser;
 
-TextureData* BaseFactory::_getTextureData(const std::string& textureAtlasName, const std::string& textureName) const
+TextureData* BaseFactory::_getTextureData(std::string_view textureAtlasName, std::string_view textureName) const
 {
     const auto iterator = _textureAtlasDataMap.find(textureAtlasName);
     if (iterator != _textureAtlasDataMap.end())
@@ -42,12 +42,12 @@ TextureData* BaseFactory::_getTextureData(const std::string& textureAtlasName, c
 }
 
 bool BaseFactory::_fillBuildArmaturePackage(BuildArmaturePackage& dataPackage,
-                                            const std::string& dragonBonesName,
-                                            const std::string& armatureName,
-                                            const std::string& skinName,
-                                            const std::string& textureAtlasName) const
+                                            std::string_view dragonBonesName,
+                                            std::string_view armatureName,
+                                            std::string_view skinName,
+                                            std::string_view textureAtlasName) const
 {
-    std::string mapName              = dragonBonesName;
+    auto mapName                     = dragonBonesName;
     DragonBonesData* dragonBonesData = nullptr;
     ArmatureData* armatureData       = nullptr;
 
@@ -141,7 +141,7 @@ void BaseFactory::_buildSlots(const BuildArmaturePackage& dataPackage, Armature*
         return;
     }
 
-    std::map<std::string, std::vector<DisplayData*>*> skinSlots;
+    hlookup::string_map<std::vector<DisplayData*>*> skinSlots;
     for (auto& pair : defaultSkin->displays)
     {
         auto& displays        = pair.second;
@@ -309,7 +309,7 @@ std::pair<void*, DisplayType> BaseFactory::_getSlotDisplay(const BuildArmaturePa
     return display;
 }
 
-DragonBonesData* BaseFactory::parseDragonBonesData(const char* rawData, const std::string& name, float scale)
+DragonBonesData* BaseFactory::parseDragonBonesData(const char* rawData, std::string_view name, float scale)
 {
     DRAGONBONES_ASSERT(rawData != nullptr, "");
 
@@ -350,7 +350,7 @@ DragonBonesData* BaseFactory::parseDragonBonesData(const char* rawData, const st
 
 TextureAtlasData* BaseFactory::parseTextureAtlasData(const char* rawData,
                                                      void* textureAtlas,
-                                                     const std::string& name,
+                                                     std::string_view name,
                                                      float scale)
 {
     const auto textureAtlasData = _buildTextureAtlasData(nullptr, nullptr);
@@ -361,7 +361,7 @@ TextureAtlasData* BaseFactory::parseTextureAtlasData(const char* rawData,
     return textureAtlasData;
 }
 
-void BaseFactory::addDragonBonesData(DragonBonesData* data, const std::string& name)
+void BaseFactory::addDragonBonesData(DragonBonesData* data, std::string_view name)
 {
     const auto& mapName = !name.empty() ? name : data->name;
     if (_dragonBonesDataMap.find(mapName) != _dragonBonesDataMap.cend())
@@ -378,7 +378,7 @@ void BaseFactory::addDragonBonesData(DragonBonesData* data, const std::string& n
     _dragonBonesDataMap[mapName] = data;
 }
 
-void BaseFactory::removeDragonBonesData(const std::string& name, bool disposeData)
+void BaseFactory::removeDragonBonesData(std::string_view name, bool disposeData)
 {
     const auto iterator = _dragonBonesDataMap.find(name);
     if (iterator != _dragonBonesDataMap.cend())
@@ -392,7 +392,7 @@ void BaseFactory::removeDragonBonesData(const std::string& name, bool disposeDat
     }
 }
 
-void BaseFactory::addTextureAtlasData(TextureAtlasData* data, const std::string& name)
+void BaseFactory::addTextureAtlasData(TextureAtlasData* data, std::string_view name)
 {
     const auto& mapName    = !name.empty() ? name : data->name;
     auto& textureAtlasList = _textureAtlasDataMap[mapName];
@@ -402,7 +402,7 @@ void BaseFactory::addTextureAtlasData(TextureAtlasData* data, const std::string&
     }
 }
 
-void BaseFactory::removeTextureAtlasData(const std::string& name, bool disposeData)
+void BaseFactory::removeTextureAtlasData(std::string_view name, bool disposeData)
 {
     const auto iterator = _textureAtlasDataMap.find(name);
     if (iterator != _textureAtlasDataMap.end())
@@ -419,7 +419,7 @@ void BaseFactory::removeTextureAtlasData(const std::string& name, bool disposeDa
     }
 }
 
-ArmatureData* BaseFactory::getArmatureData(const std::string& name, const std::string& dragonBonesName) const
+ArmatureData* BaseFactory::getArmatureData(std::string_view name, std::string_view dragonBonesName) const
 {
     BuildArmaturePackage dataPackage;
     if (!_fillBuildArmaturePackage(dataPackage, dragonBonesName, name, "", ""))
@@ -452,10 +452,10 @@ void BaseFactory::clear(bool disposeData)
     _textureAtlasDataMap.clear();
 }
 
-Armature* BaseFactory::buildArmature(const std::string& armatureName,
-                                     const std::string& dragonBonesName,
-                                     const std::string& skinName,
-                                     const std::string& textureAtlasName) const
+Armature* BaseFactory::buildArmature(std::string_view armatureName,
+                                     std::string_view dragonBonesName,
+                                     std::string_view skinName,
+                                     std::string_view textureAtlasName) const
 {
     BuildArmaturePackage dataPackage;
     if (!_fillBuildArmaturePackage(dataPackage, dragonBonesName, armatureName, skinName, textureAtlasName))
@@ -512,10 +512,10 @@ void BaseFactory::replaceDisplay(Slot* slot, DisplayData* displayData, int displ
     slot->setDisplayList(displayList);
 }
 
-bool BaseFactory::replaceSlotDisplay(const std::string& dragonBonesName,
-                                     const std::string& armatureName,
-                                     const std::string& slotName,
-                                     const std::string& displayName,
+bool BaseFactory::replaceSlotDisplay(std::string_view dragonBonesName,
+                                     std::string_view armatureName,
+                                     std::string_view slotName,
+                                     std::string_view displayName,
                                      Slot* slot,
                                      int displayIndex) const
 {
@@ -538,9 +538,9 @@ bool BaseFactory::replaceSlotDisplay(const std::string& dragonBonesName,
     return true;
 }
 
-bool BaseFactory::replaceSlotDisplayList(const std::string& dragonBonesName,
-                                         const std::string& armatureName,
-                                         const std::string& slotName,
+bool BaseFactory::replaceSlotDisplayList(std::string_view dragonBonesName,
+                                         std::string_view armatureName,
+                                         std::string_view slotName,
                                          Slot* slot) const
 {
     DRAGONBONES_ASSERT(slot, "Arguments error.");
diff --git a/extensions/DragonBones/factory/BaseFactory.h b/extensions/DragonBones/factory/BaseFactory.h
index 8d9329d57982..dcd8d8d3348e 100644
--- a/extensions/DragonBones/factory/BaseFactory.h
+++ b/extensions/DragonBones/factory/BaseFactory.h
@@ -68,8 +68,8 @@ class BaseFactory
     bool autoSearch;
 
 protected:
-    std::map<std::string, DragonBonesData*> _dragonBonesDataMap;
-    std::map<std::string, std::vector<TextureAtlasData*>> _textureAtlasDataMap;
+    hlookup::string_map<DragonBonesData*> _dragonBonesDataMap;
+    hlookup::string_map<std::vector<TextureAtlasData*>> _textureAtlasDataMap;
     DragonBones* _dragonBones;
     DataParser* _dataParser;
 
@@ -99,12 +99,12 @@ class BaseFactory
 
 protected:
     virtual inline bool _isSupportMesh() const { return true; }
-    virtual TextureData* _getTextureData(const std::string& textureAtlasName, const std::string& textureName) const;
+    virtual TextureData* _getTextureData(std::string_view textureAtlasName, std::string_view textureName) const;
     virtual bool _fillBuildArmaturePackage(BuildArmaturePackage& dataPackage,
-                                           const std::string& dragonBonesName,
-                                           const std::string& armatureName,
-                                           const std::string& skinName,
-                                           const std::string& textureAtlasName) const;
+                                           std::string_view dragonBonesName,
+                                           std::string_view armatureName,
+                                           std::string_view skinName,
+                                           std::string_view textureAtlasName) const;
     virtual void _buildBones(const BuildArmaturePackage& dataPackage, Armature* armature) const;
     /**
      * @private
@@ -151,9 +151,7 @@ class BaseFactory
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual DragonBonesData* parseDragonBonesData(const char* rawData,
-                                                  const std::string& name = "",
-                                                  float scale             = 1.0f);
+    virtual DragonBonesData* parseDragonBonesData(const char* rawData, std::string_view name = "", float scale = 1.0f);
     /**
      * - Parse the raw texture atlas data and the texture atlas object to a TextureAtlasData instance and cache it to
      * the factory.
@@ -186,8 +184,8 @@ class BaseFactory
      */
     virtual TextureAtlasData* parseTextureAtlasData(const char* rawData,
                                                     void* textureAtlas,
-                                                    const std::string& name = "",
-                                                    float scale             = 1.0f);
+                                                    std::string_view name = "",
+                                                    float scale           = 1.0f);
     /**
      * - Get a specific DragonBonesData instance.
      * @param name - The DragonBonesData instance cache name.
@@ -210,7 +208,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline DragonBonesData* getDragonBonesData(const std::string& name) const
+    inline DragonBonesData* getDragonBonesData(std::string_view name) const
     {
         return mapFind(_dragonBonesDataMap, name);
     }
@@ -237,7 +235,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual void addDragonBonesData(DragonBonesData* data, const std::string& name = "");
+    virtual void addDragonBonesData(DragonBonesData* data, std::string_view name = "");
     /**
      * - Remove a DragonBonesData instance.
      * @param name - The DragonBonesData instance cache name.
@@ -260,7 +258,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual void removeDragonBonesData(const std::string& name, bool disposeData = true);
+    virtual void removeDragonBonesData(std::string_view name, bool disposeData = true);
     /**
      * - Get a list of specific TextureAtlasData instances.
      * @param name - The TextureAtlasData cahce name.
@@ -281,7 +279,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline std::vector<TextureAtlasData*>* getTextureAtlasData(const std::string& name)
+    inline std::vector<TextureAtlasData*>* getTextureAtlasData(std::string_view name)
     {
         return mapFindB(_textureAtlasDataMap, name);
     }
@@ -308,7 +306,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual void addTextureAtlasData(TextureAtlasData* data, const std::string& name = "");
+    virtual void addTextureAtlasData(TextureAtlasData* data, std::string_view name = "");
     /**
      * - Remove a TextureAtlasData instance.
      * @param name - The TextureAtlasData instance cache name.
@@ -331,7 +329,7 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual void removeTextureAtlasData(const std::string& name, bool disposeData = true);
+    virtual void removeTextureAtlasData(std::string_view name, bool disposeData = true);
     /**
      * - Get a specific armature data.
      * @param name - The armature data name.
@@ -348,7 +346,7 @@ class BaseFactory
      * @version DragonBones 5.1
      * @language zh_CN
      */
-    virtual ArmatureData* getArmatureData(const std::string& name, const std::string& dragonBonesName = "") const;
+    virtual ArmatureData* getArmatureData(std::string_view name, std::string_view dragonBonesName = "") const;
     /**
      * - Clear all cached DragonBonesData instances and TextureAtlasData instances.
      * @param disposeData - Whether to dispose data.
@@ -403,10 +401,10 @@ class BaseFactory
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    virtual Armature* buildArmature(const std::string& armatureName,
-                                    const std::string& dragonBonesName  = "",
-                                    const std::string& skinName         = "",
-                                    const std::string& textureAtlasName = "") const;
+    virtual Armature* buildArmature(std::string_view armatureName,
+                                    std::string_view dragonBonesName  = "",
+                                    std::string_view skinName         = "",
+                                    std::string_view textureAtlasName = "") const;
     /**
      * @private
      */
@@ -448,18 +446,18 @@ class BaseFactory
      * @version DragonBones 4.5
      * @language zh_CN
      */
-    virtual bool replaceSlotDisplay(const std::string& dragonBonesName,
-                                    const std::string& armatureName,
-                                    const std::string& slotName,
-                                    const std::string& displayName,
+    virtual bool replaceSlotDisplay(std::string_view dragonBonesName,
+                                    std::string_view armatureName,
+                                    std::string_view slotName,
+                                    std::string_view displayName,
                                     Slot* slot,
                                     int displayIndex = -1) const;
     /**
      * @private
      */
-    virtual bool replaceSlotDisplayList(const std::string& dragonBonesName,
-                                        const std::string& armatureName,
-                                        const std::string& slotName,
+    virtual bool replaceSlotDisplayList(std::string_view dragonBonesName,
+                                        std::string_view armatureName,
+                                        std::string_view slotName,
                                         Slot* slot) const;
     /**
      * - Share specific skin data with specific armature.
@@ -550,14 +548,14 @@ class BaseFactory
     /**
      * @private
      */
-    inline const std::map<std::string, std::vector<TextureAtlasData*>>& getAllTextureAtlasData() const
+    inline const hlookup::string_map<std::vector<TextureAtlasData*>>& getAllTextureAtlasData() const
     {
         return _textureAtlasDataMap;
     }
     /**
      * @private
      */
-    inline const std::map<std::string, DragonBonesData*>& getAllDragonBonesData() const { return _dragonBonesDataMap; }
+    inline const hlookup::string_map<DragonBonesData*>& getAllDragonBonesData() const { return _dragonBonesDataMap; }
     /**
      * - An Worldclock instance updated by engine.
      * @version DragonBones 5.7
diff --git a/extensions/DragonBones/model/AnimationConfig.cpp b/extensions/DragonBones/model/AnimationConfig.cpp
index 26d198f630dd..8ee7dac7d60c 100644
--- a/extensions/DragonBones/model/AnimationConfig.cpp
+++ b/extensions/DragonBones/model/AnimationConfig.cpp
@@ -1,4 +1,4 @@
-#include "AnimationConfig.h"
+#include "AnimationConfig.h"
 #include "../armature/Armature.h"
 #include "../armature/Bone.h"
 
@@ -63,12 +63,12 @@ void AnimationConfig::copyFrom(AnimationConfig* value)
     boneMask         = value->boneMask;
 }
 
-bool AnimationConfig::containsBoneMask(const std::string& boneName) const
+bool AnimationConfig::containsBoneMask(std::string_view boneName) const
 {
     return boneMask.empty() || std::find(boneMask.cbegin(), boneMask.cend(), boneName) != boneMask.cend();
 }
 
-void AnimationConfig::addBoneMask(Armature* armature, const std::string& boneName, bool recursive)
+void AnimationConfig::addBoneMask(Armature* armature, std::string_view boneName, bool recursive)
 {
     const auto currentBone = armature->getBone(boneName);
     if (currentBone == nullptr)
@@ -78,7 +78,7 @@ void AnimationConfig::addBoneMask(Armature* armature, const std::string& boneNam
 
     if (std::find(boneMask.cbegin(), boneMask.cend(), boneName) == boneMask.cend())  // Add mixing
     {
-        boneMask.push_back(boneName);
+        boneMask.push_back(std::string{boneName});
     }
 
     if (recursive)  // Add recursive mixing.
@@ -88,13 +88,13 @@ void AnimationConfig::addBoneMask(Armature* armature, const std::string& boneNam
             if (std::find(boneMask.cbegin(), boneMask.cend(), bone->getName()) == boneMask.cend() &&
                 currentBone->contains(bone))
             {
-                boneMask.push_back(bone->getName());
+                boneMask.push_back(std::string{bone->getName()});
             }
         }
     }
 }
 
-void AnimationConfig::removeBoneMask(Armature* armature, const std::string& boneName, bool recursive)
+void AnimationConfig::removeBoneMask(Armature* armature, std::string_view boneName, bool recursive)
 {
     {
         auto iterator = std::find(boneMask.begin(), boneMask.end(), boneName);
@@ -131,7 +131,7 @@ void AnimationConfig::removeBoneMask(Armature* armature, const std::string& bone
 
                     if (!currentBone->contains(bone))
                     {
-                        boneMask.push_back(bone->getName());
+                        boneMask.push_back(std::string{bone->getName()});
                     }
                 }
             }
diff --git a/extensions/DragonBones/model/AnimationConfig.h b/extensions/DragonBones/model/AnimationConfig.h
index c53fe730c14a..dd90b4e7c817 100644
--- a/extensions/DragonBones/model/AnimationConfig.h
+++ b/extensions/DragonBones/model/AnimationConfig.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -296,15 +296,15 @@ class AnimationConfig : public BaseObject
     /**
      * @private
      */
-    bool containsBoneMask(const std::string& boneName) const;
+    bool containsBoneMask(std::string_view boneName) const;
     /**
      * @private
      */
-    void addBoneMask(Armature* armature, const std::string& boneName, bool recursive);
+    void addBoneMask(Armature* armature, std::string_view boneName, bool recursive);
     /**
      * @private
      */
-    void removeBoneMask(Armature* armature, const std::string& boneName, bool recursive);
+    void removeBoneMask(Armature* armature, std::string_view boneName, bool recursive);
 
 public:  // For WebAssembly.
     int getFadeOutMode() const { return (int)fadeOutMode; }
diff --git a/extensions/DragonBones/model/AnimationData.h b/extensions/DragonBones/model/AnimationData.h
index 8d7a37708ea4..64e7be54df46 100644
--- a/extensions/DragonBones/model/AnimationData.h
+++ b/extensions/DragonBones/model/AnimationData.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -126,23 +126,23 @@ class AnimationData : public BaseObject
     /**
      * @private
      */
-    std::map<std::string, std::vector<TimelineData*>> boneTimelines;
+    hlookup::string_map<std::vector<TimelineData*>> boneTimelines;
     /**
      * @private
      */
-    std::map<std::string, std::vector<TimelineData*>> slotTimelines;
+    hlookup::string_map<std::vector<TimelineData*>> slotTimelines;
     /**
      * @private
      */
-    std::map<std::string, std::vector<TimelineData*>> constraintTimelines;
+    hlookup::string_map<std::vector<TimelineData*>> constraintTimelines;
     /**
      * @private
      */
-    std::map<std::string, std::vector<int>> boneCachedFrameIndices;
+    hlookup::string_map<std::vector<int>> boneCachedFrameIndices;
     /**
      * @private
      */
-    std::map<std::string, std::vector<int>> slotCachedFrameIndices;
+    hlookup::string_map<std::vector<int>> slotCachedFrameIndices;
     /**
      * @private
      */
@@ -181,35 +181,35 @@ class AnimationData : public BaseObject
     /**
      * @private
      */
-    std::vector<TimelineData*>* getBoneTimelines(const std::string& timelineName)
+    std::vector<TimelineData*>* getBoneTimelines(std::string_view timelineName)
     {
         return mapFindB(boneTimelines, timelineName);
     }
     /**
      * @private
      */
-    inline std::vector<TimelineData*>* getSlotTimelines(const std::string& timelineName)
+    inline std::vector<TimelineData*>* getSlotTimelines(std::string_view timelineName)
     {
         return mapFindB(slotTimelines, timelineName);
     }
     /**
      * @private
      */
-    inline std::vector<TimelineData*>* getConstraintTimelines(const std::string& timelineName)
+    inline std::vector<TimelineData*>* getConstraintTimelines(std::string_view timelineName)
     {
         return mapFindB(constraintTimelines, timelineName);
     }
     /**
      * @private
      */
-    inline std::vector<int>* getBoneCachedFrameIndices(const std::string& boneName)
+    inline std::vector<int>* getBoneCachedFrameIndices(std::string_view boneName)
     {
         return mapFindB(boneCachedFrameIndices, boneName);
     }
     /**
      * @private
      */
-    inline std::vector<int>* getSlotCachedFrameIndices(const std::string& slotName)
+    inline std::vector<int>* getSlotCachedFrameIndices(std::string_view slotName)
     {
         return mapFindB(slotCachedFrameIndices, slotName);
     }
diff --git a/extensions/DragonBones/model/ArmatureData.cpp b/extensions/DragonBones/model/ArmatureData.cpp
index 9cc86af721c4..66f9dfca75d5 100644
--- a/extensions/DragonBones/model/ArmatureData.cpp
+++ b/extensions/DragonBones/model/ArmatureData.cpp
@@ -1,4 +1,4 @@
-#include "ArmatureData.h"
+#include "ArmatureData.h"
 #include "UserData.h"
 #include "DragonBonesData.h"
 #include "ConstraintData.h"
@@ -264,9 +264,9 @@ void ArmatureData::addAction(ActionData* value, bool isDefault)
     }
 }
 
-MeshDisplayData* ArmatureData::getMesh(const std::string& skinName,
-                                       const std::string& slotName,
-                                       const std::string& meshName) const
+MeshDisplayData* ArmatureData::getMesh(std::string_view skinName,
+                                       std::string_view slotName,
+                                       std::string_view meshName) const
 {
     const auto skin = getSkin(skinName);
     if (skin == nullptr)
diff --git a/extensions/DragonBones/model/ArmatureData.h b/extensions/DragonBones/model/ArmatureData.h
index 838df4adb7b8..7c39c718bb55 100644
--- a/extensions/DragonBones/model/ArmatureData.h
+++ b/extensions/DragonBones/model/ArmatureData.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -113,23 +113,23 @@ class ArmatureData : public BaseObject
     /**
      * @private
      */
-    std::map<std::string, BoneData*> bones;
+    hlookup::string_map<BoneData*> bones;
     /**
      * @private
      */
-    std::map<std::string, SlotData*> slots;
+    hlookup::string_map<SlotData*> slots;
     /**
      * @private
      */
-    std::map<std::string, ConstraintData*> constraints;
+    hlookup::string_map<ConstraintData*> constraints;
     /**
      * @private
      */
-    std::map<std::string, SkinData*> skins;
+    hlookup::string_map<SkinData*> skins;
     /**
      * @private
      */
-    std::map<std::string, AnimationData*> animations;
+    hlookup::string_map<AnimationData*> animations;
     /**
      * - The default skin data.
      * @version DragonBones 4.5
@@ -223,7 +223,7 @@ class ArmatureData : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline BoneData* getBone(const std::string& boneName) const { return mapFind<BoneData>(bones, boneName); }
+    inline BoneData* getBone(std::string_view boneName) const { return mapFind(bones, boneName); }
     /**
      * - Get a specific slot data.
      * @param slotName - The slot name.
@@ -236,13 +236,13 @@ class ArmatureData : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline SlotData* getSlot(const std::string& slotName) const { return mapFind<SlotData>(slots, slotName); }
+    inline SlotData* getSlot(std::string_view slotName) const { return mapFind(slots, slotName); }
     /**
      * @private
      */
-    inline ConstraintData* getConstraint(const std::string& constraintName) const
+    inline ConstraintData* getConstraint(std::string_view constraintName) const
     {
-        return mapFind<ConstraintData>(constraints, constraintName);
+        return mapFind(constraints, constraintName);
     }
     /**
      * - Get a specific skin data.
@@ -256,13 +256,11 @@ class ArmatureData : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline SkinData* getSkin(const std::string& skinName) const { return mapFind(skins, skinName); }
+    inline SkinData* getSkin(std::string_view skinName) const { return mapFind(skins, skinName); }
     /**
      * @private
      */
-    MeshDisplayData* getMesh(const std::string& skinName,
-                             const std::string& slotName,
-                             const std::string& meshName) const;
+    MeshDisplayData* getMesh(std::string_view skinName, std::string_view slotName, std::string_view meshName) const;
     /**
      * - Get a specific animation data.
      * @param animationName - The animation animationName.
@@ -275,7 +273,7 @@ class ArmatureData : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline AnimationData* getAnimation(const std::string& animationName) const
+    inline AnimationData* getAnimation(std::string_view animationName) const
     {
         return mapFind(animations, animationName);
     }
diff --git a/extensions/DragonBones/model/DragonBonesData.h b/extensions/DragonBones/model/DragonBonesData.h
index eef82b2b87e2..539d34896f6b 100644
--- a/extensions/DragonBones/model/DragonBonesData.h
+++ b/extensions/DragonBones/model/DragonBonesData.h
@@ -107,7 +107,7 @@ class DragonBonesData : public BaseObject
     /**
      * @private
      */
-    std::map<std::string, ArmatureData*> armatures;
+    hlookup::string_map<ArmatureData*> armatures;
     /**
      * @internal
      */
@@ -158,10 +158,7 @@ class DragonBonesData : public BaseObject
      * @version DragonBones 3.0
      * @language zh_CN
      */
-    inline ArmatureData* getArmature(const std::string& armatureName) const
-    {
-        return mapFind<ArmatureData>(armatures, armatureName);
-    }
+    inline ArmatureData* getArmature(std::string_view armatureName) const { return mapFind(armatures, armatureName); }
 
 protected:
     virtual void _onClear() override;
diff --git a/extensions/DragonBones/model/SkinData.cpp b/extensions/DragonBones/model/SkinData.cpp
index 7e6fe2501152..7f53de7acfe2 100644
--- a/extensions/DragonBones/model/SkinData.cpp
+++ b/extensions/DragonBones/model/SkinData.cpp
@@ -1,4 +1,4 @@
-#include "SkinData.h"
+#include "SkinData.h"
 #include "DisplayData.h"
 
 DRAGONBONES_NAMESPACE_BEGIN
@@ -21,7 +21,7 @@ void SkinData::_onClear()
     parent = nullptr;
 }
 
-void SkinData::addDisplay(const std::string& slotName, DisplayData* value)
+void SkinData::addDisplay(std::string_view slotName, DisplayData* value)
 {
     if (value != nullptr)
     {
@@ -31,7 +31,7 @@ void SkinData::addDisplay(const std::string& slotName, DisplayData* value)
     displays[slotName].push_back(value);  // TODO clear prev
 }
 
-DisplayData* SkinData::getDisplay(const std::string& slotName, const std::string& displayName)
+DisplayData* SkinData::getDisplay(std::string_view slotName, std::string_view displayName)
 {
     const auto slotDisplays = getDisplays(slotName);
     if (slotDisplays != nullptr)
diff --git a/extensions/DragonBones/model/SkinData.h b/extensions/DragonBones/model/SkinData.h
index e054e9f96c35..89e7abfc997b 100644
--- a/extensions/DragonBones/model/SkinData.h
+++ b/extensions/DragonBones/model/SkinData.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -24,6 +24,7 @@
 #define DRAGONBONES_SKIN_DATA_H
 
 #include "../core/BaseObject.h"
+#include "base/hlookup.h"
 
 DRAGONBONES_NAMESPACE_BEGIN
 /**
@@ -55,7 +56,7 @@ class SkinData : public BaseObject
     /**
      * @private
      */
-    std::map<std::string, std::vector<DisplayData*>> displays;
+    hlookup::string_map<std::vector<DisplayData*>> displays;
     /**
      * @private
      */
@@ -68,18 +69,18 @@ class SkinData : public BaseObject
     /**
      * @internal
      */
-    void addDisplay(const std::string& slotName, DisplayData* value);
+    void addDisplay(std::string_view slotName, DisplayData* value);
     /**
      * @private
      */
-    DisplayData* getDisplay(const std::string& slotName, const std::string& displayName);
+    DisplayData* getDisplay(std::string_view slotName, std::string_view displayName);
     /**
      * @private
      */
-    std::vector<DisplayData*>* getDisplays(const std::string& slotName) { return mapFindB(displays, slotName); }
+    std::vector<DisplayData*>* getDisplays(std::string_view slotName) { return mapFindB(displays, slotName); }
 
 public:  // For WebAssembly. TODO parent
-    const std::map<std::string, std::vector<DisplayData*>>& getSlotDisplays() const { return displays; }
+    const hlookup::string_map<std::vector<DisplayData*>>& getSlotDisplays() const { return displays; }
 };
 
 DRAGONBONES_NAMESPACE_END
diff --git a/extensions/DragonBones/model/TextureAtlasData.h b/extensions/DragonBones/model/TextureAtlasData.h
index ad5bcb504b49..08b266d356db 100644
--- a/extensions/DragonBones/model/TextureAtlasData.h
+++ b/extensions/DragonBones/model/TextureAtlasData.h
@@ -84,7 +84,7 @@ class TextureAtlasData : public BaseObject
     /**
      * @private
      */
-    std::map<std::string, TextureData*> textures;
+    hlookup::string_map<TextureData*> textures;
     /**
      * @private
      */
@@ -100,13 +100,13 @@ class TextureAtlasData : public BaseObject
     /**
      * @private
      */
-    inline TextureData* getTexture(const std::string& textureName) const { return mapFind(textures, textureName); }
+    inline TextureData* getTexture(std::string_view textureName) const { return mapFind(textures, textureName); }
 
 protected:
     virtual void _onClear() override;
 
 public:  // For WebAssembly.
-    const std::map<std::string, TextureData*>& getTextures() const { return textures; }
+    const hlookup::string_map<TextureData*>& getTextures() const { return textures; }
 };
 /**
  * @internal
diff --git a/extensions/DragonBones/parser/DataParser.cpp b/extensions/DragonBones/parser/DataParser.cpp
index 684d192e257d..3d0207d8d9a5 100644
--- a/extensions/DragonBones/parser/DataParser.cpp
+++ b/extensions/DragonBones/parser/DataParser.cpp
@@ -1,4 +1,4 @@
-#include "DataParser.h"
+#include "DataParser.h"
 
 DRAGONBONES_NAMESPACE_BEGIN
 
@@ -125,9 +125,9 @@ const char* DataParser::GOTO_AND_PLAY = "gotoAndPlay";
 
 const char* DataParser::DEFAULT_NAME = "default";
 
-TextureFormat DataParser::_getTextureFormat(const std::string& value)
+TextureFormat DataParser::_getTextureFormat(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "rgba8888")
@@ -158,9 +158,9 @@ TextureFormat DataParser::_getTextureFormat(const std::string& value)
     return TextureFormat::DEFAULT;
 }
 
-ArmatureType DataParser::_getArmatureType(const std::string& value)
+ArmatureType DataParser::_getArmatureType(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "armature")
@@ -179,9 +179,9 @@ ArmatureType DataParser::_getArmatureType(const std::string& value)
     return ArmatureType::Armature;
 }
 
-DisplayType DataParser::_getDisplayType(const std::string& value)
+DisplayType DataParser::_getDisplayType(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "image")
@@ -204,9 +204,9 @@ DisplayType DataParser::_getDisplayType(const std::string& value)
     return DisplayType::Image;
 }
 
-BoundingBoxType DataParser::_getBoundingBoxType(const std::string& value)
+BoundingBoxType DataParser::_getBoundingBoxType(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "rectangle")
@@ -225,9 +225,9 @@ BoundingBoxType DataParser::_getBoundingBoxType(const std::string& value)
     return BoundingBoxType::Rectangle;
 }
 
-ActionType DataParser::_getActionType(const std::string& value)
+ActionType DataParser::_getActionType(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "play")
@@ -246,9 +246,9 @@ ActionType DataParser::_getActionType(const std::string& value)
     return ActionType::Play;
 }
 
-BlendMode DataParser::_getBlendMode(const std::string& value)
+BlendMode DataParser::_getBlendMode(std::string_view value)
 {
-    auto lower = value;
+    std::string lower{value};
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
     if (lower == "normal")
diff --git a/extensions/DragonBones/parser/DataParser.h b/extensions/DragonBones/parser/DataParser.h
index 08328ccd5fca..ccad44049d8a 100644
--- a/extensions/DragonBones/parser/DataParser.h
+++ b/extensions/DragonBones/parser/DataParser.h
@@ -1,4 +1,4 @@
-/**
+/**
  * The MIT License (MIT)
  *
  * Copyright (c) 2012-2018 DragonBones team and other contributors
@@ -166,12 +166,12 @@ class DataParser
 
     static const char* DEFAULT_NAME;
 
-    static TextureFormat _getTextureFormat(const std::string& value);
-    static ArmatureType _getArmatureType(const std::string& value);
-    static DisplayType _getDisplayType(const std::string& value);
-    static BoundingBoxType _getBoundingBoxType(const std::string& value);
-    static ActionType _getActionType(const std::string& value);
-    static BlendMode _getBlendMode(const std::string& value);
+    static TextureFormat _getTextureFormat(std::string_view value);
+    static ArmatureType _getArmatureType(std::string_view value);
+    static DisplayType _getDisplayType(std::string_view value);
+    static BoundingBoxType _getBoundingBoxType(std::string_view value);
+    static ActionType _getActionType(std::string_view value);
+    static BlendMode _getBlendMode(std::string_view value);
 
 public:
     virtual DragonBonesData* parseDragonBonesData(const char* rawData, float scale = 1.0f)                          = 0;
diff --git a/extensions/DragonBones/parser/JSONDataParser.h b/extensions/DragonBones/parser/JSONDataParser.h
index afa6e045d4c6..21a437dac364 100644
--- a/extensions/DragonBones/parser/JSONDataParser.h
+++ b/extensions/DragonBones/parser/JSONDataParser.h
@@ -1,4 +1,4 @@
-#ifndef DRAGONBONES_JSON_DATA_PARSER_H
+#ifndef DRAGONBONES_JSON_DATA_PARSER_H
 #define DRAGONBONES_JSON_DATA_PARSER_H
 
 #include "DataParser.h"
@@ -81,7 +81,7 @@ class JSONDataParser : public DataParser
 
     inline static std::string _getString(const rapidjson::Value& rawData,
                                          const char* key,
-                                         const std::string& defaultValue)
+                                         std::string_view defaultValue)
     {
         if (rawData.HasMember(key))
         {
@@ -93,7 +93,7 @@ class JSONDataParser : public DataParser
             return dragonBones::to_string(rawData[key].GetDouble());
         }
 
-        return defaultValue;
+        return std::string{defaultValue};
     }
 
     inline static int _getParameter(const rapidjson::Value& rawData, std::size_t index, int defaultValue)
@@ -118,14 +118,14 @@ class JSONDataParser : public DataParser
 
     inline static std::string _getParameter(const rapidjson::Value& rawData,
                                             std::size_t index,
-                                            const std::string& defaultValue)
+                                            std::string_view defaultValue)
     {
         if (rawData.Size() > index)
         {
             return rawData[(int)index].GetString();
         }
 
-        return defaultValue;
+        return std::string{defaultValue};
     }
 
 protected:
@@ -160,10 +160,10 @@ class JSONDataParser : public DataParser
     std::vector<const rapidjson::Value*> _cacheRawMeshes;
     std::vector<MeshDisplayData*> _cacheMeshes;
     std::vector<ActionFrame> _actionFrames;
-    std::map<std::string, const rapidjson::Value*> _weightSlotPose;
-    std::map<std::string, const rapidjson::Value*> _weightBonePoses;
-    std::map<std::string, std::vector<BoneData*>> _cacheBones;
-    std::map<std::string, std::vector<ActionData*>> _slotChildActions;
+    hlookup::string_map<const rapidjson::Value*> _weightSlotPose;
+    hlookup::string_map<const rapidjson::Value*> _weightBonePoses;
+    hlookup::string_map<std::vector<BoneData*>> _cacheBones;
+    hlookup::string_map<std::vector<ActionData*>> _slotChildActions;
 
 public:
     JSONDataParser()
diff --git a/extensions/GUI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp
index ba95b0ed8e91..1d9ea36046a7 100644
--- a/extensions/GUI/CCControlExtension/CCControlButton.cpp
+++ b/extensions/GUI/CCControlExtension/CCControlButton.cpp
@@ -141,15 +141,15 @@ ControlButton* ControlButton::create(Node* label,
     return pRet;
 }
 
-bool ControlButton::initWithTitleAndFontNameAndFontSize(const std::string& title,
-                                                        const std::string& fontName,
+bool ControlButton::initWithTitleAndFontNameAndFontSize(std::string_view title,
+                                                        std::string_view fontName,
                                                         float fontSize)
 {
     return initWithLabelAndBackgroundSprite(Label::createWithSystemFont(title, fontName, fontSize),
                                             cocos2d::ui::Scale9Sprite::create(), true);
 }
 
-ControlButton* ControlButton::create(const std::string& title, const std::string& fontName, float fontSize)
+ControlButton* ControlButton::create(std::string_view title, std::string_view fontName, float fontSize)
 {
     ControlButton* pRet = new ControlButton();
     pRet->initWithTitleAndFontNameAndFontSize(title, fontName, fontSize);
@@ -291,7 +291,7 @@ std::string ControlButton::getTitleForState(State state)
     return iter != _titleDispatchTable.end() ? iter->second : "";
 }
 
-void ControlButton::setTitleForState(const std::string& title, State state)
+void ControlButton::setTitleForState(std::string_view title, State state)
 {
     _titleDispatchTable.erase((int)state);
 
@@ -371,12 +371,12 @@ void ControlButton::setTitleLabelForState(Node* titleLabel, State state)
     }
 }
 
-void ControlButton::setTitleTTFForState(const std::string& fontName, State state)
+void ControlButton::setTitleTTFForState(std::string_view fontName, State state)
 {
     this->setTitleLabelForState(Label::createWithSystemFont(getTitleForState(state), fontName, 12), state);
 }
 
-const std::string& ControlButton::getTitleTTFForState(State state)
+std::string_view ControlButton::getTitleTTFForState(State state)
 {
     LabelProtocol* label = dynamic_cast<LabelProtocol*>(this->getTitleLabelForState(state));
     Label* labelTTF      = dynamic_cast<Label*>(label);
@@ -416,13 +416,13 @@ float ControlButton::getTitleTTFSizeForState(State state)
     }
 }
 
-void ControlButton::setTitleBMFontForState(const std::string& fntFile, State state)
+void ControlButton::setTitleBMFontForState(std::string_view fntFile, State state)
 {
     std::string title = this->getTitleForState(state);
     this->setTitleLabelForState(Label::createWithBMFont(fntFile, title), state);
 }
 
-const std::string& ControlButton::getTitleBMFontForState(State state)
+std::string_view ControlButton::getTitleBMFontForState(State state)
 {
     LabelProtocol* label = dynamic_cast<LabelProtocol*>(this->getTitleLabelForState(state));
     auto labelBMFont     = dynamic_cast<Label*>(label);
diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h
index 51a8fcac34db..9a5f80734fb2 100644
--- a/extensions/GUI/CCControlExtension/CCControlButton.h
+++ b/extensions/GUI/CCControlExtension/CCControlButton.h
@@ -57,7 +57,7 @@ class CC_EX_DLL ControlButton : public Control
     static ControlButton* create();
     static ControlButton* create(cocos2d::ui::Scale9Sprite* sprite);
     static ControlButton* create(Node* label, cocos2d::ui::Scale9Sprite* backgroundSprite);
-    static ControlButton* create(const std::string& title, const std::string& fontName, float fontSize);
+    static ControlButton* create(std::string_view title, std::string_view fontName, float fontSize);
     static ControlButton* create(Node* label, cocos2d::ui::Scale9Sprite* backgroundSprite, bool adjustBackGroundSize);
 
     virtual void needsLayout() override;
@@ -87,7 +87,7 @@ class CC_EX_DLL ControlButton : public Control
      * @param state The state that uses the specified title. The values are described
      * in "CCControlState".
      */
-    virtual void setTitleForState(const std::string& title, State state);
+    virtual void setTitleForState(std::string_view title, State state);
 
     /**
      * Returns the title color used for a state.
@@ -128,8 +128,8 @@ class CC_EX_DLL ControlButton : public Control
      */
     virtual void setTitleLabelForState(Node* label, State state);
 
-    virtual void setTitleTTFForState(const std::string& fntFile, State state);
-    virtual const std::string& getTitleTTFForState(State state);
+    virtual void setTitleTTFForState(std::string_view fntFile, State state);
+    virtual std::string_view getTitleTTFForState(State state);
 
     virtual void setTitleTTFSizeForState(float size, State state);
     virtual float getTitleTTFSizeForState(State state);
@@ -140,8 +140,8 @@ class CC_EX_DLL ControlButton : public Control
      * @param state The state that uses the specified fntFile. The values are described
      * in "CCControlState".
      */
-    virtual void setTitleBMFontForState(const std::string& fntFile, State state);
-    virtual const std::string& getTitleBMFontForState(State state);
+    virtual void setTitleBMFontForState(std::string_view fntFile, State state);
+    virtual std::string_view getTitleBMFontForState(State state);
 
     /**
      * Returns the background sprite used for a state.
@@ -188,7 +188,7 @@ class CC_EX_DLL ControlButton : public Control
     virtual void setColor(const Color3B&) override;
     virtual void updateDisplayedColor(const Color3B& parentColor) override;
 
-    const std::string& getCurrentTitle() const { return _currentTitle; };
+    std::string_view getCurrentTitle() const { return _currentTitle; };
     std::string getCurrentTitle() { return _currentTitle; };
 
     CC_CONSTRUCTOR_ACCESS :
@@ -207,9 +207,7 @@ class CC_EX_DLL ControlButton : public Control
                                                   cocos2d::ui::Scale9Sprite* backgroundSprite,
                                                   bool adjustBackGroundSize);
     virtual bool initWithBackgroundSprite(cocos2d::ui::Scale9Sprite* sprite);
-    virtual bool initWithTitleAndFontNameAndFontSize(const std::string& title,
-                                                     const std::string& fontName,
-                                                     float fontSize);
+    virtual bool initWithTitleAndFontNameAndFontSize(std::string_view title, std::string_view fontName, float fontSize);
 
 protected:
     bool _isPushed;
diff --git a/extensions/GUI/CCControlExtension/CCControlSwitch.cpp b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp
index 09d14b6e6a00..431b465a6c6f 100644
--- a/extensions/GUI/CCControlExtension/CCControlSwitch.cpp
+++ b/extensions/GUI/CCControlExtension/CCControlSwitch.cpp
@@ -78,7 +78,7 @@ class ControlSwitchSprite : public Sprite, public ActionTweenDelegate
      * @js NA
      * @lua NA
      */
-    virtual void updateTweenAction(float value, const std::string& key) override;
+    virtual void updateTweenAction(float value, std::string_view key) override;
 
     /** Contains the position (in x-axis) of the slider inside the receiver. */
     float _sliderXPosition;
@@ -214,7 +214,7 @@ bool ControlSwitchSprite::initWithMaskSprite(Sprite* maskSprite,
     return false;
 }
 
-void ControlSwitchSprite::updateTweenAction(float value, const std::string& key)
+void ControlSwitchSprite::updateTweenAction(float value, std::string_view key)
 {
     CCLOGINFO("key = %s, value = %f", key.c_str(), value);
     setSliderXPosition(value);
diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp
index 6bf9f47288ec..bfa2cf5e127e 100644
--- a/extensions/GUI/CCScrollView/CCScrollView.cpp
+++ b/extensions/GUI/CCScrollView/CCScrollView.cpp
@@ -327,7 +327,7 @@ void ScrollView::setZoomScaleInDuration(float s, float dt)
     }
 }
 
-void ScrollView::updateTweenAction(float value, const std::string& /*key*/)
+void ScrollView::updateTweenAction(float value, std::string_view /*key*/)
 {
     this->setZoomScale(value);
 }
@@ -551,7 +551,7 @@ void ScrollView::removeAllChildren()
     removeAllChildrenWithCleanup(true);
 }
 
-void ScrollView::addChild(Node* child, int zOrder, const std::string& name)
+void ScrollView::addChild(Node* child, int zOrder, std::string_view name)
 {
     if (_container != child)
     {
diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h
index 304f4cab750b..9aef265af42f 100644
--- a/extensions/GUI/CCScrollView/CCScrollView.h
+++ b/extensions/GUI/CCScrollView/CCScrollView.h
@@ -251,7 +251,7 @@ class CC_EX_DLL ScrollView : public Layer, public ActionTweenDelegate
 
     using Node::addChild;
     virtual void addChild(Node* child, int zOrder, int tag) override;
-    virtual void addChild(Node* child, int zOrder, const std::string& name) override;
+    virtual void addChild(Node* child, int zOrder, std::string_view name) override;
 
     virtual void removeAllChildren() override;
     virtual void removeAllChildrenWithCleanup(bool cleanup) override;
@@ -259,7 +259,7 @@ class CC_EX_DLL ScrollView : public Layer, public ActionTweenDelegate
     /**
      * CCActionTweenDelegate
      */
-    void updateTweenAction(float value, const std::string& key) override;
+    void updateTweenAction(float value, std::string_view key) override;
 
     bool hasVisibleParents() const;
 
diff --git a/extensions/ImGuiEXT/CCImGuiEXT.cpp b/extensions/ImGuiEXT/CCImGuiEXT.cpp
index b3b801a33e65..000806050e14 100644
--- a/extensions/ImGuiEXT/CCImGuiEXT.cpp
+++ b/extensions/ImGuiEXT/CCImGuiEXT.cpp
@@ -5,12 +5,12 @@
 
 NS_CC_EXT_BEGIN
 
-static uint32_t fourccValue(const std::string& str)
+static uint32_t fourccValue(std::string_view str)
 {
     if (str.empty() || str[0] != '#')
         return (uint32_t)-1;
     uint32_t value = 0;
-    memcpy(&value, str.c_str() + 1, std::min(sizeof(value), str.size() - 1));
+    memcpy(&value, str.data() + 1, std::min(sizeof(value), str.size() - 1));
     return value;
 }
 
@@ -246,7 +246,7 @@ float ImGuiEXT::scaleAllByDPI(float userScale)
     return zoomFactor;
 }
 
-void ImGuiEXT::addFont(const std::string& fontFile, float fontSize, CHS_GLYPH_RANGE glyphRange)
+void ImGuiEXT::addFont(std::string_view fontFile, float fontSize, CHS_GLYPH_RANGE glyphRange)
 {
     if (FileUtils::getInstance()->isFileExistInternal(fontFile))
     {
@@ -255,7 +255,7 @@ void ImGuiEXT::addFont(const std::string& fontFile, float fontSize, CHS_GLYPH_RA
     }
 }
 
-void ImGuiEXT::removeFont(const std::string& fontFile)
+void ImGuiEXT::removeFont(std::string_view fontFile)
 {
     auto count = _fontsInfoMap.size();
     _fontsInfoMap.erase(fontFile);
@@ -339,7 +339,7 @@ void ImGuiEXT::update()
     // commands will be processed after update
 }
 
-bool ImGuiEXT::addRenderLoop(const std::string& id, std::function<void()> func, Scene* target)
+bool ImGuiEXT::addRenderLoop(std::string_view id, std::function<void()> func, Scene* target)
 {
     // TODO: check whether exist
     auto fourccId = fourccValue(id);
@@ -362,7 +362,7 @@ bool ImGuiEXT::addRenderLoop(const std::string& id, std::function<void()> func,
     return false;
 }
 
-void ImGuiEXT::removeRenderLoop(const std::string& id)
+void ImGuiEXT::removeRenderLoop(std::string_view id)
 {
     auto fourccId   = fourccValue(id);
     const auto iter = _renderPiplines.find(fourccId);
@@ -603,16 +603,16 @@ void ImGuiEXT::setLabelColor(Label* label, ImGuiCol col)
         setLabelColor(label, ImGui::GetStyleColorVec4(col));
 }
 
-ImWchar* ImGuiEXT::addGlyphRanges(const std::string& key, const std::vector<ImWchar>& ranges)
+ImWchar* ImGuiEXT::addGlyphRanges(std::string_view key, const std::vector<ImWchar>& ranges)
 {
     auto it = glyphRanges.find(key);
     // the pointer must be persistant, do not replace
     if (it != glyphRanges.end())
         return it->second.data();
-    glyphRanges[key] = ranges;
+    it = glyphRanges.emplace(key, ranges).first;  // glyphRanges[key] = ranges;
     if (ranges.empty())
-        glyphRanges[key].push_back(0);
-    return glyphRanges[key].data();
+        it->second.push_back(0);
+    return it->second.data();
 }
 
 void ImGuiEXT::mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar end)
@@ -712,13 +712,13 @@ void ImGuiEXT::setMarkdownFont(int index, ImFont* font, bool seperator, float sc
     ImGuiMarkdownConfig.headingScales[index]  = scale;
 }
 
-void ImGuiEXT::setMarkdownLinkIcon(const std::string& icon)
+void ImGuiEXT::setMarkdownLinkIcon(std::string_view icon)
 {
     ImGuiMarkdownLinkIcon        = icon;
     ImGuiMarkdownConfig.linkIcon = ImGuiMarkdownLinkIcon.c_str();
 }
 
-void ImGuiEXT::markdown(const std::string& content)
+void ImGuiEXT::markdown(std::string_view content)
 {
     ImGui::Markdown(content.c_str(), content.size(), ImGuiMarkdownConfig);
 }
diff --git a/extensions/ImGuiEXT/CCImGuiEXT.h b/extensions/ImGuiEXT/CCImGuiEXT.h
index 7c80b711c7f1..c03cddc0c241 100644
--- a/extensions/ImGuiEXT/CCImGuiEXT.h
+++ b/extensions/ImGuiEXT/CCImGuiEXT.h
@@ -50,10 +50,10 @@ class ImGuiEXT
     /// </summary>
     /// <param name="fontFile"></param>
     /// <param name="glyphRange"></param>
-    void addFont(const std::string& fontFile,
+    void addFont(std::string_view fontFile,
                  float fontSize             = DEFAULT_FONT_SIZE,
                  CHS_GLYPH_RANGE glyphRange = CHS_GLYPH_RANGE::NONE);
-    void removeFont(const std::string& fontFile);
+    void removeFont(std::string_view fontFile);
     void clearFonts();
 
     /// <summary>
@@ -62,13 +62,13 @@ class ImGuiEXT
     /// <param name="id">The FOURCC id of render loop, starts with '#', such as "#abcd"</id>
     /// <param name="func">the ImGui render loop</param>
     /// <param name="target">The target scene to track event, nullptr for global, useful for global GM tools</param>
-    bool addRenderLoop(const std::string& id, std::function<void()> func, Scene* target);
+    bool addRenderLoop(std::string_view id, std::function<void()> func, Scene* target);
 
     /// <summary>
     /// Remove ImGui render loop
     /// </summary>
     /// <param name="id">FOURCC starts with '#', such as "#abcd"</id>
-    void removeRenderLoop(const std::string& id);
+    void removeRenderLoop(std::string_view id);
 
     void end();
 
@@ -112,7 +112,7 @@ class ImGuiEXT
     static void setLabelColor(Label* label, bool disabled = false);
     static void setLabelColor(Label* label, ImGuiCol col);
 
-    ImWchar* addGlyphRanges(const std::string& key, const std::vector<ImWchar>& ranges);
+    ImWchar* addGlyphRanges(std::string_view key, const std::vector<ImWchar>& ranges);
     static void mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar end);
     int getCCRefId(Ref* p);
 
@@ -126,8 +126,8 @@ class ImGuiEXT
     void setMarkdownLinkCallback(const MdLinkCallback& f);
     void setMarkdownImageCallback(const MdImageCallback& f);
     void setMarkdownFont(int index, ImFont* font, bool seperator, float scale = 1.f);
-    void setMarkdownLinkIcon(const std::string& icon);
-    void markdown(const std::string& content);
+    void setMarkdownLinkIcon(std::string_view icon);
+    void markdown(std::string_view content);
 #endif
 
 private:
@@ -154,7 +154,7 @@ class ImGuiEXT
     std::unordered_map<Ref*, int> usedCCRefIdMap;
     // cocos objects should be retained until next frame
     Vector<Ref*> usedCCRef;
-    std::unordered_map<std::string, std::vector<ImWchar>> glyphRanges;
+    hlookup::string_map<std::vector<ImWchar>> glyphRanges;
 
     float _contentZoomFactor = 1.0f;
 
@@ -168,7 +168,7 @@ class ImGuiEXT
         CHS_GLYPH_RANGE glyphRange;
     };
 
-    std::unordered_map<std::string, FontInfo> _fontsInfoMap;
+    hlookup::string_map<FontInfo> _fontsInfoMap;
 
     bool _purgeNextLoop = false;
 };
diff --git a/extensions/ImGuiEXT/imgui/imconfig.h b/extensions/ImGuiEXT/imgui/imconfig.h
index d84c59423bbe..768377be307d 100644
--- a/extensions/ImGuiEXT/imgui/imconfig.h
+++ b/extensions/ImGuiEXT/imgui/imconfig.h
@@ -32,36 +32,36 @@
 //#define IMGUI_API __declspec( dllimport )
 
 //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid
-//using soon-to-be obsolete function/names. #define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+// using soon-to-be obsolete function/names. #define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
 
 //---- Disable all of Dear ImGui or don't implement standard windows.
 // It is very strongly recommended to NOT disable the demo windows during development. Please read comments in
 // imgui_demo.cpp.
 //#define IMGUI_DISABLE                                     // Disable everything: all headers and source files will be
-//empty. #define IMGUI_DISABLE_DEMO_WINDOWS                        // Disable demo windows:
-//ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended. #define IMGUI_DISABLE_METRICS_WINDOW // Disable
-//metrics/debugger window: ShowMetricsWindow() will be empty.
+// empty. #define IMGUI_DISABLE_DEMO_WINDOWS                        // Disable demo windows:
+// ShowDemoWindow()/ShowStyleEditor() will be empty. Not recommended. #define IMGUI_DISABLE_METRICS_WINDOW // Disable
+// metrics/debugger window: ShowMetricsWindow() will be empty.
 
 //---- Don't implement some functions to reduce linkage requirements.
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS   // [Win32] Don't implement default clipboard handler. Won't
-//use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a) #define
-//IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS          // [Win32] [Default with Visual Studio] Implement default IME
-//handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW) #define
-//IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't
-//implement default IME handler (won't require imm32.lib/.a) #define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use
-//and link with any Win32 function (clipboard, ime). #define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX]
-//Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not
-//the default). #define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement
-//ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
+// use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a) #define
+// IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS          // [Win32] [Default with Visual Studio] Implement default IME
+// handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW) #define
+// IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't
+// implement default IME handler (won't require imm32.lib/.a) #define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use
+// and link with any Win32 function (clipboard, ime). #define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX]
+// Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not
+// the default). #define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement
+// ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
 //#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement
-//ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself. #define
-//IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and
-//ImFileHandle at all (replace them with dummies) #define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't
-//implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you
-//don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function. #define
-//IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to
-//avoid linking with them. You will need to call ImGui::SetAllocatorFunctions(). #define IMGUI_DISABLE_SSE // Disable
-//use of SSE intrinsics even if available
+// ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself. #define
+// IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite
+// and ImFileHandle at all (replace them with dummies) #define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              //
+// Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if
+// you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function. #define
+// IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to
+// avoid linking with them. You will need to call ImGui::SetAllocatorFunctions(). #define IMGUI_DISABLE_SSE // Disable
+// use of SSE intrinsics even if available
 
 //---- Include imgui_user.h at the end of imgui.h as a convenience
 //#define IMGUI_INCLUDE_IMGUI_USER_H
@@ -70,7 +70,7 @@
 //#define IMGUI_USE_BGRA_PACKED_COLOR
 
 //---- Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like
-//emoticons, dingbats, symbols, shapes, ancient languages, etc...) #define IMGUI_USE_WCHAR32
+// emoticons, dingbats, symbols, shapes, ancient languages, etc...) #define IMGUI_USE_WCHAR32
 
 //---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
 // By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
@@ -80,13 +80,13 @@
 //#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
 
 //---- Use stb_printf's faster implementation of vsnprintf instead of the one from libc (unless
-//IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined)
+// IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined)
 // Requires 'stb_sprintf.h' to be available in the include path. Compatibility checks of arguments and formats done by
 // clang and GCC will be disabled in order to support the extra formats provided by STB sprintf. #define
 // IMGUI_USE_STB_SPRINTF
 
 //---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear
-//ImGui)
+// ImGui)
 // Requires FreeType headers to be available in the include path. Requires program to be compiled with
 // 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided). On Windows you may use
 // vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'.
diff --git a/extensions/ImGuiEXT/imgui/imgui.cpp b/extensions/ImGuiEXT/imgui/imgui.cpp
index e8f0481d3958..e9c52c3bf07d 100644
--- a/extensions/ImGuiEXT/imgui/imgui.cpp
+++ b/extensions/ImGuiEXT/imgui/imgui.cpp
@@ -1115,7 +1115,7 @@ you share your issues (on GitHub or privately).
 #        endif
 #        pragma clang diagnostic ignored "-Wunknown-pragmas"  // warning: unknown warning group 'xxx'
 #        pragma clang diagnostic ignored "-Wold-style-cast"   // warning: use of old-style cast // yes, they are more
-                                                             // terse.
+                                                              // terse.
 #        pragma clang diagnostic ignored \
             "-Wfloat-equal"  // warning: comparing floating point with == or != is unsafe // storing and comparing
                              // against same constants (typically 0.0f) is ok.
@@ -19477,7 +19477,7 @@ void ImGui::DebugNodeViewport(ImGuiViewportP* viewport)
         }
         BulletText("Flags: 0x%04X =%s%s%s%s%s%s%s%s%s%s%s%s", viewport->Flags,
                    //(flags & ImGuiViewportFlags_IsPlatformWindow) ? " IsPlatformWindow" : "", // Omitting because it is
-                   //the standard
+                   // the standard
                    (flags & ImGuiViewportFlags_IsPlatformMonitor) ? " IsPlatformMonitor" : "",
                    (flags & ImGuiViewportFlags_OwnedByApp) ? " OwnedByApp" : "",
                    (flags & ImGuiViewportFlags_NoDecoration) ? " NoDecoration" : "",
diff --git a/extensions/ImGuiEXT/imgui/imgui.h b/extensions/ImGuiEXT/imgui/imgui.h
index 279b0073191b..91c3a68e895f 100644
--- a/extensions/ImGuiEXT/imgui/imgui.h
+++ b/extensions/ImGuiEXT/imgui/imgui.h
@@ -2114,9 +2114,9 @@ enum ImGuiTableFlags_
 // Obsolete names (will be removed soon)
 #    ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
 //, ImGuiTableFlags_ColumnsWidthFixed = ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_ColumnsWidthStretch =
-//ImGuiTableFlags_SizingStretchSame   // WIP Tables 2020/12 , ImGuiTableFlags_SizingPolicyFixed =
-//ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_SizingPolicyStretch = ImGuiTableFlags_SizingStretchSame   // WIP
-//Tables 2021/01
+// ImGuiTableFlags_SizingStretchSame   // WIP Tables 2020/12 , ImGuiTableFlags_SizingPolicyFixed =
+// ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_SizingPolicyStretch = ImGuiTableFlags_SizingStretchSame   // WIP
+// Tables 2021/01
 #    endif
 };
 
diff --git a/extensions/ImGuiEXT/imgui/imgui_demo.cpp b/extensions/ImGuiEXT/imgui/imgui_demo.cpp
index 1818e5ff63d6..26d3e0c97a04 100644
--- a/extensions/ImGuiEXT/imgui/imgui_demo.cpp
+++ b/extensions/ImGuiEXT/imgui/imgui_demo.cpp
@@ -112,7 +112,7 @@ Index of this file:
 #        endif
 #        pragma clang diagnostic ignored "-Wunknown-pragmas"  // warning: unknown warning group 'xxx'
 #        pragma clang diagnostic ignored "-Wold-style-cast"   // warning: use of old-style cast // yes, they are more
-                                                             // terse.
+                                                              // terse.
 #        pragma clang diagnostic ignored \
             "-Wdeprecated-declarations"  // warning: 'xx' is deprecated: The POSIX name for this..   // for strdup used
                                          // in demo code (so user can copy & paste the code)
diff --git a/extensions/ImGuiEXT/imgui/imgui_draw.cpp b/extensions/ImGuiEXT/imgui/imgui_draw.cpp
index 7732f201057e..b251bc25fa97 100644
--- a/extensions/ImGuiEXT/imgui/imgui_draw.cpp
+++ b/extensions/ImGuiEXT/imgui/imgui_draw.cpp
@@ -81,7 +81,7 @@ Index of this file:
 #        endif
 #        pragma clang diagnostic ignored "-Wunknown-pragmas"  // warning: unknown warning group 'xxx'
 #        pragma clang diagnostic ignored "-Wold-style-cast"   // warning: use of old-style cast // yes, they are more
-                                                             // terse.
+                                                              // terse.
 #        pragma clang diagnostic ignored "-Wfloat-equal"  // warning: comparing floating point with == or != is unsafe
                                                           // // storing and comparing against same constants ok.
 #        pragma clang diagnostic ignored \
diff --git a/extensions/ImGuiEXT/imgui/imgui_tables.cpp b/extensions/ImGuiEXT/imgui/imgui_tables.cpp
index beac7c628789..c29b320b6fad 100644
--- a/extensions/ImGuiEXT/imgui/imgui_tables.cpp
+++ b/extensions/ImGuiEXT/imgui/imgui_tables.cpp
@@ -260,7 +260,7 @@ Index of this file:
 #        endif
 #        pragma clang diagnostic ignored "-Wunknown-pragmas"  // warning: unknown warning group 'xxx'
 #        pragma clang diagnostic ignored "-Wold-style-cast"   // warning: use of old-style cast // yes, they are more
-                                                             // terse.
+                                                              // terse.
 #        pragma clang diagnostic ignored \
             "-Wfloat-equal"  // warning: comparing floating point with == or != is unsafe // storing and comparing
                              // against same constants (typically 0.0f) is ok.
diff --git a/extensions/ImGuiEXT/imgui/imgui_widgets.cpp b/extensions/ImGuiEXT/imgui/imgui_widgets.cpp
index 9b68c0359f58..02be44862595 100644
--- a/extensions/ImGuiEXT/imgui/imgui_widgets.cpp
+++ b/extensions/ImGuiEXT/imgui/imgui_widgets.cpp
@@ -78,7 +78,7 @@ Index of this file:
 #        endif
 #        pragma clang diagnostic ignored "-Wunknown-pragmas"  // warning: unknown warning group 'xxx'
 #        pragma clang diagnostic ignored "-Wold-style-cast"   // warning: use of old-style cast // yes, they are more
-                                                             // terse.
+                                                              // terse.
 #        pragma clang diagnostic ignored \
             "-Wfloat-equal"  // warning: comparing floating point with == or != is unsafe // storing and comparing
                              // against same constants (typically 0.0f) is ok.
diff --git a/extensions/Particle3D/CCParticle3DRender.cpp b/extensions/Particle3D/CCParticle3DRender.cpp
index 58b022430ec8..d2907930af07 100644
--- a/extensions/Particle3D/CCParticle3DRender.cpp
+++ b/extensions/Particle3D/CCParticle3DRender.cpp
@@ -51,7 +51,7 @@ Particle3DQuadRender::~Particle3DQuadRender()
     CC_SAFE_RELEASE(_indexBuffer);
 }
 
-Particle3DQuadRender* Particle3DQuadRender::create(const std::string& texFile)
+Particle3DQuadRender* Particle3DQuadRender::create(std::string_view texFile)
 {
     auto ret = new Particle3DQuadRender();
     if (ret->initQuadRender(texFile))
@@ -185,7 +185,7 @@ void Particle3DQuadRender::render(Renderer* renderer, const Mat4& transform, Par
     renderer->addCommand(&_afterCommand);
 }
 
-bool Particle3DQuadRender::initQuadRender(const std::string& texFile)
+bool Particle3DQuadRender::initQuadRender(std::string_view texFile)
 {
     CC_SAFE_RELEASE_NULL(_programState);
 
@@ -285,7 +285,7 @@ Particle3DModelRender::~Particle3DModelRender()
     }
 }
 
-Particle3DModelRender* Particle3DModelRender::create(const std::string& modelFile, const std::string& texFile)
+Particle3DModelRender* Particle3DModelRender::create(std::string_view modelFile, std::string_view texFile)
 {
     auto ret        = new Particle3DModelRender();
     ret->_modelFile = modelFile;
diff --git a/extensions/Particle3D/CCParticle3DRender.h b/extensions/Particle3D/CCParticle3DRender.h
index aaa0d70104f1..0d2d0b018885 100644
--- a/extensions/Particle3D/CCParticle3DRender.h
+++ b/extensions/Particle3D/CCParticle3DRender.h
@@ -95,7 +95,7 @@ class CC_EX_DLL Particle3DRender : public Ref
 class CC_EX_DLL Particle3DQuadRender : public Particle3DRender
 {
 public:
-    static Particle3DQuadRender* create(const std::string& texFile = "");
+    static Particle3DQuadRender* create(std::string_view texFile = "");
 
     virtual void render(Renderer* renderer, const Mat4& transform, ParticleSystem3D* particleSystem) override;
 
@@ -104,7 +104,7 @@ class CC_EX_DLL Particle3DQuadRender : public Particle3DRender
     virtual ~Particle3DQuadRender();
 
 protected:
-    bool initQuadRender(const std::string& texFile);
+    bool initQuadRender(std::string_view texFile);
 
     void onBeforeDraw();
     void onAfterDraw();
@@ -145,7 +145,7 @@ class CC_EX_DLL Particle3DQuadRender : public Particle3DRender
 class CC_EX_DLL Particle3DModelRender : public Particle3DRender
 {
 public:
-    static Particle3DModelRender* create(const std::string& modelFile, const std::string& texFile = "");
+    static Particle3DModelRender* create(std::string_view modelFile, std::string_view texFile = "");
 
     virtual void render(Renderer* renderer, const Mat4& transform, ParticleSystem3D* particleSystem) override;
 
diff --git a/extensions/Particle3D/PU/CCPUAffector.cpp b/extensions/Particle3D/PU/CCPUAffector.cpp
index 7f0ea5bbdd3f..a41dfc001dee 100644
--- a/extensions/Particle3D/PU/CCPUAffector.cpp
+++ b/extensions/Particle3D/PU/CCPUAffector.cpp
@@ -161,16 +161,16 @@ void PUAffector::copyAttributesTo(PUAffector* affector)
     affector->_excludedEmitters     = _excludedEmitters;
 }
 
-void PUAffector::addEmitterToExclude(const std::string& emitterName)
+void PUAffector::addEmitterToExclude(std::string_view emitterName)
 {
     auto iter = std::find(_excludedEmitters.begin(), _excludedEmitters.end(), emitterName);
     if (iter == _excludedEmitters.end())
     {
-        _excludedEmitters.push_back(emitterName);
+        _excludedEmitters.push_back(std::string{emitterName});
     }
 }
 
-void PUAffector::removeEmitterToExclude(const std::string& emitterName)
+void PUAffector::removeEmitterToExclude(std::string_view emitterName)
 {
     auto iter = std::find(_excludedEmitters.begin(), _excludedEmitters.end(), emitterName);
     if (iter != _excludedEmitters.end())
@@ -189,8 +189,8 @@ void PUAffector::process(PUParticle3D* particle, float delta, bool firstParticle
     if (!_excludedEmitters.empty() && particle->parentEmitter)
     {
         // Return if the emitter which emits this particle is part of the vector
-        std::string emitterName = particle->parentEmitter->getName();
-        auto iter               = std::find(_excludedEmitters.begin(), _excludedEmitters.end(), emitterName);
+        auto emitterName = particle->parentEmitter->getName();
+        auto iter        = std::find(_excludedEmitters.begin(), _excludedEmitters.end(), emitterName);
         if (iter != _excludedEmitters.end())
         {
             return;
diff --git a/extensions/Particle3D/PU/CCPUAffector.h b/extensions/Particle3D/PU/CCPUAffector.h
index 219d620568d5..255401c9a6f8 100644
--- a/extensions/Particle3D/PU/CCPUAffector.h
+++ b/extensions/Particle3D/PU/CCPUAffector.h
@@ -91,22 +91,22 @@ class CC_EX_DLL PUAffector : public Particle3DAffector
 
     /** Todo
      */
-    const std::string& getAffectorType() const { return _affectorType; };
-    void setAffectorType(const std::string& affectorType) { _affectorType = affectorType; };
+    std::string_view getAffectorType() const { return _affectorType; };
+    void setAffectorType(std::string_view affectorType) { _affectorType = affectorType; };
 
     /** Add a ParticleEmitter name that excludes Particles emitted by this ParticleEmitter from being
         affected.
     */
-    void addEmitterToExclude(const std::string& emitterName);
+    void addEmitterToExclude(std::string_view emitterName);
 
     /** Remove a ParticleEmitter name that excludes Particles emitted by this ParticleEmitter.
      */
-    void removeEmitterToExclude(const std::string& emitterName);
+    void removeEmitterToExclude(std::string_view emitterName);
 
     /** Todo
      */
-    const std::string& getName() const { return _name; };
-    void setName(const std::string& name) { _name = name; };
+    std::string_view getName() const { return _name; };
+    void setName(std::string_view name) { _name = name; };
 
     virtual void copyAttributesTo(PUAffector* affector);
 
diff --git a/extensions/Particle3D/PU/CCPUAffectorManager.cpp b/extensions/Particle3D/PU/CCPUAffectorManager.cpp
index e9b4e5e00f6d..c5be72d24dbf 100644
--- a/extensions/Particle3D/PU/CCPUAffectorManager.cpp
+++ b/extensions/Particle3D/PU/CCPUAffectorManager.cpp
@@ -63,7 +63,7 @@ PUAffectorManager* PUAffectorManager::Instance()
     return &pam;
 }
 
-PUScriptTranslator* PUAffectorManager::getTranslator(const std::string& type)
+PUScriptTranslator* PUAffectorManager::getTranslator(std::string_view type)
 {
     if (type == "Align")
     {
@@ -172,7 +172,7 @@ PUScriptTranslator* PUAffectorManager::getTranslator(const std::string& type)
     return nullptr;
 }
 
-PUAffector* PUAffectorManager::createAffector(const std::string& type)
+PUAffector* PUAffectorManager::createAffector(std::string_view type)
 {
     if (type == "Align")
     {
diff --git a/extensions/Particle3D/PU/CCPUAffectorManager.h b/extensions/Particle3D/PU/CCPUAffectorManager.h
index 8fe439c10f2e..9a768d52fe58 100644
--- a/extensions/Particle3D/PU/CCPUAffectorManager.h
+++ b/extensions/Particle3D/PU/CCPUAffectorManager.h
@@ -66,8 +66,8 @@ class CC_EX_DLL PUAffectorManager
 
     /**
      */
-    PUScriptTranslator* getTranslator(const std::string& type);
-    PUAffector* createAffector(const std::string& type);
+    PUScriptTranslator* getTranslator(std::string_view type);
+    PUAffector* createAffector(std::string_view type);
 
     CC_CONSTRUCTOR_ACCESS : PUAffectorManager();
     ~PUAffectorManager();
diff --git a/extensions/Particle3D/PU/CCPUBeamRender.cpp b/extensions/Particle3D/PU/CCPUBeamRender.cpp
index c68c2f603ee7..d278f52dc818 100644
--- a/extensions/Particle3D/PU/CCPUBeamRender.cpp
+++ b/extensions/Particle3D/PU/CCPUBeamRender.cpp
@@ -49,7 +49,7 @@ const float PUBeamRender::DEFAULT_DEVIATION
 const size_t PUBeamRender::DEFAULT_NUMBER_OF_SEGMENTS                             = 2;
 const PUBillboardChain::TexCoordDirection PUBeamRender::DEFAULT_TEXTURE_DIRECTION = PUBillboardChain::TCD_V;
 
-PUBeamRender* PUBeamRender::create(const std::string& texFile)
+PUBeamRender* PUBeamRender::create(std::string_view texFile)
 {
     auto br = new PUBeamRender();
     br->autorelease();
diff --git a/extensions/Particle3D/PU/CCPUBeamRender.h b/extensions/Particle3D/PU/CCPUBeamRender.h
index 0d0ccc8ed6a1..6d6e270295d0 100644
--- a/extensions/Particle3D/PU/CCPUBeamRender.h
+++ b/extensions/Particle3D/PU/CCPUBeamRender.h
@@ -87,7 +87,7 @@ class CC_EX_DLL PUBeamRender : public PURender, public PUListener
     static const size_t DEFAULT_NUMBER_OF_SEGMENTS;
     static const PUBillboardChain::TexCoordDirection DEFAULT_TEXTURE_DIRECTION;
 
-    static PUBeamRender* create(const std::string& texFile = "");
+    static PUBeamRender* create(std::string_view texFile = "");
 
     virtual void prepare() override;
     virtual void unPrepare() override;
diff --git a/extensions/Particle3D/PU/CCPUBehaviour.h b/extensions/Particle3D/PU/CCPUBehaviour.h
index 15d098d43901..745cfb669ac3 100644
--- a/extensions/Particle3D/PU/CCPUBehaviour.h
+++ b/extensions/Particle3D/PU/CCPUBehaviour.h
@@ -45,8 +45,8 @@ class CC_EX_DLL PUBehaviour : public Ref
 public:
     /** Todo
      */
-    const std::string& getBehaviourType() const { return _behaviourType; };
-    void setBehaviourType(const std::string& behaviourType) { _behaviourType = behaviourType; };
+    std::string_view getBehaviourType() const { return _behaviourType; };
+    void setBehaviourType(std::string_view behaviourType) { _behaviourType = behaviourType; };
 
     /** Notify that the Behaviour is rescaled.
      */
diff --git a/extensions/Particle3D/PU/CCPUBehaviourManager.cpp b/extensions/Particle3D/PU/CCPUBehaviourManager.cpp
index 6ff319f6161d..2ce24c156a7d 100644
--- a/extensions/Particle3D/PU/CCPUBehaviourManager.cpp
+++ b/extensions/Particle3D/PU/CCPUBehaviourManager.cpp
@@ -38,7 +38,7 @@ PUBehaviourManager* PUBehaviourManager::Instance()
     return &pam;
 }
 
-PUScriptTranslator* PUBehaviourManager::getTranslator(const std::string& type)
+PUScriptTranslator* PUBehaviourManager::getTranslator(std::string_view type)
 {
     if (type == "Slave")
     {
@@ -47,7 +47,7 @@ PUScriptTranslator* PUBehaviourManager::getTranslator(const std::string& type)
     return nullptr;
 }
 
-PUBehaviour* PUBehaviourManager::createBehaviour(const std::string& type)
+PUBehaviour* PUBehaviourManager::createBehaviour(std::string_view type)
 {
     if (type == "Slave")
     {
diff --git a/extensions/Particle3D/PU/CCPUBehaviourManager.h b/extensions/Particle3D/PU/CCPUBehaviourManager.h
index 91dfffb450bd..7f468f173a9d 100644
--- a/extensions/Particle3D/PU/CCPUBehaviourManager.h
+++ b/extensions/Particle3D/PU/CCPUBehaviourManager.h
@@ -41,8 +41,8 @@ class PUBehaviourManager
 
     /**
      */
-    PUScriptTranslator* getTranslator(const std::string& type);
-    PUBehaviour* createBehaviour(const std::string& type);
+    PUScriptTranslator* getTranslator(std::string_view type);
+    PUBehaviour* createBehaviour(std::string_view type);
 
     CC_CONSTRUCTOR_ACCESS : PUBehaviourManager();
     ~PUBehaviourManager();
diff --git a/extensions/Particle3D/PU/CCPUBillboardChain.cpp b/extensions/Particle3D/PU/CCPUBillboardChain.cpp
index b83a9dcb4ec2..f0646533e284 100644
--- a/extensions/Particle3D/PU/CCPUBillboardChain.cpp
+++ b/extensions/Particle3D/PU/CCPUBillboardChain.cpp
@@ -48,8 +48,8 @@ PUBillboardChain::Element::Element(const Vec3& pos, float w, float tex, const Ve
     : position(pos), width(w), texCoord(tex), color(col), orientation(ori)
 {}
 //-----------------------------------------------------------------------
-PUBillboardChain::PUBillboardChain(const std::string& /*name*/,
-                                   const std::string& texFile,
+PUBillboardChain::PUBillboardChain(std::string_view /*name*/,
+                                   std::string_view texFile,
                                    size_t maxElements,
                                    size_t numberOfChains,
                                    bool useTextureCoords,
@@ -627,7 +627,7 @@ void PUBillboardChain::updateIndexBuffer()
     }
 }
 //-----------------------------------------------------------------------
-void PUBillboardChain::init(const std::string& texFile)
+void PUBillboardChain::init(std::string_view texFile)
 {
     CC_SAFE_RELEASE_NULL(_programState);
 
diff --git a/extensions/Particle3D/PU/CCPUBillboardChain.h b/extensions/Particle3D/PU/CCPUBillboardChain.h
index 329029d2aca0..ce4b77cac54d 100644
--- a/extensions/Particle3D/PU/CCPUBillboardChain.h
+++ b/extensions/Particle3D/PU/CCPUBillboardChain.h
@@ -77,13 +77,13 @@ class PUBillboardChain
     @param useVertexColours If true, use vertex colours from the chain elements
     @param dynamic If true, buffers are created with the intention of being updated
     */
-    PUBillboardChain(const std::string& name,
-                     const std::string& texFile = "",
-                     size_t maxElements         = 20,
-                     size_t numberOfChains      = 1,
-                     bool useTextureCoords      = true,
-                     bool useColours            = true,
-                     bool dynamic               = true);
+    PUBillboardChain(std::string_view name,
+                     std::string_view texFile = "",
+                     size_t maxElements       = 20,
+                     size_t numberOfChains    = 1,
+                     bool useTextureCoords    = true,
+                     bool useColours          = true,
+                     bool dynamic             = true);
     /// destructor
     virtual ~PUBillboardChain();
 
@@ -245,7 +245,7 @@ class PUBillboardChain
     /// Update the contents of the index buffer
     virtual void updateIndexBuffer();
 
-    void init(const std::string& texFile);
+    void init(std::string_view texFile);
 
 private:
     void onBeforeDraw();
diff --git a/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h b/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h
index 3c2985c3d1b0..b4425d880c75 100644
--- a/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h
+++ b/extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h
@@ -57,11 +57,11 @@ class CC_EX_DLL PUDoAffectorEventHandler : public PUEventHandler
 
     /** Get the name of the affector that must be enabled or disabled.
      */
-    const std::string& getAffectorName() const { return _affectorName; };
+    std::string_view getAffectorName() const { return _affectorName; };
 
     /** Set the name of the affector.
      */
-    void setAffectorName(const std::string& affectorName) { _affectorName = affectorName; };
+    void setAffectorName(std::string_view affectorName) { _affectorName = affectorName; };
 
     /** If the _handle() function of this class is invoked (by an Observer), it searches the
         ParticleAffector defined by the its name.
diff --git a/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h b/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h
index 9c9ff4c0fdd2..94e56865f26e 100644
--- a/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h
+++ b/extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h
@@ -47,11 +47,11 @@ class CC_EX_DLL PUDoEnableComponentEventHandler : public PUEventHandler
 
     /** Get the name of the component that must be enabled or disabled.
      */
-    const std::string& getComponentName() const { return _componentName; };
+    std::string_view getComponentName() const { return _componentName; };
 
     /** Set the name of the component that must be enabled or disables.
      */
-    void setComponentName(const std::string& componentName) { _componentName = componentName; };
+    void setComponentName(std::string_view componentName) { _componentName = componentName; };
 
     /** Get the value that identifies whether the component must be enabled or disabled.
      */
diff --git a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp
index f70ba179ff43..d572be111809 100644
--- a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp
+++ b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp
@@ -241,7 +241,7 @@ void PUDoPlacementParticleEventHandler::particleExpired(PUParticleSystem3D* /*pa
 {}
 
 //-----------------------------------------------------------------------
-void PUDoPlacementParticleEventHandler::setForceEmitterName(const std::string& forceEmitterName)
+void PUDoPlacementParticleEventHandler::setForceEmitterName(std::string_view forceEmitterName)
 {
     _forceEmitterName = forceEmitterName;
 }
diff --git a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h
index cb33bb8cbd2f..3304e7309499 100644
--- a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h
+++ b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h
@@ -78,11 +78,11 @@ class CC_EX_DLL PUDoPlacementParticleEventHandler : public PUEventHandler, publi
 
     /** Get the name of the emitter that is used to emit its particles.
      */
-    const std::string& getForceEmitterName() const { return _forceEmitterName; };
+    std::string_view getForceEmitterName() const { return _forceEmitterName; };
 
     /** Set the name of the emitter that is used to emit its particles.
      */
-    void setForceEmitterName(const std::string& forceEmitterName);
+    void setForceEmitterName(std::string_view forceEmitterName);
 
     /** Returns a pointer to the emitter that is used as a force emitter.
      */
diff --git a/extensions/Particle3D/PU/CCPUEmitter.cpp b/extensions/Particle3D/PU/CCPUEmitter.cpp
index fdf3ac0487a3..2914895a70a0 100644
--- a/extensions/Particle3D/PU/CCPUEmitter.cpp
+++ b/extensions/Particle3D/PU/CCPUEmitter.cpp
@@ -497,7 +497,7 @@ void PUEmitter::setParticleTextureCoordsRangeEnd(const unsigned short& particleT
 }
 
 //-----------------------------------------------------------------------
-void PUEmitter::setEmitsName(const std::string& emitsName)
+void PUEmitter::setEmitsName(std::string_view emitsName)
 {
     _emitsName   = emitsName;
     _emitsEntity = nullptr;
diff --git a/extensions/Particle3D/PU/CCPUEmitter.h b/extensions/Particle3D/PU/CCPUEmitter.h
index 4aa3c3a1634a..bccc699bdf6c 100644
--- a/extensions/Particle3D/PU/CCPUEmitter.h
+++ b/extensions/Particle3D/PU/CCPUEmitter.h
@@ -112,13 +112,13 @@ class CC_EX_DLL PUEmitter : public Particle3DEmitter
 
     /** Todo
      */
-    const std::string& getEmitterType() const { return _emitterType; }
-    void setEmitterType(const std::string& emitterType) { _emitterType = emitterType; };
+    std::string_view getEmitterType() const { return _emitterType; }
+    void setEmitterType(std::string_view emitterType) { _emitterType = emitterType; };
 
     /** Todo
      */
-    const std::string& getName() const { return _name; }
-    void setName(const std::string& name) { _name = name; };
+    std::string_view getName() const { return _name; }
+    void setName(std::string_view name) { _name = name; };
 
     /** Todo
      */
@@ -188,8 +188,8 @@ class CC_EX_DLL PUEmitter : public Particle3DEmitter
 
     /** Todo
      */
-    const std::string& getEmitsName() const { return _emitsName; }
-    void setEmitsName(const std::string& emitsName);
+    std::string_view getEmitsName() const { return _emitsName; }
+    void setEmitsName(std::string_view emitsName);
     PUParticle3D::ParticleType getEmitsType() const { return _emitsType; }
     void setEmitsType(PUParticle3D::ParticleType type) { _emitsType = type; };
     Ref* getEmitsEntityPtr() const;
diff --git a/extensions/Particle3D/PU/CCPUEmitterManager.cpp b/extensions/Particle3D/PU/CCPUEmitterManager.cpp
index f18566fc94eb..4c587b04aa49 100644
--- a/extensions/Particle3D/PU/CCPUEmitterManager.cpp
+++ b/extensions/Particle3D/PU/CCPUEmitterManager.cpp
@@ -45,7 +45,7 @@ PUEmitterManager* PUEmitterManager::Instance()
     return &ptm;
 }
 
-PUScriptTranslator* PUEmitterManager::getTranslator(const std::string& type)
+PUScriptTranslator* PUEmitterManager::getTranslator(std::string_view type)
 {
     if (type == "Box")
     {
@@ -86,7 +86,7 @@ PUScriptTranslator* PUEmitterManager::getTranslator(const std::string& type)
     return nullptr;
 }
 
-PUEmitter* PUEmitterManager::createEmitter(const std::string& type)
+PUEmitter* PUEmitterManager::createEmitter(std::string_view type)
 {
     if (type == "Box")
     {
diff --git a/extensions/Particle3D/PU/CCPUEmitterManager.h b/extensions/Particle3D/PU/CCPUEmitterManager.h
index 00ee4c33ae65..5affa49ef8be 100644
--- a/extensions/Particle3D/PU/CCPUEmitterManager.h
+++ b/extensions/Particle3D/PU/CCPUEmitterManager.h
@@ -48,8 +48,8 @@ class PUEmitterManager
 
     /**
      */
-    PUScriptTranslator* getTranslator(const std::string& type);
-    PUEmitter* createEmitter(const std::string& type);
+    PUScriptTranslator* getTranslator(std::string_view type);
+    PUEmitter* createEmitter(std::string_view type);
 
     CC_CONSTRUCTOR_ACCESS : PUEmitterManager();
     ~PUEmitterManager();
diff --git a/extensions/Particle3D/PU/CCPUEventHandler.h b/extensions/Particle3D/PU/CCPUEventHandler.h
index 771252122f71..a9f4582b7780 100644
--- a/extensions/Particle3D/PU/CCPUEventHandler.h
+++ b/extensions/Particle3D/PU/CCPUEventHandler.h
@@ -44,8 +44,8 @@ class CC_EX_DLL PUEventHandler : public Ref
 public:
     /** Todo
      */
-    const std::string& getName() const { return _name; };
-    void setName(const std::string& name) { _name = name; };
+    std::string_view getName() const { return _name; };
+    void setName(std::string_view name) { _name = name; };
 
     /** Todo
      */
@@ -54,8 +54,8 @@ class CC_EX_DLL PUEventHandler : public Ref
 
     /** Todo
      */
-    const std::string& getEventHandlerType() const { return _eventHandlerType; };
-    void setEventHandlerType(const std::string& eventHandlerType) { _eventHandlerType = eventHandlerType; };
+    std::string_view getEventHandlerType() const { return _eventHandlerType; };
+    void setEventHandlerType(std::string_view eventHandlerType) { _eventHandlerType = eventHandlerType; };
 
     /** Notify that the event handler is rescaled.
      */
diff --git a/extensions/Particle3D/PU/CCPUEventHandlerManager.cpp b/extensions/Particle3D/PU/CCPUEventHandlerManager.cpp
index df3803a8f43d..06206b7b9936 100644
--- a/extensions/Particle3D/PU/CCPUEventHandlerManager.cpp
+++ b/extensions/Particle3D/PU/CCPUEventHandlerManager.cpp
@@ -44,7 +44,7 @@ PUEventHandlerManager* PUEventHandlerManager::Instance()
     return &pem;
 }
 
-PUScriptTranslator* PUEventHandlerManager::getTranslator(const std::string& type)
+PUScriptTranslator* PUEventHandlerManager::getTranslator(std::string_view type)
 {
     if (type == "DoAffector")
     {
@@ -77,7 +77,7 @@ PUScriptTranslator* PUEventHandlerManager::getTranslator(const std::string& type
     return nullptr;
 }
 
-PUEventHandler* PUEventHandlerManager::createEventHandler(const std::string& type)
+PUEventHandler* PUEventHandlerManager::createEventHandler(std::string_view type)
 {
     if (type == "DoAffector")
     {
diff --git a/extensions/Particle3D/PU/CCPUEventHandlerManager.h b/extensions/Particle3D/PU/CCPUEventHandlerManager.h
index 2cc470c60bb7..bd09e1487c7b 100644
--- a/extensions/Particle3D/PU/CCPUEventHandlerManager.h
+++ b/extensions/Particle3D/PU/CCPUEventHandlerManager.h
@@ -45,8 +45,8 @@ class PUEventHandlerManager
 
     /**
      */
-    PUScriptTranslator* getTranslator(const std::string& type);
-    PUEventHandler* createEventHandler(const std::string& type);
+    PUScriptTranslator* getTranslator(std::string_view type);
+    PUEventHandler* createEventHandler(std::string_view type);
 
     CC_CONSTRUCTOR_ACCESS :
 
diff --git a/extensions/Particle3D/PU/CCPULineEmitter.cpp b/extensions/Particle3D/PU/CCPULineEmitter.cpp
index 394307f312ec..674822c247d9 100644
--- a/extensions/Particle3D/PU/CCPULineEmitter.cpp
+++ b/extensions/Particle3D/PU/CCPULineEmitter.cpp
@@ -92,7 +92,7 @@ unsigned short PULineEmitter::calculateRequestedParticles(float timeElapsed)
         //{
         //	notifyStart();
         //	mParentTechnique->lockAllParticles(); // Needed to set the first generated particle also first in the
-        //list with particles
+        // list with particles
         // }
     }
 
diff --git a/extensions/Particle3D/PU/CCPUMaterialManager.cpp b/extensions/Particle3D/PU/CCPUMaterialManager.cpp
index 05aa70292cf6..3e1d3469e5a3 100644
--- a/extensions/Particle3D/PU/CCPUMaterialManager.cpp
+++ b/extensions/Particle3D/PU/CCPUMaterialManager.cpp
@@ -77,7 +77,7 @@ PUMaterialCache* PUMaterialCache::Instance()
     return &pmm;
 }
 
-PUMaterial* PUMaterialCache::getMaterial(const std::string& name)
+PUMaterial* PUMaterialCache::getMaterial(std::string_view name)
 {
     for (auto iter : _materialMap)
     {
@@ -87,7 +87,7 @@ PUMaterial* PUMaterialCache::getMaterial(const std::string& name)
     return nullptr;
 }
 
-bool PUMaterialCache::loadMaterials(const std::string& file)
+bool PUMaterialCache::loadMaterials(std::string_view file)
 {
     bool isFirstCompile = true;
     auto list           = PUScriptCompiler::Instance()->compile(file, isFirstCompile);
@@ -128,53 +128,59 @@ int iterPath(const char* fpath, const struct stat* /*sb*/, int typeflag)
 }
 #endif
 
-bool PUMaterialCache::loadMaterialsFromSearchPaths(const std::string& fileFolder)
+bool PUMaterialCache::loadMaterialsFromSearchPaths(std::string_view fileFolder)
 {
     bool state = false;
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
     std::string seg("/");
-    std::string fullPath = fileFolder + seg + std::string("*.material");
+    std::string fullPath{fileFolder};
+    fullPath += seg;
+    fullPath += std::string("*.material");
     _finddata_t data;
     intptr_t handle = _findfirst(fullPath.c_str(), &data);
     int done        = 0;
     while ((handle != -1) && (done == 0))
     {
-        loadMaterials(fileFolder + seg + std::string(data.name));
+        fullPath = fileFolder;
+        fullPath += seg;
+        fullPath += data.name;
+        loadMaterials(fullPath);
         done  = _findnext(handle, &data);
         state = true;
     }
     _findclose(handle);
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID /* || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX*/)
-    std::string::size_type pos = fileFolder.find("assets/");
-    std::string relativePath   = fileFolder;
+    std::string::size_type pos    = fileFolder.find("assets/");
+    std::string_view relativePath = fileFolder;
     if (pos != std::string::npos)
     {
         // "assets/" is at the beginning of the path and we don't want it
         relativePath = fileFolder.substr(pos + strlen("assets/"));
     }
-    AAssetDir* dir       = AAssetManager_openDir(FileUtilsAndroid::getAssetManager(), relativePath.c_str());
+    AAssetDir* dir       = AAssetManager_openDir(FileUtilsAndroid::getAssetManager(), relativePath.data());
     const char* fileName = nullptr;
-    std::string seg("/");
+    std::string_view seg("/", 1);
+    std::string fullpath;
     while ((fileName = AAssetDir_getNextFileName(dir)) != nullptr)
     {
         if (FileUtils::getInstance()->getFileExtension(fileName) == ".material")
         {
-            std::string fullpath = fileFolder + seg + std::string(fileName);
+            fullpath.assign(fileFolder).append(seg).append(fileName);
             loadMaterials(fullpath);
         }
     }
     AAssetDir_close(dir);
 
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-    ftw(fileFolder.c_str(), iterPath, 500);
+    ftw(fileFolder.data(), iterPath, 500);
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX || CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN)
     DIR* d;               // dir handle
     struct dirent* file;  // readdir
     struct stat statbuf;
 
-    if (!(d = opendir(fileFolder.c_str())))
+    if (!(d = opendir(fileFolder.data())))
     {
-        CCLOG("error opendir %s!!!\n", fileFolder.c_str());
+        CCLOG("error opendir %s!!!\n", fileFolder.data());
         return false;
     }
     while ((file = readdir(d)) != NULL)
@@ -186,7 +192,8 @@ bool PUMaterialCache::loadMaterialsFromSearchPaths(const std::string& fileFolder
 
         if (FileUtils::getInstance()->getFileExtension(file->d_name) == ".material")
         {
-            std::string fullpath = fileFolder + "/" + file->d_name;
+            std::string fullpath{fileFolder};
+            fullpath.append("/"sv).append(file->d_name);
             CCLOG("%s", fullpath.c_str());
             loadMaterials(fullpath);
             state = true;
diff --git a/extensions/Particle3D/PU/CCPUMaterialManager.h b/extensions/Particle3D/PU/CCPUMaterialManager.h
index 54543ce34919..a5cbac89349b 100644
--- a/extensions/Particle3D/PU/CCPUMaterialManager.h
+++ b/extensions/Particle3D/PU/CCPUMaterialManager.h
@@ -63,9 +63,9 @@ class CC_EX_DLL PUMaterialCache
 
     static PUMaterialCache* Instance();
 
-    bool loadMaterials(const std::string& file);
-    bool loadMaterialsFromSearchPaths(const std::string& fileFolder);
-    PUMaterial* getMaterial(const std::string& name);
+    bool loadMaterials(std::string_view file);
+    bool loadMaterialsFromSearchPaths(std::string_view fileFolder);
+    PUMaterial* getMaterial(std::string_view name);
     void addMaterial(PUMaterial* material);
 
 protected:
diff --git a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp
index b453dc4126c8..2c787ebd3e71 100644
--- a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp
+++ b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp
@@ -162,7 +162,7 @@ const PUTriangle::PositionAndNormal PUTriangle::getRandomVertexAndNormal()
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
-MeshInfo::MeshInfo(const std::string& /*meshName*/,
+MeshInfo::MeshInfo(std::string_view /*meshName*/,
                    MeshSurfaceDistribution distribution,
                    const Quaternion& /*orientation*/,
                    const Vec3& /*scale*/)
@@ -307,7 +307,7 @@ const PUTriangle::PositionAndNormal MeshInfo::getRandomPositionAndNormal(const s
 //	{
 //		Ogre::SubMesh* submesh = mesh->getSubMesh(i);
 //		Ogre::VertexData* vertex_data = submesh->useSharedVertices ? mesh->sharedVertexData :
-//submesh->vertexData;
+// submesh->vertexData;
 //
 //		if((!submesh->useSharedVertices)||(submesh->useSharedVertices && !added_shared))
 //		{
@@ -318,10 +318,11 @@ const PUTriangle::PositionAndNormal MeshInfo::getRandomPositionAndNormal(const s
 //			}
 //
 //			const Ogre::VertexElement* posElem =
-//vertex_data->vertexDeclaration->findElementBySemantic(Ogre::VES_POSITION); 			const Ogre::VertexElement* normalElem =
-//vertex_data->vertexDeclaration->findElementBySemantic(Ogre::VES_NORMAL); 			Ogre::HardwareVertexBufferSharedPtr vbuf =
-//vertex_data->vertexBufferBinding->getBuffer(posElem->getSource()); 			unsigned char* vertex = static_cast<unsigned
-//char*>(vbuf->lock(Ogre::HardwareBuffer::HBL_READ_ONLY)); 			float* pReal;
+// vertex_data->vertexDeclaration->findElementBySemantic(Ogre::VES_POSITION); 			const
+// Ogre::VertexElement* normalElem = vertex_data->vertexDeclaration->findElementBySemantic(Ogre::VES_NORMAL);
+// Ogre::HardwareVertexBufferSharedPtr vbuf = vertex_data->vertexBufferBinding->getBuffer(posElem->getSource());
+// unsigned char* vertex = static_cast<unsigned char*>(vbuf->lock(Ogre::HardwareBuffer::HBL_READ_ONLY));
+// float* pReal;
 //
 //			for( size_t j = 0; j < vertex_data->vertexCount; ++j, vertex += vbuf->getVertexSize())
 //			{
@@ -359,7 +360,7 @@ const PUTriangle::PositionAndNormal MeshInfo::getRandomPositionAndNormal(const s
 //			for ( size_t k = 0; k < numTrisMultThree; ++k)
 //			{
 //				indices[index_offset++] = static_cast<unsigned long>(pShort[k]) + static_cast<unsigned
-//long>(offset);
+// long>(offset);
 //			}
 //		}
 //
@@ -527,12 +528,12 @@ void PUMeshSurfaceEmitter::initParticleDirection(PUParticle3D* particle)
     }
 }
 //-----------------------------------------------------------------------
-const std::string& PUMeshSurfaceEmitter::getMeshName() const
+std::string_view PUMeshSurfaceEmitter::getMeshName() const
 {
     return _meshName;
 }
 //-----------------------------------------------------------------------
-void PUMeshSurfaceEmitter::setMeshName(const std::string& meshName, bool doBuild)
+void PUMeshSurfaceEmitter::setMeshName(std::string_view meshName, bool doBuild)
 {
     _meshName = meshName;
 
diff --git a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h
index 9f1cd8389f03..553d10117623 100644
--- a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h
+++ b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h
@@ -119,7 +119,7 @@ class MeshInfo
     };
 
     /** Constructor **/
-    MeshInfo(const std::string& meshName,
+    MeshInfo(std::string_view meshName,
              const MeshSurfaceDistribution distribution = MSD_HOMOGENEOUS,
              const Quaternion& orientation              = Quaternion(),
              const Vec3& scale                          = Vec3::ZERO);
@@ -173,11 +173,11 @@ class CC_EX_DLL PUMeshSurfaceEmitter : public PUEmitter
 
     /** Returns the mesh name.
      */
-    const std::string& getMeshName() const;
+    std::string_view getMeshName() const;
 
     /** Sets the mesh name.
      */
-    void setMeshName(const std::string& meshName, bool doBuild = true);
+    void setMeshName(std::string_view meshName, bool doBuild = true);
 
     /** Returns true if normals are used for the particle direction.
      */
diff --git a/extensions/Particle3D/PU/CCPUObserver.cpp b/extensions/Particle3D/PU/CCPUObserver.cpp
index 6b93991b2a71..edfc370560a3 100644
--- a/extensions/Particle3D/PU/CCPUObserver.cpp
+++ b/extensions/Particle3D/PU/CCPUObserver.cpp
@@ -130,7 +130,7 @@ void PUObserver::notifyRescaled(const Vec3& scale)
     }
 }
 //-----------------------------------------------------------------------
-PUEventHandler* PUObserver::createEventHandler(const std::string& eventHandlerType)
+PUEventHandler* PUObserver::createEventHandler(std::string_view eventHandlerType)
 {
     PUEventHandler* eventHandler = PUEventHandlerManager::Instance()->createEventHandler(eventHandlerType);
     addEventHandler(eventHandler);
@@ -168,7 +168,7 @@ PUEventHandler* PUObserver::getEventHandler(size_t index) const
     return _eventHandlers[index];
 }
 //-----------------------------------------------------------------------
-PUEventHandler* PUObserver::getEventHandler(const std::string& eventHandlerName) const
+PUEventHandler* PUObserver::getEventHandler(std::string_view eventHandlerName) const
 {
     if (eventHandlerName.empty())
         return nullptr;
diff --git a/extensions/Particle3D/PU/CCPUObserver.h b/extensions/Particle3D/PU/CCPUObserver.h
index c2455aa0368e..dcb354bc02ac 100644
--- a/extensions/Particle3D/PU/CCPUObserver.h
+++ b/extensions/Particle3D/PU/CCPUObserver.h
@@ -63,8 +63,8 @@ class CC_EX_DLL PUObserver : public Ref
 
     /** Todo
      */
-    const std::string& getObserverType() const { return _observerType; };
-    void setObserverType(const std::string& observerType) { _observerType = observerType; };
+    std::string_view getObserverType() const { return _observerType; };
+    void setObserverType(std::string_view observerType) { _observerType = observerType; };
 
     /** Todo
      */
@@ -93,8 +93,8 @@ class CC_EX_DLL PUObserver : public Ref
 
     /** Todo
      */
-    const std::string& getName() const { return _name; };
-    void setName(const std::string& name) { _name = name; };
+    std::string_view getName() const { return _name; };
+    void setName(std::string_view name) { _name = name; };
 
     /** Todo
      */
@@ -115,7 +115,7 @@ class CC_EX_DLL PUObserver : public Ref
 
     /** Todo
      */
-    PUEventHandler* createEventHandler(const std::string& eventHandlerType);
+    PUEventHandler* createEventHandler(std::string_view eventHandlerType);
 
     /** Todo
      */
@@ -131,7 +131,7 @@ class CC_EX_DLL PUObserver : public Ref
 
     /** Todo
      */
-    PUEventHandler* getEventHandler(const std::string& eventHandlerName) const;
+    PUEventHandler* getEventHandler(std::string_view eventHandlerName) const;
 
     /** Todo
      */
diff --git a/extensions/Particle3D/PU/CCPUObserverManager.cpp b/extensions/Particle3D/PU/CCPUObserverManager.cpp
index 3ac7859ed6d9..a90e2fdb0941 100644
--- a/extensions/Particle3D/PU/CCPUObserverManager.cpp
+++ b/extensions/Particle3D/PU/CCPUObserverManager.cpp
@@ -48,7 +48,7 @@ PUObserverManager* PUObserverManager::Instance()
     return &pem;
 }
 
-PUScriptTranslator* PUObserverManager::getTranslator(const std::string& type)
+PUScriptTranslator* PUObserverManager::getTranslator(std::string_view type)
 {
     if (type == "OnClear")
     {
@@ -97,7 +97,7 @@ PUScriptTranslator* PUObserverManager::getTranslator(const std::string& type)
     return nullptr;
 }
 
-PUObserver* PUObserverManager::createObserver(const std::string& type)
+PUObserver* PUObserverManager::createObserver(std::string_view type)
 {
     if (type == "OnClear")
     {
diff --git a/extensions/Particle3D/PU/CCPUObserverManager.h b/extensions/Particle3D/PU/CCPUObserverManager.h
index cd1a69dac889..8134843e1b34 100644
--- a/extensions/Particle3D/PU/CCPUObserverManager.h
+++ b/extensions/Particle3D/PU/CCPUObserverManager.h
@@ -50,8 +50,8 @@ class PUObserverManager
 
     /**
      */
-    PUScriptTranslator* getTranslator(const std::string& type);
-    PUObserver* createObserver(const std::string& type);
+    PUScriptTranslator* getTranslator(std::string_view type);
+    PUObserver* createObserver(std::string_view type);
 
     CC_CONSTRUCTOR_ACCESS :
 
diff --git a/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp b/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp
index e9818e3a2512..4f5ea0c39366 100644
--- a/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp
+++ b/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp
@@ -259,7 +259,7 @@ PUParticleSystem3D* PUParticleSystem3D::create()
     return pups;
 }
 
-PUParticleSystem3D* PUParticleSystem3D::create(const std::string& filePath, const std::string& materialPath)
+PUParticleSystem3D* PUParticleSystem3D::create(std::string_view filePath, std::string_view materialPath)
 {
     PUParticleSystem3D* ret = new PUParticleSystem3D();
     if (ret->initWithFilePathAndMaterialPath(filePath, materialPath))
@@ -274,7 +274,7 @@ PUParticleSystem3D* PUParticleSystem3D::create(const std::string& filePath, cons
     }
 }
 
-PUParticleSystem3D* PUParticleSystem3D::create(const std::string& filePath)
+PUParticleSystem3D* PUParticleSystem3D::create(std::string_view filePath)
 {
     PUParticleSystem3D* ret = new PUParticleSystem3D();
     if (ret->initWithFilePath(filePath))
@@ -289,7 +289,7 @@ PUParticleSystem3D* PUParticleSystem3D::create(const std::string& filePath)
     }
 }
 
-bool PUParticleSystem3D::initWithFilePath(const std::string& filePath)
+bool PUParticleSystem3D::initWithFilePath(std::string_view filePath)
 {
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
     convertToUnixStylePath(fullPath);
@@ -318,7 +318,7 @@ bool PUParticleSystem3D::initWithFilePath(const std::string& filePath)
     return true;
 }
 
-bool PUParticleSystem3D::initWithFilePathAndMaterialPath(const std::string& filePath, const std::string& materialPath)
+bool PUParticleSystem3D::initWithFilePathAndMaterialPath(std::string_view filePath, std::string_view materialPath)
 {
     std::string matfullPath = FileUtils::getInstance()->fullPathForFilename(materialPath);
     convertToUnixStylePath(matfullPath);
@@ -629,24 +629,24 @@ void PUParticleSystem3D::unPrepared()
         _particlePool.lockAllDatas();
         for (auto& iter : _emittedEmitterParticlePool)
         {
-            PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+            PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
             while (particle)
             {
                 static_cast<PUEmitter*>(particle->particleEntityPtr)->unPrepare();
-                particle = static_cast<PUParticle3D*>(iter.second.getNext());
+                particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
             }
-            iter.second.lockAllDatas();
+            const_cast<ParticlePool&>(iter.second).lockAllDatas();
         }
 
         for (auto& iter : _emittedSystemParticlePool)
         {
-            PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+            PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
             while (particle)
             {
                 static_cast<PUParticleSystem3D*>(particle->particleEntityPtr)->unPrepared();
-                particle = static_cast<PUParticle3D*>(iter.second.getNext());
+                particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
             }
-            iter.second.lockAllDatas();
+            const_cast<ParticlePool&>(iter.second).lockAllDatas();
         }
         _prepared = false;
     }
@@ -692,21 +692,21 @@ void PUParticleSystem3D::preUpdator(float elapsedTime)
 
     for (auto& iter : _emittedEmitterParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUEmitter*>(particle->particleEntityPtr)->preUpdateEmitter(elapsedTime);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 
     for (auto& iter : _emittedSystemParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUParticleSystem3D*>(particle->particleEntityPtr)->preUpdator(elapsedTime);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 }
@@ -719,12 +719,12 @@ void PUParticleSystem3D::updator(float elapsedTime)
 
     for (auto& iter : _emittedEmitterParticlePool)
     {
-        processParticle(iter.second, firstActiveParticle, firstParticle, elapsedTime);
+        processParticle(const_cast<ParticlePool&>(iter.second), firstActiveParticle, firstParticle, elapsedTime);
     }
 
     for (auto& iter : _emittedSystemParticlePool)
     {
-        processParticle(iter.second, firstActiveParticle, firstParticle, elapsedTime);
+        processParticle(const_cast<ParticlePool&>(iter.second), firstActiveParticle, firstParticle, elapsedTime);
     }
 }
 
@@ -763,21 +763,21 @@ void PUParticleSystem3D::postUpdator(float elapsedTime)
 
     for (auto& iter : _emittedEmitterParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUEmitter*>(particle->particleEntityPtr)->postUpdateEmitter(elapsedTime);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 
     for (auto& iter : _emittedSystemParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUParticleSystem3D*>(particle->particleEntityPtr)->postUpdator(elapsedTime);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 }
@@ -901,7 +901,7 @@ void PUParticleSystem3D::setMaxVelocity(float maxVelocity)
     _maxVelocitySet = true;
 }
 
-bool PUParticleSystem3D::initSystem(const std::string& filePath)
+bool PUParticleSystem3D::initSystem(std::string_view filePath)
 {
     bool isFirstCompile = true;
     auto list           = PUScriptCompiler::Instance()->compile(filePath, isFirstCompile);
@@ -922,7 +922,7 @@ void PUParticleSystem3D::addEmitter(PUEmitter* emitter)
     }
 }
 
-PUAffector* PUParticleSystem3D::getAffector(const std::string& name)
+PUAffector* PUParticleSystem3D::getAffector(std::string_view name)
 {
     for (auto iter : _affectors)
     {
@@ -934,7 +934,7 @@ PUAffector* PUParticleSystem3D::getAffector(const std::string& name)
     return nullptr;
 }
 
-PUEmitter* PUParticleSystem3D::getEmitter(const std::string& name)
+PUEmitter* PUParticleSystem3D::getEmitter(std::string_view name)
 {
     for (auto iter : _emitters)
     {
@@ -1040,7 +1040,7 @@ void PUParticleSystem3D::addObserver(PUObserver* observer)
     }
 }
 
-PUObserver* PUParticleSystem3D::getObserver(const std::string& name)
+PUObserver* PUParticleSystem3D::getObserver(std::string_view name)
 {
     for (auto iter : _observers)
     {
@@ -1074,21 +1074,21 @@ void PUParticleSystem3D::notifyRescaled(const Vec3& scl)
 
     for (auto& iter : _emittedEmitterParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUEmitter*>(particle->particleEntityPtr)->notifyRescaled(scl);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 
     for (auto& iter : _emittedSystemParticlePool)
     {
-        PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+        PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
         while (particle)
         {
             static_cast<PUParticleSystem3D*>(particle->particleEntityPtr)->notifyRescaled(scl);
-            particle = static_cast<PUParticle3D*>(iter.second.getNext());
+            particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
         }
     }
 }
@@ -1113,7 +1113,7 @@ void PUParticleSystem3D::initParticleForExpiration(PUParticle3D* particle, float
         it->particleExpired(this, particle);
     }
     ///** Externs are also called to perform expiration activities. If needed, affectors and emitters may be added, but
-    ///at the moment
+    /// at the moment
     //	there is no reason for (and we don't want to waste cpu resources).
     //*/
     // if (!mExterns.empty())
@@ -1164,12 +1164,12 @@ void PUParticleSystem3D::clearAllParticles()
     _particlePool.lockAllDatas();
     for (auto& iter : _emittedEmitterParticlePool)
     {
-        iter.second.lockAllDatas();
+        const_cast<ParticlePool&>(iter.second).lockAllDatas();
     }
 
     for (auto& iter : _emittedSystemParticlePool)
     {
-        iter.second.lockAllDatas();
+        const_cast<ParticlePool&>(iter.second).lockAllDatas();
     }
 }
 
@@ -1303,11 +1303,11 @@ void PUParticleSystem3D::draw(Renderer* renderer, const Mat4& transform, uint32_
     {
         for (auto& iter : _emittedSystemParticlePool)
         {
-            PUParticle3D* particle = static_cast<PUParticle3D*>(iter.second.getFirst());
+            PUParticle3D* particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getFirst());
             while (particle)
             {
                 static_cast<PUParticleSystem3D*>(particle->particleEntityPtr)->draw(renderer, transform, flags);
-                particle = static_cast<PUParticle3D*>(iter.second.getNext());
+                particle = static_cast<PUParticle3D*>(const_cast<ParticlePool&>(iter.second).getNext());
             }
         }
     }
diff --git a/extensions/Particle3D/PU/CCPUParticleSystem3D.h b/extensions/Particle3D/PU/CCPUParticleSystem3D.h
index 4b73e26c1d2a..d7773d9892df 100644
--- a/extensions/Particle3D/PU/CCPUParticleSystem3D.h
+++ b/extensions/Particle3D/PU/CCPUParticleSystem3D.h
@@ -207,7 +207,7 @@ struct CC_EX_DLL PUParticle3D : public Particle3D
 class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
 {
 public:
-    typedef std::unordered_map<std::string, ParticlePool> ParticlePoolMap;
+    typedef hlookup::string_map<ParticlePool> ParticlePoolMap;
 
     static const float DEFAULT_WIDTH;
     static const float DEFAULT_HEIGHT;
@@ -218,8 +218,8 @@ class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
     static const float DEFAULT_MAX_VELOCITY;
 
     static PUParticleSystem3D* create();
-    static PUParticleSystem3D* create(const std::string& filePath);
-    static PUParticleSystem3D* create(const std::string& filePath, const std::string& materialPath);
+    static PUParticleSystem3D* create(std::string_view filePath);
+    static PUParticleSystem3D* create(std::string_view filePath, std::string_view materialPath);
 
     virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
 
@@ -296,8 +296,8 @@ class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
      */
     void setMaxVelocity(float maxVelocity);
 
-    void setMaterialName(const std::string& name) { _matName = name; };
-    const std::string& getMaterialName() const { return _matName; };
+    void setMaterialName(std::string_view name) { _matName = name; };
+    std::string_view getMaterialName() const { return _matName; };
 
     /** Forces emission of particles.
      * @remarks The number of requested particles are the exact number that are emitted. No down-scaling is applied.
@@ -309,8 +309,8 @@ class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
      */
     void addEmitter(PUEmitter* emitter);
 
-    PUAffector* getAffector(const std::string& name);
-    PUEmitter* getEmitter(const std::string& name);
+    PUAffector* getAffector(std::string_view name);
+    PUEmitter* getEmitter(std::string_view name);
     void removeAllEmitter();
 
     void addListener(PUListener* listener);
@@ -318,7 +318,7 @@ class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
     void removeAllListener();
 
     void addObserver(PUObserver* observer);
-    PUObserver* getObserver(const std::string& name);
+    PUObserver* getObserver(std::string_view name);
     void removerAllObserver();
 
     void addBehaviourTemplate(PUBehaviour* behaviour);
@@ -346,13 +346,13 @@ class CC_EX_DLL PUParticleSystem3D : public ParticleSystem3D
     virtual PUParticleSystem3D* clone();
     virtual void copyAttributesTo(PUParticleSystem3D* system);
 
-    bool initSystem(const std::string& filePath);
+    bool initSystem(std::string_view filePath);
 
     CC_CONSTRUCTOR_ACCESS : PUParticleSystem3D();
     virtual ~PUParticleSystem3D();
 
-    bool initWithFilePath(const std::string& filePath);
-    bool initWithFilePathAndMaterialPath(const std::string& filePath, const std::string& materialPath);
+    bool initWithFilePath(std::string_view filePath);
+    bool initWithFilePathAndMaterialPath(std::string_view filePath, std::string_view materialPath);
 
 protected:
     void prepared();
diff --git a/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.cpp b/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.cpp
index 29b6e0869717..819aa25f7d9e 100644
--- a/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.cpp
+++ b/extensions/Particle3D/PU/CCPUParticleSystem3DTranslator.cpp
@@ -107,7 +107,7 @@ void PUParticleSystem3DTranslator::translate(PUScriptCompiler* compiler, PUAbstr
             //				else
             //				{
             //					compiler->addError(PUScriptCompiler::CE_NUMBEREXPECTED, prop->file,
-            //prop->line,
+            // prop->line,
             //                                                "PU Compiler: lod_distances expects only numbers as
             //                                                arguments");
             //				}
@@ -238,7 +238,8 @@ void PUParticleSystem3DTranslator::translate(PUScriptCompiler* compiler, PUAbstr
             //				{
             //					ParticleTechnique* technique = static_cast<ParticleTechnique*>(alias);
             //					ParticleTechnique* newTechnique =
-            //ParticleSystemManager::getSingletonPtr()->cloneTechnique(technique); 					mSystem->addTechnique(newTechnique);
+            // ParticleSystemManager::getSingletonPtr()->cloneTechnique(technique);
+            // mSystem->addTechnique(newTechnique);
             //				}
             //			}
             //		}
diff --git a/extensions/Particle3D/PU/CCPURender.cpp b/extensions/Particle3D/PU/CCPURender.cpp
index d22e2c977f01..62c250500702 100644
--- a/extensions/Particle3D/PU/CCPURender.cpp
+++ b/extensions/Particle3D/PU/CCPURender.cpp
@@ -56,7 +56,7 @@ void PURender::copyAttributesTo(PURender* render)
 //     return left->depthInView > right->depthInView;
 // }
 
-PUParticle3DQuadRender* PUParticle3DQuadRender::create(const std::string& texFile)
+PUParticle3DQuadRender* PUParticle3DQuadRender::create(std::string_view texFile)
 {
     auto ret = new PUParticle3DQuadRender();
     if (ret->initRender(texFile))
@@ -227,25 +227,25 @@ void PUParticle3DQuadRender::render(Renderer* renderer, const Mat4& transform, P
 
         //_posuvcolors[vertexindex].position = (position + (- halfwidth - halfheight + halfwidth * offsetX + halfheight
         //* offsetY)); _posuvcolors[vertexindex].color = particle->color; _posuvcolors[vertexindex].uv.set(val.x +
-        //texOffset.x, val.y + texOffset.y);
+        // texOffset.x, val.y + texOffset.y);
 
         // val.set(particle->rt_uv.x - texOffset.x, particle->lb_uv.y - texOffset.y);
         // val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
         //_posuvcolors[vertexindex + 1].position = (position + (halfwidth - halfheight + halfwidth * offsetX +
-        //halfheight * offsetY)); _posuvcolors[vertexindex + 1].color = particle->color; _posuvcolors[vertexindex +
-        //1].uv.set(val.x + texOffset.x, val.y + texOffset.y);
+        // halfheight * offsetY)); _posuvcolors[vertexindex + 1].color = particle->color; _posuvcolors[vertexindex +
+        // 1].uv.set(val.x + texOffset.x, val.y + texOffset.y);
         //
         // val.set(particle->lb_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
         // val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
         //_posuvcolors[vertexindex + 2].position = (position + (- halfwidth + halfheight + halfwidth * offsetX +
-        //halfheight * offsetY)); _posuvcolors[vertexindex + 2].color = particle->color; _posuvcolors[vertexindex +
-        //2].uv.set(val.x + texOffset.x, val.y + texOffset.y);
+        // halfheight * offsetY)); _posuvcolors[vertexindex + 2].color = particle->color; _posuvcolors[vertexindex +
+        // 2].uv.set(val.x + texOffset.x, val.y + texOffset.y);
         //
         // val.set(particle->rt_uv.x - texOffset.x, particle->rt_uv.y - texOffset.y);
         // val.set(val.x * costheta - val.y * sintheta, val.x * sintheta + val.y * costheta);
         //_posuvcolors[vertexindex + 3].position = (position + (halfwidth + halfheight + halfwidth * offsetX +
-        //halfheight * offsetY)); _posuvcolors[vertexindex + 3].color = particle->color; _posuvcolors[vertexindex +
-        //3].uv.set(val.x + texOffset.x, val.y + texOffset.y);
+        // halfheight * offsetY)); _posuvcolors[vertexindex + 3].color = particle->color; _posuvcolors[vertexindex +
+        // 3].uv.set(val.x + texOffset.x, val.y + texOffset.y);
         //
         //
         //_indexData[index] = vertexindex;
@@ -488,8 +488,7 @@ PUParticle3DQuadRender* PUParticle3DQuadRender::clone()
     return render;
 }
 
-PUParticle3DModelRender* PUParticle3DModelRender::create(const std::string& modelFile,
-                                                         const std::string& texFile /*= ""*/)
+PUParticle3DModelRender* PUParticle3DModelRender::create(std::string_view modelFile, std::string_view texFile /*= ""*/)
 {
     auto ret        = new PUParticle3DModelRender();
     ret->_modelFile = modelFile;
@@ -614,7 +613,7 @@ PUParticle3DEntityRender::~PUParticle3DEntityRender()
     CC_SAFE_RELEASE(_indexBuffer);
 }
 
-bool PUParticle3DEntityRender::initRender(const std::string& texFile)
+bool PUParticle3DEntityRender::initRender(std::string_view texFile)
 {
     CC_SAFE_RELEASE_NULL(_programState);
     if (!texFile.empty())
@@ -693,7 +692,7 @@ PUParticle3DBoxRender::PUParticle3DBoxRender()
 
 PUParticle3DBoxRender::~PUParticle3DBoxRender() {}
 
-PUParticle3DBoxRender* PUParticle3DBoxRender::create(const std::string& texFile)
+PUParticle3DBoxRender* PUParticle3DBoxRender::create(std::string_view texFile)
 {
     auto ret = new PUParticle3DBoxRender();
     if (ret->initRender(texFile))
@@ -883,7 +882,7 @@ PUParticle3DBoxRender* PUParticle3DBoxRender::clone()
     return render;
 }
 
-PUSphereRender* PUSphereRender::create(const std::string& texFile)
+PUSphereRender* PUSphereRender::create(std::string_view texFile)
 {
     auto ret = new PUSphereRender();
     if (ret->initRender(texFile))
diff --git a/extensions/Particle3D/PU/CCPURender.h b/extensions/Particle3D/PU/CCPURender.h
index e4076c656534..002f333daf68 100644
--- a/extensions/Particle3D/PU/CCPURender.h
+++ b/extensions/Particle3D/PU/CCPURender.h
@@ -47,8 +47,8 @@ class CC_EX_DLL PURender : public Particle3DRender
     virtual void unPrepare(){};
     virtual void updateRender(PUParticle3D* particle, float deltaTime, bool firstParticle);
 
-    const std::string& getRenderType() const { return _renderType; };
-    void setRenderType(const std::string& observerType) { _renderType = observerType; };
+    std::string_view getRenderType() const { return _renderType; };
+    void setRenderType(std::string_view observerType) { _renderType = observerType; };
 
     virtual PURender* clone() = 0;
     void copyAttributesTo(PURender* render);
@@ -70,7 +70,7 @@ class CC_EX_DLL PUParticle3DEntityRender : public PURender
     virtual ~PUParticle3DEntityRender();
 
 protected:
-    bool initRender(const std::string& texFile);
+    bool initRender(std::string_view texFile);
 
     void onBeforeDraw();
 
@@ -141,7 +141,7 @@ class CC_EX_DLL PUParticle3DQuadRender : public PUParticle3DEntityRender
         VERTEX
     };
 
-    static PUParticle3DQuadRender* create(const std::string& texFile = "");
+    static PUParticle3DQuadRender* create(std::string_view texFile = "");
 
     void setType(Type type);
     Type getType() const { return _type; }
@@ -191,7 +191,7 @@ class CC_EX_DLL PUParticle3DQuadRender : public PUParticle3DEntityRender
 class CC_EX_DLL PUParticle3DModelRender : public PURender
 {
 public:
-    static PUParticle3DModelRender* create(const std::string& modelFile, const std::string& texFile = "");
+    static PUParticle3DModelRender* create(std::string_view modelFile, std::string_view texFile = "");
 
     virtual void render(Renderer* renderer, const Mat4& transform, ParticleSystem3D* particleSystem) override;
 
@@ -212,7 +212,7 @@ class CC_EX_DLL PUParticle3DModelRender : public PURender
 class CC_EX_DLL PUParticle3DBoxRender : public PUParticle3DEntityRender
 {
 public:
-    static PUParticle3DBoxRender* create(const std::string& texFile = "");
+    static PUParticle3DBoxRender* create(std::string_view texFile = "");
 
     virtual void render(Renderer* renderer, const Mat4& transform, ParticleSystem3D* particleSystem) override;
 
@@ -228,7 +228,7 @@ class CC_EX_DLL PUParticle3DBoxRender : public PUParticle3DEntityRender
 class CC_EX_DLL PUSphereRender : public PUParticle3DEntityRender
 {
 public:
-    static PUSphereRender* create(const std::string& texFile = "");
+    static PUSphereRender* create(std::string_view texFile = "");
 
     virtual void render(Renderer* renderer, const Mat4& transform, ParticleSystem3D* particleSystem) override;
 
diff --git a/extensions/Particle3D/PU/CCPURibbonTrail.cpp b/extensions/Particle3D/PU/CCPURibbonTrail.cpp
index b5bc2fc10b8e..fe05c3897704 100644
--- a/extensions/Particle3D/PU/CCPURibbonTrail.cpp
+++ b/extensions/Particle3D/PU/CCPURibbonTrail.cpp
@@ -36,8 +36,8 @@
 
 NS_CC_BEGIN
 
-PURibbonTrail::PURibbonTrail(const std::string& name,
-                             const std::string& texFile,
+PURibbonTrail::PURibbonTrail(std::string_view name,
+                             std::string_view texFile,
                              size_t maxElements,
                              size_t numberOfChains,
                              bool useTextureCoords,
diff --git a/extensions/Particle3D/PU/CCPURibbonTrail.h b/extensions/Particle3D/PU/CCPURibbonTrail.h
index e57ccf58e606..e2fa1183e9f0 100644
--- a/extensions/Particle3D/PU/CCPURibbonTrail.h
+++ b/extensions/Particle3D/PU/CCPURibbonTrail.h
@@ -48,12 +48,12 @@ class PURibbonTrail : public PUBillboardChain
     @param useVertexColors If true, use vertex colors from the chain elements (must
         be true if you intend to use fading)
     */
-    PURibbonTrail(const std::string& name,
-                  const std::string& texFile = "",
-                  size_t maxElements         = 20,
-                  size_t numberOfChains      = 1,
-                  bool useTextureCoords      = true,
-                  bool useColours            = true);
+    PURibbonTrail(std::string_view name,
+                  std::string_view texFile = "",
+                  size_t maxElements       = 20,
+                  size_t numberOfChains    = 1,
+                  bool useTextureCoords    = true,
+                  bool useColours          = true);
     /// destructor
     virtual ~PURibbonTrail();
 
diff --git a/extensions/Particle3D/PU/CCPURibbonTrailRender.cpp b/extensions/Particle3D/PU/CCPURibbonTrailRender.cpp
index 8a924a9c4b14..207957111507 100644
--- a/extensions/Particle3D/PU/CCPURibbonTrailRender.cpp
+++ b/extensions/Particle3D/PU/CCPURibbonTrailRender.cpp
@@ -48,7 +48,7 @@ const bool PURibbonTrailRender::DEFAULT_RANDOM_INITIAL_COLOUR = true;
 const Vec4 PURibbonTrailRender::DEFAULT_INITIAL_COLOUR(1, 1, 1, 1);
 const Vec4 PURibbonTrailRender::DEFAULT_COLOUR_CHANGE(0.5, 0.5, 0.5, 0.5);
 
-PURibbonTrailRender* PURibbonTrailRender::create(const std::string& texFile)
+PURibbonTrailRender* PURibbonTrailRender::create(std::string_view texFile)
 {
     auto br = new PURibbonTrailRender();
     br->autorelease();
@@ -233,7 +233,7 @@ void PURibbonTrailRender::prepare()
         ss << this;
         std::string childNodeNodeName = "ParticleUniverse" + ss.str();
         //_childNode =
-        //mParentTechnique->getParentSystem()->getParentSceneNode()->createChildSceneNode(childNodeNodeName);
+        // mParentTechnique->getParentSystem()->getParentSceneNode()->createChildSceneNode(childNodeNodeName);
         //_childNode->setInheritOrientation(false);
         auto parent = _particleSystem->getParent();
         if (parent)
@@ -270,7 +270,7 @@ void PURibbonTrailRender::prepare()
             // sceneNodeName = "ParticleUniverse" + ss.str() + StringConverter::toString(i);
             // RibbonTrailRendererVisualData* visualData =
             //	PU_NEW_T(RibbonTrailRendererVisualData,
-            //MEMCATEGORY_SCENE_OBJECTS)(_childNode->createChildSceneNode(sceneNodeName), _trail);
+            // MEMCATEGORY_SCENE_OBJECTS)(_childNode->createChildSceneNode(sceneNodeName), _trail);
             // visualData->node->setInheritOrientation(false);
             auto node = Node::create();
             _childNode->addChild(node);
diff --git a/extensions/Particle3D/PU/CCPURibbonTrailRender.h b/extensions/Particle3D/PU/CCPURibbonTrailRender.h
index 54ac52539ba9..ec3bb3870571 100644
--- a/extensions/Particle3D/PU/CCPURibbonTrailRender.h
+++ b/extensions/Particle3D/PU/CCPURibbonTrailRender.h
@@ -83,7 +83,7 @@ class CC_EX_DLL PURibbonTrailRender : public PURender, public PUListener
     static const Vec4 DEFAULT_INITIAL_COLOUR;
     static const Vec4 DEFAULT_COLOUR_CHANGE;
 
-    static PURibbonTrailRender* create(const std::string& texFile = "");
+    static PURibbonTrailRender* create(std::string_view texFile = "");
 
     virtual void notifyRescaled(const Vec3& scale) override;
     virtual void prepare() override;
diff --git a/extensions/Particle3D/PU/CCPUScriptCompiler.cpp b/extensions/Particle3D/PU/CCPUScriptCompiler.cpp
index c4b55f4abbc2..026311ffc588 100644
--- a/extensions/Particle3D/PU/CCPUScriptCompiler.cpp
+++ b/extensions/Particle3D/PU/CCPUScriptCompiler.cpp
@@ -67,19 +67,20 @@ std::string PUObjectAbstractNode::getValue() const
     return cls;
 }
 
-void PUObjectAbstractNode::addVariable(const std::string& inName)
+void PUObjectAbstractNode::addVariable(std::string_view inName)
 {
     _env.emplace(inName, "");
 }
 
-void PUObjectAbstractNode::setVariable(const std::string& inName, const std::string& value)
+void PUObjectAbstractNode::setVariable(std::string_view inName, std::string_view value)
 {
-    _env[inName] = value;
+    // _env[inName] = value;
+    hlookup::set_item(_env, inName, value);
 }
 
-std::pair<bool, std::string> PUObjectAbstractNode::getVariable(const std::string& inName) const
+std::pair<bool, std::string> PUObjectAbstractNode::getVariable(std::string_view inName) const
 {
-    std::unordered_map<std::string, std::string>::const_iterator i = _env.find(inName);
+    auto i = _env.find(inName);
     if (i != _env.end())
         return std::make_pair(true, i->second);
 
@@ -94,7 +95,7 @@ std::pair<bool, std::string> PUObjectAbstractNode::getVariable(const std::string
     return std::make_pair(false, "");
 }
 
-const std::unordered_map<std::string, std::string>& PUObjectAbstractNode::getVariables() const
+const hlookup::string_map<std::string>& PUObjectAbstractNode::getVariables() const
 {
     return _env;
 }
@@ -187,15 +188,16 @@ PUScriptCompiler::~PUScriptCompiler()
     _compiledScripts.clear();
 }
 
-bool PUScriptCompiler::compile(const PUConcreteNodeList& nodes, const std::string& file)
+hlookup::string_map<PUAbstractNodeList>::iterator PUScriptCompiler::compile(const PUConcreteNodeList& nodes,
+                                                                            std::string_view file)
 {
     if (nodes.empty())
-        return false;
+        return _compiledScripts.end();
 
     PUAbstractNodeList aNodes;
     convertToAST(nodes, aNodes);
 
-    _compiledScripts[file] = aNodes;
+    return hlookup::set_item(_compiledScripts, file, aNodes);  // _compiledScripts[file] = aNodes;
     // for(PUAbstractNodeList::iterator i = aNodes.begin(); i != aNodes.end(); ++i)
     //{
     //     PUScriptTranslator *translator = PUTranslateManager::Instance()->getTranslator(*i);
@@ -212,10 +214,10 @@ bool PUScriptCompiler::compile(const PUConcreteNodeList& nodes, const std::strin
     // for (auto iter : aNodes){
     //     delete iter;
     // }
-    return true;
+    // return true;
 }
 
-const PUAbstractNodeList* PUScriptCompiler::compile(const std::string& file, bool& isFirstCompile)
+const PUAbstractNodeList* PUScriptCompiler::compile(std::string_view file, bool& isFirstCompile)
 {
     auto iter = _compiledScripts.find(file);
     if (iter != _compiledScripts.end())
@@ -231,7 +233,7 @@ const PUAbstractNodeList* PUScriptCompiler::compile(const std::string& file, boo
     PUConcreteNodeList creteNodeList;
     lexer.openLexer(data, file, tokenList);
     parser.parse(creteNodeList, tokenList);
-    bool state = compile(creteNodeList, file);
+    auto it = compile(creteNodeList, file);
 
     for (auto iter1 : creteNodeList)
     {
@@ -244,9 +246,9 @@ const PUAbstractNodeList* PUScriptCompiler::compile(const std::string& file, boo
     }
 
     isFirstCompile = true;
-    if (state)
+    if (it != _compiledScripts.end())
     {
-        return &_compiledScripts[file];
+        return &it->second;
     }
     return nullptr;
 }
diff --git a/extensions/Particle3D/PU/CCPUScriptCompiler.h b/extensions/Particle3D/PU/CCPUScriptCompiler.h
index 4834595f5948..e5bc4cc7b8fe 100644
--- a/extensions/Particle3D/PU/CCPUScriptCompiler.h
+++ b/extensions/Particle3D/PU/CCPUScriptCompiler.h
@@ -72,7 +72,7 @@ class CC_EX_DLL PUAbstractNode
 class CC_EX_DLL PUObjectAbstractNode : public PUAbstractNode
 {
 private:
-    std::unordered_map<std::string, std::string> _env;
+    hlookup::string_map<std::string> _env;
 
 public:
     std::string name, cls;
@@ -88,10 +88,10 @@ class CC_EX_DLL PUObjectAbstractNode : public PUAbstractNode
     PUAbstractNode* clone() const;
     std::string getValue() const;
 
-    void addVariable(const std::string& name);
-    void setVariable(const std::string& name, const std::string& value);
-    std::pair<bool, std::string> getVariable(const std::string& name) const;
-    const std::unordered_map<std::string, std::string>& getVariables() const;
+    void addVariable(std::string_view name);
+    void setVariable(std::string_view name, std::string_view value);
+    std::pair<bool, std::string> getVariable(std::string_view name) const;
+    const hlookup::string_map<std::string>& getVariables() const;
 };
 
 /** This abstract node represents a script property */
@@ -130,9 +130,9 @@ class CC_EX_DLL PUScriptCompiler
 {
 
 private:
-    bool compile(const PUConcreteNodeList& nodes, const std::string& file);
+    hlookup::string_map<PUAbstractNodeList>::iterator compile(const PUConcreteNodeList& nodes, std::string_view file);
     // is it excluded?//
-    bool isNameExcluded(const std::string& cls, PUAbstractNode* parent);
+    bool isNameExcluded(std::string_view cls, PUAbstractNode* parent);
 
 public:
     typedef std::unordered_map<std::string, unsigned int> IdMap;
@@ -141,7 +141,7 @@ class CC_EX_DLL PUScriptCompiler
 
     void setParticleSystem3D(PUParticleSystem3D* pu);
 
-    const PUAbstractNodeList* compile(const std::string& file, bool& isFirstCompile);
+    const PUAbstractNodeList* compile(std::string_view file, bool& isFirstCompile);
 
     void convertToAST(const PUConcreteNodeList& nodes, PUAbstractNodeList& aNodes);
 
@@ -155,7 +155,7 @@ class CC_EX_DLL PUScriptCompiler
     void visit(PUConcreteNode* node);
 
 private:
-    std::unordered_map<std::string, PUAbstractNodeList> _compiledScripts;
+    hlookup::string_map<PUAbstractNodeList> _compiledScripts;
     PUAbstractNode* _current;
     PUAbstractNodeList* _nodes;
     PUParticleSystem3D* _PUParticleSystem3D;
diff --git a/extensions/Particle3D/PU/CCPUScriptLexer.cpp b/extensions/Particle3D/PU/CCPUScriptLexer.cpp
index a8720fca0fac..75aca400f7ed 100644
--- a/extensions/Particle3D/PU/CCPUScriptLexer.cpp
+++ b/extensions/Particle3D/PU/CCPUScriptLexer.cpp
@@ -31,7 +31,7 @@ PUScriptLexer::PUScriptLexer() {}
 
 PUScriptLexer::~PUScriptLexer() {}
 
-void PUScriptLexer::openLexer(const std::string& str, const std::string& source, PUScriptTokenList& tokens)
+void PUScriptLexer::openLexer(std::string_view str, std::string_view source, PUScriptTokenList& tokens)
 {
     enum
     {
@@ -55,7 +55,7 @@ void PUScriptLexer::openLexer(const std::string& str, const std::string& source,
     //
     // Iterate over the input
 
-    std::string::const_iterator i = str.begin(), end = str.end();
+    std::string_view::const_iterator i = str.begin(), end = str.end();
     while (i != end)
     {
         lastc = c;
@@ -233,7 +233,7 @@ void PUScriptLexer::openLexer(const std::string& str, const std::string& source,
     }
 }
 
-void PUScriptLexer::setToken(const std::string& lexeme, int line, const std::string& source, PUScriptTokenList* tokens)
+void PUScriptLexer::setToken(std::string_view lexeme, int line, std::string_view source, PUScriptTokenList* tokens)
 {
 
     const char openBracket = '{', closeBracket = '}', colon = ':', quote = '\"', var = '$';
diff --git a/extensions/Particle3D/PU/CCPUScriptLexer.h b/extensions/Particle3D/PU/CCPUScriptLexer.h
index e5133cf323ef..907ef09a7bed 100644
--- a/extensions/Particle3D/PU/CCPUScriptLexer.h
+++ b/extensions/Particle3D/PU/CCPUScriptLexer.h
@@ -67,12 +67,12 @@ class PUScriptLexer
     PUScriptLexer();
     ~PUScriptLexer();
 
-    void openLexer(const std::string& str, const std::string& source, PUScriptTokenList& tokenList);
+    void openLexer(std::string_view str, std::string_view source, PUScriptTokenList& tokenList);
 
     /** Tokenizes the given input and returns the list of tokens found */
     // tokenize(const std::string &str, const std::string &source);
 private:  // Private utility operations
-    void setToken(const std::string& lexeme, int line, const std::string& source, PUScriptTokenList* tokens);
+    void setToken(std::string_view lexeme, int line, std::string_view source, PUScriptTokenList* tokens);
     bool isWhitespace(char c) const;
     bool isNewline(char c) const;
 };
diff --git a/extensions/Particle3D/PU/CCPUScriptTranslator.cpp b/extensions/Particle3D/PU/CCPUScriptTranslator.cpp
index a73539e24a7a..3eeb334127e0 100644
--- a/extensions/Particle3D/PU/CCPUScriptTranslator.cpp
+++ b/extensions/Particle3D/PU/CCPUScriptTranslator.cpp
@@ -517,7 +517,7 @@ bool PUScriptTranslator::getQuaternion(PUAbstractNodeList::const_iterator i,
 //-------------------------------------------------------------------------
 bool PUScriptTranslator::passValidateProperty(PUScriptCompiler* compiler,
                                               PUPropertyAbstractNode* prop,
-                                              const std::string& token2,
+                                              std::string_view token2,
                                               ValidationType validationType)
 {
     if (!passValidatePropertyNoValues(compiler, prop, token2))
@@ -594,7 +594,7 @@ bool PUScriptTranslator::passValidateProperty(PUScriptCompiler* compiler,
 //-------------------------------------------------------------------------
 bool PUScriptTranslator::passValidatePropertyNoValues(PUScriptCompiler* /*compiler*/,
                                                       PUPropertyAbstractNode* prop,
-                                                      const std::string& /*token2*/)
+                                                      std::string_view /*token2*/)
 {
     if (prop->values.empty())
     {
@@ -607,7 +607,7 @@ bool PUScriptTranslator::passValidatePropertyNoValues(PUScriptCompiler* /*compil
 //-------------------------------------------------------------------------
 bool PUScriptTranslator::passValidatePropertyNumberOfValues(PUScriptCompiler* /*compiler*/,
                                                             PUPropertyAbstractNode* prop,
-                                                            const std::string& /*token2*/,
+                                                            std::string_view /*token2*/,
                                                             unsigned short numberOfValues)
 {
     if (prop->values.size() > numberOfValues)
@@ -619,7 +619,7 @@ bool PUScriptTranslator::passValidatePropertyNumberOfValues(PUScriptCompiler* /*
 //-------------------------------------------------------------------------
 bool PUScriptTranslator::passValidatePropertyNumberOfValuesRange(PUScriptCompiler* /*compiler*/,
                                                                  PUPropertyAbstractNode* prop,
-                                                                 const std::string& /*token2*/,
+                                                                 std::string_view /*token2*/,
                                                                  unsigned short minNumberOfValues,
                                                                  unsigned short maxNumberOfValues)
 {
diff --git a/extensions/Particle3D/PU/CCPUScriptTranslator.h b/extensions/Particle3D/PU/CCPUScriptTranslator.h
index 0e9af6d757f6..623bec8d13d8 100644
--- a/extensions/Particle3D/PU/CCPUScriptTranslator.h
+++ b/extensions/Particle3D/PU/CCPUScriptTranslator.h
@@ -679,27 +679,25 @@ class PUScriptTranslator
      */
     bool passValidateProperty(PUScriptCompiler* compiler,
                               PUPropertyAbstractNode* prop,
-                              const std::string& token,
+                              std::string_view token,
                               ValidationType validationType);
 
     /** Validate whether a property has values.
      */
-    bool passValidatePropertyNoValues(PUScriptCompiler* compiler,
-                                      PUPropertyAbstractNode* prop,
-                                      const std::string& token);
+    bool passValidatePropertyNoValues(PUScriptCompiler* compiler, PUPropertyAbstractNode* prop, std::string_view token);
 
     /** Validate whether the number of values is correct.
      */
     bool passValidatePropertyNumberOfValues(PUScriptCompiler* compiler,
                                             PUPropertyAbstractNode* prop,
-                                            const std::string& token,
+                                            std::string_view token,
                                             unsigned short numberOfValues);
 
     /** Validate whether the number of values is between a range.
      */
     bool passValidatePropertyNumberOfValuesRange(PUScriptCompiler* compiler,
                                                  PUPropertyAbstractNode* prop,
-                                                 const std::string& token,
+                                                 std::string_view token,
                                                  unsigned short minNumberOfValues,
                                                  unsigned short maxNumberOfValues);
 
diff --git a/extensions/Particle3D/PU/CCPUSlaveEmitter.cpp b/extensions/Particle3D/PU/CCPUSlaveEmitter.cpp
index 904cab168e9e..e5880b2f9c8d 100644
--- a/extensions/Particle3D/PU/CCPUSlaveEmitter.cpp
+++ b/extensions/Particle3D/PU/CCPUSlaveEmitter.cpp
@@ -39,22 +39,22 @@ PUSlaveEmitter::PUSlaveEmitter()
     , _masterEmitterNameSet(false)
 {}
 //-----------------------------------------------------------------------
-const std::string& PUSlaveEmitter::getMasterTechniqueName() const
+std::string_view PUSlaveEmitter::getMasterTechniqueName() const
 {
     return _masterTechniqueName;
 }
 //-----------------------------------------------------------------------
-void PUSlaveEmitter::setMasterTechniqueName(const std::string& masterTechniqueName)
+void PUSlaveEmitter::setMasterTechniqueName(std::string_view masterTechniqueName)
 {
     _masterTechniqueName = masterTechniqueName;
 }
 //-----------------------------------------------------------------------
-const std::string& PUSlaveEmitter::getMasterEmitterName() const
+std::string_view PUSlaveEmitter::getMasterEmitterName() const
 {
     return _masterEmitterName;
 }
 //-----------------------------------------------------------------------
-void PUSlaveEmitter::setMasterEmitterName(const std::string& masterEmitterName)
+void PUSlaveEmitter::setMasterEmitterName(std::string_view masterEmitterName)
 {
     _masterEmitterName    = masterEmitterName;
     _masterEmitterNameSet = true;
diff --git a/extensions/Particle3D/PU/CCPUSlaveEmitter.h b/extensions/Particle3D/PU/CCPUSlaveEmitter.h
index 32ab26c3c081..c260cf59e479 100644
--- a/extensions/Particle3D/PU/CCPUSlaveEmitter.h
+++ b/extensions/Particle3D/PU/CCPUSlaveEmitter.h
@@ -39,15 +39,15 @@ class CC_EX_DLL PUSlaveEmitter : public PUEmitter, public PUListener
 
     /**
      */
-    const std::string& getMasterTechniqueName() const;
+    std::string_view getMasterTechniqueName() const;
 
     /**
      */
-    void setMasterTechniqueName(const std::string& masterTechniqueName);
+    void setMasterTechniqueName(std::string_view masterTechniqueName);
 
     /**
      */
-    const std::string& getMasterEmitterName() const;
+    std::string_view getMasterEmitterName() const;
 
     /** See ParticleEmitter.
      */
@@ -79,7 +79,7 @@ class CC_EX_DLL PUSlaveEmitter : public PUEmitter, public PUListener
 
     /**
      */
-    void setMasterEmitterName(const std::string& masterEmitterName);
+    void setMasterEmitterName(std::string_view masterEmitterName);
 
     virtual PUSlaveEmitter* clone() override;
     virtual void copyAttributesTo(PUEmitter* emitter) override;
diff --git a/extensions/Particle3D/PU/CCPUVertexEmitter.cpp b/extensions/Particle3D/PU/CCPUVertexEmitter.cpp
index c7fcbb0276d3..97f9fc2a2226 100644
--- a/extensions/Particle3D/PU/CCPUVertexEmitter.cpp
+++ b/extensions/Particle3D/PU/CCPUVertexEmitter.cpp
@@ -84,12 +84,12 @@ NS_CC_BEGIN
 //	mStep = step;
 // }
 ////-----------------------------------------------------------------------
-// const std::string& Particle3DVertexEmitter::getMeshName() const
+// std::string_view Particle3DVertexEmitter::getMeshName() const
 //{
 //	return mMeshName;
 // }
 ////-----------------------------------------------------------------------
-// void Particle3DVertexEmitter::setMeshName(const std::string& meshName)
+// void Particle3DVertexEmitter::setMeshName(std::string_view meshName)
 //{
 //	_setDefaults(); // Triggers loading the new mesh
 //	mMeshName = meshName;
@@ -184,7 +184,7 @@ NS_CC_BEGIN
 // void Particle3DVertexEmitter::_loadMesh ()
 //{
 //	Ogre::MeshPtr mesh = Ogre::MeshManager::getSingleton().load(mMeshName,
-//Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); 	mMesh = mesh.getPointer(); 	mMeshProcessed = false;
+// Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); 	mMesh = mesh.getPointer(); 	mMeshProcessed = false;
 //
 //	if (mMesh->getNumSubMeshes() > 0)
 //	{
diff --git a/extensions/Particle3D/PU/CCPUVertexEmitter.h b/extensions/Particle3D/PU/CCPUVertexEmitter.h
index 7db52020dd36..b808d43acd36 100644
--- a/extensions/Particle3D/PU/CCPUVertexEmitter.h
+++ b/extensions/Particle3D/PU/CCPUVertexEmitter.h
@@ -148,7 +148,7 @@ NS_CC_BEGIN
 //
 //	/**
 //	*/
-//	const std::string& getMeshName() const;
+//	std::string_view getMeshName() const;
 //
 //	/**
 //	*/
@@ -156,7 +156,7 @@ NS_CC_BEGIN
 //
 //	/**
 //	*/
-//	void setMeshName(const std::string& meshName);
+//	void setMeshName(std::string_view meshName);
 //
 //	/**
 //	*/
diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp
index 2566e7b0c248..8b9b571df10e 100644
--- a/extensions/assets-manager/AssetsManager.cpp
+++ b/extensions/assets-manager/AssetsManager.cpp
@@ -182,7 +182,7 @@ AssetsManager::AssetsManager(const char* packageUrl /* =nullptr */,
     checkStoragePath();
     // convert downloader error code to AssetsManager::ErrorCode
     _downloader->onTaskError = [this](const DownloadTask& /*task*/, int errorCode, int /*errorCodeInternal*/,
-                                      const std::string& /*errorStr*/) {
+                                      std::string_view /*errorStr*/) {
         _isDownloading = false;
 
         if (nullptr == _delegate)
@@ -278,10 +278,10 @@ void AssetsManager::checkStoragePath()
 }
 
 // Multiple key names
-static std::string keyWithHash(const char* prefix, const std::string& url)
+static std::string keyWithHash(const char* prefix, std::string_view url)
 {
     char buf[256];
-    sprintf(buf, "%s%zd", prefix, std::hash<std::string>()(url));
+    sprintf(buf, "%s%zd", prefix, std::hash<std::string_view>()(url));
     return buf;
 }
 
@@ -565,9 +565,9 @@ void AssetsManager::setVersionFileUrl(const char* versionFileUrl)
     _versionFileUrl = versionFileUrl;
 }
 
-string AssetsManager::getVersion()
+std::string_view AssetsManager::getVersion()
 {
-    return UserDefault::getInstance()->getStringForKey(keyOfVersion().c_str());
+    return UserDefault::getInstance()->getStringForKey(keyOfVersion().data());
 }
 
 void AssetsManager::deleteVersion()
diff --git a/extensions/assets-manager/AssetsManager.h b/extensions/assets-manager/AssetsManager.h
index 34a1fb8125a8..b6587157a1ef 100644
--- a/extensions/assets-manager/AssetsManager.h
+++ b/extensions/assets-manager/AssetsManager.h
@@ -137,7 +137,7 @@ class CC_EX_DLL AssetsManager : public Node
 
     /* @brief Gets current version code.
      */
-    std::string getVersion();
+    std::string_view getVersion();
 
     /* @brief Deletes recorded version code.
      */
diff --git a/extensions/assets-manager/AssetsManagerEx.cpp b/extensions/assets-manager/AssetsManagerEx.cpp
index 10f555c1ce98..8636f4523e11 100644
--- a/extensions/assets-manager/AssetsManagerEx.cpp
+++ b/extensions/assets-manager/AssetsManagerEx.cpp
@@ -168,8 +168,7 @@ int AssetManagerEx_error_file_func(voidpf opaque, voidpf stream)
 
 // Implementation of AssetsManagerEx
 
-AssetsManagerEx::AssetsManagerEx(const std::string& manifestUrl, const std::string& storagePath)
-    : _manifestUrl(manifestUrl)
+AssetsManagerEx::AssetsManagerEx(std::string_view manifestUrl, std::string_view storagePath) : _manifestUrl(manifestUrl)
 {
     // Init variables
     _eventDispatcher    = Director::getInstance()->getEventDispatcher();
@@ -208,14 +207,14 @@ AssetsManagerEx::~AssetsManagerEx()
     CC_SAFE_RELEASE(_remoteManifest);
 }
 
-AssetsManagerEx* AssetsManagerEx::create(const std::string& manifestUrl, const std::string& storagePath)
+AssetsManagerEx* AssetsManagerEx::create(std::string_view manifestUrl, std::string_view storagePath)
 {
     AssetsManagerEx* ret = new AssetsManagerEx(manifestUrl, storagePath);
     ret->autorelease();
     return ret;
 }
 
-void AssetsManagerEx::initManifests(const std::string& manifestUrl)
+void AssetsManagerEx::initManifests(std::string_view manifestUrl)
 {
     _inited = true;
     // Init and load local manifest
@@ -260,7 +259,7 @@ void AssetsManagerEx::prepareLocalManifest()
     _localManifest->prependSearchPaths();
 }
 
-void AssetsManagerEx::loadLocalManifest(const std::string& /*manifestUrl*/)
+void AssetsManagerEx::loadLocalManifest(std::string_view /*manifestUrl*/)
 {
     Manifest* cachedManifest = nullptr;
     // Find the cached manifest file
@@ -329,7 +328,7 @@ void AssetsManagerEx::loadLocalManifest(const std::string& /*manifestUrl*/)
     }
 }
 
-std::string AssetsManagerEx::basename(const std::string& path) const
+std::string_view AssetsManagerEx::basename(std::string_view path) const
 {
     size_t found = path.find_last_of("/\\");
 
@@ -343,7 +342,7 @@ std::string AssetsManagerEx::basename(const std::string& path) const
     }
 }
 
-std::string AssetsManagerEx::get(const std::string& key) const
+std::string AssetsManagerEx::get(std::string_view key) const
 {
     auto it = _assets->find(key);
     if (it != _assets->cend())
@@ -364,12 +363,12 @@ const Manifest* AssetsManagerEx::getRemoteManifest() const
     return _remoteManifest;
 }
 
-const std::string& AssetsManagerEx::getStoragePath() const
+std::string_view AssetsManagerEx::getStoragePath() const
 {
     return _storagePath;
 }
 
-void AssetsManagerEx::setStoragePath(const std::string& storagePath)
+void AssetsManagerEx::setStoragePath(std::string_view storagePath)
 {
     _storagePath = storagePath;
     adjustPath(_storagePath);
@@ -389,16 +388,16 @@ void AssetsManagerEx::adjustPath(std::string& path)
     }
 }
 
-bool AssetsManagerEx::decompress(const std::string& zip)
+bool AssetsManagerEx::decompress(std::string_view zip)
 {
     // Find root path for zip file
     size_t pos = zip.find_last_of("/\\");
     if (pos == std::string::npos)
     {
-        CCLOG("AssetsManagerEx : no root path specified for zip file %s\n", zip.c_str());
+        CCLOG("AssetsManagerEx : no root path specified for zip file %s\n", zip.data());
         return false;
     }
-    const std::string rootPath = zip.substr(0, pos + 1);
+    const std::string_view rootPath = zip.substr(0, pos + 1);
 
     zlib_filefunc_def_s zipFunctionOverrides;
     fillZipFunctionOverrides(zipFunctionOverrides);
@@ -409,10 +408,10 @@ bool AssetsManagerEx::decompress(const std::string& zip)
     zipFunctionOverrides.opaque = &zipFileInfo;
 
     // Open the zip file
-    unzFile zipfile = unzOpen2(zip.c_str(), &zipFunctionOverrides);
+    unzFile zipfile = unzOpen2(zip.data(), &zipFunctionOverrides);
     if (!zipfile)
     {
-        CCLOG("AssetsManagerEx : can not open downloaded zip file %s\n", zip.c_str());
+        CCLOG("AssetsManagerEx : can not open downloaded zip file %s\n", zip.data());
         return false;
     }
 
@@ -420,7 +419,7 @@ bool AssetsManagerEx::decompress(const std::string& zip)
     unz_global_info global_info;
     if (unzGetGlobalInfo(zipfile, &global_info) != UNZ_OK)
     {
-        CCLOG("AssetsManagerEx : can not read file global info of %s\n", zip.c_str());
+        CCLOG("AssetsManagerEx : can not read file global info of %s\n", zip.data());
         unzClose(zipfile);
         return false;
     }
@@ -440,7 +439,8 @@ bool AssetsManagerEx::decompress(const std::string& zip)
             unzClose(zipfile);
             return false;
         }
-        const std::string fullPath = rootPath + fileName;
+        std::string fullPath{rootPath};
+        fullPath += fileName;
 
         // Check if this entry is a directory or a file.
         const size_t filenameLength = strlen(fileName);
@@ -459,7 +459,7 @@ bool AssetsManagerEx::decompress(const std::string& zip)
         else
         {
             // Create all directories in advance to avoid issue
-            std::string dir = basename(fullPath);
+            std::string_view dir = basename(fullPath);
             if (!_fileUtils->isDirectoryExist(dir))
             {
                 if (!_fileUtils->createDirectory(dir))
@@ -531,7 +531,7 @@ bool AssetsManagerEx::decompress(const std::string& zip)
     return true;
 }
 
-void AssetsManagerEx::decompressDownloadedZip(const std::string& customId, const std::string& storagePath)
+void AssetsManagerEx::decompressDownloadedZip(std::string_view customId, std::string_view storagePath)
 {
     struct AsyncData
     {
@@ -573,8 +573,8 @@ void AssetsManagerEx::decompressDownloadedZip(const std::string& customId, const
 }
 
 void AssetsManagerEx::dispatchUpdateEvent(EventAssetsManagerEx::EventCode code,
-                                          const std::string& assetId /* = ""*/,
-                                          const std::string& message /* = ""*/,
+                                          std::string_view assetId /* = ""*/,
+                                          std::string_view message /* = ""*/,
                                           int curle_code /* = CURLE_OK*/,
                                           int curlm_code /* = CURLM_OK*/)
 {
@@ -619,7 +619,7 @@ void AssetsManagerEx::downloadVersion()
     if (_updateState > State::PREDOWNLOAD_VERSION)
         return;
 
-    std::string versionUrl = _localManifest->getVersionFileUrl();
+    std::string_view versionUrl = _localManifest->getVersionFileUrl();
 
     if (!versionUrl.empty())
     {
@@ -786,7 +786,7 @@ void AssetsManagerEx::startUpdate()
         _tempManifest = _remoteManifest;
 
         // Check difference between local manifest and remote manifest
-        std::unordered_map<std::string, Manifest::AssetDiff> diff_map = _localManifest->genDiff(_remoteManifest);
+        hlookup::string_map<Manifest::AssetDiff> diff_map = _localManifest->genDiff(_remoteManifest);
         if (diff_map.empty())
         {
             updateSucceed();
@@ -794,7 +794,7 @@ void AssetsManagerEx::startUpdate()
         else
         {
             // Generate download units for all assets that need to be updated or added
-            std::string packageUrl = _remoteManifest->getPackageUrl();
+            std::string_view packageUrl = _remoteManifest->getPackageUrl();
             // Save current download manifest information for resuming
             _tempManifest->saveToFile(_tempManifestPath);
             // Preprocessing local files in previous version and creating download folders
@@ -803,10 +803,11 @@ void AssetsManagerEx::startUpdate()
                 Manifest::AssetDiff diff = it->second;
                 if (diff.type != Manifest::DiffType::DELETED)
                 {
-                    std::string path = diff.asset.path;
+                    const std::string& path = diff.asset.path;
                     DownloadUnit unit;
-                    unit.customId    = it->first;
-                    unit.srcUrl      = packageUrl + path;
+                    unit.customId = it->first;
+                    unit.srcUrl   = packageUrl;
+                    unit.srcUrl += path;
                     unit.storagePath = _tempStoragePath + path;
                     unit.size        = diff.asset.size;
                     _downloadUnits.emplace(unit.customId, unit);
@@ -1034,8 +1035,8 @@ void AssetsManagerEx::downloadFailedAssets()
     updateAssets(_failedUnits);
 }
 
-void AssetsManagerEx::fileError(const std::string& identifier,
-                                const std::string& errorStr,
+void AssetsManagerEx::fileError(std::string_view identifier,
+                                std::string_view errorStr,
                                 int errorCode,
                                 int errorCodeInternal)
 {
@@ -1056,7 +1057,7 @@ void AssetsManagerEx::fileError(const std::string& identifier,
     queueDowload();
 }
 
-void AssetsManagerEx::fileSuccess(const std::string& customId, const std::string& storagePath)
+void AssetsManagerEx::fileSuccess(std::string_view customId, std::string_view storagePath)
 {
     // Set download state to SUCCESSED
     _tempManifest->setAssetDownloadState(customId, Manifest::DownloadState::SUCCESSED);
@@ -1089,7 +1090,7 @@ void AssetsManagerEx::fileSuccess(const std::string& customId, const std::string
 void AssetsManagerEx::onError(const network::DownloadTask& task,
                               int errorCode,
                               int errorCodeInternal,
-                              const std::string& errorStr)
+                              std::string_view errorStr)
 {
     // Skip version error occurred
     if (task.identifier == VERSION_ID)
@@ -1110,10 +1111,7 @@ void AssetsManagerEx::onError(const network::DownloadTask& task,
     }
 }
 
-void AssetsManagerEx::onProgress(double total,
-                                 double downloaded,
-                                 const std::string& /*url*/,
-                                 const std::string& customId)
+void AssetsManagerEx::onProgress(double total, double downloaded, std::string_view /*url*/, std::string_view customId)
 {
     if (customId == VERSION_ID || customId == MANIFEST_ID)
     {
@@ -1170,9 +1168,7 @@ void AssetsManagerEx::onProgress(double total,
     }
 }
 
-void AssetsManagerEx::onSuccess(const std::string& /*srcUrl*/,
-                                const std::string& storagePath,
-                                const std::string& customId)
+void AssetsManagerEx::onSuccess(std::string_view /*srcUrl*/, std::string_view storagePath, std::string_view customId)
 {
     if (customId == VERSION_ID)
     {
diff --git a/extensions/assets-manager/AssetsManagerEx.h b/extensions/assets-manager/AssetsManagerEx.h
index 7180323d2d65..7a77db5b44c8 100644
--- a/extensions/assets-manager/AssetsManagerEx.h
+++ b/extensions/assets-manager/AssetsManagerEx.h
@@ -77,7 +77,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
      @warning   The cached manifest in your storage path have higher priority and will be searched first,
                 only if it doesn't exist, AssetsManagerEx will use the given manifestUrl.
      */
-    static AssetsManagerEx* create(const std::string& manifestUrl, const std::string& storagePath);
+    static AssetsManagerEx* create(std::string_view manifestUrl, std::string_view storagePath);
 
     /** @brief  Check out if there is a new version of manifest.
      *          You may use this method before updating, then let user determine whether
@@ -99,7 +99,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
 
     /** @brief Gets storage path.
      */
-    const std::string& getStoragePath() const;
+    std::string_view getStoragePath() const;
 
     /** @brief Function for retrieving the local manifest object
      */
@@ -120,8 +120,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     /** @brief Set the handle function for comparing manifests versions
      * @param handle    The compare function
      */
-    void setVersionCompareHandle(
-        const std::function<int(const std::string& versionA, const std::string& versionB)>& handle)
+    void setVersionCompareHandle(const std::function<int(std::string_view versionA, std::string_view versionB)>& handle)
     {
         _versionCompareHandle = handle;
     };
@@ -130,37 +129,37 @@ class CC_EX_DLL AssetsManagerEx : public Ref
      * verification
      * @param callback  The verify callback function
      */
-    void setVerifyCallback(const std::function<bool(const std::string& path, Manifest::Asset asset)>& callback)
+    void setVerifyCallback(const std::function<bool(std::string_view path, Manifest::Asset asset)>& callback)
     {
         _verifyCallback = callback;
     };
 
     CC_CONSTRUCTOR_ACCESS :
 
-        AssetsManagerEx(const std::string& manifestUrl, const std::string& storagePath);
+        AssetsManagerEx(std::string_view manifestUrl, std::string_view storagePath);
 
     virtual ~AssetsManagerEx();
 
 protected:
-    std::string basename(const std::string& path) const;
+    std::string_view basename(std::string_view path) const;
 
-    std::string get(const std::string& key) const;
+    std::string get(std::string_view key) const;
 
-    void initManifests(const std::string& manifestUrl);
+    void initManifests(std::string_view manifestUrl);
 
-    void loadLocalManifest(const std::string& manifestUrl);
+    void loadLocalManifest(std::string_view manifestUrl);
 
     void prepareLocalManifest();
 
-    void setStoragePath(const std::string& storagePath);
+    void setStoragePath(std::string_view storagePath);
 
     void adjustPath(std::string& path);
 
     void dispatchUpdateEvent(EventAssetsManagerEx::EventCode code,
-                             const std::string& message = "",
-                             const std::string& assetId = "",
-                             int curle_code             = 0,
-                             int curlm_code             = 0);
+                             std::string_view message = "",
+                             std::string_view assetId = "",
+                             int curle_code           = 0,
+                             int curlm_code           = 0);
 
     void downloadVersion();
     void parseVersion();
@@ -168,8 +167,8 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     void parseManifest();
     void startUpdate();
     void updateSucceed();
-    bool decompress(const std::string& filename);
-    void decompressDownloadedZip(const std::string& customId, const std::string& storagePath);
+    bool decompress(std::string_view filename);
+    void decompressDownloadedZip(std::string_view customId, std::string_view storagePath);
 
     /** @brief Update a list of assets under the current AssetsManagerEx context
      */
@@ -187,12 +186,12 @@ class CC_EX_DLL AssetsManagerEx : public Ref
      */
     void queueDowload();
 
-    void fileError(const std::string& identifier,
-                   const std::string& errorStr,
+    void fileError(std::string_view identifier,
+                   std::string_view errorStr,
                    int errorCode         = 0,
                    int errorCodeInternal = 0);
 
-    void fileSuccess(const std::string& customId, const std::string& storagePath);
+    void fileSuccess(std::string_view customId, std::string_view storagePath);
 
     /** @brief  Call back function for error handling,
      the error will then be reported to user's listener registed in addUpdateEventListener
@@ -204,7 +203,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     virtual void onError(const network::DownloadTask& task,
                          int errorCode,
                          int errorCodeInternal,
-                         const std::string& errorStr);
+                         std::string_view errorStr);
 
     /** @brief  Call back function for recording downloading percent of the current asset,
      the progression will then be reported to user's listener registed in addUpdateProgressEventListener
@@ -216,7 +215,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
      * @js NA
      * @lua NA
      */
-    virtual void onProgress(double total, double downloaded, const std::string& url, const std::string& customId);
+    virtual void onProgress(double total, double downloaded, std::string_view url, std::string_view customId);
 
     /** @brief  Call back function for success of the current asset
      the success event will then be send to user's listener registed in addUpdateEventListener
@@ -226,7 +225,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
      * @js NA
      * @lua NA
      */
-    virtual void onSuccess(const std::string& srcUrl, const std::string& storagePath, const std::string& customId);
+    virtual void onSuccess(std::string_view srcUrl, std::string_view storagePath, std::string_view customId);
 
 private:
     void batchDownload();
@@ -250,7 +249,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     std::shared_ptr<network::Downloader> _downloader;
 
     //! The reference to the local assets
-    const std::unordered_map<std::string, Manifest::Asset>* _assets = nullptr;
+    const hlookup::string_map<Manifest::Asset>* _assets = nullptr;
 
     //! The path to store successfully downloaded version.
     std::string _storagePath;
@@ -320,7 +319,7 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     double _totalSize;
 
     //! Downloaded size for each file
-    std::unordered_map<std::string, double> _downloadedSize;
+    hlookup::string_map<double> _downloadedSize;
 
     //! Total number of assets to download
     int _totalToDownload = 0;
@@ -330,10 +329,10 @@ class CC_EX_DLL AssetsManagerEx : public Ref
     float _nextSavePoint = 0.f;
 
     //! Handle function to compare versions between different manifests
-    std::function<int(const std::string& versionA, const std::string& versionB)> _versionCompareHandle = nullptr;
+    std::function<int(std::string_view versionA, std::string_view versionB)> _versionCompareHandle = nullptr;
 
     //! Callback function to verify the downloaded assets
-    std::function<bool(const std::string& path, Manifest::Asset asset)> _verifyCallback = nullptr;
+    std::function<bool(std::string_view path, Manifest::Asset asset)> _verifyCallback = nullptr;
 
     //! Marker for whether the assets manager is inited
     bool _inited = false;
diff --git a/extensions/assets-manager/CCEventAssetsManagerEx.cpp b/extensions/assets-manager/CCEventAssetsManagerEx.cpp
index 183daae66016..e14a7eed3025 100644
--- a/extensions/assets-manager/CCEventAssetsManagerEx.cpp
+++ b/extensions/assets-manager/CCEventAssetsManagerEx.cpp
@@ -30,13 +30,13 @@
 
 NS_CC_EXT_BEGIN
 
-EventAssetsManagerEx::EventAssetsManagerEx(const std::string& eventName,
+EventAssetsManagerEx::EventAssetsManagerEx(std::string_view eventName,
                                            cocos2d::extension::AssetsManagerEx* manager,
                                            const EventCode& code,
                                            float percent /* = 0 */,
                                            float percentByFile /* = 0*/,
-                                           const std::string& assetId /* = "" */,
-                                           const std::string& message /* = "" */,
+                                           std::string_view assetId /* = "" */,
+                                           std::string_view message /* = "" */,
                                            int curle_code /* = CURLE_OK*/,
                                            int curlm_code /* = CURLM_OK*/)
     : EventCustom(eventName)
diff --git a/extensions/assets-manager/CCEventAssetsManagerEx.h b/extensions/assets-manager/CCEventAssetsManagerEx.h
index 0d261ac5b958..11a6ad1220f3 100644
--- a/extensions/assets-manager/CCEventAssetsManagerEx.h
+++ b/extensions/assets-manager/CCEventAssetsManagerEx.h
@@ -74,15 +74,15 @@ class CC_EX_DLL EventAssetsManagerEx : public cocos2d::EventCustom
 
     CC_CONSTRUCTOR_ACCESS :
         /** Constructor */
-        EventAssetsManagerEx(const std::string& eventName,
+        EventAssetsManagerEx(std::string_view eventName,
                              cocos2d::extension::AssetsManagerEx* manager,
                              const EventCode& code,
-                             float percent              = 0,
-                             float percentByFile        = 0,
-                             const std::string& assetId = "",
-                             const std::string& message = "",
-                             int curle_code             = 0,
-                             int curlm_code             = 0);
+                             float percent            = 0,
+                             float percentByFile      = 0,
+                             std::string_view assetId = "",
+                             std::string_view message = "",
+                             int curle_code           = 0,
+                             int curlm_code           = 0);
 
 private:
     EventCode _code;
diff --git a/extensions/assets-manager/Manifest.cpp b/extensions/assets-manager/Manifest.cpp
index 43dc418e19e7..98af1eb1e191 100644
--- a/extensions/assets-manager/Manifest.cpp
+++ b/extensions/assets-manager/Manifest.cpp
@@ -50,16 +50,16 @@
 
 NS_CC_EXT_BEGIN
 
-static int cmpVersion(const std::string& v1, const std::string& v2)
+static int cmpVersion(std::string_view v1, std::string_view v2)
 {
     int i;
     int oct_v1[4] = {0}, oct_v2[4] = {0};
-    int filled1 = std::sscanf(v1.c_str(), "%d.%d.%d.%d", &oct_v1[0], &oct_v1[1], &oct_v1[2], &oct_v1[3]);
-    int filled2 = std::sscanf(v2.c_str(), "%d.%d.%d.%d", &oct_v2[0], &oct_v2[1], &oct_v2[2], &oct_v2[3]);
+    int filled1 = std::sscanf(v1.data(), "%d.%d.%d.%d", &oct_v1[0], &oct_v1[1], &oct_v1[2], &oct_v1[3]);
+    int filled2 = std::sscanf(v2.data(), "%d.%d.%d.%d", &oct_v2[0], &oct_v2[1], &oct_v2[2], &oct_v2[3]);
 
     if (filled1 == 0 || filled2 == 0)
     {
-        return strcmp(v1.c_str(), v2.c_str());
+        return v1 != v2;  // strcmp(v1.data(), v2.data());
     }
     for (i = 0; i < 4; i++)
     {
@@ -71,7 +71,7 @@ static int cmpVersion(const std::string& v1, const std::string& v2)
     return 0;
 }
 
-Manifest::Manifest(const std::string& manifestUrl /* = ""*/)
+Manifest::Manifest(std::string_view manifestUrl /* = ""*/)
     : _versionLoaded(false)
     , _loaded(false)
     , _manifestRoot("")
@@ -86,7 +86,7 @@ Manifest::Manifest(const std::string& manifestUrl /* = ""*/)
         parse(manifestUrl);
 }
 
-void Manifest::loadJson(const std::string& url)
+void Manifest::loadJson(std::string_view url)
 {
     clear();
     std::string content;
@@ -97,7 +97,7 @@ void Manifest::loadJson(const std::string& url)
 
         if (content.empty())
         {
-            CCLOG("Fail to retrieve local file content: %s\n", url.c_str());
+            CCLOG("Fail to retrieve local file content: %s\n", url.data());
         }
         else
         {
@@ -116,7 +116,7 @@ void Manifest::loadJson(const std::string& url)
     }
 }
 
-void Manifest::parseVersion(const std::string& versionUrl)
+void Manifest::parseVersion(std::string_view versionUrl)
 {
     loadJson(versionUrl);
 
@@ -126,7 +126,7 @@ void Manifest::parseVersion(const std::string& versionUrl)
     }
 }
 
-void Manifest::parse(const std::string& manifestUrl)
+void Manifest::parse(std::string_view manifestUrl)
 {
     loadJson(manifestUrl);
 
@@ -161,8 +161,8 @@ bool Manifest::versionEquals(const Manifest* b) const
     // Check group versions
     else
     {
-        std::vector<std::string> bGroups                       = b->getGroups();
-        std::unordered_map<std::string, std::string> bGroupVer = b->getGroupVerions();
+        std::vector<std::string> bGroups = b->getGroups();
+        auto& bGroupVer                  = b->getGroupVerions();
         // Check group size
         if (bGroups.size() != _groups.size())
             return false;
@@ -184,10 +184,10 @@ bool Manifest::versionEquals(const Manifest* b) const
 
 bool Manifest::versionGreater(
     const Manifest* b,
-    const std::function<int(const std::string& versionA, const std::string& versionB)>& handle) const
+    const std::function<int(std::string_view versionA, std::string_view versionB)>& handle) const
 {
-    std::string localVersion    = getVersion();
-    const std::string& bVersion = b->getVersion();
+    std::string_view localVersion = getVersion();
+    std::string_view bVersion     = b->getVersion();
     bool greater;
     if (handle)
     {
@@ -200,16 +200,16 @@ bool Manifest::versionGreater(
     return greater;
 }
 
-std::unordered_map<std::string, Manifest::AssetDiff> Manifest::genDiff(const Manifest* b) const
+hlookup::string_map<Manifest::AssetDiff> Manifest::genDiff(const Manifest* b) const
 {
-    std::unordered_map<std::string, AssetDiff> diff_map;
-    const std::unordered_map<std::string, Asset>& bAssets = b->getAssets();
+    hlookup::string_map<AssetDiff> diff_map;
+    auto& bAssets = b->getAssets();
 
     std::string key;
     Asset valueA;
     Asset valueB;
 
-    std::unordered_map<std::string, Asset>::const_iterator valueIt, it;
+    hlookup::string_map<Asset>::const_iterator valueIt, it;
     for (it = _assets.begin(); it != _assets.end(); ++it)
     {
         key    = it->first;
@@ -317,22 +317,22 @@ void Manifest::prependSearchPaths()
     }
 }
 
-const std::string& Manifest::getPackageUrl() const
+std::string_view Manifest::getPackageUrl() const
 {
     return _packageUrl;
 }
 
-const std::string& Manifest::getManifestFileUrl() const
+std::string_view Manifest::getManifestFileUrl() const
 {
     return _remoteManifestUrl;
 }
 
-const std::string& Manifest::getVersionFileUrl() const
+std::string_view Manifest::getVersionFileUrl() const
 {
     return _remoteVersionUrl;
 }
 
-const std::string& Manifest::getVersion() const
+std::string_view Manifest::getVersion() const
 {
     return _version;
 }
@@ -342,22 +342,22 @@ const std::vector<std::string>& Manifest::getGroups() const
     return _groups;
 }
 
-const std::unordered_map<std::string, std::string>& Manifest::getGroupVerions() const
+const hlookup::string_map<std::string>& Manifest::getGroupVerions() const
 {
     return _groupVer;
 }
 
-const std::string& Manifest::getGroupVersion(const std::string& group) const
+std::string_view Manifest::getGroupVersion(std::string_view group) const
 {
     return _groupVer.at(group);
 }
 
-const std::unordered_map<std::string, Manifest::Asset>& Manifest::getAssets() const
+const hlookup::string_map<Manifest::Asset>& Manifest::getAssets() const
 {
     return _assets;
 }
 
-void Manifest::setAssetDownloadState(const std::string& key, const Manifest::DownloadState& state)
+void Manifest::setAssetDownloadState(std::string_view key, const Manifest::DownloadState& state)
 {
     auto valueIt = _assets.find(key);
     if (valueIt != _assets.end())
@@ -372,9 +372,9 @@ void Manifest::setAssetDownloadState(const std::string& key, const Manifest::Dow
                 rapidjson::Value& assets = _json[KEY_ASSETS];
                 if (assets.IsObject())
                 {
-                    if (assets.HasMember(key.c_str()))
+                    if (assets.HasMember(key.data()))
                     {
-                        rapidjson::Value& entry = assets[key.c_str()];
+                        rapidjson::Value& entry = assets[key.data()];
                         if (entry.HasMember(KEY_DOWNLOAD_STATE) && entry[KEY_DOWNLOAD_STATE].IsInt())
                         {
                             entry[KEY_DOWNLOAD_STATE].SetInt((int)state);
@@ -413,7 +413,7 @@ void Manifest::clear()
     }
 }
 
-Manifest::Asset Manifest::parseAsset(const std::string& path, const rapidjson::Value& json)
+Manifest::Asset Manifest::parseAsset(std::string_view path, const rapidjson::Value& json)
 {
     Asset asset;
     asset.path = path;
@@ -553,7 +553,7 @@ void Manifest::loadManifest(const rapidjson::Document& json)
     _loaded = true;
 }
 
-void Manifest::saveToFile(const std::string& filepath)
+void Manifest::saveToFile(std::string_view filepath)
 {
     rapidjson::StringBuffer buffer;
     rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
diff --git a/extensions/assets-manager/Manifest.h b/extensions/assets-manager/Manifest.h
index 695cbe55c7e9..d58260810881 100644
--- a/extensions/assets-manager/Manifest.h
+++ b/extensions/assets-manager/Manifest.h
@@ -56,7 +56,7 @@ struct ManifestAsset
     int downloadState;
 };
 
-typedef std::unordered_map<std::string, DownloadUnit> DownloadUnits;
+typedef hlookup::string_map<DownloadUnit> DownloadUnits;
 
 class CC_EX_DLL Manifest : public Ref
 {
@@ -99,19 +99,19 @@ class CC_EX_DLL Manifest : public Ref
 
     /** @brief Gets remote package url.
      */
-    const std::string& getPackageUrl() const;
+    std::string_view getPackageUrl() const;
 
     /** @brief Gets remote manifest file url.
      */
-    const std::string& getManifestFileUrl() const;
+    std::string_view getManifestFileUrl() const;
 
     /** @brief Gets remote version file url.
      */
-    const std::string& getVersionFileUrl() const;
+    std::string_view getVersionFileUrl() const;
 
     /** @brief Gets manifest version.
      */
-    const std::string& getVersion() const;
+    std::string_view getVersion() const;
 
     /** @brief Get the search paths list related to the Manifest.
      */
@@ -121,22 +121,22 @@ class CC_EX_DLL Manifest : public Ref
     /** @brief Constructor for Manifest class
      * @param manifestUrl Url of the local manifest
      */
-    Manifest(const std::string& manifestUrl = "");
+    Manifest(std::string_view manifestUrl = "");
 
     /** @brief Load the json file into local json object
      * @param url Url of the json file
      */
-    void loadJson(const std::string& url);
+    void loadJson(std::string_view url);
 
     /** @brief Parse the version file information into this manifest
      * @param versionUrl Url of the local version file
      */
-    void parseVersion(const std::string& versionUrl);
+    void parseVersion(std::string_view versionUrl);
 
     /** @brief Parse the manifest file information into this manifest
      * @param manifestUrl Url of the local manifest
      */
-    void parse(const std::string& manifestUrl);
+    void parse(std::string_view manifestUrl);
 
     /** @brief Check whether the version of this manifest equals to another.
      * @param b   The other manifest
@@ -149,14 +149,13 @@ class CC_EX_DLL Manifest : public Ref
      * @param [handle]  Customized comparasion handle function
      * @return Greater or not
      */
-    bool versionGreater(
-        const Manifest* b,
-        const std::function<int(const std::string& versionA, const std::string& versionB)>& handle) const;
+    bool versionGreater(const Manifest* b,
+                        const std::function<int(std::string_view versionA, std::string_view versionB)>& handle) const;
 
     /** @brief Generate difference between this Manifest and another.
      * @param b   The other manifest
      */
-    std::unordered_map<std::string, AssetDiff> genDiff(const Manifest* b) const;
+    hlookup::string_map<AssetDiff> genDiff(const Manifest* b) const;
 
     /** @brief Generate resuming download assets list
      * @param units   The download units reference to be modified by the generation result
@@ -171,9 +170,9 @@ class CC_EX_DLL Manifest : public Ref
 
     void loadManifest(const rapidjson::Document& json);
 
-    void saveToFile(const std::string& filepath);
+    void saveToFile(std::string_view filepath);
 
-    Asset parseAsset(const std::string& path, const rapidjson::Value& json);
+    Asset parseAsset(std::string_view path, const rapidjson::Value& json);
 
     void clear();
 
@@ -183,26 +182,26 @@ class CC_EX_DLL Manifest : public Ref
 
     /** @brief Gets all groups version.
      */
-    const std::unordered_map<std::string, std::string>& getGroupVerions() const;
+    const hlookup::string_map<std::string>& getGroupVerions() const;
 
     /** @brief Gets version for the given group.
      * @param group   Key of the requested group
      */
-    const std::string& getGroupVersion(const std::string& group) const;
+    std::string_view getGroupVersion(std::string_view group) const;
 
     /**
      * @brief Gets assets.
      * @lua NA
      */
-    const std::unordered_map<std::string, Asset>& getAssets() const;
+    const hlookup::string_map<Asset>& getAssets() const;
 
     /** @brief Set the download state for an asset
      * @param key   Key of the asset to set
      * @param state The current download state of the asset
      */
-    void setAssetDownloadState(const std::string& key, const DownloadState& state);
+    void setAssetDownloadState(std::string_view key, const DownloadState& state);
 
-    void setManifestRoot(const std::string& root) { _manifestRoot = root; };
+    void setManifestRoot(std::string_view root) { _manifestRoot = root; };
 
 private:
     //! Indicate whether the version informations have been fully loaded
@@ -233,13 +232,13 @@ class CC_EX_DLL Manifest : public Ref
     std::vector<std::string> _groups;
 
     //! The versions of all local group [Optional]
-    std::unordered_map<std::string, std::string> _groupVer;
+    hlookup::string_map<std::string> _groupVer;
 
     //! The version of local engine
     std::string _engineVer;
 
     //! Full assets list
-    std::unordered_map<std::string, Asset> _assets;
+    hlookup::string_map<Asset> _assets;
 
     //! All search paths
     std::vector<std::string> _searchPaths;
diff --git a/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp
index bf4dd8ac18b8..6edbb870737a 100644
--- a/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp
+++ b/extensions/cocostudio/ActionTimeline/CCActionTimeline.cpp
@@ -319,12 +319,12 @@ void ActionTimeline::removeAnimationInfo(std::string animationName)
     _animationInfos.erase(animationName);
 }
 
-bool ActionTimeline::IsAnimationInfoExists(const std::string& animationName)
+bool ActionTimeline::IsAnimationInfoExists(std::string_view animationName)
 {
     return _animationInfos.find(animationName) != _animationInfos.end();
 }
 
-const AnimationInfo& ActionTimeline::getAnimationInfo(const std::string& animationName)
+const AnimationInfo& ActionTimeline::getAnimationInfo(std::string_view animationName)
 {
     return _animationInfos.find(animationName)->second;
 }
@@ -369,7 +369,7 @@ void ActionTimeline::emitFrameEvent(Frame* frame)
     }
 }
 
-void ActionTimeline::addFrameEndCallFunc(int frameIndex, const std::string& funcKey, std::function<void()> func)
+void ActionTimeline::addFrameEndCallFunc(int frameIndex, std::string_view funcKey, std::function<void()> func)
 {
     if (func != nullptr)
     {
@@ -377,7 +377,7 @@ void ActionTimeline::addFrameEndCallFunc(int frameIndex, const std::string& func
     }
 }
 
-void ActionTimeline::removeFrameEndCallFunc(int frameIndex, const std::string& funcKey)
+void ActionTimeline::removeFrameEndCallFunc(int frameIndex, std::string_view funcKey)
 {
     auto endClipCallsIter = _frameEndCallFuncs.find(frameIndex);
     if (endClipCallsIter != _frameEndCallFuncs.end())
diff --git a/extensions/cocostudio/ActionTimeline/CCActionTimeline.h b/extensions/cocostudio/ActionTimeline/CCActionTimeline.h
index 6437359ff4ec..0d57dea4a181 100644
--- a/extensions/cocostudio/ActionTimeline/CCActionTimeline.h
+++ b/extensions/cocostudio/ActionTimeline/CCActionTimeline.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013 cocos2d-x.org
 
 http://www.cocos2d-x.org
@@ -37,7 +37,7 @@ typedef struct AnimationInfo
 {
     AnimationInfo() : startIndex(0), endIndex(0) {}
 
-    AnimationInfo(const std::string& otherName, int otherStartIndex, int otherEndIndex)
+    AnimationInfo(std::string_view otherName, int otherStartIndex, int otherEndIndex)
         : name(otherName), startIndex(otherStartIndex), endIndex(otherEndIndex)
     {}
 
@@ -150,8 +150,8 @@ class CCS_DLL ActionTimeline : public cocos2d::Action, public cocos2d::PlayableP
     /** AnimationInfo*/
     virtual void addAnimationInfo(const AnimationInfo& animationInfo);
     virtual void removeAnimationInfo(std::string animationName);
-    virtual bool IsAnimationInfoExists(const std::string& animationName);
-    virtual const AnimationInfo& getAnimationInfo(const std::string& animationName);
+    virtual bool IsAnimationInfoExists(std::string_view animationName);
+    virtual const AnimationInfo& getAnimationInfo(std::string_view animationName);
     /**add a frame end call back to animation's end frame
      * @param animationName  @addFrameEndCallFunc, make the animationName as funcKey
      * @param func the callback function
@@ -171,9 +171,9 @@ class CCS_DLL ActionTimeline : public cocos2d::Action, public cocos2d::PlayableP
      * @param funcKey for identity the callback function
      * @param func the callback function
      */
-    virtual void addFrameEndCallFunc(int frameIndex, const std::string& funcKey, std::function<void()> func);
+    virtual void addFrameEndCallFunc(int frameIndex, std::string_view funcKey, std::function<void()> func);
     // remove callback function after frameIndex which identified with funcKey
-    virtual void removeFrameEndCallFunc(int frameIndex, const std::string& funcKey);
+    virtual void removeFrameEndCallFunc(int frameIndex, std::string_view funcKey);
     // clear callback functions after frameIndex
     virtual void removeFrameEndCallFuncs(int frameIndex);
     // clear all the callback functions after frameIndexs in this actiontimeline
@@ -224,8 +224,8 @@ class CCS_DLL ActionTimeline : public cocos2d::Action, public cocos2d::PlayableP
 
     std::function<void(Frame*)> _frameEventListener;
     std::function<void()> _lastFrameListener;
-    std::map<int, std::map<std::string, std::function<void()>>> _frameEndCallFuncs;
-    std::map<std::string, AnimationInfo> _animationInfos;
+    std::map<int, hlookup::string_map<std::function<void()>>> _frameEndCallFuncs;
+    hlookup::string_map<AnimationInfo> _animationInfos;
 };
 
 NS_TIMELINE_END
diff --git a/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
index 44af85a5c594..5ca337f08400 100644
--- a/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
+++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
@@ -126,7 +126,7 @@ void ActionTimelineCache::init()
      */
 }
 
-void ActionTimelineCache::removeAction(const std::string& fileName)
+void ActionTimelineCache::removeAction(std::string_view fileName)
 {
     if (_animationActions.find(fileName) != _animationActions.end())
     {
@@ -134,11 +134,11 @@ void ActionTimelineCache::removeAction(const std::string& fileName)
     }
 }
 
-ActionTimeline* ActionTimelineCache::createAction(const std::string& filename)
+ActionTimeline* ActionTimelineCache::createAction(std::string_view filename)
 {
-    std::string path   = filename;
-    size_t pos         = path.find_last_of('.');
-    std::string suffix = path.substr(pos + 1, path.length());
+    auto path   = filename;
+    size_t pos  = path.find_last_of('.');
+    auto suffix = path.substr(pos + 1, path.length());
 
     ActionTimelineCache* cache = ActionTimelineCache::getInstance();
 
@@ -154,7 +154,7 @@ ActionTimeline* ActionTimelineCache::createAction(const std::string& filename)
     return nullptr;
 }
 
-ActionTimeline* ActionTimelineCache::createActionFromJson(const std::string& fileName)
+ActionTimeline* ActionTimelineCache::createActionFromJson(std::string_view fileName)
 {
     ActionTimeline* action = _animationActions.at(fileName);
     if (action == nullptr)
@@ -164,7 +164,7 @@ ActionTimeline* ActionTimelineCache::createActionFromJson(const std::string& fil
     return action->clone();
 }
 
-ActionTimeline* ActionTimelineCache::createActionFromContent(const std::string& fileName, const std::string& content)
+ActionTimeline* ActionTimelineCache::createActionFromContent(std::string_view fileName, std::string_view content)
 {
     ActionTimeline* action = _animationActions.at(fileName);
     if (action == nullptr)
@@ -174,7 +174,7 @@ ActionTimeline* ActionTimelineCache::createActionFromContent(const std::string&
     return action->clone();
 }
 
-ActionTimeline* ActionTimelineCache::loadAnimationActionWithFile(const std::string& fileName)
+ActionTimeline* ActionTimelineCache::loadAnimationActionWithFile(std::string_view fileName)
 {
     // Read content from file
     std::string fullPath   = FileUtils::getInstance()->fullPathForFilename(fileName);
@@ -183,8 +183,7 @@ ActionTimeline* ActionTimelineCache::loadAnimationActionWithFile(const std::stri
     return loadAnimationActionWithContent(fileName, contentStr);
 }
 
-ActionTimeline* ActionTimelineCache::loadAnimationActionWithContent(const std::string& fileName,
-                                                                    const std::string& content)
+ActionTimeline* ActionTimelineCache::loadAnimationActionWithContent(std::string_view fileName, std::string_view content)
 {
     // if already exists an action with filename, then return this action
     ActionTimeline* action = _animationActions.at(fileName);
@@ -192,7 +191,7 @@ ActionTimeline* ActionTimelineCache::loadAnimationActionWithContent(const std::s
         return action;
 
     rapidjson::Document doc;
-    doc.Parse<0>(content.c_str());
+    doc.Parse<0>(content.data(), content.length());
     if (doc.HasParseError())
     {
         CCLOG("GetParseError %d\n", doc.GetParseError());
@@ -415,7 +414,7 @@ Frame* ActionTimelineCache::loadZOrderFrame(const rapidjson::Value& json)
     return frame;
 }
 
-ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersFile(const std::string& fileName)
+ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersFile(std::string_view fileName)
 {
     ActionTimeline* action = _animationActions.at(fileName);
     if (action == NULL)
@@ -425,7 +424,7 @@ ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersFile(const std::
     return action->clone();
 }
 
-ActionTimeline* ActionTimelineCache::createActionWithDataBuffer(Data data, const std::string& fileName)
+ActionTimeline* ActionTimelineCache::createActionWithDataBuffer(Data data, std::string_view fileName)
 {
     ActionTimeline* action = _animationActions.at(fileName);
     if (action == NULL)
@@ -435,15 +434,13 @@ ActionTimeline* ActionTimelineCache::createActionWithDataBuffer(Data data, const
     return action->clone();
 }
 
-ActionTimeline* ActionTimelineCache::loadAnimationActionWithFlatBuffersFile(const std::string& fileName)
+ActionTimeline* ActionTimelineCache::loadAnimationActionWithFlatBuffersFile(std::string_view fileName)
 {
     // if already exists an action with filename, then return this action
     ActionTimeline* action = _animationActions.at(fileName);
     if (action)
         return action;
 
-    std::string path = fileName;
-
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
 
     CC_ASSERT(FileUtils::getInstance()->isFileExist(fullPath));
@@ -455,15 +452,13 @@ ActionTimeline* ActionTimelineCache::loadAnimationActionWithFlatBuffersFile(cons
     return action;
 }
 
-ActionTimeline* ActionTimelineCache::loadAnimationWithDataBuffer(const cocos2d::Data& data, const std::string& fileName)
+ActionTimeline* ActionTimelineCache::loadAnimationWithDataBuffer(const cocos2d::Data& data, std::string_view fileName)
 {
     // if already exists an action with filename, then return this action
     ActionTimeline* action = _animationActions.at(fileName);
     if (action)
         return action;
 
-    std::string path = fileName;
-
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
 
     CC_ASSERT(FileUtils::getInstance()->isFileExist(fullPath));
@@ -953,7 +948,7 @@ void ActionTimelineCache::loadEasingDataWithFlatBuffers(cocostudio::timeline::Fr
     }
 }
 
-ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersForSimulator(const std::string& fileName)
+ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersForSimulator(std::string_view fileName)
 {
     FlatBuffersSerialize* fbs = FlatBuffersSerialize::getInstance();
     fbs->_isSimulator         = true;
diff --git a/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h
index 052280d16485..ff3ecc26a04a 100644
--- a/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h
+++ b/extensions/cocostudio/ActionTimeline/CCActionTimelineCache.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013 cocos2d-x.org
 
 http://www.cocos2d-x.org
@@ -71,24 +71,24 @@ class CCS_DLL ActionTimelineCache
     void init();
 
     /** Remove action with filename, and also remove other resource relate with this file */
-    void removeAction(const std::string& fileName);
+    void removeAction(std::string_view fileName);
 
-    static ActionTimeline* createAction(const std::string& fileName);
+    static ActionTimeline* createAction(std::string_view fileName);
 
     /** Clone a action with the specified name from the container. */
-    ActionTimeline* createActionFromJson(const std::string& fileName);
-    ActionTimeline* createActionFromContent(const std::string& fileName, const std::string& content);
+    ActionTimeline* createActionFromJson(std::string_view fileName);
+    ActionTimeline* createActionFromContent(std::string_view fileName, std::string_view content);
 
-    ActionTimeline* loadAnimationActionWithFile(const std::string& fileName);
-    ActionTimeline* loadAnimationActionWithContent(const std::string& fileName, const std::string& content);
+    ActionTimeline* loadAnimationActionWithFile(std::string_view fileName);
+    ActionTimeline* loadAnimationActionWithContent(std::string_view fileName, std::string_view content);
 
-    ActionTimeline* createActionWithFlatBuffersFile(const std::string& fileName);
-    ActionTimeline* createActionWithDataBuffer(cocos2d::Data data, const std::string& fileName);
+    ActionTimeline* createActionWithFlatBuffersFile(std::string_view fileName);
+    ActionTimeline* createActionWithDataBuffer(cocos2d::Data data, std::string_view fileName);
 
-    ActionTimeline* loadAnimationActionWithFlatBuffersFile(const std::string& fileName);
-    ActionTimeline* loadAnimationWithDataBuffer(const cocos2d::Data& data, const std::string& fileName);
+    ActionTimeline* loadAnimationActionWithFlatBuffersFile(std::string_view fileName);
+    ActionTimeline* loadAnimationWithDataBuffer(const cocos2d::Data& data, std::string_view fileName);
 
-    ActionTimeline* createActionWithFlatBuffersForSimulator(const std::string& fileName);
+    ActionTimeline* createActionWithFlatBuffersForSimulator(std::string_view fileName);
 
 protected:
     Timeline* loadTimeline(const rapidjson::Value& json);
@@ -128,8 +128,8 @@ class CCS_DLL ActionTimelineCache
     typedef std::function<Frame*(const rapidjson::Value& json)> FrameCreateFunc;
     typedef std::pair<std::string, FrameCreateFunc> Pair;
 
-    std::unordered_map<std::string, FrameCreateFunc> _funcs;
-    cocos2d::Map<std::string, ActionTimeline*> _animationActions;
+    hlookup::string_map<FrameCreateFunc> _funcs;
+    cocos2d::StringMap<ActionTimeline*> _animationActions;
 };
 
 NS_TIMELINE_END
diff --git a/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp b/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp
index de7d55ca31d5..b812c36371ee 100644
--- a/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp
+++ b/extensions/cocostudio/ActionTimeline/CCBoneNode.cpp
@@ -75,20 +75,20 @@ bool BoneNode::init()
     setProgramState(new cocos2d::backend::ProgramState(program), false);
     pipelineDescriptor.programState = _programState;
 
-    _mvpLocation = _programState->getUniformLocation("u_MVPMatrix");
+    _mvpLocation = _programState->getUniformLocation("u_MVPMatrix"sv);
 
     auto vertexLayout         = _programState->getVertexLayout();
     const auto& attributeInfo = _programState->getProgram()->getActiveAttributes();
-    auto iter                 = attributeInfo.find("a_position");
+    auto iter                 = attributeInfo.find("a_position"sv);
     if (iter != attributeInfo.end())
     {
-        vertexLayout->setAttribute("a_position", iter->second.location, cocos2d::backend::VertexFormat::FLOAT3, 0,
+        vertexLayout->setAttribute("a_position"sv, iter->second.location, cocos2d::backend::VertexFormat::FLOAT3, 0,
                                    false);
     }
-    iter = attributeInfo.find("a_color");
+    iter = attributeInfo.find("a_color"sv);
     if (iter != attributeInfo.end())
     {
-        vertexLayout->setAttribute("a_color", iter->second.location, cocos2d::backend::VertexFormat::FLOAT4,
+        vertexLayout->setAttribute("a_color"sv, iter->second.location, cocos2d::backend::VertexFormat::FLOAT4,
                                    3 * sizeof(float), false);
     }
     vertexLayout->setLayout(7 * sizeof(float));
@@ -108,7 +108,7 @@ void BoneNode::addChild(cocos2d::Node* child, int localZOrder, int tag)
     Node::addChild(child, localZOrder, tag);
 }
 
-void BoneNode::addChild(Node* child, int localZOrder, const std::string& name)
+void BoneNode::addChild(Node* child, int localZOrder, std::string_view name)
 {
     addToChildrenListHelper(child);
     Node::addChild(child, localZOrder, name);
@@ -152,7 +152,7 @@ void BoneNode::removeFromBoneList(BoneNode* bone)
         {
             auto subBones = bone->getAllSubBones();
             subBones.pushBack(bone);
-            for (auto& subBone : subBones)
+            for (auto subBone : subBones)
             {
                 if (subBone->_rootSkeleton == nullptr)
                     continue;
@@ -186,7 +186,7 @@ void BoneNode::addToBoneList(BoneNode* bone)
         {
             auto subBones = bone->getAllSubBones();
             subBones.pushBack(bone);
-            for (auto& subBone : subBones)
+            for (auto subBone : subBones)
             {
                 subBone->_rootSkeleton = _rootSkeleton;
                 auto bonename          = subBone->getName();
@@ -198,8 +198,8 @@ void BoneNode::addToBoneList(BoneNode* bone)
                     _rootSkeleton->_subBonesOrderDirty = true;
                 }
                 else
-                    CCLOG("already has a bone named %s in skeleton %s", bonename.c_str(),
-                          _rootSkeleton->getName().c_str());
+                    CCLOG("already has a bone named %s in skeleton %s", bonename.data(),
+                          _rootSkeleton->getName().data());
             }
         }
         else
@@ -240,7 +240,7 @@ void BoneNode::displaySkin(SkinNode* skin, bool hideOthers)
     }
 }
 
-void BoneNode::displaySkin(const std::string& skinName, bool hideOthers)
+void BoneNode::displaySkin(std::string_view skinName, bool hideOthers)
 {
     for (auto& skin : _boneSkins)
     {
@@ -661,7 +661,7 @@ void BoneNode::setLocalZOrder(int localZOrder)
         _rootSkeleton->_subBonesOrderDirty = true;
 }
 
-void BoneNode::setName(const std::string& name)
+void BoneNode::setName(std::string_view name)
 {
     auto oldname = getName();
     Node::setName(name);
diff --git a/extensions/cocostudio/ActionTimeline/CCBoneNode.h b/extensions/cocostudio/ActionTimeline/CCBoneNode.h
index 02003d3ce76c..60450caa799c 100644
--- a/extensions/cocostudio/ActionTimeline/CCBoneNode.h
+++ b/extensions/cocostudio/ActionTimeline/CCBoneNode.h
@@ -52,7 +52,7 @@ class CCS_DLL BoneNode : public cocos2d::Node, public cocos2d::BlendProtocol
 
     using Node::addChild;
     // add child, and add child to bone list and skeleton's sub bone map or add it to skin list
-    virtual void addChild(cocos2d::Node* child, int localZOrder, const std::string& name) override;
+    virtual void addChild(cocos2d::Node* child, int localZOrder, std::string_view name) override;
     virtual void addChild(cocos2d::Node* child, int localZOrder, int tag) override;
 
     // remove child, and remove child from bone list and skeleton's sub bone map or remove it from skin list
@@ -94,7 +94,7 @@ class CCS_DLL BoneNode : public cocos2d::Node, public cocos2d::BlendProtocol
      *         prefer to use display(SkinNode* skin, bool hideOthers = false)
      * @param: hideOthers, set other skins invisible
      */
-    virtual void displaySkin(const std::string& skinName, bool hideOthers);
+    virtual void displaySkin(std::string_view skinName, bool hideOthers);
 
     // get the skins which is visible (displaying skins)
     virtual cocos2d::Vector<SkinNode*> getVisibleSkins() const;
@@ -146,7 +146,7 @@ class CCS_DLL BoneNode : public cocos2d::Node, public cocos2d::BlendProtocol
     virtual void setLocalZOrder(int localZOrder) override;
 
     // set name, and replace the subbone map in skeleton
-    virtual void setName(const std::string& name) override;
+    virtual void setName(std::string_view name) override;
 
     // set visible, and dirty the debugdraw to make debugdraw's render layer right
     virtual void setVisible(bool visible) override;
diff --git a/extensions/cocostudio/ActionTimeline/CCFrame.cpp b/extensions/cocostudio/ActionTimeline/CCFrame.cpp
index 2b410c5f27c3..fff31a344d80 100644
--- a/extensions/cocostudio/ActionTimeline/CCFrame.cpp
+++ b/extensions/cocostudio/ActionTimeline/CCFrame.cpp
@@ -548,7 +548,7 @@ void InnerActionFrame::setEndFrameIndex(int frameIndex)
     _endFrameIndex = frameIndex;
 }
 
-void InnerActionFrame::setAnimationName(const std::string& animationName)
+void InnerActionFrame::setAnimationName(std::string_view animationName)
 {
     if (!_enterWithName)
     {
diff --git a/extensions/cocostudio/ActionTimeline/CCFrame.h b/extensions/cocostudio/ActionTimeline/CCFrame.h
index f9c0ccd37c98..715972ca554d 100644
--- a/extensions/cocostudio/ActionTimeline/CCFrame.h
+++ b/extensions/cocostudio/ActionTimeline/CCFrame.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013 cocos2d-x.org
 
 http://www.cocos2d-x.org
@@ -119,8 +119,8 @@ class CCS_DLL TextureFrame : public Frame
     virtual void onEnter(Frame* nextFrame, int currentFrameIndex) override;
     virtual Frame* clone() override;
 
-    inline void setTextureName(std::string textureName) { _textureName = textureName; }
-    inline std::string getTextureName() const { return _textureName; }
+    inline void setTextureName(std::string_view textureName) { _textureName = textureName; }
+    inline std::string_view getTextureName() const { return _textureName; }
 
 protected:
     cocos2d::Sprite* _sprite;
@@ -293,7 +293,7 @@ class CCS_DLL InnerActionFrame : public Frame
     void setEndFrameIndex(int frameIndex);
     inline int getEndFrameIndex() const { return _endFrameIndex; }
 
-    void setAnimationName(const std::string& animationNamed);
+    void setAnimationName(std::string_view animationNamed);
 
     inline void setSingleFrameIndex(int frameIndex) { _singleFrameIndex = frameIndex; }
     inline int getSingleFrameIndex() const { return _singleFrameIndex; }
@@ -366,8 +366,8 @@ class CCS_DLL EventFrame : public Frame
     virtual void onEnter(Frame* nextFrame, int currentFrameIndex) override;
     virtual Frame* clone() override;
 
-    inline void setEvent(std::string event) { _event = event; }
-    inline std::string getEvent() const { return _event; }
+    inline void setEvent(std::string_view event) { _event = event; }
+    inline std::string_view getEvent() const { return _event; }
 
 protected:
     std::string _event;
diff --git a/extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp
index 69417e6a473b..d0a07494151d 100644
--- a/extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp
+++ b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.cpp
@@ -298,7 +298,7 @@ void SkeletonNode::batchDrawAllSubBones()
 #endif  // CC_STUDIO_ENABLED_VIEW
 }
 
-void SkeletonNode::changeSkins(const std::map<std::string, std::string>& boneSkinNameMap)
+void SkeletonNode::changeSkins(const hlookup::string_map<std::string>& boneSkinNameMap)
 {
     for (auto& boneskin : boneSkinNameMap)
     {
@@ -308,7 +308,7 @@ void SkeletonNode::changeSkins(const std::map<std::string, std::string>& boneSki
     }
 }
 
-void SkeletonNode::changeSkins(const std::string& skinGroupName)
+void SkeletonNode::changeSkins(std::string_view skinGroupName)
 {
     auto suit = _skinGroupMap.find(skinGroupName);
     if (suit != _skinGroupMap.end())
@@ -317,7 +317,7 @@ void SkeletonNode::changeSkins(const std::string& skinGroupName)
     }
 }
 
-BoneNode* SkeletonNode::getBoneNode(const std::string& boneName)
+BoneNode* SkeletonNode::getBoneNode(std::string_view boneName)
 {
     auto iter = _subBonesMap.find(boneName);
     if (iter != _subBonesMap.end())
@@ -327,14 +327,14 @@ BoneNode* SkeletonNode::getBoneNode(const std::string& boneName)
     return nullptr;
 }
 
-const cocos2d::Map<std::string, BoneNode*>& SkeletonNode::getAllSubBonesMap() const
+const cocos2d::StringMap<BoneNode*>& SkeletonNode::getAllSubBonesMap() const
 {
     return _subBonesMap;
 }
 
-void SkeletonNode::addSkinGroup(std::string groupName, std::map<std::string, std::string> boneSkinNameMap)
+void SkeletonNode::addSkinGroup(std::string groupName, hlookup::string_map<std::string> boneSkinNameMap)
 {
-    _skinGroupMap.emplace(groupName, boneSkinNameMap);
+    _skinGroupMap.emplace(groupName, std::move(boneSkinNameMap));
 }
 
 void SkeletonNode::checkSubBonesDirty()
diff --git a/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h
index e6117bdcb91c..7e004a393805 100644
--- a/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h
+++ b/extensions/cocostudio/ActionTimeline/CCSkeletonNode.h
@@ -44,31 +44,31 @@ class CCS_DLL SkeletonNode : public BoneNode
     /**
      *get bonenode in skeleton node by bone name
      */
-    BoneNode* getBoneNode(const std::string& boneName);
+    BoneNode* getBoneNode(std::string_view boneName);
 
     /**
      *get All bones in this skeleton, <bone's name, BoneNode>
      */
-    const cocos2d::Map<std::string, BoneNode*>& getAllSubBonesMap() const;
+    const cocos2d::StringMap<BoneNode*>& getAllSubBonesMap() const;
 
     /**
      *@brief: change displays
      *@param: boneSkinNameMap, map <name of bone, name of skin to display which added to bone>
      */
-    void changeSkins(const std::map<std::string, std::string>& boneSkinNameMap);
+    void changeSkins(const hlookup::string_map<std::string>& boneSkinNameMap);
 
     /**
      *@brief: change displays
      *@param: skinGroupName have
      */
-    void changeSkins(const std::string& skinGroupName);
+    void changeSkins(std::string_view skinGroupName);
 
     /**
      *@brief: add a boneSkinNameMap as a SkinGroup named groupName
      *@param: groupName, key
      *@param: boneSkinNameMap, map <name of bone, name of skin to display which added to bone>
      */
-    void addSkinGroup(std::string groupName, std::map<std::string, std::string> boneSkinNameMap);
+    void addSkinGroup(std::string groupName, hlookup::string_map<std::string> boneSkinNameMap);
 
     cocos2d::Rect getBoundingBox() const override;
 
@@ -86,7 +86,7 @@ class CCS_DLL SkeletonNode : public BoneNode
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
 
 protected:
-    cocos2d::Map<std::string, BoneNode*> _subBonesMap;
+    cocos2d::StringMap<BoneNode*> _subBonesMap;
 
 private:
     struct VertexData
@@ -98,7 +98,7 @@ class CCS_DLL SkeletonNode : public BoneNode
     cocos2d::Vec2 _squareVertices[8];
     VertexData _vertexData[8];
 
-    std::map<std::string, std::map<std::string, std::string>>
+    hlookup::string_map<hlookup::string_map<std::string>>
         _skinGroupMap;  // map< suit name, map< bone name, skin name> >
     CC_DISALLOW_COPY_AND_ASSIGN(SkeletonNode);
 
diff --git a/extensions/cocostudio/ActionTimeline/CSLoader.cpp b/extensions/cocostudio/ActionTimeline/CSLoader.cpp
index fcb10cc04e0b..d414f5b7eaf2 100644
--- a/extensions/cocostudio/ActionTimeline/CSLoader.cpp
+++ b/extensions/cocostudio/ActionTimeline/CSLoader.cpp
@@ -280,11 +280,11 @@ void CSLoader::init()
     _componentFuncs.insert(ComponentPair(ClassName_ComAudio, std::bind(&CSLoader::loadComAudio, this, _1)));
 }
 
-Node* CSLoader::createNode(const std::string& filename)
+Node* CSLoader::createNode(std::string_view filename)
 {
-    std::string path   = filename;
-    size_t pos         = path.find_last_of('.');
-    std::string suffix = path.substr(pos + 1, path.length());
+    auto path   = filename;
+    size_t pos  = path.find_last_of('.');
+    auto suffix = path.substr(pos + 1, path.length());
 
     CSLoader* load = CSLoader::getInstance();
 
@@ -300,11 +300,11 @@ Node* CSLoader::createNode(const std::string& filename)
     return nullptr;
 }
 
-Node* CSLoader::createNode(const std::string& filename, const ccNodeLoadCallback& callback)
+Node* CSLoader::createNode(std::string_view filename, const ccNodeLoadCallback& callback)
 {
-    std::string path   = filename;
-    size_t pos         = path.find_last_of('.');
-    std::string suffix = path.substr(pos + 1, path.length());
+    auto path   = filename;
+    size_t pos  = path.find_last_of('.');
+    auto suffix = path.substr(pos + 1, path.length());
 
     CSLoader* load = CSLoader::getInstance();
 
@@ -316,7 +316,7 @@ Node* CSLoader::createNode(const std::string& filename, const ccNodeLoadCallback
     return nullptr;
 }
 
-Node* CSLoader::createNodeWithVisibleSize(const std::string& filename)
+Node* CSLoader::createNodeWithVisibleSize(std::string_view filename)
 {
     auto node = createNode(filename);
     if (node != nullptr)
@@ -328,7 +328,7 @@ Node* CSLoader::createNodeWithVisibleSize(const std::string& filename)
     return node;
 }
 
-Node* CSLoader::createNodeWithVisibleSize(const std::string& filename, const ccNodeLoadCallback& callback)
+Node* CSLoader::createNodeWithVisibleSize(std::string_view filename, const ccNodeLoadCallback& callback)
 {
     auto node = createNode(filename, callback);
     if (node != nullptr)
@@ -340,18 +340,18 @@ Node* CSLoader::createNodeWithVisibleSize(const std::string& filename, const ccN
     return node;
 }
 
-std::string CSLoader::getExtentionName(const std::string& name)
+std::string_view CSLoader::getExtentionName(std::string_view name)
 {
-    std::string path   = name;
-    size_t pos         = path.find_last_of('.');
-    std::string result = path.substr(pos + 1, path.length());
+    auto path   = name;
+    size_t pos  = path.find_last_of('.');
+    auto result = path.substr(pos + 1, path.length());
 
     return result;
 }
 
-ActionTimeline* CSLoader::createTimeline(const std::string& filename)
+ActionTimeline* CSLoader::createTimeline(std::string_view filename)
 {
-    std::string suffix = getExtentionName(filename);
+    auto suffix = getExtentionName(filename);
 
     ActionTimelineCache* cache = ActionTimelineCache::getInstance();
 
@@ -367,9 +367,9 @@ ActionTimeline* CSLoader::createTimeline(const std::string& filename)
     return nullptr;
 }
 
-ActionTimeline* CSLoader::createTimeline(const Data& data, const std::string& filename)
+ActionTimeline* CSLoader::createTimeline(const Data& data, std::string_view filename)
 {
-    std::string suffix = getExtentionName(filename);
+    auto suffix = getExtentionName(filename);
 
     ActionTimelineCache* cache = ActionTimelineCache::getInstance();
 
@@ -379,7 +379,7 @@ ActionTimeline* CSLoader::createTimeline(const Data& data, const std::string& fi
     }
     else if (suffix == "json" || suffix == "ExportJson")
     {
-        std::string content((char*)data.getBytes(), data.getSize());
+        std::string_view content((char*)data.getBytes(), data.getSize());
         return cache->createActionFromContent(filename, content);
     }
 
@@ -387,7 +387,7 @@ ActionTimeline* CSLoader::createTimeline(const Data& data, const std::string& fi
 }
 
 /*
-ActionTimelineNode* CSLoader::createActionTimelineNode(const std::string& filename)
+ActionTimelineNode* CSLoader::createActionTimelineNode(std::string_view filename)
 {
     Node* root = createNode(filename);
     ActionTimeline* action = createTimeline(filename);
@@ -401,7 +401,7 @@ ActionTimelineNode* CSLoader::createActionTimelineNode(const std::string& filena
     ActionTimelineNode* node = ActionTimelineNode::create(root, action);
     return node;
 }
-ActionTimelineNode* CSLoader::createActionTimelineNode(const std::string& filename, int startIndex, int endIndex, bool
+ActionTimelineNode* CSLoader::createActionTimelineNode(std::string_view filename, int startIndex, int endIndex, bool
 loop)
 {
     ActionTimelineNode* node = createActionTimelineNode(filename);
@@ -413,11 +413,11 @@ loop)
 }
  */
 
-Node* CSLoader::createNodeFromJson(const std::string& filename)
+Node* CSLoader::createNodeFromJson(std::string_view filename)
 {
     if (_recordJsonPath)
     {
-        std::string jsonPath = filename.substr(0, filename.find_last_of('/') + 1);
+        auto jsonPath = filename.substr(0, filename.find_last_of('/') + 1);
         GUIReader::getInstance()->setFilePath(jsonPath);
 
         _jsonPath = jsonPath;
@@ -432,7 +432,7 @@ Node* CSLoader::createNodeFromJson(const std::string& filename)
     return node;
 }
 
-Node* CSLoader::loadNodeWithFile(const std::string& fileName)
+Node* CSLoader::loadNodeWithFile(std::string_view fileName)
 {
     // Read content from file
     std::string contentStr = FileUtils::getInstance()->getStringFromFile(fileName);
@@ -445,10 +445,10 @@ Node* CSLoader::loadNodeWithFile(const std::string& fileName)
     return node;
 }
 
-Node* CSLoader::loadNodeWithContent(const std::string& content)
+Node* CSLoader::loadNodeWithContent(std::string_view content)
 {
     rapidjson::Document doc;
-    doc.Parse<0>(content.c_str());
+    doc.Parse<0>(content.data(), content.length());
     if (doc.HasParseError())
     {
         CCLOG("GetParseError %d\n", doc.GetParseError());
@@ -760,11 +760,11 @@ Node* CSLoader::loadWidget(const rapidjson::Value& json)
 
     if (isWidget(classname))
     {
-        std::string readerName = getGUIClassName(classname);
+        std::string readerName{getGUIClassName(classname)};
         readerName.append("Reader");
 
-        std::string guiClassName = getGUIClassName(classname);
-        widget                   = dynamic_cast<Widget*>(ObjectFactory::getInstance()->createObject(guiClassName));
+        std::string_view guiClassName = getGUIClassName(classname);
+        widget                        = dynamic_cast<Widget*>(ObjectFactory::getInstance()->createObject(guiClassName));
         // fix memory leak for v3.3
         // widget->retain();
 
@@ -785,7 +785,7 @@ Node* CSLoader::loadWidget(const rapidjson::Value& json)
 
         //
         // 1st., custom widget parse properties of parent widget with parent widget reader
-        std::string readerName = getWidgetReaderClassName(widget);
+        std::string_view readerName = getWidgetReaderClassName(widget);
         WidgetReaderProtocol* reader =
             dynamic_cast<WidgetReaderProtocol*>(ObjectFactory::getInstance()->createObject(readerName));
         if (reader && widget)
@@ -961,12 +961,12 @@ Node* CSLoader::createNode(const Data& data, const ccNodeLoadCallback& callback)
     return node;
 }
 
-Node* CSLoader::createNodeWithFlatBuffersFile(const std::string& filename)
+Node* CSLoader::createNodeWithFlatBuffersFile(std::string_view filename)
 {
     return createNodeWithFlatBuffersFile(filename, nullptr);
 }
 
-Node* CSLoader::createNodeWithFlatBuffersFile(const std::string& filename, const ccNodeLoadCallback& callback)
+Node* CSLoader::createNodeWithFlatBuffersFile(std::string_view filename, const ccNodeLoadCallback& callback)
 {
     Node* node = nodeWithFlatBuffersFile(filename, callback);
 
@@ -990,17 +990,17 @@ inline void CSLoader::reconstructNestNode(cocos2d::Node* node)
         else
         {
             _rootNode = _callbackHandlers.back();
-            CCLOG("after pop back _rootNode name = %s", _rootNode->getName().c_str());
+            CCLOG("after pop back _rootNode name = %s", _rootNode->getName().data());
         }
     }
 }
 
-Node* CSLoader::nodeWithFlatBuffersFile(const std::string& fileName)
+Node* CSLoader::nodeWithFlatBuffersFile(std::string_view fileName)
 {
     return nodeWithFlatBuffersFile(fileName, nullptr);
 }
 
-Node* CSLoader::nodeWithFlatBuffersFile(const std::string& fileName, const ccNodeLoadCallback& callback)
+Node* CSLoader::nodeWithFlatBuffersFile(std::string_view fileName, const ccNodeLoadCallback& callback)
 {
     std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
 
@@ -1010,7 +1010,7 @@ Node* CSLoader::nodeWithFlatBuffersFile(const std::string& fileName, const ccNod
 
     if (buf.isNull())
     {
-        CCLOG("CSLoader::nodeWithFlatBuffersFile - failed read file: %s", fileName.c_str());
+        CCLOG("CSLoader::nodeWithFlatBuffersFile - failed read file: %s", fileName.data());
         CC_ASSERT(false);
         return nullptr;
     }
@@ -1144,7 +1144,7 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree* nodetree, const
             {
                 classname = customClassName;
             }
-            std::string readername = getGUIClassName(classname);
+            std::string readername{getGUIClassName(classname)};
             readername.append("Reader");
 
             NodeReaderProtocol* reader =
@@ -1178,8 +1178,8 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree* nodetree, const
             Widget* widget = dynamic_cast<Widget*>(node);
             if (widget)
             {
-                std::string callbackName = widget->getCallbackName();
-                std::string callbackType = widget->getCallbackType();
+                auto callbackName = widget->getCallbackName();
+                auto callbackType = widget->getCallbackType();
 
                 bindCallback(callbackName, callbackType, widget, _rootNode);
             }
@@ -1248,8 +1248,8 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree* nodetree, const
     }
 }
 
-bool CSLoader::bindCallback(const std::string& callbackName,
-                            const std::string& callbackType,
+bool CSLoader::bindCallback(std::string_view callbackName,
+                            std::string_view callbackType,
                             cocos2d::ui::Widget* sender,
                             cocos2d::Node* handler)
 {
@@ -1288,12 +1288,12 @@ bool CSLoader::bindCallback(const std::string& callbackName,
         }
     }
 
-    CCLOG("callBackName %s cannot be found", callbackName.c_str());
+    CCLOG("callBackName %s cannot be found", callbackName.data());
 
     return false;
 }
 
-bool CSLoader::isWidget(const std::string& type)
+bool CSLoader::isWidget(std::string_view type)
 {
     return (type == ClassName_Panel || type == ClassName_Button || type == ClassName_CheckBox ||
             type == ClassName_ImageView || type == ClassName_TextAtlas || type == ClassName_LabelAtlas ||
@@ -1303,7 +1303,7 @@ bool CSLoader::isWidget(const std::string& type)
             type == ClassName_PageView || type == ClassName_Widget || type == ClassName_Label);
 }
 
-bool CSLoader::isCustomWidget(const std::string& type)
+bool CSLoader::isCustomWidget(std::string_view type)
 {
     Widget* widget = dynamic_cast<Widget*>(ObjectFactory::getInstance()->createObject(type));
     if (widget)
@@ -1315,40 +1315,42 @@ bool CSLoader::isCustomWidget(const std::string& type)
     return false;
 }
 
-std::string CSLoader::getGUIClassName(const std::string& name)
+std::string_view CSLoader::getGUIClassName(std::string_view name)
 {
-    std::string convertedClassName = name;
+    std::string_view convertedClassName;
     if (name == "Panel")
     {
-        convertedClassName = "Layout";
+        convertedClassName = "Layout"sv;
     }
     else if (name == "TextArea")
     {
-        convertedClassName = "Text";
+        convertedClassName = "Text"sv;
     }
     else if (name == "TextButton")
     {
-        convertedClassName = "Button";
+        convertedClassName = "Button"sv;
     }
     else if (name == "Label")
     {
-        convertedClassName = "Text";
+        convertedClassName = "Text"sv;
     }
     else if (name == "LabelAtlas")
     {
-        convertedClassName = "TextAtlas";
+        convertedClassName = "TextAtlas"sv;
     }
     else if (name == "LabelBMFont")
     {
-        convertedClassName = "TextBMFont";
+        convertedClassName = "TextBMFont"sv;
     }
+    else
+        convertedClassName = name;
 
     return convertedClassName;
 }
 
-std::string CSLoader::getWidgetReaderClassName(Widget* widget)
+std::string_view CSLoader::getWidgetReaderClassName(Widget* widget)
 {
-    std::string readerName;
+    std::string_view readerName;
 
     // 1st., custom widget parse properties of parent widget with parent widget reader
     if (dynamic_cast<Button*>(widget))
@@ -1408,11 +1410,13 @@ std::string CSLoader::getWidgetReaderClassName(Widget* widget)
     {
         readerName = "WidgetReader";
     }
+    else
+        readerName = hlookup::empty_sv;
 
     return readerName;
 }
 
-void CSLoader::registReaderObject(const std::string& className, ObjectFactory::Instance ins)
+void CSLoader::registReaderObject(std::string_view className, ObjectFactory::Instance ins)
 {
     ObjectFactory::TInfo t;
     t._class = className;
@@ -1421,7 +1425,7 @@ void CSLoader::registReaderObject(const std::string& className, ObjectFactory::I
     ObjectFactory::getInstance()->registerType(t);
 }
 
-Node* CSLoader::createNodeWithFlatBuffersForSimulator(const std::string& filename)
+Node* CSLoader::createNodeWithFlatBuffersForSimulator(std::string_view filename)
 {
     FlatBuffersSerialize* fbs  = FlatBuffersSerialize::getInstance();
     fbs->_isSimulator          = true;
@@ -1495,7 +1499,7 @@ Node* CSLoader::nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree* nod
     }
     else
     {
-        std::string readername = getGUIClassName(classname);
+        std::string readername{getGUIClassName(classname)};
         readername.append("Reader");
 
         NodeReaderProtocol* reader =
@@ -1508,8 +1512,8 @@ Node* CSLoader::nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree* nod
         Widget* widget = dynamic_cast<Widget*>(node);
         if (widget)
         {
-            std::string callbackName = widget->getCallbackName();
-            std::string callbackType = widget->getCallbackType();
+            auto callbackName = widget->getCallbackName();
+            auto callbackType = widget->getCallbackType();
 
             bindCallback(callbackName, callbackType, widget, _rootNode);
         }
diff --git a/extensions/cocostudio/ActionTimeline/CSLoader.h b/extensions/cocostudio/ActionTimeline/CSLoader.h
index afcd41f583d9..3ba1e7fedc1e 100644
--- a/extensions/cocostudio/ActionTimeline/CSLoader.h
+++ b/extensions/cocostudio/ActionTimeline/CSLoader.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
 
  http://www.cocos2d-x.org
@@ -79,25 +79,25 @@ class CCS_DLL CSLoader
 
     void init();
 
-    static cocos2d::Node* createNode(const std::string& filename);
-    static cocos2d::Node* createNode(const std::string& filename, const ccNodeLoadCallback& callback);
+    static cocos2d::Node* createNode(std::string_view filename);
+    static cocos2d::Node* createNode(std::string_view filename, const ccNodeLoadCallback& callback);
     static cocos2d::Node* createNode(const Data& data);
     static cocos2d::Node* createNode(const Data& data, const ccNodeLoadCallback& callback);
-    static cocos2d::Node* createNodeWithVisibleSize(const std::string& filename);
-    static cocos2d::Node* createNodeWithVisibleSize(const std::string& filename, const ccNodeLoadCallback& callback);
+    static cocos2d::Node* createNodeWithVisibleSize(std::string_view filename);
+    static cocos2d::Node* createNodeWithVisibleSize(std::string_view filename, const ccNodeLoadCallback& callback);
 
-    static cocostudio::timeline::ActionTimeline* createTimeline(const std::string& filename);
-    static cocostudio::timeline::ActionTimeline* createTimeline(const Data& data, const std::string& filename);
+    static cocostudio::timeline::ActionTimeline* createTimeline(std::string_view filename);
+    static cocostudio::timeline::ActionTimeline* createTimeline(const Data& data, std::string_view filename);
 
     /*
-    static cocostudio::timeline::ActionTimelineNode* createActionTimelineNode(const std::string& filename);
-    static cocostudio::timeline::ActionTimelineNode* createActionTimelineNode(const std::string& filename, int
+    static cocostudio::timeline::ActionTimelineNode* createActionTimelineNode(std::string_view filename);
+    static cocostudio::timeline::ActionTimelineNode* createActionTimelineNode(std::string_view filename, int
     startIndex, int endIndex, bool loop);
      */
 
-    cocos2d::Node* createNodeFromJson(const std::string& filename);
-    cocos2d::Node* loadNodeWithFile(const std::string& fileName);
-    cocos2d::Node* loadNodeWithContent(const std::string& content);
+    cocos2d::Node* createNodeFromJson(std::string_view filename);
+    cocos2d::Node* loadNodeWithFile(std::string_view fileName);
+    cocos2d::Node* loadNodeWithContent(std::string_view content);
 
     void setRecordJsonPath(bool record) { _recordJsonPath = record; }
     bool isRecordJsonPath() const { return _recordJsonPath; }
@@ -105,23 +105,23 @@ class CCS_DLL CSLoader
     void setJsonPath(std::string jsonPath) { _jsonPath = jsonPath; }
     std::string getJsonPath() const { return _jsonPath; }
 
-    cocos2d::Node* createNodeWithFlatBuffersFile(const std::string& filename);
-    cocos2d::Node* nodeWithFlatBuffersFile(const std::string& fileName);
+    cocos2d::Node* createNodeWithFlatBuffersFile(std::string_view filename);
+    cocos2d::Node* nodeWithFlatBuffersFile(std::string_view fileName);
     cocos2d::Node* nodeWithFlatBuffers(const flatbuffers::NodeTree* nodetree);
 
-    bool bindCallback(const std::string& callbackName,
-                      const std::string& callbackType,
+    bool bindCallback(std::string_view callbackName,
+                      std::string_view callbackType,
                       cocos2d::ui::Widget* sender,
                       cocos2d::Node* handler);
 
-    void registReaderObject(const std::string& className, ObjectFactory::Instance ins);
+    void registReaderObject(std::string_view className, ObjectFactory::Instance ins);
 
-    cocos2d::Node* createNodeWithFlatBuffersForSimulator(const std::string& filename);
+    cocos2d::Node* createNodeWithFlatBuffersForSimulator(std::string_view filename);
     cocos2d::Node* nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree* nodetree);
 
 protected:
-    cocos2d::Node* createNodeWithFlatBuffersFile(const std::string& filename, const ccNodeLoadCallback& callback);
-    cocos2d::Node* nodeWithFlatBuffersFile(const std::string& fileName, const ccNodeLoadCallback& callback);
+    cocos2d::Node* createNodeWithFlatBuffersFile(std::string_view filename, const ccNodeLoadCallback& callback);
+    cocos2d::Node* nodeWithFlatBuffersFile(std::string_view fileName, const ccNodeLoadCallback& callback);
     cocos2d::Node* nodeWithFlatBuffers(const flatbuffers::NodeTree* nodetree, const ccNodeLoadCallback& callback);
 
     cocos2d::Node* loadNode(const rapidjson::Value& json);
@@ -144,14 +144,14 @@ class CCS_DLL CSLoader
     cocos2d::Component* loadComponent(const rapidjson::Value& json);
     cocos2d::Component* loadComAudio(const rapidjson::Value& json);
 
-    bool isWidget(const std::string& type);
-    bool isCustomWidget(const std::string& type);
+    bool isWidget(std::string_view type);
+    bool isCustomWidget(std::string_view type);
 
-    std::string getGUIClassName(const std::string& name);
-    std::string getWidgetReaderClassName(cocos2d::ui::Widget* widget);
+    std::string_view getGUIClassName(std::string_view name);
+    std::string_view getWidgetReaderClassName(cocos2d::ui::Widget* widget);
 
     inline void reconstructNestNode(cocos2d::Node* node);
-    static inline std::string getExtentionName(const std::string& name);
+    static inline std::string_view getExtentionName(std::string_view name);
 
     typedef std::function<cocos2d::Node*(const rapidjson::Value& json)> NodeCreateFunc;
     typedef std::pair<std::string, NodeCreateFunc> Pair;
diff --git a/extensions/cocostudio/CCActionNode.cpp b/extensions/cocostudio/CCActionNode.cpp
index 88ffc8b5edf1..b514296e3e45 100644
--- a/extensions/cocostudio/CCActionNode.cpp
+++ b/extensions/cocostudio/CCActionNode.cpp
@@ -188,11 +188,11 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic, Ref* root)
     initActionNodeFromRoot(root);
 }
 
-int ActionNode::valueToInt(const std::string& value)
+int ActionNode::valueToInt(std::string_view value)
 {
-    return atoi(value.c_str());
+    return atoi(value.data());
 }
-bool ActionNode::valueToBool(const std::string& value)
+bool ActionNode::valueToBool(std::string_view value)
 {
     int intValue = valueToInt(value);
     if (1 == intValue)
@@ -204,9 +204,9 @@ bool ActionNode::valueToBool(const std::string& value)
         return false;
     }
 }
-float ActionNode::valueToFloat(const std::string& value)
+float ActionNode::valueToFloat(std::string_view value)
 {
-    return utils::atof(value.c_str());
+    return utils::atof(value.data());
 }
 
 void ActionNode::initWithBinary(CocoLoader* cocoLoader, stExpCocoNode* cocoNode, cocos2d::Ref* root)
@@ -494,8 +494,9 @@ Spawn* ActionNode::refreshActionProperty()
                     // #11173 Fixed every node of UI animation(json) is starting at frame 0.
                     //                  if (frame->getFrameIndex() > 0)
                     //				    {
-                    //					    DelayTime* cDelayTime = DelayTime::create(frame->getFrameIndex() *
-                    //getUnitTime()); 					    if (cDelayTime != nullptr)
+                    //					    DelayTime* cDelayTime =
+                    // DelayTime::create(frame->getFrameIndex()
+                    //* getUnitTime()); 					    if (cDelayTime != nullptr)
                     //						    cSequenceArray.pushBack(static_cast<FiniteTimeAction*>(cDelayTime));
                     //				    }
                 }
diff --git a/extensions/cocostudio/CCActionNode.h b/extensions/cocostudio/CCActionNode.h
index 17c29ba996c0..ec1a6554c788 100644
--- a/extensions/cocostudio/CCActionNode.h
+++ b/extensions/cocostudio/CCActionNode.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -162,9 +162,9 @@ class CCS_DLL ActionNode : public cocos2d::Ref
     virtual bool isActionDoneOnce();
 
 protected:
-    int valueToInt(const std::string& value);
-    bool valueToBool(const std::string& value);
-    float valueToFloat(const std::string& value);
+    int valueToInt(std::string_view value);
+    bool valueToBool(std::string_view value);
+    float valueToFloat(std::string_view value);
 
     int _currentFrameIndex;
     int _destFrameIndex;
diff --git a/extensions/cocostudio/CCActionObject.cpp b/extensions/cocostudio/CCActionObject.cpp
index badd9c485281..48c85bac150d 100644
--- a/extensions/cocostudio/CCActionObject.cpp
+++ b/extensions/cocostudio/CCActionObject.cpp
@@ -184,11 +184,11 @@ void ActionObject::initWithBinary(CocoLoader* cocoLoader, stExpCocoNode* cocoNod
     }
 }
 
-int ActionObject::valueToInt(const std::string& value)
+int ActionObject::valueToInt(std::string_view value)
 {
-    return atoi(value.c_str());
+    return atoi(value.data());
 }
-bool ActionObject::valueToBool(const std::string& value)
+bool ActionObject::valueToBool(std::string_view value)
 {
     int intValue = valueToInt(value);
     if (1 == intValue)
@@ -200,9 +200,9 @@ bool ActionObject::valueToBool(const std::string& value)
         return false;
     }
 }
-float ActionObject::valueToFloat(const std::string& value)
+float ActionObject::valueToFloat(std::string_view value)
 {
-    return utils::atof(value.c_str());
+    return utils::atof(value.data());
 }
 
 void ActionObject::addActionNode(ActionNode* node)
diff --git a/extensions/cocostudio/CCActionObject.h b/extensions/cocostudio/CCActionObject.h
index 195c741d5b9a..b151631ed454 100644
--- a/extensions/cocostudio/CCActionObject.h
+++ b/extensions/cocostudio/CCActionObject.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -171,9 +171,9 @@ class CCS_DLL ActionObject : public cocos2d::Ref
     void simulationActionUpdate(float dt);
 
 protected:
-    int valueToInt(const std::string& value);
-    bool valueToBool(const std::string& value);
-    float valueToFloat(const std::string& value);
+    int valueToInt(std::string_view value);
+    bool valueToBool(std::string_view value);
+    float valueToFloat(std::string_view value);
 
     cocos2d::Vector<ActionNode*> _actionNodeList;
     std::string _name;
diff --git a/extensions/cocostudio/CCArmature.cpp b/extensions/cocostudio/CCArmature.cpp
index 985d3aec43f5..ab518eda85f6 100644
--- a/extensions/cocostudio/CCArmature.cpp
+++ b/extensions/cocostudio/CCArmature.cpp
@@ -57,7 +57,7 @@ Armature* Armature::create()
     return nullptr;
 }
 
-Armature* Armature::create(const std::string& name)
+Armature* Armature::create(std::string_view name)
 {
     Armature* armature = new Armature();
     if (armature->init(name))
@@ -69,7 +69,7 @@ Armature* Armature::create(const std::string& name)
     return nullptr;
 }
 
-Armature* Armature::create(const std::string& name, Bone* parentBone)
+Armature* Armature::create(std::string_view name, Bone* parentBone)
 {
     Armature* armature = new Armature();
     if (armature->init(name, parentBone))
@@ -102,7 +102,7 @@ bool Armature::init()
     return init("");
 }
 
-bool Armature::init(const std::string& name)
+bool Armature::init(std::string_view name)
 {
     bool bRet = false;
     do
@@ -182,13 +182,13 @@ bool Armature::init(const std::string& name)
     return bRet;
 }
 
-bool Armature::init(const std::string& name, Bone* parentBone)
+bool Armature::init(std::string_view name, Bone* parentBone)
 {
     _parentBone = parentBone;
     return init(name);
 }
 
-Bone* Armature::createBone(const std::string& boneName)
+Bone* Armature::createBone(std::string_view boneName)
 {
     Bone* existedBone = getBone(boneName);
     if (existedBone != nullptr)
@@ -217,7 +217,7 @@ Bone* Armature::createBone(const std::string& boneName)
     return bone;
 }
 
-void Armature::addBone(Bone* bone, const std::string& parentName)
+void Armature::addBone(Bone* bone, std::string_view parentName)
 {
     CCASSERT(bone != nullptr, "Argument must be non-nil");
     CCASSERT(_boneDic.at(bone->getName()) == nullptr, "bone already added. It can't be added again");
@@ -260,12 +260,12 @@ void Armature::removeBone(Bone* bone, bool recursion)
     removeChild(bone, true);
 }
 
-Bone* Armature::getBone(const std::string& name) const
+Bone* Armature::getBone(std::string_view name) const
 {
     return _boneDic.at(name);
 }
 
-void Armature::changeBoneParent(Bone* bone, const std::string& parentName)
+void Armature::changeBoneParent(Bone* bone, std::string_view parentName)
 {
     CCASSERT(bone != nullptr, "bone must be added to the bone dictionary!");
 
@@ -294,7 +294,7 @@ void Armature::changeBoneParent(Bone* bone, const std::string& parentName)
     }
 }
 
-const cocos2d::Map<std::string, Bone*>& Armature::getBoneDic() const
+const cocos2d::StringMap<Bone*>& Armature::getBoneDic() const
 {
     return _boneDic;
 }
diff --git a/extensions/cocostudio/CCArmature.h b/extensions/cocostudio/CCArmature.h
index d207940d85cb..66866ed2a89d 100644
--- a/extensions/cocostudio/CCArmature.h
+++ b/extensions/cocostudio/CCArmature.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -85,9 +85,9 @@ class CCS_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
      * @param  name Armature will use the name to find the ArmatureData to initializes it.
      * @return A initialized armature which is marked as "autorelease".
      */
-    static Armature* create(const std::string& name);
+    static Armature* create(std::string_view name);
 
-    static Armature* create(const std::string& name, Bone* parentBone);
+    static Armature* create(std::string_view name, Bone* parentBone);
 
 public:
     /**
@@ -109,29 +109,29 @@ class CCS_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
      * Init an armature with specified name
      * @param name Armature name
      */
-    virtual bool init(const std::string& name);
+    virtual bool init(std::string_view name);
 
-    virtual bool init(const std::string& name, Bone* parentBone);
+    virtual bool init(std::string_view name, Bone* parentBone);
     /**
      * Add a Bone to this Armature,
      *
      * @param bone  The Bone you want to add to Armature
      * @param parentName   The parent Bone's name you want to add to . If it's  nullptr, then set Armature to its parent
      */
-    virtual void addBone(Bone* bone, const std::string& parentName);
+    virtual void addBone(Bone* bone, std::string_view parentName);
     /**
      * Get a bone with the specified name
      *
      * @param name The bone's name you want to get
      */
-    virtual Bone* getBone(const std::string& name) const;
+    virtual Bone* getBone(std::string_view name) const;
     /**
      * Change a bone's parent with the specified parent name.
      *
      * @param bone The bone you want to change parent
      * @param parentName The new parent's name.
      */
-    virtual void changeBoneParent(Bone* bone, const std::string& parentName);
+    virtual void changeBoneParent(Bone* bone, std::string_view parentName);
     /**
      * Remove a bone with the specified name. If recursion it will also remove child Bone recursionly.
      *
@@ -144,7 +144,7 @@ class CCS_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
      * Get Armature's bone dictionary
      * @return Armature's bone dictionary
      */
-    const cocos2d::Map<std::string, Bone*>& getBoneDic() const;
+    const cocos2d::StringMap<Bone*>& getBoneDic() const;
 
     /**
      * This boundingBox will calculate all bones' boundingBox every time
@@ -246,7 +246,7 @@ class CCS_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
      * @js NA
      * @lua NA
      */
-    Bone* createBone(const std::string& boneName);
+    Bone* createBone(std::string_view boneName);
 
 protected:
     ArmatureData* _armatureData;
@@ -258,7 +258,7 @@ class CCS_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol
 
     mutable bool _armatureTransformDirty;
 
-    cocos2d::Map<std::string, Bone*>
+    cocos2d::StringMap<Bone*>
         _boneDic;  //! The dictionary of the bones, include all bones in the armature, no matter it is the direct bone
                    //! or the indirect bone. It is different from m_pChindren.
 
diff --git a/extensions/cocostudio/CCArmatureAnimation.cpp b/extensions/cocostudio/CCArmatureAnimation.cpp
index 5f02e393e171..3880ecabb326 100644
--- a/extensions/cocostudio/CCArmatureAnimation.cpp
+++ b/extensions/cocostudio/CCArmatureAnimation.cpp
@@ -138,7 +138,7 @@ void ArmatureAnimation::setSpeedScale(float speedScale)
 
     _processScale = !_movementData ? _speedScale : _speedScale * _movementData->scale;
 
-    const Map<std::string, Bone*>& map = _armature->getBoneDic();
+    auto& map = _armature->getBoneDic();
     for (auto& element : map)
     {
         Bone* bone = element.second;
@@ -156,7 +156,7 @@ float ArmatureAnimation::getSpeedScale() const
     return _speedScale;
 }
 
-void ArmatureAnimation::play(const std::string& animationName, int durationTo, int loop)
+void ArmatureAnimation::play(std::string_view animationName, int durationTo, int loop)
 {
     if (animationName.empty())
     {
@@ -212,7 +212,7 @@ void ArmatureAnimation::play(const std::string& animationName, int durationTo, i
     MovementBoneData* movementBoneData = nullptr;
     _tweenList.clear();
 
-    const Map<std::string, Bone*>& map = _armature->getBoneDic();
+    auto& map = _armature->getBoneDic();
     for (auto& element : map)
     {
         Bone* bone       = element.second;
@@ -469,12 +469,12 @@ void ArmatureAnimation::setFrameEventCallFunc(Ref* target, SEL_FrameEventCallFun
 }
 
 void ArmatureAnimation::setMovementEventCallFunc(
-    std::function<void(Armature* armature, MovementEventType movementType, const std::string& movementID)> listener)
+    std::function<void(Armature* armature, MovementEventType movementType, std::string_view movementID)> listener)
 {
     _movementEventListener = listener;
 }
 void ArmatureAnimation::setFrameEventCallFunc(
-    std::function<void(Bone* bone, const std::string& frameEventName, int originFrameIndex, int currentFrameIndex)>
+    std::function<void(Bone* bone, std::string_view frameEventName, int originFrameIndex, int currentFrameIndex)>
         listener)
 {
     _frameEventListener = listener;
@@ -488,7 +488,7 @@ void ArmatureAnimation::setUserObject(Ref* pUserObject)
 }
 
 void ArmatureAnimation::frameEvent(Bone* bone,
-                                   const std::string& frameEventName,
+                                   std::string_view frameEventName,
                                    int originFrameIndex,
                                    int currentFrameIndex)
 {
@@ -504,7 +504,7 @@ void ArmatureAnimation::frameEvent(Bone* bone,
     }
 }
 
-void ArmatureAnimation::movementEvent(Armature* armature, MovementEventType movementType, const std::string& movementID)
+void ArmatureAnimation::movementEvent(Armature* armature, MovementEventType movementType, std::string_view movementID)
 {
     if ((_movementEventTarget && _movementEventCallFunc) || _movementEventListener)
     {
diff --git a/extensions/cocostudio/CCArmatureAnimation.h b/extensions/cocostudio/CCArmatureAnimation.h
index 77eb5984a094..16ac00598010 100644
--- a/extensions/cocostudio/CCArmatureAnimation.h
+++ b/extensions/cocostudio/CCArmatureAnimation.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -43,8 +43,8 @@ enum MovementEventType
 class Armature;
 class Bone;
 
-typedef void (cocos2d::Ref::*SEL_MovementEventCallFunc)(Armature*, MovementEventType, const std::string&);
-typedef void (cocos2d::Ref::*SEL_FrameEventCallFunc)(Bone*, const std::string&, int, int);
+typedef void (cocos2d::Ref::*SEL_MovementEventCallFunc)(Armature*, MovementEventType, std::string_view);
+typedef void (cocos2d::Ref::*SEL_FrameEventCallFunc)(Bone*, std::string_view, int, int);
 
 #define movementEvent_selector(_SELECTOR) (cocostudio::SEL_MovementEventCallFunc)(&_SELECTOR)
 #define frameEvent_selector(_SELECTOR) (cocostudio::SEL_FrameEventCallFunc)(&_SELECTOR)
@@ -123,7 +123,7 @@ class CCS_DLL ArmatureAnimation : public ProcessBase
      *         loop = 0 : this animation is not loop
      *         loop > 0 : this animation is loop
      */
-    virtual void play(const std::string& animationName, int durationTo = -1, int loop = -1);
+    virtual void play(std::string_view animationName, int durationTo = -1, int loop = -1);
 
     /**
      * Play animation by index, the other param is the same to play.
@@ -192,10 +192,9 @@ class CCS_DLL ArmatureAnimation : public ProcessBase
     CC_DEPRECATED_ATTRIBUTE void setFrameEventCallFunc(cocos2d::Ref* target, SEL_FrameEventCallFunc callFunc);
 
     void setMovementEventCallFunc(
-        std::function<void(Armature* armature, MovementEventType movementType, const std::string& movementID)>
-            listener);
+        std::function<void(Armature* armature, MovementEventType movementType, std::string_view movementID)> listener);
     void setFrameEventCallFunc(
-        std::function<void(Bone* bone, const std::string& frameEventName, int originFrameIndex, int currentFrameIndex)>
+        std::function<void(Bone* bone, std::string_view frameEventName, int originFrameIndex, int currentFrameIndex)>
             listener);
 
     virtual void setAnimationData(AnimationData* data)
@@ -257,12 +256,12 @@ class CCS_DLL ArmatureAnimation : public ProcessBase
      * @js NA
      * @lua NA
      */
-    void frameEvent(Bone* bone, const std::string& frameEventName, int originFrameIndex, int currentFrameIndex);
+    void frameEvent(Bone* bone, std::string_view frameEventName, int originFrameIndex, int currentFrameIndex);
 
     /**
      * Emit a movement event
      */
-    void movementEvent(Armature* armature, MovementEventType movementType, const std::string& movementID);
+    void movementEvent(Armature* armature, MovementEventType movementType, std::string_view movementID);
 
     void updateMovementList();
 
@@ -322,9 +321,9 @@ class CCS_DLL ArmatureAnimation : public ProcessBase
     cocos2d::Ref* _movementEventTarget;
     cocos2d::Ref* _frameEventTarget;
 
-    std::function<void(Armature* armature, MovementEventType movementType, const std::string& movementID)>
+    std::function<void(Armature* armature, MovementEventType movementType, std::string_view movementID)>
         _movementEventListener;
-    std::function<void(Bone* bone, const std::string& frameEventName, int originFrameIndex, int currentFrameIndex)>
+    std::function<void(Bone* bone, std::string_view frameEventName, int originFrameIndex, int currentFrameIndex)>
         _frameEventListener;
 };
 
diff --git a/extensions/cocostudio/CCArmatureDataManager.cpp b/extensions/cocostudio/CCArmatureDataManager.cpp
index 20f716f0e30a..ca323b807ea2 100644
--- a/extensions/cocostudio/CCArmatureDataManager.cpp
+++ b/extensions/cocostudio/CCArmatureDataManager.cpp
@@ -87,7 +87,7 @@ bool ArmatureDataManager::init()
     return bRet;
 }
 
-void ArmatureDataManager::removeArmatureFileInfo(const std::string& configFilePath)
+void ArmatureDataManager::removeArmatureFileInfo(std::string_view configFilePath)
 {
     if (RelativeData* data = getRelativeData(configFilePath))
     {
@@ -116,73 +116,71 @@ void ArmatureDataManager::removeArmatureFileInfo(const std::string& configFilePa
     }
 }
 
-void ArmatureDataManager::addArmatureData(const std::string& id,
+void ArmatureDataManager::addArmatureData(std::string_view id,
                                           ArmatureData* armatureData,
-                                          const std::string& configFilePath)
+                                          std::string_view configFilePath)
 {
     if (RelativeData* data = getRelativeData(configFilePath))
     {
-        data->armatures.push_back(id);
+        data->armatures.push_back(std::string{id});
     }
 
     _armarureDatas.insert(id, armatureData);
 }
 
-ArmatureData* ArmatureDataManager::getArmatureData(const std::string& id)
+ArmatureData* ArmatureDataManager::getArmatureData(std::string_view id)
 {
     return dynamic_cast<ArmatureData*>(_armarureDatas.at(id));
 }
 
-void ArmatureDataManager::removeArmatureData(const std::string& id)
+void ArmatureDataManager::removeArmatureData(std::string_view id)
 {
     _armarureDatas.erase(id);
 }
 
-void ArmatureDataManager::addAnimationData(const std::string& id,
+void ArmatureDataManager::addAnimationData(std::string_view id,
                                            AnimationData* animationData,
-                                           const std::string& configFilePath)
+                                           std::string_view configFilePath)
 {
     if (RelativeData* data = getRelativeData(configFilePath))
     {
-        data->animations.push_back(id);
+        data->animations.push_back(std::string{id});
     }
 
     _animationDatas.insert(id, animationData);
 }
 
-AnimationData* ArmatureDataManager::getAnimationData(const std::string& id)
+AnimationData* ArmatureDataManager::getAnimationData(std::string_view id)
 {
     return dynamic_cast<AnimationData*>(_animationDatas.at(id));
 }
 
-void ArmatureDataManager::removeAnimationData(const std::string& id)
+void ArmatureDataManager::removeAnimationData(std::string_view id)
 {
     _animationDatas.erase(id);
 }
 
-void ArmatureDataManager::addTextureData(const std::string& id,
-                                         TextureData* textureData,
-                                         const std::string& configFilePath)
+void ArmatureDataManager::addTextureData(std::string_view id, TextureData* textureData, std::string_view configFilePath)
 {
     if (RelativeData* data = getRelativeData(configFilePath))
     {
-        data->textures.push_back(id);
+        data->textures.push_back(std::string{id});
     }
 
     _textureDatas.insert(id, textureData);
 }
 
-TextureData* ArmatureDataManager::getTextureData(const std::string& id)
+TextureData* ArmatureDataManager::getTextureData(std::string_view id)
 {
     return dynamic_cast<TextureData*>(_textureDatas.at(id));
 }
 
-void ArmatureDataManager::removeTextureData(const std::string& id)
+void ArmatureDataManager::removeTextureData(std::string_view id)
 {
     _textureDatas.erase(id);
 }
 
-void ArmatureDataManager::addArmatureFileInfo(const std::string& configFilePath)
+void ArmatureDataManager::addArmatureFileInfo(std::string_view configFilePath)
 {
     addRelativeData(configFilePath);
 
@@ -190,9 +188,7 @@ void ArmatureDataManager::addArmatureFileInfo(const std::string& configFilePath)
     DataReaderHelper::getInstance()->addDataFromFile(configFilePath);
 }
 
-void ArmatureDataManager::addArmatureFileInfoAsync(const std::string& configFilePath,
-                                                   Ref* target,
-                                                   SEL_SCHEDULE selector)
+void ArmatureDataManager::addArmatureFileInfoAsync(std::string_view configFilePath, Ref* target, SEL_SCHEDULE selector)
 {
     addRelativeData(configFilePath);
 
@@ -200,9 +196,9 @@ void ArmatureDataManager::addArmatureFileInfoAsync(const std::string& configFile
     DataReaderHelper::getInstance()->addDataFromFileAsync("", "", configFilePath, target, selector);
 }
 
-void ArmatureDataManager::addArmatureFileInfo(const std::string& imagePath,
-                                              const std::string& plistPath,
-                                              const std::string& configFilePath)
+void ArmatureDataManager::addArmatureFileInfo(std::string_view imagePath,
+                                              std::string_view plistPath,
+                                              std::string_view configFilePath)
 {
     addRelativeData(configFilePath);
 
@@ -211,9 +207,9 @@ void ArmatureDataManager::addArmatureFileInfo(const std::string& imagePath,
     addSpriteFrameFromFile(plistPath, imagePath, configFilePath);
 }
 
-void ArmatureDataManager::addArmatureFileInfoAsync(const std::string& imagePath,
-                                                   const std::string& plistPath,
-                                                   const std::string& configFilePath,
+void ArmatureDataManager::addArmatureFileInfoAsync(std::string_view imagePath,
+                                                   std::string_view plistPath,
+                                                   std::string_view configFilePath,
                                                    Ref* target,
                                                    SEL_SCHEDULE selector)
 {
@@ -224,13 +220,13 @@ void ArmatureDataManager::addArmatureFileInfoAsync(const std::string& imagePath,
     addSpriteFrameFromFile(plistPath, imagePath, configFilePath);
 }
 
-void ArmatureDataManager::addSpriteFrameFromFile(const std::string& plistPath,
-                                                 const std::string& imagePath,
-                                                 const std::string& configFilePath)
+void ArmatureDataManager::addSpriteFrameFromFile(std::string_view plistPath,
+                                                 std::string_view imagePath,
+                                                 std::string_view configFilePath)
 {
     if (RelativeData* data = getRelativeData(configFilePath))
     {
-        data->plistFiles.push_back(plistPath);
+        data->plistFiles.push_back(std::string{plistPath});
     }
     SpriteFrameCacheHelper::getInstance()->addSpriteFrameFromFile(plistPath, imagePath);
 }
@@ -240,20 +236,20 @@ bool ArmatureDataManager::isAutoLoadSpriteFile()
     return _autoLoadSpriteFile;
 }
 
-const cocos2d::Map<std::string, ArmatureData*>& ArmatureDataManager::getArmatureDatas() const
+const cocos2d::StringMap<ArmatureData*>& ArmatureDataManager::getArmatureDatas() const
 {
     return _armarureDatas;
 }
-const cocos2d::Map<std::string, AnimationData*>& ArmatureDataManager::getAnimationDatas() const
+const cocos2d::StringMap<AnimationData*>& ArmatureDataManager::getAnimationDatas() const
 {
     return _animationDatas;
 }
-const cocos2d::Map<std::string, TextureData*>& ArmatureDataManager::getTextureDatas() const
+const cocos2d::StringMap<TextureData*>& ArmatureDataManager::getTextureDatas() const
 {
     return _textureDatas;
 }
 
-void ArmatureDataManager::addRelativeData(const std::string& configFilePath)
+void ArmatureDataManager::addRelativeData(std::string_view configFilePath)
 {
     if (_relativeDatas.find(configFilePath) == _relativeDatas.end())
     {
@@ -261,7 +257,7 @@ void ArmatureDataManager::addRelativeData(const std::string& configFilePath)
     }
 }
 
-RelativeData* ArmatureDataManager::getRelativeData(const std::string& configFilePath)
+RelativeData* ArmatureDataManager::getRelativeData(std::string_view configFilePath)
 {
     return &_relativeDatas[configFilePath];
 }
diff --git a/extensions/cocostudio/CCArmatureDataManager.h b/extensions/cocostudio/CCArmatureDataManager.h
index d7e9f5dd9783..6b549e17b1cf 100644
--- a/extensions/cocostudio/CCArmatureDataManager.h
+++ b/extensions/cocostudio/CCArmatureDataManager.h
@@ -80,112 +80,110 @@ class CCS_DLL ArmatureDataManager : public cocos2d::Ref
      * @param id The id of the armature data
      * @param armatureData ArmatureData *
      */
-    void addArmatureData(const std::string& id, ArmatureData* armatureData, const std::string& configFilePath = "");
+    void addArmatureData(std::string_view id, ArmatureData* armatureData, std::string_view configFilePath = "");
 
     /**
      *    @brief    get armature data
      *    @param    id the id of the armature data you want to get
      *  @return    ArmatureData *
      */
-    ArmatureData* getArmatureData(const std::string& id);
+    ArmatureData* getArmatureData(std::string_view id);
 
     /**
      *    @brief    remove armature data
      *    @param    id the id of the armature data you want to get
      */
-    void removeArmatureData(const std::string& id);
+    void removeArmatureData(std::string_view id);
 
     /**
      *    @brief    add animation data
      *    @param     id the id of the animation data
      *  @return AnimationData *
      */
-    void addAnimationData(const std::string& id, AnimationData* animationData, const std::string& configFilePath = "");
+    void addAnimationData(std::string_view id, AnimationData* animationData, std::string_view configFilePath = "");
 
     /**
      *    @brief    get animation data from _animationDatas(Dictionary)
      *    @param     id the id of the animation data you want to get
      *  @return AnimationData *
      */
-    AnimationData* getAnimationData(const std::string& id);
+    AnimationData* getAnimationData(std::string_view id);
 
     /**
      *    @brief    remove animation data
      *    @param     id the id of the animation data
      */
-    void removeAnimationData(const std::string& id);
+    void removeAnimationData(std::string_view id);
 
     /**
      *    @brief    add texture data
      *    @param     id the id of the texture data
      *  @return TextureData *
      */
-    void addTextureData(const std::string& id, TextureData* textureData, const std::string& configFilePath = "");
+    void addTextureData(std::string_view id, TextureData* textureData, std::string_view configFilePath = "");
 
     /**
      *    @brief    get texture data
      *    @param     id the id of the texture data you want to get
      *  @return TextureData *
      */
-    TextureData* getTextureData(const std::string& id);
+    TextureData* getTextureData(std::string_view id);
 
     /**
      *    @brief    remove texture data
      *    @param     id the id of the texture data you want to get
      */
-    void removeTextureData(const std::string& id);
+    void removeTextureData(std::string_view id);
 
     /**
      *    @brief    Add ArmatureFileInfo, it is managed by ArmatureDataManager.
      */
-    void addArmatureFileInfo(const std::string& configFilePath);
+    void addArmatureFileInfo(std::string_view configFilePath);
 
     /**
      *    @brief    Add ArmatureFileInfo, it is managed by ArmatureDataManager.
      *            It will load data in a new thread
      */
-    void addArmatureFileInfoAsync(const std::string& configFilePath,
+    void addArmatureFileInfoAsync(std::string_view configFilePath,
                                   cocos2d::Ref* target,
                                   cocos2d::SEL_SCHEDULE selector);
 
     /**
      *    @brief    Add ArmatureFileInfo, it is managed by ArmatureDataManager.
      */
-    void addArmatureFileInfo(const std::string& imagePath,
-                             const std::string& plistPath,
-                             const std::string& configFilePath);
+    void addArmatureFileInfo(std::string_view imagePath, std::string_view plistPath, std::string_view configFilePath);
 
     /**
      *    @brief    Add ArmatureFileInfo, it is managed by ArmatureDataManager.
      *            It will load data in a new thread
      */
-    void addArmatureFileInfoAsync(const std::string& imagePath,
-                                  const std::string& plistPath,
-                                  const std::string& configFilePath,
+    void addArmatureFileInfoAsync(std::string_view imagePath,
+                                  std::string_view plistPath,
+                                  std::string_view configFilePath,
                                   cocos2d::Ref* target,
                                   cocos2d::SEL_SCHEDULE selector);
 
     /**
      *    @brief    Add sprite frame to CCSpriteFrameCache, it will save display name and it's relative image name
      */
-    void addSpriteFrameFromFile(const std::string& plistPath,
-                                const std::string& imagePath,
-                                const std::string& configFilePath = "");
+    void addSpriteFrameFromFile(std::string_view plistPath,
+                                std::string_view imagePath,
+                                std::string_view configFilePath = "");
 
-    virtual void removeArmatureFileInfo(const std::string& configFilePath);
+    virtual void removeArmatureFileInfo(std::string_view configFilePath);
 
     /**
      *    @brief    Judge whether or not need auto load sprite file
      */
     bool isAutoLoadSpriteFile();
 
-    const cocos2d::Map<std::string, ArmatureData*>& getArmatureDatas() const;
-    const cocos2d::Map<std::string, AnimationData*>& getAnimationDatas() const;
-    const cocos2d::Map<std::string, TextureData*>& getTextureDatas() const;
+    const cocos2d::StringMap<ArmatureData*>& getArmatureDatas() const;
+    const cocos2d::StringMap<AnimationData*>& getAnimationDatas() const;
+    const cocos2d::StringMap<TextureData*>& getTextureDatas() const;
 
 public:
-    void addRelativeData(const std::string& configFilePath);
-    RelativeData* getRelativeData(const std::string& configFilePath);
+    void addRelativeData(std::string_view configFilePath);
+    RelativeData* getRelativeData(std::string_view configFilePath);
 
 private:
     /**
@@ -193,25 +191,25 @@ class CCS_DLL ArmatureDataManager : public cocos2d::Ref
      *  @key    std::string
      *  @value    ArmatureData *
      */
-    cocos2d::Map<std::string, ArmatureData*> _armarureDatas;
+    cocos2d::StringMap<ArmatureData*> _armarureDatas;
 
     /**
      *    @brief    save animation datas
      *  @key    std::string
      *  @value    AnimationData *
      */
-    cocos2d::Map<std::string, AnimationData*> _animationDatas;
+    cocos2d::StringMap<AnimationData*> _animationDatas;
 
     /**
      *    @brief    save texture datas
      *  @key    std::string
      *  @value    TextureData *
      */
-    cocos2d::Map<std::string, TextureData*> _textureDatas;
+    cocos2d::StringMap<TextureData*> _textureDatas;
 
     bool _autoLoadSpriteFile;
 
-    std::unordered_map<std::string, RelativeData> _relativeDatas;
+    hlookup::string_map<RelativeData> _relativeDatas;
 };
 
 }  // namespace cocostudio
diff --git a/extensions/cocostudio/CCBatchNode.cpp b/extensions/cocostudio/CCBatchNode.cpp
index f7ec04f51914..4344dea84115 100644
--- a/extensions/cocostudio/CCBatchNode.cpp
+++ b/extensions/cocostudio/CCBatchNode.cpp
@@ -69,7 +69,7 @@ void BatchNode::addChild(Node* child, int zOrder, int tag)
     }
 }
 
-void BatchNode::addChild(cocos2d::Node* child, int zOrder, const std::string& name)
+void BatchNode::addChild(cocos2d::Node* child, int zOrder, std::string_view name)
 {
     Node::addChild(child, zOrder, name);
     Armature* armature = dynamic_cast<Armature*>(child);
diff --git a/extensions/cocostudio/CCBatchNode.h b/extensions/cocostudio/CCBatchNode.h
index 88a398345174..7269f6dcbb40 100644
--- a/extensions/cocostudio/CCBatchNode.h
+++ b/extensions/cocostudio/CCBatchNode.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -58,7 +58,7 @@ class CCS_DLL BatchNode : public cocos2d::Node
     virtual bool init() override;
     using Node::addChild;
     virtual void addChild(cocos2d::Node* pChild, int zOrder, int tag) override;
-    virtual void addChild(cocos2d::Node* pChild, int zOrder, const std::string& name) override;
+    virtual void addChild(cocos2d::Node* pChild, int zOrder, std::string_view name) override;
     virtual void removeChild(cocos2d::Node* child, bool cleanup) override;
     virtual void visit(cocos2d::Renderer* renderer,
                        const cocos2d::Mat4& parentTransform,
diff --git a/extensions/cocostudio/CCBone.cpp b/extensions/cocostudio/CCBone.cpp
index bbe38bb39087..1fe824b92f0a 100644
--- a/extensions/cocostudio/CCBone.cpp
+++ b/extensions/cocostudio/CCBone.cpp
@@ -47,7 +47,7 @@ Bone* Bone::create()
     return nullptr;
 }
 
-Bone* Bone::create(const std::string& name)
+Bone* Bone::create(std::string_view name)
 {
 
     Bone* pBone = new Bone();
@@ -95,7 +95,7 @@ bool Bone::init()
     return Bone::init(nullptr);
 }
 
-bool Bone::init(const std::string& name)
+bool Bone::init(std::string_view name)
 {
     bool bRet = false;
     do
@@ -416,7 +416,7 @@ void Bone::changeDisplayByIndex(int index, bool force)
     changeDisplayWithIndex(index, force);
 }
 
-void Bone::changeDisplayByName(const std::string& name, bool force)
+void Bone::changeDisplayByName(std::string_view name, bool force)
 {
     changeDisplayWithName(name, force);
 }
@@ -426,7 +426,7 @@ void Bone::changeDisplayWithIndex(int index, bool force)
     _displayManager->changeDisplayWithIndex(index, force);
 }
 
-void Bone::changeDisplayWithName(const std::string& name, bool force)
+void Bone::changeDisplayWithName(std::string_view name, bool force)
 {
     _displayManager->changeDisplayWithName(name, force);
 }
diff --git a/extensions/cocostudio/CCBone.h b/extensions/cocostudio/CCBone.h
index bea21a95dfa5..409a0a381e4b 100644
--- a/extensions/cocostudio/CCBone.h
+++ b/extensions/cocostudio/CCBone.h
@@ -53,7 +53,7 @@ class CCS_DLL Bone : public cocos2d::Node
      * @param  name If name is not null, then set name to the bone's name
      * @return A initialized bone which is marked as "autorelease".
      */
-    static Bone* create(const std::string& name);
+    static Bone* create(std::string_view name);
 
 public:
     /**
@@ -75,7 +75,7 @@ class CCS_DLL Bone : public cocos2d::Node
      * Initializes a Bone with the specified name
      * @param name Bone's name.
      */
-    virtual bool init(const std::string& name);
+    virtual bool init(std::string_view name);
 
     /**
      * Add display and use displayData to init the display.
@@ -95,10 +95,10 @@ class CCS_DLL Bone : public cocos2d::Node
     void removeDisplay(int index);
 
     CC_DEPRECATED_ATTRIBUTE void changeDisplayByIndex(int index, bool force);
-    CC_DEPRECATED_ATTRIBUTE void changeDisplayByName(const std::string& name, bool force);
+    CC_DEPRECATED_ATTRIBUTE void changeDisplayByName(std::string_view name, bool force);
 
     void changeDisplayWithIndex(int index, bool force);
-    void changeDisplayWithName(const std::string& name, bool force);
+    void changeDisplayWithName(std::string_view name, bool force);
 
     /**
      * Add a child to this bone, and it will let this child call setParent(Bone *parent) function to set self to it's
diff --git a/extensions/cocostudio/CCComAttribute.cpp b/extensions/cocostudio/CCComAttribute.cpp
index 57cf1b07672d..f8c5381915d5 100644
--- a/extensions/cocostudio/CCComAttribute.cpp
+++ b/extensions/cocostudio/CCComAttribute.cpp
@@ -49,27 +49,27 @@ bool ComAttribute::init()
     return true;
 }
 
-void ComAttribute::setInt(const std::string& key, int value)
+void ComAttribute::setInt(std::string_view key, int value)
 {
     _dict[key] = cocos2d::Value(value);
 }
 
-void ComAttribute::setFloat(const std::string& key, float value)
+void ComAttribute::setFloat(std::string_view key, float value)
 {
     _dict[key] = cocos2d::Value(value);
 }
 
-void ComAttribute::setBool(const std::string& key, bool value)
+void ComAttribute::setBool(std::string_view key, bool value)
 {
     _dict[key] = cocos2d::Value(value);
 }
 
-void ComAttribute::setString(const std::string& key, const std::string& value)
+void ComAttribute::setString(std::string_view key, std::string_view value)
 {
     _dict[key] = cocos2d::Value(value);
 }
 
-int ComAttribute::getInt(const std::string& key, int def) const
+int ComAttribute::getInt(std::string_view key, int def) const
 {
     if (_dict.find(key) != _dict.end())
     {
@@ -77,15 +77,15 @@ int ComAttribute::getInt(const std::string& key, int def) const
         return v.asInt();
     }
 
-    if (!DICTOOL->checkObjectExist_json(_doc, key.c_str()))
+    if (!DICTOOL->checkObjectExist_json(_doc, key.data()))
     {
         return def;
     }
 
-    return DICTOOL->getIntValue_json(_doc, key.c_str());
+    return DICTOOL->getIntValue_json(_doc, key.data());
 }
 
-float ComAttribute::getFloat(const std::string& key, float def) const
+float ComAttribute::getFloat(std::string_view key, float def) const
 {
     if (_dict.find(key) != _dict.end())
     {
@@ -93,14 +93,14 @@ float ComAttribute::getFloat(const std::string& key, float def) const
         return v.asFloat();
     }
 
-    if (!DICTOOL->checkObjectExist_json(_doc, key.c_str()))
+    if (!DICTOOL->checkObjectExist_json(_doc, key.data()))
     {
         return def;
     }
-    return DICTOOL->getFloatValue_json(_doc, key.c_str());
+    return DICTOOL->getFloatValue_json(_doc, key.data());
 }
 
-bool ComAttribute::getBool(const std::string& key, bool def) const
+bool ComAttribute::getBool(std::string_view key, bool def) const
 {
     if (_dict.find(key) != _dict.end())
     {
@@ -108,15 +108,15 @@ bool ComAttribute::getBool(const std::string& key, bool def) const
         return v.asBool();
     }
 
-    if (!DICTOOL->checkObjectExist_json(_doc, key.c_str()))
+    if (!DICTOOL->checkObjectExist_json(_doc, key.data()))
     {
         return def;
     }
 
-    return DICTOOL->getBooleanValue_json(_doc, key.c_str());
+    return DICTOOL->getBooleanValue_json(_doc, key.data());
 }
 
-std::string ComAttribute::getString(const std::string& key, const std::string& def) const
+std::string ComAttribute::getString(std::string_view key, std::string_view def) const
 {
     if (_dict.find(key) != _dict.end())
     {
@@ -124,12 +124,12 @@ std::string ComAttribute::getString(const std::string& key, const std::string& d
         return v.asString();
     }
 
-    if (!DICTOOL->checkObjectExist_json(_doc, key.c_str()))
+    if (!DICTOOL->checkObjectExist_json(_doc, key.data()))
     {
-        return def;
+        return std::string{def};
     }
 
-    return DICTOOL->getStringValue_json(_doc, key.c_str());
+    return DICTOOL->getStringValue_json(_doc, key.data());
 }
 
 ComAttribute* ComAttribute::create()
@@ -206,7 +206,7 @@ bool ComAttribute::serialize(void* r)
     return ret;
 }
 
-bool ComAttribute::parse(const std::string& jsonFile)
+bool ComAttribute::parse(std::string_view jsonFile)
 {
     bool ret = false;
     do
diff --git a/extensions/cocostudio/CCComAttribute.h b/extensions/cocostudio/CCComAttribute.h
index 1a47ff8d055c..df368b8c462e 100644
--- a/extensions/cocostudio/CCComAttribute.h
+++ b/extensions/cocostudio/CCComAttribute.h
@@ -54,15 +54,15 @@ class CCS_DLL ComAttribute : public cocos2d::Component
     virtual bool init() override;
     virtual bool serialize(void* r) override;
 
-    void setInt(const std::string& key, int value);
-    void setFloat(const std::string& key, float value);
-    void setBool(const std::string& key, bool value);
-    void setString(const std::string& key, const std::string& value);
-    int getInt(const std::string& key, int def = 0) const;
-    float getFloat(const std::string& key, float def = 0.0f) const;
-    bool getBool(const std::string& key, bool def = false) const;
-    std::string getString(const std::string& key, const std::string& def = "") const;
-    bool parse(const std::string& jsonFile);
+    void setInt(std::string_view key, int value);
+    void setFloat(std::string_view key, float value);
+    void setBool(std::string_view key, bool value);
+    void setString(std::string_view key, std::string_view value);
+    int getInt(std::string_view key, int def = 0) const;
+    float getFloat(std::string_view key, float def = 0.0f) const;
+    bool getBool(std::string_view key, bool def = false) const;
+    std::string getString(std::string_view key, std::string_view def = "") const;
+    bool parse(std::string_view jsonFile);
 
 private:
     cocos2d::ValueMap _dict;
diff --git a/extensions/cocostudio/CCComExtensionData.h b/extensions/cocostudio/CCComExtensionData.h
index 0c5dcb7de01a..973549150616 100644
--- a/extensions/cocostudio/CCComExtensionData.h
+++ b/extensions/cocostudio/CCComExtensionData.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
  Copyright (c) 2015 cocos2d-x.org
 
  http://www.cocos2d-x.org
@@ -69,7 +69,7 @@ class CCS_DLL ComExtensionData : public cocos2d::Component
     static ComExtensionData* create();
     virtual bool init() override;
 
-    virtual void setCustomProperty(const std::string& customProperty) { _customProperty = customProperty; }
+    virtual void setCustomProperty(std::string_view customProperty) { _customProperty = customProperty; }
     virtual std::string getCustomProperty() const { return _customProperty; };
 
     virtual void setActionTag(int actionTag);
diff --git a/extensions/cocostudio/CCComRender.cpp b/extensions/cocostudio/CCComRender.cpp
index ad2262cf8de2..74cf487a8b24 100644
--- a/extensions/cocostudio/CCComRender.cpp
+++ b/extensions/cocostudio/CCComRender.cpp
@@ -383,7 +383,7 @@ ComRender* ComRender::create(cocos2d::Node* node, const char* comName)
     return ret;
 }
 
-bool ComRender::readJson(const std::string& fileName, rapidjson::Document& doc)
+bool ComRender::readJson(std::string_view fileName, rapidjson::Document& doc)
 {
     bool ret = false;
     do
diff --git a/extensions/cocostudio/CCComRender.h b/extensions/cocostudio/CCComRender.h
index 83bc28e58f8a..de0aaeebb17c 100644
--- a/extensions/cocostudio/CCComRender.h
+++ b/extensions/cocostudio/CCComRender.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -79,7 +79,7 @@ class CCS_DLL ComRender : public cocos2d::Component
     virtual ~ComRender();
 
 private:
-    bool readJson(const std::string& fileName, rapidjson::Document& doc);
+    bool readJson(std::string_view fileName, rapidjson::Document& doc);
 
     cocos2d::Node* _render;
 };
diff --git a/extensions/cocostudio/CCDataReaderHelper.cpp b/extensions/cocostudio/CCDataReaderHelper.cpp
index 7cd5acea543d..59d2c7d51d29 100644
--- a/extensions/cocostudio/CCDataReaderHelper.cpp
+++ b/extensions/cocostudio/CCDataReaderHelper.cpp
@@ -133,7 +133,7 @@ static const char* COLOR_INFO         = "color";
 static const char* CONFIG_FILE_PATH = "config_file_path";
 static const char* CONTENT_SCALE    = "content_scale";
 
-static std::string readFileContent(const std::string& filename, bool binary)
+static std::string readFileContent(std::string_view filename, bool binary)
 {
     auto fs = FileUtils::getInstance();
     std::string s;
@@ -264,7 +264,7 @@ DataReaderHelper::~DataReaderHelper()
     _dataReaderHelper = nullptr;
 }
 
-void DataReaderHelper::addDataFromFile(const std::string& filePath)
+void DataReaderHelper::addDataFromFile(std::string_view filePath)
 {
     /*
      * Check if file is already added to ArmatureDataManager, if then return.
@@ -276,19 +276,15 @@ void DataReaderHelper::addDataFromFile(const std::string& filePath)
             return;
         }
     }
-    _configFileList.push_back(filePath);
+    _configFileList.push_back(std::string{filePath});
 
     //! find the base file path
-    std::string basefilePath = filePath;
-    size_t pos               = basefilePath.find_last_of('/');
+    std::string basefilePath;
+    size_t pos = filePath.find_last_of('/');
 
     if (pos != std::string::npos)
     {
-        basefilePath = basefilePath.substr(0, pos + 1);
-    }
-    else
-    {
-        basefilePath = "";
+        basefilePath = filePath.substr(0, pos + 1);
     }
 
     std::string fileExtension = cocos2d::FileUtils::getInstance()->getFileExtension(filePath);
@@ -319,9 +315,9 @@ void DataReaderHelper::addDataFromFile(const std::string& filePath)
     }
 }
 
-void DataReaderHelper::addDataFromFileAsync(const std::string& imagePath,
-                                            const std::string& plistPath,
-                                            const std::string& filePath,
+void DataReaderHelper::addDataFromFileAsync(std::string_view imagePath,
+                                            std::string_view plistPath,
+                                            std::string_view filePath,
                                             Ref* target,
                                             SEL_SCHEDULE selector)
 {
@@ -346,19 +342,15 @@ void DataReaderHelper::addDataFromFileAsync(const std::string& imagePath,
             return;
         }
     }
-    _configFileList.push_back(filePath);
+    _configFileList.push_back(std::string{filePath});
 
     //! find the base file path
-    std::string basefilePath = filePath;
-    size_t pos               = basefilePath.find_last_of('/');
+    std::string basefilePath;
+    size_t pos = filePath.find_last_of('/');
 
     if (pos != std::string::npos)
     {
-        basefilePath = basefilePath.substr(0, pos + 1);
-    }
-    else
-    {
-        basefilePath = "";
+        basefilePath = filePath.substr(0, pos + 1);
     }
 
     // lazy init
@@ -490,7 +482,7 @@ void DataReaderHelper::addDataAsyncCallBack(float /*dt*/)
     }
 }
 
-void DataReaderHelper::removeConfigFile(const std::string& configFile)
+void DataReaderHelper::removeConfigFile(std::string_view configFile)
 {
     auto it_end = _configFileList.end();
     for (auto it = _configFileList.begin(); it != it_end; ++it)
@@ -503,10 +495,12 @@ void DataReaderHelper::removeConfigFile(const std::string& configFile)
     }
 }
 
-void DataReaderHelper::addDataFromCache(const std::string& pFileContent, DataInfo* dataInfo)
+void DataReaderHelper::addDataFromCache(std::string_view pFileContent, DataInfo* dataInfo)
 {
     pugi::xml_document document;
-    document.load_string(pFileContent.c_str());
+    pugi::xml_parse_result ret = document.load_buffer(pFileContent.data(), pFileContent.length());
+    if (!ret)
+        return;
 
     auto root                  = document.document_element();
     dataInfo->flashToolVersion = root.attribute(VERSION).as_float();
@@ -1116,15 +1110,15 @@ ContourData* DataReaderHelper::decodeContour(pugi::xml_node& contourXML, DataInf
     return contourData;
 }
 
-void DataReaderHelper::addDataFromJsonCache(const std::string& fileContent, DataInfo* dataInfo)
+void DataReaderHelper::addDataFromJsonCache(std::string_view fileContent, DataInfo* dataInfo)
 {
     rapidjson::Document json;
-    rapidjson::StringStream stream(fileContent.c_str());
+    rapidjson::StringStream stream(fileContent.data());
 
     if (fileContent.size() >= 3)
     {
         // Skip BOM if exists
-        const unsigned char* c = (const unsigned char*)fileContent.c_str();
+        const unsigned char* c = (const unsigned char*)fileContent.data();
         unsigned bom           = c[0] | (c[1] << 8) | (c[2] << 16);
 
         if (bom == 0xBFBBEF)  // UTF8 BOM
diff --git a/extensions/cocostudio/CCDataReaderHelper.h b/extensions/cocostudio/CCDataReaderHelper.h
index aa511c27aba6..b3437f7cb6b7 100644
--- a/extensions/cocostudio/CCDataReaderHelper.h
+++ b/extensions/cocostudio/CCDataReaderHelper.h
@@ -114,16 +114,16 @@ class CCS_DLL DataReaderHelper : cocos2d::Ref
      */
     ~DataReaderHelper();
 
-    void addDataFromFile(const std::string& filePath);
-    void addDataFromFileAsync(const std::string& imagePath,
-                              const std::string& plistPath,
-                              const std::string& filePath,
+    void addDataFromFile(std::string_view filePath);
+    void addDataFromFileAsync(std::string_view imagePath,
+                              std::string_view plistPath,
+                              std::string_view filePath,
                               cocos2d::Ref* target,
                               cocos2d::SEL_SCHEDULE selector);
 
     void addDataAsyncCallBack(float dt);
 
-    void removeConfigFile(const std::string& configFile);
+    void removeConfigFile(std::string_view configFile);
 
 public:
     /**
@@ -132,7 +132,7 @@ class CCS_DLL DataReaderHelper : cocos2d::Ref
      *
      * @param xmlPath The cache of the xml
      */
-    static void addDataFromCache(const std::string& pFileContent, DataInfo* dataInfo = nullptr);
+    static void addDataFromCache(std::string_view pFileContent, DataInfo* dataInfo = nullptr);
 
     /**
      * Decode Armature Datas from xml export from Dragon Bone flash tool
@@ -166,7 +166,7 @@ class CCS_DLL DataReaderHelper : cocos2d::Ref
     static ContourData* decodeContour(pugi::xml_node& contourXML, DataInfo* dataInfo);
 
 public:
-    static void addDataFromJsonCache(const std::string& fileContent, DataInfo* dataInfo = nullptr);
+    static void addDataFromJsonCache(std::string_view fileContent, DataInfo* dataInfo = nullptr);
 
     static ArmatureData* decodeArmature(const rapidjson::Value& json, DataInfo* dataInfo);
     static BoneData* decodeBone(const rapidjson::Value& json, DataInfo* dataInfo);
diff --git a/extensions/cocostudio/CCDatas.cpp b/extensions/cocostudio/CCDatas.cpp
index ff8d44569d0a..ef45d8bd45ff 100644
--- a/extensions/cocostudio/CCDatas.cpp
+++ b/extensions/cocostudio/CCDatas.cpp
@@ -136,16 +136,18 @@ Color4B BaseData::getColor()
     return Color4B(r, g, b, a);
 }
 
-std::string DisplayData::changeDisplayToTexture(const std::string& displayName)
+std::string DisplayData::changeDisplayToTexture(std::string_view displayName)
 {
     // remove .xxx
-    std::string textureName = displayName;
-    size_t startPos         = textureName.find_last_of(".");
+    std::string textureName;
+    size_t startPos = displayName.find_last_of(".");
 
     if (startPos != std::string::npos)
     {
-        textureName = textureName.erase(startPos);
+        textureName.assign(displayName.data(), startPos);  // textureName = textureName.erase(startPos);
     }
+    else
+        textureName = displayName;
 
     return textureName;
 }
@@ -216,7 +218,7 @@ void ArmatureData::addBoneData(BoneData* boneData)
     boneDataDic.insert(boneData->name, boneData);
 }
 
-BoneData* ArmatureData::getBoneData(const std::string& boneName)
+BoneData* ArmatureData::getBoneData(std::string_view boneName)
 {
     return static_cast<BoneData*>(boneDataDic.at(boneName));
 }
@@ -305,7 +307,7 @@ void MovementData::addMovementBoneData(MovementBoneData* movBoneData)
     movBoneDataDic.insert(movBoneData->name, movBoneData);
 }
 
-MovementBoneData* MovementData::getMovementBoneData(const std::string& boneName)
+MovementBoneData* MovementData::getMovementBoneData(std::string_view boneName)
 {
     return movBoneDataDic.at(boneName);
 }
@@ -320,7 +322,7 @@ void AnimationData::addMovement(MovementData* movData)
     movementNames.push_back(movData->name);
 }
 
-MovementData* AnimationData::getMovement(const std::string& movementName)
+MovementData* AnimationData::getMovement(std::string_view movementName)
 {
     return movementDataDic.at(movementName);
 }
diff --git a/extensions/cocostudio/CCDatas.h b/extensions/cocostudio/CCDatas.h
index 08985516ec6f..dc2d76752648 100644
--- a/extensions/cocostudio/CCDatas.h
+++ b/extensions/cocostudio/CCDatas.h
@@ -140,7 +140,7 @@ class CCS_DLL DisplayData : public cocos2d::Ref
 public:
     CC_CREATE_NO_PARAM_NO_INIT(DisplayData)
 
-    static std::string changeDisplayToTexture(const std::string& displayName);
+    static std::string changeDisplayToTexture(std::string_view displayName);
 
 public:
     /**
@@ -282,11 +282,11 @@ class CCS_DLL ArmatureData : public cocos2d::Ref
 
     bool init();
     void addBoneData(BoneData* boneData);
-    BoneData* getBoneData(const std::string& boneName);
+    BoneData* getBoneData(std::string_view boneName);
 
 public:
     std::string name;
-    cocos2d::Map<std::string, BoneData*> boneDataDic;
+    cocos2d::StringMap<BoneData*> boneDataDic;
     float dataVersion;
 };
 
@@ -409,7 +409,7 @@ class CCS_DLL MovementData : public cocos2d::Ref
     ~MovementData(void);
 
     void addMovementBoneData(MovementBoneData* movBoneData);
-    MovementBoneData* getMovementBoneData(const std::string& boneName);
+    MovementBoneData* getMovementBoneData(std::string_view boneName);
 
 public:
     std::string name;
@@ -443,10 +443,10 @@ class CCS_DLL MovementData : public cocos2d::Ref
 
     /**
      * @brief    save movement bone data
-     * @key    const std::string&
+     * @key    std::string_view
      * @value    MovementBoneData *
      */
-    cocos2d::Map<std::string, MovementBoneData*> movBoneDataDic;
+    cocos2d::StringMap<MovementBoneData*> movBoneDataDic;
 };
 
 /**
@@ -472,12 +472,12 @@ class CCS_DLL AnimationData : public cocos2d::Ref
     ~AnimationData(void);
 
     void addMovement(MovementData* movData);
-    MovementData* getMovement(const std::string& movementName);
+    MovementData* getMovement(std::string_view movementName);
     ssize_t getMovementCount();
 
 public:
     std::string name;
-    cocos2d::Map<std::string, MovementData*> movementDataDic;
+    cocos2d::StringMap<MovementData*> movementDataDic;
     std::vector<std::string> movementNames;
 };
 
diff --git a/extensions/cocostudio/CCDisplayManager.cpp b/extensions/cocostudio/CCDisplayManager.cpp
index f5a4377d0482..b6d07cc6fa0b 100644
--- a/extensions/cocostudio/CCDisplayManager.cpp
+++ b/extensions/cocostudio/CCDisplayManager.cpp
@@ -129,7 +129,7 @@ void DisplayManager::addDisplay(Node* display, int index)
         skin->setBone(_bone);
         displayData = SpriteDisplayData::create();
 
-        DisplayFactory::initSpriteDisplay(_bone, decoDisplay, skin->getDisplayName().c_str(), skin);
+        DisplayFactory::initSpriteDisplay(_bone, decoDisplay, skin->getDisplayName().data(), skin);
 
         if (SpriteDisplayData* spriteDisplayData = (SpriteDisplayData*)decoDisplay->getDisplayData())
         {
@@ -239,7 +239,7 @@ void DisplayManager::changeDisplayWithIndex(int index, bool force)
     setCurrentDecorativeDisplay(decoDisplay);
 }
 
-void DisplayManager::changeDisplayWithName(const std::string& name, bool force)
+void DisplayManager::changeDisplayWithName(std::string_view name, bool force)
 {
     for (int i = 0; i < _decoDisplayList.size(); i++)
     {
diff --git a/extensions/cocostudio/CCDisplayManager.h b/extensions/cocostudio/CCDisplayManager.h
index 1e32d8f7a788..f43fb13e56ee 100644
--- a/extensions/cocostudio/CCDisplayManager.h
+++ b/extensions/cocostudio/CCDisplayManager.h
@@ -80,7 +80,7 @@ class CCS_DLL DisplayManager : public cocos2d::Ref
      * @deprecated, please use changeDisplayWithIndex and changeDisplayWithName
      */
     CC_DEPRECATED_ATTRIBUTE void changeDisplayByIndex(int index, bool force);
-    CC_DEPRECATED_ATTRIBUTE void changeDisplayByName(const std::string& name, bool force);
+    CC_DEPRECATED_ATTRIBUTE void changeDisplayByName(std::string_view name, bool force);
 
     /**
      * Change display by index. You can just use this method to change display in the display list.
@@ -93,7 +93,7 @@ class CCS_DLL DisplayManager : public cocos2d::Ref
      * index edit in the flash every key frame.
      */
     void changeDisplayWithIndex(int index, bool force);
-    void changeDisplayWithName(const std::string& name, bool force);
+    void changeDisplayWithName(std::string_view name, bool force);
 
     cocos2d::Node* getDisplayRenderNode() const;
     DisplayType getDisplayRenderNodeType() const;
diff --git a/extensions/cocostudio/CCSGUIReader.cpp b/extensions/cocostudio/CCSGUIReader.cpp
index 0855bb102a0a..1edeaea0080f 100644
--- a/extensions/cocostudio/CCSGUIReader.cpp
+++ b/extensions/cocostudio/CCSGUIReader.cpp
@@ -160,7 +160,7 @@ cocos2d::Size GUIReader::getFileDesignSize(const char* fileName) const
     return Size(w, h);
 }
 
-void GUIReader::registerTypeAndCallBack(const std::string& classType,
+void GUIReader::registerTypeAndCallBack(std::string_view classType,
                                         ObjectFactory::Instance ins,
                                         Ref* object,
                                         SEL_ParseEvent callBack)
@@ -181,7 +181,7 @@ void GUIReader::registerTypeAndCallBack(const std::string& classType,
     }
 }
 
-void GUIReader::registerTypeAndCallBack(const std::string& classType,
+void GUIReader::registerTypeAndCallBack(std::string_view classType,
                                         ObjectFactory::InstanceFunc ins,
                                         Ref* object,
                                         SEL_ParseEvent callBack)
@@ -309,9 +309,9 @@ std::string WidgetPropertiesReader::getWidgetReaderClassName(Widget* widget)
     return readerName;
 }
 
-std::string WidgetPropertiesReader::getGUIClassName(const std::string& name)
+std::string WidgetPropertiesReader::getGUIClassName(std::string_view name)
 {
-    std::string convertedClassName = name;
+    std::string convertedClassName;
     if (name == "Panel")
     {
         convertedClassName = "Layout";
@@ -336,11 +336,13 @@ std::string WidgetPropertiesReader::getGUIClassName(const std::string& name)
     {
         convertedClassName = "TextBMFont";
     }
+    else
+        convertedClassName = name;
 
     return convertedClassName;
 }
 
-cocos2d::ui::Widget* WidgetPropertiesReader::createGUI(const std::string& classname)
+cocos2d::ui::Widget* WidgetPropertiesReader::createGUI(std::string_view classname)
 {
     std::string name = this->getGUIClassName(classname);
 
@@ -349,7 +351,7 @@ cocos2d::ui::Widget* WidgetPropertiesReader::createGUI(const std::string& classn
     return dynamic_cast<ui::Widget*>(object);
 }
 
-WidgetReaderProtocol* WidgetPropertiesReader::createWidgetReaderProtocol(const std::string& classname)
+WidgetReaderProtocol* WidgetPropertiesReader::createWidgetReaderProtocol(std::string_view classname)
 {
     Ref* object = ObjectFactory::getInstance()->createObject(classname);
 
@@ -426,10 +428,10 @@ Widget* GUIReader::widgetFromBinaryFile(const char* fileName)
     return widget;
 }
 
-std::string WidgetPropertiesReader::getWidgetReaderClassName(const std::string& classname)
+std::string WidgetPropertiesReader::getWidgetReaderClassName(std::string_view classname)
 {
     // create widget reader to parse properties of widget
-    std::string readerName = classname;
+    std::string readerName;
     if (readerName == "Panel")
     {
         readerName = "Layout";
@@ -454,6 +456,8 @@ std::string WidgetPropertiesReader::getWidgetReaderClassName(const std::string&
     {
         readerName = "TextBMFont";
     }
+    else
+        readerName = classname;
     readerName.append("Reader");
     return readerName;
 }
@@ -1240,7 +1244,7 @@ void WidgetPropertiesReader0250::setPropsForAllWidgetFromJsonDictionary(WidgetRe
                                                                         const rapidjson::Value& /*options*/)
 {}
 
-void WidgetPropertiesReader0250::setPropsForAllCustomWidgetFromJsonDictionary(const std::string& /*classType*/,
+void WidgetPropertiesReader0250::setPropsForAllCustomWidgetFromJsonDictionary(std::string_view /*classType*/,
                                                                               cocos2d::ui::Widget* /*widget*/,
                                                                               const rapidjson::Value& /*customOptions*/)
 {}
@@ -1542,7 +1546,7 @@ void WidgetPropertiesReader0300::setPropsForAllWidgetFromBinary(WidgetReaderProt
     reader->setPropsFromBinary(widget, cocoLoader, cocoNode);
 }
 
-void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromBinary(const std::string& /*classType*/,
+void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromBinary(std::string_view /*classType*/,
                                                                       cocos2d::ui::Widget* /*widget*/,
                                                                       CocoLoader* /*cocoLoader*/,
                                                                       stExpCocoNode* /*pCocoNode*/)
@@ -1637,17 +1641,17 @@ void WidgetPropertiesReader0300::setPropsForAllWidgetFromJsonDictionary(WidgetRe
     reader->setPropsFromJsonDictionary(widget, options);
 }
 
-void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
+void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromJsonDictionary(std::string_view classType,
                                                                               cocos2d::ui::Widget* widget,
                                                                               const rapidjson::Value& customOptions)
 {
     GUIReader* guiReader = GUIReader::getInstance();
 
-    std::map<std::string, Ref*>* object_map = guiReader->getParseObjectMap();
-    Ref* object                             = (*object_map)[classType];
+    hlookup::string_map<Ref*>* object_map = guiReader->getParseObjectMap();
+    Ref* object                           = (*object_map)[classType];
 
-    std::map<std::string, SEL_ParseEvent>* selector_map = guiReader->getParseCallBackMap();
-    SEL_ParseEvent selector                             = (*selector_map)[classType];
+    hlookup::string_map<SEL_ParseEvent>* selector_map = guiReader->getParseCallBackMap();
+    SEL_ParseEvent selector                           = (*selector_map)[classType];
 
     if (object && selector)
     {
diff --git a/extensions/cocostudio/CCSGUIReader.h b/extensions/cocostudio/CCSGUIReader.h
index 5c277866ccb7..efec53063425 100644
--- a/extensions/cocostudio/CCSGUIReader.h
+++ b/extensions/cocostudio/CCSGUIReader.h
@@ -50,7 +50,7 @@ struct stExpCocoNode;
 
 #define kCCSVersion 1.0
 
-typedef void (cocos2d::Ref::*SEL_ParseEvent)(const std::string&, cocos2d::Ref*, const rapidjson::Value&);
+typedef void (cocos2d::Ref::*SEL_ParseEvent)(std::string_view, cocos2d::Ref*, const rapidjson::Value&);
 #define parseselector(_SELECTOR) (SEL_ParseEvent)(&_SELECTOR)
 
 class CCS_DLL GUIReader : public cocos2d::Ref
@@ -76,15 +76,15 @@ class CCS_DLL GUIReader : public cocos2d::Ref
      */
     cocos2d::Size getFileDesignSize(const char* fileName) const;
 
-    void setFilePath(const std::string& strFilePath) { m_strFilePath = strFilePath; }
-    const std::string& getFilePath() const { return m_strFilePath; }
+    void setFilePath(std::string_view strFilePath) { m_strFilePath = strFilePath; }
+    std::string_view getFilePath() const { return m_strFilePath; }
 
-    void registerTypeAndCallBack(const std::string& classType,
+    void registerTypeAndCallBack(std::string_view classType,
                                  cocos2d::ObjectFactory::Instance ins,
                                  Ref* object,
                                  SEL_ParseEvent callBack);
 
-    void registerTypeAndCallBack(const std::string& classType,
+    void registerTypeAndCallBack(std::string_view classType,
                                  cocos2d::ObjectFactory::InstanceFunc ins,
                                  Ref* object,
                                  SEL_ParseEvent callBack);
@@ -96,9 +96,9 @@ class CCS_DLL GUIReader : public cocos2d::Ref
     std::string m_strFilePath;
     cocos2d::ValueMap _fileDesignSizes;
 
-    typedef std::map<std::string, SEL_ParseEvent> ParseCallBackMap;
+    typedef hlookup::string_map<SEL_ParseEvent> ParseCallBackMap;
     ParseCallBackMap _mapParseSelector;
-    typedef std::map<std::string, Ref*> ParseObjectMap;
+    typedef hlookup::string_map<Ref*> ParseObjectMap;
     ParseObjectMap _mapObject;
 
 public:
@@ -118,7 +118,7 @@ class CCS_DLL WidgetPropertiesReader : public cocos2d::Ref
                                                         cocos2d::ui::Widget* widget,
                                                         const rapidjson::Value& options) = 0;
 
-    virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
+    virtual void setPropsForAllCustomWidgetFromJsonDictionary(std::string_view classType,
                                                               cocos2d::ui::Widget* widget,
                                                               const rapidjson::Value& customOptions) = 0;
 
@@ -134,12 +134,12 @@ class CCS_DLL WidgetPropertiesReader : public cocos2d::Ref
 
 protected:
     void setAnchorPointForWidget(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
-    std::string getWidgetReaderClassName(const std::string& classname);
+    std::string getWidgetReaderClassName(std::string_view classname);
     std::string getWidgetReaderClassName(cocos2d::ui::Widget* widget);
 
-    std::string getGUIClassName(const std::string& name);
-    cocos2d::ui::Widget* createGUI(const std::string& classname);
-    WidgetReaderProtocol* createWidgetReaderProtocol(const std::string& classname);
+    std::string getGUIClassName(std::string_view name);
+    cocos2d::ui::Widget* createGUI(std::string_view classname);
+    WidgetReaderProtocol* createWidgetReaderProtocol(std::string_view classname);
 
 protected:
     std::string m_strFilePath;
@@ -189,7 +189,7 @@ class CCS_DLL WidgetPropertiesReader0250 : public WidgetPropertiesReader
     virtual void setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* reader,
                                                         cocos2d::ui::Widget* widget,
                                                         const rapidjson::Value& options) override;
-    virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
+    virtual void setPropsForAllCustomWidgetFromJsonDictionary(std::string_view classType,
                                                               cocos2d::ui::Widget* widget,
                                                               const rapidjson::Value& customOptions) override;
 };
@@ -217,7 +217,7 @@ class CCS_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader
                                                 CocoLoader* cocoLoader,
                                                 stExpCocoNode* pCocoNode) override;
 
-    virtual void setPropsForAllCustomWidgetFromBinary(const std::string& classType,
+    virtual void setPropsForAllCustomWidgetFromBinary(std::string_view classType,
                                                       cocos2d::ui::Widget* widget,
                                                       CocoLoader* cocoLoader,
                                                       stExpCocoNode* pCocoNode);
@@ -228,7 +228,7 @@ class CCS_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader
                                                         cocos2d::ui::Widget* widget,
                                                         const rapidjson::Value& options) override;
 
-    virtual void setPropsForAllCustomWidgetFromJsonDictionary(const std::string& classType,
+    virtual void setPropsForAllCustomWidgetFromJsonDictionary(std::string_view classType,
                                                               cocos2d::ui::Widget* widget,
                                                               const rapidjson::Value& customOptions) override;
 };
diff --git a/extensions/cocostudio/CCSSceneReader.cpp b/extensions/cocostudio/CCSSceneReader.cpp
index 477341309d48..c93c80f393ee 100644
--- a/extensions/cocostudio/CCSSceneReader.cpp
+++ b/extensions/cocostudio/CCSSceneReader.cpp
@@ -54,7 +54,7 @@ const char* SceneReader::sceneReaderVersion()
 }
 
 cocos2d::Node* SceneReader::createNodeWithSceneFile(
-    const std::string& fileName,
+    std::string_view fileName,
     AttachComponentType attachComponent /*= AttachComponentType::EMPTY_NODE*/)
 {
     std::string fileExtension = cocos2d::FileUtils::getInstance()->getFileExtension(fileName);
@@ -161,12 +161,12 @@ cocos2d::Node* SceneReader::createNodeWithSceneFile(
     }
     else
     {
-        log("read file [%s] error!\n", fileName.c_str());
+        log("read file [%s] error!\n", fileName.data());
     }
     return nullptr;
 }
 
-bool SceneReader::readJson(const std::string& fileName, rapidjson::Document& doc)
+bool SceneReader::readJson(std::string_view fileName, rapidjson::Document& doc)
 {
     bool ret = false;
     do
@@ -210,14 +210,14 @@ Node* SceneReader::nodeByTag(Node* parent, int tag)
     return _retNode;
 }
 
-cocos2d::Component* SceneReader::createComponent(const std::string& classname)
+cocos2d::Component* SceneReader::createComponent(std::string_view classname)
 {
     std::string name = this->getComponentClassName(classname);
     Ref* object      = ObjectFactory::getInstance()->createObject(name);
 
     return dynamic_cast<Component*>(object);
 }
-std::string SceneReader::getComponentClassName(const std::string& name)
+std::string SceneReader::getComponentClassName(std::string_view name)
 {
     std::string comName;
     if (name == "CCSprite" || name == "CCTMXTiledMap" || name == "CCParticleSystemQuad" || name == "CCArmature" ||
diff --git a/extensions/cocostudio/CCSSceneReader.h b/extensions/cocostudio/CCSSceneReader.h
index 90163ac7e5b1..4cb2e599b217 100644
--- a/extensions/cocostudio/CCSSceneReader.h
+++ b/extensions/cocostudio/CCSSceneReader.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 Copyright (c) 2021 Bytedance Inc.
 
@@ -61,7 +61,7 @@ class CCS_DLL SceneReader
      */
     static void destroyInstance();
     static const char* sceneReaderVersion();
-    cocos2d::Node* createNodeWithSceneFile(const std::string& fileName,
+    cocos2d::Node* createNodeWithSceneFile(std::string_view fileName,
                                            AttachComponentType attachComponent = AttachComponentType::EMPTY_NODE);
     void setTarget(const std::function<void(cocos2d::Ref* obj, void* doc)>& selector);
     cocos2d::Node* getNodeByTag(int nTag);
@@ -70,15 +70,15 @@ class CCS_DLL SceneReader
     virtual ~SceneReader();
 
 private:
-    std::string getComponentClassName(const std::string& name);
+    std::string getComponentClassName(std::string_view name);
 
-    cocos2d::Component* createComponent(const std::string& classname);
+    cocos2d::Component* createComponent(std::string_view classname);
 
     cocos2d::Node* createObject(const rapidjson::Value& dict,
                                 cocos2d::Node* parent,
                                 AttachComponentType attachComponent);
     void setPropertyFromJsonDict(const rapidjson::Value& dict, cocos2d::Node* node);
-    bool readJson(const std::string& fileName, rapidjson::Document& doc);
+    bool readJson(std::string_view fileName, rapidjson::Document& doc);
 
     cocos2d::Node* createObject(CocoLoader* cocoLoader,
                                 stExpCocoNode* cocoNode,
diff --git a/extensions/cocostudio/CCSkin.cpp b/extensions/cocostudio/CCSkin.cpp
index 253354a23517..a532988362fc 100644
--- a/extensions/cocostudio/CCSkin.cpp
+++ b/extensions/cocostudio/CCSkin.cpp
@@ -55,7 +55,7 @@ Skin* Skin::create()
     return nullptr;
 }
 
-Skin* Skin::createWithSpriteFrameName(const std::string& pszSpriteFrameName)
+Skin* Skin::createWithSpriteFrameName(std::string_view pszSpriteFrameName)
 {
     Skin* skin = new Skin();
     if (skin->initWithSpriteFrameName(pszSpriteFrameName))
@@ -67,7 +67,7 @@ Skin* Skin::createWithSpriteFrameName(const std::string& pszSpriteFrameName)
     return nullptr;
 }
 
-Skin* Skin::create(const std::string& pszFileName)
+Skin* Skin::create(std::string_view pszFileName)
 {
     Skin* skin = new Skin();
     if (skin->initWithFile(pszFileName))
@@ -81,7 +81,7 @@ Skin* Skin::create(const std::string& pszFileName)
 
 Skin::Skin() : _bone(nullptr), _armature(nullptr), _displayName(), _skinTransform(Mat4::IDENTITY) {}
 
-bool Skin::initWithSpriteFrameName(const std::string& spriteFrameName)
+bool Skin::initWithSpriteFrameName(std::string_view spriteFrameName)
 {
     CCAssert(spriteFrameName != "", "");
 
@@ -94,7 +94,7 @@ bool Skin::initWithSpriteFrameName(const std::string& spriteFrameName)
     }
     else
     {
-        CCLOG("Can't find CCSpriteFrame with %s. Please check your .plist file", spriteFrameName.c_str());
+        CCLOG("Can't find CCSpriteFrame with %s. Please check your .plist file", spriteFrameName.data());
         ret = false;
     }
 
@@ -103,7 +103,7 @@ bool Skin::initWithSpriteFrameName(const std::string& spriteFrameName)
     return ret;
 }
 
-bool Skin::initWithFile(const std::string& filename)
+bool Skin::initWithFile(std::string_view filename)
 {
     bool ret = Sprite::initWithFile(filename);
 
diff --git a/extensions/cocostudio/CCSkin.h b/extensions/cocostudio/CCSkin.h
index 74046b428ad6..f1b0fc40b11d 100644
--- a/extensions/cocostudio/CCSkin.h
+++ b/extensions/cocostudio/CCSkin.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -39,8 +39,8 @@ class CCS_DLL Skin : public cocos2d::Sprite
 {
 public:
     static Skin* create();
-    static Skin* createWithSpriteFrameName(const std::string& pszSpriteFrameName);
-    static Skin* create(const std::string& pszFileName);
+    static Skin* createWithSpriteFrameName(std::string_view pszSpriteFrameName);
+    static Skin* create(std::string_view pszFileName);
 
 public:
     /**
@@ -48,8 +48,8 @@ class CCS_DLL Skin : public cocos2d::Sprite
      */
     Skin();
 
-    virtual bool initWithSpriteFrameName(const std::string& spriteFrameName) override;
-    virtual bool initWithFile(const std::string& filename) override;
+    virtual bool initWithSpriteFrameName(std::string_view spriteFrameName) override;
+    virtual bool initWithFile(std::string_view filename) override;
 
     void updateArmatureTransform();
     void updateTransform() override;
@@ -73,7 +73,7 @@ class CCS_DLL Skin : public cocos2d::Sprite
     virtual void setBone(Bone* bone);
     virtual Bone* getBone() const;
 
-    virtual const std::string& getDisplayName() const { return _displayName; }
+    virtual std::string_view getDisplayName() const { return _displayName; }
 
 protected:
     BaseData _skinData;
diff --git a/extensions/cocostudio/CCSpriteFrameCacheHelper.cpp b/extensions/cocostudio/CCSpriteFrameCacheHelper.cpp
index ffa14bbaff6b..66f70f755213 100644
--- a/extensions/cocostudio/CCSpriteFrameCacheHelper.cpp
+++ b/extensions/cocostudio/CCSpriteFrameCacheHelper.cpp
@@ -50,7 +50,7 @@ void SpriteFrameCacheHelper::purge()
     _spriteFrameCacheHelper = nullptr;
 }
 
-void SpriteFrameCacheHelper::retainSpriteFrames(const std::string& plistPath)
+void SpriteFrameCacheHelper::retainSpriteFrames(std::string_view plistPath)
 {
     auto it = _usingSpriteFrames.find(plistPath);
     if (it != _usingSpriteFrames.end())
@@ -72,7 +72,7 @@ void SpriteFrameCacheHelper::retainSpriteFrames(const std::string& plistPath)
     _usingSpriteFrames[plistPath] = vec;
 }
 
-void SpriteFrameCacheHelper::releaseSpriteFrames(const std::string& plistPath)
+void SpriteFrameCacheHelper::releaseSpriteFrames(std::string_view plistPath)
 {
     auto it = _usingSpriteFrames.find(plistPath);
     if (it == _usingSpriteFrames.end())
@@ -89,13 +89,13 @@ void SpriteFrameCacheHelper::releaseSpriteFrames(const std::string& plistPath)
     _usingSpriteFrames.erase(it);
 }
 
-void SpriteFrameCacheHelper::removeSpriteFrameFromFile(const std::string& plistPath)
+void SpriteFrameCacheHelper::removeSpriteFrameFromFile(std::string_view plistPath)
 {
     SpriteFrameCache::getInstance()->removeSpriteFramesFromFile(plistPath);
     releaseSpriteFrames(plistPath);
 }
 
-void SpriteFrameCacheHelper::addSpriteFrameFromFile(const std::string& plistPath, const std::string& imagePath)
+void SpriteFrameCacheHelper::addSpriteFrameFromFile(std::string_view plistPath, std::string_view imagePath)
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(plistPath, imagePath);
     retainSpriteFrames(plistPath);
diff --git a/extensions/cocostudio/CCSpriteFrameCacheHelper.h b/extensions/cocostudio/CCSpriteFrameCacheHelper.h
index a24be2704919..8f168b545231 100644
--- a/extensions/cocostudio/CCSpriteFrameCacheHelper.h
+++ b/extensions/cocostudio/CCSpriteFrameCacheHelper.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -60,17 +60,17 @@ class CCS_DLL SpriteFrameCacheHelper
     /**
      *    @brief    Add sprite frame to CCSpriteFrameCache, it will save display name and it's relative image name
      */
-    void addSpriteFrameFromFile(const std::string& plistPath, const std::string& imagePath);
-    void removeSpriteFrameFromFile(const std::string& plistPath);
+    void addSpriteFrameFromFile(std::string_view plistPath, std::string_view imagePath);
+    void removeSpriteFrameFromFile(std::string_view plistPath);
 
 private:
-    void retainSpriteFrames(const std::string& plistPath);
-    void releaseSpriteFrames(const std::string& plistPath);
+    void retainSpriteFrames(std::string_view plistPath);
+    void releaseSpriteFrames(std::string_view plistPath);
 
     SpriteFrameCacheHelper();
     ~SpriteFrameCacheHelper();
 
-    std::map<std::string, std::vector<cocos2d::SpriteFrame*>> _usingSpriteFrames;
+    hlookup::string_map<std::vector<cocos2d::SpriteFrame*>> _usingSpriteFrames;
     static SpriteFrameCacheHelper* _spriteFrameCacheHelper;
 };
 
diff --git a/extensions/cocostudio/CocosStudioExport.h b/extensions/cocostudio/CocosStudioExport.h
index 89e1929c0dad..dcc448bf4074 100644
--- a/extensions/cocostudio/CocosStudioExport.h
+++ b/extensions/cocostudio/CocosStudioExport.h
@@ -31,4 +31,6 @@
 #    define CCS_DLL
 #endif
 
+#include "base/hlookup.h"
+
 #endif /* __CCEXTENSIONEXPORT_H__*/
\ No newline at end of file
diff --git a/extensions/cocostudio/FlatBuffersSerialize.cpp b/extensions/cocostudio/FlatBuffersSerialize.cpp
index 1ca0006455b0..bdd839b6e0e7 100644
--- a/extensions/cocostudio/FlatBuffersSerialize.cpp
+++ b/extensions/cocostudio/FlatBuffersSerialize.cpp
@@ -141,8 +141,8 @@ void FlatBuffersSerialize::deleteFlatBufferBuilder()
     }
 }
 
-std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFile(const std::string& xmlFileName,
-                                                                  const std::string& flatbuffersFileName)
+std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFile(std::string_view xmlFileName,
+                                                                  std::string_view flatbuffersFileName)
 {
     std::string inFullpath = FileUtils::getInstance()->fullPathForFilename(xmlFileName).c_str();
 
@@ -157,7 +157,7 @@ std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFile(const std::str
 }
 
 std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLBuffer(std::string& xmlBuffer,
-                                                                    const std::string& flatbuffersFileName)
+                                                                    std::string_view flatbuffersFileName)
 {
     // xml parse
     pugi::xml_document document;
@@ -168,7 +168,7 @@ std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLBuffer(std::string&
     return "";
 }
 
-std::string FlatBuffersSerialize::serializeFlatBuffersWithOpaque(void* opaque, const std::string& flatbuffersFileName)
+std::string FlatBuffersSerialize::serializeFlatBuffersWithOpaque(void* opaque, std::string_view flatbuffersFileName)
 {
     auto thiz = FlatBuffersSerialize::getInstance();
 
@@ -451,9 +451,9 @@ int FlatBuffersSerialize::getResourceType(std::string key)
     return 1;
 }
 
-std::string FlatBuffersSerialize::getGUIClassName(const std::string& name)
+std::string FlatBuffersSerialize::getGUIClassName(std::string_view name)
 {
-    std::string convertedClassName = name;
+    std::string convertedClassName;
     if (name == "Panel")
     {
         convertedClassName = "Layout";
@@ -478,6 +478,8 @@ std::string FlatBuffersSerialize::getGUIClassName(const std::string& name)
     {
         convertedClassName = "TextBMFont";
     }
+    else
+        convertedClassName = name;
 
     return convertedClassName;
 }
@@ -1231,7 +1233,7 @@ flatbuffers::Offset<flatbuffers::EasingData> FlatBuffersSerialize::createEasingD
 }
 
 /* create flat buffers with XML */
-FlatBufferBuilder* FlatBuffersSerialize::createFlatBuffersWithXMLFileForSimulator(const std::string& xmlFileName)
+FlatBufferBuilder* FlatBuffersSerialize::createFlatBuffersWithXMLFileForSimulator(std::string_view xmlFileName)
 {
     std::string inFullpath = FileUtils::getInstance()->fullPathForFilename(xmlFileName);
 
@@ -1520,9 +1522,9 @@ Offset<ProjectNodeOptions> FlatBuffersSerialize::createProjectNodeOptionsForSimu
 }
 
 /* Serialize language XML file to Flat Buffers file. */
-std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFileForLanguageData(const std::string& xmlFilePath,
-                                                                                 const std::string& flatBuffersFilePath,
-                                                                                 const std::string& languageName)
+std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFileForLanguageData(std::string_view xmlFilePath,
+                                                                                 std::string_view flatBuffersFilePath,
+                                                                                 std::string_view languageName)
 {
     // Read and parse XML data file.
     if (!FileUtils::getInstance()->isFileExist(xmlFilePath))
@@ -1560,7 +1562,7 @@ std::string FlatBuffersSerialize::serializeFlatBuffersWithXMLFileForLanguageData
                 hasKeyReaded = true;
             }
             // Record corresponding text.
-            else if (strcmp(languageName.c_str(), childElement.name()) == 0)
+            else if (languageName == childElement.name())
             {
                 const char* langText = childElement.text().as_string();
                 if (langText && langText[0] != '\0')
diff --git a/extensions/cocostudio/FlatBuffersSerialize.h b/extensions/cocostudio/FlatBuffersSerialize.h
index 21582b2c624e..1e592e14e9d9 100644
--- a/extensions/cocostudio/FlatBuffersSerialize.h
+++ b/extensions/cocostudio/FlatBuffersSerialize.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
 
  http://www.cocos2d-x.org
@@ -105,15 +105,14 @@ class CCS_DLL FlatBuffersSerialize
 
     void deleteFlatBufferBuilder();
 
-    std::string test(const std::string& xmlFileName, const std::string& flatbuffersFileName);
+    std::string test(std::string_view xmlFileName, std::string_view flatbuffersFileName);
 
     /* serialize flat buffers with XML */
-    static std::string serializeFlatBuffersWithXMLFile(const std::string& xmlFileName,
-                                                       const std::string& flatbuffersFileName);
+    static std::string serializeFlatBuffersWithXMLFile(std::string_view xmlFileName,
+                                                       std::string_view flatbuffersFileName);
     /* x-studio spec: serialize flat buffers with XML buffer */
-    static std::string serializeFlatBuffersWithXMLBuffer(std::string& xmlBuffer,
-                                                         const std::string& flatbuffersFileName);
-    static std::string serializeFlatBuffersWithOpaque(void* opaque, const std::string& flatbuffersFileName);
+    static std::string serializeFlatBuffersWithXMLBuffer(std::string& xmlBuffer, std::string_view flatbuffersFileName);
+    static std::string serializeFlatBuffersWithOpaque(void* opaque, std::string_view flatbuffersFileName);
 
     // NodeTree
     flatbuffers::Offset<flatbuffers::NodeTree> createNodeTree(pugi::xml_node objectData, std::string classType);
@@ -138,11 +137,11 @@ class CCS_DLL FlatBuffersSerialize
     /**/
 
     int getResourceType(std::string key);
-    std::string getGUIClassName(const std::string& name);
+    std::string getGUIClassName(std::string_view name);
     std::string getWidgetReaderClassName(cocos2d::ui::Widget* widget);
 
     /* create flat buffers with XML */
-    flatbuffers::FlatBufferBuilder* createFlatBuffersWithXMLFileForSimulator(const std::string& xmlFileName);
+    flatbuffers::FlatBufferBuilder* createFlatBuffersWithXMLFileForSimulator(std::string_view xmlFileName);
     flatbuffers::Offset<flatbuffers::NodeTree> createNodeTreeForSimulator(pugi::xml_node objectData,
                                                                           std::string classType);
     flatbuffers::Offset<flatbuffers::ProjectNodeOptions> createProjectNodeOptionsForSimulator(
@@ -151,9 +150,9 @@ class CCS_DLL FlatBuffersSerialize
     std::string getCsdVersion() { return _csdVersion; }
 
     /* Serialize language XML file to Flat Buffers file. */
-    std::string serializeFlatBuffersWithXMLFileForLanguageData(const std::string& xmlFilePath,
-                                                               const std::string& flatBuffersFilePath,
-                                                               const std::string& languageName);
+    std::string serializeFlatBuffersWithXMLFileForLanguageData(std::string_view xmlFilePath,
+                                                               std::string_view flatBuffersFilePath,
+                                                               std::string_view languageName);
 
 public:
     std::vector<flatbuffers::Offset<flatbuffers::String>> _textures;
diff --git a/extensions/cocostudio/SpineSkeletonDataCache.h b/extensions/cocostudio/SpineSkeletonDataCache.h
index 317c64d06a32..51a3e1de4a23 100644
--- a/extensions/cocostudio/SpineSkeletonDataCache.h
+++ b/extensions/cocostudio/SpineSkeletonDataCache.h
@@ -39,7 +39,7 @@ class CCS_DLL SpineSkeletonDataCache
     void removeAllUnusedData(void);
 
 public:
-    std::map<std::string, SkeletonData*> _cacheTable;
+    hlookup::string_map<SkeletonData*> _cacheTable;
     void (*_reportError)(const char* pszFormat, ...);
 };
 
@@ -76,7 +76,7 @@ class SpineSkeletonDataCache
     void removeAllUnusedData(void);
 
 public:
-    std::map<std::string, SkeletonData*> _cacheTable;
+    hlookup::string_map<SkeletonData*> _cacheTable;
     void (*_reportError)(const char* pszFormat, ...);
 };
 
diff --git a/extensions/cocostudio/TriggerMng.cpp b/extensions/cocostudio/TriggerMng.cpp
index 0ac9a3181dca..39ccd44571c3 100644
--- a/extensions/cocostudio/TriggerMng.cpp
+++ b/extensions/cocostudio/TriggerMng.cpp
@@ -505,7 +505,7 @@ ArmatureMovementDispatcher::~ArmatureMovementDispatcher(void)
 
 void ArmatureMovementDispatcher::animationEvent(Armature* armature,
                                                 MovementEventType movementType,
-                                                const std::string& movementID)
+                                                std::string_view movementID)
 {
     for (auto iter = _mapEventAnimation->begin(); iter != _mapEventAnimation->end(); ++iter)
     {
diff --git a/extensions/cocostudio/TriggerMng.h b/extensions/cocostudio/TriggerMng.h
index 30474d2a0292..1830a67fe966 100644
--- a/extensions/cocostudio/TriggerMng.h
+++ b/extensions/cocostudio/TriggerMng.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2013-2017 Chukong Technologies Inc.
 
 http://www.cocos2d-x.org
@@ -46,7 +46,7 @@ class CCS_DLL ArmatureMovementDispatcher : public cocos2d::Ref
 public:
     void addAnimationEventCallBack(cocos2d::Ref* pTarget, SEL_MovementEventCallFunc mecf);
     void removeAnnimationEventCallBack(cocos2d::Ref* pTarget, SEL_MovementEventCallFunc mecf);
-    void animationEvent(Armature* armature, MovementEventType movementType, const std::string& movementID);
+    void animationEvent(Armature* armature, MovementEventType movementType, std::string_view movementID);
 
 private:
     std::unordered_map<cocos2d::Ref*, SEL_MovementEventCallFunc>* _mapEventAnimation;
diff --git a/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp b/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp
index a8a6b59e7d10..d51149ba9d1d 100644
--- a/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp
+++ b/extensions/cocostudio/WidgetCallBackHandlerProtocol.cpp
@@ -4,15 +4,15 @@
 namespace cocostudio
 {
 WidgetCallBackHandlerProtocol::~WidgetCallBackHandlerProtocol() {}
-cocos2d::ui::Widget::ccWidgetTouchCallback WidgetCallBackHandlerProtocol::onLocateTouchCallback(const std::string&)
+cocos2d::ui::Widget::ccWidgetTouchCallback WidgetCallBackHandlerProtocol::onLocateTouchCallback(std::string_view)
 {
     return nullptr;
 }
-cocos2d::ui::Widget::ccWidgetClickCallback WidgetCallBackHandlerProtocol::onLocateClickCallback(const std::string&)
+cocos2d::ui::Widget::ccWidgetClickCallback WidgetCallBackHandlerProtocol::onLocateClickCallback(std::string_view)
 {
     return nullptr;
 }
-cocos2d::ui::Widget::ccWidgetEventCallback WidgetCallBackHandlerProtocol::onLocateEventCallback(const std::string&)
+cocos2d::ui::Widget::ccWidgetEventCallback WidgetCallBackHandlerProtocol::onLocateEventCallback(std::string_view)
 {
     return nullptr;
 }
diff --git a/extensions/cocostudio/WidgetCallBackHandlerProtocol.h b/extensions/cocostudio/WidgetCallBackHandlerProtocol.h
index aae843e00e59..dd423e63ba28 100644
--- a/extensions/cocostudio/WidgetCallBackHandlerProtocol.h
+++ b/extensions/cocostudio/WidgetCallBackHandlerProtocol.h
@@ -36,9 +36,9 @@ class CCS_DLL WidgetCallBackHandlerProtocol
 public:
     virtual ~WidgetCallBackHandlerProtocol();
 
-    virtual cocos2d::ui::Widget::ccWidgetTouchCallback onLocateTouchCallback(const std::string& callBackName);
-    virtual cocos2d::ui::Widget::ccWidgetClickCallback onLocateClickCallback(const std::string& callBackName);
-    virtual cocos2d::ui::Widget::ccWidgetEventCallback onLocateEventCallback(const std::string& callBackName);
+    virtual cocos2d::ui::Widget::ccWidgetTouchCallback onLocateTouchCallback(std::string_view callBackName);
+    virtual cocos2d::ui::Widget::ccWidgetClickCallback onLocateClickCallback(std::string_view callBackName);
+    virtual cocos2d::ui::Widget::ccWidgetEventCallback onLocateEventCallback(std::string_view callBackName);
 };
 
 }  // namespace cocostudio
diff --git a/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
index 00861efbd7b5..9202f0824c3c 100644
--- a/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
+++ b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
@@ -145,7 +145,7 @@ void ArmatureNodeReader::setPropsWithFlatBuffers(cocos2d::Node* node, const flat
 #if defined(CC_BUILD_WITH_DRANGBONES) && CC_BUILD_WITH_DRANGBONES
         auto filep = filepath.rfind('.');
         if (filep != std::string::npos && strcmp(&filepath[filep], ".json") == 0)
-        {   // Currently, adjust by file ext, regard as DragonBones 4.5/5.0
+        {  // Currently, adjust by file ext, regard as DragonBones 4.5/5.0
             // 4.5 texture info is fixed as texture.png, texture.json
             // 5.o texture info is _tex.json _tex.png
             auto sharedFactory         = dragonBones::CCFactory::getFactory();
@@ -230,7 +230,7 @@ cocos2d::Node* ArmatureNodeReader::createNodeWithFlatBuffers(const flatbuffers::
     return node;
 }
 
-std::string ArmatureNodeReader::getArmatureName(const std::string& exporJsonPath)
+std::string ArmatureNodeReader::getArmatureName(std::string_view exporJsonPath)
 {
     // FileUtils.getFileData(exporJsonPath, "r", size)   // need read armature name in exportJsonPath
     size_t end    = exporJsonPath.find_last_of(".");
@@ -241,5 +241,5 @@ std::string ArmatureNodeReader::getArmatureName(const std::string& exporJsonPath
 
     if (start == -1)
         start = 0;
-    return exporJsonPath.substr(start, end - start);
+    return std::string{exporJsonPath.substr(start, end - start)};
 }
diff --git a/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
index 3f7ae420b076..d37f2652ba85 100644
--- a/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
+++ b/extensions/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (c) 2014 cocos2d-x.org
 
 http://www.cocos2d-x.org
@@ -59,7 +59,7 @@ class ArmatureNodeReader : public cocos2d::Ref, public cocostudio::NodeReaderPro
     cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override;
 
 private:
-    std::string getArmatureName(const std::string& exporJsonPath);
+    std::string getArmatureName(std::string_view exporJsonPath);
 };
 
 #endif /* defined(__ARMATURENODEREADER_H_) */
diff --git a/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
index 6e417fcca679..f015d67a9f24 100644
--- a/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
+++ b/extensions/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
@@ -111,7 +111,7 @@ void ImageViewReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson
 
     const rapidjson::Value& imageFileNameDic = DICTOOL->getSubDictionary_json(options, P_FileNameData);
     int imageFileNameType                    = DICTOOL->getIntValue_json(imageFileNameDic, P_ResourceType);
-    const std::string& imageFilePath         = DICTOOL->getStringValue_json(imageFileNameDic, P_Path);
+    std::string_view imageFilePath           = DICTOOL->getStringValue_json(imageFileNameDic, P_Path);
 
     if (!imageFilePath.empty())
     {
diff --git a/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp
index 24997d4a98ba..5af14ee111d0 100644
--- a/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp
+++ b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.cpp
@@ -30,7 +30,7 @@ static cocos2d::Node* createArmatureNode()
     return cocostudio::Armature::create();
 }
 
-static cocos2d::ParticleSystemQuad* createParticleSystemQuad(const std::string& path)
+static cocos2d::ParticleSystemQuad* createParticleSystemQuad(std::string_view path)
 {
     return cocos2d::ParticleSystemQuad::create(path);
 }
@@ -56,13 +56,13 @@ namespace wext
 {
 bool (*onBeforeLoadObjectAsset)(cocos2d::Node*,
                                 cocos2d::ResourceData& assets,
-                                int index /*= 0*/)                       = &onLoadObjectAssetDummy;
+                                int index /*= 0*/)                     = &onLoadObjectAssetDummy;
 bool (*onAfterLoadObjectAsset)(cocos2d::Node*,
                                cocos2d::ResourceData& assets,
-                               int index /*= 0*/)                        = &onLoadObjectAssetDummy;
-void (*onLoadSpriteFramesWithFile)(std::string& file)                    = nullptr;
-void (*onNestingNodeLoading)(const std::string& filePath)                = nullptr;
-void (*onNestingNodeLoaded)(cocos2d::Node*, const std::string& filePath) = nullptr;
+                               int index /*= 0*/)                      = &onLoadObjectAssetDummy;
+void (*onLoadSpriteFramesWithFile)(std::string& file)                  = nullptr;
+void (*onNestingNodeLoading)(std::string_view filePath)                = nullptr;
+void (*onNestingNodeLoaded)(cocos2d::Node*, std::string_view filePath) = nullptr;
 cocos2d::Node* (*aNode)();
 cocos2d::ui::Widget* (*aWidget)();
 cocos2d::Sprite* (*aSprite)();
@@ -79,7 +79,7 @@ cocos2d::ui::Layout* (*aLayout)();
 cocos2d::ui::ScrollView* (*aScrollView)();
 cocos2d::ui::ListView* (*aListView)();
 cocos2d::ui::PageView* (*aPageView)();
-cocos2d::ParticleSystemQuad* (*aParticleSystemQuad)(const std::string&);
+cocos2d::ParticleSystemQuad* (*aParticleSystemQuad)(std::string_view);
 cocos2d::Node* (*aArmatureNode)();
 cocostudio::timeline::SkeletonNode* (*aSkeletonNode)();
 cocostudio::timeline::BoneNode* (*aBoneNode)();
@@ -137,7 +137,7 @@ cocos2d::ResourceData cocos2d::wext::makeResourceData(const flatbuffers::Resourc
     return fileData;
 }
 
-cocos2d::ResourceData cocos2d::wext::makeResourceData(const std::string& path, int type)
+cocos2d::ResourceData cocos2d::wext::makeResourceData(std::string_view path, int type)
 {
     cocos2d::ResourceData fileData;
     fileData.file = path;
diff --git a/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h
index 7276307498eb..ad10606f443a 100644
--- a/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h
+++ b/extensions/cocostudio/WidgetReader/NodeReaderProtocol.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
  Copyright (c) 2014 cocos2d-x.org
 
  http://www.cocos2d-x.org
@@ -141,7 +141,7 @@ CC_DLL extern APP_LOGERROR_FUNC getAppErrorLogFunc();
 CCS_DLL extern void (*onLoadSpriteFramesWithFile)(std::string& file);
 
 CCS_DLL extern cocos2d::ResourceData makeResourceData(const flatbuffers::ResourceData* data);
-CCS_DLL extern cocos2d::ResourceData makeResourceData(const std::string& path, int type = 0);
+CCS_DLL extern cocos2d::ResourceData makeResourceData(std::string_view path, int type = 0);
 CCS_DLL extern cocos2d::ResourceData makeResourceData(std::string&& path, int type = 0);
 CCS_DLL extern void resetReaderAllHooks();
 
@@ -168,7 +168,7 @@ CCS_DLL extern cocos2d::ui::PageView* (*aPageView)();
 CCS_DLL extern cocos2d::Node* (*aArmatureNode)();
 CCS_DLL extern cocostudio::timeline::SkeletonNode* (*aSkeletonNode)();
 CCS_DLL extern cocostudio::timeline::BoneNode* (*aBoneNode)();
-CCS_DLL extern cocos2d::ParticleSystemQuad* (*aParticleSystemQuad)(const std::string&);
+CCS_DLL extern cocos2d::ParticleSystemQuad* (*aParticleSystemQuad)(std::string_view);
 CCS_DLL extern cocos2d::Node* (*aNestingNode)(std::string);
 
 ///// 3d objects /////
diff --git a/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp b/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp
index 161a86263cff..61e22265d9c2 100644
--- a/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp
+++ b/extensions/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp
@@ -97,7 +97,7 @@ void TextAtlasReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson
 {
     WidgetReader::setPropsFromJsonDictionary(widget, options);
 
-    std::string jsonPath = GUIReader::getInstance()->getFilePath();
+    std::string_view jsonPath = GUIReader::getInstance()->getFilePath();
 
     TextAtlas* labelAtlas = static_cast<TextAtlas*>(widget);
     //        bool sv = DICTOOL->checkObjectExist_json(options, P_StringValue);
@@ -112,7 +112,7 @@ void TextAtlasReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson
     {
     case 0:
     {
-        std::string tp_c    = jsonPath;
+        std::string tp_c{jsonPath};
         const char* cmfPath = DICTOOL->getStringValue_json(cmftDic, P_Path);
         const char* cmf_tp  = tp_c.append(cmfPath).c_str();
         labelAtlas->setProperty(DICTOOL->getStringValue_json(options, P_StringValue, "12345678"), cmf_tp,
diff --git a/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp
index fffff874b8a8..3ee6d357279b 100644
--- a/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp
+++ b/extensions/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp
@@ -82,7 +82,7 @@ void TextBMFontReader::setPropsFromJsonDictionary(Widget* widget, const rapidjso
 {
     WidgetReader::setPropsFromJsonDictionary(widget, options);
 
-    std::string jsonPath = GUIReader::getInstance()->getFilePath();
+    std::string_view jsonPath = GUIReader::getInstance()->getFilePath();
 
     TextBMFont* labelBMFont = static_cast<TextBMFont*>(widget);
 
@@ -92,7 +92,7 @@ void TextBMFontReader::setPropsFromJsonDictionary(Widget* widget, const rapidjso
     {
     case 0:
     {
-        std::string tp_c    = jsonPath;
+        std::string tp_c{jsonPath};
         const char* cmfPath = DICTOOL->getStringValue_json(cmftDic, P_Path);
         const char* cmf_tp  = tp_c.append(cmfPath).c_str();
         labelBMFont->setFntFile(cmf_tp);
diff --git a/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp
index 484dca151fdd..e63761291a20 100644
--- a/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp
+++ b/extensions/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp
@@ -101,9 +101,9 @@ void TextFieldReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson
 
     textField->setFontSize(DICTOOL->getIntValue_json(options, P_FontSize, 20));
 
-    std::string jsonPath     = GUIReader::getInstance()->getFilePath();
-    std::string fontName     = DICTOOL->getStringValue_json(options, P_FontName, "");
-    std::string fontFilePath = jsonPath.append(fontName);
+    std::string fontFilePath{GUIReader::getInstance()->getFilePath()};
+    auto fontName = DICTOOL->getStringValue_json(options, P_FontName, "");
+    fontFilePath.append(fontName);
     if (FileUtils::getInstance()->isFileExist(fontFilePath))
         textField->setFontName(fontFilePath);
     else
diff --git a/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp b/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp
index a42748e5e2a8..05624cde11a0 100644
--- a/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp
+++ b/extensions/cocostudio/WidgetReader/TextReader/TextReader.cpp
@@ -57,7 +57,7 @@ void TextReader::setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* coc
 
     Text* label = static_cast<Text*>(widget);
 
-    std::string binaryFilePath = GUIReader::getInstance()->getFilePath();
+    std::string binaryFilePath{GUIReader::getInstance()->getFilePath()};
 
     for (int i = 0; i < cocoNode->GetChildNum(); ++i)
     {
@@ -96,7 +96,7 @@ void TextReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson::Val
 {
     WidgetReader::setPropsFromJsonDictionary(widget, options);
 
-    std::string jsonPath = GUIReader::getInstance()->getFilePath();
+    std::string fontFilePath{GUIReader::getInstance()->getFilePath()};
 
     Text* label               = static_cast<Text*>(widget);
     bool touchScaleChangeAble = DICTOOL->getBooleanValue_json(options, P_TouchScaleEnable);
@@ -106,9 +106,9 @@ void TextReader::setPropsFromJsonDictionary(Widget* widget, const rapidjson::Val
 
     label->setFontSize(DICTOOL->getIntValue_json(options, P_FontSize, 20));
 
-    std::string fontName = DICTOOL->getStringValue_json(options, P_FontName, "");
+    auto fontName = DICTOOL->getStringValue_json(options, P_FontName, "");
 
-    std::string fontFilePath = jsonPath.append(fontName);
+    fontFilePath.append(fontName);
     if (FileUtils::getInstance()->isFileExist(fontFilePath))
     {
         label->setFontName(fontFilePath);
diff --git a/extensions/cocostudio/WidgetReader/WidgetReader.cpp b/extensions/cocostudio/WidgetReader/WidgetReader.cpp
index e30e04d1c29e..14dcd1be8dd2 100644
--- a/extensions/cocostudio/WidgetReader/WidgetReader.cpp
+++ b/extensions/cocostudio/WidgetReader/WidgetReader.cpp
@@ -98,9 +98,9 @@ WidgetReader::WidgetReader()
     , _opacity(255)
     , _isAdaptScreen(false)
 {
-    valueToInt = [=](const std::string& str) -> int { return atoi(str.c_str()); };
+    valueToInt = [=](std::string_view str) -> int { return atoi(str.data()); };
 
-    valueToBool = [=](const std::string& str) -> bool {
+    valueToBool = [=](std::string_view str) -> bool {
         int intValue = valueToInt(str);
         if (1 == intValue)
         {
@@ -112,7 +112,7 @@ WidgetReader::WidgetReader()
         }
     };
 
-    valueToFloat = [=](const std::string& str) -> float { return utils::atof(str.c_str()); };
+    valueToFloat = [=](std::string_view str) -> float { return utils::atof(str.data()); };
 }
 
 WidgetReader::~WidgetReader() {}
@@ -303,17 +303,17 @@ void WidgetReader::endSetBasicProperties(Widget* widget)
 }
 
 std::string WidgetReader::getResourcePath(const rapidjson::Value& dict,
-                                          const std::string& key,
+                                          std::string_view key,
                                           cocos2d::ui::Widget::TextureResType texType)
 {
-    std::string jsonPath      = GUIReader::getInstance()->getFilePath();
-    const char* imageFileName = DICTOOL->getStringValue_json(dict, key.c_str());
+    std::string_view jsonPath = GUIReader::getInstance()->getFilePath();
+    const char* imageFileName = DICTOOL->getStringValue_json(dict, key.data());
     std::string imageFileName_tp;
     if (nullptr != imageFileName)
     {
         if (texType == ui::Widget::TextureResType::LOCAL)
         {
-            imageFileName_tp = jsonPath + imageFileName;
+            imageFileName_tp.append(jsonPath).append(imageFileName);
         }
         else if (texType == ui::Widget::TextureResType::PLIST)
         {
@@ -339,14 +339,14 @@ std::string WidgetReader::getResourcePath(CocoLoader* cocoLoader,
         return "";
     }
 
-    std::string binaryPath = GUIReader::getInstance()->getFilePath();
+    std::string_view binaryPath = GUIReader::getInstance()->getFilePath();
 
     std::string imageFileName_tp;
     if (!backgroundValue.empty())
     {
         if (texType == ui::Widget::TextureResType::LOCAL)
         {
-            imageFileName_tp = binaryPath + backgroundValue;
+            imageFileName_tp.append(binaryPath).append(backgroundValue);
         }
         else if (texType == ui::Widget::TextureResType::PLIST)
         {
@@ -940,20 +940,19 @@ Node* WidgetReader::createNodeWithFlatBuffers(const flatbuffers::Table* widgetOp
     return widget;
 }
 
-std::string WidgetReader::getResourcePath(const std::string& path, cocos2d::ui::Widget::TextureResType texType)
+std::string WidgetReader::getResourcePath(std::string_view path, cocos2d::ui::Widget::TextureResType texType)
 {
-    std::string filePath      = GUIReader::getInstance()->getFilePath();
-    const char* imageFileName = path.c_str();
+    std::string_view filePath = GUIReader::getInstance()->getFilePath();
     std::string imageFileName_tp;
-    if (nullptr != imageFileName && 0 != strcmp("", imageFileName))
+    if (!path.empty())
     {
         if (texType == ui::Widget::TextureResType::LOCAL)
         {
-            imageFileName_tp = filePath + imageFileName;
+            imageFileName_tp.append(filePath).append(path);
         }
         else if (texType == ui::Widget::TextureResType::PLIST)
         {
-            imageFileName_tp = imageFileName;
+            imageFileName_tp.assign(path);
         }
         else
         {
diff --git a/extensions/cocostudio/WidgetReader/WidgetReader.h b/extensions/cocostudio/WidgetReader/WidgetReader.h
index fb5e60d3d92f..0b9a86316b23 100644
--- a/extensions/cocostudio/WidgetReader/WidgetReader.h
+++ b/extensions/cocostudio/WidgetReader/WidgetReader.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
  Copyright (c) 2014 cocos2d-x.org
 
  http://www.cocos2d-x.org
@@ -66,7 +66,7 @@ class CCS_DLL WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol, p
 
 protected:
     std::string getResourcePath(const rapidjson::Value& dict,
-                                const std::string& key,
+                                std::string_view key,
                                 cocos2d::ui::Widget::TextureResType texType);
     void setAnchorPointForWidget(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
 
@@ -74,14 +74,14 @@ class CCS_DLL WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol, p
                                 stExpCocoNode* pCocoNode,
                                 cocos2d::ui::Widget::TextureResType texType);
 
-    std::string getResourcePath(const std::string& path, cocos2d::ui::Widget::TextureResType texType);
+    std::string getResourcePath(std::string_view path, cocos2d::ui::Widget::TextureResType texType);
 
     void beginSetBasicProperties(cocos2d::ui::Widget* widget);
     void endSetBasicProperties(cocos2d::ui::Widget* widget);
 
-    std::function<int(const std::string&)> valueToInt;
-    std::function<bool(const std::string&)> valueToBool;
-    std::function<float(const std::string&)> valueToFloat;
+    std::function<int(std::string_view)> valueToInt;
+    std::function<bool(std::string_view)> valueToBool;
+    std::function<float(std::string_view)> valueToFloat;
 
     float _sizePercentX;
     float _sizePercentY;
diff --git a/extensions/fairygui/GTextInput.cpp b/extensions/fairygui/GTextInput.cpp
index 3a9117675baf..902fc4be5244 100644
--- a/extensions/fairygui/GTextInput.cpp
+++ b/extensions/fairygui/GTextInput.cpp
@@ -122,7 +122,7 @@ void GTextInput::editBoxReturn(cocos2d::ui::EditBox * editBox)
     // dispatchEvent(UIEventType::Submit);
 }
 
-void GTextInput::editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)
+void GTextInput::editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view /*text*/)
 {
     _text.clear();
     _text.append(_input->getText());
diff --git a/extensions/fairygui/GTextInput.h b/extensions/fairygui/GTextInput.h
index 8ce76371ce75..7741843e0c7a 100644
--- a/extensions/fairygui/GTextInput.h
+++ b/extensions/fairygui/GTextInput.h
@@ -36,7 +36,7 @@ class GTextInput : public GTextField, cocos2d::ui::EditBoxDelegate
     virtual void setTextFieldText() override;
 
     virtual void editBoxReturn(cocos2d::ui::EditBox* editBox) override;
-    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text) override;
+    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text) override;
 
 private:
     FUIInput* _input;
diff --git a/extensions/fairygui/ScrollPane.cpp b/extensions/fairygui/ScrollPane.cpp
index f976666c3015..7e25cbb04387 100644
--- a/extensions/fairygui/ScrollPane.cpp
+++ b/extensions/fairygui/ScrollPane.cpp
@@ -722,13 +722,13 @@ void ScrollPane::changeContentSizeOnScrolling(float deltaWidth, float deltaHeigh
         if (deltaWidth != 0 && isRightmost)
         {
             _xPos = _overlapSize.width;
-            _container->setPositionX(_container->getPositionX() - _xPos);
+            _container->setPositionX(-_xPos);
         }
 
         if (deltaHeight != 0 && isBottom)
         {
             _yPos = _overlapSize.height;
-            _container->setPositionY2(_container->getPositionY2() - _yPos);
+            _container->setPositionY2(-_yPos);
         }
     }
 
diff --git a/extensions/fairygui/UIPackage.cpp b/extensions/fairygui/UIPackage.cpp
index 19e0ebb3dcb3..bdd97c41d299 100644
--- a/extensions/fairygui/UIPackage.cpp
+++ b/extensions/fairygui/UIPackage.cpp
@@ -200,7 +200,7 @@ string UIPackage::getItemURL(const string& pkgName, const string& resName)
     return STD_STRING_EMPTY;
 }
 
-PackageItem* UIPackage::getItemByURL(const string& url)
+PackageItem* UIPackage::getItemByURL(std::string_view url)
 {
     if (url.size() == 0)
         return nullptr;
@@ -214,22 +214,22 @@ PackageItem* UIPackage::getItemByURL(const string& url)
     {
         if (url.size() > 13)
         {
-            string pkgId = url.substr(5, 8);
+            std::string pkgId{url.substr(5, 8)};
             UIPackage* pkg = getById(pkgId);
             if (pkg != nullptr)
             {
-                string srcId = url.substr(13);
+                std::string srcId{url.substr(13)};
                 return pkg->getItem(srcId);
             }
         }
     }
     else
     {
-        string pkgName = url.substr(pos1 + 2, pos2 - pos1 - 2);
+        std::string pkgName{url.substr(pos1 + 2, pos2 - pos1 - 2)};
         UIPackage* pkg = getByName(pkgName);
         if (pkg != nullptr)
         {
-            string srcName = url.substr(pos2 + 1);
+            std::string srcName{url.substr(pos2 + 1)};
             return pkg->getItemByName(srcName);
         }
     }
@@ -274,7 +274,7 @@ void* UIPackage::getItemAsset(const std::string& pkgName, const std::string& res
     return nullptr;
 }
 
-void* UIPackage::getItemAssetByURL(const std::string& url, PackageItemType type)
+void* UIPackage::getItemAssetByURL(std::string_view url, PackageItemType type)
 {
     PackageItem* pi = UIPackage::getItemByURL(url);
     if (pi)
diff --git a/extensions/fairygui/UIPackage.h b/extensions/fairygui/UIPackage.h
index 041a86822a3f..a2b0c754d4f9 100644
--- a/extensions/fairygui/UIPackage.h
+++ b/extensions/fairygui/UIPackage.h
@@ -25,10 +25,10 @@ class UIPackage : public cocos2d::Ref
     static GObject* createObject(const std::string& pkgName, const std::string& resName);
     static GObject* createObjectFromURL(const std::string& url);
     static std::string getItemURL(const std::string& pkgName, const std::string& resName);
-    static PackageItem* getItemByURL(const std::string& url);
+    static PackageItem* getItemByURL(std::string_view url);
     static std::string normalizeURL(const std::string& url);
     static void* getItemAsset(const std::string& pkgName, const std::string& resName, PackageItemType type = PackageItemType::UNKNOWN);
-    static void* getItemAssetByURL(const std::string& url, PackageItemType type = PackageItemType::UNKNOWN);
+    static void* getItemAssetByURL(std::string_view url, PackageItemType type = PackageItemType::UNKNOWN);
     static cocos2d::Texture2D* getEmptyTexture() { return _emptyTexture; }
 
     const std::string& getId() const { return _id; }
diff --git a/extensions/fairygui/display/FUIContainer.cpp b/extensions/fairygui/display/FUIContainer.cpp
index 3cd5ff0c97f7..9676cf133ea7 100644
--- a/extensions/fairygui/display/FUIContainer.cpp
+++ b/extensions/fairygui/display/FUIContainer.cpp
@@ -496,4 +496,14 @@ void FUIContainer::visit(cocos2d::Renderer * renderer, const cocos2d::Mat4 & par
         Node::visit(renderer, parentTransform, parentFlags);
 }
 
+void FUIContainer::setGlobalZOrder(float globalZOrder)
+{
+    Node::setGlobalZOrder(globalZOrder);
+    if (_stencilClippingSupport && _stencilClippingSupport->_stencil)
+    {
+        _stencilClippingSupport->_stencil->setGlobalZOrder(globalZOrder);
+    }
+}
+
+
 NS_FGUI_END
diff --git a/extensions/fairygui/display/FUIContainer.h b/extensions/fairygui/display/FUIContainer.h
index 8f9958e83d10..6e991b5ba504 100644
--- a/extensions/fairygui/display/FUIContainer.h
+++ b/extensions/fairygui/display/FUIContainer.h
@@ -77,6 +77,7 @@ class FUIContainer : public cocos2d::Node
     void onExit() override;
     void visit(cocos2d::Renderer *renderer, const cocos2d::Mat4 &parentTransform, uint32_t parentFlags) override;
     void setCameraMask(unsigned short mask, bool applyChildren = true) override;
+    void setGlobalZOrder(float globalZOrder) override;
 
     GObject* gOwner;
 private:
diff --git a/extensions/fairygui/display/FUILabel.cpp b/extensions/fairygui/display/FUILabel.cpp
index 173acf1e58b5..9917d986a334 100644
--- a/extensions/fairygui/display/FUILabel.cpp
+++ b/extensions/fairygui/display/FUILabel.cpp
@@ -118,7 +118,7 @@ void FUILabel::applyTextFormat()
         disableEffect(LabelEffect::SHADOW);
 }
 
-bool FUILabel::setBMFontFilePath(const std::string& bmfontFilePath, const Vec2& imageOffset, float fontSize)
+bool FUILabel::setBMFontFilePath(std::string_view bmfontFilePath, const Vec2& imageOffset, float fontSize)
 {
     BitmapFont* bmFont = (BitmapFont*)UIPackage::getItemAssetByURL(bmfontFilePath, PackageItemType::FONT);
     if (bmFont == nullptr)
diff --git a/extensions/fairygui/display/FUILabel.h b/extensions/fairygui/display/FUILabel.h
index 0f9448dff397..6733431730ea 100644
--- a/extensions/fairygui/display/FUILabel.h
+++ b/extensions/fairygui/display/FUILabel.h
@@ -23,7 +23,7 @@ class FUILabel : public cocos2d::Label
 
     void setUnderlineColor(const cocos2d::Color3B& value);
 
-    virtual bool setBMFontFilePath(const std::string& bmfontFilePath, const cocos2d::Vec2& imageOffset = cocos2d::Vec2::ZERO, float fontSize = 0) override;
+    virtual bool setBMFontFilePath(std::string_view bmfontFilePath, const cocos2d::Vec2& imageOffset = cocos2d::Vec2::ZERO, float fontSize = 0) override;
 
     void setGrayed(bool value);
 protected:
diff --git a/extensions/fairygui/display/FUIRichText.cpp b/extensions/fairygui/display/FUIRichText.cpp
index 8e41ead1aa0e..e98495b7b089 100644
--- a/extensions/fairygui/display/FUIRichText.cpp
+++ b/extensions/fairygui/display/FUIRichText.cpp
@@ -76,7 +76,7 @@ static float stripTrailingWhitespace(const std::vector<Node*>& row) {
     if (!row.empty()) {
         if (auto label = dynamic_cast<Label*>(row.back())) {
             const auto width = label->getContentSize().width;
-            auto str = label->getString();
+            std::string str{label->getString()};
             rtrim(str);
             if (label->getString() != str) {
                 label->setString(str);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
index 73e05e7f3cdc..6a9652abdce7 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp
@@ -32,12 +32,12 @@ int lua_cocos2dx_3d_Animation3D_initWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Animation3D:initWithFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Animation3D:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Animation3D:initWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animation3D_initWithFile'", nullptr);
@@ -172,8 +172,8 @@ int lua_cocos2dx_3d_Animation3D_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Animation3D:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animation3D_create'", nullptr);
@@ -185,10 +185,10 @@ int lua_cocos2dx_3d_Animation3D_create(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        std::string arg0;
-        std::string arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Animation3D:create");
+        std::string_view arg0;
+        std::string_view arg1;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Animation3D:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Animation3D:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Animation3D_create'", nullptr);
@@ -1341,18 +1341,18 @@ int lua_cocos2dx_3d_TextureCube_create(lua_State* tolua_S)
 
     if (argc == 6)
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
-        std::string arg5;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCube:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TextureCube:create");
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.TextureCube:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.TextureCube:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.TextureCube:create");
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.TextureCube:create");
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
+        std::string_view arg5;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCube:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TextureCube:create");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.TextureCube:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "cc.TextureCube:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.TextureCube:create");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.TextureCube:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_TextureCube_create'", nullptr);
@@ -1641,8 +1641,8 @@ int lua_cocos2dx_3d_BillBoard_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.BillBoard:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.BillBoard:create");
             if (!ok) { break; }
             cocos2d::BillBoard* ret = cocos2d::BillBoard::create(arg0);
             object_to_luaval<cocos2d::BillBoard>(tolua_S, "cc.BillBoard",(cocos2d::BillBoard*)ret);
@@ -1654,8 +1654,8 @@ int lua_cocos2dx_3d_BillBoard_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.BillBoard:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.BillBoard:create");
             if (!ok) { break; }
             cocos2d::BillBoard::Mode arg1;
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.BillBoard:create");
@@ -1693,8 +1693,8 @@ int lua_cocos2dx_3d_BillBoard_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.BillBoard:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.BillBoard:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.BillBoard:create");
@@ -1709,8 +1709,8 @@ int lua_cocos2dx_3d_BillBoard_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.BillBoard:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.BillBoard:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.BillBoard:create");
@@ -2071,8 +2071,8 @@ int lua_cocos2dx_3d_Mesh_getName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Mesh_getName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getName",argc, 0);
@@ -2325,9 +2325,9 @@ int lua_cocos2dx_3d_Mesh_setName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Mesh:setName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Mesh:setName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Mesh_setName'", nullptr);
@@ -2938,9 +2938,9 @@ int lua_cocos2dx_3d_Skeleton3D_getBoneByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skeleton3D:getBoneByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Skeleton3D:getBoneByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Skeleton3D_getBoneByName'", nullptr);
@@ -3392,24 +3392,24 @@ int lua_cocos2dx_3d_Skybox_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 6) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
-        std::string arg5;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
+        std::string_view arg5;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Skybox:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Skybox:init");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.Skybox:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "cc.Skybox:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.Skybox:init");
 
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.Skybox:init");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.Skybox:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Skybox_init'", nullptr);
@@ -3497,23 +3497,23 @@ int lua_cocos2dx_3d_Skybox_create(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skybox:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Skybox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Skybox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Skybox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.Skybox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.Skybox:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.Skybox:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "cc.Skybox:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.Skybox:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.Skybox:create");
             if (!ok) { break; }
-            std::string arg5;
-            ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.Skybox:create");
+            std::string_view arg5;
+            ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.Skybox:create");
             if (!ok) { break; }
             cocos2d::Skybox* ret = cocos2d::Skybox::create(arg0, arg1, arg2, arg3, arg4, arg5);
             object_to_luaval<cocos2d::Skybox>(tolua_S, "cc.Skybox",(cocos2d::Skybox*)ret);
@@ -3685,8 +3685,8 @@ int lua_cocos2dx_3d_Sprite3D_setTexture(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:setTexture");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:setTexture");
 
             if (!ok) { break; }
             cobj->setTexture(arg0);
@@ -4321,9 +4321,9 @@ int lua_cocos2dx_3d_Sprite3D_getAttachNode(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:getAttachNode");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:getAttachNode");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3D_getAttachNode'", nullptr);
@@ -4532,9 +4532,9 @@ int lua_cocos2dx_3d_Sprite3D_removeAttachNode(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:removeAttachNode");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:removeAttachNode");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3D_removeAttachNode'", nullptr);
@@ -4679,9 +4679,9 @@ int lua_cocos2dx_3d_Sprite3D_getMeshByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:getMeshByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:getMeshByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3D_getMeshByName'", nullptr);
@@ -4719,8 +4719,8 @@ int lua_cocos2dx_3d_Sprite3D_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:create");
             if (!ok) { break; }
             cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0);
             object_to_luaval<cocos2d::Sprite3D>(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret);
@@ -4742,11 +4742,11 @@ int lua_cocos2dx_3d_Sprite3D_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3D:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Sprite3D:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Sprite3D:create");
             if (!ok) { break; }
             cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0, arg1);
             object_to_luaval<cocos2d::Sprite3D>(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret);
@@ -4832,9 +4832,9 @@ int lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3DCache:removeSprite3DData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3DCache:removeSprite3DData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3DCache_removeSprite3DData'", nullptr);
@@ -5092,8 +5092,8 @@ int lua_cocos2dx_3d_Sprite3DMaterial_createWithFilename(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3DMaterial:createWithFilename");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite3DMaterial:createWithFilename");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Sprite3DMaterial_createWithFilename'", nullptr);
@@ -5316,9 +5316,9 @@ int lua_cocos2dx_3d_Terrain_initHeightMap(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Terrain:initHeightMap");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Terrain:initHeightMap");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Terrain_initHeightMap'", nullptr);
@@ -5567,9 +5567,9 @@ int lua_cocos2dx_3d_Terrain_resetHeightMap(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Terrain:resetHeightMap");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Terrain:resetHeightMap");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Terrain_resetHeightMap'", nullptr);
@@ -6026,8 +6026,8 @@ int lua_cocos2dx_3d_Terrain_getTerrainSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Terrain_getTerrainSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getTerrainSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getTerrainSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Terrain:getTerrainSize",argc, 0);
@@ -6221,9 +6221,9 @@ int lua_cocos2dx_3d_Terrain_setLightMap(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Terrain:setLightMap");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Terrain:setLightMap");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Terrain_setLightMap'", nullptr);
@@ -6494,9 +6494,9 @@ int lua_cocos2dx_3d_Bundle3D_load(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Bundle3D:load");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Bundle3D:load");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Bundle3D_load'", nullptr);
@@ -6544,10 +6544,10 @@ int lua_cocos2dx_3d_Bundle3D_loadSkinData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::SkinData* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Bundle3D:loadSkinData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Bundle3D:loadSkinData");
 
         #pragma warning NO CONVERSION TO NATIVE FOR SkinData*
 		ok = false;
@@ -6747,10 +6747,10 @@ int lua_cocos2dx_3d_Bundle3D_loadAnimationData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::Animation3DData* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Bundle3D:loadAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Bundle3D:loadAnimationData");
 
         #pragma warning NO CONVERSION TO NATIVE FOR Animation3DData*
 		ok = false;
@@ -6790,8 +6790,8 @@ int lua_cocos2dx_3d_Bundle3D_parseSamplerAddressMode(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Bundle3D:parseSamplerAddressMode");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Bundle3D:parseSamplerAddressMode");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_3d_Bundle3D_parseSamplerAddressMode'", nullptr);
@@ -6896,9 +6896,9 @@ int lua_cocos2dx_3d_Bundle3D_parseGLDataType(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Bundle3D:parseGLDataType");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Bundle3D:parseGLDataType");
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Bundle3D:parseGLDataType");
         if(!ok)
         {
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp
index c468bc15a430..fbc51b00723d 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.cpp
@@ -184,8 +184,8 @@ int lua_cocos2dx_audioengine_AudioEngine_uncache(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:uncache");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:uncache");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_audioengine_AudioEngine_uncache'", nullptr);
@@ -607,8 +607,8 @@ int lua_cocos2dx_audioengine_AudioEngine_preload(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:preload");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:preload");
             if (!ok) { break; }
             std::function<void (bool)> arg1;
             do {
@@ -627,8 +627,8 @@ int lua_cocos2dx_audioengine_AudioEngine_preload(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:preload");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:preload");
             if (!ok) { break; }
             cocos2d::AudioEngine::preload(arg0);
             lua_settop(tolua_S, 1);
@@ -697,8 +697,8 @@ int lua_cocos2dx_audioengine_AudioEngine_play2d(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_audioengine_AudioEngine_play2d'", nullptr);
@@ -710,9 +710,9 @@ int lua_cocos2dx_audioengine_AudioEngine_play2d(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.AudioEngine:play2d");
         if(!ok)
         {
@@ -725,10 +725,10 @@ int lua_cocos2dx_audioengine_AudioEngine_play2d(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
         double arg2;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.AudioEngine:play2d");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.AudioEngine:play2d");
         if(!ok)
@@ -742,11 +742,11 @@ int lua_cocos2dx_audioengine_AudioEngine_play2d(lua_State* tolua_S)
     }
     if (argc == 4)
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
         double arg2;
         const cocos2d::AudioProfile* arg3;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:play2d");
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.AudioEngine:play2d");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.AudioEngine:play2d");
         ok &= luaval_to_object<const cocos2d::AudioProfile>(tolua_S, 5, "cc.AudioProfile",&arg3, "cc.AudioEngine:play2d");
@@ -1035,8 +1035,8 @@ int lua_cocos2dx_audioengine_AudioEngine_getProfile(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AudioEngine:getProfile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AudioEngine:getProfile");
             if (!ok) { break; }
             cocos2d::AudioProfile* ret = cocos2d::AudioEngine::getProfile(arg0);
             object_to_luaval<cocos2d::AudioProfile>(tolua_S, "cc.AudioProfile",(cocos2d::AudioProfile*)ret);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
index ea1bbd26b656..8a8ea3665c9c 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
@@ -300,9 +300,9 @@ int lua_cocos2dx_Console_delCommand(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:delCommand");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Console:delCommand");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Console_delCommand'", nullptr);
@@ -497,9 +497,9 @@ int lua_cocos2dx_Console_setBindAddress(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Console:setBindAddress");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Console:setBindAddress");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Console_setBindAddress'", nullptr);
@@ -962,8 +962,8 @@ int lua_cocos2dx_ShaderCache_newVertexShaderModule(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.ShaderCache:newVertexShaderModule");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.ShaderCache:newVertexShaderModule");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ShaderCache_newVertexShaderModule'", nullptr);
@@ -998,8 +998,8 @@ int lua_cocos2dx_ShaderCache_newFragmentShaderModule(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.ShaderCache:newFragmentShaderModule");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.ShaderCache:newFragmentShaderModule");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ShaderCache_newFragmentShaderModule'", nullptr);
@@ -1648,8 +1648,8 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
@@ -1668,16 +1668,16 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             bool ret = cobj->initWithString(arg0, arg1, arg2, arg3);
@@ -1692,16 +1692,16 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -1720,16 +1720,16 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -1752,16 +1752,16 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -1788,16 +1788,16 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Texture2D:initWithString");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -2062,8 +2062,8 @@ int lua_cocos2dx_Texture2D_getContentSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Texture2D_getContentSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getContentSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getContentSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSize",argc, 0);
@@ -2463,8 +2463,8 @@ int lua_cocos2dx_Texture2D_getContentSizeInPixels(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Texture2D_getContentSizeInPixels'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getContentSizeInPixels();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getContentSizeInPixels();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSizeInPixels",argc, 0);
@@ -4259,9 +4259,9 @@ int lua_cocos2dx_Component_setName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Component:setName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Component:setName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_setName'", nullptr);
@@ -4555,8 +4555,8 @@ int lua_cocos2dx_Component_getName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_getName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:getName",argc, 0);
@@ -4759,8 +4759,8 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S)
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild");
 
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.Node:addChild");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.Node:addChild");
 
             if (!ok) { break; }
             cobj->addChild(arg0, arg1, arg2);
@@ -4814,8 +4814,8 @@ int lua_cocos2dx_Node_removeComponent(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeComponent");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:removeComponent");
 
             if (!ok) { break; }
             bool ret = cobj->removeComponent(arg0);
@@ -5454,9 +5454,9 @@ int lua_cocos2dx_Node_getChildByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getChildByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:getChildByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getChildByName'", nullptr);
@@ -7147,8 +7147,8 @@ int lua_cocos2dx_Node_getName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getName",argc, 0);
@@ -8525,9 +8525,9 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:removeChildByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_removeChildByName'", nullptr);
@@ -8539,10 +8539,10 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:removeChildByName");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChildByName");
         if(!ok)
@@ -8564,6 +8564,59 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_Node_resetChild(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Node* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_resetChild'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 2) 
+    {
+        cocos2d::Node* arg0;
+        bool arg1;
+
+        ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0, "cc.Node:resetChild");
+
+        ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:resetChild");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_resetChild'", nullptr);
+            return 0;
+        }
+        cobj->resetChild(arg0, arg1);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:resetChild",argc, 2);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_resetChild'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Node_setScheduler(lua_State* tolua_S)
 {
     int argc = 0;
@@ -8927,9 +8980,9 @@ int lua_cocos2dx_Node_setName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:setName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:setName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_setName'", nullptr);
@@ -9861,9 +9914,9 @@ int lua_cocos2dx_Node_isScheduled(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:isScheduled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:isScheduled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_isScheduled'", nullptr);
@@ -10455,9 +10508,9 @@ int lua_cocos2dx_Node_getComponent(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getComponent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Node:getComponent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getComponent'", nullptr);
@@ -10510,8 +10563,8 @@ int lua_cocos2dx_Node_getContentSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getContentSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getContentSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getContentSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getContentSize",argc, 0);
@@ -11940,6 +11993,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S)
         tolua_function(tolua_S,"getPhysicsBody",lua_cocos2dx_Node_getPhysicsBody);
         tolua_function(tolua_S,"getAnchorPointInPoints",lua_cocos2dx_Node_getAnchorPointInPoints);
         tolua_function(tolua_S,"removeChildByName",lua_cocos2dx_Node_removeChildByName);
+        tolua_function(tolua_S,"resetChild",lua_cocos2dx_Node_resetChild);
         tolua_function(tolua_S,"setScheduler",lua_cocos2dx_Node_setScheduler);
         tolua_function(tolua_S,"stopAllActions",lua_cocos2dx_Node_stopAllActions);
         tolua_function(tolua_S,"getSkewX",lua_cocos2dx_Node_getSkewX);
@@ -12403,9 +12457,9 @@ int lua_cocos2dx_Scene_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scene:initWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Scene:initWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Scene_initWithSize'", nullptr);
@@ -12489,8 +12543,8 @@ int lua_cocos2dx_Scene_createWithSize(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        cocos2d::Size arg0;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scene:createWithSize");
+        cocos2d::Vec2 arg0;
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Scene:createWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Scene_createWithSize'", nullptr);
@@ -13078,8 +13132,8 @@ int lua_cocos2dx_GLView_getViewName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLView_getViewName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getViewName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getViewName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getViewName",argc, 0);
@@ -13222,8 +13276,8 @@ int lua_cocos2dx_GLView_getFrameSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLView_getFrameSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getFrameSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getFrameSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getFrameSize",argc, 0);
@@ -13507,8 +13561,8 @@ int lua_cocos2dx_GLView_getDesignResolutionSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLView_getDesignResolutionSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getDesignResolutionSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getDesignResolutionSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getDesignResolutionSize",argc, 0);
@@ -13544,8 +13598,8 @@ int lua_cocos2dx_GLView_setIcon(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 1) {
-            std::vector<std::string> arg0;
-            ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "cc.GLView:setIcon");
+            std::vector<std::string_view> arg0;
+            ok &= luaval_to_std_vector_string_view(tolua_S, 2, &arg0, "cc.GLView:setIcon");
 
             if (!ok) { break; }
             cobj->setIcon(arg0);
@@ -13556,8 +13610,8 @@ int lua_cocos2dx_GLView_setIcon(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLView:setIcon");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLView:setIcon");
 
             if (!ok) { break; }
             cobj->setIcon(arg0);
@@ -14101,9 +14155,9 @@ int lua_cocos2dx_GLView_setViewName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLView:setViewName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLView:setViewName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLView_setViewName'", nullptr);
@@ -14203,8 +14257,8 @@ int lua_cocos2dx_GLView_getVisibleSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLView_getVisibleSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getVisibleSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getVisibleSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleSize",argc, 0);
@@ -14711,8 +14765,8 @@ int lua_cocos2dx_Director_getWinSizeInPixels(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_getWinSizeInPixels'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getWinSizeInPixels();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getWinSizeInPixels();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSizeInPixels",argc, 0);
@@ -15049,8 +15103,8 @@ int lua_cocos2dx_Director_getWinSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_getWinSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getWinSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getWinSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSize",argc, 0);
@@ -16163,6 +16217,53 @@ int lua_cocos2dx_Director_isNextDeltaTimeZero(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_Director_isChildrenIndexerEnabled(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Director* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Director",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Director*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Director_isChildrenIndexerEnabled'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_isChildrenIndexerEnabled'", nullptr);
+            return 0;
+        }
+        bool ret = cobj->isChildrenIndexerEnabled();
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isChildrenIndexerEnabled",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Director_isChildrenIndexerEnabled'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Director_setClearColor(lua_State* tolua_S)
 {
     int argc = 0;
@@ -16554,6 +16655,56 @@ int lua_cocos2dx_Director_setNotificationNode(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_Director_setChildrenIndexerEnabled(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Director* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Director",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Director*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Director_setChildrenIndexerEnabled'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        bool arg0;
+
+        ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setChildrenIndexerEnabled");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_setChildrenIndexerEnabled'", nullptr);
+            return 0;
+        }
+        cobj->setChildrenIndexerEnabled(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setChildrenIndexerEnabled",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Director_setChildrenIndexerEnabled'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Director_drawScene(lua_State* tolua_S)
 {
     int argc = 0;
@@ -17122,8 +17273,8 @@ int lua_cocos2dx_Director_getVisibleSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Director_getVisibleSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getVisibleSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getVisibleSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getVisibleSize",argc, 0);
@@ -17653,6 +17804,7 @@ int lua_register_cocos2dx_Director(lua_State* tolua_S)
         tolua_function(tolua_S,"popToSceneStackLevel",lua_cocos2dx_Director_popToSceneStackLevel);
         tolua_function(tolua_S,"resume",lua_cocos2dx_Director_resume);
         tolua_function(tolua_S,"isNextDeltaTimeZero",lua_cocos2dx_Director_isNextDeltaTimeZero);
+        tolua_function(tolua_S,"isChildrenIndexerEnabled",lua_cocos2dx_Director_isChildrenIndexerEnabled);
         tolua_function(tolua_S,"setClearColor",lua_cocos2dx_Director_setClearColor);
         tolua_function(tolua_S,"endToLua",lua_cocos2dx_Director_end);
         tolua_function(tolua_S,"setOpenGLView",lua_cocos2dx_Director_setOpenGLView);
@@ -17661,6 +17813,7 @@ int lua_register_cocos2dx_Director(lua_State* tolua_S)
         tolua_function(tolua_S,"getTotalFrames",lua_cocos2dx_Director_getTotalFrames);
         tolua_function(tolua_S,"runWithScene",lua_cocos2dx_Director_runWithScene);
         tolua_function(tolua_S,"setNotificationNode",lua_cocos2dx_Director_setNotificationNode);
+        tolua_function(tolua_S,"setChildrenIndexerEnabled",lua_cocos2dx_Director_setChildrenIndexerEnabled);
         tolua_function(tolua_S,"drawScene",lua_cocos2dx_Director_drawScene);
         tolua_function(tolua_S,"restart",lua_cocos2dx_Director_restart);
         tolua_function(tolua_S,"popScene",lua_cocos2dx_Director_popScene);
@@ -20524,9 +20677,9 @@ int lua_cocos2dx_Image_initWithImageFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:initWithImageFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Image:initWithImageFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Image_initWithImageFile'", nullptr);
@@ -20809,9 +20962,9 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Image:saveToFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Image_saveToFile'", nullptr);
@@ -20823,10 +20976,10 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Image:saveToFile");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Image:saveToFile");
         if(!ok)
@@ -21065,8 +21218,8 @@ int lua_cocos2dx_PolygonInfo_getFilename(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PolygonInfo_getFilename'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFilename();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFilename();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PolygonInfo:getFilename",argc, 0);
@@ -21201,9 +21354,9 @@ int lua_cocos2dx_PolygonInfo_setFilename(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PolygonInfo:setFilename");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PolygonInfo:setFilename");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PolygonInfo_setFilename'", nullptr);
@@ -21603,9 +21756,9 @@ int lua_cocos2dx_AutoPolygon_constructor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AutoPolygon:AutoPolygon");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AutoPolygon:AutoPolygon");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AutoPolygon_constructor'", nullptr);
@@ -21876,8 +22029,8 @@ int lua_cocos2dx_SpriteFrame_getOriginalSizeInPixels(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrame_getOriginalSizeInPixels'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getOriginalSizeInPixels();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getOriginalSizeInPixels();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSizeInPixels",argc, 0);
@@ -21918,9 +22071,9 @@ int lua_cocos2dx_SpriteFrame_setOriginalSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrame_setOriginalSize'", nullptr);
@@ -22207,8 +22360,8 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 5) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:initWithTextureFilename");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrame:initWithTextureFilename");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -22223,8 +22376,8 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:initWithTextureFilename");
 
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:initWithTextureFilename");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.SpriteFrame:initWithTextureFilename");
 
             if (!ok) { break; }
             bool ret = cobj->initWithTextureFilename(arg0, arg1, arg2, arg3, arg4);
@@ -22235,8 +22388,8 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:initWithTextureFilename");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrame:initWithTextureFilename");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -22348,8 +22501,8 @@ int lua_cocos2dx_SpriteFrame_initWithTexture(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:initWithTexture");
 
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:initWithTexture");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.SpriteFrame:initWithTexture");
 
             if (!ok) { break; }
             bool ret = cobj->initWithTexture(arg0, arg1, arg2, arg3, arg4);
@@ -22417,8 +22570,8 @@ int lua_cocos2dx_SpriteFrame_getOriginalSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrame_getOriginalSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getOriginalSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getOriginalSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSize",argc, 0);
@@ -22744,9 +22897,9 @@ int lua_cocos2dx_SpriteFrame_setOriginalSizeInPixels(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSizeInPixels");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSizeInPixels");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrame_setOriginalSizeInPixels'", nullptr);
@@ -22925,8 +23078,8 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrame:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create");
@@ -22937,8 +23090,8 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S)
             cocos2d::Vec2 arg3;
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:create");
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:create");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.SpriteFrame:create");
             if (!ok) { break; }
             cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::SpriteFrame>(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret);
@@ -22950,8 +23103,8 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrame:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create");
@@ -23000,8 +23153,8 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S)
             cocos2d::Vec2 arg3;
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:createWithTexture");
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:createWithTexture");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.SpriteFrame:createWithTexture");
             if (!ok) { break; }
             cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::createWithTexture(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::SpriteFrame>(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret);
@@ -24186,9 +24339,9 @@ int lua_cocos2dx_Animation_addSpriteFrameWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation:addSpriteFrameWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Animation:addSpriteFrameWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Animation_addSpriteFrameWithFile'", nullptr);
@@ -31325,12 +31478,12 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:getStringForKey");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.UserDefault:getStringForKey");
 
             if (!ok) { break; }
-            std::string ret = cobj->getStringForKey(arg0, arg1);
-            lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+            std::string_view ret = cobj->getStringForKey(arg0, arg1);
+            lua_pushlstring(tolua_S,ret.data(),ret.length());
             return 1;
         }
     }while(0);
@@ -31341,8 +31494,8 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S)
             std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str();
 
             if (!ok) { break; }
-            std::string ret = cobj->getStringForKey(arg0);
-            lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+            std::string_view ret = cobj->getStringForKey(arg0);
+            lua_pushlstring(tolua_S,ret.data(),ret.length());
             return 1;
         }
     }while(0);
@@ -31386,11 +31539,11 @@ int lua_cocos2dx_UserDefault_setStringForKey(lua_State* tolua_S)
     if (argc == 2) 
     {
         const char* arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setStringForKey"); arg0 = arg0_tmp.c_str();
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:setStringForKey");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.UserDefault:setStringForKey");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_UserDefault_setStringForKey'", nullptr);
@@ -31498,8 +31651,8 @@ int lua_cocos2dx_UserDefault_setEncryptEnabled(lua_State* tolua_S)
     if (argc == 3) 
     {
         bool arg0;
-        cxx17::string_view arg1;
-        cxx17::string_view arg2;
+        std::string_view arg1;
+        std::string_view arg2;
 
         ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.UserDefault:setEncryptEnabled");
 
@@ -31843,9 +31996,9 @@ int lua_cocos2dx_FileUtils_fullPathForFilename(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathForFilename");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:fullPathForFilename");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_fullPathForFilename'", nullptr);
@@ -31888,8 +32041,8 @@ int lua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile");
 
             if (!ok) { break; }
             std::function<void (std::string)> arg1;
@@ -31908,8 +32061,8 @@ int lua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile");
 
             if (!ok) { break; }
             std::string ret = cobj->getStringFromFile(arg0);
@@ -32048,8 +32201,8 @@ int lua_cocos2dx_FileUtils_removeFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:removeFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg1;
@@ -32068,8 +32221,8 @@ int lua_cocos2dx_FileUtils_removeFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:removeFile");
 
             if (!ok) { break; }
             bool ret = cobj->removeFile(arg0);
@@ -32116,10 +32269,10 @@ int lua_cocos2dx_FileUtils_listFilesRecursivelyAsync(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         std::function<void (std::vector<std::string>)> arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursivelyAsync");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursivelyAsync");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -32173,9 +32326,9 @@ int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isAbsolutePath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isAbsolutePath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_isAbsolutePath'", nullptr);
@@ -32218,16 +32371,16 @@ int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.FileUtils:renameFile");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg3;
@@ -32246,16 +32399,16 @@ int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.FileUtils:renameFile");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
             bool ret = cobj->renameFile(arg0, arg1, arg2);
@@ -32266,12 +32419,12 @@ int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
             bool ret = cobj->renameFile(arg0, arg1);
@@ -32282,12 +32435,12 @@ int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:renameFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg2;
@@ -32389,9 +32542,9 @@ int lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile(lua_State* tolua
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:loadFilenameLookupDictionaryFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:loadFilenameLookupDictionaryFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile'", nullptr);
@@ -32486,9 +32639,9 @@ int lua_cocos2dx_FileUtils_getValueVectorFromFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueVectorFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getValueVectorFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getValueVectorFromFile'", nullptr);
@@ -32584,11 +32737,11 @@ int lua_cocos2dx_FileUtils_writeToFile(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::ValueMap arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:writeToFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeToFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeToFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_writeToFile'", nullptr);
@@ -32683,9 +32836,9 @@ int lua_cocos2dx_FileUtils_getNewFilename(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getNewFilename");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getNewFilename");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getNewFilename'", nullptr);
@@ -32733,9 +32886,9 @@ int lua_cocos2dx_FileUtils_listFiles(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFiles");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:listFiles");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_listFiles'", nullptr);
@@ -32783,9 +32936,9 @@ int lua_cocos2dx_FileUtils_getValueMapFromFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueMapFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getValueMapFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getValueMapFromFile'", nullptr);
@@ -32828,8 +32981,8 @@ int lua_cocos2dx_FileUtils_getFileSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getFileSize");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getFileSize");
 
             if (!ok) { break; }
             std::function<void (long long)> arg1;
@@ -32848,8 +33001,8 @@ int lua_cocos2dx_FileUtils_getFileSize(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getFileSize");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getFileSize");
 
             if (!ok) { break; }
             long long ret = cobj->getFileSize(arg0);
@@ -32944,8 +33097,8 @@ int lua_cocos2dx_FileUtils_removeDirectory(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeDirectory");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:removeDirectory");
 
             if (!ok) { break; }
             std::function<void (bool)> arg1;
@@ -32964,8 +33117,8 @@ int lua_cocos2dx_FileUtils_removeDirectory(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeDirectory");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:removeDirectory");
 
             if (!ok) { break; }
             bool ret = cobj->removeDirectory(arg0);
@@ -33061,8 +33214,8 @@ int lua_cocos2dx_FileUtils_writeStringToFile(lua_State* tolua_S)
             ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:writeStringToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeStringToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeStringToFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg2;
@@ -33081,12 +33234,12 @@ int lua_cocos2dx_FileUtils_writeStringToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:writeStringToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:writeStringToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeStringToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeStringToFile");
 
             if (!ok) { break; }
             bool ret = cobj->writeStringToFile(arg0, arg1);
@@ -33133,9 +33286,9 @@ int lua_cocos2dx_FileUtils_isFileExistInternal(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isFileExistInternal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isFileExistInternal");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_isFileExistInternal'", nullptr);
@@ -33233,9 +33386,9 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_addSearchResolutionsOrder'", nullptr);
@@ -33247,10 +33400,10 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchResolutionsOrder");
         if(!ok)
@@ -33300,9 +33453,9 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_addSearchPath'", nullptr);
@@ -33314,10 +33467,10 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchPath");
         if(!ok)
@@ -33366,8 +33519,8 @@ int lua_cocos2dx_FileUtils_writeValueVectorToFile(lua_State* tolua_S)
             ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0, "cc.FileUtils:writeValueVectorToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeValueVectorToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeValueVectorToFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg2;
@@ -33390,8 +33543,8 @@ int lua_cocos2dx_FileUtils_writeValueVectorToFile(lua_State* tolua_S)
             ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0, "cc.FileUtils:writeValueVectorToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeValueVectorToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeValueVectorToFile");
 
             if (!ok) { break; }
             bool ret = cobj->writeValueVectorToFile(arg0, arg1);
@@ -33433,8 +33586,8 @@ int lua_cocos2dx_FileUtils_isFileExist(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist");
 
             if (!ok) { break; }
             std::function<void (bool)> arg1;
@@ -33453,8 +33606,8 @@ int lua_cocos2dx_FileUtils_isFileExist(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist");
 
             if (!ok) { break; }
             bool ret = cobj->isFileExist(arg0);
@@ -33548,12 +33701,12 @@ int lua_cocos2dx_FileUtils_fullPathFromRelativeFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathFromRelativeFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:fullPathFromRelativeFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:fullPathFromRelativeFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:fullPathFromRelativeFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_fullPathFromRelativeFile'", nullptr);
@@ -33601,9 +33754,9 @@ int lua_cocos2dx_FileUtils_isDirectoryExistInternal(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExistInternal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExistInternal");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_isDirectoryExistInternal'", nullptr);
@@ -33650,8 +33803,8 @@ int lua_cocos2dx_FileUtils_writeValueMapToFile(lua_State* tolua_S)
             ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:writeValueMapToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeValueMapToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeValueMapToFile");
 
             if (!ok) { break; }
             std::function<void (bool)> arg2;
@@ -33674,8 +33827,8 @@ int lua_cocos2dx_FileUtils_writeValueMapToFile(lua_State* tolua_S)
             ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:writeValueMapToFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeValueMapToFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FileUtils:writeValueMapToFile");
 
             if (!ok) { break; }
             bool ret = cobj->writeValueMapToFile(arg0, arg1);
@@ -33722,9 +33875,9 @@ int lua_cocos2dx_FileUtils_getFileExtension(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getFileExtension");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getFileExtension");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getFileExtension'", nullptr);
@@ -33772,9 +33925,9 @@ int lua_cocos2dx_FileUtils_setWritablePath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:setWritablePath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:setWritablePath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_setWritablePath'", nullptr);
@@ -33867,8 +34020,8 @@ int lua_cocos2dx_FileUtils_isDirectoryExist(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExist");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExist");
 
             if (!ok) { break; }
             std::function<void (bool)> arg1;
@@ -33887,8 +34040,8 @@ int lua_cocos2dx_FileUtils_isDirectoryExist(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExist");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExist");
 
             if (!ok) { break; }
             bool ret = cobj->isDirectoryExist(arg0);
@@ -33935,9 +34088,9 @@ int lua_cocos2dx_FileUtils_setDefaultResourceRootPath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:setDefaultResourceRootPath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:setDefaultResourceRootPath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_setDefaultResourceRootPath'", nullptr);
@@ -34027,8 +34180,8 @@ int lua_cocos2dx_FileUtils_createDirectory(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:createDirectory");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:createDirectory");
 
             if (!ok) { break; }
             std::function<void (bool)> arg1;
@@ -34047,8 +34200,8 @@ int lua_cocos2dx_FileUtils_createDirectory(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:createDirectory");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:createDirectory");
 
             if (!ok) { break; }
             bool ret = cobj->createDirectory(arg0);
@@ -34095,10 +34248,10 @@ int lua_cocos2dx_FileUtils_listFilesAsync(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         std::function<void (std::vector<std::string>)> arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesAsync");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:listFilesAsync");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -34199,10 +34352,10 @@ int lua_cocos2dx_FileUtils_listFilesRecursively(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         std::vector<std::string>* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursively");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:listFilesRecursively");
 
         ok &= luaval_to_object<std::vector<std::string>>(tolua_S, 3, "std::vector<std::string>*",&arg1, "cc.FileUtils:listFilesRecursively");
         if(!ok)
@@ -34224,7 +34377,48 @@ int lua_cocos2dx_FileUtils_listFilesRecursively(lua_State* tolua_S)
 
     return 0;
 }
-int lua_cocos2dx_FileUtils_destroyInstance(lua_State* tolua_S)
+int lua_cocos2dx_FileUtils_writeBinaryToFile(lua_State* tolua_S)
+{
+    int argc = 0;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertable(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    argc = lua_gettop(tolua_S) - 1;
+
+    if (argc == 3)
+    {
+        const void* arg0;
+        unsigned int arg1;
+        std::string_view arg2;
+        #pragma warning NO CONVERSION TO NATIVE FOR void*
+		ok = false;
+        ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.FileUtils:writeBinaryToFile");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.FileUtils:writeBinaryToFile");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_writeBinaryToFile'", nullptr);
+            return 0;
+        }
+        bool ret = cocos2d::FileUtils::writeBinaryToFile(arg0, arg1, arg2);
+        tolua_pushboolean(tolua_S,(bool)ret);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:writeBinaryToFile",argc, 3);
+    return 0;
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_writeBinaryToFile'.",&tolua_err);
+#endif
+    return 0;
+}
+int lua_cocos2dx_FileUtils_getInstance(lua_State* tolua_S)
 {
     int argc = 0;
     bool ok  = true;
@@ -34243,22 +34437,22 @@ int lua_cocos2dx_FileUtils_destroyInstance(lua_State* tolua_S)
     {
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_destroyInstance'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getInstance'", nullptr);
             return 0;
         }
-        cocos2d::FileUtils::destroyInstance();
-        lua_settop(tolua_S, 1);
+        cocos2d::FileUtils* ret = cocos2d::FileUtils::getInstance();
+        object_to_luaval<cocos2d::FileUtils>(tolua_S, "cc.FileUtils",(cocos2d::FileUtils*)ret);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:destroyInstance",argc, 0);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:getInstance",argc, 0);
     return 0;
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_destroyInstance'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_getInstance'.",&tolua_err);
 #endif
     return 0;
 }
-int lua_cocos2dx_FileUtils_writeBinaryToFile(lua_State* tolua_S)
+int lua_cocos2dx_FileUtils_isAbsolutePathInternal(lua_State* tolua_S)
 {
     int argc = 0;
     bool ok  = true;
@@ -34273,33 +34467,28 @@ int lua_cocos2dx_FileUtils_writeBinaryToFile(lua_State* tolua_S)
 
     argc = lua_gettop(tolua_S) - 1;
 
-    if (argc == 3)
+    if (argc == 1)
     {
-        const void* arg0;
-        unsigned int arg1;
-        std::string arg2;
-        #pragma warning NO CONVERSION TO NATIVE FOR void*
-		ok = false;
-        ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.FileUtils:writeBinaryToFile");
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.FileUtils:writeBinaryToFile");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:isAbsolutePathInternal");
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_writeBinaryToFile'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_isAbsolutePathInternal'", nullptr);
             return 0;
         }
-        bool ret = cocos2d::FileUtils::writeBinaryToFile(arg0, arg1, arg2);
+        bool ret = cocos2d::FileUtils::isAbsolutePathInternal(arg0);
         tolua_pushboolean(tolua_S,(bool)ret);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:writeBinaryToFile",argc, 3);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:isAbsolutePathInternal",argc, 1);
     return 0;
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_writeBinaryToFile'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_isAbsolutePathInternal'.",&tolua_err);
 #endif
     return 0;
 }
-int lua_cocos2dx_FileUtils_getInstance(lua_State* tolua_S)
+int lua_cocos2dx_FileUtils_destroyInstance(lua_State* tolua_S)
 {
     int argc = 0;
     bool ok  = true;
@@ -34318,18 +34507,18 @@ int lua_cocos2dx_FileUtils_getInstance(lua_State* tolua_S)
     {
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getInstance'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_destroyInstance'", nullptr);
             return 0;
         }
-        cocos2d::FileUtils* ret = cocos2d::FileUtils::getInstance();
-        object_to_luaval<cocos2d::FileUtils>(tolua_S, "cc.FileUtils",(cocos2d::FileUtils*)ret);
+        cocos2d::FileUtils::destroyInstance();
+        lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:getInstance",argc, 0);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:destroyInstance",argc, 0);
     return 0;
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_getInstance'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_destroyInstance'.",&tolua_err);
 #endif
     return 0;
 }
@@ -34350,8 +34539,8 @@ int lua_cocos2dx_FileUtils_getFileShortName(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getFileShortName");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FileUtils:getFileShortName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FileUtils_getFileShortName'", nullptr);
@@ -34424,9 +34613,10 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S)
         tolua_function(tolua_S,"listFilesAsync",lua_cocos2dx_FileUtils_listFilesAsync);
         tolua_function(tolua_S,"getWritablePath",lua_cocos2dx_FileUtils_getWritablePath);
         tolua_function(tolua_S,"listFilesRecursively",lua_cocos2dx_FileUtils_listFilesRecursively);
-        tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_FileUtils_destroyInstance);
         tolua_function(tolua_S,"writeBinaryToFile", lua_cocos2dx_FileUtils_writeBinaryToFile);
         tolua_function(tolua_S,"getInstance", lua_cocos2dx_FileUtils_getInstance);
+        tolua_function(tolua_S,"isAbsolutePathInternal", lua_cocos2dx_FileUtils_isAbsolutePathInternal);
+        tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_FileUtils_destroyInstance);
         tolua_function(tolua_S,"getFileShortName", lua_cocos2dx_FileUtils_getFileShortName);
     tolua_endmodule(tolua_S);
     auto typeName = typeid(cocos2d::FileUtils).name(); // rtti is literal storage
@@ -34487,8 +34677,8 @@ int lua_cocos2dx_EventCustom_getEventName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_EventCustom_getEventName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getEventName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getEventName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventCustom:getEventName",argc, 0);
@@ -34516,9 +34706,9 @@ int lua_cocos2dx_EventCustom_constructor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventCustom:EventCustom");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventCustom:EventCustom");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_EventCustom_constructor'", nullptr);
@@ -34863,9 +35053,9 @@ int lua_cocos2dx_EventDispatcher_dispatchCustomEvent(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:dispatchCustomEvent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventDispatcher:dispatchCustomEvent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_EventDispatcher_dispatchCustomEvent'", nullptr);
@@ -34877,10 +35067,10 @@ int lua_cocos2dx_EventDispatcher_dispatchCustomEvent(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         void* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:dispatchCustomEvent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventDispatcher:dispatchCustomEvent");
 
         #pragma warning NO CONVERSION TO NATIVE FOR void*
 		ok = false;
@@ -35118,10 +35308,10 @@ int lua_cocos2dx_EventDispatcher_addCustomEventListener(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         std::function<void (cocos2d::EventCustom *)> arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:addCustomEventListener");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventDispatcher:addCustomEventListener");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -35225,9 +35415,9 @@ int lua_cocos2dx_EventDispatcher_hasEventListener(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::EventListener::ListenerID arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:hasEventListener");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventDispatcher:hasEventListener");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_EventDispatcher_hasEventListener'", nullptr);
@@ -35322,9 +35512,9 @@ int lua_cocos2dx_EventDispatcher_removeCustomEventListeners(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:removeCustomEventListeners");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventDispatcher:removeCustomEventListeners");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_EventDispatcher_removeCustomEventListeners'", nullptr);
@@ -43373,11 +43563,11 @@ int lua_cocos2dx_GridAction_initWithDuration(lua_State* tolua_S)
     if (argc == 2) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GridAction:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.GridAction:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.GridAction:initWithDuration");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GridAction_initWithDuration'", nullptr);
@@ -43820,13 +44010,13 @@ int lua_cocos2dx_Waves3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Waves3D:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves3D:initWithDuration");
 
@@ -44012,11 +44202,11 @@ int lua_cocos2dx_Waves3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Waves3D:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves3D:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves3D:create");
         if(!ok)
@@ -44127,10 +44317,10 @@ int lua_cocos2dx_FlipX3D_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         double arg1;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FlipX3D:initWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FlipX3D:initWithSize");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FlipX3D:initWithSize");
         if(!ok)
@@ -44471,13 +44661,13 @@ int lua_cocos2dx_Lens3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Lens3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Lens3D:initWithDuration");
 
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Lens3D:initWithDuration");
 
@@ -44713,11 +44903,11 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Lens3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Lens3D:create");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Lens3D:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Lens3D:create");
         if(!ok)
@@ -44880,7 +45070,7 @@ int lua_cocos2dx_Ripple3D_initWithDuration(lua_State* tolua_S)
     if (argc == 6) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         double arg3;
         unsigned int arg4;
@@ -44888,7 +45078,7 @@ int lua_cocos2dx_Ripple3D_initWithDuration(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Ripple3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Ripple3D:initWithDuration");
 
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Ripple3D:initWithDuration");
 
@@ -45175,13 +45365,13 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S)
     if (argc == 6)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         double arg3;
         unsigned int arg4;
         double arg5;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Ripple3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Ripple3D:create");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Ripple3D:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Ripple3D:create");
         ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.Ripple3D:create");
@@ -45297,13 +45487,13 @@ int lua_cocos2dx_Shaky3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Shaky3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Shaky3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Shaky3D:initWithDuration");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Shaky3D:initWithDuration");
 
@@ -45345,11 +45535,11 @@ int lua_cocos2dx_Shaky3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Shaky3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Shaky3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Shaky3D:create");
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Shaky3D:create");
         ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.Shaky3D:create");
         if(!ok)
@@ -45507,13 +45697,13 @@ int lua_cocos2dx_Liquid_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Liquid:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Liquid:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Liquid:initWithDuration");
 
@@ -45699,11 +45889,11 @@ int lua_cocos2dx_Liquid_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Liquid:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Liquid:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Liquid:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Liquid:create");
         if(!ok)
@@ -45865,7 +46055,7 @@ int lua_cocos2dx_Waves_initWithDuration(lua_State* tolua_S)
     if (argc == 6) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         bool arg4;
@@ -45873,7 +46063,7 @@ int lua_cocos2dx_Waves_initWithDuration(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Waves:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves:initWithDuration");
 
@@ -46063,13 +46253,13 @@ int lua_cocos2dx_Waves_create(lua_State* tolua_S)
     if (argc == 6)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         bool arg4;
         bool arg5;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Waves:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves:create");
         ok &= luaval_to_boolean(tolua_S, 6,&arg4, "cc.Waves:create");
@@ -46233,14 +46423,14 @@ int lua_cocos2dx_Twirl_initWithDuration(lua_State* tolua_S)
     if (argc == 5) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         unsigned int arg3;
         double arg4;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Twirl:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Twirl:initWithDuration");
 
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Twirl:initWithDuration");
 
@@ -46525,12 +46715,12 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S)
     if (argc == 5)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         unsigned int arg3;
         double arg4;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Twirl:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Twirl:create");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Twirl:create");
         ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.Twirl:create");
         ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.Twirl:create");
@@ -47519,9 +47709,9 @@ int lua_cocos2dx_PageTurn3D_create(lua_State* tolua_S)
     if (argc == 2)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PageTurn3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.PageTurn3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PageTurn3D:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PageTurn3D_create'", nullptr);
@@ -47893,13 +48083,13 @@ int lua_cocos2dx_ShakyTiles3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShakyTiles3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShakyTiles3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShakyTiles3D:initWithDuration");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShakyTiles3D:initWithDuration");
 
@@ -47941,11 +48131,11 @@ int lua_cocos2dx_ShakyTiles3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShakyTiles3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShakyTiles3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShakyTiles3D:create");
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShakyTiles3D:create");
         ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShakyTiles3D:create");
         if(!ok)
@@ -48053,13 +48243,13 @@ int lua_cocos2dx_ShatteredTiles3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShatteredTiles3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:initWithDuration");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShatteredTiles3D:initWithDuration");
 
@@ -48101,11 +48291,11 @@ int lua_cocos2dx_ShatteredTiles3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
         bool arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShatteredTiles3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:create");
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShatteredTiles3D:create");
         ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShatteredTiles3D:create");
         if(!ok)
@@ -48213,12 +48403,12 @@ int lua_cocos2dx_ShuffleTiles_initWithDuration(lua_State* tolua_S)
     if (argc == 3) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShuffleTiles:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShuffleTiles:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShuffleTiles:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.ShuffleTiles:initWithDuration");
         if(!ok)
@@ -48268,16 +48458,16 @@ int lua_cocos2dx_ShuffleTiles_getDelta(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ShuffleTiles:getDelta");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ShuffleTiles:getDelta");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ShuffleTiles_getDelta'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getDelta(arg0);
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getDelta(arg0);
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.ShuffleTiles:getDelta",argc, 1);
@@ -48308,10 +48498,10 @@ int lua_cocos2dx_ShuffleTiles_create(lua_State* tolua_S)
     if (argc == 3)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShuffleTiles:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShuffleTiles:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ShuffleTiles:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.ShuffleTiles:create");
         if(!ok)
         {
@@ -48571,10 +48761,10 @@ int lua_cocos2dx_FadeOutTRTiles_testFunc(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         double arg1;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:testFunc");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:testFunc");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutTRTiles:testFunc");
         if(!ok)
@@ -48614,9 +48804,9 @@ int lua_cocos2dx_FadeOutTRTiles_create(lua_State* tolua_S)
     if (argc == 2)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutTRTiles:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutTRTiles:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.FadeOutTRTiles:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FadeOutTRTiles_create'", nullptr);
@@ -48714,9 +48904,9 @@ int lua_cocos2dx_FadeOutBLTiles_create(lua_State* tolua_S)
     if (argc == 2)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutBLTiles:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutBLTiles:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.FadeOutBLTiles:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FadeOutBLTiles_create'", nullptr);
@@ -48810,9 +49000,9 @@ int lua_cocos2dx_FadeOutUpTiles_create(lua_State* tolua_S)
     if (argc == 2)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutUpTiles:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutUpTiles:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.FadeOutUpTiles:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FadeOutUpTiles_create'", nullptr);
@@ -48906,9 +49096,9 @@ int lua_cocos2dx_FadeOutDownTiles_create(lua_State* tolua_S)
     if (argc == 2)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutDownTiles:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutDownTiles:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.FadeOutDownTiles:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FadeOutDownTiles_create'", nullptr);
@@ -49113,12 +49303,12 @@ int lua_cocos2dx_TurnOffTiles_initWithDuration(lua_State* tolua_S)
     if (argc == 3) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TurnOffTiles:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.TurnOffTiles:initWithDuration");
         if(!ok)
@@ -49161,8 +49351,8 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S)
             double arg0;
             ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create");
             if (!ok) { break; }
-            cocos2d::Size arg1;
-            ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create");
+            cocos2d::Vec2 arg1;
+            ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TurnOffTiles:create");
             if (!ok) { break; }
             unsigned int arg2;
             ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.TurnOffTiles:create");
@@ -49180,8 +49370,8 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S)
             double arg0;
             ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create");
             if (!ok) { break; }
-            cocos2d::Size arg1;
-            ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create");
+            cocos2d::Vec2 arg1;
+            ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TurnOffTiles:create");
             if (!ok) { break; }
             cocos2d::TurnOffTiles* ret = cocos2d::TurnOffTiles::create(arg0, arg1);
             object_to_luaval<cocos2d::TurnOffTiles>(tolua_S, "cc.TurnOffTiles",(cocos2d::TurnOffTiles*)ret);
@@ -49337,13 +49527,13 @@ int lua_cocos2dx_WavesTiles3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.WavesTiles3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.WavesTiles3D:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.WavesTiles3D:initWithDuration");
 
@@ -49529,11 +49719,11 @@ int lua_cocos2dx_WavesTiles3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.WavesTiles3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.WavesTiles3D:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.WavesTiles3D:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.WavesTiles3D:create");
         if(!ok)
@@ -49695,13 +49885,13 @@ int lua_cocos2dx_JumpTiles3D_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:initWithDuration");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.JumpTiles3D:initWithDuration");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpTiles3D:initWithDuration");
 
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.JumpTiles3D:initWithDuration");
 
@@ -49887,11 +50077,11 @@ int lua_cocos2dx_JumpTiles3D_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         unsigned int arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:create");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.JumpTiles3D:create");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpTiles3D:create");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.JumpTiles3D:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.JumpTiles3D:create");
         if(!ok)
@@ -50303,13 +50493,13 @@ int lua_cocos2dx_ActionTween_initWithDuration(lua_State* tolua_S)
     if (argc == 4) 
     {
         double arg0;
-        std::string arg1;
+        std::string_view arg1;
         double arg2;
         double arg3;
 
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionTween:initWithDuration");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ActionTween:initWithDuration");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.ActionTween:initWithDuration");
 
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionTween:initWithDuration");
 
@@ -50351,11 +50541,11 @@ int lua_cocos2dx_ActionTween_create(lua_State* tolua_S)
     if (argc == 4)
     {
         double arg0;
-        std::string arg1;
+        std::string_view arg1;
         double arg2;
         double arg3;
         ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionTween:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ActionTween:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.ActionTween:create");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionTween:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ActionTween:create");
         if(!ok)
@@ -50471,12 +50661,12 @@ int lua_cocos2dx_AtlasNode_initWithTileFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 4) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
         int arg2;
         int arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AtlasNode:initWithTileFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AtlasNode:initWithTileFile");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.AtlasNode:initWithTileFile");
 
@@ -50966,11 +51156,11 @@ int lua_cocos2dx_AtlasNode_create(lua_State* tolua_S)
 
     if (argc == 4)
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
         int arg2;
         int arg3;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AtlasNode:create");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AtlasNode:create");
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.AtlasNode:create");
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.AtlasNode:create");
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.AtlasNode:create");
@@ -51814,13 +52004,13 @@ int lua_cocos2dx_DrawNode_drawLine(lua_State* tolua_S)
     {
         cocos2d::Vec2 arg0;
         cocos2d::Vec2 arg1;
-        cocos2d::Color4F arg2;
+        cocos2d::Color4B arg2;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawLine");
 
         ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawLine");
 
-        ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawLine");
+        ok &=luaval_to_color4b(tolua_S, 4, &arg2, "cc.DrawNode:drawLine");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawLine'", nullptr);
@@ -51929,8 +52119,8 @@ int lua_cocos2dx_DrawNode_drawRect(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.DrawNode:drawRect");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg4;
-            ok &=luaval_to_color4f(tolua_S, 6, &arg4, "cc.DrawNode:drawRect");
+            cocos2d::Color4B arg4;
+            ok &=luaval_to_color4b(tolua_S, 6, &arg4, "cc.DrawNode:drawRect");
 
             if (!ok) { break; }
             cobj->drawRect(arg0, arg1, arg2, arg3, arg4);
@@ -51949,8 +52139,8 @@ int lua_cocos2dx_DrawNode_drawRect(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawRect");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg2;
-            ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawRect");
+            cocos2d::Color4B arg2;
+            ok &=luaval_to_color4b(tolua_S, 4, &arg2, "cc.DrawNode:drawRect");
 
             if (!ok) { break; }
             cobj->drawRect(arg0, arg1, arg2);
@@ -52016,8 +52206,8 @@ int lua_cocos2dx_DrawNode_drawSolidCircle(lua_State* tolua_S)
             ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg6;
-            ok &=luaval_to_color4f(tolua_S, 8, &arg6, "cc.DrawNode:drawSolidCircle");
+            cocos2d::Color4B arg6;
+            ok &=luaval_to_color4b(tolua_S, 8, &arg6, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
             cobj->drawSolidCircle(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -52052,16 +52242,16 @@ int lua_cocos2dx_DrawNode_drawSolidCircle(lua_State* tolua_S)
             ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg6;
-            ok &=luaval_to_color4f(tolua_S, 8, &arg6, "cc.DrawNode:drawSolidCircle");
+            cocos2d::Color4B arg6;
+            ok &=luaval_to_color4b(tolua_S, 8, &arg6, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
             double arg7;
             ok &= luaval_to_number(tolua_S, 9,&arg7, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg8;
-            ok &=luaval_to_color4f(tolua_S, 10, &arg8, "cc.DrawNode:drawSolidCircle");
+            cocos2d::Color4B arg8;
+            ok &=luaval_to_color4b(tolua_S, 10, &arg8, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
             cobj->drawSolidCircle(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -52088,8 +52278,8 @@ int lua_cocos2dx_DrawNode_drawSolidCircle(lua_State* tolua_S)
             ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg4;
-            ok &=luaval_to_color4f(tolua_S, 6, &arg4, "cc.DrawNode:drawSolidCircle");
+            cocos2d::Color4B arg4;
+            ok &=luaval_to_color4b(tolua_S, 6, &arg4, "cc.DrawNode:drawSolidCircle");
 
             if (!ok) { break; }
             cobj->drawSolidCircle(arg0, arg1, arg2, arg3, arg4);
@@ -52188,13 +52378,13 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S)
     {
         cocos2d::Vec2 arg0;
         double arg1;
-        cocos2d::Color4F arg2;
+        cocos2d::Color4B arg2;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawDot");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.DrawNode:drawDot");
 
-        ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawDot");
+        ok &=luaval_to_color4b(tolua_S, 4, &arg2, "cc.DrawNode:drawDot");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawDot'", nullptr);
@@ -52245,7 +52435,7 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S)
         cocos2d::Vec2 arg0;
         cocos2d::Vec2 arg1;
         double arg2;
-        cocos2d::Color4F arg3;
+        cocos2d::Color4B arg3;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawSegment");
 
@@ -52253,7 +52443,7 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.DrawNode:drawSegment");
 
-        ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawSegment");
+        ok &=luaval_to_color4b(tolua_S, 5, &arg3, "cc.DrawNode:drawSegment");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawSegment'", nullptr);
@@ -52363,8 +52553,8 @@ int lua_cocos2dx_DrawNode_drawCircle(lua_State* tolua_S)
             ok &= luaval_to_boolean(tolua_S, 6,&arg4, "cc.DrawNode:drawCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg5;
-            ok &=luaval_to_color4f(tolua_S, 7, &arg5, "cc.DrawNode:drawCircle");
+            cocos2d::Color4B arg5;
+            ok &=luaval_to_color4b(tolua_S, 7, &arg5, "cc.DrawNode:drawCircle");
 
             if (!ok) { break; }
             cobj->drawCircle(arg0, arg1, arg2, arg3, arg4, arg5);
@@ -52403,8 +52593,8 @@ int lua_cocos2dx_DrawNode_drawCircle(lua_State* tolua_S)
             ok &= luaval_to_number(tolua_S, 8,&arg6, "cc.DrawNode:drawCircle");
 
             if (!ok) { break; }
-            cocos2d::Color4F arg7;
-            ok &=luaval_to_color4f(tolua_S, 9, &arg7, "cc.DrawNode:drawCircle");
+            cocos2d::Color4B arg7;
+            ok &=luaval_to_color4b(tolua_S, 9, &arg7, "cc.DrawNode:drawCircle");
 
             if (!ok) { break; }
             cobj->drawCircle(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -52455,7 +52645,7 @@ int lua_cocos2dx_DrawNode_drawQuadBezier(lua_State* tolua_S)
         cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
         unsigned int arg3;
-        cocos2d::Color4F arg4;
+        cocos2d::Color4B arg4;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawQuadBezier");
 
@@ -52465,7 +52655,7 @@ int lua_cocos2dx_DrawNode_drawQuadBezier(lua_State* tolua_S)
 
         ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.DrawNode:drawQuadBezier");
 
-        ok &=luaval_to_color4f(tolua_S, 6, &arg4, "cc.DrawNode:drawQuadBezier");
+        ok &=luaval_to_color4b(tolua_S, 6, &arg4, "cc.DrawNode:drawQuadBezier");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawQuadBezier'", nullptr);
@@ -52516,7 +52706,7 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S)
         cocos2d::Vec2 arg0;
         cocos2d::Vec2 arg1;
         cocos2d::Vec2 arg2;
-        cocos2d::Color4F arg3;
+        cocos2d::Color4B arg3;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawTriangle");
 
@@ -52524,7 +52714,7 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S)
 
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawTriangle");
 
-        ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawTriangle");
+        ok &=luaval_to_color4b(tolua_S, 5, &arg3, "cc.DrawNode:drawTriangle");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawTriangle'", nullptr);
@@ -52671,13 +52861,13 @@ int lua_cocos2dx_DrawNode_drawSolidRect(lua_State* tolua_S)
     {
         cocos2d::Vec2 arg0;
         cocos2d::Vec2 arg1;
-        cocos2d::Color4F arg2;
+        cocos2d::Color4B arg2;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawSolidRect");
 
         ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawSolidRect");
 
-        ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawSolidRect");
+        ok &=luaval_to_color4b(tolua_S, 4, &arg2, "cc.DrawNode:drawSolidRect");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawSolidRect'", nullptr);
@@ -52774,13 +52964,13 @@ int lua_cocos2dx_DrawNode_drawPoint(lua_State* tolua_S)
     {
         cocos2d::Vec2 arg0;
         double arg1;
-        cocos2d::Color4F arg2;
+        cocos2d::Color4B arg2;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawPoint");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.DrawNode:drawPoint");
 
-        ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawPoint");
+        ok &=luaval_to_color4b(tolua_S, 4, &arg2, "cc.DrawNode:drawPoint");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawPoint'", nullptr);
@@ -52880,7 +53070,7 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S)
         cocos2d::Vec2 arg2;
         cocos2d::Vec2 arg3;
         unsigned int arg4;
-        cocos2d::Color4F arg5;
+        cocos2d::Color4B arg5;
 
         ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawCubicBezier");
 
@@ -52892,7 +53082,7 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S)
 
         ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.DrawNode:drawCubicBezier");
 
-        ok &=luaval_to_color4f(tolua_S, 7, &arg5, "cc.DrawNode:drawCubicBezier");
+        ok &=luaval_to_color4b(tolua_S, 7, &arg5, "cc.DrawNode:drawCubicBezier");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_DrawNode_drawCubicBezier'", nullptr);
@@ -53153,11 +53343,11 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::Color4B arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
 
         ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Label:enableShadow");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_enableShadow'", nullptr);
@@ -53170,12 +53360,12 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S)
     if (argc == 3) 
     {
         cocos2d::Color4B arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
 
         ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Label:enableShadow");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:enableShadow");
         if(!ok)
@@ -53330,8 +53520,8 @@ int lua_cocos2dx_Label_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getString",argc, 0);
@@ -53954,8 +54144,8 @@ int lua_cocos2dx_Label_getShadowOffset(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getShadowOffset'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getShadowOffset();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getShadowOffset();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getShadowOffset",argc, 0);
@@ -54093,9 +54283,9 @@ int lua_cocos2dx_Label_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_setString'", nullptr);
@@ -54143,9 +54333,9 @@ int lua_cocos2dx_Label_setSystemFontName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setSystemFontName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setSystemFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_setSystemFontName'", nullptr);
@@ -54282,8 +54472,8 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -54302,8 +54492,8 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -54326,8 +54516,8 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             bool ret = cobj->setBMFontFilePath(arg0);
@@ -54338,8 +54528,8 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             double arg1;
@@ -54354,12 +54544,12 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:setBMFontFilePath");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             bool ret = cobj->setBMFontFilePath(arg0, arg1);
@@ -54370,12 +54560,12 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:setBMFontFilePath");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:setBMFontFilePath");
 
             if (!ok) { break; }
             double arg2;
@@ -54425,8 +54615,8 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
             ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             bool ret = cobj->initWithTTF(arg0, arg1);
@@ -54441,8 +54631,8 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
             ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
@@ -54461,8 +54651,8 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
             ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
@@ -54481,12 +54671,12 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             double arg2;
@@ -54501,20 +54691,20 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             bool ret = cobj->initWithTTF(arg0, arg1, arg2, arg3);
@@ -54525,20 +54715,20 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 5) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -54553,20 +54743,20 @@ int lua_cocos2dx_Label_initWithTTF(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 6) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
-            cocos2d::Size arg3;
-            ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
+            cocos2d::Vec2 arg3;
+            ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:initWithTTF");
 
             if (!ok) { break; }
             cocos2d::TextHAlignment arg4;
@@ -55286,8 +55476,8 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setCharMap");
 
             if (!ok) { break; }
             int arg1;
@@ -55310,8 +55500,8 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:setCharMap");
 
             if (!ok) { break; }
             bool ret = cobj->setCharMap(arg0);
@@ -55363,8 +55553,8 @@ int lua_cocos2dx_Label_getDimensions(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getDimensions'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getDimensions();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getDimensions();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getDimensions",argc, 0);
@@ -55460,8 +55650,8 @@ int lua_cocos2dx_Label_getSystemFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getSystemFontName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getSystemFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getSystemFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getSystemFontName",argc, 0);
@@ -56377,8 +56567,8 @@ int lua_cocos2dx_Label_getBMFontFilePath(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getBMFontFilePath'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getBMFontFilePath();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getBMFontFilePath();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getBMFontFilePath",argc, 0);
@@ -56756,11 +56946,11 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont");
@@ -56784,11 +56974,11 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1);
             object_to_luaval<cocos2d::Label>(tolua_S, "cc.Label",(cocos2d::Label*)ret);
@@ -56800,11 +56990,11 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont");
@@ -56819,11 +57009,11 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont");
@@ -56841,11 +57031,11 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::TextHAlignment arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont");
@@ -56853,8 +57043,8 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S)
             int arg3;
             ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithBMFont");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.Label:createWithBMFont");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.Label:createWithBMFont");
             if (!ok) { break; }
             cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::Label>(tolua_S, "cc.Label",(cocos2d::Label*)ret);
@@ -56944,8 +57134,8 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithCharMap");
             if (!ok) { break; }
             int arg1;
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:createWithCharMap");
@@ -56966,8 +57156,8 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithCharMap");
             if (!ok) { break; }
             cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0);
             object_to_luaval<cocos2d::Label>(tolua_S, "cc.Label",(cocos2d::Label*)ret);
@@ -57000,11 +57190,11 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S)
 
     if (argc == 3)
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         double arg2;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont");
         if(!ok)
         {
@@ -57017,14 +57207,14 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S)
     }
     if (argc == 4)
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         double arg2;
-        cocos2d::Size arg3;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
+        cocos2d::Vec2 arg3;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_createWithSystemFont'", nullptr);
@@ -57036,15 +57226,15 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S)
     }
     if (argc == 5)
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         double arg2;
-        cocos2d::Size arg3;
+        cocos2d::Vec2 arg3;
         cocos2d::TextHAlignment arg4;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
         ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont");
         if(!ok)
         {
@@ -57057,16 +57247,16 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S)
     }
     if (argc == 6)
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         double arg2;
-        cocos2d::Size arg3;
+        cocos2d::Vec2 arg3;
         cocos2d::TextHAlignment arg4;
         cocos2d::TextVAlignment arg5;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont");
-        ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
+        ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont");
         ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont");
         ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Label:createWithSystemFont");
         if(!ok)
@@ -57206,9 +57396,9 @@ int lua_cocos2dx_LabelAtlas_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_LabelAtlas_setString'", nullptr);
@@ -57251,12 +57441,12 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString");
 
             if (!ok) { break; }
             bool ret = cobj->initWithString(arg0, arg1);
@@ -57267,12 +57457,12 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 5) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString");
 
             if (!ok) { break; }
             int arg2;
@@ -57295,8 +57485,8 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 5) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString");
 
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
@@ -57364,8 +57554,8 @@ int lua_cocos2dx_LabelAtlas_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_LabelAtlas_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:getString",argc, 0);
@@ -57396,11 +57586,11 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.LabelAtlas:create");
             if (!ok) { break; }
             cocos2d::LabelAtlas* ret = cocos2d::LabelAtlas::create(arg0, arg1);
             object_to_luaval<cocos2d::LabelAtlas>(tolua_S, "cc.LabelAtlas",(cocos2d::LabelAtlas*)ret);
@@ -57412,11 +57602,11 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.LabelAtlas:create");
             if (!ok) { break; }
             int arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:create");
@@ -57437,8 +57627,8 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.LabelAtlas:create");
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
             ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1, "cc.LabelAtlas:create");
@@ -60672,8 +60862,8 @@ int lua_cocos2dx_MenuItemLabel_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemLabel_getString'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:getString",argc, 0);
@@ -60761,9 +60951,9 @@ int lua_cocos2dx_MenuItemLabel_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemLabel:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemLabel:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemLabel_setString'", nullptr);
@@ -61029,16 +61219,16 @@ int lua_cocos2dx_MenuItemAtlasFont_initWithString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 6) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         int arg2;
         int arg3;
         int32_t arg4;
         std::function<void (cocos2d::Ref *)> arg5;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemAtlasFont:initWithString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemAtlasFont:initWithString");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.MenuItemAtlasFont:initWithString");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.MenuItemAtlasFont:initWithString");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.MenuItemAtlasFont:initWithString");
 
@@ -61161,8 +61351,8 @@ int lua_cocos2dx_MenuItemFont_getFontNameObj(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemFont_getFontNameObj'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFontNameObj();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFontNameObj();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:getFontNameObj",argc, 0);
@@ -61203,9 +61393,9 @@ int lua_cocos2dx_MenuItemFont_setFontNameObj(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontNameObj");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontNameObj");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemFont_setFontNameObj'", nullptr);
@@ -61253,10 +61443,10 @@ int lua_cocos2dx_MenuItemFont_initWithString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         std::function<void (cocos2d::Ref *)> arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:initWithString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemFont:initWithString");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -61396,8 +61586,8 @@ int lua_cocos2dx_MenuItemFont_setFontName(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontName");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemFont_setFontName'", nullptr);
@@ -61471,8 +61661,8 @@ int lua_cocos2dx_MenuItemFont_getFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_MenuItemFont_getFontName'", nullptr);
             return 0;
         }
-        const std::string& ret = cocos2d::MenuItemFont::getFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cocos2d::MenuItemFont::getFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:getFontName",argc, 0);
@@ -62375,16 +62565,16 @@ int lua_cocos2dx_MenuItemImage_initWithNormalImage(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
         std::function<void (cocos2d::Ref *)> arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemImage:initWithNormalImage");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.MenuItemImage:initWithNormalImage");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.MenuItemImage:initWithNormalImage");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.MenuItemImage:initWithNormalImage");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.MenuItemImage:initWithNormalImage");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.MenuItemImage:initWithNormalImage");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -63783,8 +63973,8 @@ int lua_cocos2dx_MotionStreak_initWithFade(lua_State* tolua_S)
             ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:initWithFade");
 
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak:initWithFade");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.MotionStreak:initWithFade");
 
             if (!ok) { break; }
             bool ret = cobj->initWithFade(arg0, arg1, arg2, arg3, arg4);
@@ -63958,8 +64148,8 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S)
             cocos2d::Color3B arg3;
             ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.MotionStreak:create");
             if (!ok) { break; }
             cocos2d::MotionStreak* ret = cocos2d::MotionStreak::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::MotionStreak>(tolua_S, "cc.MotionStreak",(cocos2d::MotionStreak*)ret);
@@ -64676,10 +64866,10 @@ int lua_cocos2dx_ParticleBatchNode_initWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleBatchNode:initWithFile");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:initWithFile");
         if(!ok)
@@ -65018,8 +65208,8 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ParticleBatchNode_create'", nullptr);
@@ -65031,9 +65221,9 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create");
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:create");
         if(!ok)
         {
@@ -68076,8 +68266,8 @@ int lua_cocos2dx_ParticleSystem_getResourceFile(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ParticleSystem_getResourceFile'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getResourceFile();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getResourceFile();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getResourceFile",argc, 0);
@@ -68994,9 +69184,9 @@ int lua_cocos2dx_ParticleSystem_initWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystem:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleSystem:initWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ParticleSystem_initWithFile'", nullptr);
@@ -70198,8 +70388,8 @@ int lua_cocos2dx_ParticleSystem_initWithDictionary(lua_State* tolua_S)
             ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.ParticleSystem:initWithDictionary");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ParticleSystem:initWithDictionary");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.ParticleSystem:initWithDictionary");
 
             if (!ok) { break; }
             bool ret = cobj->initWithDictionary(arg0, arg1);
@@ -70582,8 +70772,8 @@ int lua_cocos2dx_ParticleSystem_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystem:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleSystem:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ParticleSystem_create'", nullptr);
@@ -71008,8 +71198,8 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystemQuad:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ParticleSystemQuad:create");
             if (!ok) { break; }
             cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0);
             object_to_luaval<cocos2d::ParticleSystemQuad>(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret);
@@ -74985,8 +75175,8 @@ int lua_cocos2dx_Sprite_setSpriteFrame(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setSpriteFrame");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:setSpriteFrame");
 
             if (!ok) { break; }
             cobj->setSpriteFrame(arg0);
@@ -75040,8 +75230,8 @@ int lua_cocos2dx_Sprite_setTexture(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setTexture");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:setTexture");
 
             if (!ok) { break; }
             cobj->setTexture(arg0);
@@ -75282,10 +75472,10 @@ int lua_cocos2dx_Sprite_setDisplayFrameWithAnimationName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         unsigned int arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setDisplayFrameWithAnimationName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:setDisplayFrameWithAnimationName");
 
         ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Sprite:setDisplayFrameWithAnimationName");
         if(!ok)
@@ -75576,8 +75766,8 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S)
             ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Sprite:setTextureRect");
 
             if (!ok) { break; }
-            cocos2d::Size arg2;
-            ok &= luaval_to_size(tolua_S, 4, &arg2, "cc.Sprite:setTextureRect");
+            cocos2d::Vec2 arg2;
+            ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Sprite:setTextureRect");
 
             if (!ok) { break; }
             cobj->setTextureRect(arg0, arg1, arg2);
@@ -75636,9 +75826,9 @@ int lua_cocos2dx_Sprite_initWithSpriteFrameName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:initWithSpriteFrameName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:initWithSpriteFrameName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite_initWithSpriteFrameName'", nullptr);
@@ -76179,8 +76369,8 @@ int lua_cocos2dx_Sprite_getResourceName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite_getResourceName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getResourceName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getResourceName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getResourceName",argc, 0);
@@ -76583,8 +76773,8 @@ int lua_cocos2dx_Sprite_initWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:initWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:initWithFile");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -76599,8 +76789,8 @@ int lua_cocos2dx_Sprite_initWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:initWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:initWithFile");
 
             if (!ok) { break; }
             bool ret = cobj->initWithFile(arg0);
@@ -76997,8 +77187,8 @@ int lua_cocos2dx_Sprite_createWithSpriteFrameName(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:createWithSpriteFrameName");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Sprite:createWithSpriteFrameName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite_createWithSpriteFrameName'", nullptr);
@@ -77568,8 +77758,8 @@ int lua_cocos2dx_RenderTexture_saveToFileAsNonPMA(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
             cocos2d::Image::Format arg1;
@@ -77580,7 +77770,7 @@ int lua_cocos2dx_RenderTexture_saveToFileAsNonPMA(lua_State* tolua_S)
             ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
-            std::function<void (cocos2d::RenderTexture *, const std::string&)> arg3;
+            std::function<void (cocos2d::RenderTexture *, std::string_view)> arg3;
             do {
 			// Lambda binding for lua is not supported.
 			assert(false);
@@ -77596,8 +77786,8 @@ int lua_cocos2dx_RenderTexture_saveToFileAsNonPMA(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
             bool ret = cobj->saveToFileAsNonPMA(arg0);
@@ -77608,8 +77798,8 @@ int lua_cocos2dx_RenderTexture_saveToFileAsNonPMA(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
             bool arg1;
@@ -77624,15 +77814,15 @@ int lua_cocos2dx_RenderTexture_saveToFileAsNonPMA(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
             bool arg1;
             ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFileAsNonPMA");
 
             if (!ok) { break; }
-            std::function<void (cocos2d::RenderTexture *, const std::string&)> arg2;
+            std::function<void (cocos2d::RenderTexture *, std::string_view)> arg2;
             do {
 			// Lambda binding for lua is not supported.
 			assert(false);
@@ -77826,8 +78016,8 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             cocos2d::Image::Format arg1;
@@ -77842,8 +78032,8 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             cocos2d::Image::Format arg1;
@@ -77862,8 +78052,8 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 4) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             cocos2d::Image::Format arg1;
@@ -77874,7 +78064,7 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
             ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
-            std::function<void (cocos2d::RenderTexture *, const std::string&)> arg3;
+            std::function<void (cocos2d::RenderTexture *, std::string_view)> arg3;
             do {
 			// Lambda binding for lua is not supported.
 			assert(false);
@@ -77890,8 +78080,8 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             bool ret = cobj->saveToFile(arg0);
@@ -77902,8 +78092,8 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             bool arg1;
@@ -77918,15 +78108,15 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
             bool arg1;
             ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile");
 
             if (!ok) { break; }
-            std::function<void (cocos2d::RenderTexture *, const std::string&)> arg2;
+            std::function<void (cocos2d::RenderTexture *, std::string_view)> arg2;
             do {
 			// Lambda binding for lua is not supported.
 			assert(false);
@@ -82057,9 +82247,9 @@ int lua_cocos2dx_TransitionFadeTR_actionWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionFadeTR:actionWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TransitionFadeTR:actionWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TransitionFadeTR_actionWithSize'", nullptr);
@@ -82493,9 +82683,9 @@ int lua_cocos2dx_TransitionPageTurn_actionWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionPageTurn:actionWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TransitionPageTurn:actionWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TransitionPageTurn_actionWithSize'", nullptr);
@@ -85287,18 +85477,18 @@ int lua_cocos2dx_CameraBackgroundBrush_createSkyboxBrush(lua_State* tolua_S)
 
     if (argc == 6)
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
-        std::string arg5;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CameraBackgroundBrush:createSkyboxBrush");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.CameraBackgroundBrush:createSkyboxBrush");
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CameraBackgroundBrush:createSkyboxBrush");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.CameraBackgroundBrush:createSkyboxBrush");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.CameraBackgroundBrush:createSkyboxBrush");
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
+        std::string_view arg5;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.CameraBackgroundBrush:createSkyboxBrush");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.CameraBackgroundBrush:createSkyboxBrush");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_CameraBackgroundBrush_createSkyboxBrush'", nullptr);
@@ -86064,23 +86254,23 @@ int lua_cocos2dx_CameraBackgroundSkyBoxBrush_create(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
-            std::string arg5;
-            ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.CameraBackgroundSkyBoxBrush:create");
+            std::string_view arg5;
+            ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.CameraBackgroundSkyBoxBrush:create");
             if (!ok) { break; }
             cocos2d::CameraBackgroundSkyBoxBrush* ret = cocos2d::CameraBackgroundSkyBoxBrush::create(arg0, arg1, arg2, arg3, arg4, arg5);
             object_to_luaval<cocos2d::CameraBackgroundSkyBoxBrush>(tolua_S, "cc.CameraBackgroundSkyBoxBrush",(cocos2d::CameraBackgroundSkyBoxBrush*)ret);
@@ -86187,9 +86377,9 @@ int lua_cocos2dx_GridBase_setGridSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:setGridSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:setGridSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GridBase_setGridSize'", nullptr);
@@ -86527,8 +86717,8 @@ int lua_cocos2dx_GridBase_getGridSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GridBase_getGridSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getGridSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getGridSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getGridSize",argc, 0);
@@ -86949,8 +87139,8 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -86965,8 +87155,8 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
 
             if (!ok) { break; }
             bool ret = cobj->initWithSize(arg0);
@@ -86977,8 +87167,8 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
 
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
@@ -86997,8 +87187,8 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 4) {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:initWithSize");
 
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
@@ -87378,8 +87568,8 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Grid3D:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Grid3D:create");
@@ -87394,8 +87584,8 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Grid3D:create");
             if (!ok) { break; }
             cocos2d::Grid3D* ret = cocos2d::Grid3D::create(arg0);
             object_to_luaval<cocos2d::Grid3D>(tolua_S, "cc.Grid3D",(cocos2d::Grid3D*)ret);
@@ -87407,8 +87597,8 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Grid3D:create");
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
             ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1, "cc.Grid3D:create");
@@ -87426,8 +87616,8 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Grid3D:create");
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
             ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1, "cc.Grid3D:create");
@@ -87530,8 +87720,8 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.TiledGrid3D:create");
@@ -87546,8 +87736,8 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
             if (!ok) { break; }
             cocos2d::TiledGrid3D* ret = cocos2d::TiledGrid3D::create(arg0);
             object_to_luaval<cocos2d::TiledGrid3D>(tolua_S, "cc.TiledGrid3D",(cocos2d::TiledGrid3D*)ret);
@@ -87559,8 +87749,8 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
             ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1, "cc.TiledGrid3D:create");
@@ -87578,8 +87768,8 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TiledGrid3D:create");
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
             ok &= luaval_to_object<cocos2d::Texture2D>(tolua_S, 3, "cc.Texture2D",&arg1, "cc.TiledGrid3D:create");
@@ -89920,9 +90110,9 @@ int lua_cocos2dx_Material_setName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Material:setName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Material:setName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Material_setName'", nullptr);
@@ -90161,9 +90351,9 @@ int lua_cocos2dx_Material_setTechnique(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Material:setTechnique");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Material:setTechnique");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Material_setTechnique'", nullptr);
@@ -90211,9 +90401,9 @@ int lua_cocos2dx_Material_getTechniqueByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Material:getTechniqueByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Material:getTechniqueByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Material_getTechniqueByName'", nullptr);
@@ -90347,8 +90537,8 @@ int lua_cocos2dx_Material_createWithFilename(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Material:createWithFilename");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Material:createWithFilename");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Material_createWithFilename'", nullptr);
@@ -90867,9 +91057,9 @@ int lua_cocos2dx_Pass_setName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Pass:setName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Pass:setName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Pass_setName'", nullptr);
@@ -90922,8 +91112,8 @@ int lua_cocos2dx_Pass_getName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Pass_getName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Pass:getName",argc, 0);
@@ -93610,11 +93800,11 @@ int lua_cocos2dx_Renderer_checkVisibility(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::Mat4 arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
 
         ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.Renderer:checkVisibility");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Renderer:checkVisibility");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Renderer:checkVisibility");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Renderer_checkVisibility'", nullptr);
@@ -94761,9 +94951,9 @@ int lua_cocos2dx_TextureCache_reloadTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:reloadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:reloadTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_reloadTexture'", nullptr);
@@ -94858,9 +95048,9 @@ int lua_cocos2dx_TextureCache_removeTextureForKey(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:removeTextureForKey");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:removeTextureForKey");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_removeTextureForKey'", nullptr);
@@ -95048,8 +95238,8 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S)
             ok &= luaval_to_object<cocos2d::Image>(tolua_S, 2, "cc.Image",&arg0, "cc.TextureCache:addImage");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TextureCache:addImage");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TextureCache:addImage");
 
             if (!ok) { break; }
             cocos2d::Texture2D* ret = cobj->addImage(arg0, arg1);
@@ -95060,8 +95250,8 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:addImage");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:addImage");
 
             if (!ok) { break; }
             cocos2d::Texture2D* ret = cobj->addImage(arg0);
@@ -95108,9 +95298,9 @@ int lua_cocos2dx_TextureCache_unbindImageAsync(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:unbindImageAsync");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:unbindImageAsync");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_unbindImageAsync'", nullptr);
@@ -95158,9 +95348,9 @@ int lua_cocos2dx_TextureCache_getTextureForKey(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:getTextureForKey");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:getTextureForKey");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_getTextureForKey'", nullptr);
@@ -95258,12 +95448,12 @@ int lua_cocos2dx_TextureCache_renameTextureWithKey(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:renameTextureWithKey");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:renameTextureWithKey");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TextureCache:renameTextureWithKey");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TextureCache:renameTextureWithKey");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_renameTextureWithKey'", nullptr);
@@ -95444,8 +95634,8 @@ int lua_cocos2dx_TextureCache_setETC1AlphaFileSuffix(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:setETC1AlphaFileSuffix");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TextureCache:setETC1AlphaFileSuffix");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_setETC1AlphaFileSuffix'", nullptr);
@@ -95941,9 +96131,9 @@ int lua_cocos2dx_Application_openURL(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Application:openURL");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.Application:openURL");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Application_openURL'", nullptr);
@@ -96137,9 +96327,9 @@ int lua_cocos2dx_GLViewImpl_createWithRect(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::Rect arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect");
         ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect");
         if(!ok)
         {
@@ -96152,10 +96342,10 @@ int lua_cocos2dx_GLViewImpl_createWithRect(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::Rect arg1;
         double arg2;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect");
         ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLViewImpl:createWithRect");
         if(!ok)
@@ -96192,8 +96382,8 @@ int lua_cocos2dx_GLViewImpl_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLViewImpl:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLViewImpl_create'", nullptr);
@@ -96228,8 +96418,8 @@ int lua_cocos2dx_GLViewImpl_createWithFullScreen(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithFullScreen");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithFullScreen");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_GLViewImpl_createWithFullScreen'", nullptr);
@@ -96297,9 +96487,9 @@ int lua_cocos2dx_AnimationCache_getAnimation(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:getAnimation");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AnimationCache:getAnimation");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AnimationCache_getAnimation'", nullptr);
@@ -96348,11 +96538,11 @@ int lua_cocos2dx_AnimationCache_addAnimation(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::Animation* arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_object<cocos2d::Animation>(tolua_S, 2, "cc.Animation",&arg0, "cc.AnimationCache:addAnimation");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimation");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimation");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AnimationCache_addAnimation'", nullptr);
@@ -96448,11 +96638,11 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithDictionary(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::ValueMap arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.AnimationCache:addAnimationsWithDictionary");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimationsWithDictionary");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimationsWithDictionary");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AnimationCache_addAnimationsWithDictionary'", nullptr);
@@ -96500,9 +96690,9 @@ int lua_cocos2dx_AnimationCache_removeAnimation(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:removeAnimation");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AnimationCache:removeAnimation");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AnimationCache_removeAnimation'", nullptr);
@@ -96550,9 +96740,9 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:addAnimationsWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AnimationCache:addAnimationsWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AnimationCache_addAnimationsWithFile'", nullptr);
@@ -97556,9 +97746,9 @@ int lua_cocos2dx_SpriteBatchNode_initWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteBatchNode:initWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteBatchNode_initWithFile'", nullptr);
@@ -97570,10 +97760,10 @@ int lua_cocos2dx_SpriteBatchNode_initWithFile(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         ssize_t arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:initWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteBatchNode:initWithFile");
 
         ok &= luaval_to_ssize_t(tolua_S, 3, &arg1, "cc.SpriteBatchNode:initWithFile");
         if(!ok)
@@ -97812,8 +98002,8 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteBatchNode_create'", nullptr);
@@ -97825,9 +98015,9 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         ssize_t arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create");
         ok &= luaval_to_ssize_t(tolua_S, 3, &arg1, "cc.SpriteBatchNode:create");
         if(!ok)
         {
@@ -98024,9 +98214,9 @@ int lua_cocos2dx_SpriteFrameCache_reloadTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:reloadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:reloadTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_reloadTexture'", nullptr);
@@ -98125,11 +98315,11 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFrame(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::SpriteFrame* arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_object<cocos2d::SpriteFrame>(tolua_S, 2, "cc.SpriteFrame",&arg0, "cc.SpriteFrameCache:addSpriteFrame");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFrame");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFrame");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_addSpriteFrame'", nullptr);
@@ -98177,9 +98367,9 @@ int lua_cocos2dx_SpriteFrameCache_findFrame(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:findFrame");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:findFrame");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_findFrame'", nullptr);
@@ -98222,12 +98412,12 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             cobj->addSpriteFramesWithFile(arg0, arg1);
@@ -98238,12 +98428,12 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             unsigned int arg2;
@@ -98258,8 +98448,8 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             cobj->addSpriteFramesWithFile(arg0);
@@ -98270,8 +98460,8 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             unsigned int arg1;
@@ -98286,8 +98476,8 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
@@ -98302,8 +98492,8 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile");
 
             if (!ok) { break; }
             cocos2d::Texture2D* arg1;
@@ -98358,9 +98548,9 @@ int lua_cocos2dx_SpriteFrameCache_getSpriteFrameByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:getSpriteFrameByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:getSpriteFrameByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_getSpriteFrameByName'", nullptr);
@@ -98464,9 +98654,9 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFile'", nullptr);
@@ -98705,9 +98895,9 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent(lua_State* t
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFileContent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFileContent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent'", nullptr);
@@ -98755,9 +98945,9 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFrameByName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFrameByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName'", nullptr);
@@ -98805,9 +98995,9 @@ int lua_cocos2dx_SpriteFrameCache_eraseFrame(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:eraseFrame");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:eraseFrame");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_eraseFrame'", nullptr);
@@ -98855,9 +99045,9 @@ int lua_cocos2dx_SpriteFrameCache_isSpriteFramesWithFileLoaded(lua_State* tolua_
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:isSpriteFramesWithFileLoaded");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.SpriteFrameCache:isSpriteFramesWithFileLoaded");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_SpriteFrameCache_isSpriteFramesWithFileLoaded'", nullptr);
@@ -99314,9 +99504,9 @@ int lua_cocos2dx_TMXObjectGroup_getProperty(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getProperty");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXObjectGroup_getProperty'", nullptr);
@@ -99411,9 +99601,9 @@ int lua_cocos2dx_TMXObjectGroup_getObject(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getObject");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getObject");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXObjectGroup_getObject'", nullptr);
@@ -99508,9 +99698,9 @@ int lua_cocos2dx_TMXObjectGroup_setGroupName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:setGroupName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXObjectGroup:setGroupName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXObjectGroup_setGroupName'", nullptr);
@@ -99610,8 +99800,8 @@ int lua_cocos2dx_TMXObjectGroup_getGroupName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXObjectGroup_getGroupName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getGroupName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getGroupName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getGroupName",argc, 0);
@@ -100083,9 +100273,9 @@ int lua_cocos2dx_TMXMapInfo_setCurrentString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setCurrentString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:setCurrentString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_setCurrentString'", nullptr);
@@ -100180,9 +100370,9 @@ int lua_cocos2dx_TMXMapInfo_setTileSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_setTileSize'", nullptr);
@@ -100377,9 +100567,9 @@ int lua_cocos2dx_TMXMapInfo_parseXMLFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_parseXMLFile'", nullptr);
@@ -100474,9 +100664,9 @@ int lua_cocos2dx_TMXMapInfo_setTMXFileName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setTMXFileName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:setTMXFileName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_setTMXFileName'", nullptr);
@@ -100524,9 +100714,9 @@ int lua_cocos2dx_TMXMapInfo_parseXMLString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_parseXMLString'", nullptr);
@@ -100718,9 +100908,9 @@ int lua_cocos2dx_TMXMapInfo_initWithTMXFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithTMXFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithTMXFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_initWithTMXFile'", nullptr);
@@ -100912,12 +101102,12 @@ int lua_cocos2dx_TMXMapInfo_initWithXML(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithXML");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TMXMapInfo:initWithXML");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_initWithXML'", nullptr);
@@ -101067,8 +101257,8 @@ int lua_cocos2dx_TMXMapInfo_getTileSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_getTileSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getTileSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getTileSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTileSize",argc, 0);
@@ -101208,8 +101398,8 @@ int lua_cocos2dx_TMXMapInfo_getExternalTilesetFileName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_getExternalTilesetFileName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getExternalTilesetFileName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getExternalTilesetFileName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getExternalTilesetFileName",argc, 0);
@@ -101302,8 +101492,8 @@ int lua_cocos2dx_TMXMapInfo_getTMXFileName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_getTMXFileName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getTMXFileName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTMXFileName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTMXFileName",argc, 0);
@@ -101544,9 +101734,9 @@ int lua_cocos2dx_TMXMapInfo_setMapSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setMapSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXMapInfo:setMapSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_setMapSize'", nullptr);
@@ -101599,8 +101789,8 @@ int lua_cocos2dx_TMXMapInfo_getCurrentString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_getCurrentString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getCurrentString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getCurrentString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getCurrentString",argc, 0);
@@ -101746,8 +101936,8 @@ int lua_cocos2dx_TMXMapInfo_getMapSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_getMapSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getMapSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getMapSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getMapSize",argc, 0);
@@ -101971,8 +102161,8 @@ int lua_cocos2dx_TMXMapInfo_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_create'", nullptr);
@@ -102007,10 +102197,10 @@ int lua_cocos2dx_TMXMapInfo_createWithXML(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
-        std::string arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:createWithXML");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:createWithXML");
+        std::string_view arg0;
+        std::string_view arg1;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TMXMapInfo:createWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TMXMapInfo:createWithXML");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TMXMapInfo_createWithXML'", nullptr);
@@ -102154,14 +102344,14 @@ int lua_cocos2dx_TileMapAtlas_initWithTileFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         int arg2;
         int arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:initWithTileFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TileMapAtlas:initWithTileFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:initWithTileFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TileMapAtlas:initWithTileFile");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:initWithTileFile");
 
@@ -102352,12 +102542,12 @@ int lua_cocos2dx_TileMapAtlas_create(lua_State* tolua_S)
 
     if (argc == 4)
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         int arg2;
         int arg3;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:create");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.TileMapAtlas:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.TileMapAtlas:create");
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:create");
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.TileMapAtlas:create");
         if(!ok)
@@ -102722,8 +102912,8 @@ int lua_cocos2dx_FastTMXLayer_getLayerSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_getLayerSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getLayerSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getLayerSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXLayer:getLayerSize",argc, 0);
@@ -102764,9 +102954,9 @@ int lua_cocos2dx_FastTMXLayer_setMapTileSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FastTMXLayer:setMapTileSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FastTMXLayer:setMapTileSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_setMapTileSize'", nullptr);
@@ -102911,9 +103101,9 @@ int lua_cocos2dx_FastTMXLayer_setLayerName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXLayer:setLayerName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXLayer:setLayerName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_setLayerName'", nullptr);
@@ -103233,8 +103423,8 @@ int lua_cocos2dx_FastTMXLayer_getMapTileSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_getMapTileSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getMapTileSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getMapTileSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXLayer:getMapTileSize",argc, 0);
@@ -103275,9 +103465,9 @@ int lua_cocos2dx_FastTMXLayer_getProperty(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXLayer:getProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXLayer:getProperty");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_getProperty'", nullptr);
@@ -103325,9 +103515,9 @@ int lua_cocos2dx_FastTMXLayer_setLayerSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FastTMXLayer:setLayerSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FastTMXLayer:setLayerSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_setLayerSize'", nullptr);
@@ -103380,8 +103570,8 @@ int lua_cocos2dx_FastTMXLayer_getLayerName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXLayer_getLayerName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getLayerName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getLayerName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXLayer:getLayerName",argc, 0);
@@ -104281,9 +104471,9 @@ int lua_cocos2dx_FastTMXTiledMap_getProperty(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getProperty");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getProperty'", nullptr);
@@ -104331,9 +104521,9 @@ int lua_cocos2dx_FastTMXTiledMap_setMapSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FastTMXTiledMap:setMapSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FastTMXTiledMap:setMapSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_setMapSize'", nullptr);
@@ -104381,9 +104571,9 @@ int lua_cocos2dx_FastTMXTiledMap_getObjectGroup(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getObjectGroup");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getObjectGroup");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getObjectGroup'", nullptr);
@@ -104436,8 +104626,8 @@ int lua_cocos2dx_FastTMXTiledMap_getResourceFile(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getResourceFile'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getResourceFile();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getResourceFile();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXTiledMap:getResourceFile",argc, 0);
@@ -104572,9 +104762,9 @@ int lua_cocos2dx_FastTMXTiledMap_initWithTMXFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:initWithTMXFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:initWithTMXFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_initWithTMXFile'", nullptr);
@@ -104627,8 +104817,8 @@ int lua_cocos2dx_FastTMXTiledMap_getTileSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getTileSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getTileSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getTileSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXTiledMap:getTileSize",argc, 0);
@@ -104674,8 +104864,8 @@ int lua_cocos2dx_FastTMXTiledMap_getMapSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getMapSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getMapSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getMapSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.FastTMXTiledMap:getMapSize",argc, 0);
@@ -104766,12 +104956,12 @@ int lua_cocos2dx_FastTMXTiledMap_initWithXML(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:initWithXML");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FastTMXTiledMap:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FastTMXTiledMap:initWithXML");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_initWithXML'", nullptr);
@@ -104916,9 +105106,9 @@ int lua_cocos2dx_FastTMXTiledMap_setTileSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FastTMXTiledMap:setTileSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FastTMXTiledMap:setTileSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_setTileSize'", nullptr);
@@ -105016,9 +105206,9 @@ int lua_cocos2dx_FastTMXTiledMap_getLayer(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getLayer");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:getLayer");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_getLayer'", nullptr);
@@ -105152,8 +105342,8 @@ int lua_cocos2dx_FastTMXTiledMap_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_create'", nullptr);
@@ -105188,10 +105378,10 @@ int lua_cocos2dx_FastTMXTiledMap_createWithXML(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
-        std::string arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:createWithXML");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FastTMXTiledMap:createWithXML");
+        std::string_view arg0;
+        std::string_view arg1;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.FastTMXTiledMap:createWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.FastTMXTiledMap:createWithXML");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_FastTMXTiledMap_createWithXML'", nullptr);
@@ -105836,8 +106026,8 @@ int lua_cocos2dx_MotionStreak3D_initWithFade(lua_State* tolua_S)
             ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak3D:initWithFade");
 
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak3D:initWithFade");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.MotionStreak3D:initWithFade");
 
             if (!ok) { break; }
             bool ret = cobj->initWithFade(arg0, arg1, arg2, arg3, arg4);
@@ -106011,8 +106201,8 @@ int lua_cocos2dx_MotionStreak3D_create(lua_State* tolua_S)
             cocos2d::Color3B arg3;
             ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak3D:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak3D:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "cc.MotionStreak3D:create");
             if (!ok) { break; }
             cocos2d::MotionStreak3D* ret = cocos2d::MotionStreak3D::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::MotionStreak3D>(tolua_S, "cc.MotionStreak3D",(cocos2d::MotionStreak3D*)ret);
@@ -106213,8 +106403,8 @@ int lua_cocos2dx_ComponentLua_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ComponentLua:create");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ComponentLua:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ComponentLua_create'", nullptr);
@@ -106247,9 +106437,9 @@ int lua_cocos2dx_ComponentLua_constructor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ComponentLua:ComponentLua");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.ComponentLua:ComponentLua");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ComponentLua_constructor'", nullptr);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
index 3e1cc6c6fe41..d7b8e611d950 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
@@ -2328,6 +2328,10 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
+
+
 
 
 
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.cpp
index 57a704777bc8..2523bad8605c 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.cpp
@@ -572,8 +572,8 @@ int lua_cocos2dx_backend_Program_getFragmentShader(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_backend_Program_getFragmentShader'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFragmentShader();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFragmentShader();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccb.Program:getFragmentShader",argc, 0);
@@ -671,8 +671,8 @@ int lua_cocos2dx_backend_Program_getUniformLocation(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.Program:getUniformLocation");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.Program:getUniformLocation");
 
             if (!ok) { break; }
             cocos2d::backend::UniformLocation ret = cobj->getUniformLocation(arg0);
@@ -771,7 +771,7 @@ int lua_cocos2dx_backend_Program_getActiveAttributes(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_backend_Program_getActiveAttributes'", nullptr);
             return 0;
         }
-        std::unordered_map<std::string, cocos2d::backend::AttributeBindInfo> ret = cobj->getActiveAttributes();
+        tsl::robin_map<std::string, cocos2d::backend::AttributeBindInfo, hlookup::string_hash, hlookup::equal_to> ret = cobj->getActiveAttributes();
         program_activeattrs_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -820,8 +820,8 @@ int lua_cocos2dx_backend_Program_getAttributeLocation(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.Program:getAttributeLocation");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.Program:getAttributeLocation");
 
             if (!ok) { break; }
             int ret = cobj->getAttributeLocation(arg0);
@@ -873,8 +873,8 @@ int lua_cocos2dx_backend_Program_getVertexShader(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_backend_Program_getVertexShader'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getVertexShader();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getVertexShader();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccb.Program:getVertexShader",argc, 0);
@@ -1125,13 +1125,13 @@ int lua_cocos2dx_backend_VertexLayout_setAttribute(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 5) 
     {
-        std::string arg0;
+        std::string_view arg0;
         unsigned int arg1;
         cocos2d::backend::VertexFormat arg2;
         unsigned int arg3;
         bool arg4;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.VertexLayout:setAttribute");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.VertexLayout:setAttribute");
 
         ok &= luaval_to_uint32(tolua_S, 3,&arg1, "ccb.VertexLayout:setAttribute");
 
@@ -1293,8 +1293,8 @@ int lua_cocos2dx_backend_ProgramState_setTexture(lua_State* tolua_S)
             ok &= luaval_to_uniformLocation(tolua_S, 2, arg0, "ccb.ProgramState:setTexture");
 
             if (!ok) { break; }
-            unsigned short arg1;
-            ok &= luaval_to_ushort(tolua_S, 3, &arg1, "ccb.ProgramState:setTexture");
+            int arg1;
+            ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccb.ProgramState:setTexture");
 
             if (!ok) { break; }
             cocos2d::backend::TextureBackend* arg2;
@@ -1325,12 +1325,12 @@ int lua_cocos2dx_backend_ProgramState_setTexture(lua_State* tolua_S)
             ok &= luaval_to_uniformLocation(tolua_S, 2, arg0, "ccb.ProgramState:setTexture");
 
             if (!ok) { break; }
-            unsigned short arg1;
-            ok &= luaval_to_ushort(tolua_S, 3, &arg1, "ccb.ProgramState:setTexture");
+            int arg1;
+            ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccb.ProgramState:setTexture");
 
             if (!ok) { break; }
-            unsigned short arg2;
-            ok &= luaval_to_ushort(tolua_S, 4, &arg2, "ccb.ProgramState:setTexture");
+            int arg2;
+            ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccb.ProgramState:setTexture");
 
             if (!ok) { break; }
             cocos2d::backend::TextureBackend* arg3;
@@ -1489,12 +1489,12 @@ int lua_cocos2dx_backend_ProgramState_setParameterAutoBinding(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.ProgramState:setParameterAutoBinding");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.ProgramState:setParameterAutoBinding");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccb.ProgramState:setParameterAutoBinding");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccb.ProgramState:setParameterAutoBinding");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_backend_ProgramState_setParameterAutoBinding'", nullptr);
@@ -1643,8 +1643,8 @@ int lua_cocos2dx_backend_ProgramState_getAttributeLocation(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.ProgramState:getAttributeLocation");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.ProgramState:getAttributeLocation");
 
             if (!ok) { break; }
             int ret = cobj->getAttributeLocation(arg0);
@@ -2992,12 +2992,12 @@ int lua_cocos2dx_backend_Device_newProgram(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccb.Device:newProgram");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccb.Device:newProgram");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccb.Device:newProgram");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccb.Device:newProgram");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_backend_Device_newProgram'", nullptr);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp
index de4305f33eae..589c61ad7f61 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp
@@ -90,8 +90,8 @@ int lua_cocos2dx_controller_Controller_getDeviceName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_controller_Controller_getDeviceName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getDeviceName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getDeviceName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getDeviceName",argc, 0);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp
index fd903bb40492..30343b1ce5bf 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp
@@ -31,9 +31,9 @@ int lua_cocos2dx_csloader_CSLoader_createNodeFromJson(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeFromJson");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:createNodeFromJson");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_createNodeFromJson'", nullptr);
@@ -81,9 +81,9 @@ int lua_cocos2dx_csloader_CSLoader_createNodeWithFlatBuffersFile(lua_State* tolu
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithFlatBuffersFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithFlatBuffersFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_createNodeWithFlatBuffersFile'", nullptr);
@@ -131,9 +131,9 @@ int lua_cocos2dx_csloader_CSLoader_loadNodeWithFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_loadNodeWithFile'", nullptr);
@@ -181,14 +181,14 @@ int lua_cocos2dx_csloader_CSLoader_bindCallback(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         cocos2d::ui::Widget* arg2;
         cocos2d::Node* arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:bindCallback");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:bindCallback");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.CSLoader:bindCallback");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.CSLoader:bindCallback");
 
         ok &= luaval_to_object<cocos2d::ui::Widget>(tolua_S, 4, "ccui.Widget",&arg2, "cc.CSLoader:bindCallback");
 
@@ -337,9 +337,9 @@ int lua_cocos2dx_csloader_CSLoader_loadNodeWithContent(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithContent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithContent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_loadNodeWithContent'", nullptr);
@@ -531,9 +531,9 @@ int lua_cocos2dx_csloader_CSLoader_createNodeWithFlatBuffersForSimulator(lua_Sta
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithFlatBuffersForSimulator");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithFlatBuffersForSimulator");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_csloader_CSLoader_createNodeWithFlatBuffersForSimulator'", nullptr);
@@ -605,8 +605,8 @@ int lua_cocos2dx_csloader_CSLoader_createNodeWithVisibleSize(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithVisibleSize");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithVisibleSize");
             if (!ok) { break; }
             std::function<void (cocos2d::Ref *)> arg1;
             do {
@@ -625,8 +625,8 @@ int lua_cocos2dx_csloader_CSLoader_createNodeWithVisibleSize(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithVisibleSize");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.CSLoader:createNodeWithVisibleSize");
             if (!ok) { break; }
             cocos2d::Node* ret = cocos2d::CSLoader::createNodeWithVisibleSize(arg0);
             object_to_luaval<cocos2d::Node>(tolua_S, "cc.Node",(cocos2d::Node*)ret);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp
index bd142213112e..0daaca8566d9 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp
@@ -471,8 +471,8 @@ int lua_cocos2dx_extension_AssetsManager_getVersion(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_AssetsManager_getVersion'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getVersion();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getVersion();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getVersion",argc, 0);
@@ -1158,11 +1158,11 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1181,12 +1181,12 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 4) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1207,13 +1207,13 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 5) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
         double arg4;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1236,14 +1236,14 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 6) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
         double arg4;
-        std::string arg5;
+        std::string_view arg5;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1253,7 +1253,7 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_EventAssetsManagerEx_constructor'", nullptr);
@@ -1268,15 +1268,15 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 7) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
         double arg4;
-        std::string arg5;
-        std::string arg6;
+        std::string_view arg5;
+        std::string_view arg6;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1286,9 +1286,9 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_EventAssetsManagerEx_constructor'", nullptr);
@@ -1303,16 +1303,16 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 8) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
         double arg4;
-        std::string arg5;
-        std::string arg6;
+        std::string_view arg5;
+        std::string_view arg6;
         int arg7;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1322,9 +1322,9 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_int32(tolua_S, 9,(int *)&arg7, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
         if(!ok)
@@ -1341,17 +1341,17 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
     }
     if (argc == 9) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::extension::AssetsManagerEx* arg1;
         cocos2d::extension::EventAssetsManagerEx::EventCode arg2;
         double arg3;
         double arg4;
-        std::string arg5;
-        std::string arg6;
+        std::string_view arg5;
+        std::string_view arg6;
         int arg7;
         int arg8;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_object<cocos2d::extension::AssetsManagerEx>(tolua_S, 3, "cc.AssetsManagerEx",&arg1, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1361,9 +1361,9 @@ int lua_cocos2dx_extension_EventAssetsManagerEx_constructor(lua_State* tolua_S)
 
         ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 8,&arg6, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
         ok &= luaval_to_int32(tolua_S, 9,(int *)&arg7, "cc.EventAssetsManagerEx:EventAssetsManagerEx");
 
@@ -1451,8 +1451,8 @@ int lua_cocos2dx_extension_Manifest_getManifestFileUrl(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_Manifest_getManifestFileUrl'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getManifestFileUrl();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getManifestFileUrl();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Manifest:getManifestFileUrl",argc, 0);
@@ -1592,8 +1592,8 @@ int lua_cocos2dx_extension_Manifest_getPackageUrl(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_Manifest_getPackageUrl'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getPackageUrl();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getPackageUrl();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Manifest:getPackageUrl",argc, 0);
@@ -1639,8 +1639,8 @@ int lua_cocos2dx_extension_Manifest_getVersion(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_Manifest_getVersion'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getVersion();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getVersion();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Manifest:getVersion",argc, 0);
@@ -1686,8 +1686,8 @@ int lua_cocos2dx_extension_Manifest_getVersionFileUrl(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_Manifest_getVersionFileUrl'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getVersionFileUrl();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getVersionFileUrl();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Manifest:getVersionFileUrl",argc, 0);
@@ -1942,7 +1942,7 @@ int lua_cocos2dx_extension_AssetsManagerEx_setVerifyCallback(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::function<bool (const std::string&, cocos2d::extension::ManifestAsset)> arg0;
+        std::function<bool (std::string_view, cocos2d::extension::ManifestAsset)> arg0;
 
         do {
 			// Lambda binding for lua is not supported.
@@ -2001,8 +2001,8 @@ int lua_cocos2dx_extension_AssetsManagerEx_getStoragePath(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_AssetsManagerEx_getStoragePath'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getStoragePath();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getStoragePath();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManagerEx:getStoragePath",argc, 0);
@@ -2090,7 +2090,7 @@ int lua_cocos2dx_extension_AssetsManagerEx_setVersionCompareHandle(lua_State* to
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::function<int (const std::string&, const std::string&)> arg0;
+        std::function<int (std::string_view, std::string_view)> arg0;
 
         do {
 			// Lambda binding for lua is not supported.
@@ -2324,10 +2324,10 @@ int lua_cocos2dx_extension_AssetsManagerEx_create(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
-        std::string arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AssetsManagerEx:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AssetsManagerEx:create");
+        std::string_view arg0;
+        std::string_view arg1;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AssetsManagerEx:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.AssetsManagerEx:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_AssetsManagerEx_create'", nullptr);
@@ -2360,12 +2360,12 @@ int lua_cocos2dx_extension_AssetsManagerEx_constructor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AssetsManagerEx:AssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.AssetsManagerEx:AssetsManagerEx");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AssetsManagerEx:AssetsManagerEx");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.AssetsManagerEx:AssetsManagerEx");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_AssetsManagerEx_constructor'", nullptr);
@@ -3604,9 +3604,9 @@ int lua_cocos2dx_extension_PUParticleSystem3D_initWithFilePath(lua_State* tolua_
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initWithFilePath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initWithFilePath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_PUParticleSystem3D_initWithFilePath'", nullptr);
@@ -3845,12 +3845,12 @@ int lua_cocos2dx_extension_PUParticleSystem3D_initWithFilePathAndMaterialPath(lu
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initWithFilePathAndMaterialPath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initWithFilePathAndMaterialPath");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.PUParticleSystem3D:initWithFilePathAndMaterialPath");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.PUParticleSystem3D:initWithFilePathAndMaterialPath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_PUParticleSystem3D_initWithFilePathAndMaterialPath'", nullptr);
@@ -3950,8 +3950,8 @@ int lua_cocos2dx_extension_PUParticleSystem3D_getMaterialName(lua_State* tolua_S
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_PUParticleSystem3D_getMaterialName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getMaterialName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getMaterialName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PUParticleSystem3D:getMaterialName",argc, 0);
@@ -4821,9 +4821,9 @@ int lua_cocos2dx_extension_PUParticleSystem3D_setMaterialName(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:setMaterialName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:setMaterialName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_PUParticleSystem3D_setMaterialName'", nullptr);
@@ -5403,9 +5403,9 @@ int lua_cocos2dx_extension_PUParticleSystem3D_initSystem(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initSystem");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:initSystem");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_extension_PUParticleSystem3D_initSystem'", nullptr);
@@ -5641,8 +5641,8 @@ int lua_cocos2dx_extension_PUParticleSystem3D_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:create");
             if (!ok) { break; }
             cocos2d::PUParticleSystem3D* ret = cocos2d::PUParticleSystem3D::create(arg0);
             object_to_luaval<cocos2d::PUParticleSystem3D>(tolua_S, "cc.PUParticleSystem3D",(cocos2d::PUParticleSystem3D*)ret);
@@ -5664,11 +5664,11 @@ int lua_cocos2dx_extension_PUParticleSystem3D_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.PUParticleSystem3D:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.PUParticleSystem3D:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.PUParticleSystem3D:create");
             if (!ok) { break; }
             cocos2d::PUParticleSystem3D* ret = cocos2d::PUParticleSystem3D::create(arg0, arg1);
             object_to_luaval<cocos2d::PUParticleSystem3D>(tolua_S, "cc.PUParticleSystem3D",(cocos2d::PUParticleSystem3D*)ret);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp
index 61117700c3dd..abb3bf630ad4 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_navmesh_auto.cpp
@@ -1424,8 +1424,8 @@ int lua_cocos2dx_navmesh_NavMeshAgent_getNavMeshAgentComponentName(lua_State* to
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_navmesh_NavMeshAgent_getNavMeshAgentComponentName'", nullptr);
             return 0;
         }
-        const std::string& ret = cocos2d::NavMeshAgent::getNavMeshAgentComponentName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cocos2d::NavMeshAgent::getNavMeshAgentComponentName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.NavMeshAgent:getNavMeshAgentComponentName",argc, 0);
@@ -1958,8 +1958,8 @@ int lua_cocos2dx_navmesh_NavMeshObstacle_getNavMeshObstacleComponentName(lua_Sta
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_navmesh_NavMeshObstacle_getNavMeshObstacleComponentName'", nullptr);
             return 0;
         }
-        const std::string& ret = cocos2d::NavMeshObstacle::getNavMeshObstacleComponentName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cocos2d::NavMeshObstacle::getNavMeshObstacleComponentName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.NavMeshObstacle:getNavMeshObstacleComponentName",argc, 0);
@@ -2450,10 +2450,10 @@ int lua_cocos2dx_navmesh_NavMesh_create(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
-        std::string arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.NavMesh:create");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.NavMesh:create");
+        std::string_view arg0;
+        std::string_view arg1;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "cc.NavMesh:create");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "cc.NavMesh:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_navmesh_NavMesh_create'", nullptr);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp
index 5d72cd0e8e0f..79c3f641c716 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp
@@ -1930,8 +1930,8 @@ int lua_cocos2dx_physics_PhysicsShapeBox_getSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsShapeBox_getSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeBox:getSize",argc, 0);
@@ -1961,8 +1961,8 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        cocos2d::Size arg0;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
+        cocos2d::Vec2 arg0;
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsShapeBox_create'", nullptr);
@@ -1974,9 +1974,9 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create");
         if(!ok)
         {
@@ -1989,10 +1989,10 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         cocos2d::Vec2 arg2;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeBox:create");
         if(!ok)
@@ -2006,11 +2006,11 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
     }
     if (argc == 4)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         cocos2d::Vec2 arg2;
         double arg3;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeBox:create");
         ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsShapeBox:create");
@@ -2326,8 +2326,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        cocos2d::Size arg0;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
+        cocos2d::Vec2 arg0;
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsShapeEdgeBox_create'", nullptr);
@@ -2339,9 +2339,9 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create");
         if(!ok)
         {
@@ -2354,10 +2354,10 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         double arg2;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create");
         if(!ok)
@@ -2371,11 +2371,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S)
     }
     if (argc == 4)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         double arg2;
         cocos2d::Vec2 arg3;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create");
         ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsShapeEdgeBox:create");
@@ -5515,8 +5515,8 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        cocos2d::Size arg0;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
+        cocos2d::Vec2 arg0;
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsBody_createBox'", nullptr);
@@ -5528,9 +5528,9 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox");
         if(!ok)
         {
@@ -5543,10 +5543,10 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         cocos2d::Vec2 arg2;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox");
         ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsBody:createBox");
         if(!ok)
@@ -5718,8 +5718,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        cocos2d::Size arg0;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
+        cocos2d::Vec2 arg0;
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsBody_createEdgeBox'", nullptr);
@@ -5731,9 +5731,9 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S)
     }
     if (argc == 2)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox");
         if(!ok)
         {
@@ -5746,10 +5746,10 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         double arg2;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox");
         if(!ok)
@@ -5763,11 +5763,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S)
     }
     if (argc == 4)
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
         cocos2d::PhysicsMaterial arg1;
         double arg2;
         cocos2d::Vec2 arg3;
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox");
         ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsBody:createEdgeBox");
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
index 35b2be46df6e..1887d9bfb8c1 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
@@ -3232,8 +3232,8 @@ int lua_cocos2dx_studio_DisplayData_changeDisplayToTexture(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayData:changeDisplayToTexture");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.DisplayData:changeDisplayToTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_DisplayData_changeDisplayToTexture'", nullptr);
@@ -4039,9 +4039,9 @@ int lua_cocos2dx_studio_ArmatureData_getBoneData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureData:getBoneData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureData:getBoneData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureData_getBoneData'", nullptr);
@@ -4569,9 +4569,9 @@ int lua_cocos2dx_studio_MovementData_getMovementBoneData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.MovementData:getMovementBoneData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.MovementData:getMovementBoneData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_MovementData_getMovementBoneData'", nullptr);
@@ -4763,9 +4763,9 @@ int lua_cocos2dx_studio_AnimationData_getMovement(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.AnimationData:getMovement");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.AnimationData:getMovement");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_AnimationData_getMovement'", nullptr);
@@ -6407,10 +6407,10 @@ int lua_cocos2dx_studio_DisplayManager_changeDisplayWithName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayManager:changeDisplayWithName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.DisplayManager:changeDisplayWithName");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.DisplayManager:changeDisplayWithName");
         if(!ok)
@@ -7577,9 +7577,9 @@ int lua_cocos2dx_studio_Bone_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Bone:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Bone_init'", nullptr);
@@ -8031,10 +8031,10 @@ int lua_cocos2dx_studio_Bone_changeDisplayWithName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:changeDisplayWithName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Bone:changeDisplayWithName");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:changeDisplayWithName");
         if(!ok)
@@ -8465,8 +8465,8 @@ int lua_cocos2dx_studio_Bone_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Bone:create");
             if (!ok) { break; }
             cocostudio::Bone* ret = cocostudio::Bone::create(arg0);
             object_to_luaval<cocostudio::Bone>(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret);
@@ -8712,9 +8712,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureAnimation_play'", nullptr);
@@ -8726,10 +8726,10 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play");
         if(!ok)
@@ -8743,11 +8743,11 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
         int arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play");
 
@@ -9558,9 +9558,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData(lua_State* tolua
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeAnimationData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData'", nullptr);
@@ -9608,10 +9608,10 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::ArmatureData* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData");
 
         ok &= luaval_to_object<cocostudio::ArmatureData>(tolua_S, 3, "ccs.ArmatureData",&arg1, "ccs.ArmatureDataManager:addArmatureData");
         if(!ok)
@@ -9625,15 +9625,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::ArmatureData* arg1;
-        std::string arg2;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData");
 
         ok &= luaval_to_object<cocostudio::ArmatureData>(tolua_S, 3, "ccs.ArmatureData",&arg1, "ccs.ArmatureDataManager:addArmatureData");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureData");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addArmatureData'", nullptr);
@@ -9676,16 +9676,16 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addArmatureFileInfo");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addArmatureFileInfo");
 
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureFileInfo");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureFileInfo");
 
             if (!ok) { break; }
             cobj->addArmatureFileInfo(arg0, arg1, arg2);
@@ -9696,8 +9696,8 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo");
 
             if (!ok) { break; }
             cobj->addArmatureFileInfo(arg0);
@@ -9744,9 +9744,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureFileInfo(lua_State* to
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureFileInfo");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureFileInfo");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_removeArmatureFileInfo'", nullptr);
@@ -9799,7 +9799,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureDatas(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getTextureDatas'", nullptr);
             return 0;
         }
-        const cocos2d::Map<std::string, cocostudio::TextureData *>& ret = cobj->getTextureDatas();
+        const cocos2d::Map<std::string, cocostudio::TextureData *, hlookup::string_hash, hlookup::equal_to>& ret = cobj->getTextureDatas();
         ccmap_string_key_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -9841,9 +9841,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getTextureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getTextureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getTextureData'", nullptr);
@@ -9891,9 +9891,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getArmatureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getArmatureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getArmatureData'", nullptr);
@@ -9941,9 +9941,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getAnimationData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationData'", nullptr);
@@ -9991,10 +9991,10 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::AnimationData* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData");
 
         ok &= luaval_to_object<cocostudio::AnimationData>(tolua_S, 3, "ccs.AnimationData",&arg1, "ccs.ArmatureDataManager:addAnimationData");
         if(!ok)
@@ -10008,15 +10008,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::AnimationData* arg1;
-        std::string arg2;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData");
 
         ok &= luaval_to_object<cocostudio::AnimationData>(tolua_S, 3, "ccs.AnimationData",&arg1, "ccs.ArmatureDataManager:addAnimationData");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addAnimationData");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addAnimationData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addAnimationData'", nullptr);
@@ -10111,9 +10111,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureData(lua_State* tolua_
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_removeArmatureData'", nullptr);
@@ -10166,7 +10166,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureDatas(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getArmatureDatas'", nullptr);
             return 0;
         }
-        const cocos2d::Map<std::string, cocostudio::ArmatureData *>& ret = cobj->getArmatureDatas();
+        const cocos2d::Map<std::string, cocostudio::ArmatureData *, hlookup::string_hash, hlookup::equal_to>& ret = cobj->getArmatureDatas();
         ccmap_string_key_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -10208,9 +10208,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_addRelativeData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addRelativeData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addRelativeData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addRelativeData'", nullptr);
@@ -10258,9 +10258,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeTextureData(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeTextureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeTextureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_removeTextureData'", nullptr);
@@ -10308,9 +10308,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_getRelativeData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getRelativeData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getRelativeData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getRelativeData'", nullptr);
@@ -10358,10 +10358,10 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::TextureData* arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData");
 
         ok &= luaval_to_object<cocostudio::TextureData>(tolua_S, 3, "ccs.TextureData",&arg1, "ccs.ArmatureDataManager:addTextureData");
         if(!ok)
@@ -10375,15 +10375,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::TextureData* arg1;
-        std::string arg2;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData");
 
         ok &= luaval_to_object<cocostudio::TextureData>(tolua_S, 3, "ccs.TextureData",&arg1, "ccs.ArmatureDataManager:addTextureData");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addTextureData");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addTextureData");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addTextureData'", nullptr);
@@ -10436,7 +10436,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas(lua_State* tolua_S
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas'", nullptr);
             return 0;
         }
-        const cocos2d::Map<std::string, cocostudio::AnimationData *>& ret = cobj->getAnimationDatas();
+        const cocos2d::Map<std::string, cocostudio::AnimationData *, hlookup::string_hash, hlookup::equal_to>& ret = cobj->getAnimationDatas();
         ccmap_string_key_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -10525,12 +10525,12 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile'", nullptr);
@@ -10542,15 +10542,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to
     }
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addSpriteFrameFromFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile'", nullptr);
@@ -10706,9 +10706,9 @@ int lua_cocos2dx_studio_Armature_getBone(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:getBone");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Armature:getBone");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Armature_getBone'", nullptr);
@@ -10757,11 +10757,11 @@ int lua_cocos2dx_studio_Armature_changeBoneParent(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocostudio::Bone* arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_object<cocostudio::Bone>(tolua_S, 2, "ccs.Bone",&arg0, "ccs.Armature:changeBoneParent");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:changeBoneParent");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.Armature:changeBoneParent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Armature_changeBoneParent'", nullptr);
@@ -11198,8 +11198,8 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Armature:init");
 
             if (!ok) { break; }
             cocostudio::Bone* arg1;
@@ -11214,8 +11214,8 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Armature:init");
 
             if (!ok) { break; }
             bool ret = cobj->init(arg0);
@@ -11460,11 +11460,11 @@ int lua_cocos2dx_studio_Armature_addBone(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocostudio::Bone* arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_object<cocostudio::Bone>(tolua_S, 2, "ccs.Bone",&arg0, "ccs.Armature:addBone");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:addBone");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.Armature:addBone");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Armature_addBone'", nullptr);
@@ -11755,7 +11755,7 @@ int lua_cocos2dx_studio_Armature_getBoneDic(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Armature_getBoneDic'", nullptr);
             return 0;
         }
-        const cocos2d::Map<std::string, cocostudio::Bone *>& ret = cobj->getBoneDic();
+        const cocos2d::Map<std::string, cocostudio::Bone *, hlookup::string_hash, hlookup::equal_to>& ret = cobj->getBoneDic();
         ccmap_string_key_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -11787,8 +11787,8 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Armature:create");
             if (!ok) { break; }
             cocostudio::Armature* ret = cocostudio::Armature::create(arg0);
             object_to_luaval<cocostudio::Armature>(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret);
@@ -11810,8 +11810,8 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Armature:create");
             if (!ok) { break; }
             cocostudio::Bone* arg1;
             ok &= luaval_to_object<cocostudio::Bone>(tolua_S, 3, "ccs.Bone",&arg1, "ccs.Armature:create");
@@ -12037,8 +12037,8 @@ int lua_cocos2dx_studio_Skin_getDisplayName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Skin_getDisplayName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getDisplayName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getDisplayName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getDisplayName",argc, 0);
@@ -12166,8 +12166,8 @@ int lua_cocos2dx_studio_Skin_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Skin:create");
             if (!ok) { break; }
             cocostudio::Skin* ret = cocostudio::Skin::create(arg0);
             object_to_luaval<cocostudio::Skin>(tolua_S, "ccs.Skin",(cocostudio::Skin*)ret);
@@ -12210,8 +12210,8 @@ int lua_cocos2dx_studio_Skin_createWithSpriteFrameName(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:createWithSpriteFrameName");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.Skin:createWithSpriteFrameName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_Skin_createWithSpriteFrameName'", nullptr);
@@ -12321,9 +12321,9 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_getFloat'", nullptr);
@@ -12335,10 +12335,10 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         double arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:getFloat");
         if(!ok)
@@ -12388,9 +12388,9 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_getString'", nullptr);
@@ -12402,12 +12402,12 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getString");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:getString");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ComAttribute:getString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_getString'", nullptr);
@@ -12455,10 +12455,10 @@ int lua_cocos2dx_studio_ComAttribute_setFloat(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         double arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setFloat");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:setFloat");
 
         ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:setFloat");
         if(!ok)
@@ -12508,12 +12508,12 @@ int lua_cocos2dx_studio_ComAttribute_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:setString");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ComAttribute:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_setString'", nullptr);
@@ -12561,9 +12561,9 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_getBool'", nullptr);
@@ -12575,10 +12575,10 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:getBool");
         if(!ok)
@@ -12628,10 +12628,10 @@ int lua_cocos2dx_studio_ComAttribute_setInt(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setInt");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:setInt");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:setInt");
         if(!ok)
@@ -12681,9 +12681,9 @@ int lua_cocos2dx_studio_ComAttribute_parse(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:parse");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:parse");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_parse'", nullptr);
@@ -12731,9 +12731,9 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComAttribute_getInt'", nullptr);
@@ -12745,10 +12745,10 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         int arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:getInt");
         if(!ok)
@@ -12798,10 +12798,10 @@ int lua_cocos2dx_studio_ComAttribute_setBool(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         bool arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setBool");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComAttribute:setBool");
 
         ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:setBool");
         if(!ok)
@@ -14785,9 +14785,9 @@ int lua_cocos2dx_studio_GUIReader_setFilePath(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.GUIReader:setFilePath");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.GUIReader:setFilePath");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_GUIReader_setFilePath'", nullptr);
@@ -14890,8 +14890,8 @@ int lua_cocos2dx_studio_GUIReader_getFilePath(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_GUIReader_getFilePath'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFilePath();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFilePath();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:getFilePath",argc, 0);
@@ -15180,9 +15180,9 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile'", nullptr);
@@ -15194,10 +15194,10 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocostudio::SceneReader::AttachComponentType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.SceneReader:createNodeWithSceneFile");
         if(!ok)
@@ -15472,9 +15472,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_createActionFromJson(lua_State* tolu
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionFromJson");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionFromJson");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionFromJson'", nullptr);
@@ -15522,9 +15522,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersFile(lua_
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionWithFlatBuffersFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionWithFlatBuffersFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersFile'", nullptr);
@@ -15572,9 +15572,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFlatBuffersFi
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFlatBuffersFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFlatBuffersFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFlatBuffersFile'", nullptr);
@@ -15622,12 +15622,12 @@ int lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent(lua_State* t
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionFromContent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionFromContent");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:createActionFromContent");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:createActionFromContent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionFromContent'", nullptr);
@@ -15769,12 +15769,12 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent(lua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithContent");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithContent");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:loadAnimationActionWithContent");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:loadAnimationActionWithContent");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent'", nullptr);
@@ -15822,9 +15822,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile(lua_Stat
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile'", nullptr);
@@ -15872,9 +15872,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_removeAction(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:removeAction");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:removeAction");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_removeAction'", nullptr);
@@ -15922,9 +15922,9 @@ int lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersForSimula
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionWithFlatBuffersForSimulator");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createActionWithFlatBuffersForSimulator");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createActionWithFlatBuffersForSimulator'", nullptr);
@@ -15995,8 +15995,8 @@ int lua_cocos2dx_studio_ActionTimelineCache_createAction(lua_State* tolua_S)
 
     if (argc == 1)
     {
-        std::string arg0;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createAction");
+        std::string_view arg0;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createAction");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimelineCache_createAction'", nullptr);
@@ -17029,8 +17029,8 @@ int lua_cocos2dx_studio_TextureFrame_getTextureName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_TextureFrame_getTextureName'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getTextureName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTextureName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:getTextureName",argc, 0);
@@ -19147,9 +19147,9 @@ int lua_cocos2dx_studio_InnerActionFrame_setAnimationName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.InnerActionFrame:setAnimationName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.InnerActionFrame:setAnimationName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_InnerActionFrame_setAnimationName'", nullptr);
@@ -19783,8 +19783,8 @@ int lua_cocos2dx_studio_EventFrame_getEvent(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_EventFrame_getEvent'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getEvent();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getEvent();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:getEvent",argc, 0);
@@ -22120,9 +22120,9 @@ int lua_cocos2dx_studio_ActionTimeline_getAnimationInfo(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimeline:getAnimationInfo");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimeline:getAnimationInfo");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimeline_getAnimationInfo'", nullptr);
@@ -22218,12 +22218,12 @@ int lua_cocos2dx_studio_ActionTimeline_addFrameEndCallFunc(lua_State* tolua_S)
     if (argc == 3) 
     {
         int arg0;
-        std::string arg1;
+        std::string_view arg1;
         std::function<void ()> arg2;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:addFrameEndCallFunc");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimeline:addFrameEndCallFunc");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ActionTimeline:addFrameEndCallFunc");
 
         do {
 			// Lambda binding for lua is not supported.
@@ -22721,9 +22721,9 @@ int lua_cocos2dx_studio_ActionTimeline_IsAnimationInfoExists(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimeline:IsAnimationInfoExists");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ActionTimeline:IsAnimationInfoExists");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimeline_IsAnimationInfoExists'", nullptr);
@@ -23016,11 +23016,11 @@ int lua_cocos2dx_studio_ActionTimeline_removeFrameEndCallFunc(lua_State* tolua_S
     if (argc == 2) 
     {
         int arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:removeFrameEndCallFunc");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimeline:removeFrameEndCallFunc");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccs.ActionTimeline:removeFrameEndCallFunc");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ActionTimeline_removeFrameEndCallFunc'", nullptr);
@@ -23916,8 +23916,8 @@ int lua_cocos2dx_studio_BoneNode_displaySkin(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.BoneNode:displaySkin");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.BoneNode:displaySkin");
 
             if (!ok) { break; }
             bool arg1;
@@ -24605,9 +24605,9 @@ int lua_cocos2dx_studio_SkeletonNode_getBoneNode(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SkeletonNode:getBoneNode");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.SkeletonNode:getBoneNode");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_SkeletonNode_getBoneNode'", nullptr);
@@ -24650,8 +24650,8 @@ int lua_cocos2dx_studio_SkeletonNode_changeSkins(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SkeletonNode:changeSkins");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.SkeletonNode:changeSkins");
 
             if (!ok) { break; }
             cobj->changeSkins(arg0);
@@ -24662,7 +24662,7 @@ int lua_cocos2dx_studio_SkeletonNode_changeSkins(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::map<std::string, std::string> arg0;
+            tsl::robin_map<std::string, std::string, hlookup::string_hash, hlookup::equal_to> arg0;
             ok &= luaval_to_std_map_string_string(tolua_S, 2, &arg0, "ccs.SkeletonNode:changeSkins");
 
             if (!ok) { break; }
@@ -24711,7 +24711,7 @@ int lua_cocos2dx_studio_SkeletonNode_addSkinGroup(lua_State* tolua_S)
     if (argc == 2) 
     {
         std::string arg0;
-        std::map<std::string, std::string> arg1;
+        tsl::robin_map<std::string, std::string, hlookup::string_hash, hlookup::equal_to> arg1;
 
         ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SkeletonNode:addSkinGroup");
 
@@ -24768,7 +24768,7 @@ int lua_cocos2dx_studio_SkeletonNode_getAllSubBonesMap(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_SkeletonNode_getAllSubBonesMap'", nullptr);
             return 0;
         }
-        const cocos2d::Map<std::string, cocostudio::timeline::BoneNode *>& ret = cobj->getAllSubBonesMap();
+        const cocos2d::Map<std::string, cocostudio::timeline::BoneNode *, hlookup::string_hash, hlookup::equal_to>& ret = cobj->getAllSubBonesMap();
         ccmap_string_key_to_luaval(tolua_S, ret);
         return 1;
     }
@@ -25050,9 +25050,9 @@ int lua_cocos2dx_studio_ComExtensionData_setCustomProperty(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComExtensionData:setCustomProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccs.ComExtensionData:setCustomProperty");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComExtensionData_setCustomProperty'", nullptr);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
index 31cef92257d5..c6176f00c078 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
@@ -559,9 +559,9 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeToWidgetName(lua_State* t
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeToWidgetName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeToWidgetName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeToWidgetName'", nullptr);
@@ -614,8 +614,8 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getRelativeName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getRelativeName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeName",argc, 0);
@@ -661,8 +661,8 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeToWidgetName(lua_State* t
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeToWidgetName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getRelativeToWidgetName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getRelativeToWidgetName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeToWidgetName",argc, 0);
@@ -703,9 +703,9 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeName'", nullptr);
@@ -1003,8 +1003,8 @@ int lua_cocos2dx_ui_Widget_getCustomSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_getCustomSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getCustomSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getCustomSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCustomSize",argc, 0);
@@ -1142,9 +1142,9 @@ int lua_cocos2dx_ui_Widget_setCallbackName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Widget:setCallbackName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Widget:setCallbackName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_setCallbackName'", nullptr);
@@ -1488,8 +1488,8 @@ int lua_cocos2dx_ui_Widget_getLayoutSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_getLayoutSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getLayoutSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getLayoutSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLayoutSize",argc, 0);
@@ -1682,8 +1682,8 @@ int lua_cocos2dx_ui_Widget_getVirtualRendererSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_getVirtualRendererSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getVirtualRendererSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getVirtualRendererSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getVirtualRendererSize",argc, 0);
@@ -2208,8 +2208,8 @@ int lua_cocos2dx_ui_Widget_getCallbackName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_getCallbackName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getCallbackName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getCallbackName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCallbackName",argc, 0);
@@ -3274,8 +3274,8 @@ int lua_cocos2dx_ui_Widget_updateSizeAndPosition(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 1) {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Widget:updateSizeAndPosition");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:updateSizeAndPosition");
 
             if (!ok) { break; }
             cobj->updateSizeAndPosition(arg0);
@@ -3482,8 +3482,8 @@ int lua_cocos2dx_ui_Widget_getCallbackType(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_getCallbackType'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getCallbackType();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getCallbackType();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCallbackType",argc, 0);
@@ -3974,9 +3974,9 @@ int lua_cocos2dx_ui_Widget_setCallbackType(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Widget:setCallbackType");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Widget:setCallbackType");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Widget_setCallbackType'", nullptr);
@@ -4929,9 +4929,9 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Layout_setBackGroundImage'", nullptr);
@@ -4943,10 +4943,10 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Layout:setBackGroundImage");
         if(!ok)
@@ -5633,8 +5633,8 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getBackGroundImageTextureSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getBackGroundImageTextureSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageTextureSize",argc, 0);
@@ -6132,8 +6132,8 @@ int lua_cocos2dx_ui_Button_getNormalTextureSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getNormalTextureSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getNormalTextureSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getNormalTextureSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getNormalTextureSize",argc, 0);
@@ -6179,8 +6179,8 @@ int lua_cocos2dx_ui_Button_getTitleText(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleText'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getTitleText();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTitleText();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleText",argc, 0);
@@ -6991,9 +6991,9 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_loadTextureDisabled'", nullptr);
@@ -7005,10 +7005,10 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureDisabled");
         if(!ok)
@@ -7058,9 +7058,9 @@ int lua_cocos2dx_ui_Button_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_init'", nullptr);
@@ -7072,12 +7072,12 @@ int lua_cocos2dx_ui_Button_init(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_init'", nullptr);
@@ -7089,15 +7089,15 @@ int lua_cocos2dx_ui_Button_init(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:init");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_init'", nullptr);
@@ -7109,16 +7109,16 @@ int lua_cocos2dx_ui_Button_init(lua_State* tolua_S)
     }
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
         cocos2d::ui::Widget::TextureResType arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:init");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:init");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:init");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:init");
         if(!ok)
@@ -7168,9 +7168,9 @@ int lua_cocos2dx_ui_Button_setTitleText(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleText");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:setTitleText");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_setTitleText'", nullptr);
@@ -7268,9 +7268,9 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_loadTexturePressed'", nullptr);
@@ -7282,10 +7282,10 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTexturePressed");
         if(!ok)
@@ -7335,9 +7335,9 @@ int lua_cocos2dx_ui_Button_setTitleFontName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleFontName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:setTitleFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_setTitleFontName'", nullptr);
@@ -7538,12 +7538,12 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_loadTextures'", nullptr);
@@ -7555,15 +7555,15 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:loadTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_loadTextures'", nullptr);
@@ -7575,16 +7575,16 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S)
     }
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
         cocos2d::ui::Widget::TextureResType arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:loadTextures");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:loadTextures");
         if(!ok)
@@ -7681,9 +7681,9 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_loadTextureNormal'", nullptr);
@@ -7695,10 +7695,10 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureNormal");
         if(!ok)
@@ -7991,8 +7991,8 @@ int lua_cocos2dx_ui_Button_getTitleFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleFontName'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getTitleFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTitleFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleFontName",argc, 0);
@@ -8170,8 +8170,8 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:create");
             if (!ok) { break; }
             cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0);
             object_to_luaval<cocos2d::ui::Button>(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret);
@@ -8183,11 +8183,11 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:create");
             if (!ok) { break; }
             cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::Button>(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret);
@@ -8199,14 +8199,14 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:create");
             if (!ok) { break; }
             cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1, arg2);
             object_to_luaval<cocos2d::ui::Button>(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret);
@@ -8218,14 +8218,14 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Button:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Button:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Button:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg3;
             ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:create");
@@ -8508,9 +8508,9 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundSelected(lua_State*
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundSelected");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundSelected");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundSelected'", nullptr);
@@ -8522,10 +8522,10 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundSelected(lua_State*
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundSelected");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundSelected");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.AbstractCheckButton:loadTextureBackGroundSelected");
         if(!ok)
@@ -8575,9 +8575,9 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundDisabled(lua_State*
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundDisabled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundDisabled'", nullptr);
@@ -8589,10 +8589,10 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGroundDisabled(lua_State*
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGroundDisabled");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.AbstractCheckButton:loadTextureBackGroundDisabled");
         if(!ok)
@@ -8880,9 +8880,9 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCross(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCross");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCross");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCross'", nullptr);
@@ -8894,10 +8894,10 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCross(lua_State* tolua_S
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCross");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCross");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.AbstractCheckButton:loadTextureFrontCross");
         if(!ok)
@@ -9041,21 +9041,21 @@ int lua_cocos2dx_ui_AbstractCheckButton_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 5) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_init'", nullptr);
@@ -9067,22 +9067,22 @@ int lua_cocos2dx_ui_AbstractCheckButton_init(lua_State* tolua_S)
     }
     if (argc == 6) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
         cocos2d::ui::Widget::TextureResType arg5;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:init");
 
         ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.AbstractCheckButton:init");
         if(!ok)
@@ -9179,21 +9179,21 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextures(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 5) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:loadTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextures'", nullptr);
@@ -9205,22 +9205,22 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextures(lua_State* tolua_S)
     }
     if (argc == 6) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
+        std::string_view arg4;
         cocos2d::ui::Widget::TextureResType arg5;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.AbstractCheckButton:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.AbstractCheckButton:loadTextures");
 
         ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.AbstractCheckButton:loadTextures");
         if(!ok)
@@ -9411,9 +9411,9 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGround(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGround");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGround");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGround'", nullptr);
@@ -9425,10 +9425,10 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureBackGround(lua_State* tolua_S
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGround");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureBackGround");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.AbstractCheckButton:loadTextureBackGround");
         if(!ok)
@@ -9528,9 +9528,9 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCrossDisabled(lua_State*
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCrossDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCrossDisabled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCrossDisabled'", nullptr);
@@ -9542,10 +9542,10 @@ int lua_cocos2dx_ui_AbstractCheckButton_loadTextureFrontCrossDisabled(lua_State*
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCrossDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.AbstractCheckButton:loadTextureFrontCrossDisabled");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.AbstractCheckButton:loadTextureFrontCrossDisabled");
         if(!ok)
@@ -9679,20 +9679,20 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.CheckBox:create");
             if (!ok) { break; }
             cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::ui::CheckBox>(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret);
@@ -9704,20 +9704,20 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.CheckBox:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg5;
             ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.CheckBox:create");
@@ -9742,11 +9742,11 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.CheckBox:create");
             if (!ok) { break; }
             cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::CheckBox>(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret);
@@ -9758,11 +9758,11 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.CheckBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.CheckBox:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.CheckBox:create");
@@ -9947,20 +9947,20 @@ int lua_cocos2dx_ui_RadioButton_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RadioButton:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.RadioButton:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.RadioButton:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RadioButton:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RadioButton:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RadioButton:create");
             if (!ok) { break; }
             cocos2d::ui::RadioButton* ret = cocos2d::ui::RadioButton::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::ui::RadioButton>(tolua_S, "ccui.RadioButton",(cocos2d::ui::RadioButton*)ret);
@@ -9972,20 +9972,20 @@ int lua_cocos2dx_ui_RadioButton_create(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RadioButton:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.RadioButton:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.RadioButton:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RadioButton:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RadioButton:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RadioButton:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg5;
             ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.RadioButton:create");
@@ -10010,11 +10010,11 @@ int lua_cocos2dx_ui_RadioButton_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RadioButton:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.RadioButton:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.RadioButton:create");
             if (!ok) { break; }
             cocos2d::ui::RadioButton* ret = cocos2d::ui::RadioButton::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::RadioButton>(tolua_S, "ccui.RadioButton",(cocos2d::ui::RadioButton*)ret);
@@ -10026,11 +10026,11 @@ int lua_cocos2dx_ui_RadioButton_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RadioButton:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RadioButton:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.RadioButton:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.RadioButton:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.RadioButton:create");
@@ -10873,9 +10873,9 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_ImageView_loadTexture'", nullptr);
@@ -10887,10 +10887,10 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:loadTexture");
         if(!ok)
@@ -10990,9 +10990,9 @@ int lua_cocos2dx_ui_ImageView_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_ImageView_init'", nullptr);
@@ -11004,10 +11004,10 @@ int lua_cocos2dx_ui_ImageView_init(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:init");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:init");
         if(!ok)
@@ -11338,8 +11338,8 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:create");
             if (!ok) { break; }
             cocos2d::ui::ImageView* ret = cocos2d::ui::ImageView::create(arg0);
             object_to_luaval<cocos2d::ui::ImageView>(tolua_S, "ccui.ImageView",(cocos2d::ui::ImageView*)ret);
@@ -11351,8 +11351,8 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.ImageView:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg1;
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:create");
@@ -11538,11 +11538,11 @@ int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::Color4B arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
 
         ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccui.Text:enableShadow");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_enableShadow'", nullptr);
@@ -11555,12 +11555,12 @@ int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S)
     if (argc == 3) 
     {
         cocos2d::Color4B arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         int arg2;
 
         ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow");
 
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccui.Text:enableShadow");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Text:enableShadow");
         if(!ok)
@@ -11662,8 +11662,8 @@ int lua_cocos2dx_ui_Text_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getString",argc, 0);
@@ -11946,9 +11946,9 @@ int lua_cocos2dx_ui_Text_setFontName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setFontName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Text:setFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_setFontName'", nullptr);
@@ -12051,8 +12051,8 @@ int lua_cocos2dx_ui_Text_getShadowOffset(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_getShadowOffset'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getShadowOffset();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getShadowOffset();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getShadowOffset",argc, 0);
@@ -12093,9 +12093,9 @@ int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Text:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_setString'", nullptr);
@@ -12190,13 +12190,13 @@ int lua_cocos2dx_ui_Text_init(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         double arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:init");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Text:init");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Text:init");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Text:init");
 
         ok &= luaval_to_number(tolua_S, 4,&arg2, "ccui.Text:init");
         if(!ok)
@@ -12345,8 +12345,8 @@ int lua_cocos2dx_ui_Text_getFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_getFontName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getFontName",argc, 0);
@@ -12387,9 +12387,9 @@ int lua_cocos2dx_ui_Text_setTextAreaSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Text:setTextAreaSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Text:setTextAreaSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_setTextAreaSize'", nullptr);
@@ -12489,8 +12489,8 @@ int lua_cocos2dx_ui_Text_getAutoRenderSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_getAutoRenderSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getAutoRenderSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getAutoRenderSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getAutoRenderSize",argc, 0);
@@ -13135,8 +13135,8 @@ int lua_cocos2dx_ui_Text_getTextAreaSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Text_getTextAreaSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getTextAreaSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getTextAreaSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextAreaSize",argc, 0);
@@ -13217,11 +13217,11 @@ int lua_cocos2dx_ui_Text_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Text:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Text:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Text:create");
             if (!ok) { break; }
             double arg2;
             ok &= luaval_to_number(tolua_S, 4,&arg2, "ccui.Text:create");
@@ -13457,8 +13457,8 @@ int lua_cocos2dx_ui_TextAtlas_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextAtlas_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:getString",argc, 0);
@@ -13499,9 +13499,9 @@ int lua_cocos2dx_ui_TextAtlas_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextAtlas:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextAtlas_setString'", nullptr);
@@ -13596,21 +13596,21 @@ int lua_cocos2dx_ui_TextAtlas_setProperty(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 5) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
         int arg2;
         int arg3;
-        std::string arg4;
+        std::string_view arg4;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextAtlas:setProperty");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:setProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TextAtlas:setProperty");
 
         ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:setProperty");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:setProperty");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:setProperty");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.TextAtlas:setProperty");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextAtlas_setProperty'", nullptr);
@@ -13695,11 +13695,11 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S)
     {
         if (argc == 5)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextAtlas:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TextAtlas:create");
             if (!ok) { break; }
             int arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:create");
@@ -13707,8 +13707,8 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S)
             int arg3;
             ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.TextAtlas:create");
             if (!ok) { break; }
             cocos2d::ui::TextAtlas* ret = cocos2d::ui::TextAtlas::create(arg0, arg1, arg2, arg3, arg4);
             object_to_luaval<cocos2d::ui::TextAtlas>(tolua_S, "ccui.TextAtlas",(cocos2d::ui::TextAtlas*)ret);
@@ -13911,9 +13911,9 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_LoadingBar_loadTexture'", nullptr);
@@ -13925,10 +13925,10 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.LoadingBar:loadTexture");
         if(!ok)
@@ -14353,8 +14353,8 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
             if (!ok) { break; }
             cocos2d::ui::LoadingBar* ret = cocos2d::ui::LoadingBar::create(arg0);
             object_to_luaval<cocos2d::ui::LoadingBar>(tolua_S, "ccui.LoadingBar",(cocos2d::ui::LoadingBar*)ret);
@@ -14366,8 +14366,8 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
             if (!ok) { break; }
             double arg1;
             ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.LoadingBar:create");
@@ -14392,8 +14392,8 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg1;
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.LoadingBar:create");
@@ -14408,8 +14408,8 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.LoadingBar:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg1;
             ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.LoadingBar:create");
@@ -15418,9 +15418,9 @@ int lua_cocos2dx_ui_ScrollView_setInnerContainerSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.ScrollView:setInnerContainerSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.ScrollView:setInnerContainerSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_ScrollView_setInnerContainerSize'", nullptr);
@@ -17473,8 +17473,8 @@ int lua_cocos2dx_ui_ScrollView_getInnerContainerSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_ScrollView_getInnerContainerSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getInnerContainerSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getInnerContainerSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getInnerContainerSize",argc, 0);
@@ -20115,9 +20115,9 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal'", nullptr);
@@ -20129,10 +20129,10 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureNormal");
         if(!ok)
@@ -20182,9 +20182,9 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadProgressBarTexture'", nullptr);
@@ -20196,10 +20196,10 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadProgressBarTexture");
         if(!ok)
@@ -20537,9 +20537,9 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTextures'", nullptr);
@@ -20551,12 +20551,12 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTextures'", nullptr);
@@ -20568,15 +20568,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTextures'", nullptr);
@@ -20588,16 +20588,16 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S)
     }
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
         cocos2d::ui::Widget::TextureResType arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Slider:loadSlidBallTextures");
         if(!ok)
@@ -20798,9 +20798,9 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadBarTexture'", nullptr);
@@ -20812,10 +20812,10 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadBarTexture");
         if(!ok)
@@ -21100,9 +21100,9 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed'", nullptr);
@@ -21114,10 +21114,10 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTexturePressed");
         if(!ok)
@@ -21455,9 +21455,9 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled'", nullptr);
@@ -21469,10 +21469,10 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureDisabled");
         if(!ok)
@@ -21609,11 +21609,11 @@ int lua_cocos2dx_ui_Slider_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Slider:create");
             if (!ok) { break; }
             cocos2d::ui::Slider* ret = cocos2d::ui::Slider::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::Slider>(tolua_S, "ccui.Slider",(cocos2d::ui::Slider*)ret);
@@ -21625,11 +21625,11 @@ int lua_cocos2dx_ui_Slider_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Slider:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Slider:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Slider:create");
@@ -21911,8 +21911,8 @@ int lua_cocos2dx_ui_TextField_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getString",argc, 0);
@@ -22102,8 +22102,8 @@ int lua_cocos2dx_ui_TextField_getPlaceHolder(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_getPlaceHolder'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getPlaceHolder();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getPlaceHolder();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPlaceHolder",argc, 0);
@@ -22191,9 +22191,9 @@ int lua_cocos2dx_ui_TextField_setFontName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setFontName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextField:setFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setFontName'", nullptr);
@@ -22338,9 +22338,9 @@ int lua_cocos2dx_ui_TextField_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextField:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setString'", nullptr);
@@ -22591,8 +22591,8 @@ int lua_cocos2dx_ui_TextField_getFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_getFontName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getFontName",argc, 0);
@@ -22633,9 +22633,9 @@ int lua_cocos2dx_ui_TextField_setTextAreaSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTextAreaSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.TextField:setTextAreaSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setTextAreaSize'", nullptr);
@@ -22782,8 +22782,8 @@ int lua_cocos2dx_ui_TextField_getAutoRenderSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_getAutoRenderSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getAutoRenderSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getAutoRenderSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getAutoRenderSize",argc, 0);
@@ -23262,9 +23262,9 @@ int lua_cocos2dx_ui_TextField_setPlaceHolder(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setPlaceHolder");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextField:setPlaceHolder");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setPlaceHolder'", nullptr);
@@ -23911,9 +23911,9 @@ int lua_cocos2dx_ui_TextField_setTouchSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTouchSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.TextField:setTouchSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_setTouchSize'", nullptr);
@@ -23966,8 +23966,8 @@ int lua_cocos2dx_ui_TextField_getTouchSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextField_getTouchSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getTouchSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getTouchSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getTouchSize",argc, 0);
@@ -23998,11 +23998,11 @@ int lua_cocos2dx_ui_TextField_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextField:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextField:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TextField:create");
             if (!ok) { break; }
             int arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextField:create");
@@ -24249,8 +24249,8 @@ int lua_cocos2dx_ui_TextBMFont_getString(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextBMFont_getString'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getString();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getString();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:getString",argc, 0);
@@ -24291,9 +24291,9 @@ int lua_cocos2dx_ui_TextBMFont_setString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextBMFont:setString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextBMFont_setString'", nullptr);
@@ -24388,9 +24388,9 @@ int lua_cocos2dx_ui_TextBMFont_setFntFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setFntFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextBMFont:setFntFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TextBMFont_setFntFile'", nullptr);
@@ -24475,11 +24475,11 @@ int lua_cocos2dx_ui_TextBMFont_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TextBMFont:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextBMFont:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TextBMFont:create");
             if (!ok) { break; }
             cocos2d::ui::TextBMFont* ret = cocos2d::ui::TextBMFont::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::TextBMFont>(tolua_S, "ccui.TextBMFont",(cocos2d::ui::TextBMFont*)ret);
@@ -25880,9 +25880,9 @@ int lua_cocos2dx_ui_PageView_setIndicatorIndexNodesTexture(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.PageView:setIndicatorIndexNodesTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.PageView:setIndicatorIndexNodesTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_PageView_setIndicatorIndexNodesTexture'", nullptr);
@@ -25894,10 +25894,10 @@ int lua_cocos2dx_ui_PageView_setIndicatorIndexNodesTexture(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.PageView:setIndicatorIndexNodesTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.PageView:setIndicatorIndexNodesTexture");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.PageView:setIndicatorIndexNodesTexture");
         if(!ok)
@@ -26287,10 +26287,10 @@ int lua_cocos2dx_ui_Helper_getSubStringOfUTF8String(lua_State* tolua_S)
 
     if (argc == 3)
     {
-        std::string arg0;
+        std::string_view arg0;
         unsigned int arg1;
         unsigned int arg2;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Helper:getSubStringOfUTF8String");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Helper:getSubStringOfUTF8String");
         ok &= luaval_to_uint32(tolua_S, 3,&arg1, "ccui.Helper:getSubStringOfUTF8String");
         ok &= luaval_to_uint32(tolua_S, 4,&arg2, "ccui.Helper:getSubStringOfUTF8String");
         if(!ok)
@@ -26438,9 +26438,9 @@ int lua_cocos2dx_ui_Helper_seekWidgetByName(lua_State* tolua_S)
     if (argc == 2)
     {
         cocos2d::ui::Widget* arg0;
-        std::string arg1;
+        std::string_view arg1;
         ok &= luaval_to_object<cocos2d::ui::Widget>(tolua_S, 2, "ccui.Widget",&arg0, "ccui.Helper:seekWidgetByName");
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Helper:seekWidgetByName");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Helper:seekWidgetByName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Helper_seekWidgetByName'", nullptr);
@@ -26514,9 +26514,9 @@ int lua_cocos2dx_ui_Helper_restrictCapInsetRect(lua_State* tolua_S)
     if (argc == 2)
     {
         cocos2d::Rect arg0;
-        cocos2d::Size arg1;
+        cocos2d::Vec2 arg1;
         ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Helper:restrictCapInsetRect");
-        ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Helper:restrictCapInsetRect");
+        ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccui.Helper:restrictCapInsetRect");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Helper_restrictCapInsetRect'", nullptr);
@@ -26844,11 +26844,11 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init");
 
@@ -26856,15 +26856,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_init'", nullptr);
@@ -26879,11 +26879,11 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init");
@@ -26892,15 +26892,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
         if(!ok)
@@ -26917,11 +26917,11 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
 
@@ -26931,15 +26931,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
 
@@ -26958,11 +26958,11 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
@@ -26973,15 +26973,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
 
@@ -27002,15 +27002,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init");
 
@@ -27018,15 +27018,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
 
@@ -27034,7 +27034,7 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:init");
 
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:init");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_init'", nullptr);
@@ -27049,15 +27049,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
         int arg12;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init");
@@ -27066,15 +27066,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
 
@@ -27082,7 +27082,7 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:init");
 
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:init");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:init");
 
         ok &= luaval_to_int32(tolua_S, 14,(int *)&arg12, "ccui.RichElementText:init");
         if(!ok)
@@ -27099,15 +27099,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
         int arg12;
         cocos2d::Color3B arg13;
 
@@ -27117,15 +27117,15 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:init");
 
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init");
 
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:init");
 
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:init");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:init");
 
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:init");
 
@@ -27133,7 +27133,7 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S)
 
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:init");
 
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:init");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:init");
 
         ok &= luaval_to_int32(tolua_S, 14,(int *)&arg12, "ccui.RichElementText:init");
 
@@ -27177,14 +27177,14 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         if(!ok)
         {
@@ -27200,15 +27200,15 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
         if(!ok)
@@ -27225,19 +27225,19 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_create'", nullptr);
@@ -27252,20 +27252,20 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         if(!ok)
         {
@@ -27281,21 +27281,21 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 11,(int *)&arg9, "ccui.RichElementText:create");
         if(!ok)
@@ -27312,22 +27312,22 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 11,(int *)&arg9, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:create");
@@ -27345,27 +27345,27 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 11,(int *)&arg9, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:create");
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:create");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementText_create'", nullptr);
@@ -27380,28 +27380,28 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
         int arg12;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 11,(int *)&arg9, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:create");
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:create");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 14,(int *)&arg12, "ccui.RichElementText:create");
         if(!ok)
         {
@@ -27417,29 +27417,29 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         double arg5;
         unsigned int arg6;
-        std::string arg7;
+        std::string_view arg7;
         cocos2d::Color3B arg8;
         int arg9;
         cocos2d::Color3B arg10;
-        cocos2d::Size arg11;
+        cocos2d::Vec2 arg11;
         int arg12;
         cocos2d::Color3B arg13;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementText:create");
         ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create");
         ok &= luaval_to_uint32(tolua_S, 8,&arg6, "ccui.RichElementText:create");
-        ok &= luaval_to_std_string(tolua_S, 9,&arg7, "ccui.RichElementText:create");
+        ok &= luaval_to_std_string_view(tolua_S, 9,&arg7, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 10, &arg8, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 11,(int *)&arg9, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 12, &arg10, "ccui.RichElementText:create");
-        ok &= luaval_to_size(tolua_S, 13, &arg11, "ccui.RichElementText:create");
+        ok &= luaval_to_vec2(tolua_S, 13, &arg11, "ccui.RichElementText:create");
         ok &= luaval_to_int32(tolua_S, 14,(int *)&arg12, "ccui.RichElementText:create");
         ok &= luaval_to_color3b(tolua_S, 15, &arg13, "ccui.RichElementText:create");
         if(!ok)
@@ -27599,7 +27599,7 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
+        std::string_view arg3;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:init");
 
@@ -27607,7 +27607,7 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_init'", nullptr);
@@ -27622,8 +27622,8 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:init");
 
@@ -27631,9 +27631,9 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementImage:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementImage:init");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_init'", nullptr);
@@ -27648,8 +27648,8 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         cocos2d::ui::Widget::TextureResType arg5;
 
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:init");
@@ -27658,9 +27658,9 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S)
 
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:init");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:init");
 
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementImage:init");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementImage:init");
 
         ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.RichElementImage:init");
         if(!ok)
@@ -27760,9 +27760,9 @@ int lua_cocos2dx_ui_RichElementImage_setUrl(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichElementImage:setUrl");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichElementImage:setUrl");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_setUrl'", nullptr);
@@ -27802,11 +27802,11 @@ int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
+        std::string_view arg3;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_create'", nullptr);
@@ -27821,13 +27821,13 @@ int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementImage:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementImage:create");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichElementImage_create'", nullptr);
@@ -27842,14 +27842,14 @@ int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S)
         int arg0;
         cocos2d::Color3B arg1;
         uint16_t arg2;
-        std::string arg3;
-        std::string arg4;
+        std::string_view arg3;
+        std::string_view arg4;
         cocos2d::ui::Widget::TextureResType arg5;
         ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:create");
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:create");
         ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:create");
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
-        ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementImage:create");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.RichElementImage:create");
+        ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.RichElementImage:create");
         ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.RichElementImage:create");
         if(!ok)
         {
@@ -28630,13 +28630,13 @@ int lua_cocos2dx_ui_RichText_setAnchorTextShadow(lua_State* tolua_S)
     {
         bool arg0;
         cocos2d::Color3B arg1;
-        cocos2d::Size arg2;
+        cocos2d::Vec2 arg2;
 
         ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.RichText:setAnchorTextShadow");
 
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichText:setAnchorTextShadow");
 
-        ok &= luaval_to_size(tolua_S, 4, &arg2, "ccui.RichText:setAnchorTextShadow");
+        ok &= luaval_to_vec2(tolua_S, 4, &arg2, "ccui.RichText:setAnchorTextShadow");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_setAnchorTextShadow'", nullptr);
@@ -28650,14 +28650,14 @@ int lua_cocos2dx_ui_RichText_setAnchorTextShadow(lua_State* tolua_S)
     {
         bool arg0;
         cocos2d::Color3B arg1;
-        cocos2d::Size arg2;
+        cocos2d::Vec2 arg2;
         int arg3;
 
         ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.RichText:setAnchorTextShadow");
 
         ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichText:setAnchorTextShadow");
 
-        ok &= luaval_to_size(tolua_S, 4, &arg2, "ccui.RichText:setAnchorTextShadow");
+        ok &= luaval_to_vec2(tolua_S, 4, &arg2, "ccui.RichText:setAnchorTextShadow");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.RichText:setAnchorTextShadow");
         if(!ok)
@@ -28754,9 +28754,9 @@ int lua_cocos2dx_ui_RichText_setAnchorFontColor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:setAnchorFontColor");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:setAnchorFontColor");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_setAnchorFontColor'", nullptr);
@@ -28804,9 +28804,9 @@ int lua_cocos2dx_ui_RichText_setFontFace(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:setFontFace");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:setFontFace");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_setFontFace'", nullptr);
@@ -29165,10 +29165,10 @@ int lua_cocos2dx_ui_RichText_initWithXML(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ValueMap arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:initWithXML");
 
         ok &= luaval_to_ccvaluemap(tolua_S, 3, &arg1, "ccui.RichText:initWithXML");
         if(!ok)
@@ -29182,11 +29182,11 @@ int lua_cocos2dx_ui_RichText_initWithXML(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ValueMap arg1;
-        std::function<void (const std::string&)> arg2;
+        std::function<void (std::string_view)> arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:initWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:initWithXML");
 
         ok &= luaval_to_ccvaluemap(tolua_S, 3, &arg1, "ccui.RichText:initWithXML");
 
@@ -29383,9 +29383,9 @@ int lua_cocos2dx_ui_RichText_openUrl(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:openUrl");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:openUrl");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_openUrl'", nullptr);
@@ -29480,9 +29480,9 @@ int lua_cocos2dx_ui_RichText_setFontColor(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:setFontColor");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:setFontColor");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_setFontColor'", nullptr);
@@ -30169,8 +30169,8 @@ int lua_cocos2dx_ui_RichText_getAnchorTextShadowOffset(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_getAnchorTextShadowOffset'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getAnchorTextShadowOffset();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getAnchorTextShadowOffset();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:getAnchorTextShadowOffset",argc, 0);
@@ -30546,9 +30546,9 @@ int lua_cocos2dx_ui_RichText_color3BWithString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:color3BWithString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:color3BWithString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RichText_color3BWithString'", nullptr);
@@ -30619,9 +30619,9 @@ int lua_cocos2dx_ui_RichText_createWithXML(lua_State* tolua_S)
 
     if (argc == 2)
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ValueMap arg1;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:createWithXML");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:createWithXML");
         ok &= luaval_to_ccvaluemap(tolua_S, 3, &arg1, "ccui.RichText:createWithXML");
         if(!ok)
         {
@@ -30634,10 +30634,10 @@ int lua_cocos2dx_ui_RichText_createWithXML(lua_State* tolua_S)
     }
     if (argc == 3)
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ValueMap arg1;
-        std::function<void (const std::string&)> arg2;
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RichText:createWithXML");
+        std::function<void (std::string_view)> arg2;
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.RichText:createWithXML");
         ok &= luaval_to_ccvaluemap(tolua_S, 3, &arg1, "ccui.RichText:createWithXML");
         do {
 			// Lambda binding for lua is not supported.
@@ -30794,9 +30794,9 @@ int lua_cocos2dx_ui_HBox_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.HBox:initWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.HBox:initWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_HBox_initWithSize'", nullptr);
@@ -30834,8 +30834,8 @@ int lua_cocos2dx_ui_HBox_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.HBox:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.HBox:create");
             if (!ok) { break; }
             cocos2d::ui::HBox* ret = cocos2d::ui::HBox::create(arg0);
             object_to_luaval<cocos2d::ui::HBox>(tolua_S, "ccui.HBox",(cocos2d::ui::HBox*)ret);
@@ -30948,9 +30948,9 @@ int lua_cocos2dx_ui_VBox_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.VBox:initWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.VBox:initWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_VBox_initWithSize'", nullptr);
@@ -30988,8 +30988,8 @@ int lua_cocos2dx_ui_VBox_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.VBox:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.VBox:create");
             if (!ok) { break; }
             cocos2d::ui::VBox* ret = cocos2d::ui::VBox::create(arg0);
             object_to_luaval<cocos2d::ui::VBox>(tolua_S, "ccui.VBox",(cocos2d::ui::VBox*)ret);
@@ -31102,9 +31102,9 @@ int lua_cocos2dx_ui_RelativeBox_initWithSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.RelativeBox:initWithSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.RelativeBox:initWithSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_RelativeBox_initWithSize'", nullptr);
@@ -31142,8 +31142,8 @@ int lua_cocos2dx_ui_RelativeBox_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            cocos2d::Size arg0;
-            ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.RelativeBox:create");
+            cocos2d::Vec2 arg0;
+            ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.RelativeBox:create");
             if (!ok) { break; }
             cocos2d::ui::RelativeBox* ret = cocos2d::ui::RelativeBox::create(arg0);
             object_to_luaval<cocos2d::ui::RelativeBox>(tolua_S, "ccui.RelativeBox",(cocos2d::ui::RelativeBox*)ret);
@@ -31267,8 +31267,8 @@ int lua_cocos2dx_ui_Scale9Sprite_updateWithSprite(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "ccui.Scale9Sprite:updateWithSprite");
 
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "ccui.Scale9Sprite:updateWithSprite");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "ccui.Scale9Sprite:updateWithSprite");
 
             if (!ok) { break; }
             cocos2d::Rect arg5;
@@ -31540,10 +31540,10 @@ int lua_cocos2dx_ui_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::Rect arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:initWithSpriteFrameName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:initWithSpriteFrameName");
 
         ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:initWithSpriteFrameName");
         if(!ok)
@@ -31795,8 +31795,8 @@ int lua_cocos2dx_ui_Scale9Sprite_init(lua_State* tolua_S)
             ok &= luaval_to_vec2(tolua_S, 5, &arg3, "ccui.Scale9Sprite:init");
 
             if (!ok) { break; }
-            cocos2d::Size arg4;
-            ok &= luaval_to_size(tolua_S, 6, &arg4, "ccui.Scale9Sprite:init");
+            cocos2d::Vec2 arg4;
+            ok &= luaval_to_vec2(tolua_S, 6, &arg4, "ccui.Scale9Sprite:init");
 
             if (!ok) { break; }
             cocos2d::Rect arg5;
@@ -31847,9 +31847,9 @@ int lua_cocos2dx_ui_Scale9Sprite_setPreferredSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Scale9Sprite:setPreferredSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Scale9Sprite:setPreferredSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Scale9Sprite_setPreferredSize'", nullptr);
@@ -32337,8 +32337,8 @@ int lua_cocos2dx_ui_Scale9Sprite_getOriginalSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Scale9Sprite_getOriginalSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getOriginalSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getOriginalSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:getOriginalSize",argc, 0);
@@ -32378,8 +32378,8 @@ int lua_cocos2dx_ui_Scale9Sprite_initWithFile(lua_State* tolua_S)
             ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Scale9Sprite:initWithFile");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Scale9Sprite:initWithFile");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Scale9Sprite:initWithFile");
 
             if (!ok) { break; }
             bool ret = cobj->initWithFile(arg0, arg1);
@@ -32390,8 +32390,8 @@ int lua_cocos2dx_ui_Scale9Sprite_initWithFile(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 3) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:initWithFile");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:initWithFile");
 
             if (!ok) { break; }
             cocos2d::Rect arg1;
@@ -32601,8 +32601,8 @@ int lua_cocos2dx_ui_Scale9Sprite_getPreferredSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Scale9Sprite_getPreferredSize'", nullptr);
             return 0;
         }
-        cocos2d::Size ret = cobj->getPreferredSize();
-        size_to_luaval(tolua_S, ret);
+        cocos2d::Vec2 ret = cobj->getPreferredSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:getPreferredSize",argc, 0);
@@ -32780,8 +32780,8 @@ int lua_cocos2dx_ui_Scale9Sprite_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:create");
@@ -32812,8 +32812,8 @@ int lua_cocos2dx_ui_Scale9Sprite_create(lua_State* tolua_S)
             cocos2d::Rect arg0;
             ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Scale9Sprite:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Scale9Sprite:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.Scale9Sprite:create");
             if (!ok) { break; }
             cocos2d::ui::Scale9Sprite* ret = cocos2d::ui::Scale9Sprite::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::Scale9Sprite>(tolua_S, "ccui.Scale9Sprite",(cocos2d::ui::Scale9Sprite*)ret);
@@ -32825,8 +32825,8 @@ int lua_cocos2dx_ui_Scale9Sprite_create(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:create");
@@ -32841,8 +32841,8 @@ int lua_cocos2dx_ui_Scale9Sprite_create(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:create");
             if (!ok) { break; }
             cocos2d::ui::Scale9Sprite* ret = cocos2d::ui::Scale9Sprite::create(arg0);
             object_to_luaval<cocos2d::ui::Scale9Sprite>(tolua_S, "ccui.Scale9Sprite",(cocos2d::ui::Scale9Sprite*)ret);
@@ -32876,8 +32876,8 @@ int lua_cocos2dx_ui_Scale9Sprite_createWithSpriteFrameName(lua_State* tolua_S)
     {
         if (argc == 2)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:createWithSpriteFrameName");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:createWithSpriteFrameName");
             if (!ok) { break; }
             cocos2d::Rect arg1;
             ok &= luaval_to_rect(tolua_S, 3, &arg1, "ccui.Scale9Sprite:createWithSpriteFrameName");
@@ -32892,8 +32892,8 @@ int lua_cocos2dx_ui_Scale9Sprite_createWithSpriteFrameName(lua_State* tolua_S)
     {
         if (argc == 1)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Scale9Sprite:createWithSpriteFrameName");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.Scale9Sprite:createWithSpriteFrameName");
             if (!ok) { break; }
             cocos2d::ui::Scale9Sprite* ret = cocos2d::ui::Scale9Sprite::createWithSpriteFrameName(arg0);
             object_to_luaval<cocos2d::ui::Scale9Sprite>(tolua_S, "ccui.Scale9Sprite",(cocos2d::ui::Scale9Sprite*)ret);
@@ -33431,8 +33431,8 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndBackgroundSprite(lua_State* tolua_S)
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndBackgroundSprite");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndBackgroundSprite");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndBackgroundSprite");
 
             if (!ok) { break; }
             bool ret = cobj->initWithSizeAndBackgroundSprite(arg0, arg1);
@@ -33447,8 +33447,8 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndBackgroundSprite(lua_State* tolua_S)
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndBackgroundSprite");
 
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndBackgroundSprite");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndBackgroundSprite");
 
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg2;
@@ -34012,9 +34012,9 @@ int lua_cocos2dx_ui_EditBox_loadTextureDisabled(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureDisabled");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_loadTextureDisabled'", nullptr);
@@ -34026,10 +34026,10 @@ int lua_cocos2dx_ui_EditBox_loadTextureDisabled(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureDisabled");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureDisabled");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.EditBox:loadTextureDisabled");
         if(!ok)
@@ -34532,9 +34532,9 @@ int lua_cocos2dx_ui_EditBox_loadTexturePressed(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTexturePressed");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_loadTexturePressed'", nullptr);
@@ -34546,10 +34546,10 @@ int lua_cocos2dx_ui_EditBox_loadTexturePressed(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTexturePressed");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTexturePressed");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.EditBox:loadTexturePressed");
         if(!ok)
@@ -34694,11 +34694,11 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndTexture(lua_State* tolua_S)
     if (argc == 2) 
     {
         cocos2d::Size arg0;
-        std::string arg1;
+        std::string_view arg1;
 
         ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_initWithSizeAndTexture'", nullptr);
@@ -34711,14 +34711,14 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndTexture(lua_State* tolua_S)
     if (argc == 3) 
     {
         cocos2d::Size arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg1;
+        std::string_view arg2;
 
         ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_initWithSizeAndTexture'", nullptr);
@@ -34731,17 +34731,17 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndTexture(lua_State* tolua_S)
     if (argc == 4) 
     {
         cocos2d::Size arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
 
         ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.EditBox:initWithSizeAndTexture");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_initWithSizeAndTexture'", nullptr);
@@ -34754,18 +34754,18 @@ int lua_cocos2dx_ui_EditBox_initWithSizeAndTexture(lua_State* tolua_S)
     if (argc == 5) 
     {
         cocos2d::Size arg0;
-        std::string arg1;
-        std::string arg2;
-        std::string arg3;
+        std::string_view arg1;
+        std::string_view arg2;
+        std::string_view arg3;
         cocos2d::ui::Widget::TextureResType arg4;
 
         ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:initWithSizeAndTexture");
 
-        ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.EditBox:initWithSizeAndTexture");
+        ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.EditBox:initWithSizeAndTexture");
 
         ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "ccui.EditBox:initWithSizeAndTexture");
         if(!ok)
@@ -35003,12 +35003,12 @@ int lua_cocos2dx_ui_EditBox_loadTextures(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_loadTextures'", nullptr);
@@ -35020,15 +35020,15 @@ int lua_cocos2dx_ui_EditBox_loadTextures(lua_State* tolua_S)
     }
     if (argc == 3) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:loadTextures");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_loadTextures'", nullptr);
@@ -35040,16 +35040,16 @@ int lua_cocos2dx_ui_EditBox_loadTextures(lua_State* tolua_S)
     }
     if (argc == 4) 
     {
-        std::string arg0;
-        std::string arg1;
-        std::string arg2;
+        std::string_view arg0;
+        std::string_view arg1;
+        std::string_view arg2;
         cocos2d::ui::Widget::TextureResType arg3;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:loadTextures");
 
-        ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:loadTextures");
+        ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:loadTextures");
 
         ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.EditBox:loadTextures");
         if(!ok)
@@ -35249,9 +35249,9 @@ int lua_cocos2dx_ui_EditBox_loadTextureNormal(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureNormal");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_EditBox_loadTextureNormal'", nullptr);
@@ -35263,10 +35263,10 @@ int lua_cocos2dx_ui_EditBox_loadTextureNormal(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
+        std::string_view arg0;
         cocos2d::ui::Widget::TextureResType arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureNormal");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.EditBox:loadTextureNormal");
 
         ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.EditBox:loadTextureNormal");
         if(!ok)
@@ -35709,8 +35709,8 @@ int lua_cocos2dx_ui_EditBox_create(lua_State* tolua_S)
             cocos2d::Size arg0;
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg2;
             ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.EditBox:create");
@@ -35785,8 +35785,8 @@ int lua_cocos2dx_ui_EditBox_create(lua_State* tolua_S)
             cocos2d::Size arg0;
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:create");
             if (!ok) { break; }
             cocos2d::ui::EditBox* ret = cocos2d::ui::EditBox::create(arg0, arg1);
             object_to_luaval<cocos2d::ui::EditBox>(tolua_S, "ccui.EditBox",(cocos2d::ui::EditBox*)ret);
@@ -35801,11 +35801,11 @@ int lua_cocos2dx_ui_EditBox_create(lua_State* tolua_S)
             cocos2d::Size arg0;
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:create");
             if (!ok) { break; }
             cocos2d::ui::EditBox* ret = cocos2d::ui::EditBox::create(arg0, arg1, arg2);
             object_to_luaval<cocos2d::ui::EditBox>(tolua_S, "ccui.EditBox",(cocos2d::ui::EditBox*)ret);
@@ -35820,14 +35820,14 @@ int lua_cocos2dx_ui_EditBox_create(lua_State* tolua_S)
             cocos2d::Size arg0;
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.EditBox:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.EditBox:create");
             if (!ok) { break; }
             cocos2d::ui::EditBox* ret = cocos2d::ui::EditBox::create(arg0, arg1, arg2, arg3);
             object_to_luaval<cocos2d::ui::EditBox>(tolua_S, "ccui.EditBox",(cocos2d::ui::EditBox*)ret);
@@ -35842,14 +35842,14 @@ int lua_cocos2dx_ui_EditBox_create(lua_State* tolua_S)
             cocos2d::Size arg0;
             ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.EditBox:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.EditBox:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.EditBox:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.EditBox:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.EditBox:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg4;
             ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "ccui.EditBox:create");
@@ -36352,8 +36352,8 @@ int lua_cocos2dx_ui_LayoutComponent_getSize(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_LayoutComponent_getSize'", nullptr);
             return 0;
         }
-        const cocos2d::Size& ret = cobj->getSize();
-        size_to_luaval(tolua_S, ret);
+        const cocos2d::Vec2& ret = cobj->getSize();
+        vec2_to_luaval(tolua_S, ret);
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutComponent:getSize",argc, 0);
@@ -38331,9 +38331,9 @@ int lua_cocos2dx_ui_LayoutComponent_setSize(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        cocos2d::Size arg0;
+        cocos2d::Vec2 arg0;
 
-        ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.LayoutComponent:setSize");
+        ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.LayoutComponent:setSize");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_LayoutComponent_setSize'", nullptr);
@@ -38611,8 +38611,8 @@ int lua_cocos2dx_ui_TabHeader_getTitleText(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TabHeader_getTitleText'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getTitleText();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTitleText();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TabHeader:getTitleText",argc, 0);
@@ -38703,9 +38703,9 @@ int lua_cocos2dx_ui_TabHeader_setTitleFontName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:setTitleFontName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:setTitleFontName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TabHeader_setTitleFontName'", nullptr);
@@ -38805,8 +38805,8 @@ int lua_cocos2dx_ui_TabHeader_getTitleFontName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TabHeader_getTitleFontName'", nullptr);
             return 0;
         }
-        std::string ret = cobj->getTitleFontName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getTitleFontName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TabHeader:getTitleFontName",argc, 0);
@@ -38941,9 +38941,9 @@ int lua_cocos2dx_ui_TabHeader_setTitleText(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:setTitleText");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:setTitleText");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_TabHeader_setTitleText'", nullptr);
@@ -39031,14 +39031,14 @@ int lua_cocos2dx_ui_TabHeader_create(lua_State* tolua_S)
     {
         if (argc == 3)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TabHeader:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.TabHeader:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.TabHeader:create");
             if (!ok) { break; }
             cocos2d::ui::TabHeader* ret = cocos2d::ui::TabHeader::create(arg0, arg1, arg2);
             object_to_luaval<cocos2d::ui::TabHeader>(tolua_S, "ccui.TabHeader",(cocos2d::ui::TabHeader*)ret);
@@ -39050,14 +39050,14 @@ int lua_cocos2dx_ui_TabHeader_create(lua_State* tolua_S)
     {
         if (argc == 4)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TabHeader:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.TabHeader:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.TabHeader:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg3;
             ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TabHeader:create");
@@ -39082,23 +39082,23 @@ int lua_cocos2dx_ui_TabHeader_create(lua_State* tolua_S)
     {
         if (argc == 6)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TabHeader:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.TabHeader:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.TabHeader:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TabHeader:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg5;
-            ok &= luaval_to_std_string(tolua_S, 7,&arg5, "ccui.TabHeader:create");
+            std::string_view arg5;
+            ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "ccui.TabHeader:create");
             if (!ok) { break; }
             cocos2d::ui::TabHeader* ret = cocos2d::ui::TabHeader::create(arg0, arg1, arg2, arg3, arg4, arg5);
             object_to_luaval<cocos2d::ui::TabHeader>(tolua_S, "ccui.TabHeader",(cocos2d::ui::TabHeader*)ret);
@@ -39110,23 +39110,23 @@ int lua_cocos2dx_ui_TabHeader_create(lua_State* tolua_S)
     {
         if (argc == 7)
         {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TabHeader:create");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg1;
-            ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TabHeader:create");
+            std::string_view arg1;
+            ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg2;
-            ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.TabHeader:create");
+            std::string_view arg2;
+            ok &= luaval_to_std_string_view(tolua_S, 4,&arg2, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg3;
-            ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.TabHeader:create");
+            std::string_view arg3;
+            ok &= luaval_to_std_string_view(tolua_S, 5,&arg3, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg4;
-            ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TabHeader:create");
+            std::string_view arg4;
+            ok &= luaval_to_std_string_view(tolua_S, 6,&arg4, "ccui.TabHeader:create");
             if (!ok) { break; }
-            std::string arg5;
-            ok &= luaval_to_std_string(tolua_S, 7,&arg5, "ccui.TabHeader:create");
+            std::string_view arg5;
+            ok &= luaval_to_std_string_view(tolua_S, 7,&arg5, "ccui.TabHeader:create");
             if (!ok) { break; }
             cocos2d::ui::Widget::TextureResType arg6;
             ok &= luaval_to_int32(tolua_S, 8,(int *)&arg6, "ccui.TabHeader:create");
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_video_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_video_auto.cpp
index d01c83a464c7..eecb3ef9a9ec 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_video_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_video_auto.cpp
@@ -36,8 +36,8 @@ int lua_cocos2dx_video_VideoPlayer_getFileName(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_video_VideoPlayer_getFileName'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getFileName();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getFileName();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.VideoPlayer:getFileName",argc, 0);
@@ -83,8 +83,8 @@ int lua_cocos2dx_video_VideoPlayer_getURL(lua_State* tolua_S)
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_video_VideoPlayer_getURL'", nullptr);
             return 0;
         }
-        const std::string& ret = cobj->getURL();
-        lua_pushlstring(tolua_S,ret.c_str(),ret.length());
+        std::string_view ret = cobj->getURL();
+        lua_pushlstring(tolua_S,ret.data(),ret.length());
         return 1;
     }
     luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.VideoPlayer:getURL",argc, 0);
@@ -366,9 +366,9 @@ int lua_cocos2dx_video_VideoPlayer_setFileName(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.VideoPlayer:setFileName");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.VideoPlayer:setFileName");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_video_VideoPlayer_setFileName'", nullptr);
@@ -416,9 +416,9 @@ int lua_cocos2dx_video_VideoPlayer_setURL(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.VideoPlayer:setURL");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.VideoPlayer:setURL");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_video_VideoPlayer_setURL'", nullptr);
diff --git a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_webview_auto.cpp b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_webview_auto.cpp
index 887d6cf0ac7c..378f246d8631 100644
--- a/extensions/scripting/lua-bindings/auto/lua_cocos2dx_webview_auto.cpp
+++ b/extensions/scripting/lua-bindings/auto/lua_cocos2dx_webview_auto.cpp
@@ -128,9 +128,9 @@ int lua_cocos2dx_webview_WebView_loadHTMLString(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:loadHTMLString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:loadHTMLString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_webview_WebView_loadHTMLString'", nullptr);
@@ -142,12 +142,12 @@ int lua_cocos2dx_webview_WebView_loadHTMLString(lua_State* tolua_S)
     }
     if (argc == 2) 
     {
-        std::string arg0;
-        std::string arg1;
+        std::string_view arg0;
+        std::string_view arg1;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:loadHTMLString");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:loadHTMLString");
 
-        ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.WebView:loadHTMLString");
+        ok &= luaval_to_std_string_view(tolua_S, 3,&arg1, "ccui.WebView:loadHTMLString");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_webview_WebView_loadHTMLString'", nullptr);
@@ -339,9 +339,9 @@ int lua_cocos2dx_webview_WebView_loadFile(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:loadFile");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:loadFile");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_webview_WebView_loadFile'", nullptr);
@@ -384,8 +384,8 @@ int lua_cocos2dx_webview_WebView_loadURL(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     do{
         if (argc == 2) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:loadURL");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:loadURL");
 
             if (!ok) { break; }
             bool arg1;
@@ -400,8 +400,8 @@ int lua_cocos2dx_webview_WebView_loadURL(lua_State* tolua_S)
     ok  = true;
     do{
         if (argc == 1) {
-            std::string arg0;
-            ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:loadURL");
+            std::string_view arg0;
+            ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:loadURL");
 
             if (!ok) { break; }
             cobj->loadURL(arg0);
@@ -498,9 +498,9 @@ int lua_cocos2dx_webview_WebView_evaluateJS(lua_State* tolua_S)
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:evaluateJS");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:evaluateJS");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_webview_WebView_evaluateJS'", nullptr);
@@ -830,9 +830,9 @@ int lua_cocos2dx_webview_WebView_setJavascriptInterfaceScheme(lua_State* tolua_S
     argc = lua_gettop(tolua_S)-1;
     if (argc == 1) 
     {
-        std::string arg0;
+        std::string_view arg0;
 
-        ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.WebView:setJavascriptInterfaceScheme");
+        ok &= luaval_to_std_string_view(tolua_S, 2,&arg0, "ccui.WebView:setJavascriptInterfaceScheme");
         if(!ok)
         {
             tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_webview_WebView_setJavascriptInterfaceScheme'", nullptr);
diff --git a/extensions/scripting/lua-bindings/manual/CCComponentLua.cpp b/extensions/scripting/lua-bindings/manual/CCComponentLua.cpp
index 1118e57d2d8c..31560146efa4 100644
--- a/extensions/scripting/lua-bindings/manual/CCComponentLua.cpp
+++ b/extensions/scripting/lua-bindings/manual/CCComponentLua.cpp
@@ -41,7 +41,7 @@ const std::string ComponentLua::UPDATE   = "update";
 
 namespace
 {
-void adjustScriptFileName(std::string& scriptFileName)
+void adjustScriptFileName(std::string_view& scriptFileName, std::string& holder)
 {
     assert(scriptFileName.size() > 4);
 
@@ -54,22 +54,26 @@ void adjustScriptFileName(std::string& scriptFileName)
 
     // xxx.lua -> xxx.luac or
     // xxx.luac -> xxx.lua
-    if (scriptFileName.compare(scriptFileName.size() - luaSuffix.size(), luaSuffix.size(), luaSuffix) == 0)
-        scriptFileName.replace(scriptFileName.size() - luaSuffix.size(), luaSuffix.size(), luacSuffix);
+    holder = scriptFileName;
+    if (holder.compare(holder.size() - luaSuffix.size(), luaSuffix.size(), luaSuffix) == 0)
+        holder.replace(holder.size() - luaSuffix.size(), luaSuffix.size(), luacSuffix);
     else
-        scriptFileName.replace(scriptFileName.size() - luacSuffix.size(), luacSuffix.size(), luaSuffix);
+        holder.replace(holder.size() - luacSuffix.size(), luacSuffix.size(), luaSuffix);
+
+    scriptFileName = holder;
 }
 }  // namespace
 
 int ComponentLua::_index = 0;
 
-ComponentLua* ComponentLua::create(const std::string& scriptFileName)
+ComponentLua* ComponentLua::create(std::string_view scriptFileName)
 {
     CC_ASSERT(!scriptFileName.empty());
 
     initClass();
 
-    adjustScriptFileName(const_cast<std::string&>(scriptFileName));
+    std::string holder;
+    adjustScriptFileName(scriptFileName, holder);
     auto componentLua = new ComponentLua(scriptFileName);
     if (componentLua)
     {
@@ -79,7 +83,7 @@ ComponentLua* ComponentLua::create(const std::string& scriptFileName)
     return componentLua;
 }
 
-ComponentLua::ComponentLua(const std::string& scriptFileName)
+ComponentLua::ComponentLua(std::string_view scriptFileName)
     : _scriptFileName(scriptFileName), _table(nullptr), _strIndex("")
 {
     _succeedLoadingScript = loadAndExecuteScript();
@@ -134,18 +138,18 @@ void ComponentLua::onExit()
     }
 }
 
-bool ComponentLua::getLuaFunction(const std::string& functionName)
+bool ComponentLua::getLuaFunction(std::string_view functionName)
 {
     lua_State* l = LuaEngine::getInstance()->getLuaStack()->getLuaState();
 
-    lua_pushstring(l, KEY_COMPONENT);         // stack: "component"
-    lua_rawget(l, LUA_REGISTRYINDEX);         // stack: table_of_component
-    lua_pushstring(l, _strIndex.c_str());     // stack: table_of_component strIndex
-    lua_rawget(l, -2);                        // stack: table_of_component table_of_this
-    lua_pushstring(l, functionName.c_str());  // stack: table_of_component table_of_this "update"
-    lua_rawget(l, -2);                        // stack: table_of_component table_of_this table_of_this["update"]
-    lua_remove(l, -2);                        // stack: table_of_component table_of_this["update"]
-    lua_remove(l, -2);                        // stack: table_of_this["update"]
+    lua_pushstring(l, KEY_COMPONENT);                                // stack: "component"
+    lua_rawget(l, LUA_REGISTRYINDEX);                                // stack: table_of_component
+    lua_pushstring(l, _strIndex.c_str());                            // stack: table_of_component strIndex
+    lua_rawget(l, -2);                                               // stack: table_of_component table_of_this
+    lua_pushlstring(l, functionName.data(), functionName.length());  // stack: table_of_component table_of_this "update"
+    lua_rawget(l, -2);  // stack: table_of_component table_of_this table_of_this["update"]
+    lua_remove(l, -2);  // stack: table_of_component table_of_this["update"]
+    lua_remove(l, -2);  // stack: table_of_this["update"]
 
     int type = lua_type(l, -1);
     //    if (type != LUA_TFUNCTION)
diff --git a/extensions/scripting/lua-bindings/manual/CCComponentLua.h b/extensions/scripting/lua-bindings/manual/CCComponentLua.h
index 4a2425987b7c..5f17a086d351 100644
--- a/extensions/scripting/lua-bindings/manual/CCComponentLua.h
+++ b/extensions/scripting/lua-bindings/manual/CCComponentLua.h
@@ -34,9 +34,9 @@ NS_CC_BEGIN
 class ComponentLua : public Component
 {
 public:
-    static ComponentLua* create(const std::string& scriptFileName);
+    static ComponentLua* create(std::string_view scriptFileName);
 
-    ComponentLua(const std::string& scriptFileName);
+    ComponentLua(std::string_view scriptFileName);
     /**
      * This function is used to be invoked from lua side to get the corresponding script object of this component.
      */
@@ -52,7 +52,7 @@ class ComponentLua : public Component
     bool loadAndExecuteScript();
     void getUserData();
     void storeLuaTable();
-    bool getLuaFunction(const std::string& functionName);
+    bool getLuaFunction(std::string_view functionName);
     void removeLuaTable();
 
     static void initClass();
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaEngine.cpp b/extensions/scripting/lua-bindings/manual/CCLuaEngine.cpp
index c474533f3c99..1e8453995300 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaEngine.cpp
+++ b/extensions/scripting/lua-bindings/manual/CCLuaEngine.cpp
@@ -174,7 +174,7 @@ int LuaEngine::reallocateScriptHandler(int nHandler)
     return nRet;
 }
 
-bool LuaEngine::parseConfig(ConfigType type, const std::string& str)
+bool LuaEngine::parseConfig(ConfigType type, std::string_view str)
 {
     lua_getglobal(_stack->getLuaState(), "__onParseConfig");
     if (!lua_isfunction(_stack->getLuaState(), -1))
@@ -185,7 +185,7 @@ bool LuaEngine::parseConfig(ConfigType type, const std::string& str)
     }
 
     _stack->pushInt((int)type);
-    _stack->pushString(str.c_str());
+    _stack->pushString(str.data(), str.length());
 
     return _stack->executeFunction(2);
 }
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaEngine.h b/extensions/scripting/lua-bindings/manual/CCLuaEngine.h
index dbaf44d04c30..233543b72f54 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaEngine.h
+++ b/extensions/scripting/lua-bindings/manual/CCLuaEngine.h
@@ -188,7 +188,7 @@ class CC_LUA_DLL LuaEngine : public ScriptEngineProtocol
      * @return if __onParseConfig function exist in the Lua, it return the value that _stack->executeFunction returns
      * otherwise return false.
      */
-    virtual bool parseConfig(ConfigType type, const std::string& str) override;
+    virtual bool parseConfig(ConfigType type, std::string_view str) override;
 
     /**
      * When some events triggered in the c++ also needs to pass on to lua to handle, we could call this function to send
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaStack.cpp b/extensions/scripting/lua-bindings/manual/CCLuaStack.cpp
index 1160d1ab9a0f..aef8cb70768b 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaStack.cpp
+++ b/extensions/scripting/lua-bindings/manual/CCLuaStack.cpp
@@ -294,9 +294,9 @@ void LuaStack::pushBoolean(bool boolValue)
     lua_pushboolean(_state, boolValue);
 }
 
-void LuaStack::pushString(const char* stringValue)
+void LuaStack::pushString(std::string_view stringValue)
 {
-    lua_pushstring(_state, stringValue);
+    lua_pushlstring(_state, stringValue.data(), stringValue.length());
 }
 
 void LuaStack::pushString(const char* stringValue, int length)
@@ -331,7 +331,7 @@ void LuaStack::pushLuaValue(const LuaValue& value)
     }
     else if (type == LuaValueTypeString)
     {
-        return pushString(value.stringValue().c_str());
+        return pushString(value.stringValue());
     }
     else if (type == LuaValueTypeDict)
     {
@@ -343,7 +343,7 @@ void LuaStack::pushLuaValue(const LuaValue& value)
     }
     else if (type == LuaValueTypeObject)
     {
-        pushObject(value.ccobjectValue(), value.getObjectTypename().c_str());
+        pushObject(value.ccobjectValue(), value.getObjectTypename().data());
     }
 }
 
@@ -352,9 +352,9 @@ void LuaStack::pushLuaValueDict(const LuaValueDict& dict)
     lua_newtable(_state); /* L: table */
     for (LuaValueDictIterator it = dict.begin(); it != dict.end(); ++it)
     {
-        lua_pushstring(_state, it->first.c_str()); /* L: table key */
-        pushLuaValue(it->second);                  /* L: table key value */
-        lua_rawset(_state, -3);                    /* table.key = value, L: table */
+        lua_pushlstring(_state, it->first.c_str(), it->first.length()); /* L: table key */
+        pushLuaValue(it->second);                                       /* L: table key value */
+        lua_rawset(_state, -3);                                         /* table.key = value, L: table */
     }
 }
 
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaStack.h b/extensions/scripting/lua-bindings/manual/CCLuaStack.h
index cd01e56d8f67..e55313b03fd5 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaStack.h
+++ b/extensions/scripting/lua-bindings/manual/CCLuaStack.h
@@ -184,7 +184,7 @@ class LuaStack : public Ref
      *
      * @param stringValue a pointer point to a zero-terminated string stringValue.
      */
-    virtual void pushString(const char* stringValue);
+    virtual void pushString(std::string_view stringValue);
 
     /**
      * Pushes the string pointed to by stringValue with size length onto the stack.
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaValue.cpp b/extensions/scripting/lua-bindings/manual/CCLuaValue.cpp
index 6bb23e16e167..6e2112c5e1d8 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaValue.cpp
+++ b/extensions/scripting/lua-bindings/manual/CCLuaValue.cpp
@@ -60,7 +60,7 @@ const LuaValue LuaValue::stringValue(const char* stringValue)
     return value;
 }
 
-const LuaValue LuaValue::stringValue(const std::string& stringValue)
+const LuaValue LuaValue::stringValue(std::string_view stringValue)
 {
     LuaValue value;
     value._type              = LuaValueTypeString;
@@ -94,9 +94,9 @@ const LuaValue LuaValue::ccobjectValue(Ref* ccobjectValue, const char* objectTyp
     return value;
 }
 
-const LuaValue LuaValue::ccobjectValue(Ref* ccobjectValue, const std::string& objectTypename)
+const LuaValue LuaValue::ccobjectValue(Ref* ccobjectValue, std::string_view objectTypename)
 {
-    return LuaValue::ccobjectValue(ccobjectValue, objectTypename.c_str());
+    return LuaValue::ccobjectValue(ccobjectValue, objectTypename.data());
 }
 
 LuaValue::LuaValue(const LuaValue& rhs)
diff --git a/extensions/scripting/lua-bindings/manual/CCLuaValue.h b/extensions/scripting/lua-bindings/manual/CCLuaValue.h
index 0997bdbf43d2..8b918263e136 100644
--- a/extensions/scripting/lua-bindings/manual/CCLuaValue.h
+++ b/extensions/scripting/lua-bindings/manual/CCLuaValue.h
@@ -135,7 +135,7 @@ class LuaValue
      * @param stringValue a std::string object.
      * @return a LuaValue object.
      */
-    static const LuaValue stringValue(const std::string& stringValue);
+    static const LuaValue stringValue(std::string_view stringValue);
 
     /**
      * Construct a LuaValue object by a LuaValueDict value.
@@ -169,7 +169,7 @@ class LuaValue
      * @param objectTypename a std::string object represent the typename of object.
      * @return a LuaValue object.
      */
-    static const LuaValue ccobjectValue(Ref* ccobjectValue, const std::string& objectTypename);
+    static const LuaValue ccobjectValue(Ref* ccobjectValue, std::string_view objectTypename);
 
     /**
      * Default constructor of LuaValue.
@@ -204,7 +204,7 @@ class LuaValue
      *
      * @return the reference of _ccobjectType.
      */
-    const std::string& getObjectTypename() const { return *_ccobjectType; }
+    std::string_view getObjectTypename() const { return *_ccobjectType; }
 
     /**
      * Get the int value of LuaValue object.
@@ -232,7 +232,7 @@ class LuaValue
      *
      * @return the reference about string value.
      */
-    const std::string& stringValue() const { return *_field.stringValue; }
+    std::string_view stringValue() const { return *_field.stringValue; }
 
     /**
      * Get the LuaValueDict value of LuaValue object.
diff --git a/extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp
index eba25e98e18a..a17f5ee6a7b3 100644
--- a/extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp
+++ b/extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp
@@ -1564,6 +1564,47 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector<std::string>*
     return ok;
 }
 
+bool luaval_to_std_vector_string_view(lua_State* L, int lo, std::vector<std::string_view>* ret, const char* funcName)
+{
+    if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
+        return false;
+
+    tolua_Error tolua_err;
+    bool ok = true;
+    if (!tolua_istable(L, lo, 0, &tolua_err))
+    {
+#if COCOS2D_DEBUG >= 1
+        luaval_to_native_err(L, "#ferror:", &tolua_err, funcName);
+#endif
+        ok = false;
+    }
+
+    if (ok)
+    {
+        size_t len             = lua_objlen(L, lo);
+        std::string_view value = "";
+        for (size_t i = 0; i < len; i++)
+        {
+            lua_pushnumber(L, i + 1);
+            lua_gettable(L, lo);
+            if (lua_isstring(L, -1))
+            {
+                ok = luaval_to_std_string_view(L, -1, &value);
+                if (ok)
+                    ret->push_back(value);
+            }
+            else
+            {
+                CCASSERT(false, "string type is needed");
+            }
+
+            lua_pop(L, 1);
+        }
+    }
+
+    return ok;
+}
+
 bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector<int>* ret, const char* funcName)
 {
     if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
@@ -2402,7 +2443,7 @@ void ccvalue_to_luaval(lua_State* L, const cocos2d::Value& inValue)
         lua_pushinteger(L, obj.asInt64());
         break;
     case Value::Type::STRING:
-        lua_pushstring(L, obj.asStringRef().c_str());
+        lua_pushstring(L, obj.asStringRef().data());
         break;
     case Value::Type::VECTOR:
         ccvaluevector_to_luaval(L, obj.asValueVector());
@@ -2527,7 +2568,7 @@ void ccvaluemapintkey_to_luaval(lua_State* L, const cocos2d::ValueMapIntKey& inV
         case Value::Type::STRING:
         {
             lua_pushstring(L, key.c_str());
-            lua_pushstring(L, obj.asStringRef().c_str());
+            lua_pushstring(L, obj.asStringRef().data());
             lua_rawset(L, -3);
         }
         break;
@@ -2725,10 +2766,10 @@ void ccvector_std_string_to_luaval(lua_State* L, const std::vector<std::string>&
 
     int index = 1;
 
-    for (const std::string& value : inValue)
+    for (std::string_view value : inValue)
     {
         lua_pushnumber(L, (lua_Number)index);
-        lua_pushstring(L, value.c_str());
+        lua_pushlstring(L, value.data(), value.length());
         lua_rawset(L, -3);
         ++index;
     }
@@ -2858,10 +2899,7 @@ void std_map_string_string_to_luaval(lua_State* L, const std::map<std::string, s
     }
 }
 
-bool luaval_to_std_map_string_string(lua_State* L,
-                                     int lo,
-                                     std::map<std::string, std::string>* ret,
-                                     const char* funcName)
+bool luaval_to_std_map_string_string(lua_State* L, int lo, hlookup::string_map<std::string>* ret, const char* funcName)
 {
     if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
         return false;
@@ -2880,15 +2918,15 @@ bool luaval_to_std_map_string_string(lua_State* L,
         return ok;
 
     lua_pushnil(L);
-    std::string key;
-    std::string value;
+    std::string_view key;
+    std::string_view value;
     while (lua_next(L, lo) != 0)
     {
         if (lua_isstring(L, -2) && lua_isstring(L, -1))
         {
-            if (luaval_to_std_string(L, -2, &key) && luaval_to_std_string(L, -1, &value))
+            if (luaval_to_std_string_view(L, -2, &key) && luaval_to_std_string_view(L, -1, &value))
             {
-                (*ret)[key] = value;
+                ret->emplace(key, value);  // (*ret)[key] = value;
             }
         }
         else
@@ -3022,8 +3060,7 @@ void uniformLocation_to_luaval(lua_State* L, const cocos2d::backend::UniformLoca
     lua_rawset(L, -3);
 }
 
-void program_activeattrs_to_luaval(lua_State* L,
-                                   const std::unordered_map<std::string, cocos2d::backend::AttributeBindInfo>& attrs)
+void program_activeattrs_to_luaval(lua_State* L, const hlookup::string_map<cocos2d::backend::AttributeBindInfo>& attrs)
 {
     if (L == nullptr)
         return;
diff --git a/extensions/scripting/lua-bindings/manual/LuaBasicConversions.h b/extensions/scripting/lua-bindings/manual/LuaBasicConversions.h
index a754959def03..d6665b5a7028 100644
--- a/extensions/scripting/lua-bindings/manual/LuaBasicConversions.h
+++ b/extensions/scripting/lua-bindings/manual/LuaBasicConversions.h
@@ -594,6 +594,11 @@ CC_LUA_DLL bool luaval_to_std_vector_string(lua_State* L,
                                             std::vector<std::string>* ret,
                                             const char* funcName = "");
 
+CC_LUA_DLL bool luaval_to_std_vector_string_view(lua_State* L,
+                                                 int lo,
+                                                 std::vector<std::string_view>* ret,
+                                                 const char* funcName = "");
+
 /**
  * Get a pointer points to a std::vector<std::int> from a Lua array table in the stack.
  *
@@ -870,7 +875,7 @@ extern bool luaval_to_std_vector_vec3(lua_State* L, int lo, std::vector<cocos2d:
 
 extern bool luaval_to_std_map_string_string(lua_State* L,
                                             int lo,
-                                            std::map<std::string, std::string>* ret,
+                                            hlookup::string_map<std::string>* ret,
                                             const char* funcName);
 
 /**@}**/
@@ -1140,7 +1145,7 @@ void ccvector_to_luaval(lua_State* L, const cocos2d::Vector<T>& inValue)
  * @param v a cocos2d::Map object.
  */
 template <class T>
-void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::Map<std::string, T>& v)
+void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::StringMap<T>& v)
 {
     lua_newtable(L);
 
@@ -1149,8 +1154,8 @@ void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::Map<std::string, T>
 
     for (auto iter = v.begin(); iter != v.end(); ++iter)
     {
-        std::string key = iter->first;
-        T obj           = iter->second;
+        auto& key = iter->first;
+        T obj     = iter->second;
         if (nullptr != dynamic_cast<cocos2d::Ref*>(obj))
         {
             auto name     = reinterpret_cast<uintptr_t>(typeid(*obj).name());
@@ -1360,9 +1365,8 @@ CC_LUA_DLL bool luaval_to_uniformLocation(lua_State* L,
  */
 CC_LUA_DLL void uniformLocation_to_luaval(lua_State* L, const cocos2d::backend::UniformLocation& desc);
 
-CC_LUA_DLL void program_activeattrs_to_luaval(
-    lua_State* L,
-    const std::unordered_map<std::string, cocos2d::backend::AttributeBindInfo>& map);
+CC_LUA_DLL void program_activeattrs_to_luaval(lua_State* L,
+                                              const hlookup::string_map<cocos2d::backend::AttributeBindInfo>& map);
 
 // end group
 /// @}
diff --git a/extensions/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp b/extensions/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp
index 7274d4866458..a43793b275cf 100644
--- a/extensions/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp
+++ b/extensions/scripting/lua-bindings/manual/audioengine/lua_cocos2dx_audioengine_manual.cpp
@@ -269,11 +269,11 @@ int lua_cocos2dx_audioengine_AudioEngine_setFinishCallback(lua_State* tolua_S)
 
         LUA_FUNCTION handler = (toluafix_ref_function(tolua_S, 3, 0));
 
-        cocos2d::AudioEngine::setFinishCallback(arg0, [=](int audioID, std::string filePath) {
+        cocos2d::AudioEngine::setFinishCallback(arg0, [=](int audioID, std::string_view filePath) {
             LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
 
             stack->pushInt(audioID);
-            stack->pushString(filePath.c_str());
+            stack->pushString(filePath);
 
             stack->executeFunctionByHandler(handler, 2);
 
diff --git a/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp b/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
index 963f1d2e159d..1b8eb8f218d7 100644
--- a/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
+++ b/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
@@ -4546,7 +4546,7 @@ EventListenerAcceleration* LuaEventListenerAcceleration::create()
     return eventAcceleration;
 }
 
-EventListenerCustom* LuaEventListenerCustom::create(const std::string& eventName)
+EventListenerCustom* LuaEventListenerCustom::create(std::string_view eventName)
 {
     EventListenerCustom* eventCustom = new EventListenerCustom();
     if (eventCustom->init(eventName, [=](EventCustom* event) {
@@ -6109,12 +6109,12 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S)
             handler = (toluafix_ref_function(tolua_S, 3, 0));
             ScriptHandlerMgr::getInstance()->addCustomHandler((void*)cobj, handler);
 
-            Console::Command outValue = {name, help, [=](int fd, const std::string& args) {
+            Console::Command outValue = {name, help, [=](int fd, std::string_view args) {
                                              auto stack = LuaEngine::getInstance()->getLuaStack();
                                              auto Ls    = stack->getLuaState();
                                              // lua-callback, the third param;
                                              tolua_pushnumber(Ls, fd);
-                                             tolua_pushstring(Ls, args.c_str());
+                                             tolua_pushstring(Ls, args.data());
 
                                              stack->executeFunctionByHandler(handler, 2);
                                          }};
@@ -6928,7 +6928,7 @@ int lua_cocos2dx_get_PolygonInfo_filename(lua_State* tolua_S)
         return 0;
     }
 #endif
-    tolua_pushcppstring(tolua_S, cobj->getFilename());
+    tolua_pushstring(tolua_S, cobj->getFilename().data());
     return 1;
 
 #if COCOS2D_DEBUG >= 1
@@ -7430,11 +7430,11 @@ static int tolua_cocos2d_utils_captureScreen(lua_State* tolua_S)
         LUA_FUNCTION handler = toluafix_ref_function(tolua_S, 2, 0);
         std::string fileName = tolua_tocppstring(tolua_S, 3, "");
         cocos2d::utils::captureScreen(
-            [=](bool succeed, const std::string& name) {
+            [=](bool succeed, std::string_view name) {
                 auto stack = LuaEngine::getInstance()->getLuaStack();
                 auto Ls    = stack->getLuaState();
                 tolua_pushboolean(Ls, succeed);
-                tolua_pushstring(Ls, name.c_str());
+                tolua_pushstring(Ls, name.data());
                 stack->executeFunctionByHandler(handler, 2);
                 toluafix_remove_function_by_refid(tolua_S, handler);
             },
diff --git a/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp b/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp
index ffca5eacff6f..d8ab149f92ca 100644
--- a/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp
+++ b/extensions/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp
@@ -44,7 +44,7 @@ NS_CC_BEGIN
 class LuaEventListenerCustom
 {
 public:
-    static EventListenerCustom* create(const std::string& eventName);
+    static EventListenerCustom* create(std::string_view eventName);
 };
 
 class LuaEventListenerAcceleration
diff --git a/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp b/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp
index be047e4b4b7e..3fa250fdb6c7 100644
--- a/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp
+++ b/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp
@@ -85,7 +85,7 @@ void CustomGUIReader::init(std::string& className, int createFunc, int setPropsF
     (*callbackMap)[className] = parseselector(CustomGUIReader::setCustomProps);
 }
 
-void CustomGUIReader::setCustomProps(const std::string& classType,
+void CustomGUIReader::setCustomProps(std::string_view classType,
                                      cocos2d::Ref* widget,
                                      const rapidjson::Value& customOptions)
 {
@@ -96,7 +96,7 @@ void CustomGUIReader::setCustomProps(const std::string& classType,
         customOptions.Accept(writer);
 
         auto stack = LuaEngine::getInstance()->getLuaStack();
-        stack->pushString(classType.c_str(), static_cast<int>(classType.size()));
+        stack->pushString(classType);
         stack->pushObject(widget, "cc.Ref");
         stack->pushString(buffer.GetString(), static_cast<int>(buffer.GetSize()));
         stack->executeFunctionByHandler(_setPropsFunc, 3);
diff --git a/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h b/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h
index 79c4ab3ec743..9c331a16fd19 100644
--- a/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h
+++ b/extensions/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h
@@ -43,7 +43,7 @@ class CustomGUIReader : public Ref
 
     Ref* createInstance();
 
-    void setCustomProps(const std::string& classType, cocos2d::Ref* widget, const rapidjson::Value& customOptions);
+    void setCustomProps(std::string_view classType, cocos2d::Ref* widget, const rapidjson::Value& customOptions);
 
 private:
     std::string _className;
diff --git a/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp b/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
index d063179bedc7..27e19dbf397a 100644
--- a/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
+++ b/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
@@ -112,11 +112,10 @@ static int lua_cocos2dx_ArmatureAnimation_setMovementEventCallFunc(lua_State* L)
                                                           ScriptHandlerMgr::HandlerType::ARMATURE_EVENT);
 
         self->setMovementEventCallFunc(
-            [=](Armature* armature, MovementEventType movementType, const std::string& movementID) {
+            [=](Armature* armature, MovementEventType movementType, std::string_view movementID) {
                 if (0 != handler)
                 {
-                    std::string strMovementID = movementID;
-                    LuaArmatureMovementEventData movementData(armature, (int)movementType, strMovementID);
+                    LuaArmatureMovementEventData movementData(armature, (int)movementType, movementID);
 
                     LuaArmatureWrapperEventData wrapperData(
                         LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::MOVEMENT_EVENT, (void*)&movementData);
@@ -188,22 +187,22 @@ static int lua_cocos2dx_ArmatureAnimation_setFrameEventCallFunc(lua_State* L)
         ScriptHandlerMgr::getInstance()->addObjectHandler((void*)wrapper, handler,
                                                           ScriptHandlerMgr::HandlerType::ARMATURE_EVENT);
 
-        self->setFrameEventCallFunc([=](cocostudio::Bone* bone, const std::string& frameEventName, int originFrameIndex,
-                                        int currentFrameIndex) {
-            if (0 != handler)
-            {
-                std::string strFrameEventName(frameEventName);
+        self->setFrameEventCallFunc(
+            [=](cocostudio::Bone* bone, std::string_view frameEventName, int originFrameIndex, int currentFrameIndex) {
+                if (0 != handler)
+                {
+                    std::string strFrameEventName(frameEventName);
 
-                LuaArmatureFrameEventData frameData(bone, frameEventName, originFrameIndex, currentFrameIndex);
+                    LuaArmatureFrameEventData frameData(bone, frameEventName, originFrameIndex, currentFrameIndex);
 
-                LuaArmatureWrapperEventData wrapperData(
-                    LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::FRAME_EVENT, (void*)&frameData);
+                    LuaArmatureWrapperEventData wrapperData(
+                        LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::FRAME_EVENT, (void*)&frameData);
 
-                BasicScriptData data((void*)vec.at(0), (void*)&wrapperData);
+                    BasicScriptData data((void*)vec.at(0), (void*)&wrapperData);
 
-                LuaEngine::getInstance()->handleEvent(ScriptHandlerMgr::HandlerType::ARMATURE_EVENT, (void*)&data);
-            }
-        });
+                    LuaEngine::getInstance()->handleEvent(ScriptHandlerMgr::HandlerType::ARMATURE_EVENT, (void*)&data);
+                }
+            });
 
         return 0;
     }
diff --git a/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp b/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp
index afd08dc0e5d9..422d717d843d 100644
--- a/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp
+++ b/extensions/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp
@@ -78,7 +78,7 @@ struct LuaArmatureMovementEventData
     int movementType;
     std::string movementID;
     
-    LuaArmatureMovementEventData(cocos2d::Ref* _objTarget, int _movementType,const std::string& _movementID):objTarget(_objTarget),movementType(_movementType),movementID(_movementID)
+    LuaArmatureMovementEventData(cocos2d::Ref* _objTarget, int _movementType,std::string_view _movementID):objTarget(_objTarget),movementType(_movementType),movementID(_movementID)
     {
     }
 };
@@ -90,7 +90,7 @@ struct LuaArmatureFrameEventData
     int originFrameIndex;
     int currentFrameIndex;
     
-    LuaArmatureFrameEventData( cocos2d::Ref* _objTarget, const std::string& _frameEventName, int _originFrameIndex, int _currentFrameIndex):objTarget(_objTarget), frameEventName(_frameEventName),originFrameIndex(_originFrameIndex), currentFrameIndex(_currentFrameIndex)
+    LuaArmatureFrameEventData( cocos2d::Ref* _objTarget, std::string_view _frameEventName, int _originFrameIndex, int _currentFrameIndex):objTarget(_objTarget), frameEventName(_frameEventName),originFrameIndex(_originFrameIndex), currentFrameIndex(_currentFrameIndex)
     {
     }
 };
diff --git a/extensions/scripting/lua-bindings/manual/network/lua_downloader.cpp b/extensions/scripting/lua-bindings/manual/network/lua_downloader.cpp
index 179eb45bf0ae..ba66c3442b40 100644
--- a/extensions/scripting/lua-bindings/manual/network/lua_downloader.cpp
+++ b/extensions/scripting/lua-bindings/manual/network/lua_downloader.cpp
@@ -270,27 +270,26 @@ static int lua_downloader_setOnTaskError(lua_State* L)
     luaL_argcheck(L, lua_isfunction(L, 2), 2, "should be a function");
     saveCallback(L, d, "setOnTaskError");
 
-    d->setOnTaskError(
-        [d, L](const DownloadTask& task, int errorCode, int errorCodeInternal, const std::string& errorSt) {
-            int ret = getCallback(L, d, "setOnTaskError");  // stack callbackfn
-            if (ret)
-            {
-                pushTaskTable(L, task);  // stack callbackfn, task
-                lua_pushnumber(L, errorCode);
-                lua_pushnumber(L, errorCodeInternal);
-                lua_pushstring(L, errorSt.c_str());
-                if (lua_pcall(L, 4, 0, 0) != 0)
-                {
-                    lua_pop(L, 1);  // remove callback or nil
-                    luaL_error(L, "cc.Downloader.setOnTaskError invoke callback error!");
-                    return;
-                }
-            }
-            else
+    d->setOnTaskError([d, L](const DownloadTask& task, int errorCode, int errorCodeInternal, std::string_view errorSt) {
+        int ret = getCallback(L, d, "setOnTaskError");  // stack callbackfn
+        if (ret)
+        {
+            pushTaskTable(L, task);  // stack callbackfn, task
+            lua_pushnumber(L, errorCode);
+            lua_pushnumber(L, errorCodeInternal);
+            lua_pushlstring(L, errorSt.data(), errorSt.length());
+            if (lua_pcall(L, 4, 0, 0) != 0)
             {
                 lua_pop(L, 1);  // remove callback or nil
+                luaL_error(L, "cc.Downloader.setOnTaskError invoke callback error!");
+                return;
             }
-        });
+        }
+        else
+        {
+            lua_pop(L, 1);  // remove callback or nil
+        }
+    });
 
     return 0;
 }
diff --git a/extensions/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp b/extensions/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp
index b6b942c6e793..dce4f0d92ab5 100644
--- a/extensions/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp
+++ b/extensions/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp
@@ -76,16 +76,16 @@ class LuaMinXmlHttpRequest : public cocos2d::Ref
     inline int getReadyState() const { return _readyState; }
 
     inline cocos2d::network::HttpRequest* getHttpRequest() const { return _httpRequest; }
-    inline const std::string& getStatusText() const { return _statusText; }
+    inline std::string_view getStatusText() const { return _statusText; }
 
     inline void setStatus(int status) { _status = status; }
     inline int getStatus() { return _status; }
 
-    inline const std::string& getUrl() { return _url; }
-    inline void setUrl(const std::string& url) { _url = url; }
+    inline std::string_view getUrl() { return _url; }
+    inline void setUrl(std::string_view url) { _url = url; }
 
-    inline const std::string& getMethod() const { return _meth; }
-    inline void setMethod(const std::string& meth) { _meth = meth; }
+    inline std::string_view getMethod() const { return _meth; }
+    inline void setMethod(std::string_view meth) { _meth = meth; }
 
     inline void setAsync(bool isAsync) { _isAsync = isAsync; }
     inline void setIsNetWork(bool isNetWork) { _isNetwork = isNetWork; }
@@ -621,7 +621,8 @@ static int lua_get_XMLHttpRequest_statusText(lua_State* L)
     }
 #endif
 
-    lua_pushstring(L, self->getStatusText().c_str());
+    auto statusText = self->getStatusText();
+    lua_pushlstring(L, statusText.data(), statusText.length());
 
     return 1;
 
diff --git a/extensions/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm b/extensions/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm
index f28f8b47b280..b50ec4d916bf 100644
--- a/extensions/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm
+++ b/extensions/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,13 +22,12 @@ of this software and associated documentation files (the "Software"), to deal
  THE SOFTWARE.
  ****************************************************************************/
 
-
 #include "scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h"
 #include <Foundation/Foundation.h>
 
 NS_CC_BEGIN
 
-void LuaObjcBridge::luaopen_luaoc(lua_State *L)
+void LuaObjcBridge::luaopen_luaoc(lua_State* L)
 {
     s_luaState = L;
     lua_newtable(L);
@@ -38,39 +37,36 @@ of this software and associated documentation files (the "Software"), to deal
     lua_setglobal(L, "LuaObjcBridge");
 }
 
-
-static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSString *key){
-    NSMutableDictionary *dict2 = [[NSMutableDictionary alloc] init];
+static void luaTableToObjcDictionary(lua_State* L, NSMutableDictionary* dict, NSString* key)
+{
+    NSMutableDictionary* dict2 = [[NSMutableDictionary alloc] init];
     lua_pushnil(L);
-    while(lua_next(L, -2))
+    while (lua_next(L, -2))
     {
-        NSString *key2 = [NSString stringWithCString:lua_tostring(L, -2) encoding:NSUTF8StringEncoding];
-        
+        NSString* key2 = [NSString stringWithCString:lua_tostring(L, -2) encoding:NSUTF8StringEncoding];
+
         switch (lua_type(L, -1))
         {
-            case LUA_TNUMBER:
-                [dict2 setObject:[NSNumber numberWithFloat:lua_tonumber(L, -1)] forKey:key2];
-                break;
-                
-            case LUA_TBOOLEAN:
-                [dict2 setObject:[NSNumber numberWithBool:lua_toboolean(L, -1)] forKey:key2];
-                break;
-                
-            case LUA_TSTRING:
-                [dict2 setObject:[NSString stringWithCString:lua_tostring(L, -1) encoding:NSUTF8StringEncoding]
-                          forKey:key2];
-                break;
-            case LUA_TTABLE:
-                luaTableToObjcDictionary(L, dict2, key2);
-                break;
+        case LUA_TNUMBER:
+            [dict2 setObject:[NSNumber numberWithFloat:lua_tonumber(L, -1)] forKey:key2];
+            break;
+
+        case LUA_TBOOLEAN:
+            [dict2 setObject:[NSNumber numberWithBool:lua_toboolean(L, -1)] forKey:key2];
+            break;
+
+        case LUA_TSTRING:
+            [dict2 setObject:[NSString stringWithCString:lua_tostring(L, -1) encoding:NSUTF8StringEncoding]
+                      forKey:key2];
+            break;
+        case LUA_TTABLE:
+            luaTableToObjcDictionary(L, dict2, key2);
+            break;
         }
-        lua_pop(L,1);
+        lua_pop(L, 1);
     }
-    
-    
+
     [dict setObject:dict2 forKey:key];
-    
-    
 }
 
 /**
@@ -78,24 +74,24 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
  methodName
  args
  */
-int LuaObjcBridge::callObjcStaticMethod(lua_State *L)
+int LuaObjcBridge::callObjcStaticMethod(lua_State* L)
 {
     if (lua_gettop(L) != 3 || !lua_isstring(L, -3) || !lua_isstring(L, -2))
     {
-    	lua_pushboolean(L, 0);
-    	lua_pushinteger(L, kLuaBridgeErrorInvalidParameters);
-    	return 2;
+        lua_pushboolean(L, 0);
+        lua_pushinteger(L, kLuaBridgeErrorInvalidParameters);
+        return 2;
     }
-    
-    const char *className  = lua_tostring(L, -3);
-    const char *methodName = lua_tostring(L, -2);
+
+    const char* className  = lua_tostring(L, -3);
+    const char* methodName = lua_tostring(L, -2);
     if (!className || !methodName)
     {
         lua_pushboolean(L, 0);
         lua_pushinteger(L, kLuaBridgeErrorInvalidParameters);
         return 2;
     }
-    
+
     Class targetClass = NSClassFromString([NSString stringWithCString:className encoding:NSUTF8StringEncoding]);
     if (!targetClass)
     {
@@ -103,14 +99,14 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
         lua_pushinteger(L, kLuaBridgeErrorClassNotFound);
         return 2;
     }
-    
+
     SEL methodSel;
     bool hasArguments = lua_istable(L, -1);
     if (hasArguments)
     {
-        NSString *methodName_ = [NSString stringWithCString:methodName encoding:NSUTF8StringEncoding];
-        methodName_ = [NSString stringWithFormat:@"%@:", methodName_];
-        methodSel = NSSelectorFromString(methodName_);
+        NSString* methodName_ = [NSString stringWithCString:methodName encoding:NSUTF8StringEncoding];
+        methodName_           = [NSString stringWithFormat:@"%@:", methodName_];
+        methodSel             = NSSelectorFromString(methodName_);
     }
     else
     {
@@ -122,58 +118,59 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
         lua_pushinteger(L, kLuaBridgeErrorMethodNotFound);
         return 2;
     }
-    
-    NSMethodSignature *methodSig = [targetClass methodSignatureForSelector:(SEL)methodSel];
+
+    NSMethodSignature* methodSig = [targetClass methodSignatureForSelector:(SEL)methodSel];
     if (methodSig == nil)
     {
         lua_pushboolean(L, 0);
         lua_pushinteger(L, kLuaBridgeErrorMethodSignature);
         return 2;
     }
-    
-    @try {
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:methodSig];
+
+    @try
+    {
+        NSInvocation* invocation = [NSInvocation invocationWithMethodSignature:methodSig];
         [invocation setTarget:targetClass];
         [invocation setSelector:methodSel];
         NSUInteger returnLength = [methodSig methodReturnLength];
-        const char *returnType = [methodSig methodReturnType];
-        
+        const char* returnType  = [methodSig methodReturnType];
+
         if (hasArguments)
         {
-            NSMutableDictionary *dict = [NSMutableDictionary dictionary];
+            NSMutableDictionary* dict = [NSMutableDictionary dictionary];
             lua_pushnil(L);
             while (lua_next(L, -2))
             {
-                NSString *key = [NSString stringWithCString:lua_tostring(L, -2) encoding:NSUTF8StringEncoding];
-                
+                NSString* key = [NSString stringWithCString:lua_tostring(L, -2) encoding:NSUTF8StringEncoding];
+
                 switch (lua_type(L, -1))
                 {
-                    case LUA_TNUMBER:
-                        [dict setObject:[NSNumber numberWithFloat:lua_tonumber(L, -1)] forKey:key];
-                        break;
-                        
-                    case LUA_TBOOLEAN:
-                        [dict setObject:[NSNumber numberWithBool:lua_toboolean(L, -1)] forKey:key];
-                        break;
-                        
-                    case LUA_TSTRING:
-                        [dict setObject:[NSString stringWithCString:lua_tostring(L, -1) encoding:NSUTF8StringEncoding]
-                                 forKey:key];
-                        break;
-                        
-                    case LUA_TTABLE:
-                        luaTableToObjcDictionary(L, dict, key);
-                        break;
-                        
-                    case LUA_TFUNCTION:
-                        int functionId = retainLuaFunction(L, -1, NULL);
-                        [dict setObject:[NSNumber numberWithInt:functionId] forKey:key];
-                        break;
+                case LUA_TNUMBER:
+                    [dict setObject:[NSNumber numberWithFloat:lua_tonumber(L, -1)] forKey:key];
+                    break;
+
+                case LUA_TBOOLEAN:
+                    [dict setObject:[NSNumber numberWithBool:lua_toboolean(L, -1)] forKey:key];
+                    break;
+
+                case LUA_TSTRING:
+                    [dict setObject:[NSString stringWithCString:lua_tostring(L, -1) encoding:NSUTF8StringEncoding]
+                             forKey:key];
+                    break;
+
+                case LUA_TTABLE:
+                    luaTableToObjcDictionary(L, dict, key);
+                    break;
+
+                case LUA_TFUNCTION:
+                    int functionId = retainLuaFunction(L, -1, NULL);
+                    [dict setObject:[NSNumber numberWithInt:functionId] forKey:key];
+                    break;
                 }
-                
+
                 lua_pop(L, 1);
             }
-            
+
             [invocation setArgument:&dict atIndex:2];
             [invocation invoke];
         }
@@ -181,7 +178,7 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
         {
             [invocation invoke];
         }
-        
+
         lua_pushboolean(L, 1);
         if (returnLength > 0)
         {
@@ -191,19 +188,19 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
                 [invocation getReturnValue:&ret];
                 pushValue(L, ret);
             }
-            else if (strcmp(returnType, @encode(BOOL)) == 0) // BOOL
+            else if (strcmp(returnType, @encode(BOOL)) == 0)  // BOOL
             {
                 char ret;
                 [invocation getReturnValue:&ret];
                 lua_pushboolean(L, ret);
             }
-            else if (strcmp(returnType, @encode(int)) == 0) // int
+            else if (strcmp(returnType, @encode(int)) == 0)  // int
             {
                 int ret;
                 [invocation getReturnValue:&ret];
                 lua_pushinteger(L, ret);
             }
-            else if (strcmp(returnType, @encode(float)) == 0) // float
+            else if (strcmp(returnType, @encode(float)) == 0)  // float
             {
                 float ret;
                 [invocation getReturnValue:&ret];
@@ -221,16 +218,16 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
         }
         return 2;
     }
-    @catch (NSException *exception)
+    @catch (NSException* exception)
     {
         NSLog(@"EXCEPTION THROW: %@", exception);
         lua_pushboolean(L, 0);
         lua_pushinteger(L, kLuaBridgeErrorExceptionOccurred);
-        return 2; 
+        return 2;
     }
 }
 
-void LuaObjcBridge::pushValue(lua_State *L, void *val)
+void LuaObjcBridge::pushValue(lua_State* L, void* val)
 {
     id oval = (id)val;
     if (oval == nil)
@@ -239,8 +236,8 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
     }
     else if ([oval isKindOfClass:[NSNumber class]])
     {
-        NSNumber *number = (NSNumber *)oval;
-        const char *numberType = [number objCType];
+        NSNumber* number       = (NSNumber*)oval;
+        const char* numberType = [number objCType];
         if (strcmp(numberType, @encode(BOOL)) == 0)
         {
             lua_pushboolean(L, [number boolValue]);
@@ -261,15 +258,15 @@ static void luaTableToObjcDictionary(lua_State *L, NSMutableDictionary *dict,NSS
     else if ([oval isKindOfClass:[NSDictionary class]])
     {
         lua_newtable(L);
-        
+
         for (id key in oval)
         {
-            const char *key_ = [[NSString stringWithFormat:@"%@", key] cStringUsingEncoding:NSUTF8StringEncoding];
+            const char* key_ = [[NSString stringWithFormat:@"%@", key] cStringUsingEncoding:NSUTF8StringEncoding];
             lua_pushstring(L, key_);
             pushValue(L, [oval objectForKey:key]);
             lua_rawset(L, -3);
         }
-        
+
         return;
     }
     else
diff --git a/extensions/scripting/lua-bindings/manual/ui/lua_cocos2dx_webview_manual.cpp b/extensions/scripting/lua-bindings/manual/ui/lua_cocos2dx_webview_manual.cpp
index a9d616e84245..88fc10209c42 100644
--- a/extensions/scripting/lua-bindings/manual/ui/lua_cocos2dx_webview_manual.cpp
+++ b/extensions/scripting/lua-bindings/manual/ui/lua_cocos2dx_webview_manual.cpp
@@ -63,8 +63,8 @@ static int lua_cocos2dx_WebView_setOnShouldStartLoading(lua_State* L)
 #endif
 
         LUA_FUNCTION handler = (toluafix_ref_function(L, 2, 0));
-        std::function<bool(ui::WebView * sender, const std::string& url)> callback =
-            [L, handler](ui::WebView* sender, const std::string& url) -> bool {
+        std::function<bool(ui::WebView * sender, std::string_view url)> callback =
+            [L, handler](ui::WebView* sender, std::string_view url) -> bool {
             toluafix_pushusertype_ccobject(L, sender->_ID, &(sender->_luaID), (void*)sender, "ccui.WebView");
             tolua_pushcppstring(L, url);
             return LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
@@ -118,13 +118,13 @@ static int lua_cocos2dx_WebView_setOnDidFinishLoading(lua_State* L)
         }
 #endif
 
-        LUA_FUNCTION handler = (toluafix_ref_function(L, 2, 0));
-        std::function<void(ui::WebView * sender, const std::string& url)> callback =
-            [L, handler](ui::WebView* sender, const std::string& url) {
-                toluafix_pushusertype_ccobject(L, sender->_ID, &(sender->_luaID), (void*)sender, "ccui.WebView");
-                tolua_pushcppstring(L, url);
-                LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
-            };
+        LUA_FUNCTION handler                                                     = (toluafix_ref_function(L, 2, 0));
+        std::function<void(ui::WebView * sender, std::string_view url)> callback = [L, handler](ui::WebView* sender,
+                                                                                                std::string_view url) {
+            toluafix_pushusertype_ccobject(L, sender->_ID, &(sender->_luaID), (void*)sender, "ccui.WebView");
+            tolua_pushcppstring(L, url);
+            LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
+        };
 
         ScriptHandlerMgr::getInstance()->addCustomHandler((void*)self, handler);
         self->setOnDidFinishLoading(callback);
@@ -173,13 +173,13 @@ static int lua_cocos2dx_WebView_setOnDidFailLoading(lua_State* L)
         }
 #endif
 
-        LUA_FUNCTION handler = (toluafix_ref_function(L, 2, 0));
-        std::function<void(ui::WebView * sender, const std::string& url)> callback =
-            [L, handler](ui::WebView* sender, const std::string& url) {
-                toluafix_pushusertype_ccobject(L, sender->_ID, &(sender->_luaID), (void*)sender, "ccui.WebView");
-                tolua_pushcppstring(L, url);
-                LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
-            };
+        LUA_FUNCTION handler                                                     = (toluafix_ref_function(L, 2, 0));
+        std::function<void(ui::WebView * sender, std::string_view url)> callback = [L, handler](ui::WebView* sender,
+                                                                                                std::string_view url) {
+            toluafix_pushusertype_ccobject(L, sender->_ID, &(sender->_luaID), (void*)sender, "ccui.WebView");
+            tolua_pushcppstring(L, url);
+            LuaEngine::getInstance()->getLuaStack()->executeFunctionByHandler(handler, 2);
+        };
 
         ScriptHandlerMgr::getInstance()->addCustomHandler((void*)self, handler);
         self->setOnDidFailLoading(callback);
diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt
index 210f150edec0..04bebd1d1ca1 100644
--- a/templates/cpp-template-default/CMakeLists.txt
+++ b/templates/cpp-template-default/CMakeLists.txt
@@ -133,15 +133,14 @@ set(all_code_files
     )
 if(NOT ANDROID)
     add_executable(${APP_NAME} ${all_code_files})
+    target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
 else()
     add_library(${APP_NAME} SHARED ${all_code_files})
-    add_subdirectory(${ADXE_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
-    target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
-
+    # whole archive ${ADXE_LUA_LIB} to make sure JNI_Onload can be invoke from java
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive ${ADXE_LUA_LIB} -Wl,--no-whole-archive)
     config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
 endif()
 
-target_link_libraries(${APP_NAME} ${ADXE_CORE_LIB})
 target_include_directories(${APP_NAME}
         PRIVATE Classes
         PRIVATE ${ADXE_ROOT_PATH}/cocos/audio/include/
diff --git a/templates/cpp-template-default/Classes/AppDelegate.cpp b/templates/cpp-template-default/Classes/AppDelegate.cpp
index 9e7d6a6d6823..0119494ae12e 100644
--- a/templates/cpp-template-default/Classes/AppDelegate.cpp
+++ b/templates/cpp-template-default/Classes/AppDelegate.cpp
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,23 +29,19 @@
 #define USE_AUDIO_ENGINE 1
 
 #if USE_AUDIO_ENGINE
-#include "audio/include/AudioEngine.h"
+#    include "audio/include/AudioEngine.h"
 #endif
 
 USING_NS_CC;
 
 static cocos2d::Size designResolutionSize = cocos2d::Size(1280, 720);
-static cocos2d::Size smallResolutionSize = cocos2d::Size(480, 320);
+static cocos2d::Size smallResolutionSize  = cocos2d::Size(480, 320);
 static cocos2d::Size mediumResolutionSize = cocos2d::Size(1024, 768);
-static cocos2d::Size largeResolutionSize = cocos2d::Size(2048, 1536);
+static cocos2d::Size largeResolutionSize  = cocos2d::Size(2048, 1536);
 
-AppDelegate::AppDelegate()
-{
-}
+AppDelegate::AppDelegate() {}
 
-AppDelegate::~AppDelegate() 
-{
-}
+AppDelegate::~AppDelegate() {}
 
 // if you want a different context, modify the value of glContextAttrs
 // it will affect all platforms
@@ -57,20 +53,24 @@ void AppDelegate::initGLContextAttrs()
     GLView::setGLContextAttrs(glContextAttrs);
 }
 
-// if you want to use the package manager to install more packages,  
+// if you want to use the package manager to install more packages,
 // don't modify or remove this function
 static int register_all_packages()
 {
-    return 0; //flag for packages manager
+    return 0;  // flag for packages manager
 }
 
-bool AppDelegate::applicationDidFinishLaunching() {
+bool AppDelegate::applicationDidFinishLaunching()
+{
     // initialize director
     auto director = Director::getInstance();
-    auto glview = director->getOpenGLView();
-    if(!glview) {
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
-        glview = GLViewImpl::createWithRect("HelloCpp", cocos2d::Rect(0, 0, designResolutionSize.width, designResolutionSize.height));
+    auto glview   = director->getOpenGLView();
+    if (!glview)
+    {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
+        glview = GLViewImpl::createWithRect(
+            "HelloCpp", cocos2d::Rect(0, 0, designResolutionSize.width, designResolutionSize.height));
 #else
         glview = GLViewImpl::create("HelloCpp");
 #endif
@@ -84,22 +84,26 @@ bool AppDelegate::applicationDidFinishLaunching() {
     director->setAnimationInterval(1.0f / 60);
 
     // Set the design resolution
-    glview->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height, ResolutionPolicy::NO_BORDER);
+    glview->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height,
+                                    ResolutionPolicy::NO_BORDER);
     auto frameSize = glview->getFrameSize();
     // if the frame's height is larger than the height of medium size.
     if (frameSize.height > mediumResolutionSize.height)
-    {        
-        director->setContentScaleFactor(MIN(largeResolutionSize.height/designResolutionSize.height, largeResolutionSize.width/designResolutionSize.width));
+    {
+        director->setContentScaleFactor(MIN(largeResolutionSize.height / designResolutionSize.height,
+                                            largeResolutionSize.width / designResolutionSize.width));
     }
     // if the frame's height is larger than the height of small size.
     else if (frameSize.height > smallResolutionSize.height)
-    {        
-        director->setContentScaleFactor(MIN(mediumResolutionSize.height/designResolutionSize.height, mediumResolutionSize.width/designResolutionSize.width));
+    {
+        director->setContentScaleFactor(MIN(mediumResolutionSize.height / designResolutionSize.height,
+                                            mediumResolutionSize.width / designResolutionSize.width));
     }
     // if the frame's height is smaller than the height of medium size.
     else
-    {        
-        director->setContentScaleFactor(MIN(smallResolutionSize.height/designResolutionSize.height, smallResolutionSize.width/designResolutionSize.width));
+    {
+        director->setContentScaleFactor(MIN(smallResolutionSize.height / designResolutionSize.height,
+                                            smallResolutionSize.width / designResolutionSize.width));
     }
 
     register_all_packages();
@@ -114,7 +118,8 @@ bool AppDelegate::applicationDidFinishLaunching() {
 }
 
 // This function will be called when the app is inactive. Note, when receiving a phone call it is invoked.
-void AppDelegate::applicationDidEnterBackground() {
+void AppDelegate::applicationDidEnterBackground()
+{
     Director::getInstance()->stopAnimation();
 
 #if USE_AUDIO_ENGINE
@@ -123,7 +128,8 @@ void AppDelegate::applicationDidEnterBackground() {
 }
 
 // this function will be called when the app is active again
-void AppDelegate::applicationWillEnterForeground() {
+void AppDelegate::applicationWillEnterForeground()
+{
     Director::getInstance()->startAnimation();
 
 #if USE_AUDIO_ENGINE
diff --git a/templates/cpp-template-default/Classes/AppDelegate.h b/templates/cpp-template-default/Classes/AppDelegate.h
index 41d860f5deef..0ce2aaaa5be1 100644
--- a/templates/cpp-template-default/Classes/AppDelegate.h
+++ b/templates/cpp-template-default/Classes/AppDelegate.h
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,8 +23,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
+#ifndef _APP_DELEGATE_H_
+#define _APP_DELEGATE_H_
 
 #include "cocos2d.h"
 
@@ -33,7 +33,7 @@
 
 Private inheritance here hides part of interface from Director.
 */
-class  AppDelegate : private cocos2d::Application
+class AppDelegate : private cocos2d::Application
 {
 public:
     AppDelegate();
@@ -61,5 +61,4 @@ class  AppDelegate : private cocos2d::Application
     void applicationWillEnterForeground() override;
 };
 
-#endif // _APP_DELEGATE_H_
-
+#endif  // _APP_DELEGATE_H_
diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.cpp b/templates/cpp-template-default/Classes/HelloWorldScene.cpp
index 620e41e8664b..5ad976f9778e 100644
--- a/templates/cpp-template-default/Classes/HelloWorldScene.cpp
+++ b/templates/cpp-template-default/Classes/HelloWorldScene.cpp
@@ -48,8 +48,8 @@ bool HelloWorld::init()
 
     auto visibleSize = Director::getInstance()->getVisibleSize();
     auto origin      = Director::getInstance()->getVisibleOrigin();
-    auto safeArea = Director::getInstance()->getSafeAreaRect();
-    auto safeOrigin = safeArea.origin;
+    auto safeArea    = Director::getInstance()->getSafeAreaRect();
+    auto safeOrigin  = safeArea.origin;
 
     /////////////////////////////
     // 2. add a menu item with "X" image, which is clicked to quit the program
@@ -97,7 +97,7 @@ bool HelloWorld::init()
     }
 
     // add "HelloWorld" splash screen"
-    auto sprite = Sprite::create("HelloWorld.png");
+    auto sprite = Sprite::create("HelloWorld.png"sv);
     if (sprite == nullptr)
     {
         problemLoading("'HelloWorld.png'");
diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.h b/templates/cpp-template-default/Classes/HelloWorldScene.h
index c77c79b593ab..894b4e0dd898 100644
--- a/templates/cpp-template-default/Classes/HelloWorldScene.h
+++ b/templates/cpp-template-default/Classes/HelloWorldScene.h
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,4 +37,4 @@ class HelloWorld : public cocos2d::Scene
     void menuCloseCallback(Ref* sender);
 };
 
-#endif // __HELLOWORLD_SCENE_H__
+#endif  // __HELLOWORLD_SCENE_H__
diff --git a/templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp
index 6cab47cbb306..ccd4757e4c78 100644
--- a/templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp
+++ b/templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,14 +29,16 @@
 
 #include "AppDelegate.h"
 
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#define LOG_TAG "main"
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-namespace {
+namespace
+{
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env) {
+void cocos_android_app_init(JNIEnv* env)
+{
     LOGD("cocos_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/templates/cpp-template-default/proj.ios_mac/ios/AppController.h b/templates/cpp-template-default/proj.ios_mac/ios/AppController.h
index f0e78b77634f..aeb65f50857b 100644
--- a/templates/cpp-template-default/proj.ios_mac/ios/AppController.h
+++ b/templates/cpp-template-default/proj.ios_mac/ios/AppController.h
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,10 +29,8 @@
 @class RootViewController;
 
 @interface AppController : NSObject <UIApplicationDelegate> {
-
 }
 
 @property(nonatomic, readonly) RootViewController* viewController;
 
 @end
-
diff --git a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm
index edcd92178a39..2dafa17d40e3 100644
--- a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm
+++ b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,29 +39,29 @@ @implementation AppController
 // cocos2d application instance
 static AppDelegate s_sharedApplication;
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    
-    cocos2d::Application *app = cocos2d::Application::getInstance();
-    
+- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{
+
+    cocos2d::Application* app = cocos2d::Application::getInstance();
+
     // Initialize the GLView attributes
     app->initGLContextAttrs();
     cocos2d::GLViewImpl::convertAttrs();
-    
+
     // Override point for customization after application launch.
 
     // Add the view controller's view to the window and display.
-    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
+    window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
     // Use RootViewController to manage CCEAGLView
-    _viewController = [[RootViewController alloc]init];
+    _viewController                       = [[RootViewController alloc] init];
     _viewController.wantsFullScreenLayout = YES;
-    
 
     // Set RootViewController to window
-    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
+    if ([[UIDevice currentDevice].systemVersion floatValue] < 6.0)
     {
         // warning: addSubView doesn't work on iOS6
-        [window addSubview: _viewController.view];
+        [window addSubview:_viewController.view];
     }
     else
     {
@@ -72,82 +72,91 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [window makeKeyAndVisible];
 
     [[UIApplication sharedApplication] setStatusBarHidden:true];
-    
-    //Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
-    if ( [[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
+
+    // Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
     {
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSAllowsDefaultLineBreakStrategy"];
     }
-    
+
     // IMPORTANT: Setting the GLView should be done after creating the RootViewController
-    cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView((__bridge void *)_viewController.view);
+    cocos2d::GLView* glview = cocos2d::GLViewImpl::createWithEAGLView((__bridge void*)_viewController.view);
     cocos2d::Director::getInstance()->setOpenGLView(glview);
-    
-    //run the cocos2d-x game scene
+
+    // run the cocos2d-x game scene
     app->run();
 
     return YES;
 }
 
-
-- (void)applicationWillResignActive:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication*)application
+{
     /*
-     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+     Sent when the application is about to move from active to inactive state. This can occur for certain types of
+     temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and
+     it begins the transition to the background state. Use this method to pause ongoing tasks, disable timers, and
+     throttle down OpenGL ES frame rates. Games should use this method to pause the game.
      */
     // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
     /* cocos2d::Director::getInstance()->pause(); */
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application {
+- (void)applicationDidBecomeActive:(UIApplication*)application
+{
     /*
-     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was
+     previously in the background, optionally refresh the user interface.
      */
     // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
     /* cocos2d::Director::getInstance()->resume(); */
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationDidEnterBackground:(UIApplication*)application
+{
     /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state
+     information to restore your application to its current state in case it is terminated later. If your application
+     supports background execution, called instead of applicationWillTerminate: when the user quits.
      */
     cocos2d::Application::getInstance()->applicationDidEnterBackground();
 }
 
-- (void)applicationWillEnterForeground:(UIApplication *)application {
+- (void)applicationWillEnterForeground:(UIApplication*)application
+{
     /*
-     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made
+     on entering the background.
      */
     cocos2d::Application::getInstance()->applicationWillEnterForeground();
 }
 
-- (void)applicationWillTerminate:(UIApplication *)application {
+- (void)applicationWillTerminate:(UIApplication*)application
+{
     /*
      Called when the application is about to terminate.
      See also applicationDidEnterBackground:.
      */
 }
 
-
 #pragma mark -
 #pragma mark Memory management
 
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+- (void)applicationDidReceiveMemoryWarning:(UIApplication*)application
+{
     /*
-     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk)
+     later.
      */
 }
 
-
 #if __has_feature(objc_arc)
 #else
-- (void)dealloc {
+- (void)dealloc
+{
     [window release];
     [_viewController release];
     [super dealloc];
 }
 #endif
 
-
 @end
diff --git a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.h b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.h
index ed4046d6faaf..06c3b0556216 100644
--- a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.h
+++ b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.h
@@ -26,10 +26,8 @@
 
 #import <UIKit/UIKit.h>
 
-
 @interface RootViewController : UIViewController {
-
 }
-- (BOOL) prefersStatusBarHidden;
+- (BOOL)prefersStatusBarHidden;
 
 @end
diff --git a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm
index a4c37af784ab..8eaf237db900 100644
--- a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm
+++ b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm
@@ -28,11 +28,11 @@ of this software and associated documentation files (the "Software"), to deal
 #import "cocos2d.h"
 #import "platform/ios/CCEAGLView-ios.h"
 
-
 @implementation RootViewController
 
 /*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+ // The designated initializer.  Override if you create the controller programmatically and want to perform
+customization that is not appropriate for viewDidLoad.
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
         // Custom initialization
@@ -42,81 +42,89 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 */
 
 // Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
+- (void)loadView
+{
     // Initialize the CCEAGLView
-    CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [UIScreen mainScreen].bounds
-                                         pixelFormat: (__bridge NSString *)cocos2d::GLViewImpl::_pixelFormat
-                                         depthFormat: cocos2d::GLViewImpl::_depthFormat
-                                  preserveBackbuffer: NO
-                                          sharegroup: nil
-                                       multiSampling: cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
-                                     numberOfSamples: cocos2d::GLViewImpl::_multisamplingCount ];
-    
+    CCEAGLView* eaglView = [CCEAGLView viewWithFrame:[UIScreen mainScreen].bounds
+                                         pixelFormat:(__bridge NSString*)cocos2d::GLViewImpl::_pixelFormat
+                                         depthFormat:cocos2d::GLViewImpl::_depthFormat
+                                  preserveBackbuffer:NO
+                                          sharegroup:nil
+                                       multiSampling:cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
+                                     numberOfSamples:cocos2d::GLViewImpl::_multisamplingCount];
+
     // Enable or disable multiple touches
     [eaglView setMultipleTouchEnabled:NO];
-    
+
     // Set EAGLView as view of RootViewController
     self.view = eaglView;
 }
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
     [super viewDidLoad];
 }
 
-- (void)viewWillAppear:(BOOL)animated {
+- (void)viewWillAppear:(BOOL)animated
+{
     [super viewWillAppear:animated];
 }
 
-- (void)viewDidDisappear:(BOOL)animated {
+- (void)viewDidDisappear:(BOOL)animated
+{
     [super viewDidDisappear:animated];
 }
 
-
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 #ifdef __IPHONE_6_0
-- (NSUInteger) supportedInterfaceOrientations{
+- (NSUInteger)supportedInterfaceOrientations
+{
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 #endif
 
-- (BOOL) shouldAutorotate {
+- (BOOL)shouldAutorotate
+{
     return YES;
 }
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
     [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
 
     if (glview)
     {
-        CCEAGLView *eaglview = (__bridge CCEAGLView *)glview->getEAGLView();
+        CCEAGLView* eaglview = (__bridge CCEAGLView*)glview->getEAGLView();
 
         if (eaglview)
         {
             CGSize s = CGSizeMake([eaglview getWidth], [eaglview getHeight]);
-            cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
+            cocos2d::Application::getInstance()->applicationScreenSizeChanged((int)s.width, (int)s.height);
         }
     }
 }
 
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden {
+// fix not hide status on ios7
+- (BOOL)prefersStatusBarHidden
+{
     return YES;
 }
 
 // Controls the application's preferred home indicator auto-hiding when this view controller is shown.
-- (BOOL)prefersHomeIndicatorAutoHidden {
+- (BOOL)prefersHomeIndicatorAutoHidden
+{
     return YES;
 }
 
-- (void)didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning
+{
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
 
     // Release any cached data, images, etc that aren't in use.
 }
 
-
 @end
diff --git a/templates/cpp-template-default/proj.ios_mac/mac/main.cpp b/templates/cpp-template-default/proj.ios_mac/mac/main.cpp
index ed8ee7c15c33..44045f8feb1d 100644
--- a/templates/cpp-template-default/proj.ios_mac/mac/main.cpp
+++ b/templates/cpp-template-default/proj.ios_mac/mac/main.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2010 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,7 +28,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     AppDelegate app;
     return Application::getInstance()->run();
diff --git a/templates/cpp-template-default/proj.linux/main.cpp b/templates/cpp-template-default/proj.linux/main.cpp
index 2bd3032f78c4..3cbdb2bc35a6 100644
--- a/templates/cpp-template-default/proj.linux/main.cpp
+++ b/templates/cpp-template-default/proj.linux/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     // create the application instance
     AppDelegate app;
diff --git a/templates/cpp-template-default/proj.win32/main.cpp b/templates/cpp-template-default/proj.win32/main.cpp
index c3c5dc6fd49c..636fa57f07f2 100644
--- a/templates/cpp-template-default/proj.win32/main.cpp
+++ b/templates/cpp-template-default/proj.win32/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,10 +28,7 @@
 
 USING_NS_CC;
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
diff --git a/templates/cpp-template-default/proj.win32/main.h b/templates/cpp-template-default/proj.win32/main.h
index 13b6f36fd230..64d684e652a4 100644
--- a/templates/cpp-template-default/proj.win32/main.h
+++ b/templates/cpp-template-default/proj.win32/main.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,7 +25,7 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
 
 // Windows Header Files:
 #include <windows.h>
@@ -34,4 +34,4 @@
 // C RunTime Header Files
 #include "platform/CCStdC.h"
 
-#endif    // __MAIN_H__
+#endif  // __MAIN_H__
diff --git a/templates/cpp-template-default/proj.win32/resource.h b/templates/cpp-template-default/proj.win32/resource.h
index 6f4e11f03d52..da3599c69cf8 100644
--- a/templates/cpp-template-default/proj.win32/resource.h
+++ b/templates/cpp-template-default/proj.win32/resource.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,18 +27,18 @@
 // Used by game.RC
 //
 
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
+#define IDS_PROJNAME 100
+#define IDR_TESTJS 100
 
-#define ID_FILE_NEW_WINDOW            32771
+#define ID_FILE_NEW_WINDOW 32771
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
+#    ifndef APSTUDIO_READONLY_SYMBOLS
+#        define _APS_NEXT_RESOURCE_VALUE 201
+#        define _APS_NEXT_CONTROL_VALUE 1000
+#        define _APS_NEXT_SYMED_VALUE 101
+#        define _APS_NEXT_COMMAND_VALUE 32775
+#    endif
 #endif
diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt
index c2f896ee0073..b5559c79d40c 100644
--- a/templates/lua-template-default/CMakeLists.txt
+++ b/templates/lua-template-default/CMakeLists.txt
@@ -132,17 +132,16 @@ set(APP_SRC ${GAME_HEADER} ${GAME_SOURCE})
 # mark app complie info and libs info
 if(NOT ANDROID)
     add_executable(${APP_NAME} ${APP_SRC})
+    target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
 else()
     add_library(${APP_NAME} SHARED ${APP_SRC})
-    add_subdirectory(${ADXE_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
-    target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
     add_subdirectory(${ADXE_ROOT_PATH}/extensions/scripting/lua-bindings/proj.android ${ENGINE_BINARY_PATH}/cocos/lua-android)
     target_link_libraries(${APP_NAME} -Wl,--whole-archive lua_android_spec -Wl,--no-whole-archive)
-
+    # whole archive ${ADXE_LUA_LIB} to make sure JNI_Onload can be invoke from java 
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive ${ADXE_LUA_LIB} -Wl,--whole-archive)
     config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/frameworks/runtime-src/proj.android/app/src")
 endif()
 
-target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
 target_include_directories(${APP_NAME} PRIVATE ${RUNTIME_SRC_ROOT}/Classes)
 
 # mark app resources, resource will be copy auto after mark
diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
index b0542eff320f..abbab833fd96 100644
--- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,35 +31,31 @@
 #define USE_AUDIO_ENGINE 1
 
 #if USE_AUDIO_ENGINE
-#include "audio/include/AudioEngine.h"
+#    include "audio/include/AudioEngine.h"
 #endif
 
 USING_NS_CC;
 using namespace std;
 
-AppDelegate::AppDelegate()
-{
-}
+AppDelegate::AppDelegate() {}
 
-AppDelegate::~AppDelegate()
-{
-}
+AppDelegate::~AppDelegate() {}
 
 // if you want a different context, modify the value of glContextAttrs
 // it will affect all platforms
 void AppDelegate::initGLContextAttrs()
 {
     // set OpenGL context attributes: red,green,blue,alpha,depth,stencil,multisamplesCount
-    GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8, 0 };
+    GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8, 0};
 
     GLView::setGLContextAttrs(glContextAttrs);
 }
 
-// if you want to use the package manager to install more packages, 
+// if you want to use the package manager to install more packages,
 // don't modify or remove this function
 static int register_all_packages()
 {
-    return 0; //flag for packages manager
+    return 0;  // flag for packages manager
 }
 
 bool AppDelegate::applicationDidFinishLaunching()
@@ -76,12 +72,12 @@ bool AppDelegate::applicationDidFinishLaunching()
     register_all_packages();
 
     LuaStack* stack = engine->getLuaStack();
-    
-    //register custom function
-    //LuaStack* stack = engine->getLuaStack();
-    //register_custom_function(stack->getLuaState());
-    
-    stack->addSearchPath("src"); 
+
+    // register custom function
+    // LuaStack* stack = engine->getLuaStack();
+    // register_custom_function(stack->getLuaState());
+
+    stack->addSearchPath("src");
     FileUtils::getInstance()->addSearchPath("res");
     if (engine->executeString("require 'main'"))
     {
diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.h b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.h
index c5a12ae3d6d1..53d04ceced8c 100644
--- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.h
+++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.h
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 Private inheritance here hides part of interface from Director.
 */
-class  AppDelegate : private cocos2d::Application
+class AppDelegate : private cocos2d::Application
 {
 public:
     AppDelegate();
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp
index 6cab47cbb306..ccd4757e4c78 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,14 +29,16 @@
 
 #include "AppDelegate.h"
 
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#define LOG_TAG "main"
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-namespace {
+namespace
+{
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env) {
+void cocos_android_app_init(JNIEnv* env)
+{
     LOGD("cocos_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h
index f0e78b77634f..aeb65f50857b 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.h
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,10 +29,8 @@
 @class RootViewController;
 
 @interface AppController : NSObject <UIApplicationDelegate> {
-
 }
 
 @property(nonatomic, readonly) RootViewController* viewController;
 
 @end
-
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
index 8116adeba98d..2dafa17d40e3 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,29 +39,29 @@ @implementation AppController
 // cocos2d application instance
 static AppDelegate s_sharedApplication;
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    
-    cocos2d::Application *app = cocos2d::Application::getInstance();
-    
+- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{
+
+    cocos2d::Application* app = cocos2d::Application::getInstance();
+
     // Initialize the GLView attributes
     app->initGLContextAttrs();
     cocos2d::GLViewImpl::convertAttrs();
-    
+
     // Override point for customization after application launch.
 
     // Add the view controller's view to the window and display.
-    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
+    window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
     // Use RootViewController to manage CCEAGLView
-    _viewController = [[RootViewController alloc]init];
+    _viewController                       = [[RootViewController alloc] init];
     _viewController.wantsFullScreenLayout = YES;
-    
 
     // Set RootViewController to window
-    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
+    if ([[UIDevice currentDevice].systemVersion floatValue] < 6.0)
     {
         // warning: addSubView doesn't work on iOS6
-        [window addSubview: _viewController.view];
+        [window addSubview:_viewController.view];
     }
     else
     {
@@ -73,81 +73,90 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     [[UIApplication sharedApplication] setStatusBarHidden:true];
 
-    //Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
-    if ( [[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
+    // Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
     {
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSAllowsDefaultLineBreakStrategy"];
     }
-    
+
     // IMPORTANT: Setting the GLView should be done after creating the RootViewController
-    cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView((__bridge void *)_viewController.view);
+    cocos2d::GLView* glview = cocos2d::GLViewImpl::createWithEAGLView((__bridge void*)_viewController.view);
     cocos2d::Director::getInstance()->setOpenGLView(glview);
-    
-    //run the cocos2d-x game scene
+
+    // run the cocos2d-x game scene
     app->run();
 
     return YES;
 }
 
-
-- (void)applicationWillResignActive:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication*)application
+{
     /*
-     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+     Sent when the application is about to move from active to inactive state. This can occur for certain types of
+     temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and
+     it begins the transition to the background state. Use this method to pause ongoing tasks, disable timers, and
+     throttle down OpenGL ES frame rates. Games should use this method to pause the game.
      */
     // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
     /* cocos2d::Director::getInstance()->pause(); */
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application {
+- (void)applicationDidBecomeActive:(UIApplication*)application
+{
     /*
-     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was
+     previously in the background, optionally refresh the user interface.
      */
     // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
     /* cocos2d::Director::getInstance()->resume(); */
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationDidEnterBackground:(UIApplication*)application
+{
     /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state
+     information to restore your application to its current state in case it is terminated later. If your application
+     supports background execution, called instead of applicationWillTerminate: when the user quits.
      */
     cocos2d::Application::getInstance()->applicationDidEnterBackground();
 }
 
-- (void)applicationWillEnterForeground:(UIApplication *)application {
+- (void)applicationWillEnterForeground:(UIApplication*)application
+{
     /*
-     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made
+     on entering the background.
      */
     cocos2d::Application::getInstance()->applicationWillEnterForeground();
 }
 
-- (void)applicationWillTerminate:(UIApplication *)application {
+- (void)applicationWillTerminate:(UIApplication*)application
+{
     /*
      Called when the application is about to terminate.
      See also applicationDidEnterBackground:.
      */
 }
 
-
 #pragma mark -
 #pragma mark Memory management
 
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+- (void)applicationDidReceiveMemoryWarning:(UIApplication*)application
+{
     /*
-     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk)
+     later.
      */
 }
 
-
 #if __has_feature(objc_arc)
 #else
-- (void)dealloc {
+- (void)dealloc
+{
     [window release];
     [_viewController release];
     [super dealloc];
 }
 #endif
 
-
 @end
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h
index ed4046d6faaf..06c3b0556216 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h
@@ -26,10 +26,8 @@
 
 #import <UIKit/UIKit.h>
 
-
 @interface RootViewController : UIViewController {
-
 }
-- (BOOL) prefersStatusBarHidden;
+- (BOOL)prefersStatusBarHidden;
 
 @end
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
index 37144e420fce..1210e485ccdc 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm
@@ -28,11 +28,11 @@ of this software and associated documentation files (the "Software"), to deal
 #import "cocos2d.h"
 #import "platform/ios/CCEAGLView-ios.h"
 
-
 @implementation RootViewController
 
 /*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+ // The designated initializer.  Override if you create the controller programmatically and want to perform
+customization that is not appropriate for viewDidLoad.
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
         // Custom initialization
@@ -42,81 +42,89 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 */
 
 // Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
+- (void)loadView
+{
     // Initialize the CCEAGLView
-    CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [UIScreen mainScreen].bounds
-                                         pixelFormat: (__bridge NSString *)cocos2d::GLViewImpl::_pixelFormat
-                                         depthFormat: cocos2d::GLViewImpl::_depthFormat
-                                  preserveBackbuffer: NO
-                                          sharegroup: nil
-                                       multiSampling: NO
-                                     numberOfSamples: 0 ];
-    
+    CCEAGLView* eaglView = [CCEAGLView viewWithFrame:[UIScreen mainScreen].bounds
+                                         pixelFormat:(__bridge NSString*)cocos2d::GLViewImpl::_pixelFormat
+                                         depthFormat:cocos2d::GLViewImpl::_depthFormat
+                                  preserveBackbuffer:NO
+                                          sharegroup:nil
+                                       multiSampling:NO
+                                     numberOfSamples:0];
+
     // Enable or disable multiple touches
     [eaglView setMultipleTouchEnabled:NO];
-    
+
     // Set EAGLView as view of RootViewController
     self.view = eaglView;
 }
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
     [super viewDidLoad];
 }
 
-- (void)viewWillAppear:(BOOL)animated {
+- (void)viewWillAppear:(BOOL)animated
+{
     [super viewWillAppear:animated];
 }
 
-- (void)viewDidDisappear:(BOOL)animated {
+- (void)viewDidDisappear:(BOOL)animated
+{
     [super viewDidDisappear:animated];
 }
 
-
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 #ifdef __IPHONE_6_0
-- (NSUInteger) supportedInterfaceOrientations{
+- (NSUInteger)supportedInterfaceOrientations
+{
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 #endif
 
-- (BOOL) shouldAutorotate {
+- (BOOL)shouldAutorotate
+{
     return YES;
 }
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
     [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 
     auto glview = cocos2d::Director::getInstance()->getOpenGLView();
 
     if (glview)
     {
-        CCEAGLView *eaglview = (__bridge CCEAGLView *)glview->getEAGLView();
+        CCEAGLView* eaglview = (__bridge CCEAGLView*)glview->getEAGLView();
 
         if (eaglview)
         {
             CGSize s = CGSizeMake([eaglview getWidth], [eaglview getHeight]);
-            cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
+            cocos2d::Application::getInstance()->applicationScreenSizeChanged((int)s.width, (int)s.height);
         }
     }
 }
 
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden {
+// fix not hide status on ios7
+- (BOOL)prefersStatusBarHidden
+{
     return YES;
 }
 
 // Controls the application's preferred home indicator auto-hiding when this view controller is shown.
-- (BOOL)prefersHomeIndicatorAutoHidden {
+- (BOOL)prefersHomeIndicatorAutoHidden
+{
     return YES;
 }
 
-- (void)didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning
+{
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
 
     // Release any cached data, images, etc that aren't in use.
 }
 
-
 @end
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp
index cd6c3e8cdc52..371a2b4fcc85 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp
@@ -4,9 +4,8 @@
 
 USING_NS_CC;
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     AppDelegate app;
     return Application::getInstance()->run();
 }
-
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.linux/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.linux/main.cpp
index 042c94fef689..c03ce74184e9 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.linux/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.linux/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     // create the application instance
     AppDelegate app;
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp
index 88ab9a2856fb..0aa2a83d78aa 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,10 +30,7 @@ USING_NS_CC;
 // uncomment below line, open debug console
 #define USE_WIN32_CONSOLE
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.h b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.h
index 7943814d121b..d262f80bb84e 100644
--- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.h
+++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
 
 // Windows Header Files:
 #include <windows.h>
@@ -32,4 +32,3 @@
 
 // C RunTime Header Files
 #include "platform/CCStdC.h"
-
diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt
index 3e73a2fa571b..f8ed4d47810d 100644
--- a/tests/cpp-tests/CMakeLists.txt
+++ b/tests/cpp-tests/CMakeLists.txt
@@ -524,16 +524,14 @@ set(all_code_files
 
 if(NOT ANDROID)
     add_executable(${APP_NAME} ${all_code_files})
+    target_link_libraries(${APP_NAME} ${ADXE_CORE_LIB})
 else()
     add_library(${APP_NAME} SHARED ${all_code_files})
-    add_subdirectory(${ADXE_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
-    target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
-
+    # whole archive ${ADXE_LUA_LIB} to make sure JNI_Onload can be invoke from java
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive ${ADXE_CORE_LIB} -Wl,--no-whole-archive)
     config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
 endif()
 
-target_link_libraries(${APP_NAME} ${ADXE_CORE_LIB})
-
 target_include_directories(${APP_NAME}
         PRIVATE Classes
 )
diff --git a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp
index e7a86cd63aa5..d4be38fbeec0 100644
--- a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp
+++ b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,12 +28,12 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
     kTagNode,
     kTagGrossini,
     kTagSequence,
-}; 
+};
 
 ActionManagerTests::ActionManagerTests()
 {
@@ -53,13 +53,9 @@ ActionManagerTests::ActionManagerTests()
 //
 //------------------------------------------------------------------
 
-ActionManagerTest::ActionManagerTest()
-{
-}
+ActionManagerTest::ActionManagerTest() {}
 
-ActionManagerTest::~ActionManagerTest()
-{
-}
+ActionManagerTest::~ActionManagerTest() {}
 
 std::string ActionManagerTest::title() const
 {
@@ -81,30 +77,23 @@ void CrashTest::onEnter()
     ActionManagerTest::onEnter();
 
     auto child = Sprite::create(s_pathGrossini);
-    child->setPosition( VisibleRect::center() );
+    child->setPosition(VisibleRect::center());
     addChild(child, 1, kTagGrossini);
 
-    //Sum of all action's duration is 1.5 second.
+    // Sum of all action's duration is 1.5 second.
     child->runAction(RotateBy::create(1.5f, 90));
-    child->runAction(Sequence::create(
-                                            DelayTime::create(1.4f),
-                                            FadeOut::create(1.1f),
-                                            nullptr)
-                    );
-    
-    //After 1.5 second, self will be removed.
-    child->runAction(Sequence::create(
-                                    DelayTime::create(1.4f),
-                                    CallFunc::create( CC_CALLBACK_0(CrashTest::removeThis,this)),
-                                    nullptr)
-             );
+    child->runAction(Sequence::create(DelayTime::create(1.4f), FadeOut::create(1.1f), nullptr));
+
+    // After 1.5 second, self will be removed.
+    child->runAction(Sequence::create(DelayTime::create(1.4f),
+                                      CallFunc::create(CC_CALLBACK_0(CrashTest::removeThis, this)), nullptr));
 }
 
 void CrashTest::removeThis()
 {
     auto child = getChildByTag(kTagGrossini);
     child->removeChild(child, true);
-    
+
     getTestSuite()->enterNextTest();
 }
 
@@ -126,22 +115,19 @@ void LogicTest::onEnter()
     addChild(grossini, 0, 2);
     grossini->setPosition(VisibleRect::center());
 
-    grossini->runAction( Sequence::create( 
-                                                MoveBy::create(1, Vec2(150.0f,0.0f)),
-                                                CallFuncN::create(CC_CALLBACK_1(LogicTest::bugMe,this)),
-                                                nullptr) 
-                        );
+    grossini->runAction(Sequence::create(MoveBy::create(1, Vec2(150.0f, 0.0f)),
+                                         CallFuncN::create(CC_CALLBACK_1(LogicTest::bugMe, this)), nullptr));
 }
 
 void LogicTest::bugMe(Node* node)
 {
-    node->stopAllActions(); //After this stop next action not working, if remove this stop everything is working
+    node->stopAllActions();  // After this stop next action not working, if remove this stop everything is working
     node->runAction(ScaleTo::create(2, 2));
 }
 
 std::string LogicTest::subtitle() const
 {
-    return "Logic test"; 
+    return "Logic test";
 }
 
 //------------------------------------------------------------------
@@ -157,32 +143,30 @@ void PauseTest::onEnter()
     // otherwise the paused action will be resumed at 'onEnter' time
     //
     ActionManagerTest::onEnter();
-    
 
     auto l = Label::createWithTTF("After 5 seconds grossini should move", "fonts/Thonburi.ttf", 16.0f);
     addChild(l);
-    l->setPosition(VisibleRect::center().x, VisibleRect::top().y-75);
-    
-    
+    l->setPosition(VisibleRect::center().x, VisibleRect::top().y - 75);
+
     //
     // Also, this test MUST be done, after [super onEnter]
     //
     auto grossini = Sprite::create(s_pathGrossini);
     addChild(grossini, 0, kTagGrossini);
-    grossini->setPosition(VisibleRect::center() );
-    
-    auto action = MoveBy::create(1, Vec2(150.0f,0.0f));
+    grossini->setPosition(VisibleRect::center());
+
+    auto action = MoveBy::create(1, Vec2(150.0f, 0.0f));
 
     auto director = Director::getInstance();
     director->getActionManager()->addAction(action, grossini, true);
 
-    schedule( CC_SCHEDULE_SELECTOR(PauseTest::unpause), 3); 
+    schedule(CC_SCHEDULE_SELECTOR(PauseTest::unpause), 3);
 }
 
 void PauseTest::unpause(float dt)
 {
-    unschedule( CC_SCHEDULE_SELECTOR(PauseTest::unpause) );
-    auto node = getChildByTag( kTagGrossini );
+    unschedule(CC_SCHEDULE_SELECTOR(PauseTest::unpause));
+    auto node     = getChildByTag(kTagGrossini);
     auto director = Director::getInstance();
     director->getActionManager()->resumeTarget(node);
 }
@@ -205,13 +189,13 @@ void StopActionTest::onEnter()
     addChild(l);
     l->setPosition(VisibleRect::center().x, VisibleRect::top().y - 75);
 
-    auto pMove = MoveBy::create(2, Vec2(200.0f, 0.0f));
-    auto pCallback = CallFunc::create(CC_CALLBACK_0(StopActionTest::stopAction,this));
+    auto pMove     = MoveBy::create(2, Vec2(200.0f, 0.0f));
+    auto pCallback = CallFunc::create(CC_CALLBACK_0(StopActionTest::stopAction, this));
     auto pSequence = Sequence::create(pMove, pCallback, nullptr);
     pSequence->setTag(kTagSequence);
 
     auto pChild = Sprite::create(s_pathGrossini);
-    pChild->setPosition( VisibleRect::center() );
+    pChild->setPosition(VisibleRect::center());
 
     addChild(pChild, 1, kTagGrossini);
     pChild->runAction(pSequence);
@@ -236,29 +220,30 @@ std::string StopActionTest::subtitle() const
 void StopAllActionsTest::onEnter()
 {
     ActionManagerTest::onEnter();
-    
-    auto l = Label::createWithTTF("Should stop scale & move after 4 seconds but keep rotate", "fonts/Thonburi.ttf", 16.0f);
+
+    auto l =
+        Label::createWithTTF("Should stop scale & move after 4 seconds but keep rotate", "fonts/Thonburi.ttf", 16.0f);
     addChild(l);
-    l->setPosition( Vec2(VisibleRect::center().x, VisibleRect::top().y - 75) );
-    
-    auto pMove1 = MoveBy::create(2, Vec2(200.0f, 0.0f));
-    auto pMove2 = MoveBy::create(2, Vec2(-200.0f, 0.0f));
+    l->setPosition(Vec2(VisibleRect::center().x, VisibleRect::top().y - 75));
+
+    auto pMove1        = MoveBy::create(2, Vec2(200.0f, 0.0f));
+    auto pMove2        = MoveBy::create(2, Vec2(-200.0f, 0.0f));
     auto pSequenceMove = Sequence::createWithTwoActions(pMove1, pMove2);
-    auto pRepeatMove = RepeatForever::create(pSequenceMove);
+    auto pRepeatMove   = RepeatForever::create(pSequenceMove);
     pRepeatMove->setTag(kTagSequence);
-    
-    auto pScale1 = ScaleBy::create(2, 1.5f);
-    auto pScale2 = ScaleBy::create(2, 1.0f/1.5f);
+
+    auto pScale1        = ScaleBy::create(2, 1.5f);
+    auto pScale2        = ScaleBy::create(2, 1.0f / 1.5f);
     auto pSequenceScale = Sequence::createWithTwoActions(pScale1, pScale2);
-    auto pRepeatScale = RepeatForever::create(pSequenceScale);
+    auto pRepeatScale   = RepeatForever::create(pSequenceScale);
     pRepeatScale->setTag(kTagSequence);
-    
-    auto pRotate = RotateBy::create(2, 360);
+
+    auto pRotate       = RotateBy::create(2, 360);
     auto pRepeatRotate = RepeatForever::create(pRotate);
-    
+
     auto pChild = Sprite::create(s_pathGrossini);
-    pChild->setPosition( VisibleRect::center() );
-    
+    pChild->setPosition(VisibleRect::center());
+
     addChild(pChild, 1, kTagGrossini);
     pChild->runAction(pRepeatMove);
     pChild->runAction(pRepeatScale);
@@ -277,7 +262,6 @@ std::string StopAllActionsTest::subtitle() const
     return "Stop All Action Test";
 }
 
-
 //------------------------------------------------------------------
 //
 // ResumeTest
@@ -314,7 +298,7 @@ void ResumeTest::resumeGrossini(float time)
     this->unschedule(CC_SCHEDULE_SELECTOR(ResumeTest::resumeGrossini));
 
     auto pGrossini = getChildByTag(kTagGrossini);
-    auto director = Director::getInstance();
+    auto director  = Director::getInstance();
     director->getActionManager()->resumeTarget(pGrossini);
 }
 
@@ -327,28 +311,29 @@ void StopActionsByFlagsTest::onEnter()
 {
     ActionManagerTest::onEnter();
 
-    auto l = Label::createWithTTF("Should stop scale & move after 4 seconds but keep rotate", "fonts/Thonburi.ttf", 16.0f);
+    auto l =
+        Label::createWithTTF("Should stop scale & move after 4 seconds but keep rotate", "fonts/Thonburi.ttf", 16.0f);
     addChild(l);
-    l->setPosition( Vec2(VisibleRect::center().x, VisibleRect::top().y - 75) );
+    l->setPosition(Vec2(VisibleRect::center().x, VisibleRect::top().y - 75));
 
-    auto pMove1 = MoveBy::create(2, Vec2(200.0f, 0.0f));
-    auto pMove2 = MoveBy::create(2, Vec2(-200.0f, 0.0f));
+    auto pMove1        = MoveBy::create(2, Vec2(200.0f, 0.0f));
+    auto pMove2        = MoveBy::create(2, Vec2(-200.0f, 0.0f));
     auto pSequenceMove = Sequence::createWithTwoActions(pMove1, pMove2);
-    auto pRepeatMove = RepeatForever::create(pSequenceMove);
+    auto pRepeatMove   = RepeatForever::create(pSequenceMove);
     pRepeatMove->setFlags(kMoveFlag | kRepeatForeverFlag);
 
-    auto pScale1 = ScaleBy::create(2, 1.5f);
-    auto pScale2 = ScaleBy::create(2, 1.0f/1.5f);
+    auto pScale1        = ScaleBy::create(2, 1.5f);
+    auto pScale2        = ScaleBy::create(2, 1.0f / 1.5f);
     auto pSequenceScale = Sequence::createWithTwoActions(pScale1, pScale2);
-    auto pRepeatScale = RepeatForever::create(pSequenceScale);
+    auto pRepeatScale   = RepeatForever::create(pSequenceScale);
     pRepeatScale->setFlags(kScaleFlag | kRepeatForeverFlag);
 
-    auto pRotate = RotateBy::create(2, 360);
+    auto pRotate       = RotateBy::create(2, 360);
     auto pRepeatRotate = RepeatForever::create(pRotate);
     pRepeatRotate->setFlags(kRotateFlag | kRepeatForeverFlag);
 
     auto pChild = Sprite::create(s_pathGrossini);
-    pChild->setPosition( VisibleRect::center() );
+    pChild->setPosition(VisibleRect::center());
 
     addChild(pChild, 1, kTagGrossini);
     pChild->runAction(pRepeatMove);
@@ -373,17 +358,11 @@ std::string StopActionsByFlagsTest::subtitle() const
 // Issue14050Test
 //
 //------------------------------------------------------------------
-class SpriteIssue14050: public Sprite
+class SpriteIssue14050 : public Sprite
 {
 public:
-    SpriteIssue14050()
-    {
-        log("SpriteIssue14050::constructor");
-    }
-    virtual ~SpriteIssue14050()
-    {
-        log("SpriteIssue14050::destructor");
-    }
+    SpriteIssue14050() { log("SpriteIssue14050::constructor"); }
+    virtual ~SpriteIssue14050() { log("SpriteIssue14050::destructor"); }
 };
 
 void Issue14050Test::onEnter()
diff --git a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h
index eb7f7528c19b..d4fd6b9a6f53 100644
--- a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h
+++ b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,7 @@ class ActionManagerTest : public TestCase
 protected:
     cocos2d::TextureAtlas* _atlas;
 
-    std::string    _title;
+    std::string _title;
 
 public:
     ActionManagerTest();
@@ -112,11 +112,13 @@ class StopActionsByFlagsTest : public ActionManagerTest
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     void stopAction(float time);
+
 protected:
-    const unsigned int kMoveFlag = 0x01;
-    const unsigned int kScaleFlag = 0x02;
-    const unsigned int kRotateFlag = 0x04;
-    const unsigned int kRepeatForeverFlag = 0x08; // You don't need this for the test, but it's for demonstration how to activate several flags on an action.
+    const unsigned int kMoveFlag          = 0x01;
+    const unsigned int kScaleFlag         = 0x02;
+    const unsigned int kRotateFlag        = 0x04;
+    const unsigned int kRepeatForeverFlag = 0x08;  // You don't need this for the test, but it's for demonstration how
+                                                   // to activate several flags on an action.
 };
 
 class Issue14050Test : public ActionManagerTest
@@ -126,6 +128,7 @@ class Issue14050Test : public ActionManagerTest
 
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
+
 protected:
 };
 
diff --git a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp
index 29c9bc3d99d8..c10e571f3ec1 100644
--- a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp
+++ b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp
@@ -29,13 +29,13 @@
 
 USING_NS_CC;
 
-enum {
+enum
+{
     kTagAction1 = 1,
     kTagAction2 = 2,
-    kTagSlider = 1,
+    kTagSlider  = 1,
 };
 
-
 //------------------------------------------------------------------
 //
 // SpriteDemo
@@ -44,34 +44,33 @@ enum {
 void EaseSpriteDemo::centerSprites(unsigned int numberOfSprites)
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    if( numberOfSprites == 0 )
+
+    if (numberOfSprites == 0)
     {
         _tamara->setVisible(false);
         _kathia->setVisible(false);
         _grossini->setVisible(false);
     }
-    else if ( numberOfSprites == 1 )
+    else if (numberOfSprites == 1)
     {
         _tamara->setVisible(false);
         _kathia->setVisible(false);
-        _grossini->setPosition(s.width/2, s.height/2);
+        _grossini->setPosition(s.width / 2, s.height / 2);
     }
-    else if( numberOfSprites == 2 )
+    else if (numberOfSprites == 2)
     {
-        _kathia->setPosition(s.width/3, s.height/2);
-        _tamara->setPosition(2*s.width/3, s.height/2);
+        _kathia->setPosition(s.width / 3, s.height / 2);
+        _tamara->setPosition(2 * s.width / 3, s.height / 2);
         _grossini->setVisible(false);
     }
-    else if( numberOfSprites == 3 )
+    else if (numberOfSprites == 3)
     {
-        _grossini->setPosition(s.width/2, s.height/2);
-        _tamara->setPosition(s.width/4, s.height/2);
-        _kathia->setPosition(3 * s.width/4, s.height/2);
+        _grossini->setPosition(s.width / 2, s.height / 2);
+        _tamara->setPosition(s.width / 4, s.height / 2);
+        _kathia->setPosition(3 * s.width / 4, s.height / 2);
     }
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEase
@@ -81,23 +80,22 @@ void EaseSpriteDemo::centerSprites(unsigned int numberOfSprites)
 void SpriteEase::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130,0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseIn::create(move->clone(), 2.5f);
+
+    auto move_ease_in      = EaseIn::create(move->clone(), 2.5f);
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseOut::create(move->clone(), 2.5f);
+
+    auto move_ease_out      = EaseOut::create(move->clone(), 2.5f);
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    
+
     auto a2 = _grossini->runAction(RepeatForever::create(seq1));
     a2->setTag(1);
 
@@ -110,7 +108,6 @@ void SpriteEase::onEnter()
     schedule(CC_SCHEDULE_SELECTOR(SpriteEase::testStopAction), 6.25f);
 }
 
-
 void SpriteEase::testStopAction(float dt)
 {
     unschedule(CC_SCHEDULE_SELECTOR(SpriteEase::testStopAction));
@@ -124,7 +121,6 @@ std::string SpriteEase::subtitle() const
     return "EaseIn - EaseOut - Stop";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseInOut
@@ -135,30 +131,29 @@ void SpriteEaseInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
 
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
-//    id move_back = move->reverse();
-    
-    auto move_ease_inout1 = EaseInOut::create(move->clone(), 0.65f);
+    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
+    //    id move_back = move->reverse();
+
+    auto move_ease_inout1      = EaseInOut::create(move->clone(), 0.65f);
     auto move_ease_inout_back1 = move_ease_inout1->reverse();
-    
-    auto move_ease_inout2 = EaseInOut::create(move->clone(), 1.35f);
+
+    auto move_ease_inout2      = EaseInOut::create(move->clone(), 1.35f);
     auto move_ease_inout_back2 = move_ease_inout2->reverse();
 
-    auto move_ease_inout3 = EaseInOut::create(move->clone(), 1.0f);
+    auto move_ease_inout3      = EaseInOut::create(move->clone(), 1.0f);
     auto move_ease_inout_back3 = move_ease_inout3->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
 
-    auto seq1 = Sequence::create( move_ease_inout1, delay, move_ease_inout_back1, delay->clone(), nullptr);
-    auto seq2 = Sequence::create( move_ease_inout2, delay->clone(), move_ease_inout_back2, delay->clone(), nullptr);
-    auto seq3 = Sequence::create( move_ease_inout3, delay->clone(), move_ease_inout_back3, delay->clone(), nullptr);
-        
+    auto seq1 = Sequence::create(move_ease_inout1, delay, move_ease_inout_back1, delay->clone(), nullptr);
+    auto seq2 = Sequence::create(move_ease_inout2, delay->clone(), move_ease_inout_back2, delay->clone(), nullptr);
+    auto seq3 = Sequence::create(move_ease_inout3, delay->clone(), move_ease_inout_back3, delay->clone(), nullptr);
+
     _tamara->runAction(RepeatForever::create(seq1));
     _kathia->runAction(RepeatForever::create(seq2));
     _grossini->runAction(RepeatForever::create(seq3));
 }
 
-
 std::string SpriteEaseInOut::subtitle() const
 {
     return "EaseInOut and rates";
@@ -173,29 +168,27 @@ std::string SpriteEaseInOut::subtitle() const
 void SpriteEaseExponential::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseExponentialIn::create(move->clone());
+
+    auto move_ease_in      = EaseExponentialIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseExponentialOut::create(move->clone());
+
+    auto move_ease_out      = EaseExponentialOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
 
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-
 std::string SpriteEaseExponential::subtitle() const
 {
     return "ExpIn - ExpOut actions";
@@ -210,25 +203,23 @@ void SpriteEaseExponentialInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
 
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseExponentialInOut::create(move->clone() );
-    auto move_ease_back = move_ease->reverse();    //--> reverse()
-    
+
+    auto move_ease      = EaseExponentialInOut::create(move->clone());
+    auto move_ease_back = move_ease->reverse();  //--> reverse()
+
     auto delay = DelayTime::create(0.25f);
-    
-    auto seq1 = Sequence::create( move, delay, move_back, delay->clone(), nullptr);
-    auto seq2 = Sequence::create( move_ease, delay, move_ease_back, delay->clone(), nullptr);
-    
+
+    auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
+    auto seq2 = Sequence::create(move_ease, delay, move_ease_back, delay->clone(), nullptr);
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-
 std::string SpriteEaseExponentialInOut::subtitle() const
 {
     return "EaseExponentialInOut action";
@@ -243,29 +234,26 @@ void SpriteEaseSine::onEnter()
 {
     EaseSpriteDemo::onEnter();
 
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseSineIn::create(move->clone() );
+
+    auto move_ease_in      = EaseSineIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseSineOut::create(move->clone() );
+
+    auto move_ease_out      = EaseSineOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-        
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));    
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-
 std::string SpriteEaseSine::subtitle() const
 {
     return "EaseSineIn - EaseSineOut";
@@ -280,24 +268,23 @@ void SpriteEaseSineInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
 
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseSineInOut::create(move->clone() );
+
+    auto move_ease      = EaseSineInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
 
     this->positionForTwo();
 
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-
 std::string SpriteEaseSineInOut::subtitle() const
 {
     return "EaseSineInOut action";
@@ -311,27 +298,26 @@ std::string SpriteEaseSineInOut::subtitle() const
 void SpriteEaseElastic::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseElasticIn::create(move->clone() );
+
+    auto move_ease_in      = EaseElasticIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseElasticOut::create(move->clone() );
+
+    auto move_ease_out      = EaseElasticOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
 
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));    
-}
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
+}
 
 std::string SpriteEaseElastic::subtitle() const
 {
@@ -347,36 +333,34 @@ std::string SpriteEaseElastic::subtitle() const
 void SpriteEaseElasticInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
 
-    auto move_ease_inout1 = EaseElasticInOut::create(move->clone(), 0.3f);
+    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
+
+    auto move_ease_inout1      = EaseElasticInOut::create(move->clone(), 0.3f);
     auto move_ease_inout_back1 = move_ease_inout1->reverse();
-    
-    auto move_ease_inout2 = EaseElasticInOut::create(move->clone(), 0.45f);
+
+    auto move_ease_inout2      = EaseElasticInOut::create(move->clone(), 0.45f);
     auto move_ease_inout_back2 = move_ease_inout2->reverse();
-    
-    auto move_ease_inout3 = EaseElasticInOut::create(move->clone(), 0.6f);
+
+    auto move_ease_inout3      = EaseElasticInOut::create(move->clone(), 0.6f);
     auto move_ease_inout_back3 = move_ease_inout3->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-        
+
     auto seq1 = Sequence::create(move_ease_inout1, delay, move_ease_inout_back1, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_inout2, delay->clone(), move_ease_inout_back2, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_inout3, delay->clone(), move_ease_inout_back3, delay->clone(), nullptr);
-    
-    _tamara->runAction( RepeatForever::create(seq1));
-    _kathia->runAction( RepeatForever::create(seq2));
-    _grossini->runAction( RepeatForever::create(seq3)); 
-}
 
+    _tamara->runAction(RepeatForever::create(seq1));
+    _kathia->runAction(RepeatForever::create(seq2));
+    _grossini->runAction(RepeatForever::create(seq3));
+}
 
 std::string SpriteEaseElasticInOut::subtitle() const
 {
     return "EaseElasticInOut action";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseBounce
@@ -386,34 +370,32 @@ std::string SpriteEaseElasticInOut::subtitle() const
 void SpriteEaseBounce::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseBounceIn::create(move->clone() );
+
+    auto move_ease_in      = EaseBounceIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseBounceOut::create(move->clone() );
+
+    auto move_ease_out      = EaseBounceOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));    
-}
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
+}
 
 std::string SpriteEaseBounce::subtitle() const
 {
     return "Bounce In - Out actions";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseBounceInOut
@@ -424,23 +406,22 @@ void SpriteEaseBounceInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
 
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseBounceInOut::create(move->clone() );
+
+    auto move_ease      = EaseBounceInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-}
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+}
 
 std::string SpriteEaseBounceInOut::subtitle() const
 {
@@ -456,28 +437,27 @@ std::string SpriteEaseBounceInOut::subtitle() const
 void SpriteEaseBack::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseBackIn::create(move->clone());
+
+    auto move_ease_in      = EaseBackIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseBackOut::create( move->clone());
+
+    auto move_ease_out      = EaseBackOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
+
     _grossini->runAction(RepeatForever::create(seq1));
     _tamara->runAction(RepeatForever::create(seq2));
-    _kathia->runAction(RepeatForever::create(seq3));    
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-
 std::string SpriteEaseBack::subtitle() const
 {
     return "Back In - Out actions";
@@ -492,24 +472,23 @@ std::string SpriteEaseBack::subtitle() const
 void SpriteEaseBackInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseBackInOut::create(move->clone() );
+
+    auto move_ease      = EaseBackInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));    
-}
 
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+}
 
 std::string SpriteEaseBackInOut::subtitle() const
 {
@@ -525,55 +504,52 @@ std::string SpriteEaseBackInOut::subtitle() const
 void SpriteEaseBezier::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     //
     // startPosition can be any coordinate, but since the movement
     // is relative to the Bezier curve, make it (0,0)
     //
-    
+
     centerSprites(3);
-    
+
     // sprite 1
     ccBezierConfig bezier;
-    bezier.controlPoint_1 = Vec2(0.0f, s.height/2);
-    bezier.controlPoint_2 = Vec2(300.0f, -s.height/2);
-    bezier.endPosition = Vec2(300.0f,100.0f);
-    
-    auto bezierForward = BezierBy::create(3, bezier);
+    bezier.controlPoint_1 = Vec2(0.0f, s.height / 2);
+    bezier.controlPoint_2 = Vec2(300.0f, -s.height / 2);
+    bezier.endPosition    = Vec2(300.0f, 100.0f);
+
+    auto bezierForward     = BezierBy::create(3, bezier);
     auto bezierEaseForward = EaseBezierAction::create(bezierForward);
     bezierEaseForward->setBezierParamer(0.5f, 0.5f, 1.0f, 1.0f);
-    
+
     auto bezierEaseBack = bezierEaseForward->reverse();
-    auto rep = RepeatForever::create(Sequence::create( bezierEaseForward, bezierEaseBack, nullptr));
-    
-    
+    auto rep            = RepeatForever::create(Sequence::create(bezierEaseForward, bezierEaseBack, nullptr));
+
     // sprite 2
-    _tamara->setPosition(80,160);
-	ccBezierConfig bezier2;
-    bezier2.controlPoint_1 = Vec2(100.0f, s.height/2);
-    bezier2.controlPoint_2 = Vec2(200.0f, -s.height/2);
-    bezier2.endPosition = Vec2(240.0f,160.0f);
-    
-    auto bezierTo1 = BezierTo::create(2, bezier2);
+    _tamara->setPosition(80, 160);
+    ccBezierConfig bezier2;
+    bezier2.controlPoint_1 = Vec2(100.0f, s.height / 2);
+    bezier2.controlPoint_2 = Vec2(200.0f, -s.height / 2);
+    bezier2.endPosition    = Vec2(240.0f, 160.0f);
+
+    auto bezierTo1     = BezierTo::create(2, bezier2);
     auto bezierEaseTo1 = EaseBezierAction::create(bezierTo1);
     bezierEaseTo1->setBezierParamer(0.5f, 0.5f, 1.0f, 1.0f);
-    
+
     // sprite 3
-    _kathia->setPosition(400.0f,160.0f);
-    auto bezierTo2 = BezierTo::create(2, bezier2);
+    _kathia->setPosition(400.0f, 160.0f);
+    auto bezierTo2     = BezierTo::create(2, bezier2);
     auto bezierEaseTo2 = EaseBezierAction::create(bezierTo2);
     bezierEaseTo2->setBezierParamer(0.0f, 0.5f, -5.0f, 1.0f);
 
-    
-    _grossini->runAction( rep);
+    _grossini->runAction(rep);
     _tamara->runAction(bezierEaseTo1);
     _kathia->runAction(bezierEaseTo2);
-    
 }
 
-std::string SpriteEaseBezier::subtitle()const
+std::string SpriteEaseBezier::subtitle() const
 {
     return "SpriteEaseBezier action";
 }
@@ -587,25 +563,25 @@ std::string SpriteEaseBezier::subtitle()const
 void SpriteEaseQuadratic::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseQuadraticActionIn::create(move->clone() );
+
+    auto move_ease_in      = EaseQuadraticActionIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseQuadraticActionOut::create(move->clone() );
+
+    auto move_ease_out      = EaseQuadraticActionOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
 std::string SpriteEaseQuadratic::subtitle() const
@@ -622,30 +598,29 @@ std::string SpriteEaseQuadratic::subtitle() const
 void SpriteEaseQuadraticInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseQuadraticActionInOut::create(move->clone() );
+
+    auto move_ease      = EaseQuadraticActionInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-std::string SpriteEaseQuadraticInOut::subtitle()const
+std::string SpriteEaseQuadraticInOut::subtitle() const
 {
     return "SpriteEaseQuadraticInOut action";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseQuartic
@@ -655,28 +630,28 @@ std::string SpriteEaseQuadraticInOut::subtitle()const
 void SpriteEaseQuartic::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseQuarticActionIn::create(move->clone() );
+
+    auto move_ease_in      = EaseQuarticActionIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseQuarticActionOut::create(move->clone() );
+
+    auto move_ease_out      = EaseQuarticActionOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-std::string SpriteEaseQuartic::subtitle()const
+std::string SpriteEaseQuartic::subtitle() const
 {
     return "SpriteEaseQuartic action";
 }
@@ -690,25 +665,25 @@ std::string SpriteEaseQuartic::subtitle()const
 void SpriteEaseQuarticInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseQuarticActionInOut::create(move->clone() );
+
+    auto move_ease      = EaseQuarticActionInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-std::string SpriteEaseQuarticInOut::subtitle()const
+std::string SpriteEaseQuarticInOut::subtitle() const
 {
     return "SpriteEaseQuarticInOut action";
 }
@@ -722,33 +697,32 @@ std::string SpriteEaseQuarticInOut::subtitle()const
 void SpriteEaseQuintic::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseQuinticActionIn::create(move->clone() );
+
+    auto move_ease_in      = EaseQuinticActionIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseQuinticActionOut::create(move->clone() );
+
+    auto move_ease_out      = EaseQuinticActionOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-std::string SpriteEaseQuintic::subtitle()const
+std::string SpriteEaseQuintic::subtitle() const
 {
     return "SpriteEaseQuintic action";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseQuinticInOut
@@ -758,25 +732,25 @@ std::string SpriteEaseQuintic::subtitle()const
 void SpriteEaseQuinticInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseQuinticActionInOut::create(move->clone() );
+
+    auto move_ease      = EaseQuinticActionInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-std::string SpriteEaseQuinticInOut::subtitle()const
+std::string SpriteEaseQuinticInOut::subtitle() const
 {
     return "SpriteEaseQuinticInOut action";
 }
@@ -790,33 +764,32 @@ std::string SpriteEaseQuinticInOut::subtitle()const
 void SpriteEaseCircle::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseCircleActionIn::create(move->clone() );
+
+    auto move_ease_in      = EaseCircleActionIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseCircleActionOut::create(move->clone() );
+
+    auto move_ease_out      = EaseCircleActionOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-std::string SpriteEaseCircle::subtitle()const
+std::string SpriteEaseCircle::subtitle() const
 {
     return "SpriteEaseCircle action";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseCircleInOut
@@ -826,25 +799,25 @@ std::string SpriteEaseCircle::subtitle()const
 void SpriteEaseCircleInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseCircleActionInOut::create(move->clone() );
+
+    auto move_ease      = EaseCircleActionInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-std::string SpriteEaseCircleInOut::subtitle()const
+std::string SpriteEaseCircleInOut::subtitle() const
 {
     return "SpriteEaseCircleInOut action";
 }
@@ -858,33 +831,32 @@ std::string SpriteEaseCircleInOut::subtitle()const
 void SpriteEaseCubic::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease_in = EaseCubicActionIn::create(move->clone() );
+
+    auto move_ease_in      = EaseCubicActionIn::create(move->clone());
     auto move_ease_in_back = move_ease_in->reverse();
-    
-    auto move_ease_out = EaseCubicActionOut::create(move->clone() );
+
+    auto move_ease_out      = EaseCubicActionOut::create(move->clone());
     auto move_ease_out_back = move_ease_out->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease_in, delay->clone(), move_ease_in_back, delay->clone(), nullptr);
     auto seq3 = Sequence::create(move_ease_out, delay->clone(), move_ease_out_back, delay->clone(), nullptr);
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
-    _kathia->runAction( RepeatForever::create(seq3));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
+    _kathia->runAction(RepeatForever::create(seq3));
 }
 
-std::string SpriteEaseCubic::subtitle()const
+std::string SpriteEaseCubic::subtitle() const
 {
     return "SpriteEaseCubic action";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteEaseCubicInOut
@@ -894,25 +866,25 @@ std::string SpriteEaseCubic::subtitle()const
 void SpriteEaseCubicInOut::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
-    auto move = MoveBy::create(3, Vec2(VisibleRect::right().x-130, 0.0f));
+
+    auto move      = MoveBy::create(3, Vec2(VisibleRect::right().x - 130, 0.0f));
     auto move_back = move->reverse();
-    
-    auto move_ease = EaseCubicActionInOut::create(move->clone() );
+
+    auto move_ease      = EaseCubicActionInOut::create(move->clone());
     auto move_ease_back = move_ease->reverse();
-    
+
     auto delay = DelayTime::create(0.25f);
-    
+
     auto seq1 = Sequence::create(move, delay, move_back, delay->clone(), nullptr);
     auto seq2 = Sequence::create(move_ease, delay->clone(), move_ease_back, delay->clone(), nullptr);
-    
+
     this->positionForTwo();
-    
-    _grossini->runAction( RepeatForever::create(seq1));
-    _tamara->runAction( RepeatForever::create(seq2));
+
+    _grossini->runAction(RepeatForever::create(seq1));
+    _tamara->runAction(RepeatForever::create(seq2));
 }
 
-std::string SpriteEaseCubicInOut::title()const
+std::string SpriteEaseCubicInOut::title() const
 {
     return "SpriteEaseCubicInOut action";
 }
@@ -925,43 +897,43 @@ std::string SpriteEaseCubicInOut::title()const
 void SpeedTest::onEnter()
 {
     EaseSpriteDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
 
     // rotate and jump
-    auto jump1 = JumpBy::create(4.0f, Vec2(-s.width+80, 0.0f), 100.0f, 4);
+    auto jump1 = JumpBy::create(4.0f, Vec2(-s.width + 80, 0.0f), 100.0f, 4);
     auto jump2 = jump1->reverse();
-    auto rot1 = RotateBy::create(4.0f, 360*2.0f);
-    auto rot2 = rot1->reverse();
-    
+    auto rot1  = RotateBy::create(4.0f, 360 * 2.0f);
+    auto rot2  = rot1->reverse();
+
     auto seq3_1 = Sequence::create(jump2, jump1, nullptr);
-    auto seq3_2 = Sequence::create( rot1, rot2, nullptr);
-    auto spawn = Spawn::create(seq3_1, seq3_2, nullptr);
+    auto seq3_2 = Sequence::create(rot1, rot2, nullptr);
+    auto spawn  = Spawn::create(seq3_1, seq3_2, nullptr);
     auto action = Speed::create(RepeatForever::create(spawn), 1.0f);
     action->setTag(kTagAction1);
-    
+
     auto action2 = action->clone();
     auto action3 = action->clone();
 
     action2->setTag(kTagAction1);
     action3->setTag(kTagAction1);
-    
+
     _grossini->runAction(action2);
     _tamara->runAction(action3);
     _kathia->runAction(action);
-    
-    this->schedule(CC_SCHEDULE_SELECTOR(SpeedTest::altertime), 1.0f);//:@selector(altertime:) interval:1.0f];
+
+    this->schedule(CC_SCHEDULE_SELECTOR(SpeedTest::altertime), 1.0f);  //:@selector(altertime:) interval:1.0f];
 }
 
 void SpeedTest::altertime(float dt)
-{    
+{
     auto action1 = static_cast<Speed*>(_grossini->getActionByTag(kTagAction1));
     auto action2 = static_cast<Speed*>(_tamara->getActionByTag(kTagAction1));
     auto action3 = static_cast<Speed*>(_kathia->getActionByTag(kTagAction1));
-    
-    action1->setSpeed( CCRANDOM_MINUS1_1() * 2 );
-    action2->setSpeed( CCRANDOM_MINUS1_1() * 2 );
-    action3->setSpeed( CCRANDOM_MINUS1_1() * 2 );
+
+    action1->setSpeed(CCRANDOM_MINUS1_1() * 2);
+    action2->setSpeed(CCRANDOM_MINUS1_1() * 2);
+    action3->setSpeed(CCRANDOM_MINUS1_1() * 2);
 }
 
 std::string SpeedTest::subtitle() const
@@ -1003,9 +975,7 @@ ActionsEaseTests::ActionsEaseTests()
     ADD_TEST_CASE(SpeedTest);
 }
 
-EaseSpriteDemo::EaseSpriteDemo()
-{
-}
+EaseSpriteDemo::EaseSpriteDemo() {}
 
 EaseSpriteDemo::~EaseSpriteDemo()
 {
@@ -1015,13 +985,14 @@ EaseSpriteDemo::~EaseSpriteDemo()
 }
 
 void EaseSpriteDemo::positionForTwo()
-{    
-    _grossini->setPosition(VisibleRect::left().x+60, VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height*1/5);
-    _tamara->setPosition(VisibleRect::left().x+60, VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height*4/5);
+{
+    _grossini->setPosition(VisibleRect::left().x + 60,
+                           VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 1 / 5);
+    _tamara->setPosition(VisibleRect::left().x + 60,
+                         VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 4 / 5);
     _kathia->setVisible(false);
 }
 
-
 std::string EaseSpriteDemo::subtitle() const
 {
     return "No title";
@@ -1032,15 +1003,21 @@ void EaseSpriteDemo::onEnter()
     TestCase::onEnter();
 
     // Or you can create an sprite using a filename. PNG and BMP files are supported.
-    _grossini = Sprite::create(s_pathGrossini); _grossini->retain();
-    _tamara = Sprite::create(s_pathSister1); _tamara->retain();
-    _kathia = Sprite::create(s_pathSister2); _kathia->retain();
-    
-    addChild( _grossini, 3);
-    addChild( _kathia, 2);
-    addChild( _tamara, 1);
-
-    _grossini->setPosition(VisibleRect::left().x + 60, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height*1/5);
-    _kathia->setPosition(VisibleRect::left().x + 60, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height*2.5f/5);
-    _tamara->setPosition(VisibleRect::left().x + 60, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height*4/5);
+    _grossini = Sprite::create(s_pathGrossini);
+    _grossini->retain();
+    _tamara = Sprite::create(s_pathSister1);
+    _tamara->retain();
+    _kathia = Sprite::create(s_pathSister2);
+    _kathia->retain();
+
+    addChild(_grossini, 3);
+    addChild(_kathia, 2);
+    addChild(_tamara, 1);
+
+    _grossini->setPosition(VisibleRect::left().x + 60,
+                           VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 1 / 5);
+    _kathia->setPosition(VisibleRect::left().x + 60,
+                         VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 2.5f / 5);
+    _tamara->setPosition(VisibleRect::left().x + 60,
+                         VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 4 / 5);
 }
diff --git a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h
index 1fe1f577f2c5..2676595bb027 100644
--- a/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h
+++ b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h
@@ -34,11 +34,11 @@ DEFINE_TEST_SUITE(ActionsEaseTests);
 class EaseSpriteDemo : public TestCase
 {
 protected:
-    cocos2d::Sprite*    _grossini;
-    cocos2d::Sprite*    _tamara;
-    cocos2d::Sprite*    _kathia;
+    cocos2d::Sprite* _grossini;
+    cocos2d::Sprite* _tamara;
+    cocos2d::Sprite* _kathia;
 
-    std::string    _title;
+    std::string _title;
 
 public:
     EaseSpriteDemo();
@@ -46,7 +46,7 @@ class EaseSpriteDemo : public TestCase
 
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
-    
+
     void centerSprites(unsigned int numberOfSprites);
 
     void positionForTwo();
@@ -225,7 +225,6 @@ class SpriteEaseQuinticInOut : public EaseSpriteDemo
     virtual std::string subtitle() const override;
 };
 
-
 class SpriteEaseCircle : public EaseSpriteDemo
 {
 public:
@@ -272,5 +271,4 @@ class SpeedTest : public EaseSpriteDemo
     void altertime(float dt);
 };
 
-
 #endif
diff --git a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp
index f1f2f2cba037..6d570773260a 100644
--- a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp
+++ b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp
@@ -45,13 +45,9 @@ ActionsProgressTests::ActionsProgressTests()
 // SpriteDemo
 //
 //------------------------------------------------------------------
-SpriteDemo::SpriteDemo()
-{
-}
+SpriteDemo::SpriteDemo() {}
 
-SpriteDemo::~SpriteDemo()
-{
-}
+SpriteDemo::~SpriteDemo() {}
 
 std::string SpriteDemo::title() const
 {
@@ -62,7 +58,7 @@ void SpriteDemo::onEnter()
 {
     TestCase::onEnter();
 
-    auto background = LayerColor::create(Color4B(255,0,0,255));
+    auto background = LayerColor::create(Color4B(255, 0, 0, 255));
     addChild(background, -10);
 }
 
@@ -74,25 +70,25 @@ void SpriteDemo::onEnter()
 void SpriteProgressToRadial::onEnter()
 {
     SpriteDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
 
     auto to1 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
     auto to2 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
 
     auto left = ProgressTimer::create(Sprite::create(s_pathSister1));
-    left->setType( ProgressTimer::Type::RADIAL );
+    left->setType(ProgressTimer::Type::RADIAL);
     addChild(left);
-    left->setPosition(100, s.height/2);
-    left->runAction( RepeatForever::create(to1));
-    
+    left->setPosition(100, s.height / 2);
+    left->runAction(RepeatForever::create(to1));
+
     auto right = ProgressTimer::create(Sprite::create(s_pathBlock));
     right->setType(ProgressTimer::Type::RADIAL);
     // Makes the ridial CCW
     right->setReverseDirection(true);
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
-    right->runAction( RepeatForever::create(to2));
+    right->setPosition(s.width - 100, s.height / 2);
+    right->runAction(RepeatForever::create(to2));
 }
 
 std::string SpriteProgressToRadial::subtitle() const
@@ -109,22 +105,22 @@ std::string SpriteProgressToRadial::subtitle() const
 void SpriteProgressToHorizontal::onEnter()
 {
     SpriteDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto to1 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
     auto to2 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
-    
+
     auto left = ProgressTimer::create(Sprite::create(s_pathSister1));
     left->setType(ProgressTimer::Type::BAR);
     //    Setup for a bar starting from the left since the midpoint is 0 for the x
-    left->setMidpoint(Vec2(0.0f,0.0f));
+    left->setMidpoint(Vec2(0.0f, 0.0f));
     //    Setup for a horizontal bar since the bar change rate is 0 for y meaning no vertical change
     left->setBarChangeRate(Vec2(1.0f, 0.0f));
     addChild(left);
-    left->setPosition(100, s.height/2);
-    left->runAction( RepeatForever::create(to1));
-    
+    left->setPosition(100, s.height / 2);
+    left->runAction(RepeatForever::create(to1));
+
     auto right = ProgressTimer::create(Sprite::create(s_pathSister2));
     right->setType(ProgressTimer::Type::BAR);
     //    Setup for a bar starting from the left since the midpoint is 1 for the x
@@ -132,8 +128,8 @@ void SpriteProgressToHorizontal::onEnter()
     //    Setup for a horizontal bar since the bar change rate is 0 for y meaning no vertical change
     right->setBarChangeRate(Vec2(1.0f, 0.0f));
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
-    right->runAction( RepeatForever::create(to2));
+    right->setPosition(s.width - 100, s.height / 2);
+    right->runAction(RepeatForever::create(to2));
 }
 
 std::string SpriteProgressToHorizontal::subtitle() const
@@ -149,23 +145,23 @@ std::string SpriteProgressToHorizontal::subtitle() const
 void SpriteProgressToVertical::onEnter()
 {
     SpriteDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto to1 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
     auto to2 = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
-    
+
     auto left = ProgressTimer::create(Sprite::create(s_pathSister1));
     left->setType(ProgressTimer::Type::BAR);
 
     //    Setup for a bar starting from the bottom since the midpoint is 0 for the y
-    left->setMidpoint(Vec2(0.0f,0.0f));
+    left->setMidpoint(Vec2(0.0f, 0.0f));
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     left->setBarChangeRate(Vec2(0.0f, 1.0f));
     addChild(left);
-    left->setPosition(100, s.height/2);
-    left->runAction( RepeatForever::create(to1));
-    
+    left->setPosition(100, s.height / 2);
+    left->runAction(RepeatForever::create(to1));
+
     auto right = ProgressTimer::create(Sprite::create(s_pathSister2));
     right->setType(ProgressTimer::Type::BAR);
     //    Setup for a bar starting from the bottom since the midpoint is 0 for the y
@@ -173,8 +169,8 @@ void SpriteProgressToVertical::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     right->setBarChangeRate(Vec2(0, 1));
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
-    right->runAction( RepeatForever::create(to2));
+    right->setPosition(s.width - 100, s.height / 2);
+    right->runAction(RepeatForever::create(to2));
 }
 
 std::string SpriteProgressToVertical::subtitle() const
@@ -196,28 +192,28 @@ void SpriteProgressToRadialMidpointChanged::onEnter()
     auto action = Sequence::createWithTwoActions(ProgressTo::create(2, 100), ProgressTo::create(0, 0));
 
     /**
-   *  Our image on the left should be a radial progress indicator, clockwise
-   */
+     *  Our image on the left should be a radial progress indicator, clockwise
+     */
     auto left = ProgressTimer::create(Sprite::create(s_pathBlock));
     left->setType(ProgressTimer::Type::RADIAL);
     addChild(left);
     left->setMidpoint(Vec2(0.25f, 0.75f));
-    left->setPosition(100, s.height/2);
+    left->setPosition(100, s.height / 2);
     left->runAction(RepeatForever::create(action->clone()));
 
     /**
-   *  Our image on the left should be a radial progress indicator, counter clockwise
-   */
+     *  Our image on the left should be a radial progress indicator, counter clockwise
+     */
     auto right = ProgressTimer::create(Sprite::create(s_pathBlock));
     right->setType(ProgressTimer::Type::RADIAL);
     right->setMidpoint(Vec2(0.75f, 0.25f));
 
     /**
-   *  Note the reverse property (default=NO) is only added to the right image. That's how
-   *  we get a counter clockwise progress.
-   */
+     *  Note the reverse property (default=NO) is only added to the right image. That's how
+     *  we get a counter clockwise progress.
+     */
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
+    right->setPosition(s.width - 100, s.height / 2);
     right->runAction(RepeatForever::create(action->clone()));
 }
 
@@ -247,7 +243,7 @@ void SpriteProgressBarVarious::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     left->setBarChangeRate(Vec2(1.0f, 0.0f));
     addChild(left);
-    left->setPosition(100, s.height/2);
+    left->setPosition(100, s.height / 2);
     left->runAction(RepeatForever::create(to->clone()));
 
     auto middle = ProgressTimer::create(Sprite::create(s_pathSister2));
@@ -255,9 +251,9 @@ void SpriteProgressBarVarious::onEnter()
     //    Setup for a bar starting from the bottom since the midpoint is 0 for the y
     middle->setMidpoint(Vec2(0.5f, 0.5f));
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
-    middle->setBarChangeRate(Vec2(1,1));
+    middle->setBarChangeRate(Vec2(1, 1));
     addChild(middle);
-    middle->setPosition(s.width/2, s.height/2);
+    middle->setPosition(s.width / 2, s.height / 2);
     middle->runAction(RepeatForever::create(to->clone()));
 
     auto right = ProgressTimer::create(Sprite::create(s_pathSister2));
@@ -267,7 +263,7 @@ void SpriteProgressBarVarious::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     right->setBarChangeRate(Vec2(0, 1));
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
+    right->setPosition(s.width - 100, s.height / 2);
     right->runAction(RepeatForever::create(to->clone()));
 }
 
@@ -287,14 +283,10 @@ void SpriteProgressBarTintAndFade::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-    auto to = Sequence::createWithTwoActions(ProgressTo::create(6, 100), ProgressTo::create(0, 0));
-	auto tint = Sequence::create(TintTo::create(1, 255, 0, 0),
-								   TintTo::create(1, 0, 255, 0),
-								   TintTo::create(1, 0, 0, 255),
-								   nullptr);
-	auto fade = Sequence::create(FadeTo::create(1.0f, 0),
-								   FadeTo::create(1.0f, 255),
-								   nullptr);
+    auto to   = Sequence::createWithTwoActions(ProgressTo::create(6, 100), ProgressTo::create(0, 0));
+    auto tint = Sequence::create(TintTo::create(1, 255, 0, 0), TintTo::create(1, 0, 255, 0),
+                                 TintTo::create(1, 0, 0, 255), nullptr);
+    auto fade = Sequence::create(FadeTo::create(1.0f, 0), FadeTo::create(1.0f, 255), nullptr);
 
     auto left = ProgressTimer::create(Sprite::create(s_pathSister1));
     left->setType(ProgressTimer::Type::BAR);
@@ -304,7 +296,7 @@ void SpriteProgressBarTintAndFade::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     left->setBarChangeRate(Vec2(1.0f, 0.0f));
     addChild(left);
-    left->setPosition(100, s.height/2);
+    left->setPosition(100, s.height / 2);
     left->runAction(RepeatForever::create(to->clone()));
     left->runAction(RepeatForever::create(tint->clone()));
 
@@ -317,7 +309,7 @@ void SpriteProgressBarTintAndFade::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     middle->setBarChangeRate(Vec2(1, 1));
     addChild(middle);
-    middle->setPosition(s.width/2, s.height/2);
+    middle->setPosition(s.width / 2, s.height / 2);
     middle->runAction(RepeatForever::create(to->clone()));
     middle->runAction(RepeatForever::create(fade->clone()));
 
@@ -330,9 +322,9 @@ void SpriteProgressBarTintAndFade::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     right->setBarChangeRate(Vec2(0, 1));
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
+    right->setPosition(s.width - 100, s.height / 2);
     right->runAction(RepeatForever::create(to->clone()));
-	right->runAction(RepeatForever::create(tint->clone()));
+    right->runAction(RepeatForever::create(tint->clone()));
     right->runAction(RepeatForever::create(fade->clone()));
 
     right->addChild(Label::createWithTTF("Tint and Fade", "fonts/Marker Felt.ttf", 20.0f));
@@ -365,7 +357,7 @@ void SpriteProgressWithSpriteFrame::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     left->setBarChangeRate(Vec2(1.0f, 0.0f));
     addChild(left);
-    left->setPosition(100, s.height/2);
+    left->setPosition(100, s.height / 2);
     left->runAction(RepeatForever::create(to->clone()));
 
     auto middle = ProgressTimer::create(Sprite::createWithSpriteFrameName("grossini_dance_02.png"));
@@ -375,7 +367,7 @@ void SpriteProgressWithSpriteFrame::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     middle->setBarChangeRate(Vec2(1, 1));
     addChild(middle);
-    middle->setPosition(s.width/2, s.height/2);
+    middle->setPosition(s.width / 2, s.height / 2);
     middle->runAction(RepeatForever::create(to->clone()));
 
     auto right = ProgressTimer::create(Sprite::createWithSpriteFrameName("grossini_dance_03.png"));
@@ -385,7 +377,7 @@ void SpriteProgressWithSpriteFrame::onEnter()
     //    Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
     right->setBarChangeRate(Vec2(0, 1));
     addChild(right);
-    right->setPosition(s.width-100, s.height/2);
+    right->setPosition(s.width - 100, s.height / 2);
     right->runAction(RepeatForever::create(to->clone()));
 }
 
diff --git a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h
index 336fabd2f3e2..5fffe2bb32a4 100644
--- a/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h
+++ b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h
@@ -104,4 +104,4 @@ class SpriteProgressWithSpriteFrame : public SpriteDemo
     virtual std::string subtitle() const override;
 };
 
-#endif // _ACTIONS__PROGRESS_TEST_H_
+#endif  // _ACTIONS__PROGRESS_TEST_H_
diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
index 03a32b70bea0..23f6b817cd42 100644
--- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
+++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
@@ -1,28 +1,28 @@
-    /****************************************************************************
- Copyright (c) 2012 cocos2d-x.org
- Copyright (c) 2013-2016 Chukong Technologies Inc.
- Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
+/****************************************************************************
+Copyright (c) 2012 cocos2d-x.org
+Copyright (c) 2013-2016 Chukong Technologies Inc.
+Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+
+http://www.cocos2d-x.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+****************************************************************************/
 
 #include "ActionsTest.h"
 #include "../testResource.h"
@@ -110,7 +110,7 @@ void ActionsDemo::onEnter()
     _grossini = Sprite::create(s_pathGrossini);
     _grossini->retain();
 
-    _tamara = Sprite::create(s_pathSister1); 
+    _tamara = Sprite::create(s_pathSister1);
     _tamara->retain();
 
     _kathia = Sprite::create(s_pathSister2);
@@ -120,9 +120,12 @@ void ActionsDemo::onEnter()
     addChild(_tamara, 2);
     addChild(_kathia, 3);
 
-    _grossini->setPosition(VisibleRect::center().x, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height/3);
-    _tamara->setPosition(VisibleRect::center().x, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height*2/3);
-    _kathia->setPosition(VisibleRect::center().x, VisibleRect::bottom().y+VisibleRect::getVisibleRect().size.height/2);
+    _grossini->setPosition(VisibleRect::center().x,
+                           VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height / 3);
+    _tamara->setPosition(VisibleRect::center().x,
+                         VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height * 2 / 3);
+    _kathia->setPosition(VisibleRect::center().x,
+                         VisibleRect::bottom().y + VisibleRect::getVisibleRect().size.height / 2);
 }
 
 void ActionsDemo::onExit()
@@ -138,29 +141,29 @@ void ActionsDemo::centerSprites(unsigned int numberOfSprites)
 {
     auto s = Director::getInstance()->getWinSize();
 
-    if( numberOfSprites == 0 )
+    if (numberOfSprites == 0)
     {
         _tamara->setVisible(false);
         _kathia->setVisible(false);
         _grossini->setVisible(false);
-    } 
-    else if ( numberOfSprites == 1 ) 
+    }
+    else if (numberOfSprites == 1)
     {
         _tamara->setVisible(false);
         _kathia->setVisible(false);
-        _grossini->setPosition(s.width/2, s.height/2);
+        _grossini->setPosition(s.width / 2, s.height / 2);
     }
-    else if( numberOfSprites == 2 ) 
-    {        
-        _kathia->setPosition(s.width/3, s.height/2);
-        _tamara->setPosition(2*s.width/3, s.height/2);
+    else if (numberOfSprites == 2)
+    {
+        _kathia->setPosition(s.width / 3, s.height / 2);
+        _tamara->setPosition(2 * s.width / 3, s.height / 2);
         _grossini->setVisible(false);
-    } 
-    else if( numberOfSprites == 3 ) 
+    }
+    else if (numberOfSprites == 3)
     {
-        _grossini->setPosition(s.width/2, s.height/2);
-        _tamara->setPosition(s.width/4, s.height/2);
-        _kathia->setPosition(3 * s.width/4, s.height/2);
+        _grossini->setPosition(s.width / 2, s.height / 2);
+        _tamara->setPosition(s.width / 4, s.height / 2);
+        _kathia->setPosition(3 * s.width / 4, s.height / 2);
     }
 }
 
@@ -168,23 +171,23 @@ void ActionsDemo::alignSpritesLeft(unsigned int numberOfSprites)
 {
     auto s = Director::getInstance()->getWinSize();
 
-    if( numberOfSprites == 1 ) 
+    if (numberOfSprites == 1)
     {
         _tamara->setVisible(false);
         _kathia->setVisible(false);
-        _grossini->setPosition(60, s.height/2);
-    } 
-    else if( numberOfSprites == 2 ) 
-    {        
-        _kathia->setPosition(60, s.height/3);
-        _tamara->setPosition(60, 2*s.height/3);
-        _grossini->setVisible( false );
-    } 
-    else if( numberOfSprites == 3 ) 
+        _grossini->setPosition(60, s.height / 2);
+    }
+    else if (numberOfSprites == 2)
     {
-        _grossini->setPosition(60, s.height/2);
-        _tamara->setPosition(60, 2*s.height/3);
-        _kathia->setPosition(60, s.height/3);
+        _kathia->setPosition(60, s.height / 3);
+        _tamara->setPosition(60, 2 * s.height / 3);
+        _grossini->setVisible(false);
+    }
+    else if (numberOfSprites == 3)
+    {
+        _grossini->setPosition(60, s.height / 2);
+        _tamara->setPosition(60, 2 * s.height / 3);
+        _kathia->setPosition(60, s.height / 3);
     }
 }
 
@@ -201,13 +204,13 @@ void ActionMove::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-    auto actionTo = MoveTo::create(2, Vec2(s.width-40, s.height-40));
-    auto actionBy = MoveBy::create(2, Vec2(80.0f,80.0f));
+    auto actionTo     = MoveTo::create(2, Vec2(s.width - 40, s.height - 40));
+    auto actionBy     = MoveBy::create(2, Vec2(80.0f, 80.0f));
     auto actionByBack = actionBy->reverse();
 
-    _tamara->runAction( actionTo);
-    _grossini->runAction( Sequence::create(actionBy, actionByBack, nullptr));
-    _kathia->runAction(MoveTo::create(1, Vec2(40.0f,40.0f)));
+    _tamara->runAction(actionTo);
+    _grossini->runAction(Sequence::create(actionBy, actionByBack, nullptr));
+    _kathia->runAction(MoveTo::create(1, Vec2(40.0f, 40.0f)));
 }
 
 std::string ActionMove::subtitle() const
@@ -223,18 +226,18 @@ std::string ActionMove::subtitle() const
 void ActionMove3D::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     centerSprites(3);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    _tamara->setPosition3D(Vec3(s.width-40, s.height-40, 0.0f));
+
+    _tamara->setPosition3D(Vec3(s.width - 40, s.height - 40, 0.0f));
     _kathia->setPosition3D(Vec3(40.0f, 40.0f, 0.0f));
-    
-    auto actionTo = MoveTo::create(2, Vec3(s.width-40, s.height-40, -100.0f));
-    auto actionBy = MoveBy::create(2, Vec3(80.0f, 80.0f, -100.0f));
+
+    auto actionTo     = MoveTo::create(2, Vec3(s.width - 40, s.height - 40, -100.0f));
+    auto actionBy     = MoveBy::create(2, Vec3(80.0f, 80.0f, -100.0f));
     auto actionByBack = actionBy->reverse();
-    
+
     _tamara->runAction(actionTo);
     _grossini->runAction(Sequence::create(actionBy, actionByBack, nullptr));
     _kathia->runAction(MoveTo::create(1, Vec3(40.0f, 40.0f, -100.0f)));
@@ -256,13 +259,13 @@ void ActionScale::onEnter()
 
     centerSprites(3);
 
-    auto actionTo = ScaleTo::create(2.0f, 0.5f);
-    auto actionBy = ScaleBy::create(2.0f, 1.0f, 10.0f);
+    auto actionTo  = ScaleTo::create(2.0f, 0.5f);
+    auto actionBy  = ScaleBy::create(2.0f, 1.0f, 10.0f);
     auto actionBy2 = ScaleBy::create(2.0f, 5.0f, 1.0f);
 
-    _grossini->runAction( actionTo);
-    _tamara->runAction( Sequence::create(actionBy, actionBy->reverse(), nullptr));
-    _kathia->runAction( Sequence::create(actionBy2, actionBy2->reverse(), nullptr));
+    _grossini->runAction(actionTo);
+    _tamara->runAction(Sequence::create(actionBy, actionBy->reverse(), nullptr));
+    _kathia->runAction(Sequence::create(actionBy2, actionBy2->reverse(), nullptr));
 }
 
 std::string ActionScale::subtitle() const
@@ -281,10 +284,10 @@ void ActionSkew::onEnter()
 
     centerSprites(3);
 
-    auto actionTo = SkewTo::create(2, 37.2f, -37.2f);
+    auto actionTo     = SkewTo::create(2, 37.2f, -37.2f);
     auto actionToBack = SkewTo::create(2, 0, 0);
-    auto actionBy = SkewBy::create(2, 0.0f, -90.0f);
-    auto actionBy2 = SkewBy::create(2, 45.0f, 45.0f);
+    auto actionBy     = SkewBy::create(2, 0.0f, -90.0f);
+    auto actionBy2    = SkewBy::create(2, 45.0f, 45.0f);
     auto actionByBack = actionBy->reverse();
 
     _tamara->runAction(Sequence::create(actionTo, actionToBack, nullptr));
@@ -305,17 +308,17 @@ void ActionRotationalSkew::onEnter()
 
     this->centerSprites(3);
 
-    auto actionTo = RotateTo::create(2, 180, 180);
+    auto actionTo     = RotateTo::create(2, 180, 180);
     auto actionToBack = RotateTo::create(2, 0, 0);
-    auto actionBy = RotateBy::create(2, 0.0f, 360);
+    auto actionBy     = RotateBy::create(2, 0.0f, 360);
     auto actionByBack = actionBy->reverse();
 
-    auto actionBy2 = RotateBy::create(2, 360, 0);
+    auto actionBy2     = RotateBy::create(2, 360, 0);
     auto actionBy2Back = actionBy2->reverse();
 
-    _tamara->runAction( Sequence::create(actionBy, actionByBack, nullptr) );
-    _grossini->runAction( Sequence::create(actionTo, actionToBack, nullptr) );
-    _kathia->runAction( Sequence::create(actionBy2, actionBy2Back, nullptr) );
+    _tamara->runAction(Sequence::create(actionBy, actionByBack, nullptr));
+    _grossini->runAction(Sequence::create(actionTo, actionToBack, nullptr));
+    _kathia->runAction(Sequence::create(actionBy2, actionBy2Back, nullptr));
 }
 
 std::string ActionRotationalSkew::subtitle() const
@@ -323,9 +326,7 @@ std::string ActionRotationalSkew::subtitle() const
     return "RotationalSkewTo / RotationalSkewBy";
 }
 
-
-
-//ActionRotationalSkewVSStandardSkew
+// ActionRotationalSkewVSStandardSkew
 void ActionRotationalSkewVSStandardSkew::onEnter()
 {
     ActionsDemo::onEnter();
@@ -338,33 +339,33 @@ void ActionRotationalSkewVSStandardSkew::onEnter()
 
     Size boxSize(100.0f, 100.0f);
 
-    auto box = LayerColor::create(Color4B(255,255,0,255));
-    box->setAnchorPoint(Vec2(0.5f,0.5f));
-    box->setContentSize( boxSize );
+    auto box = LayerColor::create(Color4B(255, 255, 0, 255));
+    box->setAnchorPoint(Vec2(0.5f, 0.5f));
+    box->setContentSize(boxSize);
     box->setIgnoreAnchorPointForPosition(false);
-    box->setPosition(s.width/2, s.height - 100 - box->getContentSize().height/2);
+    box->setPosition(s.width / 2, s.height - 100 - box->getContentSize().height / 2);
     this->addChild(box);
 
     auto label = Label::createWithTTF("Standard cocos2d Skew", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/2, s.height - 100 + label->getContentSize().height);
+    label->setPosition(s.width / 2, s.height - 100 + label->getContentSize().height);
     this->addChild(label);
 
-    auto actionTo = SkewBy::create(2, 360, 0);
+    auto actionTo     = SkewBy::create(2, 360, 0);
     auto actionToBack = SkewBy::create(2, -360, 0);
 
     box->runAction(Sequence::create(actionTo, actionToBack, nullptr));
 
-    box = LayerColor::create(Color4B(255,255,0,255));
-    box->setAnchorPoint(Vec2(0.5f,0.5f));
+    box = LayerColor::create(Color4B(255, 255, 0, 255));
+    box->setAnchorPoint(Vec2(0.5f, 0.5f));
     box->setContentSize(boxSize);
     box->setIgnoreAnchorPointForPosition(false);
-    box->setPosition(s.width/2, s.height - 250 - box->getContentSize().height/2);
+    box->setPosition(s.width / 2, s.height - 250 - box->getContentSize().height / 2);
     this->addChild(box);
 
     label = Label::createWithTTF("Rotational Skew", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/2, s.height - 250 + label->getContentSize().height/2);
+    label->setPosition(s.width / 2, s.height - 250 + label->getContentSize().height / 2);
     this->addChild(label);
-    auto actionTo2 = RotateBy::create(2, 360, 0);
+    auto actionTo2     = RotateBy::create(2, 360, 0);
     auto actionToBack2 = RotateBy::create(2, -360, 0);
     box->runAction(Sequence::create(actionTo2, actionToBack2, nullptr));
 }
@@ -390,7 +391,7 @@ void ActionSkewRotateScale::onEnter()
     box->setContentSize(boxSize);
 
     static float markrside = 10.0f;
-    auto uL = LayerColor::create(Color4B(255, 0, 0, 255));
+    auto uL                = LayerColor::create(Color4B(255, 0, 0, 255));
     box->addChild(uL);
     uL->setContentSize(Size(markrside, markrside));
     uL->setPosition(0.f, boxSize.height - markrside);
@@ -403,13 +404,13 @@ void ActionSkewRotateScale::onEnter()
     uR->setAnchorPoint(Vec2(0.0f, 0.0f));
     addChild(box);
 
-    auto actionTo = SkewTo::create(2, 0.f, 2.f);
-    auto rotateTo = RotateTo::create(2, 61.0f);
+    auto actionTo      = SkewTo::create(2, 0.f, 2.f);
+    auto rotateTo      = RotateTo::create(2, 61.0f);
     auto actionScaleTo = ScaleTo::create(2, -0.44f, 0.47f);
 
     auto actionScaleToBack = ScaleTo::create(2, 1.0f, 1.0f);
-    auto rotateToBack = RotateTo::create(2, 0);
-    auto actionToBack = SkewTo::create(2, 0, 0);
+    auto rotateToBack      = RotateTo::create(2, 0);
+    auto actionToBack      = SkewTo::create(2, 0, 0);
 
     box->runAction(Sequence::create(actionTo, actionToBack, nullptr));
     box->runAction(Sequence::create(rotateTo, rotateToBack, nullptr));
@@ -432,16 +433,16 @@ void ActionRotate::onEnter()
 
     centerSprites(3);
 
-    auto actionTo = RotateTo::create( 2, 45);
-    auto actionTo2 = RotateTo::create( 2, -45);
-    auto actionTo0 = RotateTo::create(2 , 0);
-    _tamara->runAction( Sequence::create(actionTo, actionTo0, nullptr));
+    auto actionTo  = RotateTo::create(2, 45);
+    auto actionTo2 = RotateTo::create(2, -45);
+    auto actionTo0 = RotateTo::create(2, 0);
+    _tamara->runAction(Sequence::create(actionTo, actionTo0, nullptr));
 
-    auto actionBy = RotateBy::create(2 ,  360);
+    auto actionBy     = RotateBy::create(2, 360);
     auto actionByBack = actionBy->reverse();
-    _grossini->runAction( Sequence::create(actionBy, actionByBack, nullptr));
+    _grossini->runAction(Sequence::create(actionBy, actionByBack, nullptr));
 
-    _kathia->runAction( Sequence::create(actionTo2, actionTo0->clone(), nullptr));
+    _kathia->runAction(Sequence::create(actionTo2, actionTo0->clone(), nullptr));
 }
 
 std::string ActionRotate::subtitle() const
@@ -462,11 +463,11 @@ void ActionRotateBy3D::onEnter()
 
     auto actionBy1 = RotateBy::create(4, Vec3(360.0f, 0.0f, 0.0f));
     auto actionBy2 = RotateBy::create(4, Vec3(0.0f, 360.0f, 0.0f));
-    auto actionBy3 = RotateBy::create(4 ,Vec3(0.0f, 0.0f, 360.0f));
+    auto actionBy3 = RotateBy::create(4, Vec3(0.0f, 0.0f, 360.0f));
 
-    _tamara->runAction( Sequence::create(actionBy1, actionBy1->reverse(), nullptr));
-    _grossini->runAction( Sequence::create(actionBy2, actionBy2->reverse(), nullptr));
-    _kathia->runAction( Sequence::create(actionBy3, actionBy3->reverse(), nullptr));
+    _tamara->runAction(Sequence::create(actionBy1, actionBy1->reverse(), nullptr));
+    _grossini->runAction(Sequence::create(actionBy2, actionBy2->reverse(), nullptr));
+    _kathia->runAction(Sequence::create(actionBy3, actionBy3->reverse(), nullptr));
 }
 
 std::string ActionRotateBy3D::subtitle() const
@@ -485,14 +486,14 @@ void ActionJump::onEnter()
 
     centerSprites(3);
 
-    auto actionTo = JumpTo::create(2, Vec2(300,300), 50, 4);
-    auto actionBy = JumpBy::create(2, Vec2(300,0), 50, 4);
-    auto actionUp = JumpBy::create(2, Vec2(0,0), 80, 4);
+    auto actionTo     = JumpTo::create(2, Vec2(300, 300), 50, 4);
+    auto actionBy     = JumpBy::create(2, Vec2(300, 0), 50, 4);
+    auto actionUp     = JumpBy::create(2, Vec2(0, 0), 80, 4);
     auto actionByBack = actionBy->reverse();
 
-    _tamara->runAction( actionTo);
-    _grossini->runAction( Sequence::create(actionBy, actionByBack, nullptr));
-    _kathia->runAction( RepeatForever::create(actionUp));
+    _tamara->runAction(actionTo);
+    _grossini->runAction(Sequence::create(actionBy, actionByBack, nullptr));
+    _kathia->runAction(RepeatForever::create(actionUp));
 }
 std::string ActionJump::subtitle() const
 {
@@ -519,32 +520,30 @@ void ActionBezier::onEnter()
 
     // sprite 1
     ccBezierConfig bezier;
-    bezier.controlPoint_1 = Vec2(0.0f, s.height/2);
-    bezier.controlPoint_2 = Vec2(300.0f, -s.height/2);
-    bezier.endPosition = Vec2(300.0f,100.0f);
+    bezier.controlPoint_1 = Vec2(0.0f, s.height / 2);
+    bezier.controlPoint_2 = Vec2(300.0f, -s.height / 2);
+    bezier.endPosition    = Vec2(300.0f, 100.0f);
 
     auto bezierForward = BezierBy::create(3, bezier);
-    auto bezierBack = bezierForward->reverse();
-    auto rep = RepeatForever::create(Sequence::create( bezierForward, bezierBack, nullptr));
-
+    auto bezierBack    = bezierForward->reverse();
+    auto rep           = RepeatForever::create(Sequence::create(bezierForward, bezierBack, nullptr));
 
     // sprite 2
-    _tamara->setPosition(80,160);
-	ccBezierConfig bezier2;
-    bezier2.controlPoint_1 = Vec2(100.0f, s.height/2);
-    bezier2.controlPoint_2 = Vec2(200.0f, -s.height/2);
-    bezier2.endPosition = Vec2(240.0f,160.0f);
+    _tamara->setPosition(80, 160);
+    ccBezierConfig bezier2;
+    bezier2.controlPoint_1 = Vec2(100.0f, s.height / 2);
+    bezier2.controlPoint_2 = Vec2(200.0f, -s.height / 2);
+    bezier2.endPosition    = Vec2(240.0f, 160.0f);
 
-    auto bezierTo1 = BezierTo::create(2, bezier2);    
+    auto bezierTo1 = BezierTo::create(2, bezier2);
 
     // sprite 3
-    _kathia->setPosition(400,160);
+    _kathia->setPosition(400, 160);
     auto bezierTo2 = BezierTo::create(2, bezier2);
 
-    _grossini->runAction( rep);
+    _grossini->runAction(rep);
     _tamara->runAction(bezierTo1);
     _kathia->runAction(bezierTo2);
-
 }
 
 std::string ActionBezier::subtitle() const
@@ -566,11 +565,11 @@ void ActionBlink::onEnter()
     auto action1 = Blink::create(2, 10);
     auto action2 = Blink::create(2, 5);
 
-    _tamara->runAction( action1);
+    _tamara->runAction(action1);
     _kathia->runAction(action2);
 }
 
-std::string  ActionBlink::subtitle() const
+std::string ActionBlink::subtitle() const
 {
     return "Blink";
 }
@@ -586,22 +585,22 @@ void ActionFade::onEnter()
 
     centerSprites(2);
 
-    _tamara->setOpacity( 0 );
-    auto action1 = FadeIn::create(1.0f);
+    _tamara->setOpacity(0);
+    auto action1     = FadeIn::create(1.0f);
     auto action1Back = action1->reverse();
 
-    auto action2 = FadeOut::create(1.0f);
-    auto action2Back = action2->reverse();
-    auto action2BackReverse = action2Back->reverse();
+    auto action2                   = FadeOut::create(1.0f);
+    auto action2Back               = action2->reverse();
+    auto action2BackReverse        = action2Back->reverse();
     auto action2BackReverseReverse = action2BackReverse->reverse();
 
     _tamara->setOpacity(122);
-    _tamara->runAction( Sequence::create( action1, action1Back, nullptr));
+    _tamara->runAction(Sequence::create(action1, action1Back, nullptr));
     _kathia->setOpacity(122);
-    _kathia->runAction( Sequence::create( action2, action2Back,action2BackReverse,action2BackReverseReverse, nullptr));
+    _kathia->runAction(Sequence::create(action2, action2Back, action2BackReverse, action2BackReverseReverse, nullptr));
 }
 
-std::string  ActionFade::subtitle() const
+std::string ActionFade::subtitle() const
 {
     return "FadeIn / FadeOut";
 }
@@ -618,15 +617,15 @@ void ActionTint::onEnter()
 
     centerSprites(2);
 
-    auto action1 = TintTo::create(2, 255, 0, 255);
-    auto action2 = TintBy::create(2, -127, -255, -127);
+    auto action1     = TintTo::create(2, 255, 0, 255);
+    auto action2     = TintBy::create(2, -127, -255, -127);
     auto action2Back = action2->reverse();
 
-    _tamara->runAction( action1);
-    _kathia->runAction( Sequence::create( action2, action2Back, nullptr));
+    _tamara->runAction(action1);
+    _kathia->runAction(Sequence::create(action2, action2Back, nullptr));
 }
 
-std::string  ActionTint::subtitle() const
+std::string ActionTint::subtitle() const
 {
     return "TintTo / TintBy";
 }
@@ -646,7 +645,7 @@ void ActionAnimate::onEnter()
     // Manual animation
     //
     auto animation = Animation::create();
-    for( int i=1;i<15;i++)
+    for (int i = 1; i < 15; i++)
     {
         char szName[100] = {0};
         sprintf(szName, "Images/grossini_dance_%02d.png", i);
@@ -658,7 +657,7 @@ void ActionAnimate::onEnter()
 
     auto action = Animate::create(animation);
     _grossini->runAction(Sequence::create(action, action->reverse(), nullptr));
-    
+
     //
     // File animation
     //
@@ -670,10 +669,10 @@ void ActionAnimate::onEnter()
     auto action2 = Animate::create(animation2);
     _tamara->runAction(Sequence::create(action2, action2->reverse(), nullptr));
 
-    _frameDisplayedListener = EventListenerCustom::create(AnimationFrameDisplayedNotification, [](EventCustom * event){
+    _frameDisplayedListener = EventListenerCustom::create(AnimationFrameDisplayedNotification, [](EventCustom* event) {
         auto userData = static_cast<AnimationFrame::DisplayedEventInfo*>(event->getUserData());
-        
-         log("target %p with data %s", userData->target, Value(userData->userInfo).getDescription().c_str());
+
+        log("target %p with data %s", userData->target, Value(userData->userInfo).getDescription().c_str());
     });
 
     _eventDispatcher->addEventListenerWithFixedPriority(_frameDisplayedListener, -1);
@@ -685,7 +684,6 @@ void ActionAnimate::onEnter()
     auto animation3 = animation2->clone();
     animation3->setLoops(4);
 
-
     auto action3 = Animate::create(animation3);
     _kathia->runAction(action3);
 }
@@ -717,10 +715,7 @@ void ActionSequence::onEnter()
 
     alignSpritesLeft(1);
 
-    auto action = Sequence::create(
-        MoveBy::create( 2, Vec2(240.0f,0.0f)),
-        RotateBy::create( 2,  540),
-        nullptr);
+    auto action = Sequence::create(MoveBy::create(2, Vec2(240.0f, 0.0f)), RotateBy::create(2, 540), nullptr);
 
     _grossini->runAction(action);
 }
@@ -744,40 +739,37 @@ void ActionSequence2::onEnter()
     _grossini->setVisible(false);
 
     auto action = Sequence::create(
-		Place::create(Vec2(200.0f,200.0f)),
-		Show::create(),
-		MoveBy::create(1, Vec2(100.0f,0.0f)),
-		CallFunc::create( CC_CALLBACK_0(ActionSequence2::callback1,this)),
-		CallFunc::create( CC_CALLBACK_0(ActionSequence2::callback2,this,_grossini)),
-		CallFunc::create( CC_CALLBACK_0(ActionSequence2::callback3,this,_grossini,0xbebabeba)),
-		nullptr);
+        Place::create(Vec2(200.0f, 200.0f)), Show::create(), MoveBy::create(1, Vec2(100.0f, 0.0f)),
+        CallFunc::create(CC_CALLBACK_0(ActionSequence2::callback1, this)),
+        CallFunc::create(CC_CALLBACK_0(ActionSequence2::callback2, this, _grossini)),
+        CallFunc::create(CC_CALLBACK_0(ActionSequence2::callback3, this, _grossini, 0xbebabeba)), nullptr);
 
     _grossini->runAction(action);
 }
 
 void ActionSequence2::callback1()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 1 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*1,s.height/2);
+    label->setPosition(s.width / 4 * 1, s.height / 2);
 
     addChild(label);
 }
 
 void ActionSequence2::callback2(Node* sender)
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 2 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*2,s.height/2);
+    label->setPosition(s.width / 4 * 2, s.height / 2);
 
     addChild(label);
 }
 
 void ActionSequence2::callback3(Node* sender, int32_t data)
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 3 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*3,s.height/2);
+    label->setPosition(s.width / 4 * 3, s.height / 2);
 
     addChild(label);
 }
@@ -799,7 +791,7 @@ void ActionSequence3::onEnter()
     alignSpritesLeft(1);
 
     // Uses Array API
-    auto action1 = MoveBy::create(2, Vec2(240.0f,0.0f));
+    auto action1 = MoveBy::create(2, Vec2(240.0f, 0.0f));
     auto action2 = RotateBy::create(2, 540);
     auto action3 = action1->reverse();
     auto action4 = action2->reverse();
@@ -829,10 +821,8 @@ void ActionCallFuncN::onEnter()
 
     centerSprites(1);
 
-    auto action = Sequence::create(
-        MoveBy::create(2.0f, Vec2(150.0f,0.0f)),
-        CallFuncN::create( CC_CALLBACK_1(ActionCallFuncN::callback, this)),
-        nullptr);
+    auto action = Sequence::create(MoveBy::create(2.0f, Vec2(150.0f, 0.0f)),
+                                   CallFuncN::create(CC_CALLBACK_1(ActionCallFuncN::callback, this)), nullptr);
 
     _grossini->runAction(action);
 }
@@ -847,9 +837,9 @@ std::string ActionCallFuncN::subtitle() const
     return "Grossini should jump after moving";
 }
 
-void ActionCallFuncN::callback(Node* sender )
+void ActionCallFuncN::callback(Node* sender)
 {
-    auto a = JumpBy::create(5, Vec2(0,0), 100, 5);
+    auto a = JumpBy::create(5, Vec2(0, 0), 100, 5);
     sender->runAction(a);
 }
 //------------------------------------------------------------------
@@ -865,9 +855,8 @@ void ActionCallFuncND::onEnter()
     centerSprites(1);
 
     auto action = Sequence::create(
-        MoveBy::create(2.0f, Vec2(200.0f,0.0f)),
-        CallFuncN::create( CC_CALLBACK_1(ActionCallFuncND::doRemoveFromParentAndCleanup, this, true)),
-        nullptr);
+        MoveBy::create(2.0f, Vec2(200.0f, 0.0f)),
+        CallFuncN::create(CC_CALLBACK_1(ActionCallFuncND::doRemoveFromParentAndCleanup, this, true)), nullptr);
 
     _grossini->runAction(action);
 }
@@ -898,66 +887,59 @@ void ActionCallFunction::onEnter()
 
     centerSprites(3);
 
+    auto action1 = Sequence::create(
+        MoveBy::create(2, Vec2(200.0f, 0.0f)), CallFunc::create(std::bind(&ActionCallFunction::callback1, this)),
+        CallFunc::create(
+            // lambda
+            [&]() {
+                auto s     = Director::getInstance()->getWinSize();
+                auto label = Label::createWithTTF("called:lambda callback", "fonts/Marker Felt.ttf", 16.0f);
+                label->setPosition(s.width / 4 * 1, s.height / 2 - 40);
+                this->addChild(label);
+            }),
+        nullptr);
+
+    auto action2 =
+        Sequence::create(ScaleBy::create(2, 2), FadeOut::create(2),
+                         CallFunc::create(std::bind(&ActionCallFunction::callback2, this, _tamara)), nullptr);
 
-	auto action1 = Sequence::create(
-                        MoveBy::create(2, Vec2(200.0f,0.0f)),
-                        CallFunc::create( std::bind(&ActionCallFunction::callback1, this) ),
-                        CallFunc::create(
-                             // lambda
-                             [&](){
-                                 auto s = Director::getInstance()->getWinSize();
-                                 auto label = Label::createWithTTF("called:lambda callback", "fonts/Marker Felt.ttf", 16.0f);
-                                 label->setPosition(s.width/4*1,s.height/2-40);
-                                 this->addChild(label);
-                             }  ),
-                        nullptr);
-
-    auto action2 = Sequence::create(
-                        ScaleBy::create(2 ,  2),
-                        FadeOut::create(2),
-                        CallFunc::create( std::bind(&ActionCallFunction::callback2, this, _tamara) ),
-                        nullptr);
-
-    auto action3 = Sequence::create(
-                        RotateBy::create(3 , 360),
-                        FadeOut::create(2),
-                        CallFunc::create( std::bind(&ActionCallFunction::callback3, this, _kathia, 42) ),
-                        nullptr);
+    auto action3 =
+        Sequence::create(RotateBy::create(3, 360), FadeOut::create(2),
+                         CallFunc::create(std::bind(&ActionCallFunction::callback3, this, _kathia, 42)), nullptr);
 
     _grossini->runAction(action1);
     _tamara->runAction(action2);
     _kathia->runAction(action3);
 }
 
-
 void ActionCallFunction::callback1()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 1 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*1,s.height/2);
+    label->setPosition(s.width / 4 * 1, s.height / 2);
 
     addChild(label);
 }
 
 void ActionCallFunction::callback2(Node* sender)
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 2 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*2,s.height/2);
+    label->setPosition(s.width / 4 * 2, s.height / 2);
 
     addChild(label);
 
-	CCLOG("sender is: %p", sender);
+    CCLOG("sender is: %p", sender);
 }
 
 void ActionCallFunction::callback3(Node* sender, int32_t data)
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("callback 3 called", "fonts/Marker Felt.ttf", 16.0f);
-    label->setPosition(s.width/4*3,s.height/2);
+    label->setPosition(s.width / 4 * 3, s.height / 2);
     addChild(label);
 
-	CCLOG("target is: %p, data is: %d", sender, data);
+    CCLOG("target is: %p, data is: %d", sender, data);
 }
 
 std::string ActionCallFunction::subtitle() const
@@ -976,10 +958,7 @@ void ActionSpawn::onEnter()
 
     alignSpritesLeft(1);
 
-    auto action = Spawn::create(
-        JumpBy::create(2, Vec2(300,0), 50, 4),
-        RotateBy::create( 2,  720),
-        nullptr);
+    auto action = Spawn::create(JumpBy::create(2, Vec2(300, 0), 50, 4), RotateBy::create(2, 720), nullptr);
 
     _grossini->runAction(action);
 }
@@ -1001,8 +980,8 @@ void ActionSpawn2::onEnter()
 
     alignSpritesLeft(1);
 
-    auto action1 = JumpBy::create(2, Vec2(300,0), 50, 4);
-    auto action2 = RotateBy::create( 2,  720);
+    auto action1 = JumpBy::create(2, Vec2(300, 0), 50, 4);
+    auto action2 = RotateBy::create(2, 720);
 
     Vector<FiniteTimeAction*> array;
     array.pushBack(action1);
@@ -1028,17 +1007,16 @@ void ActionRepeatForever::onEnter()
 
     centerSprites(1);
 
-    auto action = Sequence::create(
-        DelayTime::create(1),
-        CallFunc::create( std::bind( &ActionRepeatForever::repeatForever, this, _grossini) ),
-        nullptr);
+    auto action =
+        Sequence::create(DelayTime::create(1),
+                         CallFunc::create(std::bind(&ActionRepeatForever::repeatForever, this, _grossini)), nullptr);
 
     _grossini->runAction(action);
 }
 
 void ActionRepeatForever::repeatForever(Node* sender)
 {
-    auto repeat = RepeatForever::create( RotateBy::create(1.0f, 360) );
+    auto repeat = RepeatForever::create(RotateBy::create(1.0f, 360));
 
     sender->runAction(repeat);
 }
@@ -1048,7 +1026,6 @@ std::string ActionRepeatForever::subtitle() const
     return "CallFuncN + RepeatForever";
 }
 
-
 //------------------------------------------------------------------
 //
 // ActionRotateToRepeat
@@ -1060,11 +1037,11 @@ void ActionRotateToRepeat::onEnter()
 
     centerSprites(2);
 
-	auto act1 = RotateTo::create(1, 90);
-	auto act2 = RotateTo::create(1, 0);
-	auto seq = Sequence::create(act1, act2, nullptr);
-	auto rep1 = RepeatForever::create(seq);
-	auto rep2 = Repeat::create( seq->clone(), 10);
+    auto act1 = RotateTo::create(1, 90);
+    auto act2 = RotateTo::create(1, 0);
+    auto seq  = Sequence::create(act1, act2, nullptr);
+    auto rep1 = RepeatForever::create(seq);
+    auto rep2 = Repeat::create(seq->clone(), 10);
 
     _tamara->runAction(rep1);
     _kathia->runAction(rep2);
@@ -1086,8 +1063,8 @@ void ActionReverse::onEnter()
 
     alignSpritesLeft(1);
 
-    auto jump = JumpBy::create(2, Vec2(300,0), 50, 4);
-    auto action = Sequence::create( jump, jump->reverse(), nullptr);
+    auto jump   = JumpBy::create(2, Vec2(300, 0), 50, 4);
+    auto action = Sequence::create(jump, jump->reverse(), nullptr);
 
     _grossini->runAction(action);
 }
@@ -1097,7 +1074,6 @@ std::string ActionReverse::subtitle() const
     return "Reverse an action";
 }
 
-
 //------------------------------------------------------------------
 //
 // ActionDelayTime
@@ -1109,8 +1085,8 @@ void ActionDelayTime::onEnter()
 
     alignSpritesLeft(1);
 
-    auto move = MoveBy::create(1, Vec2(150.0f,0.0f));
-    auto action = Sequence::create( move, DelayTime::create(2), move, nullptr);
+    auto move   = MoveBy::create(1, Vec2(150.0f, 0.0f));
+    auto action = Sequence::create(move, DelayTime::create(2), move, nullptr);
 
     _grossini->runAction(action);
 }
@@ -1120,7 +1096,6 @@ std::string ActionDelayTime::subtitle() const
     return "DelayTime: m + delay + m";
 }
 
-
 //------------------------------------------------------------------
 //
 // ActionReverseSequence
@@ -1132,10 +1107,10 @@ void ActionReverseSequence::onEnter()
 
     alignSpritesLeft(1);
 
-    auto move1 = MoveBy::create(1, Vec2(250.0f,0.0f));
-    auto move2 = MoveBy::create(1, Vec2(0.0f,50.0f));
-    auto seq = Sequence::create( move1, move2, move1->reverse(), nullptr);
-    auto action = Sequence::create( seq, seq->reverse(), nullptr);
+    auto move1  = MoveBy::create(1, Vec2(250.0f, 0.0f));
+    auto move2  = MoveBy::create(1, Vec2(0.0f, 50.0f));
+    auto seq    = Sequence::create(move1, move2, move1->reverse(), nullptr);
+    auto action = Sequence::create(seq, seq->reverse(), nullptr);
 
     _grossini->runAction(action);
 }
@@ -1145,7 +1120,6 @@ std::string ActionReverseSequence::subtitle() const
     return "Reverse a sequence";
 }
 
-
 //------------------------------------------------------------------
 //
 // ActionReverseSequence2
@@ -1157,27 +1131,25 @@ void ActionReverseSequence2::onEnter()
 
     alignSpritesLeft(2);
 
-
     // Test:
     //   Sequence should work both with IntervalAction and InstantActions
-	auto move1 = MoveBy::create(1, Vec2(250.0f,0.0f));
-	auto move2 = MoveBy::create(1, Vec2(0.0f,50.0f));
-	auto tog1 = ToggleVisibility::create();
-	auto tog2 = ToggleVisibility::create();
-	auto seq = Sequence::create( move1, tog1, move2, tog2, move1->reverse(), nullptr);
-	auto action = Repeat::create(Sequence::create( seq, seq->reverse(), nullptr), 3);
-
+    auto move1  = MoveBy::create(1, Vec2(250.0f, 0.0f));
+    auto move2  = MoveBy::create(1, Vec2(0.0f, 50.0f));
+    auto tog1   = ToggleVisibility::create();
+    auto tog2   = ToggleVisibility::create();
+    auto seq    = Sequence::create(move1, tog1, move2, tog2, move1->reverse(), nullptr);
+    auto action = Repeat::create(Sequence::create(seq, seq->reverse(), nullptr), 3);
 
     // Test:
     //   Also test that the reverse of Hide is Show, and vice-versa
     _kathia->runAction(action);
 
-	auto move_tamara = MoveBy::create(1, Vec2(100.0f,0.0f));
-	auto move_tamara2 = MoveBy::create(1, Vec2(50.0f,0.0f));
-	auto hide = Hide::create();
-	auto seq_tamara = Sequence::create( move_tamara, hide, move_tamara2, nullptr);
-	auto seq_back = seq_tamara->reverse();
-    _tamara->runAction( Sequence::create( seq_tamara, seq_back, nullptr));
+    auto move_tamara  = MoveBy::create(1, Vec2(100.0f, 0.0f));
+    auto move_tamara2 = MoveBy::create(1, Vec2(50.0f, 0.0f));
+    auto hide         = Hide::create();
+    auto seq_tamara   = Sequence::create(move_tamara, hide, move_tamara2, nullptr);
+    auto seq_back     = seq_tamara->reverse();
+    _tamara->runAction(Sequence::create(seq_tamara, seq_back, nullptr));
 }
 std::string ActionReverseSequence2::subtitle() const
 {
@@ -1195,14 +1167,9 @@ void ActionRepeat::onEnter()
 
     alignSpritesLeft(2);
 
-
-    auto a1 = MoveBy::create(1, Vec2(150.0f,0.0f));
-    auto action1 = Repeat::create(
-        Sequence::create( Place::create(Vec2(60.0f,60.0f)), a1, nullptr) ,
-        3); 
-    auto  action2 = RepeatForever::create(
-        Sequence::create(a1->clone(), a1->reverse(), nullptr)
-        );
+    auto a1      = MoveBy::create(1, Vec2(150.0f, 0.0f));
+    auto action1 = Repeat::create(Sequence::create(Place::create(Vec2(60.0f, 60.0f)), a1, nullptr), 3);
+    auto action2 = RepeatForever::create(Sequence::create(a1->clone(), a1->reverse(), nullptr));
 
     _kathia->runAction(action1);
     _tamara->runAction(action2);
@@ -1225,41 +1192,32 @@ void ActionOrbit::onEnter()
     Director::getInstance()->setProjection(Director::Projection::_2D);
     centerSprites(3);
 
-    auto orbit1 = OrbitCamera::create(2,1, 0, 0, 180, 0, 0);
-    auto action1 = Sequence::create(
-        orbit1,
-        orbit1->reverse(),
-        nullptr);
+    auto orbit1  = OrbitCamera::create(2, 1, 0, 0, 180, 0, 0);
+    auto action1 = Sequence::create(orbit1, orbit1->reverse(), nullptr);
 
-    auto orbit2 = OrbitCamera::create(2,1, 0, 0, 180, -45, 0);
-    auto action2 = Sequence::create(
-        orbit2,
-        orbit2->reverse(),
-        nullptr);
+    auto orbit2  = OrbitCamera::create(2, 1, 0, 0, 180, -45, 0);
+    auto action2 = Sequence::create(orbit2, orbit2->reverse(), nullptr);
 
-    auto orbit3 = OrbitCamera::create(2,1, 0, 0, 180, 90, 0);
-    auto action3 = Sequence::create(
-        orbit3,
-        orbit3->reverse(),
-        nullptr);
+    auto orbit3  = OrbitCamera::create(2, 1, 0, 0, 180, 90, 0);
+    auto action3 = Sequence::create(orbit3, orbit3->reverse(), nullptr);
 
     _kathia->runAction(RepeatForever::create(action1));
     _tamara->runAction(RepeatForever::create(action2));
     _grossini->runAction(RepeatForever::create(action3));
 
-    auto move = MoveBy::create(3, Vec2(100.0f,-100.0f));
+    auto move      = MoveBy::create(3, Vec2(100.0f, -100.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create(move, move_back, nullptr);
-    auto rfe = RepeatForever::create(seq);
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    auto rfe       = RepeatForever::create(seq);
     _kathia->runAction(rfe);
-    _tamara->runAction(rfe->clone() );
-    _grossini->runAction( rfe->clone() );
+    _tamara->runAction(rfe->clone());
+    _grossini->runAction(rfe->clone());
 }
 
 void ActionOrbit::onExit()
 {
     ActionsDemo::onExit();
-    
+
     Director::getInstance()->setProjection(Director::Projection::DEFAULT);
 }
 
@@ -1281,19 +1239,19 @@ void ActionFollow::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     DrawNode* drawNode = DrawNode::create();
-    float x = s.width*2 - 100;
-    float y = s.height;
-    
-    Vec2 vertices[] = { Vec2(5.0f,5.0f), Vec2(x-5,5.0f), Vec2(x-5,y-5), Vec2(5.0f,y-5) };
-    drawNode->drawPoly(vertices, 4, true,  Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
-    
+    float x            = s.width * 2 - 100;
+    float y            = s.height;
+
+    Vec2 vertices[] = {Vec2(5.0f, 5.0f), Vec2(x - 5, 5.0f), Vec2(x - 5, y - 5), Vec2(5.0f, y - 5)};
+    drawNode->drawPoly(vertices, 4, true, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+
     this->addChild(drawNode);
 
     _grossini->setPosition(-200.0f, s.height / 2);
-    auto move = MoveBy::create(2, Vec2(s.width * 3, 0.0f));
+    auto move      = MoveBy::create(2, Vec2(s.width * 3, 0.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create(move, move_back, nullptr);
-    auto rep = RepeatForever::create(seq);
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    auto rep       = RepeatForever::create(seq);
 
     _grossini->runAction(rep);
 
@@ -1313,31 +1271,32 @@ std::string ActionFollow::subtitle() const
 void ActionFollowWithOffset::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     centerSprites(1);
     auto s = Director::getInstance()->getWinSize();
-    
+
     DrawNode* drawNode = DrawNode::create();
-    float x = s.width*2 - 100;
-    float y = s.height;
-    
-    Vec2 vertices[] = { Vec2(5.0f,5.0f), Vec2(x-5,5.0f), Vec2(x-5,y-5), Vec2(5.0f,y-5) };
-    drawNode->drawPoly(vertices, 4, true,  Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
-    
+    float x            = s.width * 2 - 100;
+    float y            = s.height;
+
+    Vec2 vertices[] = {Vec2(5.0f, 5.0f), Vec2(x - 5, 5.0f), Vec2(x - 5, y - 5), Vec2(5.0f, y - 5)};
+    drawNode->drawPoly(vertices, 4, true, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+
     this->addChild(drawNode);
-    
+
     _grossini->setPosition(-200, s.height / 2);
-    auto move = MoveBy::create(2, Vec2(s.width * 3, 1.0f));
+    auto move      = MoveBy::create(2, Vec2(s.width * 3, 1.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create(move, move_back, nullptr);
-    auto rep = RepeatForever::create(seq);
-    
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    auto rep       = RepeatForever::create(seq);
+
     _grossini->runAction(rep);
-    
-    //sample offset values set
-    float verticalOffset = -900;
+
+    // sample offset values set
+    float verticalOffset   = -900;
     float horizontalOffset = 200;
-    this->runAction(Follow::createWithOffset(_grossini, horizontalOffset,verticalOffset,Rect(0.0f, 0.0f, s.width * 2 - 100, s.height)));
+    this->runAction(Follow::createWithOffset(_grossini, horizontalOffset, verticalOffset,
+                                             Rect(0.0f, 0.0f, s.width * 2 - 100, s.height)));
 }
 
 std::string ActionFollowWithOffset::subtitle() const
@@ -1345,22 +1304,20 @@ std::string ActionFollowWithOffset::subtitle() const
     return "Follow action with horizontal and vertical offset";
 }
 
-
 void ActionTargeted::onEnter()
 {
     ActionsDemo::onEnter();
     centerSprites(2);
 
-
-    auto jump1 = JumpBy::create(2,Vec2::ZERO,100,3);
+    auto jump1 = JumpBy::create(2, Vec2::ZERO, 100, 3);
     auto jump2 = jump1->clone();
-    auto rot1 = RotateBy::create(1, 360);
-    auto rot2 = rot1->clone();
+    auto rot1  = RotateBy::create(1, 360);
+    auto rot2  = rot1->clone();
 
     auto t1 = TargetedAction::create(_kathia, jump2);
     auto t2 = TargetedAction::create(_kathia, rot2);
 
-    auto seq = Sequence::create(jump1, t1, rot1, t2, nullptr);
+    auto seq    = Sequence::create(jump1, t1, rot1, t2, nullptr);
     auto always = RepeatForever::create(seq);
 
     _tamara->runAction(always);
@@ -1376,24 +1333,22 @@ std::string ActionTargeted::subtitle() const
     return "Action that runs on another target. Useful for sequences";
 }
 
-
 void ActionTargetedReverse::onEnter()
 {
     ActionsDemo::onEnter();
     centerSprites(2);
-    
-    
-    auto jump1 = JumpBy::create(2,Vec2::ZERO,100,3);
+
+    auto jump1 = JumpBy::create(2, Vec2::ZERO, 100, 3);
     auto jump2 = jump1->clone();
-    auto rot1 = RotateBy::create(1, 360);
-    auto rot2 = rot1->clone();
-    
+    auto rot1  = RotateBy::create(1, 360);
+    auto rot2  = rot1->clone();
+
     auto t1 = TargetedAction::create(_kathia, jump2);
     auto t2 = TargetedAction::create(_kathia, rot2);
-    
-    auto seq = Sequence::create(jump1, t1->reverse(), rot1, t2->reverse(), nullptr);
+
+    auto seq    = Sequence::create(jump1, t1->reverse(), rot1, t2->reverse(), nullptr);
     auto always = RepeatForever::create(seq);
-    
+
     _tamara->runAction(always);
 }
 
@@ -1412,15 +1367,15 @@ std::string ActionTargetedReverse::subtitle() const
 void ActionStacked::onEnter()
 {
     ActionsDemo::onEnter();
-        
+
     this->centerSprites(0);
-    
-    auto listener = EventListenerTouchAllAtOnce::create();
+
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(ActionStacked::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    this->addNewSpriteWithCoords(Vec2(s.width/2, s.height/2));
+    this->addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 }
 
 void ActionStacked::addNewSpriteWithCoords(Vec2 p)
@@ -1428,27 +1383,28 @@ void ActionStacked::addNewSpriteWithCoords(Vec2 p)
     int idx = static_cast<int>(CCRANDOM_0_1() * 1400 / 100);
     float w = 85.0f;
     float h = 121.0f;
-    float x = (idx%5) * w;
-    float y = (idx/5) * h;
-    
-    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(x,y,w,h));
-    
+    float x = (idx % 5) * w;
+    float y = (idx / 5) * h;
+
+    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(x, y, w, h));
+
     sprite->setPosition(p);
     this->addChild(sprite);
-    
+
     this->runActionsInSprite(sprite);
 }
 
-void ActionStacked::runActionsInSprite(Sprite *sprite)
+void ActionStacked::runActionsInSprite(Sprite* sprite)
 {
     // override me
 }
 
 void ActionStacked::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for ( auto &touch: touches ) {
+    for (auto& touch : touches)
+    {
         auto location = touch->getLocation();
-        addNewSpriteWithCoords( location );
+        addNewSpriteWithCoords(location);
     }
 }
 
@@ -1464,25 +1420,16 @@ std::string ActionStacked::subtitle() const
 
 // ActionMoveStacked
 
-
-void ActionMoveStacked::runActionsInSprite(Sprite *sprite)
+void ActionMoveStacked::runActionsInSprite(Sprite* sprite)
 {
-    sprite->runAction(
-        RepeatForever::create(
-                Sequence::create(
-                MoveBy::create(0.05f, Vec2(10.0f,10.0f)),
-                MoveBy::create(0.05f, Vec2(-10.0f,-10.0f)),
-       nullptr)));
-    
-    auto action = MoveBy::create(2.0f, Vec2(400.0f,0.0f));
+    sprite->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 10.0f)),
+                                                             MoveBy::create(0.05f, Vec2(-10.0f, -10.0f)), nullptr)));
+
+    auto action      = MoveBy::create(2.0f, Vec2(400.0f, 0.0f));
     auto action_back = action->reverse();
-    
-    sprite->runAction(
-      RepeatForever::create(
-        Sequence::create(action, action_back, nullptr)
-      ));
-}
 
+    sprite->runAction(RepeatForever::create(Sequence::create(action, action_back, nullptr)));
+}
 
 std::string ActionMoveStacked::title() const
 {
@@ -1491,22 +1438,15 @@ std::string ActionMoveStacked::title() const
 
 // ActionMoveJumpStacked
 
-void ActionMoveJumpStacked::runActionsInSprite(Sprite *sprite)
+void ActionMoveJumpStacked::runActionsInSprite(Sprite* sprite)
 {
-    sprite->runAction(
-          RepeatForever::create(
-            Sequence::create(
-             MoveBy::create(0.05f, Vec2(10,2)),
-             MoveBy::create(0.05f, Vec2(-10,-2)),
-             nullptr)));
-    
-    auto jump = JumpBy::create(2.0f, Vec2(400,0), 100, 5);
+    sprite->runAction(RepeatForever::create(
+        Sequence::create(MoveBy::create(0.05f, Vec2(10, 2)), MoveBy::create(0.05f, Vec2(-10, -2)), nullptr)));
+
+    auto jump      = JumpBy::create(2.0f, Vec2(400, 0), 100, 5);
     auto jump_back = jump->reverse();
-    
-    sprite->runAction(
-      RepeatForever::create(
-          Sequence::create(jump, jump_back, nullptr)
-          ));
+
+    sprite->runAction(RepeatForever::create(Sequence::create(jump, jump_back, nullptr)));
 }
 
 std::string ActionMoveJumpStacked::title() const
@@ -1516,28 +1456,24 @@ std::string ActionMoveJumpStacked::title() const
 
 // ActionMoveBezierStacked
 
-void ActionMoveBezierStacked::runActionsInSprite(Sprite *sprite)
+void ActionMoveBezierStacked::runActionsInSprite(Sprite* sprite)
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     // sprite 1
     ccBezierConfig bezier;
-    bezier.controlPoint_1 = Vec2(0.0f, s.height/2);
-    bezier.controlPoint_2 = Vec2(300.0f, -s.height/2);
-    bezier.endPosition = Vec2(300.0f,100.0f);
-    
+    bezier.controlPoint_1 = Vec2(0.0f, s.height / 2);
+    bezier.controlPoint_2 = Vec2(300.0f, -s.height / 2);
+    bezier.endPosition    = Vec2(300.0f, 100.0f);
+
     auto bezierForward = BezierBy::create(3, bezier);
-    auto bezierBack = bezierForward->reverse();
-    auto seq = Sequence::create(bezierForward, bezierBack, nullptr);
-    auto rep = RepeatForever::create(seq);
+    auto bezierBack    = bezierForward->reverse();
+    auto seq           = Sequence::create(bezierForward, bezierBack, nullptr);
+    auto rep           = RepeatForever::create(seq);
     sprite->runAction(rep);
-    
-    sprite->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       MoveBy::create(0.05f, Vec2(10.0f,0.0f)),
-       MoveBy::create(0.05f, Vec2(-10.0f,0.0f)),
-       nullptr)));
+
+    sprite->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 0.0f)),
+                                                             MoveBy::create(0.05f, Vec2(-10.0f, 0.0f)), nullptr)));
 }
 
 std::string ActionMoveBezierStacked::title() const
@@ -1545,92 +1481,81 @@ std::string ActionMoveBezierStacked::title() const
     return "Stacked Move + Bezier actions";
 }
 
-
 // ActionCatmullRomStacked
 
 void ActionCatmullRomStacked::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     this->centerSprites(2);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     //
     // sprite 1 (By)
     //
     // startPosition can be any coordinate, but since the movement
     // is relative to the Catmull Rom curve, it is better to start with (0,0).
     //
-    
-    _tamara->setPosition(50,50);
-    
+
+    _tamara->setPosition(50, 50);
+
     auto array = PointArray::create(20);
-    
-    array->addControlPoint(Vec2(0.0f,0.0f));
-    array->addControlPoint(Vec2(80.0f,80.0f));
-    array->addControlPoint(Vec2(s.width-80,80.0f));
-    array->addControlPoint(Vec2(s.width-80,s.height-80.0f));
-    array->addControlPoint(Vec2(80.0f,s.height-80.0f));
-    array->addControlPoint(Vec2(80.0f,80.0f));
-    array->addControlPoint(Vec2(s.width/2, s.height/2));
-    
-    auto action = CatmullRomBy::create(3, array);
+
+    array->addControlPoint(Vec2(0.0f, 0.0f));
+    array->addControlPoint(Vec2(80.0f, 80.0f));
+    array->addControlPoint(Vec2(s.width - 80, 80.0f));
+    array->addControlPoint(Vec2(s.width - 80, s.height - 80.0f));
+    array->addControlPoint(Vec2(80.0f, s.height - 80.0f));
+    array->addControlPoint(Vec2(80.0f, 80.0f));
+    array->addControlPoint(Vec2(s.width / 2, s.height / 2));
+
+    auto action  = CatmullRomBy::create(3, array);
     auto reverse = action->reverse();
-    
+
     auto seq = Sequence::create(action, reverse, nullptr);
-    
+
     _tamara->runAction(seq);
-    
-    _tamara->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                MoveBy::create(0.05f, Vec2(10.0f,0.0f)),
-                MoveBy::create(0.05f, Vec2(-10.0f,0.0f)),
-                nullptr)));
-    
+
+    _tamara->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 0.0f)),
+                                                              MoveBy::create(0.05f, Vec2(-10.0f, 0.0f)), nullptr)));
+
     auto drawNode1 = DrawNode::create();
-    drawNode1->setPosition(Vec2(50.0f,50.0f));
+    drawNode1->setPosition(Vec2(50.0f, 50.0f));
     drawNode1->drawCatmullRom(array, 50, Color4F(1.0f, 1.0f, 0.0f, 0.5f));
     this->addChild(drawNode1);
-    
+
     //
     // sprite 2 (To)
     //
     // The startPosition is not important here, because it uses a "To" action.
     // The initial position will be the 1st point of the Catmull Rom path
     //
-    
+
     auto array2 = PointArray::create(20);
-    
-    array2->addControlPoint(Vec2(s.width/2, 30.0f));
-    array2->addControlPoint(Vec2(s.width-80,30.0f));
-    array2->addControlPoint(Vec2(s.width-80.0f,s.height-80.0f));
-    array2->addControlPoint(Vec2(s.width/2,s.height-80.0f));
-    array2->addControlPoint(Vec2(s.width/2, 30.0f));
-    
-    auto action2 = CatmullRomTo::create(3, array2);
+
+    array2->addControlPoint(Vec2(s.width / 2, 30.0f));
+    array2->addControlPoint(Vec2(s.width - 80, 30.0f));
+    array2->addControlPoint(Vec2(s.width - 80.0f, s.height - 80.0f));
+    array2->addControlPoint(Vec2(s.width / 2, s.height - 80.0f));
+    array2->addControlPoint(Vec2(s.width / 2, 30.0f));
+
+    auto action2  = CatmullRomTo::create(3, array2);
     auto reverse2 = action2->reverse();
-    
+
     auto seq2 = Sequence::create(action2, reverse2, nullptr);
-    
+
     _kathia->runAction(seq2);
-    
-    _kathia->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                MoveBy::create(0.05f, Vec2(10.0f,0.0f)),
-                MoveBy::create(0.05f, Vec2(-10.0f,0.0f)),
-                nullptr)));
-    
+
+    _kathia->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 0.0f)),
+                                                              MoveBy::create(0.05f, Vec2(-10.0f, 0.0f)), nullptr)));
+
     auto drawNode2 = DrawNode::create();
     drawNode2->drawCatmullRom(array2, 50, Color4F(1.0, 0.0, 0.0, 0.5));
     this->addChild(drawNode2);
 }
 
-ActionCatmullRomStacked::~ActionCatmullRomStacked()
-{
-}
+ActionCatmullRomStacked::~ActionCatmullRomStacked() {}
 
 std::string ActionCatmullRomStacked::title() const
 {
@@ -1642,83 +1567,71 @@ std::string ActionCatmullRomStacked::subtitle() const
     return "MoveBy + CatmullRom at the same time in the same sprite";
 }
 
-
 // ActionCardinalSplineStacked
 
 void ActionCardinalSplineStacked::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     this->centerSprites(2);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto array = PointArray::create(20);
-    
+
     array->addControlPoint(Vec2(0.0f, 0.0f));
-    array->addControlPoint(Vec2(s.width/2-30,0.0f));
-    array->addControlPoint(Vec2(s.width/2-30,s.height-80.0f));
-    array->addControlPoint(Vec2(0.0f, s.height-80.0f));
+    array->addControlPoint(Vec2(s.width / 2 - 30, 0.0f));
+    array->addControlPoint(Vec2(s.width / 2 - 30, s.height - 80.0f));
+    array->addControlPoint(Vec2(0.0f, s.height - 80.0f));
     array->addControlPoint(Vec2(0.0f, 0.0f));
-    
-    
+
     //
     // sprite 1 (By)
     //
     // Spline with no tension (tension==0)
     //
 
-    auto action = CardinalSplineBy::create(3, array, 0);
+    auto action  = CardinalSplineBy::create(3, array, 0);
     auto reverse = action->reverse();
-    
+
     auto seq = Sequence::create(action, reverse, nullptr);
-    
-    _tamara->setPosition(50,50);
+
+    _tamara->setPosition(50, 50);
     _tamara->runAction(seq);
-    
-    _tamara->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                MoveBy::create(0.05f, Vec2(10.0f,0.0f)),
-                MoveBy::create(0.05f, Vec2(-10.0f,0.0f)),
-                nullptr)));
-    
+
+    _tamara->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 0.0f)),
+                                                              MoveBy::create(0.05f, Vec2(-10.0f, 0.0f)), nullptr)));
+
     auto drawNode1 = DrawNode::create();
-    drawNode1->setPosition(Vec2(50.0f,50.0f));
+    drawNode1->setPosition(Vec2(50.0f, 50.0f));
     drawNode1->drawCardinalSpline(array, 0, 100, Color4F(1.0f, 0.0f, 1.0f, 1.0f));
     this->addChild(drawNode1);
-    
+
     //
     // sprite 2 (By)
     //
     // Spline with high tension (tension==1)
     //
-    
-    auto *action2 = CardinalSplineBy::create(3, array, 1);
+
+    auto* action2 = CardinalSplineBy::create(3, array, 1);
     auto reverse2 = action2->reverse();
-    
+
     auto seq2 = Sequence::create(action2, reverse2, nullptr);
-    
-    _kathia->setPosition(s.width/2,50);
-    
+
+    _kathia->setPosition(s.width / 2, 50);
+
     _kathia->runAction(seq2);
-    
-    _kathia->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                MoveBy::create(0.05f, Vec2(10.0f,0.0f)),
-                MoveBy::create(0.05f, Vec2(-10.0f,0.0f)),
-                nullptr)));
-    
+
+    _kathia->runAction(RepeatForever::create(Sequence::create(MoveBy::create(0.05f, Vec2(10.0f, 0.0f)),
+                                                              MoveBy::create(0.05f, Vec2(-10.0f, 0.0f)), nullptr)));
+
     auto drawNode2 = DrawNode::create();
-    drawNode2->setPosition(Vec2(s.width/2,50.0f));
+    drawNode2->setPosition(Vec2(s.width / 2, 50.0f));
     drawNode2->drawCardinalSpline(array, 1, 100, Color4F(0.0f, 0.0f, 1.0f, 1.0f));
     this->addChild(drawNode2);
 }
 
-ActionCardinalSplineStacked::~ActionCardinalSplineStacked()
-{
-}
+ActionCardinalSplineStacked::~ActionCardinalSplineStacked() {}
 
 std::string ActionCardinalSplineStacked::title() const
 {
@@ -1740,11 +1653,12 @@ void Issue1305::onEnter()
     _spriteTmp->runAction(CallFunc::create(std::bind(&Issue1305::log, this, _spriteTmp)));
     _spriteTmp->retain();
 
-    scheduleOnce([&](float dt) {
-        _spriteTmp->setPosition(250,250);
-        addChild(_spriteTmp);
-    },2 ,"update_key");
-
+    scheduleOnce(
+        [&](float dt) {
+            _spriteTmp->setPosition(250, 250);
+            addChild(_spriteTmp);
+        },
+        2, "update_key");
 }
 
 void Issue1305::log(Node* sender)
@@ -1775,10 +1689,10 @@ void Issue1305_2::onEnter()
     centerSprites(0);
 
     auto spr = Sprite::create("Images/grossini.png");
-    spr->setPosition(200,200);
+    spr->setPosition(200, 200);
     addChild(spr);
 
-    auto act1 = MoveBy::create(2 ,Vec2(0.0f, 100.0f));
+    auto act1 = MoveBy::create(2, Vec2(0.0f, 100.0f));
     /* c++ can't support block, so we use CallFuncN instead.
     id act2 = [CallBlock actionWithBlock:^{
         NSLog(@"1st block");
@@ -1797,19 +1711,18 @@ void Issue1305_2::onEnter()
     });
     */
 
-    auto act2 = CallFunc::create( std::bind( &Issue1305_2::printLog1, this));
+    auto act2 = CallFunc::create(std::bind(&Issue1305_2::printLog1, this));
     auto act3 = MoveBy::create(2, Vec2(0.0f, -100.0f));
-    auto act4 = CallFunc::create( std::bind( &Issue1305_2::printLog2, this));
+    auto act4 = CallFunc::create(std::bind(&Issue1305_2::printLog2, this));
     auto act5 = MoveBy::create(2, Vec2(100.0f, -100.0f));
-    auto act6 = CallFunc::create( std::bind( &Issue1305_2::printLog3, this));
+    auto act6 = CallFunc::create(std::bind(&Issue1305_2::printLog3, this));
     auto act7 = MoveBy::create(2, Vec2(-100.0f, 0.0f));
-    auto act8 = CallFunc::create( std::bind( &Issue1305_2::printLog4, this));
+    auto act8 = CallFunc::create(std::bind(&Issue1305_2::printLog4, this));
 
     auto actF = Sequence::create(act1, act2, act3, act4, act5, act6, act7, act8, nullptr);
 
     //    [spr runAction:actF);
-    Director::getInstance()->getActionManager()->addAction(actF ,spr, false);
-
+    Director::getInstance()->getActionManager()->addAction(actF, spr, false);
 }
 
 void Issue1305_2::printLog1()
@@ -1892,7 +1805,6 @@ std::string Issue1288_2::subtitle() const
     return "Sprite should move 100 pixels, and stay there";
 }
 
-
 void Issue1327::onEnter()
 {
     ActionsDemo::onEnter();
@@ -1902,15 +1814,15 @@ void Issue1327::onEnter()
     spr->setPosition(100, 100);
     addChild(spr);
 
-    auto act1 = CallFunc::create( std::bind(&Issue1327::logSprRotation, this, spr));
+    auto act1 = CallFunc::create(std::bind(&Issue1327::logSprRotation, this, spr));
     auto act2 = RotateBy::create(0.25, 45);
-    auto act3 = CallFunc::create( std::bind(&Issue1327::logSprRotation, this, spr));
+    auto act3 = CallFunc::create(std::bind(&Issue1327::logSprRotation, this, spr));
     auto act4 = RotateBy::create(0.25, 45);
-    auto act5 = CallFunc::create( std::bind(&Issue1327::logSprRotation, this, spr));
+    auto act5 = CallFunc::create(std::bind(&Issue1327::logSprRotation, this, spr));
     auto act6 = RotateBy::create(0.25, 45);
-    auto act7 = CallFunc::create( std::bind(&Issue1327::logSprRotation, this, spr));
+    auto act7 = CallFunc::create(std::bind(&Issue1327::logSprRotation, this, spr));
     auto act8 = RotateBy::create(0.25, 45);
-    auto act9 = CallFunc::create( std::bind(&Issue1327::logSprRotation, this, spr));
+    auto act9 = CallFunc::create(std::bind(&Issue1327::logSprRotation, this, spr));
 
     auto actF = Sequence::create(act1, act2, act3, act4, act5, act6, act7, act8, act9, nullptr);
     spr->runAction(actF);
@@ -1931,7 +1843,7 @@ void Issue1327::logSprRotation(Sprite* sender)
     log("%f", sender->getRotation());
 }
 
-//Issue1398
+// Issue1398
 void Issue1398::incrementInteger()
 {
     _testInteger++;
@@ -1947,16 +1859,14 @@ void Issue1398::onEnter()
     log("testInt = %d", _testInteger);
 
     this->runAction(
-        Sequence::create(
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"1")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"2")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"3")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"4")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"5")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"6")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"7")),
-			CallFunc::create( std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"8")),
-            nullptr));
+        Sequence::create(CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"1")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"2")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"3")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"4")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"5")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"6")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"7")),
+                         CallFunc::create(std::bind(&Issue1398::incrementIntegerCallback, this, (void*)"8")), nullptr));
 }
 
 void Issue1398::incrementIntegerCallback(void* data)
@@ -1979,22 +1889,16 @@ void Issue2599::onEnter()
 {
     ActionsDemo::onEnter();
     this->centerSprites(0);
-    
+
     _count = 0;
     log("before: count = %d", _count);
-    
+
     log("start count up 50 times using Repeat action");
-    auto delay = 1.0f / 50;
+    auto delay        = 1.0f / 50;
     auto repeatAction = Repeat::create(
-        Sequence::createWithTwoActions(
-            CallFunc::create([&](){ this->_count++; }),
-            DelayTime::create(delay)),
-        50);
-    this->runAction(
-        Sequence::createWithTwoActions(
-            repeatAction,
-            CallFunc::create([&]() { log("after: count = %d", this->_count); })
-        ));
+        Sequence::createWithTwoActions(CallFunc::create([&]() { this->_count++; }), DelayTime::create(delay)), 50);
+    this->runAction(Sequence::createWithTwoActions(
+        repeatAction, CallFunc::create([&]() { log("after: count = %d", this->_count); })));
 }
 
 std::string Issue2599::subtitle() const
@@ -2012,22 +1916,22 @@ std::string Issue2599::title() const
 void ActionCatmullRom::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     this->centerSprites(2);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     //
     // sprite 1 (By)
     //
     // startPosition can be any coordinate, but since the movement
     // is relative to the Catmull Rom curve, it is better to start with (0,0).
     //
-    
+
     _tamara->setPosition(50, 50);
-    
+
     auto array = PointArray::create(20);
-    
+
     array->addControlPoint(Vec2(0.0f, 0.0f));
     array->addControlPoint(Vec2(80.0f, 80.0f));
     array->addControlPoint(Vec2(s.width - 80, 80.0f));
@@ -2035,49 +1939,47 @@ void ActionCatmullRom::onEnter()
     array->addControlPoint(Vec2(80.0f, s.height - 80.0f));
     array->addControlPoint(Vec2(80.0f, 80.0f));
     array->addControlPoint(Vec2(s.width / 2, s.height / 2));
-    
-    auto action = CatmullRomBy::create(3, array);
+
+    auto action  = CatmullRomBy::create(3, array);
     auto reverse = action->reverse();
-    
+
     auto seq = Sequence::create(action, reverse, nullptr);
-    
+
     _tamara->runAction(seq);
-    
+
     auto drawNode1 = DrawNode::create();
-    drawNode1->setPosition(Vec2(50.0f,50.0f));
+    drawNode1->setPosition(Vec2(50.0f, 50.0f));
     drawNode1->drawCatmullRom(array, 50, Color4F(1.0f, 0.0f, 1.0f, 1.0f));
     this->addChild(drawNode1);
-    
+
     //
     // sprite 2 (To)
     //
     // The startPosition is not important here, because it uses a "To" action.
     // The initial position will be the 1st point of the Catmull Rom path
-    //    
-    
+    //
+
     auto array2 = PointArray::create(20);
-    
+
     array2->addControlPoint(Vec2(s.width / 2, 30.0f));
-    array2->addControlPoint(Vec2(s.width  -80, 30.0f));
+    array2->addControlPoint(Vec2(s.width - 80, 30.0f));
     array2->addControlPoint(Vec2(s.width - 80, s.height - 80));
     array2->addControlPoint(Vec2(s.width / 2, s.height - 80));
     array2->addControlPoint(Vec2(s.width / 2, 30.0f));
-    
-    auto action2 = CatmullRomTo::create(3, array2);
+
+    auto action2  = CatmullRomTo::create(3, array2);
     auto reverse2 = action2->reverse();
-    
+
     auto seq2 = Sequence::create(action2, reverse2, nullptr);
-    
+
     _kathia->runAction(seq2);
-    
+
     auto drawNode2 = DrawNode::create();
     drawNode2->drawCatmullRom(array2, 50, Color4F(0.0f, 1.0f, 1.0f, 1.0f));
     this->addChild(drawNode2);
 }
 
-ActionCatmullRom::~ActionCatmullRom()
-{
-}
+ActionCatmullRom::~ActionCatmullRom() {}
 
 std::string ActionCatmullRom::title() const
 {
@@ -2094,61 +1996,59 @@ std::string ActionCatmullRom::subtitle() const
 void ActionCardinalSpline::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     this->centerSprites(2);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto array = PointArray::create(20);
-    
+
     array->addControlPoint(Vec2(0.0f, 0.0f));
-    array->addControlPoint(Vec2(s.width/2-30, 0.0f));
-    array->addControlPoint(Vec2(s.width/2-30, s.height-80));
-    array->addControlPoint(Vec2(0.0f, s.height-80));
+    array->addControlPoint(Vec2(s.width / 2 - 30, 0.0f));
+    array->addControlPoint(Vec2(s.width / 2 - 30, s.height - 80));
+    array->addControlPoint(Vec2(0.0f, s.height - 80));
     array->addControlPoint(Vec2(0.0f, 0.0f));
-    
+
     //
     // sprite 1 (By)
     //
     // Spline with no tension (tension==0)
     //
-    
-    auto action = CardinalSplineBy::create(3, array, 0);
+
+    auto action  = CardinalSplineBy::create(3, array, 0);
     auto reverse = action->reverse();
-    
+
     auto seq = Sequence::create(action, reverse, nullptr);
-    
+
     _tamara->setPosition(50, 50);
     _tamara->runAction(seq);
-    
+
     auto drawNode1 = DrawNode::create();
-    drawNode1->setPosition(Vec2(50.0f,50.0f));
+    drawNode1->setPosition(Vec2(50.0f, 50.0f));
     drawNode1->drawCardinalSpline(array, 0, 100, Color4F(1.0f, 0.0f, 1.0f, 1.0f));
     this->addChild(drawNode1);
-    
+
     //
     // sprite 2 (By)
     //
     // Spline with high tension (tension==1)
     //
-    
-    auto action2 = CardinalSplineBy::create(3, array, 1);
+
+    auto action2  = CardinalSplineBy::create(3, array, 1);
     auto reverse2 = action2->reverse();
-    
+
     auto seq2 = Sequence::create(action2, reverse2, nullptr);
-    
-    _kathia->setPosition(s.width/2, 50);
+
+    _kathia->setPosition(s.width / 2, 50);
     _kathia->runAction(seq2);
-    
+
     auto drawNode2 = DrawNode::create();
-    drawNode2->setPosition(Vec2(s.width/2, 50.0f));
+    drawNode2->setPosition(Vec2(s.width / 2, 50.0f));
     drawNode2->drawCardinalSpline(array, 1, 100, Color4F(1.0f, 0.0f, 1.0f, 1.0f));
     this->addChild(drawNode2);
 }
 
-ActionCardinalSpline::~ActionCardinalSpline()
-{
-}
+ActionCardinalSpline::~ActionCardinalSpline() {}
 
 std::string ActionCardinalSpline::title() const
 {
@@ -2163,41 +2063,37 @@ std::string ActionCardinalSpline::subtitle() const
 /** PauseResumeActions
  */
 
-PauseResumeActions::PauseResumeActions()
-{
+PauseResumeActions::PauseResumeActions() {}
 
-}
-
-PauseResumeActions::~PauseResumeActions()
-{
-
-}
+PauseResumeActions::~PauseResumeActions() {}
 
 void PauseResumeActions::onEnter()
 {
     ActionsDemo::onEnter();
-    
+
     this->centerSprites(3);
-    
+
     _tamara->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
     _grossini->runAction(RepeatForever::create(RotateBy::create(3.0f, -360.0f)));
     _kathia->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
-    
-    this->schedule([&](float dt){
-        log("Pausing");
-        auto director = Director::getInstance();
 
-        _pausedTargets = director->getActionManager()->pauseAllRunningActions();
-    }
-                   ,3 ,false ,0 ,"pause_key");
+    this->schedule(
+        [&](float dt) {
+            log("Pausing");
+            auto director = Director::getInstance();
 
-    this->schedule([&](float dt) {
-        log("Resuming");
-        auto director = Director::getInstance();
-        director->getActionManager()->resumeTargets(_pausedTargets);
-        _pausedTargets.clear();
-    }
-                   ,5 ,false ,0, "resume_key");
+            _pausedTargets = director->getActionManager()->pauseAllRunningActions();
+        },
+        3, false, 0, "pause_key");
+
+    this->schedule(
+        [&](float dt) {
+            log("Resuming");
+            auto director = Director::getInstance();
+            director->getActionManager()->resumeTargets(_pausedTargets);
+            _pausedTargets.clear();
+        },
+        5, false, 0, "resume_key");
 }
 
 std::string PauseResumeActions::title() const
@@ -2213,11 +2109,11 @@ std::string PauseResumeActions::subtitle() const
 //------------------------------------------------------------------
 //
 //    ActionResize
-//    Works on all nodes where setContentSize is effective. 
+//    Works on all nodes where setContentSize is effective.
 //    But it's mostly useful for nodes where 9-slice is enabled
 //
 //------------------------------------------------------------------
-void ActionResize::onEnter() 
+void ActionResize::onEnter()
 {
     ActionsDemo::onEnter();
 
@@ -2227,10 +2123,13 @@ void ActionResize::onEnter()
 
     Size widgetSize = getContentSize();
 
-    Text* alert = Text::create("ImageView Content ResizeTo ResizeBy action. \nTop: ResizeTo/ResizeBy on a 9-slice ImageView  \nBottom: ScaleTo/ScaleBy on a 9-slice ImageView (for comparison)", "fonts/Marker Felt.ttf", 14);
+    Text* alert = Text::create(
+        "ImageView Content ResizeTo ResizeBy action. \nTop: ResizeTo/ResizeBy on a 9-slice ImageView  \nBottom: "
+        "ScaleTo/ScaleBy on a 9-slice ImageView (for comparison)",
+        "fonts/Marker Felt.ttf", 14);
     alert->setColor(Color3B(159, 168, 176));
-    alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                            widgetSize.height / 2.0f - alert->getContentSize().height * 1.125f));
+    alert->setPosition(
+        Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.125f));
 
     addChild(alert);
 
@@ -2239,14 +2138,13 @@ void ActionResize::onEnter()
     ImageView* imageViewResize = ImageView::create("cocosui/buttonHighlighted.png");
     imageViewResize->setScale9Enabled(true);
     imageViewResize->setContentSize(Size(50.0f, 40.0f));
-    imageViewResize->setPosition(Vec2((widgetSize.width / 2.0f) + offset.x,
-                                (widgetSize.height / 2.0f) + offset.y));
+    imageViewResize->setPosition(Vec2((widgetSize.width / 2.0f) + offset.x, (widgetSize.height / 2.0f) + offset.y));
 
     auto resizeDown = cocos2d::ResizeTo::create(2.8f, Size(50.0f, 40.0f));
-    auto resizeUp = cocos2d::ResizeTo::create(2.8f, Size(300.0f, 40.0f));
+    auto resizeUp   = cocos2d::ResizeTo::create(2.8f, Size(300.0f, 40.0f));
 
     auto resizeByDown = cocos2d::ResizeBy::create(1.8f, Size(0.0f, -30.0f));
-    auto resizeByUp = cocos2d::ResizeBy::create(1.8f, Size(0.0f, 30.0f));
+    auto resizeByUp   = cocos2d::ResizeBy::create(1.8f, Size(0.0f, 30.0f));
     addChild(imageViewResize);
     auto rep = RepeatForever::create(Sequence::create(resizeUp, resizeDown, resizeByDown, resizeByUp, nullptr));
     imageViewResize->runAction(rep);
@@ -2255,20 +2153,20 @@ void ActionResize::onEnter()
     ImageView* imageViewScale = ImageView::create("cocosui/buttonHighlighted.png");
     imageViewScale->setScale9Enabled(true);
     imageViewScale->setContentSize(Size(50.0f, 40.0f));
-    imageViewScale->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f));
+    imageViewScale->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
 
     auto scaleDownScale = cocos2d::ScaleTo::create(2.8f, 1.0f);
-    auto scaleUpScale = cocos2d::ScaleTo::create(2.8f, 6.0f, 1.0f);
+    auto scaleUpScale   = cocos2d::ScaleTo::create(2.8f, 6.0f, 1.0f);
 
     auto scaleByDownScale = cocos2d::ScaleBy::create(1.8f, 1.0f, 0.25f);
-    auto scaleByUpScale = cocos2d::ScaleBy::create(1.8f, 1.0f, 4.0f);
+    auto scaleByUpScale   = cocos2d::ScaleBy::create(1.8f, 1.0f, 4.0f);
     addChild(imageViewScale);
-    auto rep2 = RepeatForever::create(Sequence::create(scaleUpScale, scaleDownScale, scaleByDownScale, scaleByUpScale, nullptr));
+    auto rep2 = RepeatForever::create(
+        Sequence::create(scaleUpScale, scaleDownScale, scaleByDownScale, scaleByUpScale, nullptr));
     imageViewScale->runAction(rep2);
 }
 
-std::string ActionResize::subtitle() const 
+std::string ActionResize::subtitle() const
 {
     return "ResizeTo / ResizeBy";
 }
@@ -2280,23 +2178,19 @@ std::string ActionResize::subtitle() const
 //------------------------------------------------------------------
 void ActionRemoveSelf::onEnter()
 {
-	ActionsDemo::onEnter();
+    ActionsDemo::onEnter();
 
-	alignSpritesLeft(1);
+    alignSpritesLeft(1);
 
-	auto action = Sequence::create(
-		MoveBy::create( 2, Vec2(240.0f,0.0f)),
-		RotateBy::create( 2,  540),
-		ScaleTo::create(1,0.1f),
-		RemoveSelf::create(),
-		nullptr);
+    auto action = Sequence::create(MoveBy::create(2, Vec2(240.0f, 0.0f)), RotateBy::create(2, 540),
+                                   ScaleTo::create(1, 0.1f), RemoveSelf::create(), nullptr);
 
-	_grossini->runAction(action);
+    _grossini->runAction(action);
 }
 
 std::string ActionRemoveSelf::subtitle() const
 {
-	return "Sequence: Move + Rotate + Scale + RemoveSelf";
+    return "Sequence: Move + Rotate + Scale + RemoveSelf";
 }
 
 //------------------------------------------------------------------
@@ -2312,31 +2206,28 @@ void ActionFloatTest::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-    // create float action with duration and from to value, using lambda function we can easily animate any property of the Node.
-    auto actionFloat = ActionFloat::create(2.f, 0, 3, [this](float value) {
-        _tamara->setScale(value);
-    });
+    // create float action with duration and from to value, using lambda function we can easily animate any property of
+    // the Node.
+    auto actionFloat = ActionFloat::create(2.f, 0, 3, [this](float value) { _tamara->setScale(value); });
 
     float grossiniY = _grossini->getPositionY();
 
-    auto actionFloat1 = ActionFloat::create(3.f, grossiniY, grossiniY + 50, [this](float value) {
-        _grossini->setPositionY(value);
-    });
+    auto actionFloat1 =
+        ActionFloat::create(3.f, grossiniY, grossiniY + 50, [this](float value) { _grossini->setPositionY(value); });
 
-    auto actionFloat2 = ActionFloat::create(3.f, 3, 1, [this] (float value) {
-        _kathia->setScale(value);
-    });
+    auto actionFloat2 = ActionFloat::create(3.f, 3, 1, [this](float value) { _kathia->setScale(value); });
 
     _tamara->runAction(actionFloat);
     _grossini->runAction(actionFloat1);
     _kathia->runAction(actionFloat2);
 }
 
-void Issue14936_1::onEnter() {
+void Issue14936_1::onEnter()
+{
     ActionsDemo::onEnter();
     centerSprites(0);
 
-    auto origin = cocos2d::Director::getInstance()->getVisibleOrigin();
+    auto origin      = cocos2d::Director::getInstance()->getVisibleOrigin();
     auto visibleSize = cocos2d::Director::getInstance()->getVisibleSize();
 
     _count = 0;
@@ -2345,7 +2236,7 @@ void Issue14936_1::onEnter() {
     counterLabel->setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2);
     addChild(counterLabel);
 
-    auto func = CallFunc::create([this, counterLabel]{
+    auto func = CallFunc::create([this, counterLabel] {
         _count++;
         std::ostringstream os;
         os << _count;
@@ -2355,18 +2246,20 @@ void Issue14936_1::onEnter() {
     runAction(Spawn::create(func, func, nullptr));
 }
 
-std::string Issue14936_1::subtitle() const {
+std::string Issue14936_1::subtitle() const
+{
     return "Counter should be equal 2";
 }
 
-void Issue14936_2::onEnter() {
+void Issue14936_2::onEnter()
+{
     ActionsDemo::onEnter();
     centerSprites(0);
 
-    auto origin = cocos2d::Director::getInstance()->getVisibleOrigin();
+    auto origin      = cocos2d::Director::getInstance()->getVisibleOrigin();
     auto visibleSize = cocos2d::Director::getInstance()->getVisibleSize();
 
-    _count = 0;
+    _count            = 0;
     auto counterLabel = Label::createWithTTF("0", "fonts/Marker Felt.ttf", 16.0f);
     counterLabel->setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2);
     addChild(counterLabel);
@@ -2381,15 +2274,18 @@ void Issue14936_2::onEnter() {
     runAction(Sequence::create(TargetedAction::create(this, func), DelayTime::create(0.2f), nullptr));
 }
 
-std::string Issue14936_2::subtitle() const {
+std::string Issue14936_2::subtitle() const
+{
     return "Counter should be equal 1";
 }
 
-std::string Issue14936_2::title() const {
+std::string Issue14936_2::title() const
+{
     return "Issue 14936 - Sequence";
 }
 
-std::string Issue14936_1::title() const {
+std::string Issue14936_1::title() const
+{
     return "Issue 14936 - Action Interval";
 }
 
@@ -2398,8 +2294,6 @@ std::string ActionFloatTest::subtitle() const
     return "ActionFloat";
 }
 
-
-
 //------------------------------------------------------------------
 //
 // SequenceWithFinalInstant
@@ -2410,36 +2304,31 @@ void SequenceWithFinalInstant::onEnter()
     TestCase::onEnter();
 
     _manager = new cocos2d::ActionManager();
-    
+
     _target = cocos2d::Node::create();
-    _target->setActionManager( _manager );
+    _target->setActionManager(_manager);
     _target->retain();
     _target->onEnter();
 
-    bool called( false );
-    const auto f
-      ( [ &called ]() -> void
-        {
-          cocos2d::log("Callback called.");
-          called = true;
-        } );
-    
+    bool called(false);
+    const auto f([&called]() -> void {
+        cocos2d::log("Callback called.");
+        called = true;
+    });
+
     const auto action =
-      cocos2d::Sequence::create
-      (cocos2d::DelayTime::create(0.05f),
-       cocos2d::CallFunc::create(f),
-       nullptr);
+        cocos2d::Sequence::create(cocos2d::DelayTime::create(0.05f), cocos2d::CallFunc::create(f), nullptr);
 
     _target->runAction(action);
     _manager->update(0);
     _manager->update(0.05f - FLT_EPSILON);
 
-    if ( action->isDone() && !called )
+    if (action->isDone() && !called)
         assert(false);
-    
+
     _manager->update(FLT_EPSILON);
 
-    if ( action->isDone() && !called )
+    if (action->isDone() && !called)
         assert(false);
 }
 
@@ -2465,54 +2354,46 @@ std::string SequenceWithFinalInstant::subtitle() const
 void Issue18003::onEnter()
 {
     TestCase::onEnter();
-    
+
     _manager = new ActionManager();
-    
+
     _target = Node::create();
     _target->setActionManager(_manager);
     _target->retain();
     _target->onEnter();
-    
+
     // instant action + interval action
-    
-    const auto f
-    ( []() -> void
-     {
-         // do nothing
-     });
-    
-    auto action = Sequence::create(CallFunc::create(f),
-                                   DelayTime::create(1),
-                                   nullptr);
-    
+
+    const auto f([]() -> void {
+        // do nothing
+    });
+
+    auto action = Sequence::create(CallFunc::create(f), DelayTime::create(1), nullptr);
+
     _target->runAction(action);
     _manager->update(0);
     _manager->update(2);
-    
+
     assert(action->isDone());
-    
+
     _target->stopAction(action);
-    
+
     // instant action + instant action
-    action = Sequence::create(CallFunc::create(f),
-                              CallFunc::create(f),
-                              nullptr);
+    action = Sequence::create(CallFunc::create(f), CallFunc::create(f), nullptr);
     _target->runAction(action);
     _manager->update(0);
     _manager->update(1);
     assert(action->isDone());
     _target->stopAction(action);
-    
+
     // interval action + instant action
-    action = Sequence::create(DelayTime::create(1),
-                              CallFunc::create(f),
-                              nullptr);
+    action = Sequence::create(DelayTime::create(1), CallFunc::create(f), nullptr);
     _target->runAction(action);
     _manager->update(0);
     _manager->update(2);
     assert(action->isDone());
     _target->stopAction(action);
-    
+
     // interval action + interval action
     action = Sequence::create(DelayTime::create(1), DelayTime::create(1), nullptr);
     _target->runAction(action);
diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h
index 12b16ed6a160..1252de4f9d47 100644
--- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h
+++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h
@@ -34,9 +34,10 @@ DEFINE_TEST_SUITE(ActionsTests);
 class ActionsDemo : public TestCase
 {
 protected:
-    cocos2d::Sprite*    _grossini;
-    cocos2d::Sprite*    _tamara;
-    cocos2d::Sprite*    _kathia;
+    cocos2d::Sprite* _grossini;
+    cocos2d::Sprite* _tamara;
+    cocos2d::Sprite* _kathia;
+
 public:
     virtual void onEnter() override;
     virtual void onExit() override;
@@ -59,7 +60,7 @@ class ActionMove3D : public ActionsDemo
 {
 public:
     CREATE_FUNC(ActionMove3D);
-    
+
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
 };
@@ -181,7 +182,7 @@ class ActionAnimate : public ActionsDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::EventListenerCustom* _frameDisplayedListener;
 };
@@ -295,8 +296,8 @@ class ActionRemoveSelf : public ActionsDemo
 public:
     CREATE_FUNC(ActionRemoveSelf);
 
-	virtual void onEnter() override;
-	virtual std::string subtitle() const override;
+    virtual void onEnter() override;
+    virtual std::string subtitle() const override;
 };
 
 class ActionRepeatForever : public ActionsDemo
@@ -354,7 +355,6 @@ class ActionCallFunction : public ActionsDemo
     void callback3(Node* pTarget, int32_t data);
 };
 
-
 class ActionFollow : public ActionsDemo
 {
 public:
@@ -366,10 +366,10 @@ class ActionFollow : public ActionsDemo
 
 class ActionFollowWithOffset : public ActionsDemo
 {
-    
+
 public:
     CREATE_FUNC(ActionFollowWithOffset);
-    
+
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
 };
@@ -466,6 +466,7 @@ class Issue1305 : public ActionsDemo
     void log(Node* sender);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::Sprite* _spriteTmp;
 };
@@ -525,6 +526,7 @@ class Issue1398 : public ActionsDemo
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
+
 private:
     int _testInteger;
 };
@@ -533,10 +535,11 @@ class Issue2599 : public ActionsDemo
 {
 public:
     CREATE_FUNC(Issue2599);
-    
+
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
+
 private:
     int _count;
 };
@@ -547,7 +550,7 @@ class ActionCatmullRom : public ActionsDemo
     CREATE_FUNC(ActionCatmullRom);
 
     ~ActionCatmullRom();
-    
+
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
@@ -559,7 +562,7 @@ class ActionCardinalSpline : public ActionsDemo
     CREATE_FUNC(ActionCardinalSpline);
 
     ~ActionCardinalSpline();
-    
+
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
@@ -574,12 +577,13 @@ class PauseResumeActions : public ActionsDemo
     virtual ~PauseResumeActions();
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
-    virtual std::string title() const override;    
+    virtual std::string title() const override;
+
 private:
     cocos2d::Vector<Node*> _pausedTargets;
 };
 
-class ActionResize : public ActionsDemo 
+class ActionResize : public ActionsDemo
 {
 public:
     CREATE_FUNC(ActionResize);
@@ -605,6 +609,7 @@ class Issue14936_1 : public ActionsDemo
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
+
 private:
     int _count;
 };
@@ -617,6 +622,7 @@ class Issue14936_2 : public ActionsDemo
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     virtual std::string title() const override;
+
 private:
     int _count;
 };
@@ -625,30 +631,28 @@ class SequenceWithFinalInstant : public ActionsDemo
 {
 public:
     CREATE_FUNC(SequenceWithFinalInstant);
-    
+
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
 private:
     cocos2d::ActionManager* _manager;
     cocos2d::Node* _target;
-    
 };
 
 class Issue18003 : public ActionsDemo
 {
 public:
     CREATE_FUNC(Issue18003);
-    
+
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
 private:
     cocos2d::ActionManager* _manager;
     cocos2d::Node* _target;
-    
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp
index 6dda03072606..e606394e20aa 100644
--- a/tests/cpp-tests/Classes/AppDelegate.cpp
+++ b/tests/cpp-tests/Classes/AppDelegate.cpp
@@ -36,21 +36,18 @@ USING_NS_CC;
 
 // Enable log on Debug version
 #ifndef NDEBUG
-#define COCOS2D_DEBUG 1
+#    define COCOS2D_DEBUG 1
 #else
-#define COCOS2D_DEBUG 0
+#    define COCOS2D_DEBUG 0
 #endif
 
-AppDelegate::AppDelegate()
-: _testController(nullptr)
-{
-}
+AppDelegate::AppDelegate() : _testController(nullptr) {}
 
 AppDelegate::~AppDelegate()
 {
-    //SimpleAudioEngine::end();
-    //TODO: minggo
-    // cocostudio::ArmatureDataManager::destroyInstance();
+    // SimpleAudioEngine::end();
+    // TODO: minggo
+    //  cocostudio::ArmatureDataManager::destroyInstance();
 }
 
 // if you want a different context, modify the value of glContextAttrs
@@ -75,42 +72,42 @@ bool AppDelegate::applicationDidFinishLaunching()
 
     // initialize director
     auto director = Director::getInstance();
-    auto glview = director->getOpenGLView();
-    if (!glview) {
+    auto glview   = director->getOpenGLView();
+    if (!glview)
+    {
         std::string title = "Cpp Tests";
 #ifndef NDEBUG
         title += " *Debug*",
 #endif
-        glview = GLViewImpl::createWithRect(title, Rect(0, 0, resourceSize.width, resourceSize.height));
+            glview = GLViewImpl::createWithRect(title, Rect(0, 0, resourceSize.width, resourceSize.height));
         director->setOpenGLView(glview);
     }
-    
+
     director->setDisplayStats(true);
     director->setAnimationInterval(1.0f / 60);
 
     auto screenSize = glview->getFrameSize();
 
-
     auto fileUtils = FileUtils::getInstance();
     std::vector<std::string> searchPaths;
-    
+
     if (screenSize.height > 320)
     {
         searchPaths.push_back("hd");
         searchPaths.push_back("ccs-res/hd");
         searchPaths.push_back("ccs-res");
         searchPaths.push_back("Manifests");
-        director->setContentScaleFactor(resourceSize.height/designSize.height);
+        director->setContentScaleFactor(resourceSize.height / designSize.height);
 
         searchPaths.push_back("hd/ActionTimeline");
     }
     else
     {
         searchPaths.push_back("ccs-res");
-        
+
         searchPaths.push_back("ActionTimeline");
     }
-    
+
     fileUtils->setSearchPaths(searchPaths);
 
     glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER);
@@ -129,9 +126,9 @@ void AppDelegate::applicationDidEnterBackground()
 {
     if (_testController)
     {
-//        _testController->onEnterBackground();
+        //        _testController->onEnterBackground();
     }
-    
+
     Director::getInstance()->stopAnimation();
 }
 
@@ -140,8 +137,8 @@ void AppDelegate::applicationWillEnterForeground()
 {
     if (_testController)
     {
-//        _testController->onEnterForeground();
+        //        _testController->onEnterForeground();
     }
-    
+
     Director::getInstance()->startAnimation();
 }
diff --git a/tests/cpp-tests/Classes/AppDelegate.h b/tests/cpp-tests/Classes/AppDelegate.h
index 6a7ff311ecca..ee34105f56ff 100644
--- a/tests/cpp-tests/Classes/AppDelegate.h
+++ b/tests/cpp-tests/Classes/AppDelegate.h
@@ -24,8 +24,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
+#ifndef _APP_DELEGATE_H_
+#define _APP_DELEGATE_H_
 
 #include "cocos2d.h"
 
@@ -35,7 +35,7 @@ class TestController;
 
 Private inheritance here hides part of interface from Director.
 */
-class  AppDelegate : private cocos2d::Application
+class AppDelegate : private cocos2d::Application
 {
 public:
     AppDelegate();
@@ -66,5 +66,4 @@ class  AppDelegate : private cocos2d::Application
     TestController* _testController;
 };
 
-#endif // _APP_DELEGATE_H_
-
+#endif  // _APP_DELEGATE_H_
diff --git a/tests/cpp-tests/Classes/BaseTest.cpp b/tests/cpp-tests/Classes/BaseTest.cpp
index 30fbd9671fa3..04856b009b4b 100644
--- a/tests/cpp-tests/Classes/BaseTest.cpp
+++ b/tests/cpp-tests/Classes/BaseTest.cpp
@@ -32,17 +32,9 @@ USING_NS_CC_EXT;
 
 #define TABEL_LABEL_TAG 1024
 
-TestBase::TestBase()
-: _parentTest(nullptr)
-, _isTestList(false)
-{
-
-}
-
-TestBase::~TestBase()
-{
+TestBase::TestBase() : _parentTest(nullptr), _isTestList(false) {}
 
-}
+TestBase::~TestBase() {}
 
 void TestBase::backsUpOneLevel()
 {
@@ -53,7 +45,7 @@ void TestBase::backsUpOneLevel()
     }
 }
 
-//TestList
+// TestList
 class TestCustomTableView : public TableView
 {
 public:
@@ -68,8 +60,8 @@ class TestCustomTableView : public TableView
 
         return table;
     }
-   
-    virtual void onTouchEnded(Touch *touch, Event *event) override
+
+    virtual void onTouchEnded(Touch* touch, Event* event) override
     {
         if (!this->isVisible())
         {
@@ -80,7 +72,7 @@ class TestCustomTableView : public TableView
         {
             auto label = (Label*)_touchedCell->getChildByTag(TABEL_LABEL_TAG);
 
-            Rect bbox = label->getBoundingBox();
+            Rect bbox   = label->getBoundingBox();
             bbox.origin = _touchedCell->convertToWorldSpace(bbox.origin);
 
             if (bbox.containsPoint(touch->getLocation()) && _tableViewDelegate != nullptr)
@@ -95,10 +87,10 @@ class TestCustomTableView : public TableView
         ScrollView::onTouchEnded(touch, event);
     }
 
-    void onMouseScroll(Event *event)
+    void onMouseScroll(Event* event)
     {
         auto mouseEvent = static_cast<EventMouse*>(event);
-        float moveY = mouseEvent->getScrollY() * 20;
+        float moveY     = mouseEvent->getScrollY() * 20;
 
         auto minOffset = this->minContainerOffset();
         auto maxOffset = this->maxContainerOffset();
@@ -120,7 +112,7 @@ class TestCustomTableView : public TableView
 protected:
     TestCustomTableView()
     {
-        auto mouseListener = EventListenerMouse::create();
+        auto mouseListener           = EventListenerMouse::create();
         mouseListener->onMouseScroll = CC_CALLBACK_1(TestCustomTableView::onMouseScroll, this);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(mouseListener, this);
     }
@@ -128,25 +120,28 @@ class TestCustomTableView : public TableView
 
 TestList::TestList()
 {
-    _isTestList = true;
+    _isTestList               = true;
     _shouldRestoreTableOffset = false;
 }
 
-TestList::~TestList() {
+TestList::~TestList()
+{
     deatchTableView();
 }
 
-void TestList::deatchTableView() {
+void TestList::deatchTableView()
+{
     if (_tableView)
         _tableView->setDataSource(nullptr);
     CC_SAFE_RELEASE_NULL(_tableView);
 }
 
-void TestList::addTest(const std::string& testName, std::function<TestBase*()> callback)
+void TestList::addTest(std::string_view testName, std::function<TestBase*()> callback)
 {
     if (!testName.empty())
     {
-        _childTestNames.emplace_back(StringUtils::format("%d", static_cast<int>(_childTestNames.size() + 1)) + ":" + testName);
+        _childTestNames.emplace_back(
+            StringUtils::format("%d:%s", static_cast<int>(_childTestNames.size() + 1), testName.data()));
         _testCallbacks.emplace_back(callback);
     }
 }
@@ -156,24 +151,24 @@ void TestList::runThisTest()
     _cellTouchEnabled = true;
 
     /* Restore default window and design size
-    * Note: We should change frame and design size before your new scene create
-    * otherwise, the layout will incorrect
-    */
-    
-    GLViewImpl* glview = (GLViewImpl*) Director::getInstance()->getOpenGLView();
- #if defined(CC_PLATFORM_PC)
+     * Note: We should change frame and design size before your new scene create
+     * otherwise, the layout will incorrect
+     */
+
+    GLViewImpl* glview = (GLViewImpl*)Director::getInstance()->getOpenGLView();
+#if defined(CC_PLATFORM_PC)
     Size resourceSize(960, 640);
     glview->setWindowed(resourceSize.width, resourceSize.height);
- #endif
- 
+#endif
+
     Size designSize(480, 320);
     glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER);
 
     auto director = Director::getInstance();
-    auto scene = Scene::create();
+    auto scene    = Scene::create();
 
     auto visibleSize = director->getVisibleSize();
-    auto origin = director->getVisibleOrigin();
+    auto origin      = director->getVisibleOrigin();
     deatchTableView();
     _tableView = TestCustomTableView::create(this, Size(400, visibleSize.height));
     _tableView->retain();
@@ -191,12 +186,12 @@ void TestList::runThisTest()
 
     if (_parentTest)
     {
-        //Add back button.
+        // Add back button.
         TTFConfig ttfConfig("fonts/arial.ttf", 20);
         auto label = Label::createWithTTF(ttfConfig, "Back");
 
         auto menuItem = MenuItemLabel::create(label, std::bind(&TestBase::backsUpOneLevel, this));
-        auto menu = Menu::create(menuItem, nullptr);
+        auto menu     = Menu::create(menuItem, nullptr);
 
         menu->setPosition(Vec2::ZERO);
         menuItem->setPosition(Vec2(VisibleRect::right().x - 50, VisibleRect::bottom().y + 25));
@@ -205,18 +200,17 @@ void TestList::runThisTest()
     }
     else
     {
-        //Add close and "Start AutoTest" button.
-        auto closeItem = MenuItemImage::create(s_pathClose, s_pathClose, [](Ref* sender){
+        // Add close and "Start AutoTest" button.
+        auto closeItem = MenuItemImage::create(s_pathClose, s_pathClose, [](Ref* sender) {
             TestController::getInstance()->stopAutoTest();
             TestController::destroyInstance();
             Director::getInstance()->end();
         });
         closeItem->setPosition(VisibleRect::right().x - 30, VisibleRect::top().y - 30);
 
-        auto autoTestLabel = Label::createWithTTF("Start AutoTest","fonts/arial.ttf",16);
-        auto autoTestItem = MenuItemLabel::create(autoTestLabel, [&](Ref* sender){
-            TestController::getInstance()->startAutoTest();
-        });
+        auto autoTestLabel = Label::createWithTTF("Start AutoTest", "fonts/arial.ttf", 16);
+        auto autoTestItem =
+            MenuItemLabel::create(autoTestLabel, [&](Ref* sender) { TestController::getInstance()->startAutoTest(); });
         autoTestItem->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + 50));
 
         auto menu = Menu::create(closeItem, autoTestItem, nullptr);
@@ -237,9 +231,9 @@ void TestList::tableCellTouched(TableView* table, TableViewCell* cell)
             auto test = _testCallbacks[index]();
             if (test->getChildTestCount() > 0)
             {
-                _tableOffset = table->getContentOffset();
+                _tableOffset              = table->getContentOffset();
                 _shouldRestoreTableOffset = true;
-                _cellTouchEnabled = false;
+                _cellTouchEnabled         = false;
                 test->setTestParent(this);
                 test->runThisTest();
             }
@@ -251,12 +245,12 @@ void TestList::tableCellTouched(TableView* table, TableViewCell* cell)
     }
 }
 
-TableViewCell* TestList::tableCellAtIndex(TableView *table, ssize_t idx)
+TableViewCell* TestList::tableCellAtIndex(TableView* table, ssize_t idx)
 {
     auto cell = table->dequeueCell();
     if (!cell)
     {
-        cell = TableViewCell::create();
+        cell       = TableViewCell::create();
         auto label = Label::createWithTTF(_childTestNames[idx], "fonts/arial.ttf", 20.0f);
         label->setTag(TABEL_LABEL_TAG);
         label->setPosition(200, 15);
@@ -271,18 +265,18 @@ TableViewCell* TestList::tableCellAtIndex(TableView *table, ssize_t idx)
     return cell;
 }
 
-Size TestList::tableCellSizeForIndex(TableView *table, ssize_t idx)
+Size TestList::tableCellSizeForIndex(TableView* table, ssize_t idx)
 {
     return Size(400, 30);
 }
 
-ssize_t TestList::numberOfCellsInTableView(TableView *table)
+ssize_t TestList::numberOfCellsInTableView(TableView* table)
 {
     return _childTestNames.size();
 }
 
-//TestSuite
-void TestSuite::addTestCase(const std::string& testName, std::function<Scene*()> callback)
+// TestSuite
+void TestSuite::addTestCase(std::string_view testName, std::function<Scene*()> callback)
 {
     if (!testName.empty() && callback)
     {
@@ -294,7 +288,7 @@ void TestSuite::addTestCase(const std::string& testName, std::function<Scene*()>
 static TestCase* getTestCase(Scene* scene)
 {
     auto transitionScene = dynamic_cast<TransitionScene*>(scene);
-    TestCase* testCase = nullptr;
+    TestCase* testCase   = nullptr;
     if (transitionScene)
     {
         testCase = dynamic_cast<TestCase*>(transitionScene->getInScene());
@@ -314,8 +308,8 @@ void TestSuite::runThisTest()
         TestController::getInstance()->setCurrTestSuite(this);
 
         _currTestIndex = 0;
-        auto scene = _testCallbacks[0]();
-        auto testCase = getTestCase(scene);
+        auto scene     = _testCallbacks[0]();
+        auto testCase  = getTestCase(scene);
         testCase->setTestSuite(this);
         testCase->setTestCaseName(_childTestNames[_currTestIndex]);
         Director::getInstance()->replaceScene(scene);
@@ -324,7 +318,7 @@ void TestSuite::runThisTest()
 
 void TestSuite::restartCurrTest()
 {
-    auto scene = _testCallbacks[_currTestIndex]();
+    auto scene    = _testCallbacks[_currTestIndex]();
     auto testCase = getTestCase(scene);
     testCase->setTestSuite(this);
     testCase->setTestCaseName(_childTestNames[_currTestIndex]);
@@ -336,7 +330,7 @@ void TestSuite::enterNextTest()
 {
     _currTestIndex = (_currTestIndex + 1) % _childTestNames.size();
 
-    auto scene = _testCallbacks[_currTestIndex]();
+    auto scene    = _testCallbacks[_currTestIndex]();
     auto testCase = getTestCase(scene);
     testCase->setTestSuite(this);
     testCase->setTestCaseName(_childTestNames[_currTestIndex]);
@@ -355,7 +349,7 @@ void TestSuite::enterPreviousTest()
         _currTestIndex = (int)_childTestNames.size() - 1;
     }
 
-    auto scene = _testCallbacks[_currTestIndex]();
+    auto scene    = _testCallbacks[_currTestIndex]();
     auto testCase = getTestCase(scene);
     testCase->setTestSuite(this);
     testCase->setTestCaseName(_childTestNames[_currTestIndex]);
@@ -363,22 +357,20 @@ void TestSuite::enterPreviousTest()
     Director::getInstance()->replaceScene(scene);
 }
 
-//TestCase
+// TestCase
 TestCase::TestCase()
-: _priorTestItem(nullptr)
-, _restartTestItem(nullptr)
-, _nextTestItem(nullptr)
-, _titleLabel(nullptr)
-, _subtitleLabel(nullptr)
-, _testSuite(nullptr)
-, _runTime(0.0f)
+    : _priorTestItem(nullptr)
+    , _restartTestItem(nullptr)
+    , _nextTestItem(nullptr)
+    , _titleLabel(nullptr)
+    , _subtitleLabel(nullptr)
+    , _testSuite(nullptr)
+    , _runTime(0.0f)
 {
     SpriteFrameCache::getInstance()->removeUnusedSpriteFrames();
     Director::getInstance()->getTextureCache()->removeUnusedTextures();
 
-    this->schedule([&](float dt){
-        _runTime += dt;
-    }, "AccumulatedTimeUse");
+    this->schedule([&](float dt) { _runTime += dt; }, "AccumulatedTimeUse");
 }
 
 TestCase::~TestCase()
@@ -422,27 +414,31 @@ bool TestCase::init()
         _titleLabel = Label::createWithTTF(ttfConfig, title());
         addChild(_titleLabel, 9999);
         _titleLabel->setPosition(VisibleRect::center().x, VisibleRect::top().y - 30);
-        
+
         ttfConfig.fontSize = 16;
-        _subtitleLabel = Label::createWithTTF(ttfConfig, subtitle());
+        _subtitleLabel     = Label::createWithTTF(ttfConfig, subtitle());
         _subtitleLabel->setMaxLineWidth(VisibleRect::getVisibleRect().size.width);
         addChild(_subtitleLabel, 9999);
         _subtitleLabel->setPosition(VisibleRect::center().x, VisibleRect::top().y - 60);
-        
+
         _priorTestItem = MenuItemImage::create(s_pathB1, s_pathB2, CC_CALLBACK_1(TestCase::priorTestCallback, this));
-        _restartTestItem = MenuItemImage::create(s_pathR1, s_pathR2, CC_CALLBACK_1(TestCase::restartTestCallback, this));
+        _restartTestItem =
+            MenuItemImage::create(s_pathR1, s_pathR2, CC_CALLBACK_1(TestCase::restartTestCallback, this));
         _nextTestItem = MenuItemImage::create(s_pathF1, s_pathF2, CC_CALLBACK_1(TestCase::nextTestCallback, this));
-        
+
         ttfConfig.fontSize = 20;
-        auto backLabel = Label::createWithTTF(ttfConfig, "Back");
-        auto backItem = MenuItemLabel::create(backLabel, CC_CALLBACK_1(TestCase::onBackCallback, this));
+        auto backLabel     = Label::createWithTTF(ttfConfig, "Back");
+        auto backItem      = MenuItemLabel::create(backLabel, CC_CALLBACK_1(TestCase::onBackCallback, this));
 
         auto menu = Menu::create(_priorTestItem, _restartTestItem, _nextTestItem, backItem, nullptr);
 
         menu->setPosition(Vec2::ZERO);
-        _priorTestItem->setPosition(VisibleRect::center().x - _restartTestItem->getContentSize().width * 2, VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
-        _restartTestItem->setPosition(VisibleRect::center().x, VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
-        _nextTestItem->setPosition(VisibleRect::center().x + _restartTestItem->getContentSize().width * 2, VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
+        _priorTestItem->setPosition(VisibleRect::center().x - _restartTestItem->getContentSize().width * 2,
+                                    VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
+        _restartTestItem->setPosition(VisibleRect::center().x,
+                                      VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
+        _nextTestItem->setPosition(VisibleRect::center().x + _restartTestItem->getContentSize().width * 2,
+                                   VisibleRect::bottom().y + _restartTestItem->getContentSize().height / 2);
         backItem->setPosition(Vec2(VisibleRect::right().x - 50, VisibleRect::bottom().y + 25));
 
         addChild(menu, 9999);
@@ -464,7 +460,8 @@ void TestCase::onEnter()
 
     if (_testSuite)
     {
-        _titleLabel->setString(StringUtils::format("%d", static_cast<int>(_testSuite->getCurrTestIndex() + 1)) + ":" + title());
+        _titleLabel->setString(StringUtils::format("%d", static_cast<int>(_testSuite->getCurrTestIndex() + 1)) + ":" +
+                               title());
     }
     else
     {
diff --git a/tests/cpp-tests/Classes/BaseTest.h b/tests/cpp-tests/Classes/BaseTest.h
index b7824a917ccd..526b4d16d552 100644
--- a/tests/cpp-tests/Classes/BaseTest.h
+++ b/tests/cpp-tests/Classes/BaseTest.h
@@ -47,7 +47,7 @@ class TestCase : public cocos2d::Scene
         /** For testing whether test case not crash.*/
         ROBUSTNESS,
         /**
-         * For check the correctness of regular test cases. 
+         * For check the correctness of regular test cases.
          * A test case passes only if the actual output equal to the expected output.
          */
         UNIT,
@@ -67,7 +67,6 @@ class TestCase : public cocos2d::Scene
     /** Returns the time the test case needs.*/
     virtual float getDuration() const;
 
-
     /** Returns the expected output.*/
     virtual std::string getExpectedOutput() const { return ""; }
     /** Returns the actual output.*/
@@ -91,15 +90,14 @@ class TestCase : public cocos2d::Scene
     /**
      * You should NEVER call this method, unless you know what you are doing.
      */
-    void setTestCaseName(const std::string& name) { _testCaseName = name; }
+    void setTestCaseName(std::string_view name) { _testCaseName = name; }
     std::string getTestCaseName() const { return _testCaseName; }
 
     const cocos2d::Label* getSubtitleLable() const { return _subtitleLabel; }
     const cocos2d::MenuItemImage* getRestartTestItem() const { return _restartTestItem; }
 
     virtual void onEnter() override;
-CC_CONSTRUCTOR_ACCESS:
-    virtual bool init() override;
+    CC_CONSTRUCTOR_ACCESS : virtual bool init() override;
 
 protected:
     cocos2d::MenuItemImage* _priorTestItem;
@@ -138,13 +136,14 @@ class TestBase : public cocos2d::Ref
     ssize_t getChildTestCount() { return _childTestNames.size(); }
 
     /**
-    * You should NEVER call this method.
-    */
+     * You should NEVER call this method.
+     */
     void setTestParent(TestBase* parent) { _parentTest = parent; }
     TestBase* getTestParent() { return _parentTest; }
 
-    void setTestName(const std::string& testName) { _testName = testName; }
+    void setTestName(std::string_view testName) { _testName = testName; }
     std::string getTestName() const { return _testName; }
+
 protected:
     TestBase();
 
@@ -157,13 +156,13 @@ class TestBase : public cocos2d::Ref
 class TestController;
 
 /**
-* TestSuite correspond to a group of test cases.
-* @note Each test case should add to a TestSuite object. 
-*/
+ * TestSuite correspond to a group of test cases.
+ * @note Each test case should add to a TestSuite object.
+ */
 class TestSuite : public TestBase
 {
 public:
-    void addTestCase(const std::string& testName, std::function<cocos2d::Scene*()> callback);
+    void addTestCase(std::string_view testName, std::function<cocos2d::Scene*()> callback);
 
     virtual void restartCurrTest();
     virtual void enterNextTest();
@@ -184,26 +183,30 @@ class TestCustomTableView;
 /**
  * An instance of TestList is a means for displaying hierarchical lists of TestSuite.
  */
-class TestList : public TestBase, public cocos2d::extension::TableViewDataSource, public cocos2d::extension::TableViewDelegate
+class TestList : public TestBase,
+                 public cocos2d::extension::TableViewDataSource,
+                 public cocos2d::extension::TableViewDelegate
 {
 public:
     TestList();
     ~TestList();
 
-    void addTest(const std::string& testName, std::function<TestBase*()> callback);
+    void addTest(std::string_view testName, std::function<TestBase*()> callback);
 
     virtual void runThisTest() override;
 
+    virtual void tableCellTouched(cocos2d::extension::TableView* table,
+                                  cocos2d::extension::TableViewCell* cell) override;
+    virtual cocos2d::extension::TableViewCell* tableCellAtIndex(cocos2d::extension::TableView* table,
+                                                                ssize_t idx) override;
+    virtual cocos2d::Size tableCellSizeForIndex(cocos2d::extension::TableView* table, ssize_t idx) override;
+    virtual ssize_t numberOfCellsInTableView(cocos2d::extension::TableView* table) override;
 
-    virtual void tableCellTouched(cocos2d::extension::TableView* table, cocos2d::extension::TableViewCell* cell) override;
-    virtual cocos2d::extension::TableViewCell* tableCellAtIndex(cocos2d::extension::TableView *table, ssize_t idx) override;
-    virtual cocos2d::Size tableCellSizeForIndex(cocos2d::extension::TableView *table, ssize_t idx) override;
-    virtual ssize_t numberOfCellsInTableView(cocos2d::extension::TableView *table) override;
-
-    virtual void scrollViewDidScroll(cocos2d::extension::ScrollView* view) override{}
-    virtual void scrollViewDidZoom(cocos2d::extension::ScrollView* view) override{}
+    virtual void scrollViewDidScroll(cocos2d::extension::ScrollView* view) override {}
+    virtual void scrollViewDidZoom(cocos2d::extension::ScrollView* view) override {}
 
     void deatchTableView();
+
 private:
     std::vector<std::function<TestBase*()>> _testCallbacks;
     bool _cellTouchEnabled;
@@ -213,32 +216,40 @@ class TestList : public TestBase, public cocos2d::extension::TableViewDataSource
     TestCustomTableView* _tableView{};
 };
 
+#define ADD_TEST(__className__) addTest(#__className__, []() { return new __className__; });
 
-#define ADD_TEST(__className__) addTest( #__className__, [](){ return new __className__;} );
-
-#define ADD_TEST_CASE(__className__) addTestCase( #__className__, [](){ return __className__::create();} );
+#define ADD_TEST_CASE(__className__) addTestCase(#__className__, []() { return __className__::create(); });
 
-#define DEFINE_TEST_LIST(__className__) class __className__  : public TestList { public: __className__();}
-
-#define DEFINE_TEST_SUITE(__className__) class __className__  : public TestSuite { public: __className__();}
+#define DEFINE_TEST_LIST(__className__)   \
+    class __className__ : public TestList \
+    {                                     \
+    public:                               \
+        __className__();                  \
+    }
 
+#define DEFINE_TEST_SUITE(__className__)   \
+    class __className__ : public TestSuite \
+    {                                      \
+    public:                                \
+        __className__();                   \
+    }
 
 /**
  * BaseTest is retained for compatibility with older versions.
- * @warning It should soon be removed. 
+ * @warning It should soon be removed.
  */
 class BaseTest : public cocos2d::Layer
 {
 public:
     virtual std::string title() const { return ""; }
-    virtual std::string subtitle() const{ return ""; }
+    virtual std::string subtitle() const { return ""; }
 
     virtual void restartCallback(cocos2d::Ref* sender) {}
-    virtual void nextCallback(cocos2d::Ref* sender){}
-    virtual void backCallback(cocos2d::Ref* sender){}
+    virtual void nextCallback(cocos2d::Ref* sender) {}
+    virtual void backCallback(cocos2d::Ref* sender) {}
 
-    virtual void onEnter() override{}
-    virtual void onExit() override{}
+    virtual void onEnter() override {}
+    virtual void onExit() override {}
 };
 
 #endif /* defined(_CPPTESTS_BASETEST_H__) */
diff --git a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp
index 49b908ab2242..0e7953a73541 100644
--- a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp
+++ b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.cpp
@@ -2,19 +2,19 @@
  Copyright (c) 2012 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,6 @@ USING_NS_CC;
 USING_NS_CC_EXT;
 using namespace cocos2d::ui;
 
-
 BillBoardTests::BillBoardTests()
 {
     ADD_TEST_CASE(BillBoardRotationTest);
@@ -49,51 +48,48 @@ BillBoardTests::BillBoardTests()
 BillBoardRotationTest::BillBoardRotationTest()
 {
     auto root = Sprite3D::create();
-    root->setPositionNormalized(Vec2(0.5f,0.25f));
+    root->setPositionNormalized(Vec2(0.5f, 0.25f));
     addChild(root);
-    
+
     auto model = Sprite3D::create("Sprite3DTest/orc.c3b");
     model->setScale(5);
-    model->setRotation3D(Vec3(0.0f,180.0f,0.0f));
+    model->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     root->addChild(model);
-    
+
     auto bill = BillBoard::create();
     bill->setPosition(0, 120);
     root->addChild(bill);
-    
+
     auto sp = Sprite::create("Images/SpookyPeas.png");
     sp->setScale(2);
     bill->addChild(sp);
-    
+
     auto lbl = Label::create();
     lbl->setPosition(0.0f, 30.0f);
     lbl->setString("+100");
     bill->addChild(lbl);
-    
-    auto r = RotateBy::create(10, Vec3(0.0f,360.0f,0.0f));
+
+    auto r  = RotateBy::create(10, Vec3(0.0f, 360.0f, 0.0f));
     auto rp = RepeatForever::create(r);
     root->runAction(rp);
-    
-    auto jump = JumpBy::create(1, Vec2(0.0f, 0.0f), 30, 1);
+
+    auto jump  = JumpBy::create(1, Vec2(0.0f, 0.0f), 30, 1);
     auto scale = ScaleBy::create(2.f, 2.f, 2.f, 0.1f);
-    auto seq = Sequence::create(jump,scale, NULL);
-    
+    auto seq   = Sequence::create(jump, scale, NULL);
+
     auto rot = RotateBy::create(2, Vec3(-90.0f, 0.0f, 0.0f));
-    auto act = Spawn::create(seq, rot,NULL);
-    
+    auto act = Spawn::create(seq, rot, NULL);
+
     auto scale2 = scale->reverse();
-    auto rot2 = rot->reverse();
-    auto act2 = Spawn::create(scale2, rot2, NULL);
-    
-    auto seq2 = Sequence::create(act, act2, NULL);
+    auto rot2   = rot->reverse();
+    auto act2   = Spawn::create(scale2, rot2, NULL);
+
+    auto seq2   = Sequence::create(act, act2, NULL);
     auto repeat = RepeatForever::create(seq2);
     model->runAction(repeat);
 }
 
-BillBoardRotationTest::~BillBoardRotationTest()
-{
-    
-}
+BillBoardRotationTest::~BillBoardRotationTest() {}
 
 std::string BillBoardRotationTest::title() const
 {
@@ -110,38 +106,37 @@ std::string BillBoardRotationTest::subtitle() const
 // Billboard Rendering Test
 //
 //------------------------------------------------------------------
-BillBoardTest::BillBoardTest()
-:  _camera(nullptr)
+BillBoardTest::BillBoardTest() : _camera(nullptr)
 {
-    //Create touch listener
-    auto listener = EventListenerTouchAllAtOnce::create();
+    // Create touch listener
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(BillBoardTest::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
-    auto layer3D=Layer::create();
-    addChild(layer3D,0);
+
+    auto layer3D = Layer::create();
+    addChild(layer3D, 0);
     _layerBillBoard = layer3D;
-    auto s = Director::getInstance()->getWinSize();
+    auto s          = Director::getInstance()->getWinSize();
     if (_camera == nullptr)
     {
-        _camera=Camera::createPerspective(60, (float)s.width/s.height, 1, 500);
+        _camera = Camera::createPerspective(60, (float)s.width / s.height, 1, 500);
         _camera->setCameraFlag(CameraFlag::USER1);
         _layerBillBoard->addChild(_camera);
     }
 
-    //Create rotating billboards
+    // Create rotating billboards
     std::string imgs[3] = {"Images/Icon.png", "Images/r2.png"};
     for (unsigned int i = 0; i < 4; ++i)
     {
-        Layer *layer = Layer::create();
+        Layer* layer   = Layer::create();
         auto billboard = BillBoard::create(imgs[(unsigned int)(CCRANDOM_0_1() * 1 + 0.5f)]);
         billboard->setScale(0.5f);
-        billboard->setPosition3D(Vec3(0.0f, 0.0f,  CCRANDOM_MINUS1_1() * 150.0f));
+        billboard->setPosition3D(Vec3(0.0f, 0.0f, CCRANDOM_MINUS1_1() * 150.0f));
         billboard->setOpacity(static_cast<uint8_t>(CCRANDOM_0_1() * 128 + 128));
         _billboards.push_back(billboard);
         layer->addChild(billboard);
         _layerBillBoard->addChild(layer);
-        layer->runAction( RepeatForever::create( RotateBy::create( CCRANDOM_0_1() * 10, Vec3(0.0f, 45.0f, 0.0f) ) ) );
+        layer->runAction(RepeatForever::create(RotateBy::create(CCRANDOM_0_1() * 10, Vec3(0.0f, 45.0f, 0.0f))));
     }
 
     {
@@ -158,62 +153,64 @@ BillBoardTest::BillBoardTest()
         auto sprite3d = Sprite3D::create("Sprite3DTest/orc.c3t");
         sprite3d->setScale(2.0f);
         sprite3d->addChild(billboard);
-        sprite3d->runAction( RepeatForever::create( RotateBy::create( 10.0f, Vec3(0.0f, 360.0f, 0.0f) ) ) );
+        sprite3d->runAction(RepeatForever::create(RotateBy::create(10.0f, Vec3(0.0f, 360.0f, 0.0f))));
         _layerBillBoard->addChild(sprite3d);
     }
 
-    addNewBillBoardWithCoords(Vec3(20.0f,5.0f,0.0f));
-    addNewBillBoardWithCoords(Vec3(60.0f,5.0f,0.0f));
-    addNewBillBoardWithCoords(Vec3(100.0f,5.0f,0.0f));
-    addNewBillBoardWithCoords(Vec3(140.0f,5.0f,0.0f));
-    addNewBillBoardWithCoords(Vec3(180.0f,5.0f,0.0f));
-    
-    addNewAniBillBoardWithCoords(Vec3(-20.0f,0.0f,0.0f));
-    addNewAniBillBoardWithCoords(Vec3(-60.0f,0.0f,0.0f));
-    addNewAniBillBoardWithCoords(Vec3(-100.0f,0.0f,0.0f));
-    addNewAniBillBoardWithCoords(Vec3(-140.0f,0.0f,0.0f));
-    addNewAniBillBoardWithCoords(Vec3(-180.0f,0.0f,0.0f));
-    
+    addNewBillBoardWithCoords(Vec3(20.0f, 5.0f, 0.0f));
+    addNewBillBoardWithCoords(Vec3(60.0f, 5.0f, 0.0f));
+    addNewBillBoardWithCoords(Vec3(100.0f, 5.0f, 0.0f));
+    addNewBillBoardWithCoords(Vec3(140.0f, 5.0f, 0.0f));
+    addNewBillBoardWithCoords(Vec3(180.0f, 5.0f, 0.0f));
+
+    addNewAniBillBoardWithCoords(Vec3(-20.0f, 0.0f, 0.0f));
+    addNewAniBillBoardWithCoords(Vec3(-60.0f, 0.0f, 0.0f));
+    addNewAniBillBoardWithCoords(Vec3(-100.0f, 0.0f, 0.0f));
+    addNewAniBillBoardWithCoords(Vec3(-140.0f, 0.0f, 0.0f));
+    addNewAniBillBoardWithCoords(Vec3(-180.0f, 0.0f, 0.0f));
+
     _camera->setPosition3D(Vec3(0.0f, 100.0f, 230.0f));
-    _camera->lookAt(Vec3(0,0,0), Vec3(0.0f,1.0f,0.0f));
+    _camera->lookAt(Vec3(0, 0, 0), Vec3(0.0f, 1.0f, 0.0f));
 
     TTFConfig ttfConfig("fonts/arial.ttf", 16);
-    auto label1 = Label::createWithTTF(ttfConfig,"rotate+");
-    auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback,this,10));
-    auto label2 = Label::createWithTTF(ttfConfig,"rotate-");
-    auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback,this,-10));
-    auto menu = Menu::create(menuItem1, menuItem2, nullptr);
+    auto label1    = Label::createWithTTF(ttfConfig, "rotate+");
+    auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback, this, 10));
+    auto label2    = Label::createWithTTF(ttfConfig, "rotate-");
+    auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(BillBoardTest::rotateCameraCallback, this, -10));
+    auto menu      = Menu::create(menuItem1, menuItem2, nullptr);
     menu->setPosition(Vec2::ZERO);
-    menuItem1->setPosition( Vec2( s.width-80, VisibleRect::top().y-160) );
-    menuItem2->setPosition( Vec2( s.width-80, VisibleRect::top().y-190) );
+    menuItem1->setPosition(Vec2(s.width - 80, VisibleRect::top().y - 160));
+    menuItem2->setPosition(Vec2(s.width - 80, VisibleRect::top().y - 190));
     addChild(menu, 0);
     _layerBillBoard->setCameraMask(2);
-    
-    label1 = Label::createWithTTF(ttfConfig,"Point Oriented");
-    menuItem1 = MenuItemLabel::create(label1,CC_CALLBACK_1(BillBoardTest::menuCallback_orientedPoint,this) );
-    label2 = Label::createWithTTF(ttfConfig,"Plane Oriented");
-    menuItem2 = MenuItemLabel::create(label2,CC_CALLBACK_1(BillBoardTest::menuCallback_orientedPlane,this) );
-    menuItem1->setPosition( Vec2( s.width-80, VisibleRect::top().y-100) );
-    menuItem2->setPosition( Vec2( s.width-80, VisibleRect::top().y-130) );
-    
+
+    label1    = Label::createWithTTF(ttfConfig, "Point Oriented");
+    menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(BillBoardTest::menuCallback_orientedPoint, this));
+    label2    = Label::createWithTTF(ttfConfig, "Plane Oriented");
+    menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(BillBoardTest::menuCallback_orientedPlane, this));
+    menuItem1->setPosition(Vec2(s.width - 80, VisibleRect::top().y - 100));
+    menuItem2->setPosition(Vec2(s.width - 80, VisibleRect::top().y - 130));
+
     menu = Menu::create(menuItem1, menuItem2, nullptr);
-    menu->setPosition(Vec2(0,0));
+    menu->setPosition(Vec2(0, 0));
     this->addChild(menu, 10);
     menuCallback_orientedPoint(nullptr);
-    
+
     schedule(CC_SCHEDULE_SELECTOR(BillBoardTest::update));
 }
 
 void BillBoardTest::menuCallback_orientedPoint(Ref* sender)
 {
-    for (auto& billboard : _billboards) {
+    for (auto& billboard : _billboards)
+    {
         billboard->setMode(BillBoard::Mode::VIEW_POINT_ORIENTED);
     }
 }
 
 void BillBoardTest::menuCallback_orientedPlane(Ref* sender)
 {
-    for (auto& billboard : _billboards) {
+    for (auto& billboard : _billboards)
+    {
         billboard->setMode(BillBoard::Mode::VIEW_PLANE_ORIENTED);
     }
 }
@@ -242,7 +239,7 @@ void BillBoardTest::addNewBillBoardWithCoords(Vec3 p)
         billboard->setScale(0.5f);
         billboard->setPosition3D(Vec3(p.x, p.y, -150.0f + 30 * i));
         billboard->setOpacity(static_cast<uint8_t>(CCRANDOM_0_1() * 128 + 128));
-        
+
         _layerBillBoard->addChild(billboard);
         _billboards.push_back(billboard);
     }
@@ -253,11 +250,11 @@ void BillBoardTest::addNewAniBillBoardWithCoords(Vec3 p)
     {
         auto billboardAni = BillBoard::create("Images/grossini.png");
         billboardAni->setScale(0.5f);
-        billboardAni->setPosition3D(Vec3(p.x, p.y,  -150.0f + 30 * i));
+        billboardAni->setPosition3D(Vec3(p.x, p.y, -150.0f + 30 * i));
         _layerBillBoard->addChild(billboardAni);
 
         auto animation = Animation::create();
-        for( int i=1;i<15;i++)
+        for (int i = 1; i < 15; i++)
         {
             char szName1[100] = {0};
             sprintf(szName1, "Images/grossini_dance_%02d.png", i);
@@ -273,37 +270,35 @@ void BillBoardTest::addNewAniBillBoardWithCoords(Vec3 p)
         _billboards.push_back(billboardAni);
     }
 }
-void BillBoardTest::update(float dt)
-{
-}
+void BillBoardTest::update(float dt) {}
 
 void BillBoardTest::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-    if(touches.size()==1)
+    if (touches.size() == 1)
     {
-        auto touch = touches[0];
-        auto location = touch->getLocation();
+        auto touch            = touches[0];
+        auto location         = touch->getLocation();
         auto PreviousLocation = touch->getPreviousLocation();
-        Point newPos = PreviousLocation - location;
+        Point newPos          = PreviousLocation - location;
 
         Vec3 cameraDir;
         Vec3 cameraRightDir;
         _camera->getNodeToWorldTransform().getForwardVector(&cameraDir);
         cameraDir.normalize();
-        cameraDir.y=0;
+        cameraDir.y = 0;
         _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
         cameraRightDir.normalize();
-        cameraRightDir.y=0;
-        Vec3 cameraPos=  _camera->getPosition3D();
-        cameraPos+=cameraDir*newPos.y*0.5;
-        cameraPos+=cameraRightDir*newPos.x*0.5;
-        _camera->setPosition3D(cameraPos);      
+        cameraRightDir.y = 0;
+        Vec3 cameraPos   = _camera->getPosition3D();
+        cameraPos += cameraDir * newPos.y * 0.5;
+        cameraPos += cameraRightDir * newPos.x * 0.5;
+        _camera->setPosition3D(cameraPos);
     }
 }
 
-void BillBoardTest::rotateCameraCallback(Ref* sender,float value)
+void BillBoardTest::rotateCameraCallback(Ref* sender, float value)
 {
-    Vec3  rotation3D= _camera->getRotation3D();
-    rotation3D.y+= value;
+    Vec3 rotation3D = _camera->getRotation3D();
+    rotation3D.y += value;
     _camera->setRotation3D(rotation3D);
 }
diff --git a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h
index d53779089749..729091065107 100644
--- a/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h
+++ b/tests/cpp-tests/Classes/BillBoardTest/BillBoardTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,10 +29,11 @@
 #include "../BaseTest.h"
 #include <string>
 
-namespace cocos2d {
-    class BillBoard;
-    class Camera;
-}
+namespace cocos2d
+{
+class BillBoard;
+class Camera;
+}  // namespace cocos2d
 
 class BillBoardRotationTest : public TestCase
 {
@@ -42,7 +43,7 @@ class BillBoardRotationTest : public TestCase
     virtual ~BillBoardRotationTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
 };
 
@@ -57,15 +58,15 @@ class BillBoardTest : public TestCase
     virtual void update(float dt) override;
     void addNewBillBoardWithCoords(cocos2d::Vec3 p);
     void addNewAniBillBoardWithCoords(cocos2d::Vec3 p);
-    void rotateCameraCallback(cocos2d::Ref* sender,float value);
+    void rotateCameraCallback(cocos2d::Ref* sender, float value);
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
     void menuCallback_orientedPoint(cocos2d::Ref* sender);
     void menuCallback_orientedPlane(cocos2d::Ref* sender);
-    
+
 protected:
-    cocos2d::Camera*           _camera;
-    cocos2d::Layer*            _layerBillBoard;
+    cocos2d::Camera* _camera;
+    cocos2d::Layer* _layerBillBoard;
 
     std::vector<cocos2d::BillBoard*> _billboards;
 };
diff --git a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp
index 52f3a16bd400..1461f8505883 100644
--- a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp
+++ b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp
@@ -29,18 +29,16 @@
 #include "renderer/CCRenderer.h"
 #include "renderer/CCCustomCommand.h"
 
-
-
 USING_NS_CC;
 USING_NS_CC_EXT;
 
 #define PTM_RATIO 32
 
-enum {
+enum
+{
     kTagParentNode = 1,
 };
 
-
 Box2DTests::Box2DTests()
 {
     ADD_TEST_CASE(Box2DTest);
@@ -51,7 +49,6 @@ std::string Box2DTest::title() const
     return "Box2D - Basic";
 }
 
-
 bool Box2DTest::init()
 {
     if (!TestCase::init())
@@ -60,35 +57,34 @@ bool Box2DTest::init()
     }
     auto dispatcher = Director::getInstance()->getEventDispatcher();
 
-    auto touchListener = EventListenerTouchAllAtOnce::create();
+    auto touchListener            = EventListenerTouchAllAtOnce::create();
     touchListener->onTouchesEnded = CC_CALLBACK_2(Box2DTest::onTouchesEnded, this);
     dispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
 
-
     // init physics
     this->initPhysics();
     // create reset button
     this->createResetButton();
 
-    //Set up sprite
+    // Set up sprite
 #if 1
     // Use batch node. Faster
-    auto parent = SpriteBatchNode::create("Images/blocks.png", 100);
+    auto parent    = SpriteBatchNode::create("Images/blocks.png", 100);
     _spriteTexture = parent->getTexture();
 #else
     // doesn't use batch node. Slower
     _spriteTexture = Director::getInstance()->getTextureCache()->addImage("Images/blocks.png");
-    auto parent = Node::create();
+    auto parent    = Node::create();
 #endif
     addChild(parent, 0, kTagParentNode);
 
-
     addNewSpriteAtPosition(VisibleRect::center());
 
-    auto label = Label::createWithTTF("Tap screen add boxes.\nSome objects be only visible with debug on.", "fonts/Marker Felt.ttf", 12.0f);
+    auto label = Label::createWithTTF("Tap screen add boxes.\nSome objects be only visible with debug on.",
+                                      "fonts/Marker Felt.ttf", 12.0f);
     addChild(label, 0);
     label->setColor(Color3B(0, 0, 255));
-    label->setPosition(VisibleRect::center().x-50, VisibleRect::top().y - 60);
+    label->setPosition(VisibleRect::center().x - 50, VisibleRect::top().y - 60);
 
     // menu for debug layer
     MenuItemFont::setFontSize(18);
@@ -107,26 +103,19 @@ bool Box2DTest::init()
     return true;
 }
 
-Box2DTest::Box2DTest()
-    : _spriteTexture(nullptr)
-    , world(nullptr)
-{
-
-}
+Box2DTest::Box2DTest() : _spriteTexture(nullptr), world(nullptr) {}
 
 Box2DTest::~Box2DTest()
 {
     CC_SAFE_DELETE(world);
 }
 
-
 void Box2DTest::toggleDebugCallback(Ref* sender)
 {
     showDebugDraw = !showDebugDraw;
-    drawBox2D->clear(); 
+    drawBox2D->clear();
 }
 
-
 void Box2DTest::initPhysics()
 {
     b2Vec2 gravity;
@@ -140,7 +129,7 @@ void Box2DTest::initPhysics()
 
     // Define the ground body.
     b2BodyDef groundBodyDef;
-    groundBodyDef.position.Set(0, 0); // bottom-left corner
+    groundBodyDef.position.Set(0, 0);  // bottom-left corner
 
     // Call the body factory which allocates memory for the ground body
     // from a pool and creates the ground box shape (also from a pool).
@@ -151,22 +140,25 @@ void Box2DTest::initPhysics()
     b2EdgeShape groundBox;
 
     // bottom
-    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftBottom().x / PTM_RATIO, VisibleRect::leftBottom().y / PTM_RATIO), b2Vec2(VisibleRect::rightBottom().x / PTM_RATIO, VisibleRect::rightBottom().y / PTM_RATIO));
+    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftBottom().x / PTM_RATIO, VisibleRect::leftBottom().y / PTM_RATIO),
+                          b2Vec2(VisibleRect::rightBottom().x / PTM_RATIO, VisibleRect::rightBottom().y / PTM_RATIO));
     groundBody->CreateFixture(&groundBox, 0);
 
     // top
-    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftTop().x / PTM_RATIO, VisibleRect::leftTop().y / PTM_RATIO), b2Vec2(VisibleRect::rightTop().x / PTM_RATIO, VisibleRect::rightTop().y / PTM_RATIO));
+    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftTop().x / PTM_RATIO, VisibleRect::leftTop().y / PTM_RATIO),
+                          b2Vec2(VisibleRect::rightTop().x / PTM_RATIO, VisibleRect::rightTop().y / PTM_RATIO));
     groundBody->CreateFixture(&groundBox, 0);
 
     // left
-    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftTop().x / PTM_RATIO, VisibleRect::leftTop().y / PTM_RATIO), b2Vec2(VisibleRect::leftBottom().x / PTM_RATIO, VisibleRect::leftBottom().y / PTM_RATIO));
+    groundBox.SetTwoSided(b2Vec2(VisibleRect::leftTop().x / PTM_RATIO, VisibleRect::leftTop().y / PTM_RATIO),
+                          b2Vec2(VisibleRect::leftBottom().x / PTM_RATIO, VisibleRect::leftBottom().y / PTM_RATIO));
     groundBody->CreateFixture(&groundBox, 0);
 
     // right
-    groundBox.SetTwoSided(b2Vec2(VisibleRect::rightBottom().x / PTM_RATIO, VisibleRect::rightBottom().y / PTM_RATIO), b2Vec2(VisibleRect::rightTop().x / PTM_RATIO, VisibleRect::rightTop().y / PTM_RATIO));
+    groundBox.SetTwoSided(b2Vec2(VisibleRect::rightBottom().x / PTM_RATIO, VisibleRect::rightBottom().y / PTM_RATIO),
+                          b2Vec2(VisibleRect::rightTop().x / PTM_RATIO, VisibleRect::rightTop().y / PTM_RATIO));
     groundBody->CreateFixture(&groundBox, 0);
 
-
     // Small triangle
     b2Vec2 vertices[3];
     vertices[0].Set(-1.0f, 0.0f);
@@ -177,7 +169,7 @@ void Box2DTest::initPhysics()
     polygon.Set(vertices, 3);
 
     b2FixtureDef triangleShapeDef;
-    triangleShapeDef.shape = &polygon;
+    triangleShapeDef.shape   = &polygon;
     triangleShapeDef.density = 1.0f;
 
     b2BodyDef triangleBodyDef;
@@ -202,7 +194,7 @@ void Box2DTest::initPhysics()
     polygon.SetAsBox(1.0f, 0.5f);
 
     b2FixtureDef boxShapeDef;
-    boxShapeDef.shape = &polygon;
+    boxShapeDef.shape   = &polygon;
     boxShapeDef.density = 1.0f;
 
     b2BodyDef boxBodyDef;
@@ -224,7 +216,7 @@ void Box2DTest::initPhysics()
     circle.m_radius = 1.0f;
 
     b2FixtureDef circleShapeDef;
-    circleShapeDef.shape = &circle;
+    circleShapeDef.shape   = &circle;
     circleShapeDef.density = 1.0f;
 
     b2BodyDef circleBodyDef;
@@ -247,16 +239,15 @@ void Box2DTest::initPhysics()
     flags += 0 * b2Draw::e_aabbBit;
     flags += 0 * b2Draw::e_centerOfMassBit;
     g_debugDraw.SetFlags(flags);
-    g_debugDraw.mRatio = PTM_RATIO;
-    g_debugDraw.debugNodeOffset = { 0, 0 };
+    g_debugDraw.mRatio          = PTM_RATIO;
+    g_debugDraw.debugNodeOffset = {0, 0};
     world->SetDebugDraw(&g_debugDraw);
 }
 
 void Box2DTest::createResetButton()
 {
-    auto reset = MenuItemImage::create("Images/r1.png", "Images/r2.png", [&](Ref* sender) {
-        getTestSuite()->restartCurrTest();
-        });
+    auto reset = MenuItemImage::create("Images/r1.png", "Images/r2.png",
+                                       [&](Ref* sender) { getTestSuite()->restartCurrTest(); });
 
     auto menu = Menu::create(reset, nullptr);
 
@@ -269,7 +260,7 @@ void Box2DTest::addNewSpriteAtPosition(Vec2 p)
     CCLOG("Add sprite %0.2f x %02.f", p.x, p.y);
 
     // Define the dynamic body.
-    //Set up a 1m squared box in the physics world
+    // Set up a 1m squared box in the physics world
     b2BodyDef bodyDef;
     bodyDef.type = b2_dynamicBody;
     bodyDef.position.Set(p.x / PTM_RATIO, p.y / PTM_RATIO);
@@ -280,21 +271,21 @@ void Box2DTest::addNewSpriteAtPosition(Vec2 p)
 
     // Define another box shape for our dynamic body.
     b2PolygonShape dynamicBox;
-    dynamicBox.SetAsBox(.5f, .5f);//These are mid points for our 1m box
+    dynamicBox.SetAsBox(.5f, .5f);  // These are mid points for our 1m box
 
     // Define the dynamic body fixture.
     b2FixtureDef fixtureDef;
-    fixtureDef.shape = &dynamicBox;
-    fixtureDef.density = 1.0f;
+    fixtureDef.shape    = &dynamicBox;
+    fixtureDef.density  = 1.0f;
     fixtureDef.friction = 0.3f;
     body->CreateFixture(&fixtureDef);
 
     auto parent = this->getChildByTag(kTagParentNode);
 
-    //We have a 64x64 sprite sheet with 4 different 32x32 images.  The following code is
-    //just randomly picking one of the images
-    int idx = (CCRANDOM_0_1() > .5 ? 0 : 1);
-    int idy = (CCRANDOM_0_1() > .5 ? 0 : 1);
+    // We have a 64x64 sprite sheet with 4 different 32x32 images.  The following code is
+    // just randomly picking one of the images
+    int idx     = (CCRANDOM_0_1() > .5 ? 0 : 1);
+    int idy     = (CCRANDOM_0_1() > .5 ? 0 : 1);
     auto sprite = PhysicsSpriteBox2D::createWithTexture(_spriteTexture, Rect(32 * idx, 32 * idy, 32, 32));
     parent->addChild(sprite);
     sprite->setB2Body(body);
@@ -304,10 +295,10 @@ void Box2DTest::addNewSpriteAtPosition(Vec2 p)
 
 void Box2DTest::update(float dt)
 {
-    //It is recommended that a fixed time step is used with Box2D for stability
-    //of the simulation, however, we are using a variable time step here.
-    //You need to make an informed choice, the following URL is useful
-    //http://gafferongames.com/game-physics/fix-your-timestep/
+    // It is recommended that a fixed time step is used with Box2D for stability
+    // of the simulation, however, we are using a variable time step here.
+    // You need to make an informed choice, the following URL is useful
+    // http://gafferongames.com/game-physics/fix-your-timestep/
 
     int velocityIterations = 8;
     int positionIterations = 1;
@@ -316,19 +307,17 @@ void Box2DTest::update(float dt)
     // generally best to keep the time step and iterations fixed.
     world->Step(dt, velocityIterations, positionIterations);
 
-
     // Debug draw
     if (showDebugDraw)
     {
         drawBox2D->clear();
         world->DebugDraw();
     }
-
 }
 
 void Box2DTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    //Add a new body/atlas sprite at the touched location
+    // Add a new body/atlas sprite at the touched location
 
     for (auto& touch : touches)
     {
diff --git a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h
index d98406d746a9..f11f92fe08fc 100644
--- a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h
+++ b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
  Copyright (c) 2021 @aismann; Peter Eismann, Germany; dreifrankensoft
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,6 @@
 
 DEFINE_TEST_SUITE(Box2DTests);
 
-
 class Box2DTest : public TestCase
 {
 public:
@@ -61,6 +60,6 @@ class Box2DTest : public TestCase
     cocos2d::DrawNode* drawBox2D;
     cocos2d::extension::PhysicsDebugNodeBox2D g_debugDraw;
     bool showDebugDraw = true;
-} ;
+};
 
 #endif
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp
index 1b95100a080d..76c03de9ff3e 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp
@@ -34,8 +34,9 @@
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-enum {
-	kTagParentNode = 1,
+enum
+{
+    kTagParentNode = 1,
 };
 
 Settings settings;
@@ -43,34 +44,31 @@ cocos2d::Label* labelDebugDraw;
 
 enum
 {
-	kTagBox2DNode,
+    kTagBox2DNode,
 };
 
-
-TestEntry g_testEntries[MAX_TESTS] = { {nullptr} };
-int g_testCount = 0;
+TestEntry g_testEntries[MAX_TESTS] = {{nullptr}};
+int g_testCount                    = 0;
 
 int RegisterTest(const char* category, const char* name, TestCreateFcn* fcn)
 {
-	int index = g_testCount;
-	if (index < MAX_TESTS)
-	{
-		g_testEntries[index] = { category, name, fcn };
-		++g_testCount;
-		return index;
-	}
-
-	return -1;
+    int index = g_testCount;
+    if (index < MAX_TESTS)
+    {
+        g_testEntries[index] = {category, name, fcn};
+        ++g_testCount;
+        return index;
+    }
+
+    return -1;
 }
 
 Box2DTestBedTests::Box2DTestBedTests()
 {
-	for (int entryId = 0; entryId < g_testCount; ++entryId)
-	{
-		addTestCase(g_testEntries[entryId].name, [entryId]() {
-			return Box2DTestBed::createWithEntryID(entryId);
-			});
-	}
+    for (int entryId = 0; entryId < g_testCount; ++entryId)
+    {
+        addTestCase(g_testEntries[entryId].name, [entryId]() { return Box2DTestBed::createWithEntryID(entryId); });
+    }
 }
 
 //------------------------------------------------------------------
@@ -79,205 +77,202 @@ Box2DTestBedTests::Box2DTestBedTests()
 //
 //------------------------------------------------------------------
 
-Box2DTestBed::Box2DTestBed()
-{
-}
+Box2DTestBed::Box2DTestBed() {}
 
 Box2DTestBed::~Box2DTestBed()
 {
-	Layer::_eventDispatcher->removeEventListener(_touchListener);
+    Layer::_eventDispatcher->removeEventListener(_touchListener);
 }
 
 Box2DTestBed* Box2DTestBed::createWithEntryID(int entryId)
 {
-	auto layer = new Box2DTestBed();
-	layer->initWithEntryID(entryId);
-//	layer->autorelease();
+    auto layer = new Box2DTestBed();
+    layer->initWithEntryID(entryId);
+    //	layer->autorelease();
 
-	return layer;
+    return layer;
 }
 
 bool Box2DTestBed::initWithEntryID(int entryId)
 {
-	if (!TestCase::init())
-	{
-		return false;
-	}
-	auto director = Director::getInstance();
-	Vec2 visibleOrigin = director->getVisibleOrigin();
-	Size visibleSize = director->getVisibleSize();
-
-	m_entryID = entryId;
-
-	m_entry = g_testEntries + entryId;
-	m_test = m_entry->createFcn();
-
-	debugDrawNode = g_debugDraw.GetDrawNode();
-	m_test->debugDrawNode = debugDrawNode;
-	m_test->g_debugDraw = g_debugDraw;
-
-	TestCase::addChild(debugDrawNode, 100);
-
-	// init physics
-	this->initPhysics();
-
-	auto label = Label::createWithTTF(m_entry->name, "fonts/arial.ttf", 28);
-	TestCase::addChild(label, 1);
-	label->setPosition(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 50);
-
-	// Adds touch event listener
-	_touchListener = EventListenerTouchOneByOne::create();
-	_touchListener->setSwallowTouches(true);
-	_touchListener->onTouchBegan = CC_CALLBACK_2(Box2DTestBed::onTouchBegan, this);
-	_touchListener->onTouchMoved = CC_CALLBACK_2(Box2DTestBed::onTouchMoved, this);
-	_touchListener->onTouchEnded = CC_CALLBACK_2(Box2DTestBed::onTouchEnded, this);
-	TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_touchListener,10);
-
-	// Adds Keyboard event listener
-	_keyboardListener = EventListenerKeyboard::create();
-	_keyboardListener->onKeyPressed = CC_CALLBACK_2(Box2DTestBed::onKeyPressed, this);
-	_keyboardListener->onKeyReleased = CC_CALLBACK_2(Box2DTestBed::onKeyReleased, this);
-	TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_keyboardListener,11);
-
-	auto _mouseListener = EventListenerMouse::create();
-	_mouseListener->onMouseMove = CC_CALLBACK_1(Box2DTestBed::onMouseMove, this);
-	_mouseListener->onMouseUp = CC_CALLBACK_1(Box2DTestBed::onMouseUp, this);
-	_mouseListener->onMouseDown = CC_CALLBACK_1(Box2DTestBed::onMouseDown, this);
-	_mouseListener->onMouseScroll = CC_CALLBACK_1(Box2DTestBed::onMouseScroll, this);
-	TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_mouseListener, 12);
-
-	// Demo messageString
-	labelDebugDraw = Label::createWithTTF("TEST", "fonts/arial.ttf", 8.0f);
-	labelDebugDraw->setAnchorPoint(Vec2(0, 1));
-	labelDebugDraw->setPosition(VisibleRect::left().x, VisibleRect::top().y - 10);
-	labelDebugDraw->setColor(Color3B::WHITE);
-	TestCase::addChild(labelDebugDraw, 100);
-
-	TestCase::scheduleUpdate();
-
-	return true;
+    if (!TestCase::init())
+    {
+        return false;
+    }
+    auto director      = Director::getInstance();
+    Vec2 visibleOrigin = director->getVisibleOrigin();
+    Size visibleSize   = director->getVisibleSize();
+
+    m_entryID = entryId;
+
+    m_entry = g_testEntries + entryId;
+    m_test  = m_entry->createFcn();
+
+    debugDrawNode         = g_debugDraw.GetDrawNode();
+    m_test->debugDrawNode = debugDrawNode;
+    m_test->g_debugDraw   = g_debugDraw;
+
+    TestCase::addChild(debugDrawNode, 100);
+
+    // init physics
+    this->initPhysics();
+
+    auto label = Label::createWithTTF(m_entry->name, "fonts/arial.ttf", 28);
+    TestCase::addChild(label, 1);
+    label->setPosition(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 50);
+
+    // Adds touch event listener
+    _touchListener = EventListenerTouchOneByOne::create();
+    _touchListener->setSwallowTouches(true);
+    _touchListener->onTouchBegan = CC_CALLBACK_2(Box2DTestBed::onTouchBegan, this);
+    _touchListener->onTouchMoved = CC_CALLBACK_2(Box2DTestBed::onTouchMoved, this);
+    _touchListener->onTouchEnded = CC_CALLBACK_2(Box2DTestBed::onTouchEnded, this);
+    TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_touchListener, 10);
+
+    // Adds Keyboard event listener
+    _keyboardListener                = EventListenerKeyboard::create();
+    _keyboardListener->onKeyPressed  = CC_CALLBACK_2(Box2DTestBed::onKeyPressed, this);
+    _keyboardListener->onKeyReleased = CC_CALLBACK_2(Box2DTestBed::onKeyReleased, this);
+    TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_keyboardListener, 11);
+
+    auto _mouseListener           = EventListenerMouse::create();
+    _mouseListener->onMouseMove   = CC_CALLBACK_1(Box2DTestBed::onMouseMove, this);
+    _mouseListener->onMouseUp     = CC_CALLBACK_1(Box2DTestBed::onMouseUp, this);
+    _mouseListener->onMouseDown   = CC_CALLBACK_1(Box2DTestBed::onMouseDown, this);
+    _mouseListener->onMouseScroll = CC_CALLBACK_1(Box2DTestBed::onMouseScroll, this);
+    TestCase::_eventDispatcher->addEventListenerWithFixedPriority(_mouseListener, 12);
+
+    // Demo messageString
+    labelDebugDraw = Label::createWithTTF("TEST", "fonts/arial.ttf", 8.0f);
+    labelDebugDraw->setAnchorPoint(Vec2(0, 1));
+    labelDebugDraw->setPosition(VisibleRect::left().x, VisibleRect::top().y - 10);
+    labelDebugDraw->setColor(Color3B::WHITE);
+    TestCase::addChild(labelDebugDraw, 100);
+
+    TestCase::scheduleUpdate();
+
+    return true;
 }
 
 bool Box2DTestBed::onTouchBegan(Touch* touch, Event* event)
 {
-	auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
-	b2Vec2 pos = { location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio };
-	return m_test->MouseDown(pos);
+    auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
+    b2Vec2 pos    = {location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio};
+    return m_test->MouseDown(pos);
 }
 
 void Box2DTestBed::onTouchMoved(Touch* touch, Event* event)
 {
-	auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
-	b2Vec2 pos = { location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio };
-	m_test->MouseMove(pos);
+    auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
+    b2Vec2 pos    = {location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio};
+    m_test->MouseMove(pos);
 }
 
 void Box2DTestBed::onTouchEnded(Touch* touch, Event* event)
 {
-	auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
-	b2Vec2 pos = { location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio };
-	m_test->MouseUp(pos);
+    auto location = touch->getLocation() - g_debugDraw.debugNodeOffset;
+    b2Vec2 pos    = {location.x / g_debugDraw.mRatio, location.y / g_debugDraw.mRatio};
+    m_test->MouseUp(pos);
 }
 
 void Box2DTestBed::onKeyPressed(EventKeyboard::KeyCode code, Event* event)
 {
-	CCLOG("onKeyPressed, keycode: %d", static_cast<int>(code));
-	m_test->Keyboard((static_cast<int>(code) - 59));  // its a bad hack!
+    CCLOG("onKeyPressed, keycode: %d", static_cast<int>(code));
+    m_test->Keyboard((static_cast<int>(code) - 59));  // its a bad hack!
 }
 
 void Box2DTestBed::onKeyReleased(EventKeyboard::KeyCode code, Event* event)
 {
-	CCLOG("onKeyPressed, keycode: %d", static_cast<int>(code));
-	m_test->KeyboardUp((static_cast<int>(code) - 59)); // its a bad hack!
-
+    CCLOG("onKeyPressed, keycode: %d", static_cast<int>(code));
+    m_test->KeyboardUp((static_cast<int>(code) - 59));  // its a bad hack!
 }
 
 void Box2DTestBed::onMouseDown(Event* event)
 {
-	EventMouse* e = (EventMouse*)event;
-	switch (e->getMouseButton())
-	{
-		button[(int)EventMouse::MouseButton::BUTTON_LEFT] = false;
-		button[(int)EventMouse::MouseButton::BUTTON_RIGHT] = false;
-		button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = false;
-	case EventMouse::MouseButton::BUTTON_LEFT:
-		button[(int)EventMouse::MouseButton::BUTTON_LEFT] = true;
-		break;
-	case EventMouse::MouseButton::BUTTON_RIGHT:
-		button[(int)EventMouse::MouseButton::BUTTON_RIGHT] = true;
-		break;
-	case EventMouse::MouseButton::BUTTON_MIDDLE:
-		button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = true;
-		break;
-	}
+    EventMouse* e = (EventMouse*)event;
+    switch (e->getMouseButton())
+    {
+        button[(int)EventMouse::MouseButton::BUTTON_LEFT]   = false;
+        button[(int)EventMouse::MouseButton::BUTTON_RIGHT]  = false;
+        button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = false;
+    case EventMouse::MouseButton::BUTTON_LEFT:
+        button[(int)EventMouse::MouseButton::BUTTON_LEFT] = true;
+        break;
+    case EventMouse::MouseButton::BUTTON_RIGHT:
+        button[(int)EventMouse::MouseButton::BUTTON_RIGHT] = true;
+        break;
+    case EventMouse::MouseButton::BUTTON_MIDDLE:
+        button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = true;
+        break;
+    }
 }
 
 void Box2DTestBed::onMouseUp(Event* event)
 {
-	button[(int)EventMouse::MouseButton::BUTTON_LEFT] = false;
-	button[(int)EventMouse::MouseButton::BUTTON_RIGHT] = false;
-	button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = false;
+    button[(int)EventMouse::MouseButton::BUTTON_LEFT]   = false;
+    button[(int)EventMouse::MouseButton::BUTTON_RIGHT]  = false;
+    button[(int)EventMouse::MouseButton::BUTTON_MIDDLE] = false;
 }
 
 void Box2DTestBed::onMouseMove(Event* event)
 {
-	EventMouse* e = (EventMouse*)event;
-	pos = { e->getCursorX() / g_debugDraw.mRatio , e->getCursorY() / g_debugDraw.mRatio };
-
-	if (button[(int)EventMouse::MouseButton::BUTTON_RIGHT])
-	{
-		(pos.x > oldPos.x) ? g_debugDraw.debugNodeOffset.x += 4 : g_debugDraw.debugNodeOffset.x -= 4;
-		(pos.y < oldPos.y) ? g_debugDraw.debugNodeOffset.y -= 2 : g_debugDraw.debugNodeOffset.y += 2;
-	}
-	oldPos = pos;
+    EventMouse* e = (EventMouse*)event;
+    pos           = {e->getCursorX() / g_debugDraw.mRatio, e->getCursorY() / g_debugDraw.mRatio};
+
+    if (button[(int)EventMouse::MouseButton::BUTTON_RIGHT])
+    {
+        (pos.x > oldPos.x) ? g_debugDraw.debugNodeOffset.x += 4 : g_debugDraw.debugNodeOffset.x -= 4;
+        (pos.y < oldPos.y) ? g_debugDraw.debugNodeOffset.y -= 2 : g_debugDraw.debugNodeOffset.y += 2;
+    }
+    oldPos = pos;
 }
 
 void Box2DTestBed::onMouseScroll(Event* event)
 {
-	EventMouse* e = (EventMouse*)event;
-	g_debugDraw.mRatio += e->getScrollY();
+    EventMouse* e = (EventMouse*)event;
+    g_debugDraw.mRatio += e->getScrollY();
 }
 
 void Box2DTestBed::onEnter()
 {
-	Scene::onEnter();
-	ImGuiEXT::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
-	ImGuiEXT::getInstance()->addRenderLoop("#im01", CC_CALLBACK_0(Box2DTestBed::onDrawImGui, this), this);
+    Scene::onEnter();
+    ImGuiEXT::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
+    ImGuiEXT::getInstance()->addRenderLoop("#im01", CC_CALLBACK_0(Box2DTestBed::onDrawImGui, this), this);
 }
 void Box2DTestBed::onExit()
 {
-	Scene::onExit();
-	ImGuiEXT::getInstance()->removeRenderLoop("#im01");
+    Scene::onExit();
+    ImGuiEXT::getInstance()->removeRenderLoop("#im01");
 }
 
 void Box2DTestBed::update(float dt)
 {
-	// Debug draw
-	m_test->debugString = "";
-	labelDebugDraw->setString("");
-	debugDrawNode->clear();
-	m_test->Step(settings);
-	m_test->m_world->DebugDraw();
+    // Debug draw
+    m_test->debugString = "";
+    labelDebugDraw->setString("");
+    debugDrawNode->clear();
+    m_test->Step(settings);
+    m_test->m_world->DebugDraw();
 }
 
 void Box2DTestBed::initPhysics()
 {
-	uint32 flags = 0;
-	flags += 1 * b2Draw::e_shapeBit;
-	flags += 1 * b2Draw::e_jointBit;
-	flags += 0 * b2Draw::e_aabbBit;
-	flags += 0 * b2Draw::e_centerOfMassBit;
-	g_debugDraw.SetFlags(flags);
-	g_debugDraw.mRatio = 8;
-	m_test->m_world->SetDebugDraw(&g_debugDraw);
-	m_test->g_debugDraw = g_debugDraw;
-	g_debugDraw.debugNodeOffset = { 250, 70 };
-	m_test->g_debugDraw.debugNodeOffset = g_debugDraw.debugNodeOffset;
-
-	settings.m_hertz = 60;
+    uint32 flags = 0;
+    flags += 1 * b2Draw::e_shapeBit;
+    flags += 1 * b2Draw::e_jointBit;
+    flags += 0 * b2Draw::e_aabbBit;
+    flags += 0 * b2Draw::e_centerOfMassBit;
+    g_debugDraw.SetFlags(flags);
+    g_debugDraw.mRatio = 8;
+    m_test->m_world->SetDebugDraw(&g_debugDraw);
+    m_test->g_debugDraw                 = g_debugDraw;
+    g_debugDraw.debugNodeOffset         = {250, 70};
+    m_test->g_debugDraw.debugNodeOffset = g_debugDraw.debugNodeOffset;
+
+    settings.m_hertz = 60;
 }
 
 void Box2DTestBed::onDrawImGui()
 {
-	m_test->UpdateUI();
+    m_test->UpdateUI();
 }
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h
index ef82f8bdf86f..40fd87846750 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h
+++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h
@@ -31,15 +31,14 @@
 
 DEFINE_TEST_SUITE(Box2DTestBedTests);
 
-
 class Test;
 typedef Test* TestCreateFcn();
 
 struct TestEntry
 {
-	const char* category;
-	const char* name;
-	TestCreateFcn* createFcn;
+    const char* category;
+    const char* name;
+    TestCreateFcn* createFcn;
 };
 
 #define MAX_TESTS 256
@@ -50,55 +49,53 @@ int RegisterTest(const char* category, const char* name, TestCreateFcn* fcn);
 class Box2DTestBed : public TestCase, cocos2d::Layer
 {
 public:
-	static Box2DTestBed* createWithEntryID(int entryId);
+    static Box2DTestBed* createWithEntryID(int entryId);
 
-	Box2DTestBed();
-	virtual ~Box2DTestBed();
+    Box2DTestBed();
+    virtual ~Box2DTestBed();
 
-	void onEnter() override;
-	void onExit() override;
+    void onEnter() override;
+    void onExit() override;
 
-	void onDrawImGui();
+    void onDrawImGui();
 
-	void initPhysics();
-	void update(float dt) override;
+    void initPhysics();
+    void update(float dt) override;
 
-	void createResetButton();
+    void createResetButton();
 
-	bool initWithEntryID(int entryId);
+    bool initWithEntryID(int entryId);
 
-	bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
-	void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
-	void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
+    bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
+    void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
+    void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
 
-	void onKeyPressed(cocos2d::EventKeyboard::KeyCode code, cocos2d::Event* event);
-	void onKeyReleased(cocos2d::EventKeyboard::KeyCode code, cocos2d::Event* event);
+    void onKeyPressed(cocos2d::EventKeyboard::KeyCode code, cocos2d::Event* event);
+    void onKeyReleased(cocos2d::EventKeyboard::KeyCode code, cocos2d::Event* event);
 
-	void onMouseDown(cocos2d::Event* event);
-	void onMouseUp(cocos2d::Event* event);
-	void onMouseMove(cocos2d::Event* event);
-	void onMouseScroll(cocos2d::Event* event);
+    void onMouseDown(cocos2d::Event* event);
+    void onMouseUp(cocos2d::Event* event);
+    void onMouseMove(cocos2d::Event* event);
+    void onMouseScroll(cocos2d::Event* event);
 
-	cocos2d::EventListenerTouchOneByOne* _touchListener;
-	cocos2d::EventListenerKeyboard* _keyboardListener;
+    cocos2d::EventListenerTouchOneByOne* _touchListener;
+    cocos2d::EventListenerKeyboard* _keyboardListener;
 
-	TestEntry* m_entry;
-	Test* m_test;
-	int m_entryID;
+    TestEntry* m_entry;
+    Test* m_test;
+    int m_entryID;
 
 private:
+    b2World* world;
+    cocos2d::Texture2D* _spriteTexture;
 
-	b2World* world;
-	cocos2d::Texture2D* _spriteTexture;
-
-	b2Vec2 pos;
-	b2Vec2 oldPos;
-	bool button[2];
-
-	// Debug stuff
-	cocos2d::DrawNode* debugDrawNode;
-	cocos2d::extension::PhysicsDebugNodeBox2D g_debugDraw;
+    b2Vec2 pos;
+    b2Vec2 oldPos;
+    bool button[2];
 
+    // Debug stuff
+    cocos2d::DrawNode* debugDrawNode;
+    cocos2d::extension::PhysicsDebugNodeBox2D g_debugDraw;
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/test.cpp
index 5d88954b276e..1c60abf38593 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/test.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/test.cpp
@@ -1,20 +1,20 @@
 /*
-* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-*/
+ * Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
 
 #include "tests/test.h"
 #include "tests/settings.h"
@@ -31,471 +31,476 @@ USING_NS_CC_EXT;
 extern cocos2d::Label* labelDebugDraw;
 #endif
 
-void DestructionListener::SayGoodbye(b2Joint * joint)
+void DestructionListener::SayGoodbye(b2Joint* joint)
 {
-	if (test->m_mouseJoint == joint)
-	{
-		test->m_mouseJoint = NULL;
-	}
-	else
-	{
-		test->JointDestroyed(joint);
-	}
+    if (test->m_mouseJoint == joint)
+    {
+        test->m_mouseJoint = NULL;
+    }
+    else
+    {
+        test->JointDestroyed(joint);
+    }
 }
 
 Test::Test()
 {
-	b2Vec2 gravity;
-	gravity.Set(0.0f, -10.0f);
-	m_world = new b2World(gravity);
-	m_bomb = NULL;
-	m_textLine = 30;
-	m_textIncrement = 13;
-	m_mouseJoint = NULL;
-	m_pointCount = 0;
+    b2Vec2 gravity;
+    gravity.Set(0.0f, -10.0f);
+    m_world         = new b2World(gravity);
+    m_bomb          = NULL;
+    m_textLine      = 30;
+    m_textIncrement = 13;
+    m_mouseJoint    = NULL;
+    m_pointCount    = 0;
 
-	m_destructionListener.test = this;
-	m_world->SetDestructionListener(&m_destructionListener);
-	m_world->SetContactListener(this);
-	m_world->SetDebugDraw(&g_debugDraw);
+    m_destructionListener.test = this;
+    m_world->SetDestructionListener(&m_destructionListener);
+    m_world->SetContactListener(this);
+    m_world->SetDebugDraw(&g_debugDraw);
 
-	m_bombSpawning = false;
+    m_bombSpawning = false;
 
-	m_stepCount = 0;
+    m_stepCount = 0;
 
-	b2BodyDef bodyDef;
-	m_groundBody = m_world->CreateBody(&bodyDef);
+    b2BodyDef bodyDef;
+    m_groundBody = m_world->CreateBody(&bodyDef);
 
-	memset(&m_maxProfile, 0, sizeof(b2Profile));
-	memset(&m_totalProfile, 0, sizeof(b2Profile));
+    memset(&m_maxProfile, 0, sizeof(b2Profile));
+    memset(&m_totalProfile, 0, sizeof(b2Profile));
 }
 
 Test::~Test()
 {
-	// By deleting the world, we delete the bomb, mouse joint, etc.
-	delete m_world;
-	m_world = NULL;
+    // By deleting the world, we delete the bomb, mouse joint, etc.
+    delete m_world;
+    m_world = NULL;
 }
 
-void Test::PreSolve(b2Contact * contact, const b2Manifold * oldManifold)
+void Test::PreSolve(b2Contact* contact, const b2Manifold* oldManifold)
 {
-	const b2Manifold* manifold = contact->GetManifold();
-
-	if (manifold->pointCount == 0)
-	{
-		return;
-	}
-
-	b2Fixture* fixtureA = contact->GetFixtureA();
-	b2Fixture* fixtureB = contact->GetFixtureB();
-
-	b2PointState state1[b2_maxManifoldPoints], state2[b2_maxManifoldPoints];
-	b2GetPointStates(state1, state2, oldManifold, manifold);
-
-	b2WorldManifold worldManifold;
-	contact->GetWorldManifold(&worldManifold);
-
-	for (int32 i = 0; i < manifold->pointCount && m_pointCount < k_maxContactPoints; ++i)
-	{
-		ContactPoint* cp = m_points + m_pointCount;
-		cp->fixtureA = fixtureA;
-		cp->fixtureB = fixtureB;
-		cp->position = worldManifold.points[i];
-		cp->normal = worldManifold.normal;
-		cp->state = state2[i];
-		cp->normalImpulse = manifold->points[i].normalImpulse;
-		cp->tangentImpulse = manifold->points[i].tangentImpulse;
-		cp->separation = worldManifold.separations[i];
-		++m_pointCount;
-	}
+    const b2Manifold* manifold = contact->GetManifold();
+
+    if (manifold->pointCount == 0)
+    {
+        return;
+    }
+
+    b2Fixture* fixtureA = contact->GetFixtureA();
+    b2Fixture* fixtureB = contact->GetFixtureB();
+
+    b2PointState state1[b2_maxManifoldPoints], state2[b2_maxManifoldPoints];
+    b2GetPointStates(state1, state2, oldManifold, manifold);
+
+    b2WorldManifold worldManifold;
+    contact->GetWorldManifold(&worldManifold);
+
+    for (int32 i = 0; i < manifold->pointCount && m_pointCount < k_maxContactPoints; ++i)
+    {
+        ContactPoint* cp   = m_points + m_pointCount;
+        cp->fixtureA       = fixtureA;
+        cp->fixtureB       = fixtureB;
+        cp->position       = worldManifold.points[i];
+        cp->normal         = worldManifold.normal;
+        cp->state          = state2[i];
+        cp->normalImpulse  = manifold->points[i].normalImpulse;
+        cp->tangentImpulse = manifold->points[i].tangentImpulse;
+        cp->separation     = worldManifold.separations[i];
+        ++m_pointCount;
+    }
 }
 
 void Test::DrawTitle(const char* string)
 {
-	DrawString(5, 5, string);
-	m_textLine = int32(26.0f);
+    DrawString(5, 5, string);
+    m_textLine = int32(26.0f);
 }
 
 class QueryCallback : public b2QueryCallback
 {
 public:
-	QueryCallback(const b2Vec2& point)
-	{
-		m_point = point;
-		m_fixture = NULL;
-	}
-
-	bool ReportFixture(b2Fixture* fixture) override
-	{
-		b2Body* body = fixture->GetBody();
-		if (body->GetType() == b2_dynamicBody)
-		{
-			bool inside = fixture->TestPoint(m_point);
-			if (inside)
-			{
-				m_fixture = fixture;
-
-				// We are done, terminate the query.
-				return false;
-			}
-		}
-
-		// Continue the query.
-		return true;
-	}
-
-	b2Vec2 m_point;
-	b2Fixture* m_fixture;
+    QueryCallback(const b2Vec2& point)
+    {
+        m_point   = point;
+        m_fixture = NULL;
+    }
+
+    bool ReportFixture(b2Fixture* fixture) override
+    {
+        b2Body* body = fixture->GetBody();
+        if (body->GetType() == b2_dynamicBody)
+        {
+            bool inside = fixture->TestPoint(m_point);
+            if (inside)
+            {
+                m_fixture = fixture;
+
+                // We are done, terminate the query.
+                return false;
+            }
+        }
+
+        // Continue the query.
+        return true;
+    }
+
+    b2Vec2 m_point;
+    b2Fixture* m_fixture;
 };
 
-bool Test::MouseDown(const b2Vec2 & p)
+bool Test::MouseDown(const b2Vec2& p)
 {
-	m_mouseWorld = p;
-
-	if (m_mouseJoint != NULL)
-	{
-		return false;
-	}
-
-	// Make a small box.
-	b2AABB aabb;
-	b2Vec2 d;
-	d.Set(0.001f, 0.001f);
-	aabb.lowerBound = p - d;
-	aabb.upperBound = p + d;
-
-	// Query the world for overlapping shapes.
-	QueryCallback callback(p);
-	m_world->QueryAABB(&callback, aabb);
-
-	if (callback.m_fixture)
-	{
-		float frequencyHz = 5.0f;
-		float dampingRatio = 0.7f;
-
-		b2Body* body = callback.m_fixture->GetBody();
-		b2MouseJointDef jd;
-		jd.bodyA = m_groundBody;
-		jd.bodyB = body;
-		jd.target = p;
-		jd.maxForce = 1000.0f * body->GetMass();
-		b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-
-		m_mouseJoint = (b2MouseJoint*)m_world->CreateJoint(&jd);
-		body->SetAwake(true);
-		return true;
-	}
-	return false;
+    m_mouseWorld = p;
+
+    if (m_mouseJoint != NULL)
+    {
+        return false;
+    }
+
+    // Make a small box.
+    b2AABB aabb;
+    b2Vec2 d;
+    d.Set(0.001f, 0.001f);
+    aabb.lowerBound = p - d;
+    aabb.upperBound = p + d;
+
+    // Query the world for overlapping shapes.
+    QueryCallback callback(p);
+    m_world->QueryAABB(&callback, aabb);
+
+    if (callback.m_fixture)
+    {
+        float frequencyHz  = 5.0f;
+        float dampingRatio = 0.7f;
+
+        b2Body* body = callback.m_fixture->GetBody();
+        b2MouseJointDef jd;
+        jd.bodyA    = m_groundBody;
+        jd.bodyB    = body;
+        jd.target   = p;
+        jd.maxForce = 1000.0f * body->GetMass();
+        b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+
+        m_mouseJoint = (b2MouseJoint*)m_world->CreateJoint(&jd);
+        body->SetAwake(true);
+        return true;
+    }
+    return false;
 }
 
-void Test::SpawnBomb(const b2Vec2 & worldPt)
+void Test::SpawnBomb(const b2Vec2& worldPt)
 {
-	m_bombSpawnPoint = worldPt;
-	m_bombSpawning = true;
+    m_bombSpawnPoint = worldPt;
+    m_bombSpawning   = true;
 }
 
-void Test::CompleteBombSpawn(const b2Vec2 & p)
+void Test::CompleteBombSpawn(const b2Vec2& p)
 {
-	if (m_bombSpawning == false)
-	{
-		return;
-	}
-
-	const float multiplier = 30.0f;
-	b2Vec2 vel = m_bombSpawnPoint - p;
-	vel *= multiplier;
-	LaunchBomb(m_bombSpawnPoint, vel);
-	m_bombSpawning = false;
+    if (m_bombSpawning == false)
+    {
+        return;
+    }
+
+    const float multiplier = 30.0f;
+    b2Vec2 vel             = m_bombSpawnPoint - p;
+    vel *= multiplier;
+    LaunchBomb(m_bombSpawnPoint, vel);
+    m_bombSpawning = false;
 }
 
-void Test::ShiftMouseDown(const b2Vec2 & p)
+void Test::ShiftMouseDown(const b2Vec2& p)
 {
-	m_mouseWorld = p;
+    m_mouseWorld = p;
 
-	if (m_mouseJoint != NULL)
-	{
-		return;
-	}
+    if (m_mouseJoint != NULL)
+    {
+        return;
+    }
 
-	SpawnBomb(p);
+    SpawnBomb(p);
 }
 
-void Test::MouseUp(const b2Vec2 & p)
+void Test::MouseUp(const b2Vec2& p)
 {
-	if (m_mouseJoint)
-	{
-		m_world->DestroyJoint(m_mouseJoint);
-		m_mouseJoint = NULL;
-	}
-
-	if (m_bombSpawning)
-	{
-		CompleteBombSpawn(p);
-	}
+    if (m_mouseJoint)
+    {
+        m_world->DestroyJoint(m_mouseJoint);
+        m_mouseJoint = NULL;
+    }
+
+    if (m_bombSpawning)
+    {
+        CompleteBombSpawn(p);
+    }
 }
 
-void Test::MouseMove(const b2Vec2 & p)
+void Test::MouseMove(const b2Vec2& p)
 {
-	m_mouseWorld = p;
+    m_mouseWorld = p;
 
-	if (m_mouseJoint)
-	{
-		m_mouseJoint->SetTarget(p);
-	}
+    if (m_mouseJoint)
+    {
+        m_mouseJoint->SetTarget(p);
+    }
 }
 
 void Test::LaunchBomb()
 {
-	b2Vec2 p(RandomFloat(-15.0f, 15.0f), 30.0f);
-	b2Vec2 v = -5.0f * p;
-	LaunchBomb(p, v);
+    b2Vec2 p(RandomFloat(-15.0f, 15.0f), 30.0f);
+    b2Vec2 v = -5.0f * p;
+    LaunchBomb(p, v);
 }
 
-void Test::LaunchBomb(const b2Vec2 & position, const b2Vec2 & velocity)
+void Test::LaunchBomb(const b2Vec2& position, const b2Vec2& velocity)
 {
-	if (m_bomb)
-	{
-		m_world->DestroyBody(m_bomb);
-		m_bomb = NULL;
-	}
-
-	b2BodyDef bd;
-	bd.type = b2_dynamicBody;
-	bd.position = position;
-	bd.bullet = true;
-	m_bomb = m_world->CreateBody(&bd);
-	m_bomb->SetLinearVelocity(velocity);
-
-	b2CircleShape circle;
-	circle.m_radius = 0.3f;
-
-	b2FixtureDef fd;
-	fd.shape = &circle;
-	fd.density = 20.0f;
-	fd.restitution = 0.0f;
-
-	b2Vec2 minV = position - b2Vec2(0.3f, 0.3f);
-	b2Vec2 maxV = position + b2Vec2(0.3f, 0.3f);
-
-	b2AABB aabb;
-	aabb.lowerBound = minV;
-	aabb.upperBound = maxV;
-
-	m_bomb->CreateFixture(&fd);
+    if (m_bomb)
+    {
+        m_world->DestroyBody(m_bomb);
+        m_bomb = NULL;
+    }
+
+    b2BodyDef bd;
+    bd.type     = b2_dynamicBody;
+    bd.position = position;
+    bd.bullet   = true;
+    m_bomb      = m_world->CreateBody(&bd);
+    m_bomb->SetLinearVelocity(velocity);
+
+    b2CircleShape circle;
+    circle.m_radius = 0.3f;
+
+    b2FixtureDef fd;
+    fd.shape       = &circle;
+    fd.density     = 20.0f;
+    fd.restitution = 0.0f;
+
+    b2Vec2 minV = position - b2Vec2(0.3f, 0.3f);
+    b2Vec2 maxV = position + b2Vec2(0.3f, 0.3f);
+
+    b2AABB aabb;
+    aabb.lowerBound = minV;
+    aabb.upperBound = maxV;
+
+    m_bomb->CreateFixture(&fd);
 }
 
 void Test::Step(Settings& settings)
 {
-	float timeStep = settings.m_hertz > 0.0f ? 1.0f / settings.m_hertz : float(0.0f);
-
-	if (settings.m_pause)
-	{
-		if (settings.m_singleStep)
-		{
-			settings.m_singleStep = 0;
-		}
-		else
-		{
-			timeStep = 0.0f;
-		}
-
-		DrawString(5, m_textLine, "****PAUSED****");
-		
-	}
-
-	uint32 flags = 0;
-	flags += settings.m_drawShapes * b2Draw::e_shapeBit;
-	flags += settings.m_drawJoints * b2Draw::e_jointBit;
-	flags += settings.m_drawAABBs * b2Draw::e_aabbBit;
-	flags += settings.m_drawCOMs * b2Draw::e_centerOfMassBit;
-	g_debugDraw.SetFlags(flags);
-
-	m_world->SetAllowSleeping(settings.m_enableSleep);
-	m_world->SetWarmStarting(settings.m_enableWarmStarting);
-	m_world->SetContinuousPhysics(settings.m_enableContinuous);
-	m_world->SetSubStepping(settings.m_enableSubStepping);
-
-	m_pointCount = 0;
-
-	m_world->Step(timeStep, settings.m_velocityIterations, settings.m_positionIterations);
-
-	m_world->DebugDraw();
-
-	if (timeStep > 0.0f)
-	{
-		++m_stepCount;
-	}
-
-	if (settings.m_drawStats)
-	{
-		int32 bodyCount = m_world->GetBodyCount();
-		int32 contactCount = m_world->GetContactCount();
-		int32 jointCount = m_world->GetJointCount();
-		DrawString(5, m_textLine, "bodies/contacts/joints = %d/%d/%d", bodyCount, contactCount, jointCount);
-		
-
-		int32 proxyCount = m_world->GetProxyCount();
-		int32 height = m_world->GetTreeHeight();
-		int32 balance = m_world->GetTreeBalance();
-		float quality = m_world->GetTreeQuality();
-		DrawString(5, m_textLine, "proxies/height/balance/quality = %d/%d/%d/%g", proxyCount, height, balance, quality);
-		
-	}
-
-	// Track maximum profile times
-	{
-		const b2Profile& p = m_world->GetProfile();
-		m_maxProfile.step = b2Max(m_maxProfile.step, p.step);
-		m_maxProfile.collide = b2Max(m_maxProfile.collide, p.collide);
-		m_maxProfile.solve = b2Max(m_maxProfile.solve, p.solve);
-		m_maxProfile.solveInit = b2Max(m_maxProfile.solveInit, p.solveInit);
-		m_maxProfile.solveVelocity = b2Max(m_maxProfile.solveVelocity, p.solveVelocity);
-		m_maxProfile.solvePosition = b2Max(m_maxProfile.solvePosition, p.solvePosition);
-		m_maxProfile.solveTOI = b2Max(m_maxProfile.solveTOI, p.solveTOI);
-		m_maxProfile.broadphase = b2Max(m_maxProfile.broadphase, p.broadphase);
-
-		m_totalProfile.step += p.step;
-		m_totalProfile.collide += p.collide;
-		m_totalProfile.solve += p.solve;
-		m_totalProfile.solveInit += p.solveInit;
-		m_totalProfile.solveVelocity += p.solveVelocity;
-		m_totalProfile.solvePosition += p.solvePosition;
-		m_totalProfile.solveTOI += p.solveTOI;
-		m_totalProfile.broadphase += p.broadphase;
-	}
-
-	if (settings.m_drawProfile)
-	{
-		const b2Profile& p = m_world->GetProfile();
-
-		b2Profile aveProfile;
-		memset(&aveProfile, 0, sizeof(b2Profile));
-		if (m_stepCount > 0)
-		{
-			float scale = 1.0f / m_stepCount;
-			aveProfile.step = scale * m_totalProfile.step;
-			aveProfile.collide = scale * m_totalProfile.collide;
-			aveProfile.solve = scale * m_totalProfile.solve;
-			aveProfile.solveInit = scale * m_totalProfile.solveInit;
-			aveProfile.solveVelocity = scale * m_totalProfile.solveVelocity;
-			aveProfile.solvePosition = scale * m_totalProfile.solvePosition;
-			aveProfile.solveTOI = scale * m_totalProfile.solveTOI;
-			aveProfile.broadphase = scale * m_totalProfile.broadphase;
-		}
-
-		DrawString(5, m_textLine, "step [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.step, aveProfile.step, m_maxProfile.step);
-		DrawString(5, m_textLine, "collide [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.collide, aveProfile.collide, m_maxProfile.collide);
-		DrawString(5, m_textLine, "solve [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solve, aveProfile.solve, m_maxProfile.solve);		
-		DrawString(5, m_textLine, "solve init [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveInit, aveProfile.solveInit, m_maxProfile.solveInit);		
-		DrawString(5, m_textLine, "solve velocity [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveVelocity, aveProfile.solveVelocity, m_maxProfile.solveVelocity);	
-		DrawString(5, m_textLine, "solve position [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solvePosition, aveProfile.solvePosition, m_maxProfile.solvePosition);	
-		DrawString(5, m_textLine, "solveTOI [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveTOI, aveProfile.solveTOI, m_maxProfile.solveTOI);	
-		DrawString(5, m_textLine, "broad-phase [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.broadphase, aveProfile.broadphase, m_maxProfile.broadphase);
-	}
-
-	if (m_bombSpawning)
-	{
-		b2Color c;
-		c.Set(0.0f, 0.0f, 1.0f);
-		g_debugDraw.DrawPoint(m_bombSpawnPoint, 4.0f, c);
-
-		c.Set(0.8f, 0.8f, 0.8f);
-		g_debugDraw.DrawSegment(m_mouseWorld, m_bombSpawnPoint, c);
-	}
-
-	if (settings.m_drawContactPoints)
-	{
-		const float k_impulseScale = 0.1f;
-		const float k_axisScale = 0.3f;
-
-		for (int32 i = 0; i < m_pointCount; ++i)
-		{
-			ContactPoint* point = m_points + i;
-
-			if (point->state == b2_addState)
-			{
-				// Add
-				g_debugDraw.DrawPoint(point->position, 10.0f, b2Color(0.3f, 0.95f, 0.3f));
-			}
-			else if (point->state == b2_persistState)
-			{
-				// Persist
-				g_debugDraw.DrawPoint(point->position, 5.0f, b2Color(0.3f, 0.3f, 0.95f));
-			}
-
-			if (settings.m_drawContactNormals == 1)
-			{
-				b2Vec2 p1 = point->position;
-				b2Vec2 p2 = p1 + k_axisScale * point->normal;
-				g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.9f));
-			}
-			else if (settings.m_drawContactImpulse == 1)
-			{
-				b2Vec2 p1 = point->position;
-				b2Vec2 p2 = p1 + k_impulseScale * point->normalImpulse * point->normal;
-				g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.3f));
-			}
-
-			if (settings.m_drawFrictionImpulse == 1)
-			{
-				b2Vec2 tangent = b2Cross(point->normal, 1.0f);
-				b2Vec2 p1 = point->position;
-				b2Vec2 p2 = p1 + k_impulseScale * point->tangentImpulse * tangent;
-				g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.3f));
-			}
-		}
-	}
+    float timeStep = settings.m_hertz > 0.0f ? 1.0f / settings.m_hertz : float(0.0f);
+
+    if (settings.m_pause)
+    {
+        if (settings.m_singleStep)
+        {
+            settings.m_singleStep = 0;
+        }
+        else
+        {
+            timeStep = 0.0f;
+        }
+
+        DrawString(5, m_textLine, "****PAUSED****");
+    }
+
+    uint32 flags = 0;
+    flags += settings.m_drawShapes * b2Draw::e_shapeBit;
+    flags += settings.m_drawJoints * b2Draw::e_jointBit;
+    flags += settings.m_drawAABBs * b2Draw::e_aabbBit;
+    flags += settings.m_drawCOMs * b2Draw::e_centerOfMassBit;
+    g_debugDraw.SetFlags(flags);
+
+    m_world->SetAllowSleeping(settings.m_enableSleep);
+    m_world->SetWarmStarting(settings.m_enableWarmStarting);
+    m_world->SetContinuousPhysics(settings.m_enableContinuous);
+    m_world->SetSubStepping(settings.m_enableSubStepping);
+
+    m_pointCount = 0;
+
+    m_world->Step(timeStep, settings.m_velocityIterations, settings.m_positionIterations);
+
+    m_world->DebugDraw();
+
+    if (timeStep > 0.0f)
+    {
+        ++m_stepCount;
+    }
+
+    if (settings.m_drawStats)
+    {
+        int32 bodyCount    = m_world->GetBodyCount();
+        int32 contactCount = m_world->GetContactCount();
+        int32 jointCount   = m_world->GetJointCount();
+        DrawString(5, m_textLine, "bodies/contacts/joints = %d/%d/%d", bodyCount, contactCount, jointCount);
+
+        int32 proxyCount = m_world->GetProxyCount();
+        int32 height     = m_world->GetTreeHeight();
+        int32 balance    = m_world->GetTreeBalance();
+        float quality    = m_world->GetTreeQuality();
+        DrawString(5, m_textLine, "proxies/height/balance/quality = %d/%d/%d/%g", proxyCount, height, balance, quality);
+    }
+
+    // Track maximum profile times
+    {
+        const b2Profile& p         = m_world->GetProfile();
+        m_maxProfile.step          = b2Max(m_maxProfile.step, p.step);
+        m_maxProfile.collide       = b2Max(m_maxProfile.collide, p.collide);
+        m_maxProfile.solve         = b2Max(m_maxProfile.solve, p.solve);
+        m_maxProfile.solveInit     = b2Max(m_maxProfile.solveInit, p.solveInit);
+        m_maxProfile.solveVelocity = b2Max(m_maxProfile.solveVelocity, p.solveVelocity);
+        m_maxProfile.solvePosition = b2Max(m_maxProfile.solvePosition, p.solvePosition);
+        m_maxProfile.solveTOI      = b2Max(m_maxProfile.solveTOI, p.solveTOI);
+        m_maxProfile.broadphase    = b2Max(m_maxProfile.broadphase, p.broadphase);
+
+        m_totalProfile.step += p.step;
+        m_totalProfile.collide += p.collide;
+        m_totalProfile.solve += p.solve;
+        m_totalProfile.solveInit += p.solveInit;
+        m_totalProfile.solveVelocity += p.solveVelocity;
+        m_totalProfile.solvePosition += p.solvePosition;
+        m_totalProfile.solveTOI += p.solveTOI;
+        m_totalProfile.broadphase += p.broadphase;
+    }
+
+    if (settings.m_drawProfile)
+    {
+        const b2Profile& p = m_world->GetProfile();
+
+        b2Profile aveProfile;
+        memset(&aveProfile, 0, sizeof(b2Profile));
+        if (m_stepCount > 0)
+        {
+            float scale              = 1.0f / m_stepCount;
+            aveProfile.step          = scale * m_totalProfile.step;
+            aveProfile.collide       = scale * m_totalProfile.collide;
+            aveProfile.solve         = scale * m_totalProfile.solve;
+            aveProfile.solveInit     = scale * m_totalProfile.solveInit;
+            aveProfile.solveVelocity = scale * m_totalProfile.solveVelocity;
+            aveProfile.solvePosition = scale * m_totalProfile.solvePosition;
+            aveProfile.solveTOI      = scale * m_totalProfile.solveTOI;
+            aveProfile.broadphase    = scale * m_totalProfile.broadphase;
+        }
+
+        DrawString(5, m_textLine, "step [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.step, aveProfile.step,
+                   m_maxProfile.step);
+        DrawString(5, m_textLine, "collide [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.collide, aveProfile.collide,
+                   m_maxProfile.collide);
+        DrawString(5, m_textLine, "solve [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solve, aveProfile.solve,
+                   m_maxProfile.solve);
+        DrawString(5, m_textLine, "solve init [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveInit, aveProfile.solveInit,
+                   m_maxProfile.solveInit);
+        DrawString(5, m_textLine, "solve velocity [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveVelocity,
+                   aveProfile.solveVelocity, m_maxProfile.solveVelocity);
+        DrawString(5, m_textLine, "solve position [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solvePosition,
+                   aveProfile.solvePosition, m_maxProfile.solvePosition);
+        DrawString(5, m_textLine, "solveTOI [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.solveTOI, aveProfile.solveTOI,
+                   m_maxProfile.solveTOI);
+        DrawString(5, m_textLine, "broad-phase [ave] (max) = %5.2f [%6.2f] (%6.2f)", p.broadphase,
+                   aveProfile.broadphase, m_maxProfile.broadphase);
+    }
+
+    if (m_bombSpawning)
+    {
+        b2Color c;
+        c.Set(0.0f, 0.0f, 1.0f);
+        g_debugDraw.DrawPoint(m_bombSpawnPoint, 4.0f, c);
+
+        c.Set(0.8f, 0.8f, 0.8f);
+        g_debugDraw.DrawSegment(m_mouseWorld, m_bombSpawnPoint, c);
+    }
+
+    if (settings.m_drawContactPoints)
+    {
+        const float k_impulseScale = 0.1f;
+        const float k_axisScale    = 0.3f;
+
+        for (int32 i = 0; i < m_pointCount; ++i)
+        {
+            ContactPoint* point = m_points + i;
+
+            if (point->state == b2_addState)
+            {
+                // Add
+                g_debugDraw.DrawPoint(point->position, 10.0f, b2Color(0.3f, 0.95f, 0.3f));
+            }
+            else if (point->state == b2_persistState)
+            {
+                // Persist
+                g_debugDraw.DrawPoint(point->position, 5.0f, b2Color(0.3f, 0.3f, 0.95f));
+            }
+
+            if (settings.m_drawContactNormals == 1)
+            {
+                b2Vec2 p1 = point->position;
+                b2Vec2 p2 = p1 + k_axisScale * point->normal;
+                g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.9f));
+            }
+            else if (settings.m_drawContactImpulse == 1)
+            {
+                b2Vec2 p1 = point->position;
+                b2Vec2 p2 = p1 + k_impulseScale * point->normalImpulse * point->normal;
+                g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.3f));
+            }
+
+            if (settings.m_drawFrictionImpulse == 1)
+            {
+                b2Vec2 tangent = b2Cross(point->normal, 1.0f);
+                b2Vec2 p1      = point->position;
+                b2Vec2 p2      = p1 + k_impulseScale * point->tangentImpulse * tangent;
+                g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.9f, 0.3f));
+            }
+        }
+    }
 }
 
-void Test::ShiftOrigin(const b2Vec2 & newOrigin)
+void Test::ShiftOrigin(const b2Vec2& newOrigin)
 {
-	m_world->ShiftOrigin(newOrigin);
+    m_world->ShiftOrigin(newOrigin);
 }
 
 void Test::initShader(void)
 {
-	// initShader is unsupported
+    // initShader is unsupported
 }
 
 void Test::DrawString(int x, int y, const char* fmt, ...)
 {
 #if defined(CC_PLATFORM_PC)
-	debugString.append(std::string(fmt));
-	debugString.append("\n");
-	labelDebugDraw->setString(debugString);
-	//	labelDebugDraw->setPosition(x, y);
+    debugString.append(std::string(fmt));
+    debugString.append("\n");
+    labelDebugDraw->setString(debugString);
+    //	labelDebugDraw->setPosition(x, y);
 #endif
 }
 
 void Test::DrawString(const b2Vec2& pw, const char* fmt, ...)
 {
 #if defined(CC_PLATFORM_PC)
-	debugString.append(std::string(fmt));
-	debugString.append("\n");
-	labelDebugDraw->setString(debugString);
-	//	labelDebugDraw->setPosition(pw.x, pw.y);
+    debugString.append(std::string(fmt));
+    debugString.append("\n");
+    labelDebugDraw->setString(debugString);
+    //	labelDebugDraw->setPosition(pw.x, pw.y);
 #endif
 }
 
-
-
 void Test::DrawAABB(b2AABB* aabb, const b2Color& color)
 {
-	b2Vec2 p1 = aabb->lowerBound;
-	b2Vec2 p2 = b2Vec2(aabb->upperBound.x, aabb->lowerBound.y);
-	b2Vec2 p3 = aabb->upperBound;
-	b2Vec2 p4 = b2Vec2(aabb->lowerBound.x, aabb->upperBound.y);
-
-	Vec2 verts[] = {
-	Vec2(p1.x * g_debugDraw.mRatio, p1.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset ,
-	Vec2(p2.x * g_debugDraw.mRatio, p2.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset ,
-	Vec2(p3.x * g_debugDraw.mRatio, p3.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset ,
-	Vec2(p4.x * g_debugDraw.mRatio, p4.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset ,
-	};
-	debugDrawNode->drawPolygon(verts, sizeof(verts) / sizeof(verts[0]), Color4F(color.r / 2, color.g / 2, color.b / 2, 0), 0.4f, Color4F(color.r, color.g, color.b, color.a));
+    b2Vec2 p1 = aabb->lowerBound;
+    b2Vec2 p2 = b2Vec2(aabb->upperBound.x, aabb->lowerBound.y);
+    b2Vec2 p3 = aabb->upperBound;
+    b2Vec2 p4 = b2Vec2(aabb->lowerBound.x, aabb->upperBound.y);
+
+    Vec2 verts[] = {
+        Vec2(p1.x * g_debugDraw.mRatio, p1.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset,
+        Vec2(p2.x * g_debugDraw.mRatio, p2.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset,
+        Vec2(p3.x * g_debugDraw.mRatio, p3.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset,
+        Vec2(p4.x * g_debugDraw.mRatio, p4.y * g_debugDraw.mRatio) + g_debugDraw.debugNodeOffset,
+    };
+    debugDrawNode->drawPolygon(verts, sizeof(verts) / sizeof(verts[0]),
+                               Color4F(color.r / 2, color.g / 2, color.b / 2, 0), 0.4f,
+                               Color4F(color.r, color.g, color.b, color.a));
 }
 
 void Test::Flush()
 {
-	// Flush is unsupported
+    // Flush is unsupported
 }
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/add_pair.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/add_pair.cpp
index ceccbf8ca2e7..4465d35f3e01 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/add_pair.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/add_pair.cpp
@@ -25,47 +25,43 @@
 class AddPair : public Test
 {
 public:
+    AddPair()
+    {
+        m_world->SetGravity(b2Vec2(0.0f, 0.0f));
+        {
+            b2CircleShape shape;
+            shape.m_p.SetZero();
+            shape.m_radius = 0.1f;
 
-	AddPair()
-	{
-		m_world->SetGravity(b2Vec2(0.0f,0.0f));
-		{
-			b2CircleShape shape;
-			shape.m_p.SetZero();
-			shape.m_radius = 0.1f;
+            float minX = -6.0f;
+            float maxX = 0.0f;
+            float minY = 4.0f;
+            float maxY = 6.0f;
 
-			float minX = -6.0f;
-			float maxX = 0.0f;
-			float minY = 4.0f;
-			float maxY = 6.0f;
-			
-			for (int32 i = 0; i < 400; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position = b2Vec2(RandomFloat(minX,maxX),RandomFloat(minY,maxY));
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 0.01f);
-			}
-		}
-		
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(1.5f, 1.5f);
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-40.0f,5.0f);
-			bd.bullet = true;
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 1.0f);
-			body->SetLinearVelocity(b2Vec2(10.0f, 0.0f));
-		}
-	}
+            for (int32 i = 0; i < 400; ++i)
+            {
+                b2BodyDef bd;
+                bd.type      = b2_dynamicBody;
+                bd.position  = b2Vec2(RandomFloat(minX, maxX), RandomFloat(minY, maxY));
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 0.01f);
+            }
+        }
 
-	static Test* Create()
-	{
-		return new AddPair;
-	}
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(1.5f, 1.5f);
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-40.0f, 5.0f);
+            bd.bullet    = true;
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 1.0f);
+            body->SetLinearVelocity(b2Vec2(10.0f, 0.0f));
+        }
+    }
+
+    static Test* Create() { return new AddPair; }
 };
 
 static int testIndex = RegisterTest("Benchmark", "Add Pair", AddPair::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/apply_force.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/apply_force.cpp
index 40fc7e1decf4..51239f60e2f3 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/apply_force.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/apply_force.cpp
@@ -28,176 +28,172 @@
 class ApplyForce : public Test
 {
 public:
-	ApplyForce()
-	{
-		m_world->SetGravity(b2Vec2(0.0f, 0.0f));
-
-		const float k_restitution = 0.4f;
-
-		b2Body* ground;
-		{
-			b2BodyDef bd;
-			bd.position.Set(0.0f, 20.0f);
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-
-			b2FixtureDef sd;
-			sd.shape = &shape;
-			sd.density = 0.0f;
-			sd.restitution = k_restitution;
-
-			// Left vertical
-			shape.SetTwoSided(b2Vec2(-20.0f, -20.0f), b2Vec2(-20.0f, 20.0f));
-			ground->CreateFixture(&sd);
-
-			// Right vertical
-			shape.SetTwoSided(b2Vec2(20.0f, -20.0f), b2Vec2(20.0f, 20.0f));
-			ground->CreateFixture(&sd);
-
-			// Top horizontal
-			shape.SetTwoSided(b2Vec2(-20.0f, 20.0f), b2Vec2(20.0f, 20.0f));
-			ground->CreateFixture(&sd);
-
-			// Bottom horizontal
-			shape.SetTwoSided(b2Vec2(-20.0f, -20.0f), b2Vec2(20.0f, -20.0f));
-			ground->CreateFixture(&sd);
-		}
-
-		{
-			b2Transform xf1;
-			xf1.q.Set(0.3524f * b2_pi);
-			xf1.p = xf1.q.GetXAxis();
-
-			b2Vec2 vertices[3];
-			vertices[0] = b2Mul(xf1, b2Vec2(-1.0f, 0.0f));
-			vertices[1] = b2Mul(xf1, b2Vec2(1.0f, 0.0f));
-			vertices[2] = b2Mul(xf1, b2Vec2(0.0f, 0.5f));
-			
-			b2PolygonShape poly1;
-			poly1.Set(vertices, 3);
-
-			b2FixtureDef sd1;
-			sd1.shape = &poly1;
-			sd1.density = 2.0f;
-
-			b2Transform xf2;
-			xf2.q.Set(-0.3524f * b2_pi);
-			xf2.p = -xf2.q.GetXAxis();
-
-			vertices[0] = b2Mul(xf2, b2Vec2(-1.0f, 0.0f));
-			vertices[1] = b2Mul(xf2, b2Vec2(1.0f, 0.0f));
-			vertices[2] = b2Mul(xf2, b2Vec2(0.0f, 0.5f));
-			
-			b2PolygonShape poly2;
-			poly2.Set(vertices, 3);
-
-			b2FixtureDef sd2;
-			sd2.shape = &poly2;
-			sd2.density = 2.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			bd.position.Set(0.0f, 3.0);
-			bd.angle = b2_pi;
-			bd.allowSleep = false;
-			m_body = m_world->CreateBody(&bd);
-			m_body->CreateFixture(&sd1);
-			m_body->CreateFixture(&sd2);
-
-			float gravity = 10.0f;
-			float I = m_body->GetInertia();
-			float mass = m_body->GetMass();
-
-			// Compute an effective radius that can be used to
-			// set the max torque for a friction joint
-			// For a circle: I = 0.5 * m * r * r ==> r = sqrt(2 * I / m)
-			float radius = b2Sqrt(2.0f * I / mass);
-
-			b2FrictionJointDef jd;
-			jd.bodyA = ground;
-			jd.bodyB = m_body;
-			jd.localAnchorA.SetZero();
-			jd.localAnchorB = m_body->GetLocalCenter();
-			jd.collideConnected = true;
-			jd.maxForce = 0.5f * mass * gravity;
-			jd.maxTorque = 0.2f * mass * radius * gravity;
-
-			m_world->CreateJoint(&jd);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-			fd.friction = 0.3f;
-
-			for (int i = 0; i < 10; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-
-				bd.position.Set(0.0f, 7.0f + 1.54f * i);
-				b2Body* body = m_world->CreateBody(&bd);
-
-				body->CreateFixture(&fd);
-
-				float gravity = 10.0f;
-				float I = body->GetInertia();
-				float mass = body->GetMass();
-
-				// For a circle: I = 0.5 * m * r * r ==> r = sqrt(2 * I / m)
-				float radius = b2Sqrt(2.0f * I / mass);
-
-				b2FrictionJointDef jd;
-				jd.localAnchorA.SetZero();
-				jd.localAnchorB.SetZero();
-				jd.bodyA = ground;
-				jd.bodyB = body;
-				jd.collideConnected = true;
-				jd.maxForce = mass * gravity;
-				jd.maxTorque = 0.1f * mass * radius * gravity;
-
-				m_world->CreateJoint(&jd);
-			}
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		DrawString(5, m_textLine, "Forward (W), Turn (A) and (D)");
-		
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_W) == GLFW_PRESS)
-		//{
-		//	b2Vec2 f = m_body->GetWorldVector(b2Vec2(0.0f, -50.0f));
-		//	b2Vec2 p = m_body->GetWorldPoint(b2Vec2(0.0f, 3.0f));
-		//	m_body->ApplyForce(f, p, true);
-		//}
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_A) == GLFW_PRESS)
-		//{
-		//	m_body->ApplyTorque(10.0f, true);
-		//}
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_D) == GLFW_PRESS)
-		//{
-		//	m_body->ApplyTorque(-10.0f, true);
-		//}
-
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new ApplyForce;
-	}
-
-	b2Body* m_body;
+    ApplyForce()
+    {
+        m_world->SetGravity(b2Vec2(0.0f, 0.0f));
+
+        const float k_restitution = 0.4f;
+
+        b2Body* ground;
+        {
+            b2BodyDef bd;
+            bd.position.Set(0.0f, 20.0f);
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+
+            b2FixtureDef sd;
+            sd.shape       = &shape;
+            sd.density     = 0.0f;
+            sd.restitution = k_restitution;
+
+            // Left vertical
+            shape.SetTwoSided(b2Vec2(-20.0f, -20.0f), b2Vec2(-20.0f, 20.0f));
+            ground->CreateFixture(&sd);
+
+            // Right vertical
+            shape.SetTwoSided(b2Vec2(20.0f, -20.0f), b2Vec2(20.0f, 20.0f));
+            ground->CreateFixture(&sd);
+
+            // Top horizontal
+            shape.SetTwoSided(b2Vec2(-20.0f, 20.0f), b2Vec2(20.0f, 20.0f));
+            ground->CreateFixture(&sd);
+
+            // Bottom horizontal
+            shape.SetTwoSided(b2Vec2(-20.0f, -20.0f), b2Vec2(20.0f, -20.0f));
+            ground->CreateFixture(&sd);
+        }
+
+        {
+            b2Transform xf1;
+            xf1.q.Set(0.3524f * b2_pi);
+            xf1.p = xf1.q.GetXAxis();
+
+            b2Vec2 vertices[3];
+            vertices[0] = b2Mul(xf1, b2Vec2(-1.0f, 0.0f));
+            vertices[1] = b2Mul(xf1, b2Vec2(1.0f, 0.0f));
+            vertices[2] = b2Mul(xf1, b2Vec2(0.0f, 0.5f));
+
+            b2PolygonShape poly1;
+            poly1.Set(vertices, 3);
+
+            b2FixtureDef sd1;
+            sd1.shape   = &poly1;
+            sd1.density = 2.0f;
+
+            b2Transform xf2;
+            xf2.q.Set(-0.3524f * b2_pi);
+            xf2.p = -xf2.q.GetXAxis();
+
+            vertices[0] = b2Mul(xf2, b2Vec2(-1.0f, 0.0f));
+            vertices[1] = b2Mul(xf2, b2Vec2(1.0f, 0.0f));
+            vertices[2] = b2Mul(xf2, b2Vec2(0.0f, 0.5f));
+
+            b2PolygonShape poly2;
+            poly2.Set(vertices, 3);
+
+            b2FixtureDef sd2;
+            sd2.shape   = &poly2;
+            sd2.density = 2.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            bd.position.Set(0.0f, 3.0);
+            bd.angle      = b2_pi;
+            bd.allowSleep = false;
+            m_body        = m_world->CreateBody(&bd);
+            m_body->CreateFixture(&sd1);
+            m_body->CreateFixture(&sd2);
+
+            float gravity = 10.0f;
+            float I       = m_body->GetInertia();
+            float mass    = m_body->GetMass();
+
+            // Compute an effective radius that can be used to
+            // set the max torque for a friction joint
+            // For a circle: I = 0.5 * m * r * r ==> r = sqrt(2 * I / m)
+            float radius = b2Sqrt(2.0f * I / mass);
+
+            b2FrictionJointDef jd;
+            jd.bodyA = ground;
+            jd.bodyB = m_body;
+            jd.localAnchorA.SetZero();
+            jd.localAnchorB     = m_body->GetLocalCenter();
+            jd.collideConnected = true;
+            jd.maxForce         = 0.5f * mass * gravity;
+            jd.maxTorque        = 0.2f * mass * radius * gravity;
+
+            m_world->CreateJoint(&jd);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 1.0f;
+            fd.friction = 0.3f;
+
+            for (int i = 0; i < 10; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+
+                bd.position.Set(0.0f, 7.0f + 1.54f * i);
+                b2Body* body = m_world->CreateBody(&bd);
+
+                body->CreateFixture(&fd);
+
+                float gravity = 10.0f;
+                float I       = body->GetInertia();
+                float mass    = body->GetMass();
+
+                // For a circle: I = 0.5 * m * r * r ==> r = sqrt(2 * I / m)
+                float radius = b2Sqrt(2.0f * I / mass);
+
+                b2FrictionJointDef jd;
+                jd.localAnchorA.SetZero();
+                jd.localAnchorB.SetZero();
+                jd.bodyA            = ground;
+                jd.bodyB            = body;
+                jd.collideConnected = true;
+                jd.maxForce         = mass * gravity;
+                jd.maxTorque        = 0.1f * mass * radius * gravity;
+
+                m_world->CreateJoint(&jd);
+            }
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        DrawString(5, m_textLine, "Forward (W), Turn (A) and (D)");
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_W) == GLFW_PRESS)
+        //{
+        //	b2Vec2 f = m_body->GetWorldVector(b2Vec2(0.0f, -50.0f));
+        //	b2Vec2 p = m_body->GetWorldPoint(b2Vec2(0.0f, 3.0f));
+        //	m_body->ApplyForce(f, p, true);
+        // }
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_A) == GLFW_PRESS)
+        //{
+        //	m_body->ApplyTorque(10.0f, true);
+        // }
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_D) == GLFW_PRESS)
+        //{
+        //	m_body->ApplyTorque(-10.0f, true);
+        // }
+
+        Test::Step(settings);
+    }
+
+    static Test* Create() { return new ApplyForce; }
+
+    b2Body* m_body;
 };
 
 static int testIndex = RegisterTest("Forces", "Apply Force", ApplyForce::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/body_types.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/body_types.cpp
index 055d27957833..0de1079826f0 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/body_types.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/body_types.cpp
@@ -25,139 +25,134 @@
 class BodyTypes : public Test
 {
 public:
-	BodyTypes()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-
-			ground->CreateFixture(&fd);
-		}
-
-		// Define attachment
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 3.0f);
-			m_attachment = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 2.0f);
-			m_attachment->CreateFixture(&shape, 2.0f);
-		}
-
-		// Define platform
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-4.0f, 5.0f);
-			m_platform = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 4.0f, b2Vec2(4.0f, 0.0f), 0.5f * b2_pi);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.friction = 0.6f;
-			fd.density = 2.0f;
-			m_platform->CreateFixture(&fd);
-
-			b2RevoluteJointDef rjd;
-			rjd.Initialize(m_attachment, m_platform, b2Vec2(0.0f, 5.0f));
-			rjd.maxMotorTorque = 50.0f;
-			rjd.enableMotor = true;
-			m_world->CreateJoint(&rjd);
-
-			b2PrismaticJointDef pjd;
-			pjd.Initialize(ground, m_platform, b2Vec2(0.0f, 5.0f), b2Vec2(1.0f, 0.0f));
-
-			pjd.maxMotorForce = 1000.0f;
-			pjd.enableMotor = true;
-			pjd.lowerTranslation = -10.0f;
-			pjd.upperTranslation = 10.0f;
-			pjd.enableLimit = true;
-
-			m_world->CreateJoint(&pjd);
-
-			m_speed = 3.0f;
-		}
-
-		// Create a payload
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 8.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.75f, 0.75f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.friction = 0.6f;
-			fd.density = 2.0f;
-
-			body->CreateFixture(&fd);
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_D:
-			m_platform->SetType(b2_dynamicBody);
-			break;
-
-		case GLFW_KEY_S:
-			m_platform->SetType(b2_staticBody);
-			break;
-
-		case GLFW_KEY_K:
-			m_platform->SetType(b2_kinematicBody);
-			m_platform->SetLinearVelocity(b2Vec2(-m_speed, 0.0f));
-			m_platform->SetAngularVelocity(0.0f);
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		// Drive the kinematic body.
-		if (m_platform->GetType() == b2_kinematicBody)
-		{
-			b2Vec2 p = m_platform->GetTransform().p;
-			b2Vec2 v = m_platform->GetLinearVelocity();
-
-			if ((p.x < -10.0f && v.x < 0.0f) ||
-				(p.x > 10.0f && v.x > 0.0f))
-			{
-				v.x = -v.x;
-				m_platform->SetLinearVelocity(v);
-			}
-		}
-
-		Test::Step(settings);
-
-		DrawString(5, m_textLine, "Keys: (d) dynamic, (s) static, (k) kinematic");
-		
-	}
-
-	static Test* Create()
-	{
-		return new BodyTypes;
-	}
-
-	b2Body* m_attachment;
-	b2Body* m_platform;
-	float m_speed;
+    BodyTypes()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+
+            b2FixtureDef fd;
+            fd.shape = &shape;
+
+            ground->CreateFixture(&fd);
+        }
+
+        // Define attachment
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 3.0f);
+            m_attachment = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 2.0f);
+            m_attachment->CreateFixture(&shape, 2.0f);
+        }
+
+        // Define platform
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-4.0f, 5.0f);
+            m_platform = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 4.0f, b2Vec2(4.0f, 0.0f), 0.5f * b2_pi);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.friction = 0.6f;
+            fd.density  = 2.0f;
+            m_platform->CreateFixture(&fd);
+
+            b2RevoluteJointDef rjd;
+            rjd.Initialize(m_attachment, m_platform, b2Vec2(0.0f, 5.0f));
+            rjd.maxMotorTorque = 50.0f;
+            rjd.enableMotor    = true;
+            m_world->CreateJoint(&rjd);
+
+            b2PrismaticJointDef pjd;
+            pjd.Initialize(ground, m_platform, b2Vec2(0.0f, 5.0f), b2Vec2(1.0f, 0.0f));
+
+            pjd.maxMotorForce    = 1000.0f;
+            pjd.enableMotor      = true;
+            pjd.lowerTranslation = -10.0f;
+            pjd.upperTranslation = 10.0f;
+            pjd.enableLimit      = true;
+
+            m_world->CreateJoint(&pjd);
+
+            m_speed = 3.0f;
+        }
+
+        // Create a payload
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 8.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.75f, 0.75f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.friction = 0.6f;
+            fd.density  = 2.0f;
+
+            body->CreateFixture(&fd);
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_D:
+            m_platform->SetType(b2_dynamicBody);
+            break;
+
+        case GLFW_KEY_S:
+            m_platform->SetType(b2_staticBody);
+            break;
+
+        case GLFW_KEY_K:
+            m_platform->SetType(b2_kinematicBody);
+            m_platform->SetLinearVelocity(b2Vec2(-m_speed, 0.0f));
+            m_platform->SetAngularVelocity(0.0f);
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        // Drive the kinematic body.
+        if (m_platform->GetType() == b2_kinematicBody)
+        {
+            b2Vec2 p = m_platform->GetTransform().p;
+            b2Vec2 v = m_platform->GetLinearVelocity();
+
+            if ((p.x < -10.0f && v.x < 0.0f) || (p.x > 10.0f && v.x > 0.0f))
+            {
+                v.x = -v.x;
+                m_platform->SetLinearVelocity(v);
+            }
+        }
+
+        Test::Step(settings);
+
+        DrawString(5, m_textLine, "Keys: (d) dynamic, (s) static, (k) kinematic");
+    }
+
+    static Test* Create() { return new BodyTypes; }
+
+    b2Body* m_attachment;
+    b2Body* m_platform;
+    float m_speed;
 };
 
 static int testIndex = RegisterTest("Examples", "Body Types", BodyTypes::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/box_stack.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/box_stack.cpp
index 10da577cbcac..463d399b7f8e 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/box_stack.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/box_stack.cpp
@@ -27,148 +27,144 @@ extern B2_API bool g_blockSolve;
 class BoxStack : public Test
 {
 public:
+    enum
+    {
+        e_columnCount = 1,
+        e_rowCount    = 15
+        // e_columnCount = 1,
+        // e_rowCount = 1
+    };
+
+    BoxStack()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(b2Vec2(20.0f, 0.0f), b2Vec2(20.0f, 20.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        float xs[5] = {0.0f, -10.0f, -5.0f, 5.0f, 10.0f};
+
+        for (int32 j = 0; j < e_columnCount; ++j)
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 1.0f;
+            fd.friction = 0.3f;
+
+            for (int i = 0; i < e_rowCount; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+
+                int32 n = j * e_rowCount + i;
+                b2Assert(n < e_rowCount * e_columnCount);
+                m_indices[n]        = n;
+                bd.userData.pointer = n;
+
+                float x = 0.0f;
+                // float x = RandomFloat(-0.02f, 0.02f);
+                // float x = i % 2 == 0 ? -0.01f : 0.01f;
+                bd.position.Set(xs[j] + x, 0.55f + 1.1f * i);
+                b2Body* body = m_world->CreateBody(&bd);
+
+                m_bodies[n] = body;
+
+                body->CreateFixture(&fd);
+            }
+        }
+
+        m_bullet = NULL;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_COMMA:
+            if (m_bullet != NULL)
+            {
+                m_world->DestroyBody(m_bullet);
+                m_bullet = NULL;
+            }
+
+            {
+                b2CircleShape shape;
+                shape.m_radius = 0.25f;
+
+                b2FixtureDef fd;
+                fd.shape       = &shape;
+                fd.density     = 20.0f;
+                fd.restitution = 0.05f;
+
+                b2BodyDef bd;
+                bd.type   = b2_dynamicBody;
+                bd.bullet = true;
+                bd.position.Set(-31.0f, 5.0f);
+
+                m_bullet = m_world->CreateBody(&bd);
+                m_bullet->CreateFixture(&fd);
+
+                m_bullet->SetLinearVelocity(b2Vec2(400.0f, 0.0f));
+            }
+            break;
 
-	enum
-	{
-		e_columnCount = 1,
-		e_rowCount = 15
-		//e_columnCount = 1,
-		//e_rowCount = 1
-	};
-
-	BoxStack()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(b2Vec2(20.0f, 0.0f), b2Vec2(20.0f, 20.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		float xs[5] = {0.0f, -10.0f, -5.0f, 5.0f, 10.0f};
-
-		for (int32 j = 0; j < e_columnCount; ++j)
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-			fd.friction = 0.3f;
-
-			for (int i = 0; i < e_rowCount; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-
-				int32 n = j * e_rowCount + i;
-				b2Assert(n < e_rowCount * e_columnCount);
-				m_indices[n] = n;
-				bd.userData.pointer = n;
-
-				float x = 0.0f;
-				//float x = RandomFloat(-0.02f, 0.02f);
-				//float x = i % 2 == 0 ? -0.01f : 0.01f;
-				bd.position.Set(xs[j] + x, 0.55f + 1.1f * i);
-				b2Body* body = m_world->CreateBody(&bd);
-
-				m_bodies[n] = body;
-
-				body->CreateFixture(&fd);
-			}
-		}
-
-		m_bullet = NULL;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_COMMA:
-			if (m_bullet != NULL)
-			{
-				m_world->DestroyBody(m_bullet);
-				m_bullet = NULL;
-			}
-
-			{
-				b2CircleShape shape;
-				shape.m_radius = 0.25f;
-
-				b2FixtureDef fd;
-				fd.shape = &shape;
-				fd.density = 20.0f;
-				fd.restitution = 0.05f;
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.bullet = true;
-				bd.position.Set(-31.0f, 5.0f);
-
-				m_bullet = m_world->CreateBody(&bd);
-				m_bullet->CreateFixture(&fd);
-
-				m_bullet->SetLinearVelocity(b2Vec2(400.0f, 0.0f));
-			}
-			break;
-                
         case GLFW_KEY_B:
             g_blockSolve = !g_blockSolve;
             break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Press: (,) to launch a bullet.");
-		
-		DrawString(5, m_textLine, "Blocksolve = %d", g_blockSolve);
-		if (m_stepCount == 300)
-		{
-			if (m_bullet != NULL)
-			{
-				m_world->DestroyBody(m_bullet);
-				m_bullet = NULL;
-			}
-
-			{
-				b2CircleShape shape;
-				shape.m_radius = 0.25f;
-
-				b2FixtureDef fd;
-				fd.shape = &shape;
-				fd.density = 20.0f;
-				fd.restitution = 0.05f;
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.bullet = true;
-				bd.position.Set(-31.0f, 5.0f);
-
-				m_bullet = m_world->CreateBody(&bd);
-				m_bullet->CreateFixture(&fd);
-
-				m_bullet->SetLinearVelocity(b2Vec2(400.0f, 0.0f));
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new BoxStack;
-	}
-
-	b2Body* m_bullet;
-	b2Body* m_bodies[e_rowCount * e_columnCount];
-	int32 m_indices[e_rowCount * e_columnCount];
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Press: (,) to launch a bullet.");
+
+        DrawString(5, m_textLine, "Blocksolve = %d", g_blockSolve);
+        if (m_stepCount == 300)
+        {
+            if (m_bullet != NULL)
+            {
+                m_world->DestroyBody(m_bullet);
+                m_bullet = NULL;
+            }
+
+            {
+                b2CircleShape shape;
+                shape.m_radius = 0.25f;
+
+                b2FixtureDef fd;
+                fd.shape       = &shape;
+                fd.density     = 20.0f;
+                fd.restitution = 0.05f;
+
+                b2BodyDef bd;
+                bd.type   = b2_dynamicBody;
+                bd.bullet = true;
+                bd.position.Set(-31.0f, 5.0f);
+
+                m_bullet = m_world->CreateBody(&bd);
+                m_bullet->CreateFixture(&fd);
+
+                m_bullet->SetLinearVelocity(b2Vec2(400.0f, 0.0f));
+            }
+        }
+    }
+
+    static Test* Create() { return new BoxStack; }
+
+    b2Body* m_bullet;
+    b2Body* m_bodies[e_rowCount * e_columnCount];
+    int32 m_indices[e_rowCount * e_columnCount];
 };
 
 static int testIndex = RegisterTest("Stacking", "Boxes", BoxStack::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/breakable.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/breakable.cpp
index 136244a49d3b..1128a56ef498 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/breakable.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/breakable.cpp
@@ -26,133 +26,129 @@
 class Breakable : public Test
 {
 public:
-
-	enum
-	{
-		e_count = 7
-	};
-
-	Breakable()
-	{
-		// Ground body
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Breakable dynamic body
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 40.0f);
-			bd.angle = 0.25f * b2_pi;
-			m_body1 = m_world->CreateBody(&bd);
-
-			m_shape1.SetAsBox(0.5f, 0.5f, b2Vec2(-0.5f, 0.0f), 0.0f);
-			m_piece1 = m_body1->CreateFixture(&m_shape1, 1.0f);
-
-			m_shape2.SetAsBox(0.5f, 0.5f, b2Vec2(0.5f, 0.0f), 0.0f);
-			m_piece2 = m_body1->CreateFixture(&m_shape2, 1.0f);
-		}
-
-		m_break = false;
-		m_broke = false;
-	}
-
-	void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) override
-	{
-		if (m_broke)
-		{
-			// The body already broke.
-			return;
-		}
-
-		// Should the body break?
-		int32 count = contact->GetManifold()->pointCount;
-
-		float maxImpulse = 0.0f;
-		for (int32 i = 0; i < count; ++i)
-		{
-			maxImpulse = b2Max(maxImpulse, impulse->normalImpulses[i]);
-		}
-
-		if (maxImpulse > 40.0f)
-		{
-			// Flag the body for breaking.
-			m_break = true;
-		}
-	}
-
-	void Break()
-	{
-		// Create two bodies from one.
-		b2Body* body1 = m_piece1->GetBody();
-		b2Vec2 center = body1->GetWorldCenter();
-
-		body1->DestroyFixture(m_piece2);
-		m_piece2 = NULL;
-
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-		bd.position = body1->GetPosition();
-		bd.angle = body1->GetAngle();
-
-		b2Body* body2 = m_world->CreateBody(&bd);
-		m_piece2 = body2->CreateFixture(&m_shape2, 1.0f);
-
-		// Compute consistent velocities for new bodies based on
-		// cached velocity.
-		b2Vec2 center1 = body1->GetWorldCenter();
-		b2Vec2 center2 = body2->GetWorldCenter();
-		
-		b2Vec2 velocity1 = m_velocity + b2Cross(m_angularVelocity, center1 - center);
-		b2Vec2 velocity2 = m_velocity + b2Cross(m_angularVelocity, center2 - center);
-
-		body1->SetAngularVelocity(m_angularVelocity);
-		body1->SetLinearVelocity(velocity1);
-
-		body2->SetAngularVelocity(m_angularVelocity);
-		body2->SetLinearVelocity(velocity2);
-	}
-
-	void Step(Settings& settings) override
-	{
-		if (m_break)
-		{
-			Break();
-			m_broke = true;
-			m_break = false;
-		}
-
-		// Cache velocities to improve movement on breakage.
-		if (m_broke == false)
-		{
-			m_velocity = m_body1->GetLinearVelocity();
-			m_angularVelocity = m_body1->GetAngularVelocity();
-		}
-
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new Breakable;
-	}
-
-	b2Body* m_body1;
-	b2Vec2 m_velocity;
-	float m_angularVelocity;
-	b2PolygonShape m_shape1;
-	b2PolygonShape m_shape2;
-	b2Fixture* m_piece1;
-	b2Fixture* m_piece2;
-
-	bool m_broke;
-	bool m_break;
+    enum
+    {
+        e_count = 7
+    };
+
+    Breakable()
+    {
+        // Ground body
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Breakable dynamic body
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 40.0f);
+            bd.angle = 0.25f * b2_pi;
+            m_body1  = m_world->CreateBody(&bd);
+
+            m_shape1.SetAsBox(0.5f, 0.5f, b2Vec2(-0.5f, 0.0f), 0.0f);
+            m_piece1 = m_body1->CreateFixture(&m_shape1, 1.0f);
+
+            m_shape2.SetAsBox(0.5f, 0.5f, b2Vec2(0.5f, 0.0f), 0.0f);
+            m_piece2 = m_body1->CreateFixture(&m_shape2, 1.0f);
+        }
+
+        m_break = false;
+        m_broke = false;
+    }
+
+    void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) override
+    {
+        if (m_broke)
+        {
+            // The body already broke.
+            return;
+        }
+
+        // Should the body break?
+        int32 count = contact->GetManifold()->pointCount;
+
+        float maxImpulse = 0.0f;
+        for (int32 i = 0; i < count; ++i)
+        {
+            maxImpulse = b2Max(maxImpulse, impulse->normalImpulses[i]);
+        }
+
+        if (maxImpulse > 40.0f)
+        {
+            // Flag the body for breaking.
+            m_break = true;
+        }
+    }
+
+    void Break()
+    {
+        // Create two bodies from one.
+        b2Body* body1 = m_piece1->GetBody();
+        b2Vec2 center = body1->GetWorldCenter();
+
+        body1->DestroyFixture(m_piece2);
+        m_piece2 = NULL;
+
+        b2BodyDef bd;
+        bd.type     = b2_dynamicBody;
+        bd.position = body1->GetPosition();
+        bd.angle    = body1->GetAngle();
+
+        b2Body* body2 = m_world->CreateBody(&bd);
+        m_piece2      = body2->CreateFixture(&m_shape2, 1.0f);
+
+        // Compute consistent velocities for new bodies based on
+        // cached velocity.
+        b2Vec2 center1 = body1->GetWorldCenter();
+        b2Vec2 center2 = body2->GetWorldCenter();
+
+        b2Vec2 velocity1 = m_velocity + b2Cross(m_angularVelocity, center1 - center);
+        b2Vec2 velocity2 = m_velocity + b2Cross(m_angularVelocity, center2 - center);
+
+        body1->SetAngularVelocity(m_angularVelocity);
+        body1->SetLinearVelocity(velocity1);
+
+        body2->SetAngularVelocity(m_angularVelocity);
+        body2->SetLinearVelocity(velocity2);
+    }
+
+    void Step(Settings& settings) override
+    {
+        if (m_break)
+        {
+            Break();
+            m_broke = true;
+            m_break = false;
+        }
+
+        // Cache velocities to improve movement on breakage.
+        if (m_broke == false)
+        {
+            m_velocity        = m_body1->GetLinearVelocity();
+            m_angularVelocity = m_body1->GetAngularVelocity();
+        }
+
+        Test::Step(settings);
+    }
+
+    static Test* Create() { return new Breakable; }
+
+    b2Body* m_body1;
+    b2Vec2 m_velocity;
+    float m_angularVelocity;
+    b2PolygonShape m_shape1;
+    b2PolygonShape m_shape2;
+    b2Fixture* m_piece1;
+    b2Fixture* m_piece2;
+
+    bool m_broke;
+    bool m_break;
 };
 
 static int testIndex = RegisterTest("Examples", "Breakable", Breakable::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/bridge.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/bridge.cpp
index d397a607daa9..69bfab2cf1ea 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/bridge.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/bridge.cpp
@@ -25,104 +25,100 @@
 class Bridge : public Test
 {
 public:
-
-	enum
-	{
-		e_count = 30
-	};
-
-	Bridge()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			fd.friction = 0.2f;
-
-			b2RevoluteJointDef jd;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-14.5f + 1.0f * i, 5.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				b2Vec2 anchor(-15.0f + 1.0f * i, 5.0f);
-				jd.Initialize(prevBody, body, anchor);
-				m_world->CreateJoint(&jd);
-
-				if (i == (e_count >> 1))
-				{
-					m_middle = body;
-				}
-				prevBody = body;
-			}
-
-			b2Vec2 anchor(-15.0f + 1.0f * e_count, 5.0f);
-			jd.Initialize(prevBody, ground, anchor);
-			m_world->CreateJoint(&jd);
-		}
-
-		for (int32 i = 0; i < 2; ++i)
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.5f, 0.0f);
-			vertices[1].Set(0.5f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-
-			b2PolygonShape shape;
-			shape.Set(vertices, 3);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-8.0f + 8.0f * i, 12.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&fd);
-		}
-
-		for (int32 i = 0; i < 3; ++i)
-		{
-			b2CircleShape shape;
-			shape.m_radius = 0.5f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-6.0f + 6.0f * i, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&fd);
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Bridge;
-	}
-
-	b2Body* m_middle;
+    enum
+    {
+        e_count = 30
+    };
+
+    Bridge()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 20.0f;
+            fd.friction = 0.2f;
+
+            b2RevoluteJointDef jd;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-14.5f + 1.0f * i, 5.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                b2Vec2 anchor(-15.0f + 1.0f * i, 5.0f);
+                jd.Initialize(prevBody, body, anchor);
+                m_world->CreateJoint(&jd);
+
+                if (i == (e_count >> 1))
+                {
+                    m_middle = body;
+                }
+                prevBody = body;
+            }
+
+            b2Vec2 anchor(-15.0f + 1.0f * e_count, 5.0f);
+            jd.Initialize(prevBody, ground, anchor);
+            m_world->CreateJoint(&jd);
+        }
+
+        for (int32 i = 0; i < 2; ++i)
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.5f, 0.0f);
+            vertices[1].Set(0.5f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+
+            b2PolygonShape shape;
+            shape.Set(vertices, 3);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-8.0f + 8.0f * i, 12.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&fd);
+        }
+
+        for (int32 i = 0; i < 3; ++i)
+        {
+            b2CircleShape shape;
+            shape.m_radius = 0.5f;
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-6.0f + 6.0f * i, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&fd);
+        }
+    }
+
+    static Test* Create() { return new Bridge; }
+
+    b2Body* m_middle;
 };
 
 static int testIndex = RegisterTest("Joints", "Bridge", Bridge::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/bullet_test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/bullet_test.cpp
index 0ff1800f2834..945887da6f9c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/bullet_test.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/bullet_test.cpp
@@ -25,115 +25,108 @@
 class BulletTest : public Test
 {
 public:
-
-	BulletTest()
-	{
-		{
-			b2BodyDef bd;
-			bd.position.Set(0.0f, 0.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2EdgeShape edge;
-
-			edge.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
-			body->CreateFixture(&edge, 0.0f);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.2f, 1.0f, b2Vec2(0.5f, 1.0f), 0.0f);
-			body->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 4.0f);
-
-			b2PolygonShape box;
-			box.SetAsBox(2.0f, 0.1f);
-
-			m_body = m_world->CreateBody(&bd);
-			m_body->CreateFixture(&box, 1.0f);
-
-			box.SetAsBox(0.25f, 0.25f);
-
-			//m_x = RandomFloat(-1.0f, 1.0f);
-			m_x = 0.20352793f;
-			bd.position.Set(m_x, 10.0f);
-			bd.bullet = true;
-
-			m_bullet = m_world->CreateBody(&bd);
-			m_bullet->CreateFixture(&box, 100.0f);
-
-			m_bullet->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
-		}
-	}
-
-	void Launch()
-	{
-		m_body->SetTransform(b2Vec2(0.0f, 4.0f), 0.0f);
-		m_body->SetLinearVelocity(b2Vec2_zero);
-		m_body->SetAngularVelocity(0.0f);
-
-		m_x = RandomFloat(-1.0f, 1.0f);
-		m_bullet->SetTransform(b2Vec2(m_x, 10.0f), 0.0f);
-		m_bullet->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
-		m_bullet->SetAngularVelocity(0.0f);
-
-		extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
-		extern B2_API int32 b2_toiCalls, b2_toiIters, b2_toiMaxIters;
-		extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
-
-		b2_gjkCalls = 0;
-		b2_gjkIters = 0;
-		b2_gjkMaxIters = 0;
-
-		b2_toiCalls = 0;
-		b2_toiIters = 0;
-		b2_toiMaxIters = 0;
-		b2_toiRootIters = 0;
-		b2_toiMaxRootIters = 0;
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
-		extern B2_API int32 b2_toiCalls, b2_toiIters;
-		extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
-
-		if (b2_gjkCalls > 0)
-		{
-			DrawString(5, m_textLine, "gjk calls = %d, ave gjk iters = %3.1f, max gjk iters = %d",
-				b2_gjkCalls, b2_gjkIters / float(b2_gjkCalls), b2_gjkMaxIters);
-			
-		}
-
-		if (b2_toiCalls > 0)
-		{
-			DrawString(5, m_textLine, "toi calls = %d, ave toi iters = %3.1f, max toi iters = %d",
-				b2_toiCalls, b2_toiIters / float(b2_toiCalls), b2_toiMaxRootIters);
-			
-
-			DrawString(5, m_textLine, "ave toi root iters = %3.1f, max toi root iters = %d",
-				b2_toiRootIters / float(b2_toiCalls), b2_toiMaxRootIters);
-			
-		}
-
-		if (m_stepCount % 60 == 0)
-		{
-			Launch();
-		}
-	}
-
-	static Test* Create()
-	{
-		return new BulletTest;
-	}
-
-	b2Body* m_body;
-	b2Body* m_bullet;
-	float m_x;
+    BulletTest()
+    {
+        {
+            b2BodyDef bd;
+            bd.position.Set(0.0f, 0.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2EdgeShape edge;
+
+            edge.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
+            body->CreateFixture(&edge, 0.0f);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.2f, 1.0f, b2Vec2(0.5f, 1.0f), 0.0f);
+            body->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 4.0f);
+
+            b2PolygonShape box;
+            box.SetAsBox(2.0f, 0.1f);
+
+            m_body = m_world->CreateBody(&bd);
+            m_body->CreateFixture(&box, 1.0f);
+
+            box.SetAsBox(0.25f, 0.25f);
+
+            // m_x = RandomFloat(-1.0f, 1.0f);
+            m_x = 0.20352793f;
+            bd.position.Set(m_x, 10.0f);
+            bd.bullet = true;
+
+            m_bullet = m_world->CreateBody(&bd);
+            m_bullet->CreateFixture(&box, 100.0f);
+
+            m_bullet->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
+        }
+    }
+
+    void Launch()
+    {
+        m_body->SetTransform(b2Vec2(0.0f, 4.0f), 0.0f);
+        m_body->SetLinearVelocity(b2Vec2_zero);
+        m_body->SetAngularVelocity(0.0f);
+
+        m_x = RandomFloat(-1.0f, 1.0f);
+        m_bullet->SetTransform(b2Vec2(m_x, 10.0f), 0.0f);
+        m_bullet->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
+        m_bullet->SetAngularVelocity(0.0f);
+
+        extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
+        extern B2_API int32 b2_toiCalls, b2_toiIters, b2_toiMaxIters;
+        extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
+
+        b2_gjkCalls    = 0;
+        b2_gjkIters    = 0;
+        b2_gjkMaxIters = 0;
+
+        b2_toiCalls        = 0;
+        b2_toiIters        = 0;
+        b2_toiMaxIters     = 0;
+        b2_toiRootIters    = 0;
+        b2_toiMaxRootIters = 0;
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
+        extern B2_API int32 b2_toiCalls, b2_toiIters;
+        extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
+
+        if (b2_gjkCalls > 0)
+        {
+            DrawString(5, m_textLine, "gjk calls = %d, ave gjk iters = %3.1f, max gjk iters = %d", b2_gjkCalls,
+                       b2_gjkIters / float(b2_gjkCalls), b2_gjkMaxIters);
+        }
+
+        if (b2_toiCalls > 0)
+        {
+            DrawString(5, m_textLine, "toi calls = %d, ave toi iters = %3.1f, max toi iters = %d", b2_toiCalls,
+                       b2_toiIters / float(b2_toiCalls), b2_toiMaxRootIters);
+
+            DrawString(5, m_textLine, "ave toi root iters = %3.1f, max toi root iters = %d",
+                       b2_toiRootIters / float(b2_toiCalls), b2_toiMaxRootIters);
+        }
+
+        if (m_stepCount % 60 == 0)
+        {
+            Launch();
+        }
+    }
+
+    static Test* Create() { return new BulletTest; }
+
+    b2Body* m_body;
+    b2Body* m_bullet;
+    float m_x;
 };
 
 static int testIndex = RegisterTest("Continuous", "Bullet Test", BulletTest::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/cantilever.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/cantilever.cpp
index e54717b76b64..8a9ffce0b7cd 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/cantilever.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/cantilever.cpp
@@ -29,190 +29,186 @@
 class Cantilever : public Test
 {
 public:
-
-	enum
-	{
-		e_count = 8
-	};
-
-	Cantilever()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-
-			b2WeldJointDef jd;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-14.5f + 1.0f * i, 5.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				b2Vec2 anchor(-15.0f + 1.0f * i, 5.0f);
-				jd.Initialize(prevBody, body, anchor);
-				m_world->CreateJoint(&jd);
-
-				prevBody = body;
-			}
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(1.0f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-
-			b2WeldJointDef jd;
-			float frequencyHz = 5.0f;
-			float dampingRatio = 0.7f;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < 3; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-14.0f + 2.0f * i, 15.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				b2Vec2 anchor(-15.0f + 2.0f * i, 15.0f);
-				jd.Initialize(prevBody, body, anchor);
-				b2AngularStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-				m_world->CreateJoint(&jd);
-
-				prevBody = body;
-			}
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-
-			b2WeldJointDef jd;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-4.5f + 1.0f * i, 5.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				if (i > 0)
-				{
-					b2Vec2 anchor(-5.0f + 1.0f * i, 5.0f);
-					jd.Initialize(prevBody, body, anchor);
-					m_world->CreateJoint(&jd);
-				}
-
-				prevBody = body;
-			}
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-
-			b2WeldJointDef jd;
-			float frequencyHz = 8.0f;
-			float dampingRatio = 0.7f;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(5.5f + 1.0f * i, 10.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				if (i > 0)
-				{
-					b2Vec2 anchor(5.0f + 1.0f * i, 10.0f);
-					jd.Initialize(prevBody, body, anchor);
-
-					b2AngularStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, prevBody, body);
-
-					m_world->CreateJoint(&jd);
-				}
-
-				prevBody = body;
-			}
-		}
-
-		for (int32 i = 0; i < 2; ++i)
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.5f, 0.0f);
-			vertices[1].Set(0.5f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-
-			b2PolygonShape shape;
-			shape.Set(vertices, 3);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-8.0f + 8.0f * i, 12.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&fd);
-		}
-
-		for (int32 i = 0; i < 2; ++i)
-		{
-			b2CircleShape shape;
-			shape.m_radius = 0.5f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-6.0f + 6.0f * i, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&fd);
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Cantilever;
-	}
-
-	b2Body* m_middle;
+    enum
+    {
+        e_count = 8
+    };
+
+    Cantilever()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+
+            b2WeldJointDef jd;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-14.5f + 1.0f * i, 5.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                b2Vec2 anchor(-15.0f + 1.0f * i, 5.0f);
+                jd.Initialize(prevBody, body, anchor);
+                m_world->CreateJoint(&jd);
+
+                prevBody = body;
+            }
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(1.0f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+
+            b2WeldJointDef jd;
+            float frequencyHz  = 5.0f;
+            float dampingRatio = 0.7f;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < 3; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-14.0f + 2.0f * i, 15.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                b2Vec2 anchor(-15.0f + 2.0f * i, 15.0f);
+                jd.Initialize(prevBody, body, anchor);
+                b2AngularStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+                m_world->CreateJoint(&jd);
+
+                prevBody = body;
+            }
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+
+            b2WeldJointDef jd;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-4.5f + 1.0f * i, 5.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                if (i > 0)
+                {
+                    b2Vec2 anchor(-5.0f + 1.0f * i, 5.0f);
+                    jd.Initialize(prevBody, body, anchor);
+                    m_world->CreateJoint(&jd);
+                }
+
+                prevBody = body;
+            }
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+
+            b2WeldJointDef jd;
+            float frequencyHz  = 8.0f;
+            float dampingRatio = 0.7f;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(5.5f + 1.0f * i, 10.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                if (i > 0)
+                {
+                    b2Vec2 anchor(5.0f + 1.0f * i, 10.0f);
+                    jd.Initialize(prevBody, body, anchor);
+
+                    b2AngularStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, prevBody, body);
+
+                    m_world->CreateJoint(&jd);
+                }
+
+                prevBody = body;
+            }
+        }
+
+        for (int32 i = 0; i < 2; ++i)
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.5f, 0.0f);
+            vertices[1].Set(0.5f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+
+            b2PolygonShape shape;
+            shape.Set(vertices, 3);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-8.0f + 8.0f * i, 12.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&fd);
+        }
+
+        for (int32 i = 0; i < 2; ++i)
+        {
+            b2CircleShape shape;
+            shape.m_radius = 0.5f;
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-6.0f + 6.0f * i, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&fd);
+        }
+    }
+
+    static Test* Create() { return new Cantilever; }
+
+    b2Body* m_middle;
 };
 
 static int testIndex = RegisterTest("Joints", "Cantilever", Cantilever::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/car.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/car.cpp
index 63179b052642..c8bd9f087569 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/car.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/car.cpp
@@ -30,261 +30,257 @@ USING_NS_CC_EXT;
 class Car : public Test
 {
 public:
-	Car()
-	{		
-		m_speed = 50.0f;
-
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 0.0f;
-			fd.friction = 0.6f;
-
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-			ground->CreateFixture(&fd);
-
-			float hs[10] = {0.25f, 1.0f, 4.0f, 0.0f, 0.0f, -1.0f, -2.0f, -2.0f, -1.25f, 0.0f};
-
-			float x = 20.0f, y1 = 0.0f, dx = 5.0f;
-
-			for (int32 i = 0; i < 10; ++i)
-			{
-				float y2 = hs[i];
-				shape.SetTwoSided(b2Vec2(x, y1), b2Vec2(x + dx, y2));
-				ground->CreateFixture(&fd);
-				y1 = y2;
-				x += dx;
-			}
-
-			for (int32 i = 0; i < 10; ++i)
-			{
-				float y2 = hs[i];
-				shape.SetTwoSided(b2Vec2(x, y1), b2Vec2(x + dx, y2));
-				ground->CreateFixture(&fd);
-				y1 = y2;
-				x += dx;
-			}
-
-			shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
-			ground->CreateFixture(&fd);
-
-			x += 80.0f;
-			shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
-			ground->CreateFixture(&fd);
-
-			x += 40.0f;
-			shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 10.0f, 5.0f));
-			ground->CreateFixture(&fd);
-
-			x += 20.0f;
-			shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
-			ground->CreateFixture(&fd);
-
-			x += 40.0f;
-			shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x, 20.0f));
-			ground->CreateFixture(&fd);
-		}
-
-		// Teeter
-		{
-			b2BodyDef bd;
-			bd.position.Set(140.0f, 1.0f);
-			bd.type = b2_dynamicBody;
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape box;
-			box.SetAsBox(10.0f, 0.25f);
-			body->CreateFixture(&box, 1.0f);
-
-			b2RevoluteJointDef jd;
-			jd.Initialize(ground, body, body->GetPosition());
-			jd.lowerAngle = -8.0f * b2_pi / 180.0f;
-			jd.upperAngle = 8.0f * b2_pi / 180.0f;
-			jd.enableLimit = true;
-			m_world->CreateJoint(&jd);
-
-			body->ApplyAngularImpulse(100.0f, true);
-		}
-
-		// Bridge
-		{
-			int32 N = 20;
-			b2PolygonShape shape;
-			shape.SetAsBox(1.0f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-			fd.friction = 0.6f;
-
-			b2RevoluteJointDef jd;
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < N; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(161.0f + 2.0f * i, -0.125f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-
-				b2Vec2 anchor(160.0f + 2.0f * i, -0.125f);
-				jd.Initialize(prevBody, body, anchor);
-				m_world->CreateJoint(&jd);
-
-				prevBody = body;
-			}
-
-			b2Vec2 anchor(160.0f + 2.0f * N, -0.125f);
-			jd.Initialize(prevBody, ground, anchor);
-			m_world->CreateJoint(&jd);
-		}
-
-		// Boxes
-		{
-			b2PolygonShape box;
-			box.SetAsBox(0.5f, 0.5f);
-
-			b2Body* body = NULL;
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			bd.position.Set(230.0f, 0.5f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&box, 0.5f);
-
-			bd.position.Set(230.0f, 1.5f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&box, 0.5f);
-
-			bd.position.Set(230.0f, 2.5f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&box, 0.5f);
-
-			bd.position.Set(230.0f, 3.5f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&box, 0.5f);
-
-			bd.position.Set(230.0f, 4.5f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&box, 0.5f);
-		}
-
-		// Car
-		{
-			b2PolygonShape chassis;
-			b2Vec2 vertices[8];
-			vertices[0].Set(-1.5f, -0.5f);
-			vertices[1].Set(1.5f, -0.5f);
-			vertices[2].Set(1.5f, 0.0f);
-			vertices[3].Set(0.0f, 0.9f);
-			vertices[4].Set(-1.15f, 0.9f);
-			vertices[5].Set(-1.5f, 0.2f);
-			chassis.Set(vertices, 6);
-
-			b2CircleShape circle;
-			circle.m_radius = 0.4f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 1.0f);
-			m_car = m_world->CreateBody(&bd);
-			m_car->CreateFixture(&chassis, 1.0f);
-
-			b2FixtureDef fd;
-			fd.shape = &circle;
-			fd.density = 1.0f;
-			fd.friction = 0.9f;
-
-			bd.position.Set(-1.0f, 0.35f);
-			m_wheel1 = m_world->CreateBody(&bd);
-			m_wheel1->CreateFixture(&fd);
-
-			bd.position.Set(1.0f, 0.4f);
-			m_wheel2 = m_world->CreateBody(&bd);
-			m_wheel2->CreateFixture(&fd);
-
-			b2WheelJointDef jd;
-			b2Vec2 axis(0.0f, 1.0f);
-
-			float mass1 = m_wheel1->GetMass();
-			float mass2 = m_wheel2->GetMass();
-
-			float hertz = 4.0f;
-			float dampingRatio = 0.7f;
-			float omega = 2.0f * b2_pi * hertz;
-
-			jd.Initialize(m_car, m_wheel1, m_wheel1->GetPosition(), axis);
-			jd.motorSpeed = 0.0f;
-			jd.maxMotorTorque = 20.0f;
-			jd.enableMotor = true;
-			jd.stiffness = mass1 * omega * omega;
-			jd.damping = 2.0f * mass1 * dampingRatio * omega;
-			jd.lowerTranslation = -0.25f;
-			jd.upperTranslation = 0.25f;
-			jd.enableLimit = true;
-			m_spring1 = (b2WheelJoint*)m_world->CreateJoint(&jd);
-
-			jd.Initialize(m_car, m_wheel2, m_wheel2->GetPosition(), axis);
-			jd.motorSpeed = 0.0f;
-			jd.maxMotorTorque = 10.0f;
-			jd.enableMotor = false;
-			jd.stiffness = mass2 * omega * omega;
-			jd.damping = 2.0f * mass2 * dampingRatio * omega;
-			jd.lowerTranslation = -0.25f;
-			jd.upperTranslation = 0.25f;
-			jd.enableLimit = true;
-			m_spring2 = (b2WheelJoint*)m_world->CreateJoint(&jd);
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_spring1->SetMotorSpeed(m_speed);
-			break;
-
-		case GLFW_KEY_S:
-			m_spring1->SetMotorSpeed(0.0f);
-			break;
-
-		case GLFW_KEY_D:
-			m_spring1->SetMotorSpeed(-m_speed);
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		DrawString(5, m_textLine, "Keys: left = a, brake = s, right = d, hz down = q, hz up = e");
-		
-
-		//g_camera.m_center.x = m_car->GetPosition().x;
-		g_debugDraw.debugNodeOffset.x += m_car->GetPosition().x;
-
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new Car;
-	}
-
-	b2Body* m_car;
-	b2Body* m_wheel1;
-	b2Body* m_wheel2;
-
-	float m_speed;
-	b2WheelJoint* m_spring1;
-	b2WheelJoint* m_spring2;
+    Car()
+    {
+        m_speed = 50.0f;
+
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 0.0f;
+            fd.friction = 0.6f;
+
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+            ground->CreateFixture(&fd);
+
+            float hs[10] = {0.25f, 1.0f, 4.0f, 0.0f, 0.0f, -1.0f, -2.0f, -2.0f, -1.25f, 0.0f};
+
+            float x = 20.0f, y1 = 0.0f, dx = 5.0f;
+
+            for (int32 i = 0; i < 10; ++i)
+            {
+                float y2 = hs[i];
+                shape.SetTwoSided(b2Vec2(x, y1), b2Vec2(x + dx, y2));
+                ground->CreateFixture(&fd);
+                y1 = y2;
+                x += dx;
+            }
+
+            for (int32 i = 0; i < 10; ++i)
+            {
+                float y2 = hs[i];
+                shape.SetTwoSided(b2Vec2(x, y1), b2Vec2(x + dx, y2));
+                ground->CreateFixture(&fd);
+                y1 = y2;
+                x += dx;
+            }
+
+            shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
+            ground->CreateFixture(&fd);
+
+            x += 80.0f;
+            shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
+            ground->CreateFixture(&fd);
+
+            x += 40.0f;
+            shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 10.0f, 5.0f));
+            ground->CreateFixture(&fd);
+
+            x += 20.0f;
+            shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x + 40.0f, 0.0f));
+            ground->CreateFixture(&fd);
+
+            x += 40.0f;
+            shape.SetTwoSided(b2Vec2(x, 0.0f), b2Vec2(x, 20.0f));
+            ground->CreateFixture(&fd);
+        }
+
+        // Teeter
+        {
+            b2BodyDef bd;
+            bd.position.Set(140.0f, 1.0f);
+            bd.type      = b2_dynamicBody;
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape box;
+            box.SetAsBox(10.0f, 0.25f);
+            body->CreateFixture(&box, 1.0f);
+
+            b2RevoluteJointDef jd;
+            jd.Initialize(ground, body, body->GetPosition());
+            jd.lowerAngle  = -8.0f * b2_pi / 180.0f;
+            jd.upperAngle  = 8.0f * b2_pi / 180.0f;
+            jd.enableLimit = true;
+            m_world->CreateJoint(&jd);
+
+            body->ApplyAngularImpulse(100.0f, true);
+        }
+
+        // Bridge
+        {
+            int32 N = 20;
+            b2PolygonShape shape;
+            shape.SetAsBox(1.0f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 1.0f;
+            fd.friction = 0.6f;
+
+            b2RevoluteJointDef jd;
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < N; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(161.0f + 2.0f * i, -0.125f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+
+                b2Vec2 anchor(160.0f + 2.0f * i, -0.125f);
+                jd.Initialize(prevBody, body, anchor);
+                m_world->CreateJoint(&jd);
+
+                prevBody = body;
+            }
+
+            b2Vec2 anchor(160.0f + 2.0f * N, -0.125f);
+            jd.Initialize(prevBody, ground, anchor);
+            m_world->CreateJoint(&jd);
+        }
+
+        // Boxes
+        {
+            b2PolygonShape box;
+            box.SetAsBox(0.5f, 0.5f);
+
+            b2Body* body = NULL;
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            bd.position.Set(230.0f, 0.5f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&box, 0.5f);
+
+            bd.position.Set(230.0f, 1.5f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&box, 0.5f);
+
+            bd.position.Set(230.0f, 2.5f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&box, 0.5f);
+
+            bd.position.Set(230.0f, 3.5f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&box, 0.5f);
+
+            bd.position.Set(230.0f, 4.5f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&box, 0.5f);
+        }
+
+        // Car
+        {
+            b2PolygonShape chassis;
+            b2Vec2 vertices[8];
+            vertices[0].Set(-1.5f, -0.5f);
+            vertices[1].Set(1.5f, -0.5f);
+            vertices[2].Set(1.5f, 0.0f);
+            vertices[3].Set(0.0f, 0.9f);
+            vertices[4].Set(-1.15f, 0.9f);
+            vertices[5].Set(-1.5f, 0.2f);
+            chassis.Set(vertices, 6);
+
+            b2CircleShape circle;
+            circle.m_radius = 0.4f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 1.0f);
+            m_car = m_world->CreateBody(&bd);
+            m_car->CreateFixture(&chassis, 1.0f);
+
+            b2FixtureDef fd;
+            fd.shape    = &circle;
+            fd.density  = 1.0f;
+            fd.friction = 0.9f;
+
+            bd.position.Set(-1.0f, 0.35f);
+            m_wheel1 = m_world->CreateBody(&bd);
+            m_wheel1->CreateFixture(&fd);
+
+            bd.position.Set(1.0f, 0.4f);
+            m_wheel2 = m_world->CreateBody(&bd);
+            m_wheel2->CreateFixture(&fd);
+
+            b2WheelJointDef jd;
+            b2Vec2 axis(0.0f, 1.0f);
+
+            float mass1 = m_wheel1->GetMass();
+            float mass2 = m_wheel2->GetMass();
+
+            float hertz        = 4.0f;
+            float dampingRatio = 0.7f;
+            float omega        = 2.0f * b2_pi * hertz;
+
+            jd.Initialize(m_car, m_wheel1, m_wheel1->GetPosition(), axis);
+            jd.motorSpeed       = 0.0f;
+            jd.maxMotorTorque   = 20.0f;
+            jd.enableMotor      = true;
+            jd.stiffness        = mass1 * omega * omega;
+            jd.damping          = 2.0f * mass1 * dampingRatio * omega;
+            jd.lowerTranslation = -0.25f;
+            jd.upperTranslation = 0.25f;
+            jd.enableLimit      = true;
+            m_spring1           = (b2WheelJoint*)m_world->CreateJoint(&jd);
+
+            jd.Initialize(m_car, m_wheel2, m_wheel2->GetPosition(), axis);
+            jd.motorSpeed       = 0.0f;
+            jd.maxMotorTorque   = 10.0f;
+            jd.enableMotor      = false;
+            jd.stiffness        = mass2 * omega * omega;
+            jd.damping          = 2.0f * mass2 * dampingRatio * omega;
+            jd.lowerTranslation = -0.25f;
+            jd.upperTranslation = 0.25f;
+            jd.enableLimit      = true;
+            m_spring2           = (b2WheelJoint*)m_world->CreateJoint(&jd);
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_spring1->SetMotorSpeed(m_speed);
+            break;
+
+        case GLFW_KEY_S:
+            m_spring1->SetMotorSpeed(0.0f);
+            break;
+
+        case GLFW_KEY_D:
+            m_spring1->SetMotorSpeed(-m_speed);
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        DrawString(5, m_textLine, "Keys: left = a, brake = s, right = d, hz down = q, hz up = e");
+
+        // g_camera.m_center.x = m_car->GetPosition().x;
+        g_debugDraw.debugNodeOffset.x += m_car->GetPosition().x;
+
+        Test::Step(settings);
+    }
+
+    static Test* Create() { return new Car; }
+
+    b2Body* m_car;
+    b2Body* m_wheel1;
+    b2Body* m_wheel2;
+
+    float m_speed;
+    b2WheelJoint* m_spring1;
+    b2WheelJoint* m_spring2;
 };
 
 static int testIndex = RegisterTest("Examples", "Car", Car::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/chain.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/chain.cpp
index e1580355e307..3520b89330ca 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/chain.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/chain.cpp
@@ -27,66 +27,63 @@
 class Chain : public Test
 {
 public:
-	Chain()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.6f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			fd.friction = 0.2f;
-
-			b2RevoluteJointDef jd;
-			jd.collideConnected = false;
-
-			const float y = 25.0f;
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < 30; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.5f + i, y);
-				b2Body* body = m_world->CreateBody(&bd);
+    Chain()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.6f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 20.0f;
+            fd.friction = 0.2f;
+
+            b2RevoluteJointDef jd;
+            jd.collideConnected = false;
+
+            const float y    = 25.0f;
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < 30; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.5f + i, y);
+                b2Body* body = m_world->CreateBody(&bd);
 
 #if TEST_BAD_BODY == 1
-				if (i == 10)
-				{
-					// Test zero density dynamic body
-					fd.density = 0.0f;
-				}
-				else
-				{
-					fd.density = 20.0f;
-				}
+                if (i == 10)
+                {
+                    // Test zero density dynamic body
+                    fd.density = 0.0f;
+                }
+                else
+                {
+                    fd.density = 20.0f;
+                }
 #endif
 
-				body->CreateFixture(&fd);
+                body->CreateFixture(&fd);
 
-				b2Vec2 anchor(float(i), y);
-				jd.Initialize(prevBody, body, anchor);
-				m_world->CreateJoint(&jd);
+                b2Vec2 anchor(float(i), y);
+                jd.Initialize(prevBody, body, anchor);
+                m_world->CreateJoint(&jd);
 
-				prevBody = body;
-			}
-		}
-	}
+                prevBody = body;
+            }
+        }
+    }
 
-	static Test* Create()
-	{
-		return new Chain;
-	}
+    static Test* Create() { return new Chain; }
 };
 
 static int testIndex = RegisterTest("Joints", "Chain", Chain::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/chain_problem.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/chain_problem.cpp
index 4b2ab3828db4..a9a48a87301d 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/chain_problem.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/chain_problem.cpp
@@ -25,17 +25,16 @@
 class ChainProblem : public Test
 {
 public:
-
     ChainProblem()
     {
         {
             b2Vec2 g(0.0f, -10.0f);
             m_world->SetGravity(g);
-            b2Body** bodies = (b2Body**)b2Alloc(2 * sizeof(b2Body*));
+            b2Body** bodies  = (b2Body**)b2Alloc(2 * sizeof(b2Body*));
             b2Joint** joints = (b2Joint**)b2Alloc(0 * sizeof(b2Joint*));
             {
                 b2BodyDef bd;
-                bd.type = b2BodyType(0);
+                bd.type   = b2BodyType(0);
                 bodies[0] = m_world->CreateBody(&bd);
 
                 {
@@ -56,14 +55,14 @@ class ChainProblem : public Test
             {
                 b2BodyDef bd;
                 bd.type = b2BodyType(2);
-                //bd.position.Set(6.033980250358582e-01f, 3.028350114822388e+00f);
+                // bd.position.Set(6.033980250358582e-01f, 3.028350114822388e+00f);
                 bd.position.Set(1.0f, 3.0f);
                 bodies[1] = m_world->CreateBody(&bd);
 
                 {
                     b2FixtureDef fd;
                     fd.friction = 0.2f;
-                    fd.density = 10.0f;
+                    fd.density  = 10.0f;
                     b2PolygonShape shape;
                     b2Vec2 vs[8];
                     vs[0].Set(0.5f, -3.0f);
@@ -84,11 +83,7 @@ class ChainProblem : public Test
         }
     }
 
-    static Test* Create()
-    {
-        return new ChainProblem;
-    }
-
+    static Test* Create() { return new ChainProblem; }
 };
 
 static int testIndex = RegisterTest("Bugs", "Chain Problem", ChainProblem::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/character_collision.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/character_collision.cpp
index 42af87aec71f..42f9f81d6f98 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/character_collision.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/character_collision.cpp
@@ -28,229 +28,225 @@
 class CharacterCollision : public Test
 {
 public:
-	CharacterCollision()
-	{
-		// Ground body
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Collinear edges with no adjacency information.
-		// This shows the problematic case where a box shape can hit
-		// an internal vertex.
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-8.0f, 1.0f), b2Vec2(-6.0f, 1.0f));
-			ground->CreateFixture(&shape, 0.0f);
-			shape.SetTwoSided(b2Vec2(-6.0f, 1.0f), b2Vec2(-4.0f, 1.0f));
-			ground->CreateFixture(&shape, 0.0f);
-			shape.SetTwoSided(b2Vec2(-4.0f, 1.0f), b2Vec2(-2.0f, 1.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Chain shape
-		{
-			b2BodyDef bd;
-			bd.angle = 0.25f * b2_pi;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2Vec2 vs[4];
-			vs[0].Set(5.0f, 7.0f);
-			vs[1].Set(6.0f, 8.0f);
-			vs[2].Set(7.0f, 8.0f);
-			vs[3].Set(8.0f, 7.0f);
-			b2ChainShape shape;
-			shape.CreateLoop(vs, 4);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Square tiles. This shows that adjacency shapes may
-		// have non-smooth collision. There is no solution
-		// to this problem.
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(1.0f, 1.0f, b2Vec2(4.0f, 3.0f), 0.0f);
-			ground->CreateFixture(&shape, 0.0f);
-			shape.SetAsBox(1.0f, 1.0f, b2Vec2(6.0f, 3.0f), 0.0f);
-			ground->CreateFixture(&shape, 0.0f);
-			shape.SetAsBox(1.0f, 1.0f, b2Vec2(8.0f, 3.0f), 0.0f);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Square made from an edge loop. Collision should be smooth.
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2Vec2 vs[4];
-			vs[0].Set(-1.0f, 3.0f);
-			vs[1].Set(1.0f, 3.0f);
-			vs[2].Set(1.0f, 5.0f);
-			vs[3].Set(-1.0f, 5.0f);
-			b2ChainShape shape;
-			shape.CreateLoop(vs, 4);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Edge loop. Collision should be smooth.
-		{
-			b2BodyDef bd;
-			bd.position.Set(-10.0f, 4.0f);
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2Vec2 vs[10];
-			vs[0].Set(0.0f, 0.0f);
-			vs[1].Set(6.0f, 0.0f);
-			vs[2].Set(6.0f, 2.0f);
-			vs[3].Set(4.0f, 1.0f);
-			vs[4].Set(2.0f, 2.0f);
-			vs[5].Set(0.0f, 2.0f);
-			vs[6].Set(-2.0f, 2.0f);
-			vs[7].Set(-4.0f, 3.0f);
-			vs[8].Set(-6.0f, 2.0f);
-			vs[9].Set(-6.0f, 0.0f);
-			b2ChainShape shape;
-			shape.CreateLoop(vs, 10);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Square character 1
-		{
-			b2BodyDef bd;
-			bd.position.Set(-3.0f, 8.0f);
-			bd.type = b2_dynamicBody;
-			bd.fixedRotation = true;
-			bd.allowSleep = false;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			body->CreateFixture(&fd);
-		}
-
-		// Square character 2
-		{
-			b2BodyDef bd;
-			bd.position.Set(-5.0f, 5.0f);
-			bd.type = b2_dynamicBody;
-			bd.fixedRotation = true;
-			bd.allowSleep = false;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 0.25f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			body->CreateFixture(&fd);
-		}
-
-		// Hexagon character
-		{
-			b2BodyDef bd;
-			bd.position.Set(-5.0f, 8.0f);
-			bd.type = b2_dynamicBody;
-			bd.fixedRotation = true;
-			bd.allowSleep = false;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			float angle = 0.0f;
-			float delta = b2_pi / 3.0f;
-			b2Vec2 vertices[6];
-			for (int32 i = 0; i < 6; ++i)
-			{
-				vertices[i].Set(0.5f * cosf(angle), 0.5f * sinf(angle));
-				angle += delta;
-			}
-
-			b2PolygonShape shape;
-			shape.Set(vertices, 6);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			body->CreateFixture(&fd);
-		}
-
-		// Circle character
-		{
-			b2BodyDef bd;
-			bd.position.Set(3.0f, 5.0f);
-			bd.type = b2_dynamicBody;
-			bd.fixedRotation = true;
-			bd.allowSleep = false;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_radius = 0.5f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			body->CreateFixture(&fd);
-		}
-
-		// Circle character
-		{
-			b2BodyDef bd;
-			bd.position.Set(-7.0f, 6.0f);
-			bd.type = b2_dynamicBody;
-			bd.allowSleep = false;
-
-			m_character = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_radius = 0.25f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			fd.friction = 1.0f;
-			m_character->CreateFixture(&fd);
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		b2Vec2 v = m_character->GetLinearVelocity();
-		v.x = -5.0f;
-		m_character->SetLinearVelocity(v);
-
-		Test::Step(settings);
-		DrawString(5, m_textLine, "This tests various character collision shapes.");
-		
-		DrawString(5, m_textLine, "Limitation: square and hexagon can snag on aligned boxes.");
-		
-		DrawString(5, m_textLine, "Feature: edge chains have smooth collision inside and out.");
-		
-	}
-
-	static Test* Create()
-	{
-		return new CharacterCollision;
-	}
-
-	b2Body* m_character;
+    CharacterCollision()
+    {
+        // Ground body
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Collinear edges with no adjacency information.
+        // This shows the problematic case where a box shape can hit
+        // an internal vertex.
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-8.0f, 1.0f), b2Vec2(-6.0f, 1.0f));
+            ground->CreateFixture(&shape, 0.0f);
+            shape.SetTwoSided(b2Vec2(-6.0f, 1.0f), b2Vec2(-4.0f, 1.0f));
+            ground->CreateFixture(&shape, 0.0f);
+            shape.SetTwoSided(b2Vec2(-4.0f, 1.0f), b2Vec2(-2.0f, 1.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Chain shape
+        {
+            b2BodyDef bd;
+            bd.angle       = 0.25f * b2_pi;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2Vec2 vs[4];
+            vs[0].Set(5.0f, 7.0f);
+            vs[1].Set(6.0f, 8.0f);
+            vs[2].Set(7.0f, 8.0f);
+            vs[3].Set(8.0f, 7.0f);
+            b2ChainShape shape;
+            shape.CreateLoop(vs, 4);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Square tiles. This shows that adjacency shapes may
+        // have non-smooth collision. There is no solution
+        // to this problem.
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(1.0f, 1.0f, b2Vec2(4.0f, 3.0f), 0.0f);
+            ground->CreateFixture(&shape, 0.0f);
+            shape.SetAsBox(1.0f, 1.0f, b2Vec2(6.0f, 3.0f), 0.0f);
+            ground->CreateFixture(&shape, 0.0f);
+            shape.SetAsBox(1.0f, 1.0f, b2Vec2(8.0f, 3.0f), 0.0f);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Square made from an edge loop. Collision should be smooth.
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2Vec2 vs[4];
+            vs[0].Set(-1.0f, 3.0f);
+            vs[1].Set(1.0f, 3.0f);
+            vs[2].Set(1.0f, 5.0f);
+            vs[3].Set(-1.0f, 5.0f);
+            b2ChainShape shape;
+            shape.CreateLoop(vs, 4);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Edge loop. Collision should be smooth.
+        {
+            b2BodyDef bd;
+            bd.position.Set(-10.0f, 4.0f);
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2Vec2 vs[10];
+            vs[0].Set(0.0f, 0.0f);
+            vs[1].Set(6.0f, 0.0f);
+            vs[2].Set(6.0f, 2.0f);
+            vs[3].Set(4.0f, 1.0f);
+            vs[4].Set(2.0f, 2.0f);
+            vs[5].Set(0.0f, 2.0f);
+            vs[6].Set(-2.0f, 2.0f);
+            vs[7].Set(-4.0f, 3.0f);
+            vs[8].Set(-6.0f, 2.0f);
+            vs[9].Set(-6.0f, 0.0f);
+            b2ChainShape shape;
+            shape.CreateLoop(vs, 10);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Square character 1
+        {
+            b2BodyDef bd;
+            bd.position.Set(-3.0f, 8.0f);
+            bd.type          = b2_dynamicBody;
+            bd.fixedRotation = true;
+            bd.allowSleep    = false;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+            body->CreateFixture(&fd);
+        }
+
+        // Square character 2
+        {
+            b2BodyDef bd;
+            bd.position.Set(-5.0f, 5.0f);
+            bd.type          = b2_dynamicBody;
+            bd.fixedRotation = true;
+            bd.allowSleep    = false;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 0.25f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+            body->CreateFixture(&fd);
+        }
+
+        // Hexagon character
+        {
+            b2BodyDef bd;
+            bd.position.Set(-5.0f, 8.0f);
+            bd.type          = b2_dynamicBody;
+            bd.fixedRotation = true;
+            bd.allowSleep    = false;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            float angle = 0.0f;
+            float delta = b2_pi / 3.0f;
+            b2Vec2 vertices[6];
+            for (int32 i = 0; i < 6; ++i)
+            {
+                vertices[i].Set(0.5f * cosf(angle), 0.5f * sinf(angle));
+                angle += delta;
+            }
+
+            b2PolygonShape shape;
+            shape.Set(vertices, 6);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+            body->CreateFixture(&fd);
+        }
+
+        // Circle character
+        {
+            b2BodyDef bd;
+            bd.position.Set(3.0f, 5.0f);
+            bd.type          = b2_dynamicBody;
+            bd.fixedRotation = true;
+            bd.allowSleep    = false;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_radius = 0.5f;
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 20.0f;
+            body->CreateFixture(&fd);
+        }
+
+        // Circle character
+        {
+            b2BodyDef bd;
+            bd.position.Set(-7.0f, 6.0f);
+            bd.type       = b2_dynamicBody;
+            bd.allowSleep = false;
+
+            m_character = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_radius = 0.25f;
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 20.0f;
+            fd.friction = 1.0f;
+            m_character->CreateFixture(&fd);
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        b2Vec2 v = m_character->GetLinearVelocity();
+        v.x      = -5.0f;
+        m_character->SetLinearVelocity(v);
+
+        Test::Step(settings);
+        DrawString(5, m_textLine, "This tests various character collision shapes.");
+
+        DrawString(5, m_textLine, "Limitation: square and hexagon can snag on aligned boxes.");
+
+        DrawString(5, m_textLine, "Feature: edge chains have smooth collision inside and out.");
+    }
+
+    static Test* Create() { return new CharacterCollision; }
+
+    b2Body* m_character;
 };
 
 static int testIndex = RegisterTest("Examples", "Character Collision", CharacterCollision::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/circle_stack.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/circle_stack.cpp
index 62d19ea3feda..d642a12d33e2 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/circle_stack.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/circle_stack.cpp
@@ -25,65 +25,61 @@
 class CircleStack : public Test
 {
 public:
+    enum
+    {
+        e_count = 10
+    };
 
-	enum
-	{
-		e_count = 10
-	};
+    CircleStack()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
 
-	CircleStack()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
 
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
+        {
+            b2CircleShape shape;
+            shape.m_radius = 1.0f;
 
-		{
-			b2CircleShape shape;
-			shape.m_radius = 1.0f;
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.0, 4.0f + 3.0f * i);
 
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.0, 4.0f + 3.0f * i);
+                m_bodies[i] = m_world->CreateBody(&bd);
 
-				m_bodies[i] = m_world->CreateBody(&bd);
+                m_bodies[i]->CreateFixture(&shape, 1.0f);
 
-				m_bodies[i]->CreateFixture(&shape, 1.0f);
+                m_bodies[i]->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
+            }
+        }
+    }
 
-				m_bodies[i]->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
-			}
-		}
-	}
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
 
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
+        // for (int32 i = 0; i < e_count; ++i)
+        //{
+        //	printf("%g ", m_bodies[i]->GetWorldCenter().y);
+        // }
 
-		//for (int32 i = 0; i < e_count; ++i)
-		//{
-		//	printf("%g ", m_bodies[i]->GetWorldCenter().y);
-		//}
+        // for (int32 i = 0; i < e_count; ++i)
+        //{
+        //	printf("%g ", m_bodies[i]->GetLinearVelocity().y);
+        // }
 
-		//for (int32 i = 0; i < e_count; ++i)
-		//{
-		//	printf("%g ", m_bodies[i]->GetLinearVelocity().y);
-		//}
+        // printf("\n");
+    }
 
-		//printf("\n");
-	}
+    static Test* Create() { return new CircleStack; }
 
-	static Test* Create()
-	{
-		return new CircleStack;
-	}
-
-	b2Body* m_bodies[e_count];
+    b2Body* m_bodies[e_count];
 };
 
 static int testIndex = RegisterTest("Stacking", "Circles", CircleStack::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_filtering.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_filtering.cpp
index 4903da5f5c64..65acb3866862 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_filtering.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_filtering.cpp
@@ -28,152 +28,149 @@
 // The 3 small ones always collide.
 // The 3 large ones never collide.
 // The boxes don't collide with triangles (except if both are small).
-const int16	k_smallGroup = 1;
+const int16 k_smallGroup = 1;
 const int16 k_largeGroup = -1;
 
 const uint16 k_triangleCategory = 0x0002;
-const uint16 k_boxCategory = 0x0004;
-const uint16 k_circleCategory = 0x0008;
+const uint16 k_boxCategory      = 0x0004;
+const uint16 k_circleCategory   = 0x0008;
 
 const uint16 k_triangleMask = 0xFFFF;
-const uint16 k_boxMask = 0xFFFF ^ k_triangleCategory;
-const uint16 k_circleMask = 0xFFFF;
+const uint16 k_boxMask      = 0xFFFF ^ k_triangleCategory;
+const uint16 k_circleMask   = 0xFFFF;
 
 class CollisionFiltering : public Test
 {
 public:
-	CollisionFiltering()
-	{
-		// Ground body
-		{
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-
-			b2FixtureDef sd;
-			sd.shape = &shape;
-			sd.friction = 0.3f;
-
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&sd);
-		}
-
-		// Small triangle
-		b2Vec2 vertices[3];
-		vertices[0].Set(-1.0f, 0.0f);
-		vertices[1].Set(1.0f, 0.0f);
-		vertices[2].Set(0.0f, 2.0f);
-		b2PolygonShape polygon;
-		polygon.Set(vertices, 3);
-
-		b2FixtureDef triangleShapeDef;
-		triangleShapeDef.shape = &polygon;
-		triangleShapeDef.density = 1.0f;
-
-		triangleShapeDef.filter.groupIndex = k_smallGroup;
-		triangleShapeDef.filter.categoryBits = k_triangleCategory;
-		triangleShapeDef.filter.maskBits = k_triangleMask;
-
-		b2BodyDef triangleBodyDef;
-		triangleBodyDef.type = b2_dynamicBody;
-		triangleBodyDef.position.Set(-5.0f, 2.0f);
-
-		b2Body* body1 = m_world->CreateBody(&triangleBodyDef);
-		body1->CreateFixture(&triangleShapeDef);
-
-		// Large triangle (recycle definitions)
-		vertices[0] *= 2.0f;
-		vertices[1] *= 2.0f;
-		vertices[2] *= 2.0f;
-		polygon.Set(vertices, 3);
-		triangleShapeDef.filter.groupIndex = k_largeGroup;
-		triangleBodyDef.position.Set(-5.0f, 6.0f);
-		triangleBodyDef.fixedRotation = true; // look at me!
-
-		b2Body* body2 = m_world->CreateBody(&triangleBodyDef);
-		body2->CreateFixture(&triangleShapeDef);
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-5.0f, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape p;
-			p.SetAsBox(0.5f, 1.0f);
-			body->CreateFixture(&p, 1.0f);
-
-			b2PrismaticJointDef jd;
-			jd.bodyA = body2;
-			jd.bodyB = body;
-			jd.enableLimit = true;
-			jd.localAnchorA.Set(0.0f, 4.0f);
-			jd.localAnchorB.SetZero();
-			jd.localAxisA.Set(0.0f, 1.0f);
-			jd.lowerTranslation = -1.0f;
-			jd.upperTranslation = 1.0f;
-
-			m_world->CreateJoint(&jd);
-		}
-
-		// Small box
-		polygon.SetAsBox(1.0f, 0.5f);
-		b2FixtureDef boxShapeDef;
-		boxShapeDef.shape = &polygon;
-		boxShapeDef.density = 1.0f;
-		boxShapeDef.restitution = 0.1f;
-
-		boxShapeDef.filter.groupIndex = k_smallGroup;
-		boxShapeDef.filter.categoryBits = k_boxCategory;
-		boxShapeDef.filter.maskBits = k_boxMask;
-
-		b2BodyDef boxBodyDef;
-		boxBodyDef.type = b2_dynamicBody;
-		boxBodyDef.position.Set(0.0f, 2.0f);
-
-		b2Body* body3 = m_world->CreateBody(&boxBodyDef);
-		body3->CreateFixture(&boxShapeDef);
-
-		// Large box (recycle definitions)
-		polygon.SetAsBox(2.0f, 1.0f);
-		boxShapeDef.filter.groupIndex = k_largeGroup;
-		boxBodyDef.position.Set(0.0f, 6.0f);
-
-		b2Body* body4 = m_world->CreateBody(&boxBodyDef);
-		body4->CreateFixture(&boxShapeDef);
-
-		// Small circle
-		b2CircleShape circle;
-		circle.m_radius = 1.0f;
-
-		b2FixtureDef circleShapeDef;
-		circleShapeDef.shape = &circle;
-		circleShapeDef.density = 1.0f;
-
-		circleShapeDef.filter.groupIndex = k_smallGroup;
-		circleShapeDef.filter.categoryBits = k_circleCategory;
-		circleShapeDef.filter.maskBits = k_circleMask;
-
-		b2BodyDef circleBodyDef;
-		circleBodyDef.type = b2_dynamicBody;
-		circleBodyDef.position.Set(5.0f, 2.0f);
-		
-		b2Body* body5 = m_world->CreateBody(&circleBodyDef);
-		body5->CreateFixture(&circleShapeDef);
-
-		// Large circle
-		circle.m_radius *= 2.0f;
-		circleShapeDef.filter.groupIndex = k_largeGroup;
-		circleBodyDef.position.Set(5.0f, 6.0f);
-
-		b2Body* body6 = m_world->CreateBody(&circleBodyDef);
-		body6->CreateFixture(&circleShapeDef);
-	}
-
-	static Test* Create()
-	{
-		return new CollisionFiltering;
-	}
+    CollisionFiltering()
+    {
+        // Ground body
+        {
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+
+            b2FixtureDef sd;
+            sd.shape    = &shape;
+            sd.friction = 0.3f;
+
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&sd);
+        }
+
+        // Small triangle
+        b2Vec2 vertices[3];
+        vertices[0].Set(-1.0f, 0.0f);
+        vertices[1].Set(1.0f, 0.0f);
+        vertices[2].Set(0.0f, 2.0f);
+        b2PolygonShape polygon;
+        polygon.Set(vertices, 3);
+
+        b2FixtureDef triangleShapeDef;
+        triangleShapeDef.shape   = &polygon;
+        triangleShapeDef.density = 1.0f;
+
+        triangleShapeDef.filter.groupIndex   = k_smallGroup;
+        triangleShapeDef.filter.categoryBits = k_triangleCategory;
+        triangleShapeDef.filter.maskBits     = k_triangleMask;
+
+        b2BodyDef triangleBodyDef;
+        triangleBodyDef.type = b2_dynamicBody;
+        triangleBodyDef.position.Set(-5.0f, 2.0f);
+
+        b2Body* body1 = m_world->CreateBody(&triangleBodyDef);
+        body1->CreateFixture(&triangleShapeDef);
+
+        // Large triangle (recycle definitions)
+        vertices[0] *= 2.0f;
+        vertices[1] *= 2.0f;
+        vertices[2] *= 2.0f;
+        polygon.Set(vertices, 3);
+        triangleShapeDef.filter.groupIndex = k_largeGroup;
+        triangleBodyDef.position.Set(-5.0f, 6.0f);
+        triangleBodyDef.fixedRotation = true;  // look at me!
+
+        b2Body* body2 = m_world->CreateBody(&triangleBodyDef);
+        body2->CreateFixture(&triangleShapeDef);
+
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-5.0f, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape p;
+            p.SetAsBox(0.5f, 1.0f);
+            body->CreateFixture(&p, 1.0f);
+
+            b2PrismaticJointDef jd;
+            jd.bodyA       = body2;
+            jd.bodyB       = body;
+            jd.enableLimit = true;
+            jd.localAnchorA.Set(0.0f, 4.0f);
+            jd.localAnchorB.SetZero();
+            jd.localAxisA.Set(0.0f, 1.0f);
+            jd.lowerTranslation = -1.0f;
+            jd.upperTranslation = 1.0f;
+
+            m_world->CreateJoint(&jd);
+        }
+
+        // Small box
+        polygon.SetAsBox(1.0f, 0.5f);
+        b2FixtureDef boxShapeDef;
+        boxShapeDef.shape       = &polygon;
+        boxShapeDef.density     = 1.0f;
+        boxShapeDef.restitution = 0.1f;
+
+        boxShapeDef.filter.groupIndex   = k_smallGroup;
+        boxShapeDef.filter.categoryBits = k_boxCategory;
+        boxShapeDef.filter.maskBits     = k_boxMask;
+
+        b2BodyDef boxBodyDef;
+        boxBodyDef.type = b2_dynamicBody;
+        boxBodyDef.position.Set(0.0f, 2.0f);
+
+        b2Body* body3 = m_world->CreateBody(&boxBodyDef);
+        body3->CreateFixture(&boxShapeDef);
+
+        // Large box (recycle definitions)
+        polygon.SetAsBox(2.0f, 1.0f);
+        boxShapeDef.filter.groupIndex = k_largeGroup;
+        boxBodyDef.position.Set(0.0f, 6.0f);
+
+        b2Body* body4 = m_world->CreateBody(&boxBodyDef);
+        body4->CreateFixture(&boxShapeDef);
+
+        // Small circle
+        b2CircleShape circle;
+        circle.m_radius = 1.0f;
+
+        b2FixtureDef circleShapeDef;
+        circleShapeDef.shape   = &circle;
+        circleShapeDef.density = 1.0f;
+
+        circleShapeDef.filter.groupIndex   = k_smallGroup;
+        circleShapeDef.filter.categoryBits = k_circleCategory;
+        circleShapeDef.filter.maskBits     = k_circleMask;
+
+        b2BodyDef circleBodyDef;
+        circleBodyDef.type = b2_dynamicBody;
+        circleBodyDef.position.Set(5.0f, 2.0f);
+
+        b2Body* body5 = m_world->CreateBody(&circleBodyDef);
+        body5->CreateFixture(&circleShapeDef);
+
+        // Large circle
+        circle.m_radius *= 2.0f;
+        circleShapeDef.filter.groupIndex = k_largeGroup;
+        circleBodyDef.position.Set(5.0f, 6.0f);
+
+        b2Body* body6 = m_world->CreateBody(&circleBodyDef);
+        body6->CreateFixture(&circleShapeDef);
+    }
+
+    static Test* Create() { return new CollisionFiltering; }
 };
 
 static int testIndex = RegisterTest("Examples", "Collision Filtering", CollisionFiltering::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_processing.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_processing.cpp
index 1c684bdaecc1..f31db91a3b7d 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_processing.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/collision_processing.cpp
@@ -29,163 +29,161 @@
 class CollisionProcessing : public Test
 {
 public:
-	CollisionProcessing()
-	{
-		// Ground body
-		{
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(50.0f, 0.0f));
-
-			b2FixtureDef sd;
-			sd.shape = &shape;;
-
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&sd);
-		}
-
-		float xLo = -5.0f, xHi = 5.0f;
-		float yLo = 2.0f, yHi = 35.0f;
-
-		// Small triangle
-		b2Vec2 vertices[3];
-		vertices[0].Set(-1.0f, 0.0f);
-		vertices[1].Set(1.0f, 0.0f);
-		vertices[2].Set(0.0f, 2.0f);
-
-		b2PolygonShape polygon;
-		polygon.Set(vertices, 3);
-
-		b2FixtureDef triangleShapeDef;
-		triangleShapeDef.shape = &polygon;
-		triangleShapeDef.density = 1.0f;
-
-		b2BodyDef triangleBodyDef;
-		triangleBodyDef.type = b2_dynamicBody;
-		triangleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-
-		b2Body* body1 = m_world->CreateBody(&triangleBodyDef);
-		body1->CreateFixture(&triangleShapeDef);
-
-		// Large triangle (recycle definitions)
-		vertices[0] *= 2.0f;
-		vertices[1] *= 2.0f;
-		vertices[2] *= 2.0f;
-		polygon.Set(vertices, 3);
-
-		triangleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-
-		b2Body* body2 = m_world->CreateBody(&triangleBodyDef);
-		body2->CreateFixture(&triangleShapeDef);
-		
-		// Small box
-		polygon.SetAsBox(1.0f, 0.5f);
-
-		b2FixtureDef boxShapeDef;
-		boxShapeDef.shape = &polygon;
-		boxShapeDef.density = 1.0f;
-
-		b2BodyDef boxBodyDef;
-		boxBodyDef.type = b2_dynamicBody;
-		boxBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-
-		b2Body* body3 = m_world->CreateBody(&boxBodyDef);
-		body3->CreateFixture(&boxShapeDef);
-
-		// Large box (recycle definitions)
-		polygon.SetAsBox(2.0f, 1.0f);
-		boxBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-		
-		b2Body* body4 = m_world->CreateBody(&boxBodyDef);
-		body4->CreateFixture(&boxShapeDef);
-
-		// Small circle
-		b2CircleShape circle;
-		circle.m_radius = 1.0f;
-
-		b2FixtureDef circleShapeDef;
-		circleShapeDef.shape = &circle;
-		circleShapeDef.density = 1.0f;
-
-		b2BodyDef circleBodyDef;
-		circleBodyDef.type = b2_dynamicBody;
-		circleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-
-		b2Body* body5 = m_world->CreateBody(&circleBodyDef);
-		body5->CreateFixture(&circleShapeDef);
-
-		// Large circle
-		circle.m_radius *= 2.0f;
-		circleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
-
-		b2Body* body6 = m_world->CreateBody(&circleBodyDef);
-		body6->CreateFixture(&circleShapeDef);
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		// We are going to destroy some bodies according to contact
-		// points. We must buffer the bodies that should be destroyed
-		// because they may belong to multiple contact points.
-		const int32 k_maxNuke = 6;
-		b2Body* nuke[k_maxNuke];
-		int32 nukeCount = 0;
-
-		// Traverse the contact results. Destroy bodies that
-		// are touching heavier bodies.
-		for (int32 i = 0; i < m_pointCount; ++i)
-		{
-			ContactPoint* point = m_points + i;
-
-			b2Body* body1 = point->fixtureA->GetBody();
-			b2Body* body2 = point->fixtureB->GetBody();
-			float mass1 = body1->GetMass();
-			float mass2 = body2->GetMass();
-
-			if (mass1 > 0.0f && mass2 > 0.0f)
-			{
-				if (mass2 > mass1)
-				{
-					nuke[nukeCount++] = body1;
-				}
-				else
-				{
-					nuke[nukeCount++] = body2;
-				}
-
-				if (nukeCount == k_maxNuke)
-				{
-					break;
-				}
-			}
-		}
-
-		// Sort the nuke array to group duplicates.
-		std::sort(nuke, nuke + nukeCount);
-
-		// Destroy the bodies, skipping duplicates.
-		int32 i = 0;
-		while (i < nukeCount)
-		{
-			b2Body* b = nuke[i++];
-			while (i < nukeCount && nuke[i] == b)
-			{
-				++i;
-			}
-
-			if (b != m_bomb)
-			{
-				m_world->DestroyBody(b);
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new CollisionProcessing;
-	}
+    CollisionProcessing()
+    {
+        // Ground body
+        {
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(50.0f, 0.0f));
+
+            b2FixtureDef sd;
+            sd.shape = &shape;
+            ;
+
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&sd);
+        }
+
+        float xLo = -5.0f, xHi = 5.0f;
+        float yLo = 2.0f, yHi = 35.0f;
+
+        // Small triangle
+        b2Vec2 vertices[3];
+        vertices[0].Set(-1.0f, 0.0f);
+        vertices[1].Set(1.0f, 0.0f);
+        vertices[2].Set(0.0f, 2.0f);
+
+        b2PolygonShape polygon;
+        polygon.Set(vertices, 3);
+
+        b2FixtureDef triangleShapeDef;
+        triangleShapeDef.shape   = &polygon;
+        triangleShapeDef.density = 1.0f;
+
+        b2BodyDef triangleBodyDef;
+        triangleBodyDef.type = b2_dynamicBody;
+        triangleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body1 = m_world->CreateBody(&triangleBodyDef);
+        body1->CreateFixture(&triangleShapeDef);
+
+        // Large triangle (recycle definitions)
+        vertices[0] *= 2.0f;
+        vertices[1] *= 2.0f;
+        vertices[2] *= 2.0f;
+        polygon.Set(vertices, 3);
+
+        triangleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body2 = m_world->CreateBody(&triangleBodyDef);
+        body2->CreateFixture(&triangleShapeDef);
+
+        // Small box
+        polygon.SetAsBox(1.0f, 0.5f);
+
+        b2FixtureDef boxShapeDef;
+        boxShapeDef.shape   = &polygon;
+        boxShapeDef.density = 1.0f;
+
+        b2BodyDef boxBodyDef;
+        boxBodyDef.type = b2_dynamicBody;
+        boxBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body3 = m_world->CreateBody(&boxBodyDef);
+        body3->CreateFixture(&boxShapeDef);
+
+        // Large box (recycle definitions)
+        polygon.SetAsBox(2.0f, 1.0f);
+        boxBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body4 = m_world->CreateBody(&boxBodyDef);
+        body4->CreateFixture(&boxShapeDef);
+
+        // Small circle
+        b2CircleShape circle;
+        circle.m_radius = 1.0f;
+
+        b2FixtureDef circleShapeDef;
+        circleShapeDef.shape   = &circle;
+        circleShapeDef.density = 1.0f;
+
+        b2BodyDef circleBodyDef;
+        circleBodyDef.type = b2_dynamicBody;
+        circleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body5 = m_world->CreateBody(&circleBodyDef);
+        body5->CreateFixture(&circleShapeDef);
+
+        // Large circle
+        circle.m_radius *= 2.0f;
+        circleBodyDef.position.Set(RandomFloat(xLo, xHi), RandomFloat(yLo, yHi));
+
+        b2Body* body6 = m_world->CreateBody(&circleBodyDef);
+        body6->CreateFixture(&circleShapeDef);
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        // We are going to destroy some bodies according to contact
+        // points. We must buffer the bodies that should be destroyed
+        // because they may belong to multiple contact points.
+        const int32 k_maxNuke = 6;
+        b2Body* nuke[k_maxNuke];
+        int32 nukeCount = 0;
+
+        // Traverse the contact results. Destroy bodies that
+        // are touching heavier bodies.
+        for (int32 i = 0; i < m_pointCount; ++i)
+        {
+            ContactPoint* point = m_points + i;
+
+            b2Body* body1 = point->fixtureA->GetBody();
+            b2Body* body2 = point->fixtureB->GetBody();
+            float mass1   = body1->GetMass();
+            float mass2   = body2->GetMass();
+
+            if (mass1 > 0.0f && mass2 > 0.0f)
+            {
+                if (mass2 > mass1)
+                {
+                    nuke[nukeCount++] = body1;
+                }
+                else
+                {
+                    nuke[nukeCount++] = body2;
+                }
+
+                if (nukeCount == k_maxNuke)
+                {
+                    break;
+                }
+            }
+        }
+
+        // Sort the nuke array to group duplicates.
+        std::sort(nuke, nuke + nukeCount);
+
+        // Destroy the bodies, skipping duplicates.
+        int32 i = 0;
+        while (i < nukeCount)
+        {
+            b2Body* b = nuke[i++];
+            while (i < nukeCount && nuke[i] == b)
+            {
+                ++i;
+            }
+
+            if (b != m_bomb)
+            {
+                m_world->DestroyBody(b);
+            }
+        }
+    }
+
+    static Test* Create() { return new CollisionProcessing; }
 };
 
 static int testIndex = RegisterTest("Examples", "Collision Processing", CollisionProcessing::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/compound_shapes.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/compound_shapes.cpp
index 657d8b27b9b5..34d29535110d 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/compound_shapes.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/compound_shapes.cpp
@@ -26,202 +26,199 @@
 class CompoundShapes : public Test
 {
 public:
-	CompoundShapes()
-	{
-		{
-			b2BodyDef bd;
-			bd.position.Set(0.0f, 0.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(-50.0f, 0.0f));
-
-			body->CreateFixture(&shape, 0.0f);
-		}
-
-		// Table 1
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-15.0f, 1.0f);
-			m_table1 = m_world->CreateBody(&bd);
-
-			b2PolygonShape top;
-			top.SetAsBox(3.0f, 0.5f, b2Vec2(0.0f, 3.5f), 0.0f);
-
-			b2PolygonShape leftLeg;
-			leftLeg.SetAsBox(0.5f, 1.5f, b2Vec2(-2.5f, 1.5f), 0.0f);
-
-			b2PolygonShape rightLeg;
-			rightLeg.SetAsBox(0.5f, 1.5f, b2Vec2(2.5f, 1.5f), 0.0f);
-
-			m_table1->CreateFixture(&top, 2.0f);
-			m_table1->CreateFixture(&leftLeg, 2.0f);
-			m_table1->CreateFixture(&rightLeg, 2.0f);
-		}
-
-		// Table 2
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-5.0f, 1.0f);
-			m_table2 = m_world->CreateBody(&bd);
-
-			b2PolygonShape top;
-			top.SetAsBox(3.0f, 0.5f, b2Vec2(0.0f, 3.5f), 0.0f);
-
-			b2PolygonShape leftLeg;
-			leftLeg.SetAsBox(0.5f, 2.0f, b2Vec2(-2.5f, 2.0f), 0.0f);
-
-			b2PolygonShape rightLeg;
-			rightLeg.SetAsBox(0.5f, 2.0f, b2Vec2(2.5f, 2.0f), 0.0f);
-
-			m_table2->CreateFixture(&top, 2.0f);
-			m_table2->CreateFixture(&leftLeg, 2.0f);
-			m_table2->CreateFixture(&rightLeg, 2.0f);
-		}
-
-		// Spaceship 1
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(5.0f, 1.0f);
-			m_ship1 = m_world->CreateBody(&bd);
-
-			b2Vec2 vertices[3];
-
-			b2PolygonShape left;
-			vertices[0].Set(-2.0f, 0.0f);
-			vertices[1].Set(0.0f, 4.0f / 3.0f);
-			vertices[2].Set(0.0f, 4.0f);
-			left.Set(vertices, 3);
-
-			b2PolygonShape right;
-			vertices[0].Set(2.0f, 0.0f);
-			vertices[1].Set(0.0f, 4.0f / 3.0f);
-			vertices[2].Set(0.0f, 4.0f);
-			right.Set(vertices, 3);
-
-			m_ship1->CreateFixture(&left, 2.0f);
-			m_ship1->CreateFixture(&right, 2.0f);
-		}
-
-		// Spaceship 2
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(15.0f, 1.0f);
-			m_ship2 = m_world->CreateBody(&bd);
-
-			b2Vec2 vertices[3];
-
-			b2PolygonShape left;
-			vertices[0].Set(-2.0f, 0.0f);
-			vertices[1].Set(1.0f, 2.0f);
-			vertices[2].Set(0.0f, 4.0f);
-			left.Set(vertices, 3);
-
-			b2PolygonShape right;
-			vertices[0].Set(2.0f, 0.0f);
-			vertices[1].Set(-1.0f, 2.0f);
-			vertices[2].Set(0.0f, 4.0f);
-			right.Set(vertices, 3);
-
-			m_ship2->CreateFixture(&left, 2.0f);
-			m_ship2->CreateFixture(&right, 2.0f);
-		}
-	}
-
-	void Spawn()
-	{
-		// Table 1 obstruction
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = m_table1->GetPosition();
-			bd.angle = m_table1->GetAngle();
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape box;
-			box.SetAsBox(4.0f, 0.1f, b2Vec2(0.0f, 3.0f), 0.0f);
-			
-			body->CreateFixture(&box, 2.0f);
-		}
-
-		// Table 2 obstruction
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = m_table2->GetPosition();
-			bd.angle = m_table2->GetAngle();
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape box;
-			box.SetAsBox(4.0f, 0.1f, b2Vec2(0.0f, 3.0f), 0.0f);
-			
-			body->CreateFixture(&box, 2.0f);
-		}
-
-		// Ship 1 obstruction
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = m_ship1->GetPosition();
-			bd.angle = m_ship1->GetAngle();
-			bd.gravityScale = 0.0f;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2CircleShape circle;
-			circle.m_radius = 0.5f;
-			circle.m_p.Set(0.0f, 2.0f);
-
-			body->CreateFixture(&circle, 2.0f);
-		}
-
-		// Ship 2 obstruction
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = m_ship2->GetPosition();
-			bd.angle = m_ship2->GetAngle();
-			bd.gravityScale = 0.0f;
-
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2CircleShape circle;
-			circle.m_radius = 0.5f;
-			circle.m_p.Set(0.0f, 2.0f);
-
-			body->CreateFixture(&circle, 2.0f);
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Button("Spawn"))
-		{
-			Spawn();
-		}
-
-		ImGui::End();
-	}
-
-	static Test* Create()
-	{
-		return new CompoundShapes;
-	}
-
-	b2Body* m_table1;
-	b2Body* m_table2;
-	b2Body* m_ship1;
-	b2Body* m_ship2;
+    CompoundShapes()
+    {
+        {
+            b2BodyDef bd;
+            bd.position.Set(0.0f, 0.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(-50.0f, 0.0f));
+
+            body->CreateFixture(&shape, 0.0f);
+        }
+
+        // Table 1
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-15.0f, 1.0f);
+            m_table1 = m_world->CreateBody(&bd);
+
+            b2PolygonShape top;
+            top.SetAsBox(3.0f, 0.5f, b2Vec2(0.0f, 3.5f), 0.0f);
+
+            b2PolygonShape leftLeg;
+            leftLeg.SetAsBox(0.5f, 1.5f, b2Vec2(-2.5f, 1.5f), 0.0f);
+
+            b2PolygonShape rightLeg;
+            rightLeg.SetAsBox(0.5f, 1.5f, b2Vec2(2.5f, 1.5f), 0.0f);
+
+            m_table1->CreateFixture(&top, 2.0f);
+            m_table1->CreateFixture(&leftLeg, 2.0f);
+            m_table1->CreateFixture(&rightLeg, 2.0f);
+        }
+
+        // Table 2
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-5.0f, 1.0f);
+            m_table2 = m_world->CreateBody(&bd);
+
+            b2PolygonShape top;
+            top.SetAsBox(3.0f, 0.5f, b2Vec2(0.0f, 3.5f), 0.0f);
+
+            b2PolygonShape leftLeg;
+            leftLeg.SetAsBox(0.5f, 2.0f, b2Vec2(-2.5f, 2.0f), 0.0f);
+
+            b2PolygonShape rightLeg;
+            rightLeg.SetAsBox(0.5f, 2.0f, b2Vec2(2.5f, 2.0f), 0.0f);
+
+            m_table2->CreateFixture(&top, 2.0f);
+            m_table2->CreateFixture(&leftLeg, 2.0f);
+            m_table2->CreateFixture(&rightLeg, 2.0f);
+        }
+
+        // Spaceship 1
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(5.0f, 1.0f);
+            m_ship1 = m_world->CreateBody(&bd);
+
+            b2Vec2 vertices[3];
+
+            b2PolygonShape left;
+            vertices[0].Set(-2.0f, 0.0f);
+            vertices[1].Set(0.0f, 4.0f / 3.0f);
+            vertices[2].Set(0.0f, 4.0f);
+            left.Set(vertices, 3);
+
+            b2PolygonShape right;
+            vertices[0].Set(2.0f, 0.0f);
+            vertices[1].Set(0.0f, 4.0f / 3.0f);
+            vertices[2].Set(0.0f, 4.0f);
+            right.Set(vertices, 3);
+
+            m_ship1->CreateFixture(&left, 2.0f);
+            m_ship1->CreateFixture(&right, 2.0f);
+        }
+
+        // Spaceship 2
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(15.0f, 1.0f);
+            m_ship2 = m_world->CreateBody(&bd);
+
+            b2Vec2 vertices[3];
+
+            b2PolygonShape left;
+            vertices[0].Set(-2.0f, 0.0f);
+            vertices[1].Set(1.0f, 2.0f);
+            vertices[2].Set(0.0f, 4.0f);
+            left.Set(vertices, 3);
+
+            b2PolygonShape right;
+            vertices[0].Set(2.0f, 0.0f);
+            vertices[1].Set(-1.0f, 2.0f);
+            vertices[2].Set(0.0f, 4.0f);
+            right.Set(vertices, 3);
+
+            m_ship2->CreateFixture(&left, 2.0f);
+            m_ship2->CreateFixture(&right, 2.0f);
+        }
+    }
+
+    void Spawn()
+    {
+        // Table 1 obstruction
+        {
+            b2BodyDef bd;
+            bd.type     = b2_dynamicBody;
+            bd.position = m_table1->GetPosition();
+            bd.angle    = m_table1->GetAngle();
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape box;
+            box.SetAsBox(4.0f, 0.1f, b2Vec2(0.0f, 3.0f), 0.0f);
+
+            body->CreateFixture(&box, 2.0f);
+        }
+
+        // Table 2 obstruction
+        {
+            b2BodyDef bd;
+            bd.type     = b2_dynamicBody;
+            bd.position = m_table2->GetPosition();
+            bd.angle    = m_table2->GetAngle();
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape box;
+            box.SetAsBox(4.0f, 0.1f, b2Vec2(0.0f, 3.0f), 0.0f);
+
+            body->CreateFixture(&box, 2.0f);
+        }
+
+        // Ship 1 obstruction
+        {
+            b2BodyDef bd;
+            bd.type         = b2_dynamicBody;
+            bd.position     = m_ship1->GetPosition();
+            bd.angle        = m_ship1->GetAngle();
+            bd.gravityScale = 0.0f;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2CircleShape circle;
+            circle.m_radius = 0.5f;
+            circle.m_p.Set(0.0f, 2.0f);
+
+            body->CreateFixture(&circle, 2.0f);
+        }
+
+        // Ship 2 obstruction
+        {
+            b2BodyDef bd;
+            bd.type         = b2_dynamicBody;
+            bd.position     = m_ship2->GetPosition();
+            bd.angle        = m_ship2->GetAngle();
+            bd.gravityScale = 0.0f;
+
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2CircleShape circle;
+            circle.m_radius = 0.5f;
+            circle.m_p.Set(0.0f, 2.0f);
+
+            body->CreateFixture(&circle, 2.0f);
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Button("Spawn"))
+        {
+            Spawn();
+        }
+
+        ImGui::End();
+    }
+
+    static Test* Create() { return new CompoundShapes; }
+
+    b2Body* m_table1;
+    b2Body* m_table2;
+    b2Body* m_ship1;
+    b2Body* m_ship2;
 };
 
 static int testIndex = RegisterTest("Examples", "Compound Shapes", CompoundShapes::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/confined.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/confined.cpp
index dc0e7cf12208..44e2f6201036 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/confined.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/confined.cpp
@@ -25,146 +25,141 @@
 class Confined : public Test
 {
 public:
-
-	enum
-	{
-		e_columnCount = 0,
-		e_rowCount = 0
-	};
-
-	Confined()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-
-			// Floor
-			shape.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			// Left wall
-			shape.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(-10.0f, 20.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			// Right wall
-			shape.SetTwoSided(b2Vec2(10.0f, 0.0f), b2Vec2(10.0f, 20.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			// Roof
-			shape.SetTwoSided(b2Vec2(-10.0f, 20.0f), b2Vec2(10.0f, 20.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		float radius = 0.5f;
-		b2CircleShape shape;
-		shape.m_p.SetZero();
-		shape.m_radius = radius;
-
-		b2FixtureDef fd;
-		fd.shape = &shape;
-		fd.density = 1.0f;
-		fd.friction = 0.1f;
-
-		for (int32 j = 0; j < e_columnCount; ++j)
-		{
-			for (int i = 0; i < e_rowCount; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-10.0f + (2.1f * j + 1.0f + 0.01f * i) * radius, (2.0f * i + 1.0f) * radius);
-				b2Body* body = m_world->CreateBody(&bd);
-
-				body->CreateFixture(&fd);
-			}
-		}
-
-		m_world->SetGravity(b2Vec2(0.0f, 0.0f));
-	}
-
-	void CreateCircle()
-	{
-		float radius = 2.0f;
-		b2CircleShape shape;
-		shape.m_p.SetZero();
-		shape.m_radius = radius;
-
-		b2FixtureDef fd;
-		fd.shape = &shape;
-		fd.density = 1.0f;
-		fd.friction = 0.0f;
-
-		b2Vec2 p(RandomFloat(), 3.0f + RandomFloat());
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-		bd.position = p;
-		//bd.allowSleep = false;
-		b2Body* body = m_world->CreateBody(&bd);
-
-		body->CreateFixture(&fd);
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_C:
-			CreateCircle();
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		bool sleeping = true;
-		for (b2Body* b = m_world->GetBodyList(); b; b = b->GetNext())
-		{
-			if (b->GetType() != b2_dynamicBody)
-			{
-				continue;
-			}
-
-			if (b->IsAwake())
-			{
-				sleeping = false;
-			}
-		}
-
-		if (m_stepCount == 180)
-		{
-			m_stepCount += 0;
-		}
-
-		//if (sleeping)
-		//{
-		//	CreateCircle();
-		//}
-
-		Test::Step(settings);
-
-		for (b2Body* b = m_world->GetBodyList(); b; b = b->GetNext())
-		{
-			if (b->GetType() != b2_dynamicBody)
-			{
-				continue;
-			}
-
-			b2Vec2 p = b->GetPosition();
-			if (p.x <= -10.0f || 10.0f <= p.x || p.y <= 0.0f || 20.0f <= p.y)
-			{
-				p.x += 0.0f;
-			}
-		}
-
-		DrawString(5, m_textLine, "Press 'c' to create a circle.");
-		
-	}
-
-	static Test* Create()
-	{
-		return new Confined;
-	}
+    enum
+    {
+        e_columnCount = 0,
+        e_rowCount    = 0
+    };
+
+    Confined()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+
+            // Floor
+            shape.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            // Left wall
+            shape.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(-10.0f, 20.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            // Right wall
+            shape.SetTwoSided(b2Vec2(10.0f, 0.0f), b2Vec2(10.0f, 20.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            // Roof
+            shape.SetTwoSided(b2Vec2(-10.0f, 20.0f), b2Vec2(10.0f, 20.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        float radius = 0.5f;
+        b2CircleShape shape;
+        shape.m_p.SetZero();
+        shape.m_radius = radius;
+
+        b2FixtureDef fd;
+        fd.shape    = &shape;
+        fd.density  = 1.0f;
+        fd.friction = 0.1f;
+
+        for (int32 j = 0; j < e_columnCount; ++j)
+        {
+            for (int i = 0; i < e_rowCount; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-10.0f + (2.1f * j + 1.0f + 0.01f * i) * radius, (2.0f * i + 1.0f) * radius);
+                b2Body* body = m_world->CreateBody(&bd);
+
+                body->CreateFixture(&fd);
+            }
+        }
+
+        m_world->SetGravity(b2Vec2(0.0f, 0.0f));
+    }
+
+    void CreateCircle()
+    {
+        float radius = 2.0f;
+        b2CircleShape shape;
+        shape.m_p.SetZero();
+        shape.m_radius = radius;
+
+        b2FixtureDef fd;
+        fd.shape    = &shape;
+        fd.density  = 1.0f;
+        fd.friction = 0.0f;
+
+        b2Vec2 p(RandomFloat(), 3.0f + RandomFloat());
+        b2BodyDef bd;
+        bd.type     = b2_dynamicBody;
+        bd.position = p;
+        // bd.allowSleep = false;
+        b2Body* body = m_world->CreateBody(&bd);
+
+        body->CreateFixture(&fd);
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_C:
+            CreateCircle();
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        bool sleeping = true;
+        for (b2Body* b = m_world->GetBodyList(); b; b = b->GetNext())
+        {
+            if (b->GetType() != b2_dynamicBody)
+            {
+                continue;
+            }
+
+            if (b->IsAwake())
+            {
+                sleeping = false;
+            }
+        }
+
+        if (m_stepCount == 180)
+        {
+            m_stepCount += 0;
+        }
+
+        // if (sleeping)
+        //{
+        //	CreateCircle();
+        // }
+
+        Test::Step(settings);
+
+        for (b2Body* b = m_world->GetBodyList(); b; b = b->GetNext())
+        {
+            if (b->GetType() != b2_dynamicBody)
+            {
+                continue;
+            }
+
+            b2Vec2 p = b->GetPosition();
+            if (p.x <= -10.0f || 10.0f <= p.x || p.y <= 0.0f || 20.0f <= p.y)
+            {
+                p.x += 0.0f;
+            }
+        }
+
+        DrawString(5, m_textLine, "Press 'c' to create a circle.");
+    }
+
+    static Test* Create() { return new Confined; }
 };
 
 static int testIndex = RegisterTest("Solver", "Confined", Confined::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/continuous_test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/continuous_test.cpp
index d8da4e99c1fb..80187d9daaad 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/continuous_test.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/continuous_test.cpp
@@ -25,136 +25,138 @@
 class ContinuousTest : public Test
 {
 public:
+    ContinuousTest()
+    {
+        {
+            b2BodyDef bd;
+            bd.position.Set(0.0f, 0.0f);
+            b2Body* body = m_world->CreateBody(&bd);
 
-	ContinuousTest()
-	{
-		{
-			b2BodyDef bd;
-			bd.position.Set(0.0f, 0.0f);
-			b2Body* body = m_world->CreateBody(&bd);
+            b2EdgeShape edge;
 
-			b2EdgeShape edge;
+            edge.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
+            body->CreateFixture(&edge, 0.0f);
 
-			edge.SetTwoSided(b2Vec2(-10.0f, 0.0f), b2Vec2(10.0f, 0.0f));
-			body->CreateFixture(&edge, 0.0f);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.2f, 1.0f, b2Vec2(0.5f, 1.0f), 0.0f);
-			body->CreateFixture(&shape, 0.0f);
-		}
+            b2PolygonShape shape;
+            shape.SetAsBox(0.2f, 1.0f, b2Vec2(0.5f, 1.0f), 0.0f);
+            body->CreateFixture(&shape, 0.0f);
+        }
 
 #if 1
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 20.0f);
-			//bd.angle = 0.1f;
-
-			b2PolygonShape shape;
-			shape.SetAsBox(2.0f, 0.1f);
-
-			m_body = m_world->CreateBody(&bd);
-			m_body->CreateFixture(&shape, 1.0f);
-
-			m_angularVelocity = RandomFloat(-50.0f, 50.0f);
-			//m_angularVelocity = 46.661274f;
-			m_body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
-			m_body->SetAngularVelocity(m_angularVelocity);
-		}
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 20.0f);
+            // bd.angle = 0.1f;
+
+            b2PolygonShape shape;
+            shape.SetAsBox(2.0f, 0.1f);
+
+            m_body = m_world->CreateBody(&bd);
+            m_body->CreateFixture(&shape, 1.0f);
+
+            m_angularVelocity = RandomFloat(-50.0f, 50.0f);
+            // m_angularVelocity = 46.661274f;
+            m_body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
+            m_body->SetAngularVelocity(m_angularVelocity);
+        }
 #else
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 2.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_p.SetZero();
-			shape.m_radius = 0.5f;
-			body->CreateFixture(&shape, 1.0f);
-
-			bd.bullet = true;
-			bd.position.Set(0.0f, 10.0f);
-			body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 1.0f);
-			body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
-		}
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 2.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_p.SetZero();
+            shape.m_radius = 0.5f;
+            body->CreateFixture(&shape, 1.0f);
+
+            bd.bullet = true;
+            bd.position.Set(0.0f, 10.0f);
+            body = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 1.0f);
+            body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
+        }
 #endif
 
-		extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
-		extern B2_API int32 b2_toiCalls, b2_toiIters;
-		extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
-		extern B2_API float b2_toiTime, b2_toiMaxTime;
-
-		b2_gjkCalls = 0; b2_gjkIters = 0; b2_gjkMaxIters = 0;
-		b2_toiCalls = 0; b2_toiIters = 0;
-		b2_toiRootIters = 0; b2_toiMaxRootIters = 0;
-		b2_toiTime = 0.0f; b2_toiMaxTime = 0.0f;
-	}
-
-	void Launch()
-	{
-		extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
-		extern B2_API int32 b2_toiCalls, b2_toiIters;
-		extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
-		extern B2_API float b2_toiTime, b2_toiMaxTime;
-
-		b2_gjkCalls = 0; b2_gjkIters = 0; b2_gjkMaxIters = 0;
-		b2_toiCalls = 0; b2_toiIters = 0;
-		b2_toiRootIters = 0; b2_toiMaxRootIters = 0;
-		b2_toiTime = 0.0f; b2_toiMaxTime = 0.0f;
-
-		m_body->SetTransform(b2Vec2(0.0f, 20.0f), 0.0f);
-		m_angularVelocity = RandomFloat(-50.0f, 50.0f);
-		m_body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
-		m_body->SetAngularVelocity(m_angularVelocity);
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
-
-		if (b2_gjkCalls > 0)
-		{
-			DrawString(5, m_textLine, "gjk calls = %d, ave gjk iters = %3.1f, max gjk iters = %d",
-				b2_gjkCalls, b2_gjkIters / float(b2_gjkCalls), b2_gjkMaxIters);
-			
-		}
-
-		extern B2_API int32 b2_toiCalls, b2_toiIters;
-		extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
-		extern B2_API float b2_toiTime, b2_toiMaxTime;
-
-		if (b2_toiCalls > 0)
-		{
-			DrawString(5, m_textLine, "toi calls = %d, ave [max] toi iters = %3.1f [%d]",
-								b2_toiCalls, b2_toiIters / float(b2_toiCalls), b2_toiMaxRootIters);
-			
-			
-			DrawString(5, m_textLine, "ave [max] toi root iters = %3.1f [%d]",
-				b2_toiRootIters / float(b2_toiCalls), b2_toiMaxRootIters);
-			
-
-			DrawString(5, m_textLine, "ave [max] toi time = %.1f [%.1f] (microseconds)",
-				1000.0f * b2_toiTime / float(b2_toiCalls), 1000.0f * b2_toiMaxTime);
-			
-		}
-
-		if (m_stepCount % 60 == 0)
-		{
-			Launch();
-		}
-	}
-
-	static Test* Create()
-	{
-		return new ContinuousTest;
-	}
-
-	b2Body* m_body;
-	float m_angularVelocity;
+        extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
+        extern B2_API int32 b2_toiCalls, b2_toiIters;
+        extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
+        extern B2_API float b2_toiTime, b2_toiMaxTime;
+
+        b2_gjkCalls        = 0;
+        b2_gjkIters        = 0;
+        b2_gjkMaxIters     = 0;
+        b2_toiCalls        = 0;
+        b2_toiIters        = 0;
+        b2_toiRootIters    = 0;
+        b2_toiMaxRootIters = 0;
+        b2_toiTime         = 0.0f;
+        b2_toiMaxTime      = 0.0f;
+    }
+
+    void Launch()
+    {
+        extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
+        extern B2_API int32 b2_toiCalls, b2_toiIters;
+        extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
+        extern B2_API float b2_toiTime, b2_toiMaxTime;
+
+        b2_gjkCalls        = 0;
+        b2_gjkIters        = 0;
+        b2_gjkMaxIters     = 0;
+        b2_toiCalls        = 0;
+        b2_toiIters        = 0;
+        b2_toiRootIters    = 0;
+        b2_toiMaxRootIters = 0;
+        b2_toiTime         = 0.0f;
+        b2_toiMaxTime      = 0.0f;
+
+        m_body->SetTransform(b2Vec2(0.0f, 20.0f), 0.0f);
+        m_angularVelocity = RandomFloat(-50.0f, 50.0f);
+        m_body->SetLinearVelocity(b2Vec2(0.0f, -100.0f));
+        m_body->SetAngularVelocity(m_angularVelocity);
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        extern B2_API int32 b2_gjkCalls, b2_gjkIters, b2_gjkMaxIters;
+
+        if (b2_gjkCalls > 0)
+        {
+            DrawString(5, m_textLine, "gjk calls = %d, ave gjk iters = %3.1f, max gjk iters = %d", b2_gjkCalls,
+                       b2_gjkIters / float(b2_gjkCalls), b2_gjkMaxIters);
+        }
+
+        extern B2_API int32 b2_toiCalls, b2_toiIters;
+        extern B2_API int32 b2_toiRootIters, b2_toiMaxRootIters;
+        extern B2_API float b2_toiTime, b2_toiMaxTime;
+
+        if (b2_toiCalls > 0)
+        {
+            DrawString(5, m_textLine, "toi calls = %d, ave [max] toi iters = %3.1f [%d]", b2_toiCalls,
+                       b2_toiIters / float(b2_toiCalls), b2_toiMaxRootIters);
+
+            DrawString(5, m_textLine, "ave [max] toi root iters = %3.1f [%d]", b2_toiRootIters / float(b2_toiCalls),
+                       b2_toiMaxRootIters);
+
+            DrawString(5, m_textLine, "ave [max] toi time = %.1f [%.1f] (microseconds)",
+                       1000.0f * b2_toiTime / float(b2_toiCalls), 1000.0f * b2_toiMaxTime);
+        }
+
+        if (m_stepCount % 60 == 0)
+        {
+            Launch();
+        }
+    }
+
+    static Test* Create() { return new ContinuousTest; }
+
+    b2Body* m_body;
+    float m_angularVelocity;
 };
 
 static int testIndex = RegisterTest("Continuous", "Continuous Test", ContinuousTest::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/convex_hull.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/convex_hull.cpp
index ac047b235eea..44f4da8906e5 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/convex_hull.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/convex_hull.cpp
@@ -25,88 +25,84 @@
 class ConvexHull : public Test
 {
 public:
-	enum
-	{
-		e_count = b2_maxPolygonVertices
-	};
-
-	ConvexHull()
-	{
-		Generate();
-		m_auto = false;
-	}
-
-	void Generate()
-	{
-		b2Vec2 lowerBound(-8.0f, -8.0f);
-		b2Vec2 upperBound(8.0f, 8.0f);
-
-		for (int32 i = 0; i < e_count; ++i)
-		{
-			float x = 10.0f * RandomFloat();
-			float y = 10.0f * RandomFloat();
-
-			// Clamp onto a square to help create collinearities.
-			// This will stress the convex hull algorithm.
-			b2Vec2 v(x, y);
-			v = b2Clamp(v, lowerBound, upperBound);
-			m_points[i] = v;
-		}
-
-		m_count = e_count;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_auto = !m_auto;
-			break;
-
-		case GLFW_KEY_G:
-			Generate();
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		b2PolygonShape shape;
-		shape.Set(m_points, m_count);
-
-		DrawString(5, m_textLine, "Press g to generate a new random convex hull");
-		
-
-		g_debugDraw.DrawPolygon(shape.m_vertices, shape.m_count, b2Color(0.9f, 0.9f, 0.9f));
-
-		for (int32 i = 0; i < m_count; ++i)
-		{
-			g_debugDraw.DrawPoint(m_points[i], 3.0f, b2Color(0.3f, 0.9f, 0.3f));
-			DrawString(m_points[i] + b2Vec2(0.05f, 0.05f), "%d", i);
-		}
-
-		if (shape.Validate() == false)
-		{
-			m_textLine += 0;
-		}
-
-		if (m_auto)
-		{
-			Generate();
-		}
-	}
-
-	static Test* Create()
-	{
-		return new ConvexHull;
-	}
-
-	b2Vec2 m_points[b2_maxPolygonVertices];
-	int32 m_count;
-	bool m_auto;
+    enum
+    {
+        e_count = b2_maxPolygonVertices
+    };
+
+    ConvexHull()
+    {
+        Generate();
+        m_auto = false;
+    }
+
+    void Generate()
+    {
+        b2Vec2 lowerBound(-8.0f, -8.0f);
+        b2Vec2 upperBound(8.0f, 8.0f);
+
+        for (int32 i = 0; i < e_count; ++i)
+        {
+            float x = 10.0f * RandomFloat();
+            float y = 10.0f * RandomFloat();
+
+            // Clamp onto a square to help create collinearities.
+            // This will stress the convex hull algorithm.
+            b2Vec2 v(x, y);
+            v           = b2Clamp(v, lowerBound, upperBound);
+            m_points[i] = v;
+        }
+
+        m_count = e_count;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_auto = !m_auto;
+            break;
+
+        case GLFW_KEY_G:
+            Generate();
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        b2PolygonShape shape;
+        shape.Set(m_points, m_count);
+
+        DrawString(5, m_textLine, "Press g to generate a new random convex hull");
+
+        g_debugDraw.DrawPolygon(shape.m_vertices, shape.m_count, b2Color(0.9f, 0.9f, 0.9f));
+
+        for (int32 i = 0; i < m_count; ++i)
+        {
+            g_debugDraw.DrawPoint(m_points[i], 3.0f, b2Color(0.3f, 0.9f, 0.3f));
+            DrawString(m_points[i] + b2Vec2(0.05f, 0.05f), "%d", i);
+        }
+
+        if (shape.Validate() == false)
+        {
+            m_textLine += 0;
+        }
+
+        if (m_auto)
+        {
+            Generate();
+        }
+    }
+
+    static Test* Create() { return new ConvexHull; }
+
+    b2Vec2 m_points[b2_maxPolygonVertices];
+    int32 m_count;
+    bool m_auto;
 };
 
 static int testIndex = RegisterTest("Geometry", "Convex Hull", ConvexHull::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/conveyor_belt.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/conveyor_belt.cpp
index 41d4f2c61c5a..967ff5826369 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/conveyor_belt.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/conveyor_belt.cpp
@@ -25,77 +25,70 @@
 class ConveyorBelt : public Test
 {
 public:
-
-	ConveyorBelt()
-	{
-		// Ground
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Platform
-		{
-			b2BodyDef bd;
-			bd.position.Set(-5.0f, 5.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(10.0f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.friction = 0.8f;
-			m_platform = body->CreateFixture(&fd);
-		}
-
-		// Boxes
-		for (int32 i = 0; i < 5; ++i)
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-10.0f + 2.0f * i, 7.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-			body->CreateFixture(&shape, 20.0f);
-		}
-	}
-
-	void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override
-	{
-		Test::PreSolve(contact, oldManifold);
-
-		b2Fixture* fixtureA = contact->GetFixtureA();
-		b2Fixture* fixtureB = contact->GetFixtureB();
-
-		if (fixtureA == m_platform)
-		{
-			contact->SetTangentSpeed(5.0f);
-		}
-
-		if (fixtureB == m_platform)
-		{
-			contact->SetTangentSpeed(-5.0f);
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new ConveyorBelt;
-	}
-
-	b2Fixture* m_platform;
+    ConveyorBelt()
+    {
+        // Ground
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Platform
+        {
+            b2BodyDef bd;
+            bd.position.Set(-5.0f, 5.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(10.0f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.friction = 0.8f;
+            m_platform  = body->CreateFixture(&fd);
+        }
+
+        // Boxes
+        for (int32 i = 0; i < 5; ++i)
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-10.0f + 2.0f * i, 7.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+            body->CreateFixture(&shape, 20.0f);
+        }
+    }
+
+    void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override
+    {
+        Test::PreSolve(contact, oldManifold);
+
+        b2Fixture* fixtureA = contact->GetFixtureA();
+        b2Fixture* fixtureB = contact->GetFixtureB();
+
+        if (fixtureA == m_platform)
+        {
+            contact->SetTangentSpeed(5.0f);
+        }
+
+        if (fixtureB == m_platform)
+        {
+            contact->SetTangentSpeed(-5.0f);
+        }
+    }
+
+    void Step(Settings& settings) override { Test::Step(settings); }
+
+    static Test* Create() { return new ConveyorBelt; }
+
+    b2Fixture* m_platform;
 };
 
 static int testIndex = RegisterTest("Examples", "Conveyor Belt", ConveyorBelt::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_joint.cpp
index 455a600bf216..087b6fcad1d7 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_joint.cpp
@@ -27,97 +27,94 @@
 class DistanceJoint : public Test
 {
 public:
-	DistanceJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.angularDamping = 0.1f;
-
-			bd.position.Set(0.0f, 5.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-			body->CreateFixture(&shape, 5.0f);
-
-			m_hertz = 1.0f;
-			m_dampingRatio = 0.7f;
-
-			b2DistanceJointDef jd;
-			jd.Initialize(ground, body, b2Vec2(0.0f, 15.0f), bd.position);
-			jd.collideConnected = true;
-			m_length = jd.length;
-			m_minLength = m_length;
-			m_maxLength = m_length;
-			b2LinearStiffness(jd.stiffness, jd.damping, m_hertz, m_dampingRatio, jd.bodyA, jd.bodyB);
-			m_joint = (b2DistanceJoint*)m_world->CreateJoint(&jd);
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(260.0f, 150.0f));
-		ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::SliderFloat("Length", &m_length, 0.0f, 20.0f, "%.0f"))
-		{
-			m_length = m_joint->SetLength(m_length);
-		}
-
-		if (ImGui::SliderFloat("Min Length", &m_minLength, 0.0f, 20.0f, "%.0f"))
-		{
-			m_minLength = m_joint->SetMinLength(m_minLength);
-		}
-
-		if (ImGui::SliderFloat("Max Length", &m_maxLength, 0.0f, 20.0f, "%.0f"))
-		{
-			m_maxLength = m_joint->SetMaxLength(m_maxLength);
-		}
-
-		if (ImGui::SliderFloat("Hertz", &m_hertz, 0.0f, 10.0f, "%.1f"))
-		{
-			float stiffness;
-			float damping;
-			b2LinearStiffness(stiffness, damping, m_hertz, m_dampingRatio, m_joint->GetBodyA(), m_joint->GetBodyB());
-			m_joint->SetStiffness(stiffness);
-			m_joint->SetDamping(damping);
-		}
-
-		if (ImGui::SliderFloat("Damping Ratio", &m_dampingRatio, 0.0f, 2.0f, "%.1f"))
-		{
-			float stiffness;
-			float damping;
-			b2LinearStiffness(stiffness, damping, m_hertz, m_dampingRatio, m_joint->GetBodyA(), m_joint->GetBodyB());
-			m_joint->SetStiffness(stiffness);
-			m_joint->SetDamping(damping);
-		}
-
-		ImGui::End();
-	}
-
-	static Test* Create()
-	{
-		return new DistanceJoint;
-	}
-
-	b2DistanceJoint* m_joint;
-	float m_length;
-	float m_minLength;
-	float m_maxLength;
-	float m_hertz;
-	float m_dampingRatio;
+    DistanceJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type           = b2_dynamicBody;
+            bd.angularDamping = 0.1f;
+
+            bd.position.Set(0.0f, 5.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+            body->CreateFixture(&shape, 5.0f);
+
+            m_hertz        = 1.0f;
+            m_dampingRatio = 0.7f;
+
+            b2DistanceJointDef jd;
+            jd.Initialize(ground, body, b2Vec2(0.0f, 15.0f), bd.position);
+            jd.collideConnected = true;
+            m_length            = jd.length;
+            m_minLength         = m_length;
+            m_maxLength         = m_length;
+            b2LinearStiffness(jd.stiffness, jd.damping, m_hertz, m_dampingRatio, jd.bodyA, jd.bodyB);
+            m_joint = (b2DistanceJoint*)m_world->CreateJoint(&jd);
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(260.0f, 150.0f));
+        ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::SliderFloat("Length", &m_length, 0.0f, 20.0f, "%.0f"))
+        {
+            m_length = m_joint->SetLength(m_length);
+        }
+
+        if (ImGui::SliderFloat("Min Length", &m_minLength, 0.0f, 20.0f, "%.0f"))
+        {
+            m_minLength = m_joint->SetMinLength(m_minLength);
+        }
+
+        if (ImGui::SliderFloat("Max Length", &m_maxLength, 0.0f, 20.0f, "%.0f"))
+        {
+            m_maxLength = m_joint->SetMaxLength(m_maxLength);
+        }
+
+        if (ImGui::SliderFloat("Hertz", &m_hertz, 0.0f, 10.0f, "%.1f"))
+        {
+            float stiffness;
+            float damping;
+            b2LinearStiffness(stiffness, damping, m_hertz, m_dampingRatio, m_joint->GetBodyA(), m_joint->GetBodyB());
+            m_joint->SetStiffness(stiffness);
+            m_joint->SetDamping(damping);
+        }
+
+        if (ImGui::SliderFloat("Damping Ratio", &m_dampingRatio, 0.0f, 2.0f, "%.1f"))
+        {
+            float stiffness;
+            float damping;
+            b2LinearStiffness(stiffness, damping, m_hertz, m_dampingRatio, m_joint->GetBodyA(), m_joint->GetBodyB());
+            m_joint->SetStiffness(stiffness);
+            m_joint->SetDamping(damping);
+        }
+
+        ImGui::End();
+    }
+
+    static Test* Create() { return new DistanceJoint; }
+
+    b2DistanceJoint* m_joint;
+    float m_length;
+    float m_minLength;
+    float m_maxLength;
+    float m_hertz;
+    float m_dampingRatio;
 };
 
 static int testIndex = RegisterTest("Joints", "Distance Joint", DistanceJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_test.cpp
index 0f970de658af..6372330426b0 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_test.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/distance_test.cpp
@@ -26,114 +26,109 @@
 class DistanceTest : public Test
 {
 public:
-	DistanceTest()
-	{
-		{
-			m_transformA.SetIdentity();
-			m_transformA.p.Set(0.0f, -0.2f);
-			m_polygonA.SetAsBox(10.0f, 0.2f);
-		}
-
-		{
-			m_positionB.Set(12.017401f, 0.13678508f);
-			m_angleB = -0.0109265f;
-			m_transformB.Set(m_positionB, m_angleB);
-
-			m_polygonB.SetAsBox(2.0f, 0.1f);
-		}
-	}
-
-	static Test* Create()
-	{
-		return new DistanceTest;
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		b2DistanceInput input;
-		input.proxyA.Set(&m_polygonA, 0);
-		input.proxyB.Set(&m_polygonB, 0);
-		input.transformA = m_transformA;
-		input.transformB = m_transformB;
-		input.useRadii = true;
-		b2SimplexCache cache;
-		cache.count = 0;
-		b2DistanceOutput output;
-		b2Distance(&output, &cache, &input);
-
-		DrawString(5, m_textLine, "distance = %g", output.distance);
-		
-
-		DrawString(5, m_textLine, "iterations = %d", output.iterations);
-		
-
-		{
-			b2Color color(0.9f, 0.9f, 0.9f);
-			b2Vec2 v[b2_maxPolygonVertices];
-			for (int32 i = 0; i < m_polygonA.m_count; ++i)
-			{
-				v[i] = b2Mul(m_transformA, m_polygonA.m_vertices[i]);
-			}
-			g_debugDraw.DrawPolygon(v, m_polygonA.m_count, color);
-
-			for (int32 i = 0; i < m_polygonB.m_count; ++i)
-			{
-				v[i] = b2Mul(m_transformB, m_polygonB.m_vertices[i]);
-			}
-			g_debugDraw.DrawPolygon(v, m_polygonB.m_count, color);
-		}
-
-		b2Vec2 x1 = output.pointA;
-		b2Vec2 x2 = output.pointB;
-
-		b2Color c1(1.0f, 0.0f, 0.0f);
-		g_debugDraw.DrawPoint(x1, 4.0f, c1);
-
-		b2Color c2(1.0f, 1.0f, 0.0f);
-		g_debugDraw.DrawPoint(x2, 4.0f, c2);
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_positionB.x -= 0.1f;
-			break;
-
-		case GLFW_KEY_D:
-			m_positionB.x += 0.1f;
-			break;
-
-		case GLFW_KEY_S:
-			m_positionB.y -= 0.1f;
-			break;
-
-		case GLFW_KEY_W:
-			m_positionB.y += 0.1f;
-			break;
-
-		case GLFW_KEY_Q:
-			m_angleB += 0.1f * b2_pi;
-			break;
-
-		case GLFW_KEY_E:
-			m_angleB -= 0.1f * b2_pi;
-			break;
-		}
-
-		m_transformB.Set(m_positionB, m_angleB);
-	}
-
-	b2Vec2 m_positionB;
-	float m_angleB;
-
-	b2Transform m_transformA;
-	b2Transform m_transformB;
-	b2PolygonShape m_polygonA;
-	b2PolygonShape m_polygonB;
+    DistanceTest()
+    {
+        {
+            m_transformA.SetIdentity();
+            m_transformA.p.Set(0.0f, -0.2f);
+            m_polygonA.SetAsBox(10.0f, 0.2f);
+        }
+
+        {
+            m_positionB.Set(12.017401f, 0.13678508f);
+            m_angleB = -0.0109265f;
+            m_transformB.Set(m_positionB, m_angleB);
+
+            m_polygonB.SetAsBox(2.0f, 0.1f);
+        }
+    }
+
+    static Test* Create() { return new DistanceTest; }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        b2DistanceInput input;
+        input.proxyA.Set(&m_polygonA, 0);
+        input.proxyB.Set(&m_polygonB, 0);
+        input.transformA = m_transformA;
+        input.transformB = m_transformB;
+        input.useRadii   = true;
+        b2SimplexCache cache;
+        cache.count = 0;
+        b2DistanceOutput output;
+        b2Distance(&output, &cache, &input);
+
+        DrawString(5, m_textLine, "distance = %g", output.distance);
+
+        DrawString(5, m_textLine, "iterations = %d", output.iterations);
+
+        {
+            b2Color color(0.9f, 0.9f, 0.9f);
+            b2Vec2 v[b2_maxPolygonVertices];
+            for (int32 i = 0; i < m_polygonA.m_count; ++i)
+            {
+                v[i] = b2Mul(m_transformA, m_polygonA.m_vertices[i]);
+            }
+            g_debugDraw.DrawPolygon(v, m_polygonA.m_count, color);
+
+            for (int32 i = 0; i < m_polygonB.m_count; ++i)
+            {
+                v[i] = b2Mul(m_transformB, m_polygonB.m_vertices[i]);
+            }
+            g_debugDraw.DrawPolygon(v, m_polygonB.m_count, color);
+        }
+
+        b2Vec2 x1 = output.pointA;
+        b2Vec2 x2 = output.pointB;
+
+        b2Color c1(1.0f, 0.0f, 0.0f);
+        g_debugDraw.DrawPoint(x1, 4.0f, c1);
+
+        b2Color c2(1.0f, 1.0f, 0.0f);
+        g_debugDraw.DrawPoint(x2, 4.0f, c2);
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_positionB.x -= 0.1f;
+            break;
+
+        case GLFW_KEY_D:
+            m_positionB.x += 0.1f;
+            break;
+
+        case GLFW_KEY_S:
+            m_positionB.y -= 0.1f;
+            break;
+
+        case GLFW_KEY_W:
+            m_positionB.y += 0.1f;
+            break;
+
+        case GLFW_KEY_Q:
+            m_angleB += 0.1f * b2_pi;
+            break;
+
+        case GLFW_KEY_E:
+            m_angleB -= 0.1f * b2_pi;
+            break;
+        }
+
+        m_transformB.Set(m_positionB, m_angleB);
+    }
+
+    b2Vec2 m_positionB;
+    float m_angleB;
+
+    b2Transform m_transformA;
+    b2Transform m_transformB;
+    b2PolygonShape m_polygonA;
+    b2PolygonShape m_polygonB;
 };
 
 static int testIndex = RegisterTest("Geometry", "Distance Test", DistanceTest::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/dominos.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/dominos.cpp
index 739876bf55fd..f64a141bd407 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/dominos.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/dominos.cpp
@@ -25,196 +25,192 @@
 class Dominos : public Test
 {
 public:
-
-	Dominos()
-	{
-		b2Body* b1;
-		{
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-
-			b2BodyDef bd;
-			b1 = m_world->CreateBody(&bd);
-			b1->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(6.0f, 0.25f);
-
-			b2BodyDef bd;
-			bd.position.Set(-1.5f, 10.0f);
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.1f, 1.0f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			fd.friction = 0.1f;
-
-			for (int i = 0; i < 10; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-6.0f + 1.0f * i, 11.25f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&fd);
-			}
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(7.0f, 0.25f, b2Vec2_zero, 0.3f);
-
-			b2BodyDef bd;
-			bd.position.Set(1.0f, 6.0f);
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		b2Body* b2;
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 1.5f);
-
-			b2BodyDef bd;
-			bd.position.Set(-7.0f, 4.0f);
-			b2 = m_world->CreateBody(&bd);
-			b2->CreateFixture(&shape, 0.0f);
-		}
-
-		b2Body* b3;
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(6.0f, 0.125f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-0.9f, 1.0f);
-			bd.angle = -0.15f;
-
-			b3 = m_world->CreateBody(&bd);
-			b3->CreateFixture(&shape, 10.0f);
-		}
-
-		b2RevoluteJointDef jd;
-		b2Vec2 anchor;
-
-		anchor.Set(-2.0f, 1.0f);
-		jd.Initialize(b1, b3, anchor);
-		jd.collideConnected = true;
-		m_world->CreateJoint(&jd);
-
-		b2Body* b4;
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 0.25f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-10.0f, 15.0f);
-			b4 = m_world->CreateBody(&bd);
-			b4->CreateFixture(&shape, 10.0f);
-		}
-
-		anchor.Set(-7.0f, 15.0f);
-		jd.Initialize(b2, b4, anchor);
-		m_world->CreateJoint(&jd);
-
-		b2Body* b5;
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(6.5f, 3.0f);
-			b5 = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			b2FixtureDef fd;
-
-			fd.shape = &shape;
-			fd.density = 10.0f;
-			fd.friction = 0.1f;
-
-			shape.SetAsBox(1.0f, 0.1f, b2Vec2(0.0f, -0.9f), 0.0f);
-			b5->CreateFixture(&fd);
-
-			shape.SetAsBox(0.1f, 1.0f, b2Vec2(-0.9f, 0.0f), 0.0f);
-			b5->CreateFixture(&fd);
-
-			shape.SetAsBox(0.1f, 1.0f, b2Vec2(0.9f, 0.0f), 0.0f);
-			b5->CreateFixture(&fd);
-		}
-
-		anchor.Set(6.0f, 2.0f);
-		jd.Initialize(b1, b5, anchor);
-		m_world->CreateJoint(&jd);
-
-		b2Body* b6;
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(1.0f, 0.1f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(6.5f, 4.1f);
-			b6 = m_world->CreateBody(&bd);
-			b6->CreateFixture(&shape, 30.0f);
-		}
-
-		anchor.Set(7.5f, 4.0f);
-		jd.Initialize(b5, b6, anchor);
-		m_world->CreateJoint(&jd);
-
-		b2Body* b7;
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.1f, 1.0f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(7.4f, 1.0f);
-
-			b7 = m_world->CreateBody(&bd);
-			b7->CreateFixture(&shape, 10.0f);
-		}
-
-		b2DistanceJointDef djd;
-		djd.bodyA = b3;
-		djd.bodyB = b7;
-		djd.localAnchorA.Set(6.0f, 0.0f);
-		djd.localAnchorB.Set(0.0f, -1.0f);
-		b2Vec2 d = djd.bodyB->GetWorldPoint(djd.localAnchorB) - djd.bodyA->GetWorldPoint(djd.localAnchorA);
-		djd.length = d.Length();
-
-		b2LinearStiffness(djd.stiffness, djd.damping, 1.0f, 1.0f, djd.bodyA, djd.bodyB);
-		m_world->CreateJoint(&djd);
-
-		{
-			float radius = 0.2f;
-
-			b2CircleShape shape;
-			shape.m_radius = radius;
-
-			for (int32 i = 0; i < 4; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(5.9f + 2.0f * radius * i, 2.4f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 10.0f);
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Dominos;
-	}
+    Dominos()
+    {
+        b2Body* b1;
+        {
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+
+            b2BodyDef bd;
+            b1 = m_world->CreateBody(&bd);
+            b1->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(6.0f, 0.25f);
+
+            b2BodyDef bd;
+            bd.position.Set(-1.5f, 10.0f);
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.1f, 1.0f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 20.0f;
+            fd.friction = 0.1f;
+
+            for (int i = 0; i < 10; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-6.0f + 1.0f * i, 11.25f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&fd);
+            }
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(7.0f, 0.25f, b2Vec2_zero, 0.3f);
+
+            b2BodyDef bd;
+            bd.position.Set(1.0f, 6.0f);
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        b2Body* b2;
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 1.5f);
+
+            b2BodyDef bd;
+            bd.position.Set(-7.0f, 4.0f);
+            b2 = m_world->CreateBody(&bd);
+            b2->CreateFixture(&shape, 0.0f);
+        }
+
+        b2Body* b3;
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(6.0f, 0.125f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-0.9f, 1.0f);
+            bd.angle = -0.15f;
+
+            b3 = m_world->CreateBody(&bd);
+            b3->CreateFixture(&shape, 10.0f);
+        }
+
+        b2RevoluteJointDef jd;
+        b2Vec2 anchor;
+
+        anchor.Set(-2.0f, 1.0f);
+        jd.Initialize(b1, b3, anchor);
+        jd.collideConnected = true;
+        m_world->CreateJoint(&jd);
+
+        b2Body* b4;
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 0.25f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-10.0f, 15.0f);
+            b4 = m_world->CreateBody(&bd);
+            b4->CreateFixture(&shape, 10.0f);
+        }
+
+        anchor.Set(-7.0f, 15.0f);
+        jd.Initialize(b2, b4, anchor);
+        m_world->CreateJoint(&jd);
+
+        b2Body* b5;
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(6.5f, 3.0f);
+            b5 = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            b2FixtureDef fd;
+
+            fd.shape    = &shape;
+            fd.density  = 10.0f;
+            fd.friction = 0.1f;
+
+            shape.SetAsBox(1.0f, 0.1f, b2Vec2(0.0f, -0.9f), 0.0f);
+            b5->CreateFixture(&fd);
+
+            shape.SetAsBox(0.1f, 1.0f, b2Vec2(-0.9f, 0.0f), 0.0f);
+            b5->CreateFixture(&fd);
+
+            shape.SetAsBox(0.1f, 1.0f, b2Vec2(0.9f, 0.0f), 0.0f);
+            b5->CreateFixture(&fd);
+        }
+
+        anchor.Set(6.0f, 2.0f);
+        jd.Initialize(b1, b5, anchor);
+        m_world->CreateJoint(&jd);
+
+        b2Body* b6;
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(1.0f, 0.1f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(6.5f, 4.1f);
+            b6 = m_world->CreateBody(&bd);
+            b6->CreateFixture(&shape, 30.0f);
+        }
+
+        anchor.Set(7.5f, 4.0f);
+        jd.Initialize(b5, b6, anchor);
+        m_world->CreateJoint(&jd);
+
+        b2Body* b7;
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.1f, 1.0f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(7.4f, 1.0f);
+
+            b7 = m_world->CreateBody(&bd);
+            b7->CreateFixture(&shape, 10.0f);
+        }
+
+        b2DistanceJointDef djd;
+        djd.bodyA = b3;
+        djd.bodyB = b7;
+        djd.localAnchorA.Set(6.0f, 0.0f);
+        djd.localAnchorB.Set(0.0f, -1.0f);
+        b2Vec2 d   = djd.bodyB->GetWorldPoint(djd.localAnchorB) - djd.bodyA->GetWorldPoint(djd.localAnchorA);
+        djd.length = d.Length();
+
+        b2LinearStiffness(djd.stiffness, djd.damping, 1.0f, 1.0f, djd.bodyA, djd.bodyB);
+        m_world->CreateJoint(&djd);
+
+        {
+            float radius = 0.2f;
+
+            b2CircleShape shape;
+            shape.m_radius = radius;
+
+            for (int32 i = 0; i < 4; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(5.9f + 2.0f * radius * i, 2.4f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 10.0f);
+            }
+        }
+    }
+
+    static Test* Create() { return new Dominos; }
 };
 
 static int testIndex = RegisterTest("Examples", "Dominos", Dominos::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/dump_loader.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/dump_loader.cpp
index 3225113b517d..74e0984b076f 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/dump_loader.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/dump_loader.cpp
@@ -26,63 +26,58 @@
 class DumpLoader : public Test
 {
 public:
+    DumpLoader()
+    {
+        b2ChainShape chainShape;
+        b2Vec2 vertices[] = {b2Vec2(-5, 0), b2Vec2(5, 0), b2Vec2(5, 5), b2Vec2(4, 1), b2Vec2(-4, 1), b2Vec2(-5, 5)};
+        chainShape.CreateLoop(vertices, 6);
 
-	DumpLoader()
-	{
-		b2ChainShape chainShape;
-		b2Vec2 vertices[] = {b2Vec2(-5,0), b2Vec2(5,0), b2Vec2(5,5), b2Vec2(4,1), b2Vec2(-4,1), b2Vec2(-5,5)};
-		chainShape.CreateLoop(vertices, 6);
+        b2FixtureDef groundFixtureDef;
+        groundFixtureDef.density = 0;
+        groundFixtureDef.shape   = &chainShape;
 
-		b2FixtureDef groundFixtureDef;
-		groundFixtureDef.density = 0;
-		groundFixtureDef.shape = &chainShape;
+        b2BodyDef groundBodyDef;
+        groundBodyDef.type = b2_staticBody;
 
-		b2BodyDef groundBodyDef;
-		groundBodyDef.type = b2_staticBody;
+        b2Body* groundBody           = m_world->CreateBody(&groundBodyDef);
+        b2Fixture* groundBodyFixture = groundBody->CreateFixture(&groundFixtureDef);
 
-		b2Body *groundBody = m_world->CreateBody(&groundBodyDef);
-		b2Fixture *groundBodyFixture = groundBody->CreateFixture(&groundFixtureDef);
+        b2CircleShape ballShape;
+        ballShape.m_radius = 1;
 
-		b2CircleShape ballShape;
-		ballShape.m_radius = 1;
+        b2FixtureDef ballFixtureDef;
+        ballFixtureDef.restitution = 0.75f;
+        ballFixtureDef.density     = 1;
+        ballFixtureDef.shape       = &ballShape;
 
-		b2FixtureDef ballFixtureDef;
-		ballFixtureDef.restitution = 0.75f;
-		ballFixtureDef.density = 1;
-		ballFixtureDef.shape = &ballShape;
+        b2BodyDef ballBodyDef;
+        ballBodyDef.type     = b2BodyType::b2_dynamicBody;
+        ballBodyDef.position = b2Vec2(0, 10);
+        // ballBodyDef.angularDamping = 0.2f;
 
-		b2BodyDef ballBodyDef;
-		ballBodyDef.type = b2BodyType::b2_dynamicBody;
-		ballBodyDef.position = b2Vec2(0, 10);
-		// ballBodyDef.angularDamping = 0.2f;
+        m_ball                 = m_world->CreateBody(&ballBodyDef);
+        b2Fixture* ballFixture = m_ball->CreateFixture(&ballFixtureDef);
+        m_ball->ApplyForceToCenter(b2Vec2(-1000, -400), true);
+    }
 
-		m_ball = m_world->CreateBody(&ballBodyDef);
-		b2Fixture *ballFixture = m_ball->CreateFixture(&ballFixtureDef);
-		m_ball->ApplyForceToCenter(b2Vec2(-1000, -400), true);
-	}
+    void Step(Settings& settings) override
+    {
+        b2Vec2 v    = m_ball->GetLinearVelocity();
+        float omega = m_ball->GetAngularVelocity();
 
-	void Step(Settings& settings) override
-	{
-		b2Vec2 v = m_ball->GetLinearVelocity();
-		float omega = m_ball->GetAngularVelocity();
+        b2MassData massData;
+        m_ball->GetMassData(&massData);
 
-		b2MassData massData;
-		m_ball->GetMassData(&massData);
+        float ke = 0.5f * massData.mass * b2Dot(v, v) + 0.5f * massData.I * omega * omega;
 
-		float ke = 0.5f * massData.mass * b2Dot(v, v) + 0.5f * massData.I * omega * omega;
+        DrawString(5, m_textLine, "kinetic energy = %.6f", ke);
 
-		DrawString(5, m_textLine, "kinetic energy = %.6f", ke);
-		
+        Test::Step(settings);
+    }
 
-		Test::Step(settings);
-	}
+    static Test* Create() { return new DumpLoader; }
 
-	static Test* Create()
-	{
-		return new DumpLoader;
-	}
-
-	b2Body* m_ball;
+    b2Body* m_ball;
 };
 
 static int testIndex = RegisterTest("Bugs", "Dump Loader", DumpLoader::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/dynamic_tree.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/dynamic_tree.cpp
index 4efcf56903bb..bd2de4d80a0f 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/dynamic_tree.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/dynamic_tree.cpp
@@ -25,336 +25,333 @@
 class DynamicTree : public Test
 {
 public:
-
-	enum
-	{
-		e_actorCount = 128
-	};
-
-	DynamicTree()
-	{
-		m_worldExtent = 15.0f;
-		m_proxyExtent = 0.5f;
-
-		srand(888);
-
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			Actor* actor = m_actors + i;
-			GetRandomAABB(&actor->aabb);
-			actor->proxyId = m_tree.CreateProxy(actor->aabb, actor);
-		}
-
-		m_stepCount = 0;
-
-		float h = m_worldExtent;
-		m_queryAABB.lowerBound.Set(-3.0f, -4.0f + h);
-		m_queryAABB.upperBound.Set(5.0f, 6.0f + h);
-
-		m_rayCastInput.p1.Set(-5.0, 5.0f + h);
-		m_rayCastInput.p2.Set(7.0f, -4.0f + h);
-		//m_rayCastInput.p1.Set(0.0f, 2.0f + h);
-		//m_rayCastInput.p2.Set(0.0f, -2.0f + h);
-		m_rayCastInput.maxFraction = 1.0f;
-
-		m_automated = false;
-	}
-
-	static Test* Create()
-	{
-		return new DynamicTree;
-	}
-
-	void Step(Settings& settings) override
-	{
-		B2_NOT_USED(settings);
-
-		m_rayActor = NULL;
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			m_actors[i].fraction = 1.0f;
-			m_actors[i].overlap = false;
-		}
-
-		if (m_automated == true)
-		{
-			int32 actionCount = b2Max(1, e_actorCount >> 2);
-
-			for (int32 i = 0; i < actionCount; ++i)
-			{
-				Action();
-			}
-		}
-
-		Query();
-		RayCast();
-
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			Actor* actor = m_actors + i;
-			if (actor->proxyId == b2_nullNode)
-				continue;
-
-			b2Color c(0.9f, 0.9f, 0.9f);
-			if (actor == m_rayActor && actor->overlap)
-			{
-				c.Set(0.9f, 0.6f, 0.6f);
-			}
-			else if (actor == m_rayActor)
-			{
-				c.Set(0.6f, 0.9f, 0.6f);
-			}
-			else if (actor->overlap)
-			{
-				c.Set(0.6f, 0.6f, 0.9f);
-			}
-
-			DrawAABB(&actor->aabb, c);
-		}
-
-		b2Color c(0.7f, 0.7f, 0.7f);
-		DrawAABB(&m_queryAABB, c);
-
-		g_debugDraw.DrawSegment(m_rayCastInput.p1, m_rayCastInput.p2, c);
-
-		b2Color c1(0.2f, 0.9f, 0.2f);
-		b2Color c2(0.9f, 0.2f, 0.2f);
-		g_debugDraw.DrawPoint(m_rayCastInput.p1, 6.0f, c1);
-		g_debugDraw.DrawPoint(m_rayCastInput.p2, 6.0f, c2);
-
-		if (m_rayActor)
-		{
-			b2Color cr(0.2f, 0.2f, 0.9f);
-			b2Vec2 p = m_rayCastInput.p1 + m_rayActor->fraction * (m_rayCastInput.p2 - m_rayCastInput.p1);
-			g_debugDraw.DrawPoint(p, 6.0f, cr);
-		}
-
-		{
-			int32 height = m_tree.GetHeight();
-			DrawString(5, m_textLine, "dynamic tree height = %d", height);
-			
-		}
-
-		++m_stepCount;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_automated = !m_automated;
-			break;
-
-		case GLFW_KEY_C:
-			CreateProxy();
-			break;
-
-		case GLFW_KEY_D:
-			DestroyProxy();
-			break;
-
-		case GLFW_KEY_M:
-			MoveProxy();
-			break;
-		}
-	}
-
-	bool QueryCallback(int32 proxyId)
-	{
-		Actor* actor = (Actor*)m_tree.GetUserData(proxyId);
-		actor->overlap = b2TestOverlap(m_queryAABB, actor->aabb);
-		return true;
-	}
-
-	float RayCastCallback(const b2RayCastInput& input, int32 proxyId)
-	{
-		Actor* actor = (Actor*)m_tree.GetUserData(proxyId);
-
-		b2RayCastOutput output;
-		bool hit = actor->aabb.RayCast(&output, input);
-
-		if (hit)
-		{
-			m_rayCastOutput = output;
-			m_rayActor = actor;
-			m_rayActor->fraction = output.fraction;
-			return output.fraction;
-		}
-
-		return input.maxFraction;
-	}
+    enum
+    {
+        e_actorCount = 128
+    };
+
+    DynamicTree()
+    {
+        m_worldExtent = 15.0f;
+        m_proxyExtent = 0.5f;
+
+        srand(888);
+
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            Actor* actor = m_actors + i;
+            GetRandomAABB(&actor->aabb);
+            actor->proxyId = m_tree.CreateProxy(actor->aabb, actor);
+        }
+
+        m_stepCount = 0;
+
+        float h = m_worldExtent;
+        m_queryAABB.lowerBound.Set(-3.0f, -4.0f + h);
+        m_queryAABB.upperBound.Set(5.0f, 6.0f + h);
+
+        m_rayCastInput.p1.Set(-5.0, 5.0f + h);
+        m_rayCastInput.p2.Set(7.0f, -4.0f + h);
+        // m_rayCastInput.p1.Set(0.0f, 2.0f + h);
+        // m_rayCastInput.p2.Set(0.0f, -2.0f + h);
+        m_rayCastInput.maxFraction = 1.0f;
+
+        m_automated = false;
+    }
+
+    static Test* Create() { return new DynamicTree; }
+
+    void Step(Settings& settings) override
+    {
+        B2_NOT_USED(settings);
+
+        m_rayActor = NULL;
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            m_actors[i].fraction = 1.0f;
+            m_actors[i].overlap  = false;
+        }
+
+        if (m_automated == true)
+        {
+            int32 actionCount = b2Max(1, e_actorCount >> 2);
+
+            for (int32 i = 0; i < actionCount; ++i)
+            {
+                Action();
+            }
+        }
+
+        Query();
+        RayCast();
+
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            Actor* actor = m_actors + i;
+            if (actor->proxyId == b2_nullNode)
+                continue;
+
+            b2Color c(0.9f, 0.9f, 0.9f);
+            if (actor == m_rayActor && actor->overlap)
+            {
+                c.Set(0.9f, 0.6f, 0.6f);
+            }
+            else if (actor == m_rayActor)
+            {
+                c.Set(0.6f, 0.9f, 0.6f);
+            }
+            else if (actor->overlap)
+            {
+                c.Set(0.6f, 0.6f, 0.9f);
+            }
+
+            DrawAABB(&actor->aabb, c);
+        }
+
+        b2Color c(0.7f, 0.7f, 0.7f);
+        DrawAABB(&m_queryAABB, c);
+
+        g_debugDraw.DrawSegment(m_rayCastInput.p1, m_rayCastInput.p2, c);
+
+        b2Color c1(0.2f, 0.9f, 0.2f);
+        b2Color c2(0.9f, 0.2f, 0.2f);
+        g_debugDraw.DrawPoint(m_rayCastInput.p1, 6.0f, c1);
+        g_debugDraw.DrawPoint(m_rayCastInput.p2, 6.0f, c2);
+
+        if (m_rayActor)
+        {
+            b2Color cr(0.2f, 0.2f, 0.9f);
+            b2Vec2 p = m_rayCastInput.p1 + m_rayActor->fraction * (m_rayCastInput.p2 - m_rayCastInput.p1);
+            g_debugDraw.DrawPoint(p, 6.0f, cr);
+        }
+
+        {
+            int32 height = m_tree.GetHeight();
+            DrawString(5, m_textLine, "dynamic tree height = %d", height);
+        }
+
+        ++m_stepCount;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_automated = !m_automated;
+            break;
+
+        case GLFW_KEY_C:
+            CreateProxy();
+            break;
+
+        case GLFW_KEY_D:
+            DestroyProxy();
+            break;
+
+        case GLFW_KEY_M:
+            MoveProxy();
+            break;
+        }
+    }
+
+    bool QueryCallback(int32 proxyId)
+    {
+        Actor* actor   = (Actor*)m_tree.GetUserData(proxyId);
+        actor->overlap = b2TestOverlap(m_queryAABB, actor->aabb);
+        return true;
+    }
+
+    float RayCastCallback(const b2RayCastInput& input, int32 proxyId)
+    {
+        Actor* actor = (Actor*)m_tree.GetUserData(proxyId);
+
+        b2RayCastOutput output;
+        bool hit = actor->aabb.RayCast(&output, input);
+
+        if (hit)
+        {
+            m_rayCastOutput      = output;
+            m_rayActor           = actor;
+            m_rayActor->fraction = output.fraction;
+            return output.fraction;
+        }
+
+        return input.maxFraction;
+    }
 
 private:
-
-	struct Actor
-	{
-		b2AABB aabb;
-		float fraction;
-		bool overlap;
-		int32 proxyId;
-	};
-
-	void GetRandomAABB(b2AABB* aabb)
-	{
-		b2Vec2 w; w.Set(2.0f * m_proxyExtent, 2.0f * m_proxyExtent);
-		//aabb->lowerBound.x = -m_proxyExtent;
-		//aabb->lowerBound.y = -m_proxyExtent + m_worldExtent;
-		aabb->lowerBound.x = RandomFloat(-m_worldExtent, m_worldExtent);
-		aabb->lowerBound.y = RandomFloat(0.0f, 2.0f * m_worldExtent);
-		aabb->upperBound = aabb->lowerBound + w;
-	}
-
-	void MoveAABB(b2AABB* aabb)
-	{
-		b2Vec2 d;
-		d.x = RandomFloat(-0.5f, 0.5f);
-		d.y = RandomFloat(-0.5f, 0.5f);
-		//d.x = 2.0f;
-		//d.y = 0.0f;
-		aabb->lowerBound += d;
-		aabb->upperBound += d;
-
-		b2Vec2 c0 = 0.5f * (aabb->lowerBound + aabb->upperBound);
-		b2Vec2 min; min.Set(-m_worldExtent, 0.0f);
-		b2Vec2 max; max.Set(m_worldExtent, 2.0f * m_worldExtent);
-		b2Vec2 c = b2Clamp(c0, min, max);
-
-		aabb->lowerBound += c - c0;
-		aabb->upperBound += c - c0;
-	}
-
-	void CreateProxy()
-	{
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			int32 j = rand() % e_actorCount;
-			Actor* actor = m_actors + j;
-			if (actor->proxyId == b2_nullNode)
-			{
-				GetRandomAABB(&actor->aabb);
-				actor->proxyId = m_tree.CreateProxy(actor->aabb, actor);
-				return;
-			}
-		}
-	}
-
-	void DestroyProxy()
-	{
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			int32 j = rand() % e_actorCount;
-			Actor* actor = m_actors + j;
-			if (actor->proxyId != b2_nullNode)
-			{
-				m_tree.DestroyProxy(actor->proxyId);
-				actor->proxyId = b2_nullNode;
-				return;
-			}
-		}
-	}
-
-	void MoveProxy()
-	{
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			int32 j = rand() % e_actorCount;
-			Actor* actor = m_actors + j;
-			if (actor->proxyId == b2_nullNode)
-			{
-				continue;
-			}
-
-			b2AABB aabb0 = actor->aabb;
-			MoveAABB(&actor->aabb);
-			b2Vec2 displacement = actor->aabb.GetCenter() - aabb0.GetCenter();
-			m_tree.MoveProxy(actor->proxyId, actor->aabb, displacement);
-			return;
-		}
-	}
-
-	void Action()
-	{
-		int32 choice = rand() % 20;
-
-		switch (choice)
-		{
-		case 0:
-			CreateProxy();
-			break;
-
-		case 1:
-			DestroyProxy();
-			break;
-
-		default:
-			MoveProxy();
-		}
-	}
-
-	void Query()
-	{
-		m_tree.Query(this, m_queryAABB);
-
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			if (m_actors[i].proxyId == b2_nullNode)
-			{
-				continue;
-			}
-
-			bool overlap = b2TestOverlap(m_queryAABB, m_actors[i].aabb);
-			B2_NOT_USED(overlap);
-			b2Assert(overlap == m_actors[i].overlap);
-		}
-	}
-
-	void RayCast()
-	{
-		m_rayActor = NULL;
-
-		b2RayCastInput input = m_rayCastInput;
-
-		// Ray cast against the dynamic tree.
-		m_tree.RayCast(this, input);
-
-		// Brute force ray cast.
-		Actor* bruteActor = NULL;
-		b2RayCastOutput bruteOutput;
-		for (int32 i = 0; i < e_actorCount; ++i)
-		{
-			if (m_actors[i].proxyId == b2_nullNode)
-			{
-				continue;
-			}
-
-			b2RayCastOutput output;
-			bool hit = m_actors[i].aabb.RayCast(&output, input);
-			if (hit)
-			{
-				bruteActor = m_actors + i;
-				bruteOutput = output;
-				input.maxFraction = output.fraction;
-			}
-		}
-
-		if (bruteActor != NULL)
-		{
-			b2Assert(bruteOutput.fraction == m_rayCastOutput.fraction);
-		}
-	}
-
-	float m_worldExtent;
-	float m_proxyExtent;
-
-	b2DynamicTree m_tree;
-	b2AABB m_queryAABB;
-	b2RayCastInput m_rayCastInput;
-	b2RayCastOutput m_rayCastOutput;
-	Actor* m_rayActor;
-	Actor m_actors[e_actorCount];
-	int32 m_stepCount;
-	bool m_automated;
+    struct Actor
+    {
+        b2AABB aabb;
+        float fraction;
+        bool overlap;
+        int32 proxyId;
+    };
+
+    void GetRandomAABB(b2AABB* aabb)
+    {
+        b2Vec2 w;
+        w.Set(2.0f * m_proxyExtent, 2.0f * m_proxyExtent);
+        // aabb->lowerBound.x = -m_proxyExtent;
+        // aabb->lowerBound.y = -m_proxyExtent + m_worldExtent;
+        aabb->lowerBound.x = RandomFloat(-m_worldExtent, m_worldExtent);
+        aabb->lowerBound.y = RandomFloat(0.0f, 2.0f * m_worldExtent);
+        aabb->upperBound   = aabb->lowerBound + w;
+    }
+
+    void MoveAABB(b2AABB* aabb)
+    {
+        b2Vec2 d;
+        d.x = RandomFloat(-0.5f, 0.5f);
+        d.y = RandomFloat(-0.5f, 0.5f);
+        // d.x = 2.0f;
+        // d.y = 0.0f;
+        aabb->lowerBound += d;
+        aabb->upperBound += d;
+
+        b2Vec2 c0 = 0.5f * (aabb->lowerBound + aabb->upperBound);
+        b2Vec2 min;
+        min.Set(-m_worldExtent, 0.0f);
+        b2Vec2 max;
+        max.Set(m_worldExtent, 2.0f * m_worldExtent);
+        b2Vec2 c = b2Clamp(c0, min, max);
+
+        aabb->lowerBound += c - c0;
+        aabb->upperBound += c - c0;
+    }
+
+    void CreateProxy()
+    {
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            int32 j      = rand() % e_actorCount;
+            Actor* actor = m_actors + j;
+            if (actor->proxyId == b2_nullNode)
+            {
+                GetRandomAABB(&actor->aabb);
+                actor->proxyId = m_tree.CreateProxy(actor->aabb, actor);
+                return;
+            }
+        }
+    }
+
+    void DestroyProxy()
+    {
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            int32 j      = rand() % e_actorCount;
+            Actor* actor = m_actors + j;
+            if (actor->proxyId != b2_nullNode)
+            {
+                m_tree.DestroyProxy(actor->proxyId);
+                actor->proxyId = b2_nullNode;
+                return;
+            }
+        }
+    }
+
+    void MoveProxy()
+    {
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            int32 j      = rand() % e_actorCount;
+            Actor* actor = m_actors + j;
+            if (actor->proxyId == b2_nullNode)
+            {
+                continue;
+            }
+
+            b2AABB aabb0 = actor->aabb;
+            MoveAABB(&actor->aabb);
+            b2Vec2 displacement = actor->aabb.GetCenter() - aabb0.GetCenter();
+            m_tree.MoveProxy(actor->proxyId, actor->aabb, displacement);
+            return;
+        }
+    }
+
+    void Action()
+    {
+        int32 choice = rand() % 20;
+
+        switch (choice)
+        {
+        case 0:
+            CreateProxy();
+            break;
+
+        case 1:
+            DestroyProxy();
+            break;
+
+        default:
+            MoveProxy();
+        }
+    }
+
+    void Query()
+    {
+        m_tree.Query(this, m_queryAABB);
+
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            if (m_actors[i].proxyId == b2_nullNode)
+            {
+                continue;
+            }
+
+            bool overlap = b2TestOverlap(m_queryAABB, m_actors[i].aabb);
+            B2_NOT_USED(overlap);
+            b2Assert(overlap == m_actors[i].overlap);
+        }
+    }
+
+    void RayCast()
+    {
+        m_rayActor = NULL;
+
+        b2RayCastInput input = m_rayCastInput;
+
+        // Ray cast against the dynamic tree.
+        m_tree.RayCast(this, input);
+
+        // Brute force ray cast.
+        Actor* bruteActor = NULL;
+        b2RayCastOutput bruteOutput;
+        for (int32 i = 0; i < e_actorCount; ++i)
+        {
+            if (m_actors[i].proxyId == b2_nullNode)
+            {
+                continue;
+            }
+
+            b2RayCastOutput output;
+            bool hit = m_actors[i].aabb.RayCast(&output, input);
+            if (hit)
+            {
+                bruteActor        = m_actors + i;
+                bruteOutput       = output;
+                input.maxFraction = output.fraction;
+            }
+        }
+
+        if (bruteActor != NULL)
+        {
+            b2Assert(bruteOutput.fraction == m_rayCastOutput.fraction);
+        }
+    }
+
+    float m_worldExtent;
+    float m_proxyExtent;
+
+    b2DynamicTree m_tree;
+    b2AABB m_queryAABB;
+    b2RayCastInput m_rayCastInput;
+    b2RayCastOutput m_rayCastOutput;
+    Actor* m_rayActor;
+    Actor m_actors[e_actorCount];
+    int32 m_stepCount;
+    bool m_automated;
 };
 
 static int testIndex = RegisterTest("Collision", "Dynamic Tree", DynamicTree::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_shapes.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_shapes.cpp
index 37923549694a..f7416dc4373d 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_shapes.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_shapes.cpp
@@ -26,228 +26,219 @@
 class EdgeShapesCallback : public b2RayCastCallback
 {
 public:
-	EdgeShapesCallback()
-	{
-		m_fixture = NULL;
-	}
-
-	float ReportFixture(b2Fixture* fixture, const b2Vec2& point,
-						  const b2Vec2& normal, float fraction) override
-	{
-		m_fixture = fixture;
-		m_point = point;
-		m_normal = normal;
-
-		return fraction;
-	}
-
-	b2Fixture* m_fixture;
-	b2Vec2 m_point;
-	b2Vec2 m_normal;
+    EdgeShapesCallback() { m_fixture = NULL; }
+
+    float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float fraction) override
+    {
+        m_fixture = fixture;
+        m_point   = point;
+        m_normal  = normal;
+
+        return fraction;
+    }
+
+    b2Fixture* m_fixture;
+    b2Vec2 m_point;
+    b2Vec2 m_normal;
 };
 
 class EdgeShapes : public Test
 {
 public:
-
-	enum
-	{
-		e_maxBodies = 256
-	};
-
-	EdgeShapes()
-	{
-		// Ground body
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			float x1 = -20.0f;
-			float y1 = 2.0f * cosf(x1 / 10.0f * b2_pi);
-			for (int32 i = 0; i < 80; ++i)
-			{
-				float x2 = x1 + 0.5f;
-				float y2 = 2.0f * cosf(x2 / 10.0f * b2_pi);
-
-				b2EdgeShape shape;
-				shape.SetTwoSided(b2Vec2(x1, y1), b2Vec2(x2, y2));
-				ground->CreateFixture(&shape, 0.0f);
-
-				x1 = x2;
-				y1 = y2;
-			}
-		}
-
-		{
-		b2Vec2 vertices[3];
-		vertices[0].Set(-0.5f, 0.0f);
-		vertices[1].Set(0.5f, 0.0f);
-		vertices[2].Set(0.0f, 1.5f);
-		m_polygons[0].Set(vertices, 3);
-	}
-
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.1f, 0.0f);
-			vertices[1].Set(0.1f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-			m_polygons[1].Set(vertices, 3);
-		}
-
-		{
-			float w = 1.0f;
-			float b = w / (2.0f + b2Sqrt(2.0f));
-			float s = b2Sqrt(2.0f) * b;
-
-			b2Vec2 vertices[8];
-			vertices[0].Set(0.5f * s, 0.0f);
-			vertices[1].Set(0.5f * w, b);
-			vertices[2].Set(0.5f * w, b + s);
-			vertices[3].Set(0.5f * s, w);
-			vertices[4].Set(-0.5f * s, w);
-			vertices[5].Set(-0.5f * w, b + s);
-			vertices[6].Set(-0.5f * w, b);
-			vertices[7].Set(-0.5f * s, 0.0f);
-
-			m_polygons[2].Set(vertices, 8);
-		}
-
-		{
-			m_polygons[3].SetAsBox(0.5f, 0.5f);
-		}
-
-		{
-			m_circle.m_radius = 0.5f;
-		}
-
-		m_bodyIndex = 0;
-		memset(m_bodies, 0, sizeof(m_bodies));
-
-		m_angle = 0.0f;
-	}
-
-	void Create(int32 index)
-	{
-		if (m_bodies[m_bodyIndex] != NULL)
-		{
-			m_world->DestroyBody(m_bodies[m_bodyIndex]);
-			m_bodies[m_bodyIndex] = NULL;
-		}
-
-		b2BodyDef bd;
-
-		float x = RandomFloat(-10.0f, 10.0f);
-		float y = RandomFloat(10.0f, 20.0f);
-		bd.position.Set(x, y);
-		bd.angle = RandomFloat(-b2_pi, b2_pi);
-		bd.type = b2_dynamicBody;
-
-		if (index == 4)
-		{
-			bd.angularDamping = 0.02f;
-		}
-
-		m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
-
-		if (index < 4)
-		{
-			b2FixtureDef fd;
-			fd.shape = m_polygons + index;
-			fd.friction = 0.3f;
-			fd.density = 20.0f;
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-		else
-		{
-			b2FixtureDef fd;
-			fd.shape = &m_circle;
-			fd.friction = 0.3f;
-			fd.density = 20.0f;
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-
-		m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
-	}
-
-	void DestroyBody()
-	{
-		for (int32 i = 0; i < e_maxBodies; ++i)
-		{
-			if (m_bodies[i] != NULL)
-			{
-				m_world->DestroyBody(m_bodies[i]);
-				m_bodies[i] = NULL;
-				return;
-			}
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_1:
-		case GLFW_KEY_2:
-		case GLFW_KEY_3:
-		case GLFW_KEY_4:
-		case GLFW_KEY_5:
-			Create(key - GLFW_KEY_1);
-			break;
-
-		case GLFW_KEY_D:
-			DestroyBody();
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		bool advanceRay = settings.m_pause == 0 || settings.m_singleStep;
-
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Press 1-5 to drop stuff");
-		
-
-		float L = 25.0f;
-		b2Vec2 point1(0.0f, 10.0f);
-		b2Vec2 d(L * cosf(m_angle), -L * b2Abs(sinf(m_angle)));
-		b2Vec2 point2 = point1 + d;
-
-		EdgeShapesCallback callback;
-
-		m_world->RayCast(&callback, point1, point2);
-
-		if (callback.m_fixture)
-		{
-			g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
-
-			g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
-
-			b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
-			g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
-		}
-		else
-		{
-			g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
-		}
-
-		if (advanceRay)
-		{
-			m_angle += 0.25f * b2_pi / 180.0f;
-		}
-	}
-
-	static Test* Create()
-	{
-		return new EdgeShapes;
-	}
-
-	int32 m_bodyIndex;
-	b2Body* m_bodies[e_maxBodies];
-	b2PolygonShape m_polygons[4];
-	b2CircleShape m_circle;
-
-	float m_angle;
+    enum
+    {
+        e_maxBodies = 256
+    };
+
+    EdgeShapes()
+    {
+        // Ground body
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            float x1 = -20.0f;
+            float y1 = 2.0f * cosf(x1 / 10.0f * b2_pi);
+            for (int32 i = 0; i < 80; ++i)
+            {
+                float x2 = x1 + 0.5f;
+                float y2 = 2.0f * cosf(x2 / 10.0f * b2_pi);
+
+                b2EdgeShape shape;
+                shape.SetTwoSided(b2Vec2(x1, y1), b2Vec2(x2, y2));
+                ground->CreateFixture(&shape, 0.0f);
+
+                x1 = x2;
+                y1 = y2;
+            }
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.5f, 0.0f);
+            vertices[1].Set(0.5f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[0].Set(vertices, 3);
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.1f, 0.0f);
+            vertices[1].Set(0.1f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[1].Set(vertices, 3);
+        }
+
+        {
+            float w = 1.0f;
+            float b = w / (2.0f + b2Sqrt(2.0f));
+            float s = b2Sqrt(2.0f) * b;
+
+            b2Vec2 vertices[8];
+            vertices[0].Set(0.5f * s, 0.0f);
+            vertices[1].Set(0.5f * w, b);
+            vertices[2].Set(0.5f * w, b + s);
+            vertices[3].Set(0.5f * s, w);
+            vertices[4].Set(-0.5f * s, w);
+            vertices[5].Set(-0.5f * w, b + s);
+            vertices[6].Set(-0.5f * w, b);
+            vertices[7].Set(-0.5f * s, 0.0f);
+
+            m_polygons[2].Set(vertices, 8);
+        }
+
+        {
+            m_polygons[3].SetAsBox(0.5f, 0.5f);
+        }
+
+        {
+            m_circle.m_radius = 0.5f;
+        }
+
+        m_bodyIndex = 0;
+        memset(m_bodies, 0, sizeof(m_bodies));
+
+        m_angle = 0.0f;
+    }
+
+    void Create(int32 index)
+    {
+        if (m_bodies[m_bodyIndex] != NULL)
+        {
+            m_world->DestroyBody(m_bodies[m_bodyIndex]);
+            m_bodies[m_bodyIndex] = NULL;
+        }
+
+        b2BodyDef bd;
+
+        float x = RandomFloat(-10.0f, 10.0f);
+        float y = RandomFloat(10.0f, 20.0f);
+        bd.position.Set(x, y);
+        bd.angle = RandomFloat(-b2_pi, b2_pi);
+        bd.type  = b2_dynamicBody;
+
+        if (index == 4)
+        {
+            bd.angularDamping = 0.02f;
+        }
+
+        m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
+
+        if (index < 4)
+        {
+            b2FixtureDef fd;
+            fd.shape    = m_polygons + index;
+            fd.friction = 0.3f;
+            fd.density  = 20.0f;
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+        else
+        {
+            b2FixtureDef fd;
+            fd.shape    = &m_circle;
+            fd.friction = 0.3f;
+            fd.density  = 20.0f;
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+
+        m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
+    }
+
+    void DestroyBody()
+    {
+        for (int32 i = 0; i < e_maxBodies; ++i)
+        {
+            if (m_bodies[i] != NULL)
+            {
+                m_world->DestroyBody(m_bodies[i]);
+                m_bodies[i] = NULL;
+                return;
+            }
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_1:
+        case GLFW_KEY_2:
+        case GLFW_KEY_3:
+        case GLFW_KEY_4:
+        case GLFW_KEY_5:
+            Create(key - GLFW_KEY_1);
+            break;
+
+        case GLFW_KEY_D:
+            DestroyBody();
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        bool advanceRay = settings.m_pause == 0 || settings.m_singleStep;
+
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Press 1-5 to drop stuff");
+
+        float L = 25.0f;
+        b2Vec2 point1(0.0f, 10.0f);
+        b2Vec2 d(L * cosf(m_angle), -L * b2Abs(sinf(m_angle)));
+        b2Vec2 point2 = point1 + d;
+
+        EdgeShapesCallback callback;
+
+        m_world->RayCast(&callback, point1, point2);
+
+        if (callback.m_fixture)
+        {
+            g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
+
+            g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
+
+            b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
+            g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
+        }
+        else
+        {
+            g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
+        }
+
+        if (advanceRay)
+        {
+            m_angle += 0.25f * b2_pi / 180.0f;
+        }
+    }
+
+    static Test* Create() { return new EdgeShapes; }
+
+    int32 m_bodyIndex;
+    b2Body* m_bodies[e_maxBodies];
+    b2PolygonShape m_polygons[4];
+    b2CircleShape m_circle;
+
+    float m_angle;
 };
 
 static int testIndex = RegisterTest("Geometry", "Edge Shapes", EdgeShapes::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_test.cpp
index 7f53a86f1cb8..e9c4bf4dc55c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_test.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/edge_test.cpp
@@ -26,257 +26,242 @@
 class EdgeTest : public Test
 {
 public:
+    EdgeTest()
+    {
+        b2Vec2 vertices[10] = {{10.0f, -4.0f}, {10.0f, 0.0f}, {6.0f, 0.0f},   {4.0f, 2.0f},   {2.0f, 0.0f},
+                               {-2.0f, 0.0f},  {-6.0f, 0.0f}, {-8.0f, -3.0f}, {-10.0f, 0.0f}, {-10.0f, -4.0f}};
 
-	EdgeTest()
-	{
-		b2Vec2 vertices[10] =
-		{
-			{10.0f, -4.0f},
-			{10.0f, 0.0f},
-			{6.0f, 0.0f},
-			{4.0f, 2.0f},
-			{2.0f, 0.0f},
-			{-2.0f, 0.0f},
-			{-6.0f, 0.0f},
-			{-8.0f, -3.0f},
-			{-10.0f, 0.0f},
-			{-10.0f, -4.0f}
-		};
+        m_offset1.Set(0.0f, 8.0f);
+        m_offset2.Set(0.0f, 16.0f);
 
-		m_offset1.Set(0.0f, 8.0f);
-		m_offset2.Set(0.0f, 16.0f);
-
-		{
-			b2Vec2 v1 = vertices[0] + m_offset1;
-			b2Vec2 v2 = vertices[1] + m_offset1;
-			b2Vec2 v3 = vertices[2] + m_offset1;
-			b2Vec2 v4 = vertices[3] + m_offset1;
-			b2Vec2 v5 = vertices[4] + m_offset1;
-			b2Vec2 v6 = vertices[5] + m_offset1;
-			b2Vec2 v7 = vertices[6] + m_offset1;
-			b2Vec2 v8 = vertices[7] + m_offset1;
-			b2Vec2 v9 = vertices[8] + m_offset1;
-			b2Vec2 v10 = vertices[9] + m_offset1;
-
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-
-			shape.SetOneSided(v10, v1, v2, v3);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v1, v2, v3, v4);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v2, v3, v4, v5);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v3, v4, v5, v6);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v4, v5, v6, v7);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v5, v6, v7, v8);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v6, v7, v8, v9);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v7, v8, v9, v10);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v8, v9, v10, v1);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetOneSided(v9, v10, v1, v2);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2Vec2 v1 = vertices[0] + m_offset2;
-			b2Vec2 v2 = vertices[1] + m_offset2;
-			b2Vec2 v3 = vertices[2] + m_offset2;
-			b2Vec2 v4 = vertices[3] + m_offset2;
-			b2Vec2 v5 = vertices[4] + m_offset2;
-			b2Vec2 v6 = vertices[5] + m_offset2;
-			b2Vec2 v7 = vertices[6] + m_offset2;
-			b2Vec2 v8 = vertices[7] + m_offset2;
-			b2Vec2 v9 = vertices[8] + m_offset2;
-			b2Vec2 v10 = vertices[9] + m_offset2;
-
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-
-			shape.SetTwoSided(v1, v2);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v2, v3);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v3, v4);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v4, v5);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v5, v6);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v6, v7);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v7, v8);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v8, v9);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v9, v10);
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(v10, v1);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		m_body1 = nullptr;
-		m_body2 = nullptr;
-		CreateBoxes();
-		m_boxes = true;
-	}
-
-	void CreateBoxes()
-	{
-		if (m_body1)
-		{
-			m_world->DestroyBody(m_body1);
-			m_body1 = nullptr;
-		}
-
-		if (m_body2)
-		{
-			m_world->DestroyBody(m_body2);
-			m_body2 = nullptr;
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = b2Vec2(8.0f, 2.6f) + m_offset1;
-			bd.allowSleep = false;
-			m_body1 = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 1.0f);
-
-			m_body1->CreateFixture(&shape, 1.0f);
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = b2Vec2(8.0f, 2.6f) + m_offset2;
-			bd.allowSleep = false;
-			m_body2 = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 1.0f);
-
-			m_body2->CreateFixture(&shape, 1.0f);
-		}
-	}
-
-	void CreateCircles()
-	{
-		if (m_body1)
-		{
-			m_world->DestroyBody(m_body1);
-			m_body1 = nullptr;
-		}
-
-		if (m_body2)
-		{
-			m_world->DestroyBody(m_body2);
-			m_body2 = nullptr;
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = b2Vec2(-0.5f, 0.6f) + m_offset1;
-			bd.allowSleep = false;
-			m_body1 = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_radius = 0.5f;
-
-			m_body1->CreateFixture(&shape, 1.0f);
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = b2Vec2(-0.5f, 0.6f) + m_offset2;
-			bd.allowSleep = false;
-			m_body2 = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_radius = 0.5f;
-
-			m_body2->CreateFixture(&shape, 1.0f);
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Custom Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::RadioButton("Boxes", m_boxes == true))
-		{
-			CreateBoxes();
-			m_boxes = true;
-		}
-
-		if (ImGui::RadioButton("Circles", m_boxes == false))
-		{
-			CreateCircles();
-			m_boxes = false;
-		}
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_A) == GLFW_PRESS)
-		//{
-		//	m_body1->ApplyForceToCenter(b2Vec2(-10.0f, 0.0f), true);
-		//	m_body2->ApplyForceToCenter(b2Vec2(-10.0f, 0.0f), true);
-		//}
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_D) == GLFW_PRESS)
-		//{
-		//	m_body1->ApplyForceToCenter(b2Vec2(10.0f, 0.0f), true);
-		//	m_body2->ApplyForceToCenter(b2Vec2(10.0f, 0.0f), true);
-		//}
-
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new EdgeTest;
-	}
-
-	b2Vec2 m_offset1, m_offset2;
-	b2Body* m_body1;
-	b2Body* m_body2;
-	bool m_boxes;
+        {
+            b2Vec2 v1  = vertices[0] + m_offset1;
+            b2Vec2 v2  = vertices[1] + m_offset1;
+            b2Vec2 v3  = vertices[2] + m_offset1;
+            b2Vec2 v4  = vertices[3] + m_offset1;
+            b2Vec2 v5  = vertices[4] + m_offset1;
+            b2Vec2 v6  = vertices[5] + m_offset1;
+            b2Vec2 v7  = vertices[6] + m_offset1;
+            b2Vec2 v8  = vertices[7] + m_offset1;
+            b2Vec2 v9  = vertices[8] + m_offset1;
+            b2Vec2 v10 = vertices[9] + m_offset1;
+
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+
+            shape.SetOneSided(v10, v1, v2, v3);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v1, v2, v3, v4);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v2, v3, v4, v5);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v3, v4, v5, v6);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v4, v5, v6, v7);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v5, v6, v7, v8);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v6, v7, v8, v9);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v7, v8, v9, v10);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v8, v9, v10, v1);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetOneSided(v9, v10, v1, v2);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2Vec2 v1  = vertices[0] + m_offset2;
+            b2Vec2 v2  = vertices[1] + m_offset2;
+            b2Vec2 v3  = vertices[2] + m_offset2;
+            b2Vec2 v4  = vertices[3] + m_offset2;
+            b2Vec2 v5  = vertices[4] + m_offset2;
+            b2Vec2 v6  = vertices[5] + m_offset2;
+            b2Vec2 v7  = vertices[6] + m_offset2;
+            b2Vec2 v8  = vertices[7] + m_offset2;
+            b2Vec2 v9  = vertices[8] + m_offset2;
+            b2Vec2 v10 = vertices[9] + m_offset2;
+
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+
+            shape.SetTwoSided(v1, v2);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v2, v3);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v3, v4);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v4, v5);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v5, v6);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v6, v7);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v7, v8);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v8, v9);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v9, v10);
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(v10, v1);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        m_body1 = nullptr;
+        m_body2 = nullptr;
+        CreateBoxes();
+        m_boxes = true;
+    }
+
+    void CreateBoxes()
+    {
+        if (m_body1)
+        {
+            m_world->DestroyBody(m_body1);
+            m_body1 = nullptr;
+        }
+
+        if (m_body2)
+        {
+            m_world->DestroyBody(m_body2);
+            m_body2 = nullptr;
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type       = b2_dynamicBody;
+            bd.position   = b2Vec2(8.0f, 2.6f) + m_offset1;
+            bd.allowSleep = false;
+            m_body1       = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 1.0f);
+
+            m_body1->CreateFixture(&shape, 1.0f);
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type       = b2_dynamicBody;
+            bd.position   = b2Vec2(8.0f, 2.6f) + m_offset2;
+            bd.allowSleep = false;
+            m_body2       = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 1.0f);
+
+            m_body2->CreateFixture(&shape, 1.0f);
+        }
+    }
+
+    void CreateCircles()
+    {
+        if (m_body1)
+        {
+            m_world->DestroyBody(m_body1);
+            m_body1 = nullptr;
+        }
+
+        if (m_body2)
+        {
+            m_world->DestroyBody(m_body2);
+            m_body2 = nullptr;
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type       = b2_dynamicBody;
+            bd.position   = b2Vec2(-0.5f, 0.6f) + m_offset1;
+            bd.allowSleep = false;
+            m_body1       = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_radius = 0.5f;
+
+            m_body1->CreateFixture(&shape, 1.0f);
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type       = b2_dynamicBody;
+            bd.position   = b2Vec2(-0.5f, 0.6f) + m_offset2;
+            bd.allowSleep = false;
+            m_body2       = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_radius = 0.5f;
+
+            m_body2->CreateFixture(&shape, 1.0f);
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Custom Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::RadioButton("Boxes", m_boxes == true))
+        {
+            CreateBoxes();
+            m_boxes = true;
+        }
+
+        if (ImGui::RadioButton("Circles", m_boxes == false))
+        {
+            CreateCircles();
+            m_boxes = false;
+        }
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_A) == GLFW_PRESS)
+        //{
+        //	m_body1->ApplyForceToCenter(b2Vec2(-10.0f, 0.0f), true);
+        //	m_body2->ApplyForceToCenter(b2Vec2(-10.0f, 0.0f), true);
+        // }
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_D) == GLFW_PRESS)
+        //{
+        //	m_body1->ApplyForceToCenter(b2Vec2(10.0f, 0.0f), true);
+        //	m_body2->ApplyForceToCenter(b2Vec2(10.0f, 0.0f), true);
+        // }
+
+        Test::Step(settings);
+    }
+
+    static Test* Create() { return new EdgeTest; }
+
+    b2Vec2 m_offset1, m_offset2;
+    b2Body* m_body1;
+    b2Body* m_body2;
+    bool m_boxes;
 };
 
 static int testIndex = RegisterTest("Geometry", "Edge Test", EdgeTest::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/friction.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/friction.cpp
index 9f1c06e93206..b935e0459c64 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/friction.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/friction.cpp
@@ -25,103 +25,99 @@
 class Friction : public Test
 {
 public:
-
-	Friction()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(13.0f, 0.25f);
-
-			b2BodyDef bd;
-			bd.position.Set(-4.0f, 22.0f);
-			bd.angle = -0.25f;
-
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 1.0f);
-
-			b2BodyDef bd;
-			bd.position.Set(10.5f, 19.0f);
-
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(13.0f, 0.25f);
-
-			b2BodyDef bd;
-			bd.position.Set(4.0f, 14.0f);
-			bd.angle = 0.25f;
-
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 1.0f);
-
-			b2BodyDef bd;
-			bd.position.Set(-10.5f, 11.0f);
-
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(13.0f, 0.25f);
-
-			b2BodyDef bd;
-			bd.position.Set(-4.0f, 6.0f);
-			bd.angle = -0.25f;
-
-			b2Body* ground = m_world->CreateBody(&bd);
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 25.0f;
-
-			float friction[5] = {0.75f, 0.5f, 0.35f, 0.1f, 0.0f};
-
-			for (int i = 0; i < 5; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-15.0f + 4.0f * i, 28.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-
-				fd.friction = friction[i];
-				body->CreateFixture(&fd);
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Friction;
-	}
+    Friction()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(13.0f, 0.25f);
+
+            b2BodyDef bd;
+            bd.position.Set(-4.0f, 22.0f);
+            bd.angle = -0.25f;
+
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 1.0f);
+
+            b2BodyDef bd;
+            bd.position.Set(10.5f, 19.0f);
+
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(13.0f, 0.25f);
+
+            b2BodyDef bd;
+            bd.position.Set(4.0f, 14.0f);
+            bd.angle = 0.25f;
+
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 1.0f);
+
+            b2BodyDef bd;
+            bd.position.Set(-10.5f, 11.0f);
+
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(13.0f, 0.25f);
+
+            b2BodyDef bd;
+            bd.position.Set(-4.0f, 6.0f);
+            bd.angle = -0.25f;
+
+            b2Body* ground = m_world->CreateBody(&bd);
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 25.0f;
+
+            float friction[5] = {0.75f, 0.5f, 0.35f, 0.1f, 0.0f};
+
+            for (int i = 0; i < 5; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-15.0f + 4.0f * i, 28.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+
+                fd.friction = friction[i];
+                body->CreateFixture(&fd);
+            }
+        }
+    }
+
+    static Test* Create() { return new Friction; }
 };
 
 static int testIndex = RegisterTest("Forces", "Friction", Friction::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/gear_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/gear_joint.cpp
index ddde2cfb8d7e..d7e1b15771e2 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/gear_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/gear_joint.cpp
@@ -25,156 +25,151 @@
 class GearJoint : public Test
 {
 public:
-	GearJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(-50.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2CircleShape circle1;
-			circle1.m_radius = 1.0f;
-
-			b2PolygonShape box;
-			box.SetAsBox(0.5f, 5.0f);
-
-			b2CircleShape circle2;
-			circle2.m_radius = 2.0f;
-			
-			b2BodyDef bd1;
-			bd1.type = b2_staticBody;
-			bd1.position.Set(10.0f, 9.0f);
-			b2Body* body1 = m_world->CreateBody(&bd1);
-			body1->CreateFixture(&circle1, 5.0f);
-
-			b2BodyDef bd2;
-			bd2.type = b2_dynamicBody;
-			bd2.position.Set(10.0f, 8.0f);
-			b2Body* body2 = m_world->CreateBody(&bd2);
-			body2->CreateFixture(&box, 5.0f);
-
-			b2BodyDef bd3;
-			bd3.type = b2_dynamicBody;
-			bd3.position.Set(10.0f, 6.0f);
-			b2Body* body3 = m_world->CreateBody(&bd3);
-			body3->CreateFixture(&circle2, 5.0f);
-
-			b2RevoluteJointDef jd1;
-			jd1.Initialize(body1, body2, bd1.position);
-			b2Joint* joint1 = m_world->CreateJoint(&jd1);
-
-			b2RevoluteJointDef jd2;
-			jd2.Initialize(body2, body3, bd3.position);
-			b2Joint* joint2 = m_world->CreateJoint(&jd2);
-
-			b2GearJointDef jd4;
-			jd4.bodyA = body1;
-			jd4.bodyB = body3;
-			jd4.joint1 = joint1;
-			jd4.joint2 = joint2;
-			jd4.ratio = circle2.m_radius / circle1.m_radius;
-			m_world->CreateJoint(&jd4);
-		}
-
-		{
-			b2CircleShape circle1;
-			circle1.m_radius = 1.0f;
-
-			b2CircleShape circle2;
-			circle2.m_radius = 2.0f;
-			
-			b2PolygonShape box;
-			box.SetAsBox(0.5f, 5.0f);
-
-			b2BodyDef bd1;
-			bd1.type = b2_dynamicBody;
-			bd1.position.Set(-3.0f, 12.0f);
-			b2Body* body1 = m_world->CreateBody(&bd1);
-			body1->CreateFixture(&circle1, 5.0f);
-
-			b2RevoluteJointDef jd1;
-			jd1.bodyA = ground;
-			jd1.bodyB = body1;
-			jd1.localAnchorA = ground->GetLocalPoint(bd1.position);
-			jd1.localAnchorB = body1->GetLocalPoint(bd1.position);
-			jd1.referenceAngle = body1->GetAngle() - ground->GetAngle();
-			m_joint1 = (b2RevoluteJoint*)m_world->CreateJoint(&jd1);
-
-			b2BodyDef bd2;
-			bd2.type = b2_dynamicBody;
-			bd2.position.Set(0.0f, 12.0f);
-			b2Body* body2 = m_world->CreateBody(&bd2);
-			body2->CreateFixture(&circle2, 5.0f);
-
-			b2RevoluteJointDef jd2;
-			jd2.Initialize(ground, body2, bd2.position);
-			m_joint2 = (b2RevoluteJoint*)m_world->CreateJoint(&jd2);
-
-			b2BodyDef bd3;
-			bd3.type = b2_dynamicBody;
-			bd3.position.Set(2.5f, 12.0f);
-			b2Body* body3 = m_world->CreateBody(&bd3);
-			body3->CreateFixture(&box, 5.0f);
-
-			b2PrismaticJointDef jd3;
-			jd3.Initialize(ground, body3, bd3.position, b2Vec2(0.0f, 1.0f));
-			jd3.lowerTranslation = -5.0f;
-			jd3.upperTranslation = 5.0f;
-			jd3.enableLimit = true;
-
-			m_joint3 = (b2PrismaticJoint*)m_world->CreateJoint(&jd3);
-
-			b2GearJointDef jd4;
-			jd4.bodyA = body1;
-			jd4.bodyB = body2;
-			jd4.joint1 = m_joint1;
-			jd4.joint2 = m_joint2;
-			jd4.ratio = circle2.m_radius / circle1.m_radius;
-			m_joint4 = (b2GearJoint*)m_world->CreateJoint(&jd4);
-
-			b2GearJointDef jd5;
-			jd5.bodyA = body2;
-			jd5.bodyB = body3;
-			jd5.joint1 = m_joint2;
-			jd5.joint2 = m_joint3;
-			jd5.ratio = -1.0f / circle2.m_radius;
-			m_joint5 = (b2GearJoint*)m_world->CreateJoint(&jd5);
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		float ratio, value;
-		
-		ratio = m_joint4->GetRatio();
-		value = m_joint1->GetJointAngle() + ratio * m_joint2->GetJointAngle();
-		DrawString(5, m_textLine, "theta1 + %4.2f * theta2 = %4.2f", (float) ratio, (float) value);
-		
-
-		ratio = m_joint5->GetRatio();
-		value = m_joint2->GetJointAngle() + ratio * m_joint3->GetJointTranslation();
-		DrawString(5, m_textLine, "theta2 + %4.2f * delta = %4.2f", (float) ratio, (float) value);
-		
-	}
-
-	static Test* Create()
-	{
-		return new GearJoint;
-	}
-
-	b2RevoluteJoint* m_joint1;
-	b2RevoluteJoint* m_joint2;
-	b2PrismaticJoint* m_joint3;
-	b2GearJoint* m_joint4;
-	b2GearJoint* m_joint5;
+    GearJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(-50.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2CircleShape circle1;
+            circle1.m_radius = 1.0f;
+
+            b2PolygonShape box;
+            box.SetAsBox(0.5f, 5.0f);
+
+            b2CircleShape circle2;
+            circle2.m_radius = 2.0f;
+
+            b2BodyDef bd1;
+            bd1.type = b2_staticBody;
+            bd1.position.Set(10.0f, 9.0f);
+            b2Body* body1 = m_world->CreateBody(&bd1);
+            body1->CreateFixture(&circle1, 5.0f);
+
+            b2BodyDef bd2;
+            bd2.type = b2_dynamicBody;
+            bd2.position.Set(10.0f, 8.0f);
+            b2Body* body2 = m_world->CreateBody(&bd2);
+            body2->CreateFixture(&box, 5.0f);
+
+            b2BodyDef bd3;
+            bd3.type = b2_dynamicBody;
+            bd3.position.Set(10.0f, 6.0f);
+            b2Body* body3 = m_world->CreateBody(&bd3);
+            body3->CreateFixture(&circle2, 5.0f);
+
+            b2RevoluteJointDef jd1;
+            jd1.Initialize(body1, body2, bd1.position);
+            b2Joint* joint1 = m_world->CreateJoint(&jd1);
+
+            b2RevoluteJointDef jd2;
+            jd2.Initialize(body2, body3, bd3.position);
+            b2Joint* joint2 = m_world->CreateJoint(&jd2);
+
+            b2GearJointDef jd4;
+            jd4.bodyA  = body1;
+            jd4.bodyB  = body3;
+            jd4.joint1 = joint1;
+            jd4.joint2 = joint2;
+            jd4.ratio  = circle2.m_radius / circle1.m_radius;
+            m_world->CreateJoint(&jd4);
+        }
+
+        {
+            b2CircleShape circle1;
+            circle1.m_radius = 1.0f;
+
+            b2CircleShape circle2;
+            circle2.m_radius = 2.0f;
+
+            b2PolygonShape box;
+            box.SetAsBox(0.5f, 5.0f);
+
+            b2BodyDef bd1;
+            bd1.type = b2_dynamicBody;
+            bd1.position.Set(-3.0f, 12.0f);
+            b2Body* body1 = m_world->CreateBody(&bd1);
+            body1->CreateFixture(&circle1, 5.0f);
+
+            b2RevoluteJointDef jd1;
+            jd1.bodyA          = ground;
+            jd1.bodyB          = body1;
+            jd1.localAnchorA   = ground->GetLocalPoint(bd1.position);
+            jd1.localAnchorB   = body1->GetLocalPoint(bd1.position);
+            jd1.referenceAngle = body1->GetAngle() - ground->GetAngle();
+            m_joint1           = (b2RevoluteJoint*)m_world->CreateJoint(&jd1);
+
+            b2BodyDef bd2;
+            bd2.type = b2_dynamicBody;
+            bd2.position.Set(0.0f, 12.0f);
+            b2Body* body2 = m_world->CreateBody(&bd2);
+            body2->CreateFixture(&circle2, 5.0f);
+
+            b2RevoluteJointDef jd2;
+            jd2.Initialize(ground, body2, bd2.position);
+            m_joint2 = (b2RevoluteJoint*)m_world->CreateJoint(&jd2);
+
+            b2BodyDef bd3;
+            bd3.type = b2_dynamicBody;
+            bd3.position.Set(2.5f, 12.0f);
+            b2Body* body3 = m_world->CreateBody(&bd3);
+            body3->CreateFixture(&box, 5.0f);
+
+            b2PrismaticJointDef jd3;
+            jd3.Initialize(ground, body3, bd3.position, b2Vec2(0.0f, 1.0f));
+            jd3.lowerTranslation = -5.0f;
+            jd3.upperTranslation = 5.0f;
+            jd3.enableLimit      = true;
+
+            m_joint3 = (b2PrismaticJoint*)m_world->CreateJoint(&jd3);
+
+            b2GearJointDef jd4;
+            jd4.bodyA  = body1;
+            jd4.bodyB  = body2;
+            jd4.joint1 = m_joint1;
+            jd4.joint2 = m_joint2;
+            jd4.ratio  = circle2.m_radius / circle1.m_radius;
+            m_joint4   = (b2GearJoint*)m_world->CreateJoint(&jd4);
+
+            b2GearJointDef jd5;
+            jd5.bodyA  = body2;
+            jd5.bodyB  = body3;
+            jd5.joint1 = m_joint2;
+            jd5.joint2 = m_joint3;
+            jd5.ratio  = -1.0f / circle2.m_radius;
+            m_joint5   = (b2GearJoint*)m_world->CreateJoint(&jd5);
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        float ratio, value;
+
+        ratio = m_joint4->GetRatio();
+        value = m_joint1->GetJointAngle() + ratio * m_joint2->GetJointAngle();
+        DrawString(5, m_textLine, "theta1 + %4.2f * theta2 = %4.2f", (float)ratio, (float)value);
+
+        ratio = m_joint5->GetRatio();
+        value = m_joint2->GetJointAngle() + ratio * m_joint3->GetJointTranslation();
+        DrawString(5, m_textLine, "theta2 + %4.2f * delta = %4.2f", (float)ratio, (float)value);
+    }
+
+    static Test* Create() { return new GearJoint; }
+
+    b2RevoluteJoint* m_joint1;
+    b2RevoluteJoint* m_joint2;
+    b2PrismaticJoint* m_joint3;
+    b2GearJoint* m_joint4;
+    b2GearJoint* m_joint5;
 };
 
 static int testIndex = RegisterTest("Joints", "Gear", GearJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy1.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy1.cpp
index d302808aad4d..17ba6d183f23 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy1.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy1.cpp
@@ -25,37 +25,33 @@
 class Heavy1 : public Test
 {
 public:
-    
     Heavy1()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-            
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-        
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-		bd.position.Set(0.0f, 0.5f);
-		b2Body* body = m_world->CreateBody(&bd);
-        
-		b2CircleShape shape;
-		shape.m_radius = 0.5f;
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        b2BodyDef bd;
+        bd.type = b2_dynamicBody;
+        bd.position.Set(0.0f, 0.5f);
+        b2Body* body = m_world->CreateBody(&bd);
+
+        b2CircleShape shape;
+        shape.m_radius = 0.5f;
         body->CreateFixture(&shape, 10.0f);
-        
+
         bd.position.Set(0.0f, 6.0f);
-        body = m_world->CreateBody(&bd);
+        body           = m_world->CreateBody(&bd);
         shape.m_radius = 5.0f;
         body->CreateFixture(&shape, 10.0f);
-	}
-    
-	static Test* Create()
-	{
-		return new Heavy1;
-	}
+    }
+
+    static Test* Create() { return new Heavy1; }
 };
 
 static int testIndex = RegisterTest("Solver", "Heavy 1", Heavy1::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy2.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy2.cpp
index 271c089b3d7c..c34a36995eb8 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy2.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/heavy2.cpp
@@ -25,34 +25,33 @@
 class Heavy2 : public Test
 {
 public:
-    
     Heavy2()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-            
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-        
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-		bd.position.Set(0.0f, 2.5f);
-		b2Body* body = m_world->CreateBody(&bd);
-        
-		b2CircleShape shape;
-		shape.m_radius = 0.5f;
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        b2BodyDef bd;
+        bd.type = b2_dynamicBody;
+        bd.position.Set(0.0f, 2.5f);
+        b2Body* body = m_world->CreateBody(&bd);
+
+        b2CircleShape shape;
+        shape.m_radius = 0.5f;
         body->CreateFixture(&shape, 10.0f);
-        
+
         bd.position.Set(0.0f, 3.5f);
         body = m_world->CreateBody(&bd);
         body->CreateFixture(&shape, 10.0f);
-        
+
         m_heavy = NULL;
-	}
-    
+    }
+
     void ToggleHeavy()
     {
         if (m_heavy)
@@ -66,29 +65,26 @@ class Heavy2 : public Test
             bd.type = b2_dynamicBody;
             bd.position.Set(0.0f, 9.0f);
             m_heavy = m_world->CreateBody(&bd);
-            
+
             b2CircleShape shape;
             shape.m_radius = 5.0f;
             m_heavy->CreateFixture(&shape, 10.0f);
         }
     }
-    
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
         case GLFW_KEY_H:
             ToggleHeavy();
             break;
-		}
-	}
-    
-	static Test* Create()
-	{
-		return new Heavy2;
-	}
-    
-	b2Body* m_heavy;
+        }
+    }
+
+    static Test* Create() { return new Heavy2; }
+
+    b2Body* m_heavy;
 };
 
 static int testIndex = RegisterTest("Solver", "Heavy 2", Heavy2::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_balanced.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_balanced.cpp
index ee5af37831d5..8b68edd0b7c7 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_balanced.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_balanced.cpp
@@ -25,84 +25,80 @@
 class MobileBalanced : public Test
 {
 public:
-
-	enum
-	{
-		e_depth = 4
-	};
-
-	MobileBalanced()
-	{
-		b2Body* ground;
-
-		// Create ground body.
-		{
-			b2BodyDef bodyDef;
-			bodyDef.position.Set(0.0f, 20.0f);
-			ground = m_world->CreateBody(&bodyDef);
-		}
-
-		float a = 0.5f;
-		b2Vec2 h(0.0f, a);
-
-		b2Body* root = AddNode(ground, b2Vec2_zero, 0, 3.0f, a);
-
-		b2RevoluteJointDef jointDef;
-		jointDef.bodyA = ground;
-		jointDef.bodyB = root;
-		jointDef.localAnchorA.SetZero();
-		jointDef.localAnchorB = h;
-		m_world->CreateJoint(&jointDef);
-	}
-
-	b2Body* AddNode(b2Body* parent, const b2Vec2& localAnchor, int32 depth, float offset, float a)
-	{
-		float density = 20.0f;
-		b2Vec2 h(0.0f, a);
-
-		b2Vec2 p = parent->GetPosition() + localAnchor - h;
-
-		b2BodyDef bodyDef;
-		bodyDef.type = b2_dynamicBody;
-		bodyDef.position = p;
-		b2Body* body = m_world->CreateBody(&bodyDef);
-
-		b2PolygonShape shape;
-		shape.SetAsBox(0.25f * a, a);
-		body->CreateFixture(&shape, density);
-
-		if (depth == e_depth)
-		{
-			return body;
-		}
-
-		shape.SetAsBox(offset, 0.25f * a, b2Vec2(0, -a), 0.0f);
-		body->CreateFixture(&shape, density);
-
-		b2Vec2 a1 = b2Vec2(offset, -a);
-		b2Vec2 a2 = b2Vec2(-offset, -a);
-		b2Body* body1 = AddNode(body, a1, depth + 1, 0.5f * offset, a);
-		b2Body* body2 = AddNode(body, a2, depth + 1, 0.5f * offset, a);
-
-		b2RevoluteJointDef jointDef;
-		jointDef.bodyA = body;
-		jointDef.localAnchorB = h;
-
-		jointDef.localAnchorA = a1;
-		jointDef.bodyB = body1;
-		m_world->CreateJoint(&jointDef);
-
-		jointDef.localAnchorA = a2;
-		jointDef.bodyB = body2;
-		m_world->CreateJoint(&jointDef);
-
-		return body;
-	}
-
-	static Test* Create()
-	{
-		return new MobileBalanced;
-	}
+    enum
+    {
+        e_depth = 4
+    };
+
+    MobileBalanced()
+    {
+        b2Body* ground;
+
+        // Create ground body.
+        {
+            b2BodyDef bodyDef;
+            bodyDef.position.Set(0.0f, 20.0f);
+            ground = m_world->CreateBody(&bodyDef);
+        }
+
+        float a = 0.5f;
+        b2Vec2 h(0.0f, a);
+
+        b2Body* root = AddNode(ground, b2Vec2_zero, 0, 3.0f, a);
+
+        b2RevoluteJointDef jointDef;
+        jointDef.bodyA = ground;
+        jointDef.bodyB = root;
+        jointDef.localAnchorA.SetZero();
+        jointDef.localAnchorB = h;
+        m_world->CreateJoint(&jointDef);
+    }
+
+    b2Body* AddNode(b2Body* parent, const b2Vec2& localAnchor, int32 depth, float offset, float a)
+    {
+        float density = 20.0f;
+        b2Vec2 h(0.0f, a);
+
+        b2Vec2 p = parent->GetPosition() + localAnchor - h;
+
+        b2BodyDef bodyDef;
+        bodyDef.type     = b2_dynamicBody;
+        bodyDef.position = p;
+        b2Body* body     = m_world->CreateBody(&bodyDef);
+
+        b2PolygonShape shape;
+        shape.SetAsBox(0.25f * a, a);
+        body->CreateFixture(&shape, density);
+
+        if (depth == e_depth)
+        {
+            return body;
+        }
+
+        shape.SetAsBox(offset, 0.25f * a, b2Vec2(0, -a), 0.0f);
+        body->CreateFixture(&shape, density);
+
+        b2Vec2 a1     = b2Vec2(offset, -a);
+        b2Vec2 a2     = b2Vec2(-offset, -a);
+        b2Body* body1 = AddNode(body, a1, depth + 1, 0.5f * offset, a);
+        b2Body* body2 = AddNode(body, a2, depth + 1, 0.5f * offset, a);
+
+        b2RevoluteJointDef jointDef;
+        jointDef.bodyA        = body;
+        jointDef.localAnchorB = h;
+
+        jointDef.localAnchorA = a1;
+        jointDef.bodyB        = body1;
+        m_world->CreateJoint(&jointDef);
+
+        jointDef.localAnchorA = a2;
+        jointDef.bodyB        = body2;
+        m_world->CreateJoint(&jointDef);
+
+        return body;
+    }
+
+    static Test* Create() { return new MobileBalanced; }
 };
 
 static int testIndex = RegisterTest("Solver", "Mobile Balanced", MobileBalanced::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_unbalanced.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_unbalanced.cpp
index 5f62fb6ebf6f..6d95738e5443 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_unbalanced.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/mobile_unbalanced.cpp
@@ -25,81 +25,77 @@
 class MobileUnbalanced : public Test
 {
 public:
-
-	enum
-	{
-		e_depth = 4
-	};
-
-	MobileUnbalanced()
-	{
-		b2Body* ground;
-
-		// Create ground body.
-		{
-			b2BodyDef bodyDef;
-			bodyDef.position.Set(0.0f, 20.0f);
-			ground = m_world->CreateBody(&bodyDef);
-		}
-
-		float a = 0.5f;
-		b2Vec2 h(0.0f, a);
-
-		b2Body* root = AddNode(ground, b2Vec2_zero, 0, 3.0f, a);
-
-		b2RevoluteJointDef jointDef;
-		jointDef.bodyA = ground;
-		jointDef.bodyB = root;
-		jointDef.localAnchorA.SetZero();
-		jointDef.localAnchorB = h;
-		m_world->CreateJoint(&jointDef);
-	}
-
-	b2Body* AddNode(b2Body* parent, const b2Vec2& localAnchor, int32 depth, float offset, float a)
-	{
-		float density = 20.0f;
-		b2Vec2 h(0.0f, a);
-
-		b2Vec2 p = parent->GetPosition() + localAnchor - h;
-
-		b2BodyDef bodyDef;
-		bodyDef.type = b2_dynamicBody;
-		bodyDef.position = p;
-		b2Body* body = m_world->CreateBody(&bodyDef);
-
-		b2PolygonShape shape;
-		shape.SetAsBox(0.25f * a, a);
-		body->CreateFixture(&shape, density);
-
-		if (depth == e_depth)
-		{
-			return body;
-		}
-
-		b2Vec2 a1 = b2Vec2(offset, -a);
-		b2Vec2 a2 = b2Vec2(-offset, -a);
-		b2Body* body1 = AddNode(body, a1, depth + 1, 0.5f * offset, a);
-		b2Body* body2 = AddNode(body, a2, depth + 1, 0.5f * offset, a);
-
-		b2RevoluteJointDef jointDef;
-		jointDef.bodyA = body;
-		jointDef.localAnchorB = h;
-
-		jointDef.localAnchorA = a1;
-		jointDef.bodyB = body1;
-		m_world->CreateJoint(&jointDef);
-
-		jointDef.localAnchorA = a2;
-		jointDef.bodyB = body2;
-		m_world->CreateJoint(&jointDef);
-
-		return body;
-	}
-
-	static Test* Create()
-	{
-		return new MobileUnbalanced;
-	}
+    enum
+    {
+        e_depth = 4
+    };
+
+    MobileUnbalanced()
+    {
+        b2Body* ground;
+
+        // Create ground body.
+        {
+            b2BodyDef bodyDef;
+            bodyDef.position.Set(0.0f, 20.0f);
+            ground = m_world->CreateBody(&bodyDef);
+        }
+
+        float a = 0.5f;
+        b2Vec2 h(0.0f, a);
+
+        b2Body* root = AddNode(ground, b2Vec2_zero, 0, 3.0f, a);
+
+        b2RevoluteJointDef jointDef;
+        jointDef.bodyA = ground;
+        jointDef.bodyB = root;
+        jointDef.localAnchorA.SetZero();
+        jointDef.localAnchorB = h;
+        m_world->CreateJoint(&jointDef);
+    }
+
+    b2Body* AddNode(b2Body* parent, const b2Vec2& localAnchor, int32 depth, float offset, float a)
+    {
+        float density = 20.0f;
+        b2Vec2 h(0.0f, a);
+
+        b2Vec2 p = parent->GetPosition() + localAnchor - h;
+
+        b2BodyDef bodyDef;
+        bodyDef.type     = b2_dynamicBody;
+        bodyDef.position = p;
+        b2Body* body     = m_world->CreateBody(&bodyDef);
+
+        b2PolygonShape shape;
+        shape.SetAsBox(0.25f * a, a);
+        body->CreateFixture(&shape, density);
+
+        if (depth == e_depth)
+        {
+            return body;
+        }
+
+        b2Vec2 a1     = b2Vec2(offset, -a);
+        b2Vec2 a2     = b2Vec2(-offset, -a);
+        b2Body* body1 = AddNode(body, a1, depth + 1, 0.5f * offset, a);
+        b2Body* body2 = AddNode(body, a2, depth + 1, 0.5f * offset, a);
+
+        b2RevoluteJointDef jointDef;
+        jointDef.bodyA        = body;
+        jointDef.localAnchorB = h;
+
+        jointDef.localAnchorA = a1;
+        jointDef.bodyB        = body1;
+        m_world->CreateJoint(&jointDef);
+
+        jointDef.localAnchorA = a2;
+        jointDef.bodyB        = body2;
+        m_world->CreateJoint(&jointDef);
+
+        return body;
+    }
+
+    static Test* Create() { return new MobileUnbalanced; }
 };
 
 static int testIndex = RegisterTest("Solver", "Mobile Unbalanced", MobileUnbalanced::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/motor_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/motor_joint.cpp
index a7b0156e9bc8..1b4873ad0eda 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/motor_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/motor_joint.cpp
@@ -29,90 +29,87 @@
 class MotorJoint : public Test
 {
 public:
-	MotorJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-
-			ground->CreateFixture(&fd);
-		}
-
-		// Define motorized body
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 8.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(2.0f, 0.5f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.friction = 0.6f;
-			fd.density = 2.0f;
-			body->CreateFixture(&fd);
-
-			b2MotorJointDef mjd;
-			mjd.Initialize(ground, body);
-			mjd.maxForce = 1000.0f;
-			mjd.maxTorque = 1000.0f;
-			m_joint = (b2MotorJoint*)m_world->CreateJoint(&mjd);
-		}
-
-		m_go = false;
-		m_time = 0.0f;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_S:
-			m_go = !m_go;
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		if (m_go && settings.m_hertz > 0.0f)
-		{
-			m_time += 1.0f / settings.m_hertz;
-		}
-
-		b2Vec2 linearOffset;
-		linearOffset.x = 6.0f * sinf(2.0f * m_time);
-		linearOffset.y = 8.0f + 4.0f * sinf(1.0f * m_time);
-		
-		float angularOffset = 4.0f * m_time;
-
-		m_joint->SetLinearOffset(linearOffset);
-		m_joint->SetAngularOffset(angularOffset);
-
-		g_debugDraw.DrawPoint(linearOffset, 4.0f, b2Color(0.9f, 0.9f, 0.9f));
-
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Keys: (s) pause");
-		m_textLine += 15;
-	}
-
-	static Test* Create()
-	{
-		return new MotorJoint;
-	}
-
-	b2MotorJoint* m_joint;
-	float m_time;
-	bool m_go;
+    MotorJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+
+            b2FixtureDef fd;
+            fd.shape = &shape;
+
+            ground->CreateFixture(&fd);
+        }
+
+        // Define motorized body
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 8.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(2.0f, 0.5f);
+
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.friction = 0.6f;
+            fd.density  = 2.0f;
+            body->CreateFixture(&fd);
+
+            b2MotorJointDef mjd;
+            mjd.Initialize(ground, body);
+            mjd.maxForce  = 1000.0f;
+            mjd.maxTorque = 1000.0f;
+            m_joint       = (b2MotorJoint*)m_world->CreateJoint(&mjd);
+        }
+
+        m_go   = false;
+        m_time = 0.0f;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_S:
+            m_go = !m_go;
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        if (m_go && settings.m_hertz > 0.0f)
+        {
+            m_time += 1.0f / settings.m_hertz;
+        }
+
+        b2Vec2 linearOffset;
+        linearOffset.x = 6.0f * sinf(2.0f * m_time);
+        linearOffset.y = 8.0f + 4.0f * sinf(1.0f * m_time);
+
+        float angularOffset = 4.0f * m_time;
+
+        m_joint->SetLinearOffset(linearOffset);
+        m_joint->SetAngularOffset(angularOffset);
+
+        g_debugDraw.DrawPoint(linearOffset, 4.0f, b2Color(0.9f, 0.9f, 0.9f));
+
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Keys: (s) pause");
+        m_textLine += 15;
+    }
+
+    static Test* Create() { return new MotorJoint; }
+
+    b2MotorJoint* m_joint;
+    float m_time;
+    bool m_go;
 };
 
 static int testIndex = RegisterTest("Joints", "Motor Joint", MotorJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/pinball.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/pinball.cpp
index c7dca48db498..1c117de53c0e 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/pinball.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/pinball.cpp
@@ -27,144 +27,139 @@
 class Pinball : public Test
 {
 public:
-	Pinball()
-	{
-		// Ground body
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2Vec2 vs[5];
-			vs[0].Set(-8.0f, 6.0f);
-			vs[1].Set(-8.0f, 20.0f);
-			vs[2].Set(8.0f, 20.0f);
-			vs[3].Set(8.0f, 6.0f);
-			vs[4].Set(0.0f, -2.0f);
-
-			b2ChainShape loop;
-			loop.CreateLoop(vs, 5);
-			b2FixtureDef fd;
-			fd.shape = &loop;
-			fd.density = 0.0f;
-			ground->CreateFixture(&fd);
-		}
-
-		// Flippers
-		{
-			b2Vec2 p1(-2.0f, 0.0f), p2(2.0f, 0.0f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			bd.position = p1;
-			b2Body* leftFlipper = m_world->CreateBody(&bd);
-
-			bd.position = p2;
-			b2Body* rightFlipper = m_world->CreateBody(&bd);
-
-			b2PolygonShape box;
-			box.SetAsBox(1.75f, 0.1f);
-
-			b2FixtureDef fd;
-			fd.shape = &box;
-			fd.density = 1.0f;
-
-			leftFlipper->CreateFixture(&fd);
-			rightFlipper->CreateFixture(&fd);
-
-			b2RevoluteJointDef jd;
-			jd.bodyA = ground;
-			jd.localAnchorB.SetZero();
-			jd.enableMotor = true;
-			jd.maxMotorTorque = 1000.0f;
-			jd.enableLimit = true;
-
-			jd.motorSpeed = 0.0f;
-			jd.localAnchorA = p1;
-			jd.bodyB = leftFlipper;
-			jd.lowerAngle = -30.0f * b2_pi / 180.0f;
-			jd.upperAngle = 5.0f * b2_pi / 180.0f;
-			m_leftJoint = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-
-			jd.motorSpeed = 0.0f;
-			jd.localAnchorA = p2;
-			jd.bodyB = rightFlipper;
-			jd.lowerAngle = -5.0f * b2_pi / 180.0f;
-			jd.upperAngle = 30.0f * b2_pi / 180.0f;
-			m_rightJoint = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-		}
-
-		// Circle character
-		{
-			b2BodyDef bd;
-			bd.position.Set(1.0f, 15.0f);
-			bd.type = b2_dynamicBody;
-			bd.bullet = true;
-
-			m_ball = m_world->CreateBody(&bd);
-
-			b2CircleShape shape;
-			shape.m_radius = 0.2f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-			m_ball->CreateFixture(&fd);
-		}
-
-		m_button = false;
-	}
-
-	void Step(Settings& settings) override
-	{
-		if (m_button)
-		{
-			m_leftJoint->SetMotorSpeed(20.0f);
-			m_rightJoint->SetMotorSpeed(-20.0f);
-		}
-		else
-		{
-			m_leftJoint->SetMotorSpeed(-10.0f);
-			m_rightJoint->SetMotorSpeed(10.0f);
-		}
-
-		Test::Step(settings);
-
-		DrawString(5, m_textLine, "Press 'a' to control the flippers");
-		
-
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_button = true;
-			break;
-		}
-	}
-
-	void KeyboardUp(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_button = false;
-			break;
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Pinball;
-	}
-
-	b2RevoluteJoint* m_leftJoint;
-	b2RevoluteJoint* m_rightJoint;
-	b2Body* m_ball;
-	bool m_button;
+    Pinball()
+    {
+        // Ground body
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2Vec2 vs[5];
+            vs[0].Set(-8.0f, 6.0f);
+            vs[1].Set(-8.0f, 20.0f);
+            vs[2].Set(8.0f, 20.0f);
+            vs[3].Set(8.0f, 6.0f);
+            vs[4].Set(0.0f, -2.0f);
+
+            b2ChainShape loop;
+            loop.CreateLoop(vs, 5);
+            b2FixtureDef fd;
+            fd.shape   = &loop;
+            fd.density = 0.0f;
+            ground->CreateFixture(&fd);
+        }
+
+        // Flippers
+        {
+            b2Vec2 p1(-2.0f, 0.0f), p2(2.0f, 0.0f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            bd.position         = p1;
+            b2Body* leftFlipper = m_world->CreateBody(&bd);
+
+            bd.position          = p2;
+            b2Body* rightFlipper = m_world->CreateBody(&bd);
+
+            b2PolygonShape box;
+            box.SetAsBox(1.75f, 0.1f);
+
+            b2FixtureDef fd;
+            fd.shape   = &box;
+            fd.density = 1.0f;
+
+            leftFlipper->CreateFixture(&fd);
+            rightFlipper->CreateFixture(&fd);
+
+            b2RevoluteJointDef jd;
+            jd.bodyA = ground;
+            jd.localAnchorB.SetZero();
+            jd.enableMotor    = true;
+            jd.maxMotorTorque = 1000.0f;
+            jd.enableLimit    = true;
+
+            jd.motorSpeed   = 0.0f;
+            jd.localAnchorA = p1;
+            jd.bodyB        = leftFlipper;
+            jd.lowerAngle   = -30.0f * b2_pi / 180.0f;
+            jd.upperAngle   = 5.0f * b2_pi / 180.0f;
+            m_leftJoint     = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+
+            jd.motorSpeed   = 0.0f;
+            jd.localAnchorA = p2;
+            jd.bodyB        = rightFlipper;
+            jd.lowerAngle   = -5.0f * b2_pi / 180.0f;
+            jd.upperAngle   = 30.0f * b2_pi / 180.0f;
+            m_rightJoint    = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+        }
+
+        // Circle character
+        {
+            b2BodyDef bd;
+            bd.position.Set(1.0f, 15.0f);
+            bd.type   = b2_dynamicBody;
+            bd.bullet = true;
+
+            m_ball = m_world->CreateBody(&bd);
+
+            b2CircleShape shape;
+            shape.m_radius = 0.2f;
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+            m_ball->CreateFixture(&fd);
+        }
+
+        m_button = false;
+    }
+
+    void Step(Settings& settings) override
+    {
+        if (m_button)
+        {
+            m_leftJoint->SetMotorSpeed(20.0f);
+            m_rightJoint->SetMotorSpeed(-20.0f);
+        }
+        else
+        {
+            m_leftJoint->SetMotorSpeed(-10.0f);
+            m_rightJoint->SetMotorSpeed(10.0f);
+        }
+
+        Test::Step(settings);
+
+        DrawString(5, m_textLine, "Press 'a' to control the flippers");
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_button = true;
+            break;
+        }
+    }
+
+    void KeyboardUp(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_button = false;
+            break;
+        }
+    }
+
+    static Test* Create() { return new Pinball; }
+
+    b2RevoluteJoint* m_leftJoint;
+    b2RevoluteJoint* m_rightJoint;
+    b2Body* m_ball;
+    bool m_button;
 };
 
 static int testIndex = RegisterTest("Examples", "Pinball", Pinball::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/platformer.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/platformer.cpp
index 18b39b8a7ef7..c308f4922bac 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/platformer.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/platformer.cpp
@@ -25,109 +25,104 @@
 class Platformer : public Test
 {
 public:
+    enum State
+    {
+        e_unknown,
+        e_above,
+        e_below
+    };
+
+    Platformer()
+    {
+        // Ground
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Platform
+        {
+            b2BodyDef bd;
+            bd.position.Set(0.0f, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(3.0f, 0.5f);
+            m_platform = body->CreateFixture(&shape, 0.0f);
+
+            m_bottom = 10.0f - 0.5f;
+            m_top    = 10.0f + 0.5f;
+        }
+
+        // Actor
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 12.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            m_radius = 0.5f;
+            b2CircleShape shape;
+            shape.m_radius = m_radius;
+            m_character    = body->CreateFixture(&shape, 20.0f);
+
+            body->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
+
+            m_state = e_unknown;
+        }
+    }
 
-	enum State
-	{
-		e_unknown,
-		e_above,
-		e_below
-	};
-
-	Platformer()
-	{
-		// Ground
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-20.0f, 0.0f), b2Vec2(20.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Platform
-		{
-			b2BodyDef bd;
-			bd.position.Set(0.0f, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(3.0f, 0.5f);
-			m_platform = body->CreateFixture(&shape, 0.0f);
-
-			m_bottom = 10.0f - 0.5f;
-			m_top = 10.0f + 0.5f;
-		}
-
-		// Actor
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 12.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			m_radius = 0.5f;
-			b2CircleShape shape;
-			shape.m_radius = m_radius;
-			m_character = body->CreateFixture(&shape, 20.0f);
-
-			body->SetLinearVelocity(b2Vec2(0.0f, -50.0f));
-
-			m_state = e_unknown;
-		}
-	}
-
-	void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override
-	{
-		Test::PreSolve(contact, oldManifold);
-
-		b2Fixture* fixtureA = contact->GetFixtureA();
-		b2Fixture* fixtureB = contact->GetFixtureB();
-
-		if (fixtureA != m_platform && fixtureA != m_character)
-		{
-			return;
-		}
-
-		if (fixtureB != m_platform && fixtureB != m_character)
-		{
-			return;
-		}
+    void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override
+    {
+        Test::PreSolve(contact, oldManifold);
+
+        b2Fixture* fixtureA = contact->GetFixtureA();
+        b2Fixture* fixtureB = contact->GetFixtureB();
+
+        if (fixtureA != m_platform && fixtureA != m_character)
+        {
+            return;
+        }
+
+        if (fixtureB != m_platform && fixtureB != m_character)
+        {
+            return;
+        }
 
 #if 1
-		b2Vec2 position = m_character->GetBody()->GetPosition();
+        b2Vec2 position = m_character->GetBody()->GetPosition();
 
-		if (position.y < m_top + m_radius - 3.0f * b2_linearSlop)
-		{
-			contact->SetEnabled(false);
-		}
+        if (position.y < m_top + m_radius - 3.0f * b2_linearSlop)
+        {
+            contact->SetEnabled(false);
+        }
 #else
         b2Vec2 v = m_character->GetBody()->GetLinearVelocity();
         if (v.y > 0.0f)
-		{
+        {
             contact->SetEnabled(false);
         }
 #endif
-	}
+    }
 
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
 
-		b2Vec2 v = m_character->GetBody()->GetLinearVelocity();
+        b2Vec2 v = m_character->GetBody()->GetLinearVelocity();
         DrawString(5, m_textLine, "Character Linear Velocity: %f", v.y);
-		
-	}
-
-	static Test* Create()
-	{
-		return new Platformer;
-	}
-
-	float m_radius, m_top, m_bottom;
-	State m_state;
-	b2Fixture* m_platform;
-	b2Fixture* m_character;
+    }
+
+    static Test* Create() { return new Platformer; }
+
+    float m_radius, m_top, m_bottom;
+    State m_state;
+    b2Fixture* m_platform;
+    b2Fixture* m_character;
 };
 
 static int testIndex = RegisterTest("Examples", "Platformer", Platformer::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_collision.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_collision.cpp
index 558ad59c2751..dbc924694c2d 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_collision.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_collision.cpp
@@ -25,103 +25,99 @@
 class PolygonCollision : public Test
 {
 public:
-	PolygonCollision()
-	{
-		{
-			m_polygonA.SetAsBox(0.2f, 0.4f);
-			m_transformA.Set(b2Vec2(0.0f, 0.0f), 0.0f);
-		}
-
-		{
-			m_polygonB.SetAsBox(0.5f, 0.5f);
-			m_positionB.Set(19.345284f, 1.5632932f);
-			m_angleB = 1.9160721f;
-			m_transformB.Set(m_positionB, m_angleB);
-		}
-	}
-
-	static Test* Create()
-	{
-		return new PolygonCollision;
-	}
-
-	void Step(Settings& settings) override
-	{
-		B2_NOT_USED(settings);
-
-		b2Manifold manifold;
-		b2CollidePolygons(&manifold, &m_polygonA, m_transformA, &m_polygonB, m_transformB);
-
-		b2WorldManifold worldManifold;
-		worldManifold.Initialize(&manifold, m_transformA, m_polygonA.m_radius, m_transformB, m_polygonB.m_radius);
-
-		DrawString(5, m_textLine, "point count = %d", manifold.pointCount);
-		
-
-		{
-			b2Color color(0.9f, 0.9f, 0.9f);
-			b2Vec2 v[b2_maxPolygonVertices];
-			for (int32 i = 0; i < m_polygonA.m_count; ++i)
-			{
-				v[i] = b2Mul(m_transformA, m_polygonA.m_vertices[i]);
-			}
-			g_debugDraw.DrawPolygon(v, m_polygonA.m_count, color);
-
-			for (int32 i = 0; i < m_polygonB.m_count; ++i)
-			{
-				v[i] = b2Mul(m_transformB, m_polygonB.m_vertices[i]);
-			}
-			g_debugDraw.DrawPolygon(v, m_polygonB.m_count, color);
-		}
-
-		for (int32 i = 0; i < manifold.pointCount; ++i)
-		{
-			g_debugDraw.DrawPoint(worldManifold.points[i], 4.0f, b2Color(0.9f, 0.3f, 0.3f));
-		}
-
-		Test::Step(settings);
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_positionB.x -= 0.1f;
-			break;
-
-		case GLFW_KEY_D:
-			m_positionB.x += 0.1f;
-			break;
-
-		case GLFW_KEY_S:
-			m_positionB.y -= 0.1f;
-			break;
-
-		case GLFW_KEY_W:
-			m_positionB.y += 0.1f;
-			break;
-
-		case GLFW_KEY_Q:
-			m_angleB += 0.1f * b2_pi;
-			break;
-
-		case GLFW_KEY_E:
-			m_angleB -= 0.1f * b2_pi;
-			break;
-		}
-
-		m_transformB.Set(m_positionB, m_angleB);
-	}
-
-	b2PolygonShape m_polygonA;
-	b2PolygonShape m_polygonB;
-
-	b2Transform m_transformA;
-	b2Transform m_transformB;
-
-	b2Vec2 m_positionB;
-	float m_angleB;
+    PolygonCollision()
+    {
+        {
+            m_polygonA.SetAsBox(0.2f, 0.4f);
+            m_transformA.Set(b2Vec2(0.0f, 0.0f), 0.0f);
+        }
+
+        {
+            m_polygonB.SetAsBox(0.5f, 0.5f);
+            m_positionB.Set(19.345284f, 1.5632932f);
+            m_angleB = 1.9160721f;
+            m_transformB.Set(m_positionB, m_angleB);
+        }
+    }
+
+    static Test* Create() { return new PolygonCollision; }
+
+    void Step(Settings& settings) override
+    {
+        B2_NOT_USED(settings);
+
+        b2Manifold manifold;
+        b2CollidePolygons(&manifold, &m_polygonA, m_transformA, &m_polygonB, m_transformB);
+
+        b2WorldManifold worldManifold;
+        worldManifold.Initialize(&manifold, m_transformA, m_polygonA.m_radius, m_transformB, m_polygonB.m_radius);
+
+        DrawString(5, m_textLine, "point count = %d", manifold.pointCount);
+
+        {
+            b2Color color(0.9f, 0.9f, 0.9f);
+            b2Vec2 v[b2_maxPolygonVertices];
+            for (int32 i = 0; i < m_polygonA.m_count; ++i)
+            {
+                v[i] = b2Mul(m_transformA, m_polygonA.m_vertices[i]);
+            }
+            g_debugDraw.DrawPolygon(v, m_polygonA.m_count, color);
+
+            for (int32 i = 0; i < m_polygonB.m_count; ++i)
+            {
+                v[i] = b2Mul(m_transformB, m_polygonB.m_vertices[i]);
+            }
+            g_debugDraw.DrawPolygon(v, m_polygonB.m_count, color);
+        }
+
+        for (int32 i = 0; i < manifold.pointCount; ++i)
+        {
+            g_debugDraw.DrawPoint(worldManifold.points[i], 4.0f, b2Color(0.9f, 0.3f, 0.3f));
+        }
+
+        Test::Step(settings);
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_positionB.x -= 0.1f;
+            break;
+
+        case GLFW_KEY_D:
+            m_positionB.x += 0.1f;
+            break;
+
+        case GLFW_KEY_S:
+            m_positionB.y -= 0.1f;
+            break;
+
+        case GLFW_KEY_W:
+            m_positionB.y += 0.1f;
+            break;
+
+        case GLFW_KEY_Q:
+            m_angleB += 0.1f * b2_pi;
+            break;
+
+        case GLFW_KEY_E:
+            m_angleB -= 0.1f * b2_pi;
+            break;
+        }
+
+        m_transformB.Set(m_positionB, m_angleB);
+    }
+
+    b2PolygonShape m_polygonA;
+    b2PolygonShape m_polygonB;
+
+    b2Transform m_transformA;
+    b2Transform m_transformB;
+
+    b2Vec2 m_positionB;
+    float m_angleB;
 };
 
 static int testIndex = RegisterTest("Geometry", "Polygon Collision", PolygonCollision::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_shapes.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_shapes.cpp
index 2fa4c1cbc699..369f777ee85c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_shapes.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/polygon_shapes.cpp
@@ -31,235 +31,227 @@
 class PolygonShapesCallback : public b2QueryCallback
 {
 public:
-	
-	enum
-	{
-		e_maxCount = 4
-	};
-
-	PolygonShapesCallback()
-	{
-		m_count = 0;
-	}
-
-	/// Called for each fixture found in the query AABB.
-	/// @return false to terminate the query.
-	bool ReportFixture(b2Fixture* fixture) override
-	{
-		if (m_count == e_maxCount)
-		{
-			return false;
-		}
-
-		b2Body* body = fixture->GetBody();
-		b2Shape* shape = fixture->GetShape();
-
-		bool overlap = b2TestOverlap(shape, 0, &m_circle, 0, body->GetTransform(), m_transform);
-			
-		if (overlap)
-		{
-			b2Color color(0.95f, 0.95f, 0.6f);
-			b2Vec2 center = body->GetWorldCenter();
-			g_debugDraw->DrawPoint(center, 5.0f, color);
-			++m_count;
-		}
-
-		return true;
-	}
-
-	b2CircleShape m_circle;
-	b2Transform m_transform;
-	b2Draw* g_debugDraw;
-	int32 m_count;
+    enum
+    {
+        e_maxCount = 4
+    };
+
+    PolygonShapesCallback() { m_count = 0; }
+
+    /// Called for each fixture found in the query AABB.
+    /// @return false to terminate the query.
+    bool ReportFixture(b2Fixture* fixture) override
+    {
+        if (m_count == e_maxCount)
+        {
+            return false;
+        }
+
+        b2Body* body   = fixture->GetBody();
+        b2Shape* shape = fixture->GetShape();
+
+        bool overlap = b2TestOverlap(shape, 0, &m_circle, 0, body->GetTransform(), m_transform);
+
+        if (overlap)
+        {
+            b2Color color(0.95f, 0.95f, 0.6f);
+            b2Vec2 center = body->GetWorldCenter();
+            g_debugDraw->DrawPoint(center, 5.0f, color);
+            ++m_count;
+        }
+
+        return true;
+    }
+
+    b2CircleShape m_circle;
+    b2Transform m_transform;
+    b2Draw* g_debugDraw;
+    int32 m_count;
 };
 
 class PolygonShapes : public Test
 {
 public:
-
-	enum
-	{
-		e_maxBodies = 256
-	};
-
-	PolygonShapes()
-	{
-		// Ground body
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.5f, 0.0f);
-			vertices[1].Set(0.5f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-			m_polygons[0].Set(vertices, 3);
-		}
-		
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.1f, 0.0f);
-			vertices[1].Set(0.1f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-			m_polygons[1].Set(vertices, 3);
-		}
-
-		{
-			float w = 1.0f;
-			float b = w / (2.0f + b2Sqrt(2.0f));
-			float s = b2Sqrt(2.0f) * b;
-
-			b2Vec2 vertices[8];
-			vertices[0].Set(0.5f * s, 0.0f);
-			vertices[1].Set(0.5f * w, b);
-			vertices[2].Set(0.5f * w, b + s);
-			vertices[3].Set(0.5f * s, w);
-			vertices[4].Set(-0.5f * s, w);
-			vertices[5].Set(-0.5f * w, b + s);
-			vertices[6].Set(-0.5f * w, b);
-			vertices[7].Set(-0.5f * s, 0.0f);
-
-			m_polygons[2].Set(vertices, 8);
-		}
-
-		{
-			m_polygons[3].SetAsBox(0.5f, 0.5f);
-		}
-
-		{
-			m_circle.m_radius = 0.5f;
-		}
-
-		m_bodyIndex = 0;
-		memset(m_bodies, 0, sizeof(m_bodies));
-	}
-
-	void Create(int32 index)
-	{
-		if (m_bodies[m_bodyIndex] != NULL)
-		{
-			m_world->DestroyBody(m_bodies[m_bodyIndex]);
-			m_bodies[m_bodyIndex] = NULL;
-		}
-
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-
-		float x = RandomFloat(-2.0f, 2.0f);
-		bd.position.Set(x, 10.0f);
-		bd.angle = RandomFloat(-b2_pi, b2_pi);
-
-		if (index == 4)
-		{
-			bd.angularDamping = 0.02f;
-		}
-
-		m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
-
-		if (index < 4)
-		{
-			b2FixtureDef fd;
-			fd.shape = m_polygons + index;
-			fd.density = 1.0f;
-			fd.friction = 0.3f;
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-		else
-		{
-			b2FixtureDef fd;
-			fd.shape = &m_circle;
-			fd.density = 1.0f;
-			fd.friction = 0.3f;
-
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-
-		m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
-	}
-
-	void DestroyBody()
-	{
-		for (int32 i = 0; i < e_maxBodies; ++i)
-		{
-			if (m_bodies[i] != NULL)
-			{
-				m_world->DestroyBody(m_bodies[i]);
-				m_bodies[i] = NULL;
-				return;
-			}
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_1:
-		case GLFW_KEY_2:
-		case GLFW_KEY_3:
-		case GLFW_KEY_4:
-		case GLFW_KEY_5:
-			Create(key - GLFW_KEY_1);
-			break;
-
-		case GLFW_KEY_A:
-			for (int32 i = 0; i < e_maxBodies; i += 2)
-			{
-				if (m_bodies[i])
-				{
-					bool enabled = m_bodies[i]->IsEnabled();
-					m_bodies[i]->SetEnabled(!enabled);
-				}
-			}
-			break;
-
-		case GLFW_KEY_D:
-			DestroyBody();
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		PolygonShapesCallback callback;
-		callback.m_circle.m_radius = 2.0f;
-		callback.m_circle.m_p.Set(0.0f, 1.1f);
-		callback.m_transform.SetIdentity();
-		callback.g_debugDraw = &g_debugDraw;
-
-		b2AABB aabb;
-		callback.m_circle.ComputeAABB(&aabb, callback.m_transform, 0);
-
-		m_world->QueryAABB(&callback, aabb);
-
-		b2Color color(0.4f, 0.7f, 0.8f);
-		g_debugDraw.DrawCircle(callback.m_circle.m_p, callback.m_circle.m_radius, color);
-
-		DrawString(5, m_textLine, "Press 1-5 to drop stuff, maximum of %d overlaps detected", PolygonShapesCallback::e_maxCount);
-		
-		DrawString(5, m_textLine, "Press 'a' to enable/disable some bodies");
-		
-		DrawString(5, m_textLine, "Press 'd' to destroy a body");
-		
-	}
-
-	static Test* Create()
-	{
-		return new PolygonShapes;
-	}
-
-	int32 m_bodyIndex;
-	b2Body* m_bodies[e_maxBodies];
-	b2PolygonShape m_polygons[4];
-	b2CircleShape m_circle;
+    enum
+    {
+        e_maxBodies = 256
+    };
+
+    PolygonShapes()
+    {
+        // Ground body
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.5f, 0.0f);
+            vertices[1].Set(0.5f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[0].Set(vertices, 3);
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.1f, 0.0f);
+            vertices[1].Set(0.1f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[1].Set(vertices, 3);
+        }
+
+        {
+            float w = 1.0f;
+            float b = w / (2.0f + b2Sqrt(2.0f));
+            float s = b2Sqrt(2.0f) * b;
+
+            b2Vec2 vertices[8];
+            vertices[0].Set(0.5f * s, 0.0f);
+            vertices[1].Set(0.5f * w, b);
+            vertices[2].Set(0.5f * w, b + s);
+            vertices[3].Set(0.5f * s, w);
+            vertices[4].Set(-0.5f * s, w);
+            vertices[5].Set(-0.5f * w, b + s);
+            vertices[6].Set(-0.5f * w, b);
+            vertices[7].Set(-0.5f * s, 0.0f);
+
+            m_polygons[2].Set(vertices, 8);
+        }
+
+        {
+            m_polygons[3].SetAsBox(0.5f, 0.5f);
+        }
+
+        {
+            m_circle.m_radius = 0.5f;
+        }
+
+        m_bodyIndex = 0;
+        memset(m_bodies, 0, sizeof(m_bodies));
+    }
+
+    void Create(int32 index)
+    {
+        if (m_bodies[m_bodyIndex] != NULL)
+        {
+            m_world->DestroyBody(m_bodies[m_bodyIndex]);
+            m_bodies[m_bodyIndex] = NULL;
+        }
+
+        b2BodyDef bd;
+        bd.type = b2_dynamicBody;
+
+        float x = RandomFloat(-2.0f, 2.0f);
+        bd.position.Set(x, 10.0f);
+        bd.angle = RandomFloat(-b2_pi, b2_pi);
+
+        if (index == 4)
+        {
+            bd.angularDamping = 0.02f;
+        }
+
+        m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
+
+        if (index < 4)
+        {
+            b2FixtureDef fd;
+            fd.shape    = m_polygons + index;
+            fd.density  = 1.0f;
+            fd.friction = 0.3f;
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+        else
+        {
+            b2FixtureDef fd;
+            fd.shape    = &m_circle;
+            fd.density  = 1.0f;
+            fd.friction = 0.3f;
+
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+
+        m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
+    }
+
+    void DestroyBody()
+    {
+        for (int32 i = 0; i < e_maxBodies; ++i)
+        {
+            if (m_bodies[i] != NULL)
+            {
+                m_world->DestroyBody(m_bodies[i]);
+                m_bodies[i] = NULL;
+                return;
+            }
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_1:
+        case GLFW_KEY_2:
+        case GLFW_KEY_3:
+        case GLFW_KEY_4:
+        case GLFW_KEY_5:
+            Create(key - GLFW_KEY_1);
+            break;
+
+        case GLFW_KEY_A:
+            for (int32 i = 0; i < e_maxBodies; i += 2)
+            {
+                if (m_bodies[i])
+                {
+                    bool enabled = m_bodies[i]->IsEnabled();
+                    m_bodies[i]->SetEnabled(!enabled);
+                }
+            }
+            break;
+
+        case GLFW_KEY_D:
+            DestroyBody();
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        PolygonShapesCallback callback;
+        callback.m_circle.m_radius = 2.0f;
+        callback.m_circle.m_p.Set(0.0f, 1.1f);
+        callback.m_transform.SetIdentity();
+        callback.g_debugDraw = &g_debugDraw;
+
+        b2AABB aabb;
+        callback.m_circle.ComputeAABB(&aabb, callback.m_transform, 0);
+
+        m_world->QueryAABB(&callback, aabb);
+
+        b2Color color(0.4f, 0.7f, 0.8f);
+        g_debugDraw.DrawCircle(callback.m_circle.m_p, callback.m_circle.m_radius, color);
+
+        DrawString(5, m_textLine, "Press 1-5 to drop stuff, maximum of %d overlaps detected",
+                   PolygonShapesCallback::e_maxCount);
+
+        DrawString(5, m_textLine, "Press 'a' to enable/disable some bodies");
+
+        DrawString(5, m_textLine, "Press 'd' to destroy a body");
+    }
+
+    static Test* Create() { return new PolygonShapes; }
+
+    int32 m_bodyIndex;
+    b2Body* m_bodies[e_maxBodies];
+    b2PolygonShape m_polygons[4];
+    b2CircleShape m_circle;
 };
 
 static int testIndex = RegisterTest("Geometry", "Polygon Shapes", PolygonShapes::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/prismatic_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/prismatic_joint.cpp
index b63d6c5f9260..d078c31b8ee1 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/prismatic_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/prismatic_joint.cpp
@@ -28,91 +28,87 @@
 class PrismaticJoint : public Test
 {
 public:
-	PrismaticJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		m_enableLimit = true;
-		m_enableMotor = false;
-		m_motorSpeed = 10.0f;
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(1.0f, 1.0f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 10.0f);
-			bd.angle = 0.5f * b2_pi;
-			bd.allowSleep = false;
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 5.0f);
-
-			b2PrismaticJointDef pjd;
-
-			// Horizontal
-			pjd.Initialize(ground, body, bd.position, b2Vec2(1.0f, 0.0f));
-
-			pjd.motorSpeed = m_motorSpeed;
-			pjd.maxMotorForce = 10000.0f;
-			pjd.enableMotor = m_enableMotor;
-			pjd.lowerTranslation = -10.0f;
-			pjd.upperTranslation = 10.0f;
-			pjd.enableLimit = m_enableLimit;
-
-			m_joint = (b2PrismaticJoint*)m_world->CreateJoint(&pjd);
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Checkbox("Limit", &m_enableLimit))
-		{
-			m_joint->EnableLimit(m_enableLimit);
-		}
-
-		if (ImGui::Checkbox("Motor", &m_enableMotor))
-		{
-			m_joint->EnableMotor(m_enableMotor);
-		}
-
-		if (ImGui::SliderFloat("Speed", &m_motorSpeed, -100.0f, 100.0f, "%.0f"))
-		{
-			m_joint->SetMotorSpeed(m_motorSpeed);
-		}
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		float force = m_joint->GetMotorForce(settings.m_hertz);
-		DrawString(5, m_textLine, "Motor Force = %4.0f", force);
-		
-	}
-
-	static Test* Create()
-	{
-		return new PrismaticJoint;
-	}
-
-	b2PrismaticJoint* m_joint;
-	float m_motorSpeed;
-	bool m_enableMotor;
-	bool m_enableLimit;
+    PrismaticJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        m_enableLimit = true;
+        m_enableMotor = false;
+        m_motorSpeed  = 10.0f;
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(1.0f, 1.0f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 10.0f);
+            bd.angle      = 0.5f * b2_pi;
+            bd.allowSleep = false;
+            b2Body* body  = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 5.0f);
+
+            b2PrismaticJointDef pjd;
+
+            // Horizontal
+            pjd.Initialize(ground, body, bd.position, b2Vec2(1.0f, 0.0f));
+
+            pjd.motorSpeed       = m_motorSpeed;
+            pjd.maxMotorForce    = 10000.0f;
+            pjd.enableMotor      = m_enableMotor;
+            pjd.lowerTranslation = -10.0f;
+            pjd.upperTranslation = 10.0f;
+            pjd.enableLimit      = m_enableLimit;
+
+            m_joint = (b2PrismaticJoint*)m_world->CreateJoint(&pjd);
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Checkbox("Limit", &m_enableLimit))
+        {
+            m_joint->EnableLimit(m_enableLimit);
+        }
+
+        if (ImGui::Checkbox("Motor", &m_enableMotor))
+        {
+            m_joint->EnableMotor(m_enableMotor);
+        }
+
+        if (ImGui::SliderFloat("Speed", &m_motorSpeed, -100.0f, 100.0f, "%.0f"))
+        {
+            m_joint->SetMotorSpeed(m_motorSpeed);
+        }
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+        float force = m_joint->GetMotorForce(settings.m_hertz);
+        DrawString(5, m_textLine, "Motor Force = %4.0f", force);
+    }
+
+    static Test* Create() { return new PrismaticJoint; }
+
+    b2PrismaticJoint* m_joint;
+    float m_motorSpeed;
+    bool m_enableMotor;
+    bool m_enableLimit;
 };
 
 static int testIndex = RegisterTest("Joints", "Prismatic", PrismaticJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/pulley_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/pulley_joint.cpp
index 83dcd6e28347..b724673d148a 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/pulley_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/pulley_joint.cpp
@@ -25,72 +25,68 @@
 class PulleyJoint : public Test
 {
 public:
-	PulleyJoint()
-	{
-		float y = 16.0f;
-		float L = 12.0f;
-		float a = 1.0f;
-		float b = 2.0f;
-
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2CircleShape circle;
-			circle.m_radius = 2.0f;
-
-			circle.m_p.Set(-10.0f, y + b + L);
-			ground->CreateFixture(&circle, 0.0f);
-
-			circle.m_p.Set(10.0f, y + b + L);
-			ground->CreateFixture(&circle, 0.0f);
-		}
-
-		{
-
-			b2PolygonShape shape;
-			shape.SetAsBox(a, b);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			//bd.fixedRotation = true;
-			bd.position.Set(-10.0f, y);
-			b2Body* body1 = m_world->CreateBody(&bd);
-			body1->CreateFixture(&shape, 5.0f);
-
-			bd.position.Set(10.0f, y);
-			b2Body* body2 = m_world->CreateBody(&bd);
-			body2->CreateFixture(&shape, 5.0f);
-
-			b2PulleyJointDef pulleyDef;
-			b2Vec2 anchor1(-10.0f, y + b);
-			b2Vec2 anchor2(10.0f, y + b);
-			b2Vec2 groundAnchor1(-10.0f, y + b + L);
-			b2Vec2 groundAnchor2(10.0f, y + b + L);
-			pulleyDef.Initialize(body1, body2, groundAnchor1, groundAnchor2, anchor1, anchor2, 1.5f);
-
-			m_joint1 = (b2PulleyJoint*)m_world->CreateJoint(&pulleyDef);
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		float ratio = m_joint1->GetRatio();
-		float L = m_joint1->GetCurrentLengthA() + ratio * m_joint1->GetCurrentLengthB();
-		DrawString(5, m_textLine, "L1 + %4.2f * L2 = %4.2f", (float) ratio, (float) L);
-		
-	}
-
-	static Test* Create()
-	{
-		return new PulleyJoint;
-	}
-
-	b2PulleyJoint* m_joint1;
+    PulleyJoint()
+    {
+        float y = 16.0f;
+        float L = 12.0f;
+        float a = 1.0f;
+        float b = 2.0f;
+
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2CircleShape circle;
+            circle.m_radius = 2.0f;
+
+            circle.m_p.Set(-10.0f, y + b + L);
+            ground->CreateFixture(&circle, 0.0f);
+
+            circle.m_p.Set(10.0f, y + b + L);
+            ground->CreateFixture(&circle, 0.0f);
+        }
+
+        {
+
+            b2PolygonShape shape;
+            shape.SetAsBox(a, b);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            // bd.fixedRotation = true;
+            bd.position.Set(-10.0f, y);
+            b2Body* body1 = m_world->CreateBody(&bd);
+            body1->CreateFixture(&shape, 5.0f);
+
+            bd.position.Set(10.0f, y);
+            b2Body* body2 = m_world->CreateBody(&bd);
+            body2->CreateFixture(&shape, 5.0f);
+
+            b2PulleyJointDef pulleyDef;
+            b2Vec2 anchor1(-10.0f, y + b);
+            b2Vec2 anchor2(10.0f, y + b);
+            b2Vec2 groundAnchor1(-10.0f, y + b + L);
+            b2Vec2 groundAnchor2(10.0f, y + b + L);
+            pulleyDef.Initialize(body1, body2, groundAnchor1, groundAnchor2, anchor1, anchor2, 1.5f);
+
+            m_joint1 = (b2PulleyJoint*)m_world->CreateJoint(&pulleyDef);
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        float ratio = m_joint1->GetRatio();
+        float L     = m_joint1->GetCurrentLengthA() + ratio * m_joint1->GetCurrentLengthB();
+        DrawString(5, m_textLine, "L1 + %4.2f * L2 = %4.2f", (float)ratio, (float)L);
+    }
+
+    static Test* Create() { return new PulleyJoint; }
+
+    b2PulleyJoint* m_joint1;
 };
 
 static int testIndex = RegisterTest("Joints", "Pulley", PulleyJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/pyramid.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/pyramid.cpp
index ee90d5d01b45..5f527451601a 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/pyramid.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/pyramid.cpp
@@ -25,68 +25,65 @@
 class Pyramid : public Test
 {
 public:
-	enum
-	{
-		e_count = 20
-	};
-
-	Pyramid()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			float a = 0.5f;
-			b2PolygonShape shape;
-			shape.SetAsBox(a, a);
-
-			b2Vec2 x(-7.0f, 0.75f);
-			b2Vec2 y;
-			b2Vec2 deltaX(0.5625f, 1.25f);
-			b2Vec2 deltaY(1.125f, 0.0f);
-
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				y = x;
-
-				for (int32 j = i; j < e_count; ++j)
-				{
-					b2BodyDef bd;
-					bd.type = b2_dynamicBody;
-					bd.position = y;
-					b2Body* body = m_world->CreateBody(&bd);
-					body->CreateFixture(&shape, 5.0f);
-
-					y += deltaY;
-				}
-
-				x += deltaX;
-			}
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		//b2DynamicTree* tree = &m_world->m_contactManager.m_broadPhase.m_tree;
-
-		//if (m_stepCount == 400)
-		//{
-		//	tree->RebuildBottomUp();
-		//}
-	}
-
-	static Test* Create()
-	{
-		return new Pyramid;
-	}
+    enum
+    {
+        e_count = 20
+    };
+
+    Pyramid()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            float a = 0.5f;
+            b2PolygonShape shape;
+            shape.SetAsBox(a, a);
+
+            b2Vec2 x(-7.0f, 0.75f);
+            b2Vec2 y;
+            b2Vec2 deltaX(0.5625f, 1.25f);
+            b2Vec2 deltaY(1.125f, 0.0f);
+
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                y = x;
+
+                for (int32 j = i; j < e_count; ++j)
+                {
+                    b2BodyDef bd;
+                    bd.type      = b2_dynamicBody;
+                    bd.position  = y;
+                    b2Body* body = m_world->CreateBody(&bd);
+                    body->CreateFixture(&shape, 5.0f);
+
+                    y += deltaY;
+                }
+
+                x += deltaX;
+            }
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        // b2DynamicTree* tree = &m_world->m_contactManager.m_broadPhase.m_tree;
+
+        // if (m_stepCount == 400)
+        //{
+        //	tree->RebuildBottomUp();
+        // }
+    }
+
+    static Test* Create() { return new Pyramid; }
 };
 
 static int testIndex = RegisterTest("Stacking", "Pyramid", Pyramid::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/ray_cast.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/ray_cast.cpp
index 4dba339838ee..0f31b5d4c908 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/ray_cast.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/ray_cast.cpp
@@ -26,7 +26,7 @@
 
 enum
 {
-	e_maxBodies = 256
+    e_maxBodies = 256
 };
 
 // This test demonstrates how to use the world ray-cast feature.
@@ -37,68 +37,62 @@ enum
 class RayCastClosestCallback : public b2RayCastCallback
 {
 public:
-	RayCastClosestCallback()
-	{
-		m_hit = false;
-	}
-
-	float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float fraction) override
-	{
-		uintptr_t index = fixture->GetUserData().pointer;
-		if (index == 1)
-		{
-			// By returning -1, we instruct the calling code to ignore this fixture and
-			// continue the ray-cast to the next fixture.
-			return -1.0f;
-		}
-
-		m_hit = true;
-		m_point = point;
-		m_normal = normal;
-
-		// By returning the current fraction, we instruct the calling code to clip the ray and
-		// continue the ray-cast to the next fixture. WARNING: do not assume that fixtures
-		// are reported in order. However, by clipping, we can always get the closest fixture.
-		return fraction;
-	}
-	
-	bool m_hit;
-	b2Vec2 m_point;
-	b2Vec2 m_normal;
+    RayCastClosestCallback() { m_hit = false; }
+
+    float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float fraction) override
+    {
+        uintptr_t index = fixture->GetUserData().pointer;
+        if (index == 1)
+        {
+            // By returning -1, we instruct the calling code to ignore this fixture and
+            // continue the ray-cast to the next fixture.
+            return -1.0f;
+        }
+
+        m_hit    = true;
+        m_point  = point;
+        m_normal = normal;
+
+        // By returning the current fraction, we instruct the calling code to clip the ray and
+        // continue the ray-cast to the next fixture. WARNING: do not assume that fixtures
+        // are reported in order. However, by clipping, we can always get the closest fixture.
+        return fraction;
+    }
+
+    bool m_hit;
+    b2Vec2 m_point;
+    b2Vec2 m_normal;
 };
 
 // This callback finds any hit. Polygon 0 is filtered. For this type of query we are usually
-// just checking for obstruction, so the actual fixture and hit point are irrelevant. 
+// just checking for obstruction, so the actual fixture and hit point are irrelevant.
 class RayCastAnyCallback : public b2RayCastCallback
 {
 public:
-	RayCastAnyCallback()
-	{
-		m_hit = false;
-	}
-
-	float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float) override
-	{
-		uintptr_t index = fixture->GetUserData().pointer;
-		if (index == 1)
-		{
-			// By returning -1, we instruct the calling code to ignore this fixture and
-			// continue the ray-cast to the next fixture.
-			return -1.0f;
-		}
-
-		m_hit = true;
-		m_point = point;
-		m_normal = normal;
-
-		// At this point we have a hit, so we know the ray is obstructed.
-		// By returning 0, we instruct the calling code to terminate the ray-cast.
-		return 0.0f;
-	}
-
-	bool m_hit;
-	b2Vec2 m_point;
-	b2Vec2 m_normal;
+    RayCastAnyCallback() { m_hit = false; }
+
+    float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float) override
+    {
+        uintptr_t index = fixture->GetUserData().pointer;
+        if (index == 1)
+        {
+            // By returning -1, we instruct the calling code to ignore this fixture and
+            // continue the ray-cast to the next fixture.
+            return -1.0f;
+        }
+
+        m_hit    = true;
+        m_point  = point;
+        m_normal = normal;
+
+        // At this point we have a hit, so we know the ray is obstructed.
+        // By returning 0, we instruct the calling code to terminate the ray-cast.
+        return 0.0f;
+    }
+
+    bool m_hit;
+    b2Vec2 m_point;
+    b2Vec2 m_normal;
 };
 
 // This ray cast collects multiple hits along the ray. Polygon 0 is filtered.
@@ -107,319 +101,312 @@ class RayCastAnyCallback : public b2RayCastCallback
 class RayCastMultipleCallback : public b2RayCastCallback
 {
 public:
-	enum
-	{
-		e_maxCount = 3
-	};
-
-	RayCastMultipleCallback()
-	{
-		m_count = 0;
-	}
-
-	float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float) override
-	{
-		uintptr_t index = fixture->GetUserData().pointer;
-		if (index == 1)
-		{
-			// By returning -1, we instruct the calling code to ignore this fixture and
-			// continue the ray-cast to the next fixture.
-			return -1.0f;
-		}
-
-		b2Assert(m_count < e_maxCount);
-
-		m_points[m_count] = point;
-		m_normals[m_count] = normal;
-		++m_count;
-
-		if (m_count == e_maxCount)
-		{
-			// At this point the buffer is full.
-			// By returning 0, we instruct the calling code to terminate the ray-cast.
-			return 0.0f;
-		}
-
-		// By returning 1, we instruct the caller to continue without clipping the ray.
-		return 1.0f;
-	}
-
-	b2Vec2 m_points[e_maxCount];
-	b2Vec2 m_normals[e_maxCount];
-	int32 m_count;
+    enum
+    {
+        e_maxCount = 3
+    };
+
+    RayCastMultipleCallback() { m_count = 0; }
+
+    float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float) override
+    {
+        uintptr_t index = fixture->GetUserData().pointer;
+        if (index == 1)
+        {
+            // By returning -1, we instruct the calling code to ignore this fixture and
+            // continue the ray-cast to the next fixture.
+            return -1.0f;
+        }
+
+        b2Assert(m_count < e_maxCount);
+
+        m_points[m_count]  = point;
+        m_normals[m_count] = normal;
+        ++m_count;
+
+        if (m_count == e_maxCount)
+        {
+            // At this point the buffer is full.
+            // By returning 0, we instruct the calling code to terminate the ray-cast.
+            return 0.0f;
+        }
+
+        // By returning 1, we instruct the caller to continue without clipping the ray.
+        return 1.0f;
+    }
+
+    b2Vec2 m_points[e_maxCount];
+    b2Vec2 m_normals[e_maxCount];
+    int32 m_count;
 };
 
-
 class RayCast : public Test
 {
 public:
-
-	enum Mode
-	{
-		e_any = 0,
-		e_closest = 1,
-		e_multiple = 2
-	};
-
-	RayCast()
-	{
-		// Ground body
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.5f, 0.0f);
-			vertices[1].Set(0.5f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-			m_polygons[0].Set(vertices, 3);
-		}
-
-		{
-			b2Vec2 vertices[3];
-			vertices[0].Set(-0.1f, 0.0f);
-			vertices[1].Set(0.1f, 0.0f);
-			vertices[2].Set(0.0f, 1.5f);
-			m_polygons[1].Set(vertices, 3);
-		}
-
-		{
-			float w = 1.0f;
-			float b = w / (2.0f + b2Sqrt(2.0f));
-			float s = b2Sqrt(2.0f) * b;
-
-			b2Vec2 vertices[8];
-			vertices[0].Set(0.5f * s, 0.0f);
-			vertices[1].Set(0.5f * w, b);
-			vertices[2].Set(0.5f * w, b + s);
-			vertices[3].Set(0.5f * s, w);
-			vertices[4].Set(-0.5f * s, w);
-			vertices[5].Set(-0.5f * w, b + s);
-			vertices[6].Set(-0.5f * w, b);
-			vertices[7].Set(-0.5f * s, 0.0f);
-
-			m_polygons[2].Set(vertices, 8);
-		}
-
-		{
-			m_polygons[3].SetAsBox(0.5f, 0.5f);
-		}
-
-		{
-			m_circle.m_radius = 0.5f;
-		}
-
-		{
-			m_edge.SetTwoSided(b2Vec2(-1.0f, 0.0f), b2Vec2(1.0f, 0.0f));
-		}
-
-		m_bodyIndex = 0;
-		memset(m_bodies, 0, sizeof(m_bodies));
-
-		m_degrees = 0.0f;
-
-		m_mode = e_closest;
-	}
-
-	void Create(int32 index)
-	{
-		if (m_bodies[m_bodyIndex] != NULL)
-		{
-			m_world->DestroyBody(m_bodies[m_bodyIndex]);
-			m_bodies[m_bodyIndex] = NULL;
-		}
-
-		b2BodyDef bd;
-
-		float x = RandomFloat(-10.0f, 10.0f);
-		float y = RandomFloat(0.0f, 20.0f);
-		bd.position.Set(x, y);
-		bd.angle = RandomFloat(-b2_pi, b2_pi);
-
-		if (index == 4)
-		{
-			bd.angularDamping = 0.02f;
-		}
-
-		m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
-
-		if (index < 4)
-		{
-			b2FixtureDef fd;
-			fd.shape = m_polygons + index;
-			fd.friction = 0.3f;
-			fd.userData.pointer = index + 1;
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-		else if (index < 5)
-		{
-			b2FixtureDef fd;
-			fd.shape = &m_circle;
-			fd.friction = 0.3f;
-			fd.userData.pointer = index + 1;
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-		else
-		{
-			b2FixtureDef fd;
-			fd.shape = &m_edge;
-			fd.friction = 0.3f;
-			fd.userData.pointer = index + 1;
-
-			m_bodies[m_bodyIndex]->CreateFixture(&fd);
-		}
-
-		m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
-	}
-
-	void DestroyBody()
-	{
-		for (int32 i = 0; i < e_maxBodies; ++i)
-		{
-			if (m_bodies[i] != NULL)
-			{
-				m_world->DestroyBody(m_bodies[i]);
-				m_bodies[i] = NULL;
-				return;
-			}
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(g_debugDrawTestBed.debugNodeOffset.x, g_debugDrawTestBed.debugNodeOffset.y));
-		ImGui::SetNextWindowSize(ImVec2(210.0f, 285.0f));
-		ImGui::Begin("Ray-cast Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Button("Shape 1"))
-		{
-			Create(0);
-		}
-
-		if (ImGui::Button("Shape 2"))
-		{
-			Create(1);
-		}
-
-		if (ImGui::Button("Shape 3"))
-		{
-			Create(2);
-		}
-
-		if (ImGui::Button("Shape 4"))
-		{
-			Create(3);
-		}
-
-		if (ImGui::Button("Shape 5"))
-		{
-			Create(4);
-		}
-
-		if (ImGui::Button("Shape 6"))
-		{
-			Create(5);
-		}
-
-		if (ImGui::Button("Destroy Shape"))
-		{
-			DestroyBody();
-		}
-
-		ImGui::RadioButton("Any", &m_mode, e_any);
-		ImGui::RadioButton("Closest", &m_mode, e_closest);
-		ImGui::RadioButton("Multiple", &m_mode, e_multiple);
-
-		ImGui::SliderFloat("Angle", &m_degrees, 0.0f, 360.0f, "%.0f");
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		DrawString(5, m_textLine, "Shape 1 is intentionally ignored by the ray");
-		
-		switch (m_mode)
-		{
-		case e_closest:
-			DrawString(5, m_textLine, "Ray-cast mode: closest - find closest fixture along the ray");
-			break;
-		
-		case e_any:
-			DrawString(5, m_textLine, "Ray-cast mode: any - check for obstruction");
-			break;
-
-		case e_multiple:
-			DrawString(5, m_textLine, "Ray-cast mode: multiple - gather multiple fixtures");
-			break;
-		}
-
-		
-
-		float angle = b2_pi * m_degrees / 180.0f;
-		float L = 11.0f;
-		b2Vec2 point1(0.0f, 10.0f);
-		b2Vec2 d(L * cosf(angle), L * sinf(angle));
-		b2Vec2 point2 = point1 + d;
-
-		if (m_mode == e_closest)
-		{
-			RayCastClosestCallback callback;
-			m_world->RayCast(&callback, point1, point2);
-
-			if (callback.m_hit)
-			{
-				g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
-				g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
-				b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
-				g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
-			}
-			else
-			{
-				g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
-			}
-		}
-		else if (m_mode == e_any)
-		{
-			RayCastAnyCallback callback;
-			m_world->RayCast(&callback, point1, point2);
-
-			if (callback.m_hit)
-			{
-				g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
-				g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
-				b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
-				g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
-			}
-			else
-			{
-				g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
-			}
-		}
-		else if (m_mode == e_multiple)
-		{
-			RayCastMultipleCallback callback;
-			m_world->RayCast(&callback, point1, point2);
-			g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
-
-			for (int32 i = 0; i < callback.m_count; ++i)
-			{
-				b2Vec2 p = callback.m_points[i];
-				b2Vec2 n = callback.m_normals[i];
-				g_debugDraw.DrawPoint(p, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
-				g_debugDraw.DrawSegment(point1, p, b2Color(0.8f, 0.8f, 0.8f));
-				b2Vec2 head = p + 0.5f * n;
-				g_debugDraw.DrawSegment(p, head, b2Color(0.9f, 0.9f, 0.4f));
-			}
-		}
+    enum Mode
+    {
+        e_any      = 0,
+        e_closest  = 1,
+        e_multiple = 2
+    };
+
+    RayCast()
+    {
+        // Ground body
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.5f, 0.0f);
+            vertices[1].Set(0.5f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[0].Set(vertices, 3);
+        }
+
+        {
+            b2Vec2 vertices[3];
+            vertices[0].Set(-0.1f, 0.0f);
+            vertices[1].Set(0.1f, 0.0f);
+            vertices[2].Set(0.0f, 1.5f);
+            m_polygons[1].Set(vertices, 3);
+        }
+
+        {
+            float w = 1.0f;
+            float b = w / (2.0f + b2Sqrt(2.0f));
+            float s = b2Sqrt(2.0f) * b;
+
+            b2Vec2 vertices[8];
+            vertices[0].Set(0.5f * s, 0.0f);
+            vertices[1].Set(0.5f * w, b);
+            vertices[2].Set(0.5f * w, b + s);
+            vertices[3].Set(0.5f * s, w);
+            vertices[4].Set(-0.5f * s, w);
+            vertices[5].Set(-0.5f * w, b + s);
+            vertices[6].Set(-0.5f * w, b);
+            vertices[7].Set(-0.5f * s, 0.0f);
+
+            m_polygons[2].Set(vertices, 8);
+        }
+
+        {
+            m_polygons[3].SetAsBox(0.5f, 0.5f);
+        }
+
+        {
+            m_circle.m_radius = 0.5f;
+        }
+
+        {
+            m_edge.SetTwoSided(b2Vec2(-1.0f, 0.0f), b2Vec2(1.0f, 0.0f));
+        }
+
+        m_bodyIndex = 0;
+        memset(m_bodies, 0, sizeof(m_bodies));
+
+        m_degrees = 0.0f;
+
+        m_mode = e_closest;
+    }
+
+    void Create(int32 index)
+    {
+        if (m_bodies[m_bodyIndex] != NULL)
+        {
+            m_world->DestroyBody(m_bodies[m_bodyIndex]);
+            m_bodies[m_bodyIndex] = NULL;
+        }
+
+        b2BodyDef bd;
+
+        float x = RandomFloat(-10.0f, 10.0f);
+        float y = RandomFloat(0.0f, 20.0f);
+        bd.position.Set(x, y);
+        bd.angle = RandomFloat(-b2_pi, b2_pi);
+
+        if (index == 4)
+        {
+            bd.angularDamping = 0.02f;
+        }
+
+        m_bodies[m_bodyIndex] = m_world->CreateBody(&bd);
+
+        if (index < 4)
+        {
+            b2FixtureDef fd;
+            fd.shape            = m_polygons + index;
+            fd.friction         = 0.3f;
+            fd.userData.pointer = index + 1;
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+        else if (index < 5)
+        {
+            b2FixtureDef fd;
+            fd.shape            = &m_circle;
+            fd.friction         = 0.3f;
+            fd.userData.pointer = index + 1;
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+        else
+        {
+            b2FixtureDef fd;
+            fd.shape            = &m_edge;
+            fd.friction         = 0.3f;
+            fd.userData.pointer = index + 1;
+
+            m_bodies[m_bodyIndex]->CreateFixture(&fd);
+        }
+
+        m_bodyIndex = (m_bodyIndex + 1) % e_maxBodies;
+    }
+
+    void DestroyBody()
+    {
+        for (int32 i = 0; i < e_maxBodies; ++i)
+        {
+            if (m_bodies[i] != NULL)
+            {
+                m_world->DestroyBody(m_bodies[i]);
+                m_bodies[i] = NULL;
+                return;
+            }
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(g_debugDrawTestBed.debugNodeOffset.x, g_debugDrawTestBed.debugNodeOffset.y));
+        ImGui::SetNextWindowSize(ImVec2(210.0f, 285.0f));
+        ImGui::Begin("Ray-cast Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Button("Shape 1"))
+        {
+            Create(0);
+        }
+
+        if (ImGui::Button("Shape 2"))
+        {
+            Create(1);
+        }
+
+        if (ImGui::Button("Shape 3"))
+        {
+            Create(2);
+        }
+
+        if (ImGui::Button("Shape 4"))
+        {
+            Create(3);
+        }
+
+        if (ImGui::Button("Shape 5"))
+        {
+            Create(4);
+        }
+
+        if (ImGui::Button("Shape 6"))
+        {
+            Create(5);
+        }
+
+        if (ImGui::Button("Destroy Shape"))
+        {
+            DestroyBody();
+        }
+
+        ImGui::RadioButton("Any", &m_mode, e_any);
+        ImGui::RadioButton("Closest", &m_mode, e_closest);
+        ImGui::RadioButton("Multiple", &m_mode, e_multiple);
+
+        ImGui::SliderFloat("Angle", &m_degrees, 0.0f, 360.0f, "%.0f");
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        DrawString(5, m_textLine, "Shape 1 is intentionally ignored by the ray");
+
+        switch (m_mode)
+        {
+        case e_closest:
+            DrawString(5, m_textLine, "Ray-cast mode: closest - find closest fixture along the ray");
+            break;
+
+        case e_any:
+            DrawString(5, m_textLine, "Ray-cast mode: any - check for obstruction");
+            break;
+
+        case e_multiple:
+            DrawString(5, m_textLine, "Ray-cast mode: multiple - gather multiple fixtures");
+            break;
+        }
+
+        float angle = b2_pi * m_degrees / 180.0f;
+        float L     = 11.0f;
+        b2Vec2 point1(0.0f, 10.0f);
+        b2Vec2 d(L * cosf(angle), L * sinf(angle));
+        b2Vec2 point2 = point1 + d;
+
+        if (m_mode == e_closest)
+        {
+            RayCastClosestCallback callback;
+            m_world->RayCast(&callback, point1, point2);
+
+            if (callback.m_hit)
+            {
+                g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
+                g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
+                b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
+                g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
+            }
+            else
+            {
+                g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
+            }
+        }
+        else if (m_mode == e_any)
+        {
+            RayCastAnyCallback callback;
+            m_world->RayCast(&callback, point1, point2);
+
+            if (callback.m_hit)
+            {
+                g_debugDraw.DrawPoint(callback.m_point, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
+                g_debugDraw.DrawSegment(point1, callback.m_point, b2Color(0.8f, 0.8f, 0.8f));
+                b2Vec2 head = callback.m_point + 0.5f * callback.m_normal;
+                g_debugDraw.DrawSegment(callback.m_point, head, b2Color(0.9f, 0.9f, 0.4f));
+            }
+            else
+            {
+                g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
+            }
+        }
+        else if (m_mode == e_multiple)
+        {
+            RayCastMultipleCallback callback;
+            m_world->RayCast(&callback, point1, point2);
+            g_debugDraw.DrawSegment(point1, point2, b2Color(0.8f, 0.8f, 0.8f));
+
+            for (int32 i = 0; i < callback.m_count; ++i)
+            {
+                b2Vec2 p = callback.m_points[i];
+                b2Vec2 n = callback.m_normals[i];
+                g_debugDraw.DrawPoint(p, 5.0f, b2Color(0.4f, 0.9f, 0.4f));
+                g_debugDraw.DrawSegment(point1, p, b2Color(0.8f, 0.8f, 0.8f));
+                b2Vec2 head = p + 0.5f * n;
+                g_debugDraw.DrawSegment(p, head, b2Color(0.9f, 0.9f, 0.4f));
+            }
+        }
 
 #if 0
 		// This case was failing.
@@ -460,20 +447,17 @@ class RayCast : public Test
 			g_debugDraw.DrawSegment(input.p1, input.p2, color);
 		}
 #endif
-	}
-
-	static Test* Create()
-	{
-		return new RayCast;
-	}
-
-	int32 m_bodyIndex;
-	b2Body* m_bodies[e_maxBodies];
-	b2PolygonShape m_polygons[4];
-	b2CircleShape m_circle;
-	b2EdgeShape m_edge;
-	float m_degrees;
-	int32 m_mode;
+    }
+
+    static Test* Create() { return new RayCast; }
+
+    int32 m_bodyIndex;
+    b2Body* m_bodies[e_maxBodies];
+    b2PolygonShape m_polygons[4];
+    b2CircleShape m_circle;
+    b2EdgeShape m_edge;
+    float m_degrees;
+    int32 m_mode;
 };
 
 static int testIndex = RegisterTest("Collision", "Ray Cast", RayCast::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/restitution.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/restitution.cpp
index 7772c623638c..10dd861e57f5 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/restitution.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/restitution.cpp
@@ -27,53 +27,49 @@
 class Restitution : public Test
 {
 public:
+    Restitution()
+    {
+        const float threshold = 10.0f;
 
-	Restitution()
-	{
-		const float threshold = 10.0f;
-
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.restitutionThreshold = threshold;
-			ground->CreateFixture(&fd);
-		}
-
-		{
-			b2CircleShape shape;
-			shape.m_radius = 1.0f;
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 1.0f;
-
-			float restitution[7] = { 0.0f, 0.1f, 0.3f, 0.5f, 0.75f, 0.9f, 1.0f };
-
-			for (int32 i = 0; i < 7; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-10.0f + 3.0f * i, 20.0f);
-
-				b2Body* body = m_world->CreateBody(&bd);
-
-				fd.restitution = restitution[i];
-				fd.restitutionThreshold = threshold;
-				body->CreateFixture(&fd);
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Restitution;
-	}
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+
+            b2FixtureDef fd;
+            fd.shape                = &shape;
+            fd.restitutionThreshold = threshold;
+            ground->CreateFixture(&fd);
+        }
+
+        {
+            b2CircleShape shape;
+            shape.m_radius = 1.0f;
+
+            b2FixtureDef fd;
+            fd.shape   = &shape;
+            fd.density = 1.0f;
+
+            float restitution[7] = {0.0f, 0.1f, 0.3f, 0.5f, 0.75f, 0.9f, 1.0f};
+
+            for (int32 i = 0; i < 7; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-10.0f + 3.0f * i, 20.0f);
+
+                b2Body* body = m_world->CreateBody(&bd);
+
+                fd.restitution          = restitution[i];
+                fd.restitutionThreshold = threshold;
+                body->CreateFixture(&fd);
+            }
+        }
+    }
+
+    static Test* Create() { return new Restitution; }
 };
 
 static int testIndex = RegisterTest("Forces", "Restitution", Restitution::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/revolute_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/revolute_joint.cpp
index e793d86bf283..9422ce3473bf 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/revolute_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/revolute_joint.cpp
@@ -27,136 +27,131 @@
 class RevoluteJoint : public Test
 {
 public:
-	RevoluteJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			//fd.filter.categoryBits = 2;
-
-			ground->CreateFixture(&fd);
-		}
-
-		m_enableLimit = true;
-		m_enableMotor = false;
-		m_motorSpeed = 1.0f;
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.25f, 3.0f, b2Vec2(0.0f, 3.0f), 0.0f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-10.0f, 20.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 5.0f);
-
-			b2RevoluteJointDef jd;
-			jd.Initialize(ground, body, b2Vec2(-10.0f, 20.5f));
-			jd.motorSpeed = m_motorSpeed;
-			jd.maxMotorTorque = 10000.0f;
-			jd.enableMotor = m_enableMotor;
-			jd.lowerAngle = -0.25f * b2_pi;
-			jd.upperAngle = 0.5f * b2_pi;
-			jd.enableLimit = m_enableLimit;
-
-			m_joint1 = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-		}
-
-		{
-			b2CircleShape circle_shape;
-			circle_shape.m_radius = 2.0f;
-
-			b2BodyDef circle_bd;
-			circle_bd.type = b2_dynamicBody;
-			circle_bd.position.Set(5.0f, 30.0f);
-
-			b2FixtureDef fd;
-			fd.density = 5.0f;
-			fd.filter.maskBits = 1;
-			fd.shape = &circle_shape;
-
-			m_ball = m_world->CreateBody(&circle_bd);
-			m_ball->CreateFixture(&fd);
-
-			b2PolygonShape polygon_shape;
-			polygon_shape.SetAsBox(10.0f, 0.5f, b2Vec2 (-10.0f, 0.0f), 0.0f);
-
-			b2BodyDef polygon_bd;
-			polygon_bd.position.Set(20.0f, 10.0f);
-			polygon_bd.type = b2_dynamicBody;
-			polygon_bd.bullet = true;
-			b2Body* polygon_body = m_world->CreateBody(&polygon_bd);
-			polygon_body->CreateFixture(&polygon_shape, 2.0f);
-
-			b2RevoluteJointDef jd;
-			jd.Initialize(ground, polygon_body, b2Vec2(19.0f, 10.0f));
-			jd.lowerAngle = -0.25f * b2_pi;
-			jd.upperAngle = 0.0f * b2_pi;
-			jd.enableLimit = true;
-			jd.enableMotor = true;
-			jd.motorSpeed = 0.0f;
-			jd.maxMotorTorque = 10000.0f;
-
-			m_joint2 = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Checkbox("Limit", &m_enableLimit))
-		{
-			m_joint1->EnableLimit(m_enableLimit);
-		}
-
-		if (ImGui::Checkbox("Motor", &m_enableMotor))
-		{
-			m_joint1->EnableMotor(m_enableMotor);
-		}
-
-		if (ImGui::SliderFloat("Speed", &m_motorSpeed, -20.0f, 20.0f, "%.0f"))
-		{
-			m_joint1->SetMotorSpeed(m_motorSpeed);
-		}
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		
-		float torque1 = m_joint1->GetMotorTorque(settings.m_hertz);
-		DrawString(5, m_textLine, "Motor Torque 1= %4.0f", torque1);
-		
-
-		float torque2 = m_joint2->GetMotorTorque(settings.m_hertz);
-		DrawString(5, m_textLine, "Motor Torque 2= %4.0f", torque2);
-		
-	}
-
-	static Test* Create()
-	{
-		return new RevoluteJoint;
-	}
-
-	b2Body* m_ball;
-	b2RevoluteJoint* m_joint1;
-	b2RevoluteJoint* m_joint2;
-	float m_motorSpeed;
-	bool m_enableMotor;
-	bool m_enableLimit;
+    RevoluteJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+
+            b2FixtureDef fd;
+            fd.shape = &shape;
+            // fd.filter.categoryBits = 2;
+
+            ground->CreateFixture(&fd);
+        }
+
+        m_enableLimit = true;
+        m_enableMotor = false;
+        m_motorSpeed  = 1.0f;
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.25f, 3.0f, b2Vec2(0.0f, 3.0f), 0.0f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-10.0f, 20.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 5.0f);
+
+            b2RevoluteJointDef jd;
+            jd.Initialize(ground, body, b2Vec2(-10.0f, 20.5f));
+            jd.motorSpeed     = m_motorSpeed;
+            jd.maxMotorTorque = 10000.0f;
+            jd.enableMotor    = m_enableMotor;
+            jd.lowerAngle     = -0.25f * b2_pi;
+            jd.upperAngle     = 0.5f * b2_pi;
+            jd.enableLimit    = m_enableLimit;
+
+            m_joint1 = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+        }
+
+        {
+            b2CircleShape circle_shape;
+            circle_shape.m_radius = 2.0f;
+
+            b2BodyDef circle_bd;
+            circle_bd.type = b2_dynamicBody;
+            circle_bd.position.Set(5.0f, 30.0f);
+
+            b2FixtureDef fd;
+            fd.density         = 5.0f;
+            fd.filter.maskBits = 1;
+            fd.shape           = &circle_shape;
+
+            m_ball = m_world->CreateBody(&circle_bd);
+            m_ball->CreateFixture(&fd);
+
+            b2PolygonShape polygon_shape;
+            polygon_shape.SetAsBox(10.0f, 0.5f, b2Vec2(-10.0f, 0.0f), 0.0f);
+
+            b2BodyDef polygon_bd;
+            polygon_bd.position.Set(20.0f, 10.0f);
+            polygon_bd.type      = b2_dynamicBody;
+            polygon_bd.bullet    = true;
+            b2Body* polygon_body = m_world->CreateBody(&polygon_bd);
+            polygon_body->CreateFixture(&polygon_shape, 2.0f);
+
+            b2RevoluteJointDef jd;
+            jd.Initialize(ground, polygon_body, b2Vec2(19.0f, 10.0f));
+            jd.lowerAngle     = -0.25f * b2_pi;
+            jd.upperAngle     = 0.0f * b2_pi;
+            jd.enableLimit    = true;
+            jd.enableMotor    = true;
+            jd.motorSpeed     = 0.0f;
+            jd.maxMotorTorque = 10000.0f;
+
+            m_joint2 = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Checkbox("Limit", &m_enableLimit))
+        {
+            m_joint1->EnableLimit(m_enableLimit);
+        }
+
+        if (ImGui::Checkbox("Motor", &m_enableMotor))
+        {
+            m_joint1->EnableMotor(m_enableMotor);
+        }
+
+        if (ImGui::SliderFloat("Speed", &m_motorSpeed, -20.0f, 20.0f, "%.0f"))
+        {
+            m_joint1->SetMotorSpeed(m_motorSpeed);
+        }
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        float torque1 = m_joint1->GetMotorTorque(settings.m_hertz);
+        DrawString(5, m_textLine, "Motor Torque 1= %4.0f", torque1);
+
+        float torque2 = m_joint2->GetMotorTorque(settings.m_hertz);
+        DrawString(5, m_textLine, "Motor Torque 2= %4.0f", torque2);
+    }
+
+    static Test* Create() { return new RevoluteJoint; }
+
+    b2Body* m_ball;
+    b2RevoluteJoint* m_joint1;
+    b2RevoluteJoint* m_joint2;
+    float m_motorSpeed;
+    bool m_enableMotor;
+    bool m_enableLimit;
 };
 
 static int testIndex = RegisterTest("Joints", "Revolute", RevoluteJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/rope.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/rope.cpp
index 846cfaaee654..65b41763f23b 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/rope.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/rope.cpp
@@ -29,258 +29,254 @@
 class Rope : public Test
 {
 public:
-	Rope()
-	{
-		const int32 N = 20;
-		const float L = 0.5f;
-		b2Vec2 vertices[N];
-		float masses[N];
-
-		for (int32 i = 0; i < N; ++i)
-		{
-			vertices[i].Set(0.0f, L * (N - i));
-			masses[i] = 1.0f;
-		}
-		masses[0] = 0.0f;
-		masses[1] = 0.0f;
-
-		m_tuning1.bendHertz = 30.0f;
-		m_tuning1.bendDamping = 4.0f;
-		m_tuning1.bendStiffness = 1.0f;
-		m_tuning1.bendingModel = b2_pbdTriangleBendingModel;
-		m_tuning1.isometric = true;
-
-		m_tuning1.stretchHertz = 30.0f;
-		m_tuning1.stretchDamping = 4.0f;
-		m_tuning1.stretchStiffness = 1.0f;
-		m_tuning1.stretchingModel = b2_pbdStretchingModel;
-
-		m_tuning2.bendHertz = 30.0f;
-		m_tuning2.bendDamping = 0.7f;
-		m_tuning2.bendStiffness = 1.0f;
-		m_tuning2.bendingModel = b2_pbdHeightBendingModel;
-		m_tuning2.isometric = true;
-
-		m_tuning2.stretchHertz = 30.0f;
-		m_tuning2.stretchDamping = 1.0f;
-		m_tuning2.stretchStiffness = 1.0f;
-		m_tuning2.stretchingModel = b2_pbdStretchingModel;
-
-		m_position1.Set(-5.0f, 15.0f);
-		m_position2.Set(5.0f, 15.0f);
-
-		b2RopeDef def;
-		def.vertices = vertices;
-		def.count = N;
-		def.gravity.Set(0.0f, -10.0f);
-		def.masses = masses;
-
-		def.position = m_position1;
-		def.tuning = m_tuning1;
-		m_rope1.Create(def);
-
-		def.position = m_position2;
-		def.tuning = m_tuning2;
-		m_rope2.Create(def);
-
-		m_iterations1 = 8;
-		m_iterations2 = 8;
-
-		m_speed = 10.0f;
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 700.0f));
-		ImGui::Begin("Tuning", nullptr, ImGuiWindowFlags_NoResize);
-
-		ImGui::Separator();
+    Rope()
+    {
+        const int32 N = 20;
+        const float L = 0.5f;
+        b2Vec2 vertices[N];
+        float masses[N];
+
+        for (int32 i = 0; i < N; ++i)
+        {
+            vertices[i].Set(0.0f, L * (N - i));
+            masses[i] = 1.0f;
+        }
+        masses[0] = 0.0f;
+        masses[1] = 0.0f;
+
+        m_tuning1.bendHertz     = 30.0f;
+        m_tuning1.bendDamping   = 4.0f;
+        m_tuning1.bendStiffness = 1.0f;
+        m_tuning1.bendingModel  = b2_pbdTriangleBendingModel;
+        m_tuning1.isometric     = true;
+
+        m_tuning1.stretchHertz     = 30.0f;
+        m_tuning1.stretchDamping   = 4.0f;
+        m_tuning1.stretchStiffness = 1.0f;
+        m_tuning1.stretchingModel  = b2_pbdStretchingModel;
+
+        m_tuning2.bendHertz     = 30.0f;
+        m_tuning2.bendDamping   = 0.7f;
+        m_tuning2.bendStiffness = 1.0f;
+        m_tuning2.bendingModel  = b2_pbdHeightBendingModel;
+        m_tuning2.isometric     = true;
+
+        m_tuning2.stretchHertz     = 30.0f;
+        m_tuning2.stretchDamping   = 1.0f;
+        m_tuning2.stretchStiffness = 1.0f;
+        m_tuning2.stretchingModel  = b2_pbdStretchingModel;
+
+        m_position1.Set(-5.0f, 15.0f);
+        m_position2.Set(5.0f, 15.0f);
+
+        b2RopeDef def;
+        def.vertices = vertices;
+        def.count    = N;
+        def.gravity.Set(0.0f, -10.0f);
+        def.masses = masses;
+
+        def.position = m_position1;
+        def.tuning   = m_tuning1;
+        m_rope1.Create(def);
+
+        def.position = m_position2;
+        def.tuning   = m_tuning2;
+        m_rope2.Create(def);
+
+        m_iterations1 = 8;
+        m_iterations2 = 8;
+
+        m_speed = 10.0f;
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 700.0f));
+        ImGui::Begin("Tuning", nullptr, ImGuiWindowFlags_NoResize);
+
+        ImGui::Separator();
 
         ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
-        
-		const ImGuiComboFlags comboFlags = 0;
-		const char* bendModels[] = { "Spring", "PBD Ang", "XPBD Ang", "PBD Dist", "PBD Height", "PBD Triangle" };
-		const char* stretchModels[] = { "PBD", "XPBD" };
-
-		ImGui::Text("Rope 1");
-		static int bendModel1 = m_tuning1.bendingModel;
-		if (ImGui::BeginCombo("Bend Model##1", bendModels[bendModel1], comboFlags))
-		{
-			for (int i = 0; i < IM_ARRAYSIZE(bendModels); ++i)
-			{
-				bool isSelected = (bendModel1 == i);
-				if (ImGui::Selectable(bendModels[i], isSelected))
-				{
-					bendModel1 = i;
-					m_tuning1.bendingModel = b2BendingModel(i);
-				}
-
-				if (isSelected)
-				{
-					ImGui::SetItemDefaultFocus();
-				}
-			}
-			ImGui::EndCombo();
-		}
-
-		ImGui::SliderFloat("Damping##B1", &m_tuning1.bendDamping, 0.0f, 4.0f, "%.1f");
-		ImGui::SliderFloat("Hertz##B1", &m_tuning1.bendHertz, 0.0f, 60.0f, "%.0f");
-		ImGui::SliderFloat("Stiffness##B1", &m_tuning1.bendStiffness, 0.0f, 1.0f, "%.1f");
-
-		ImGui::Checkbox("Isometric##1", &m_tuning1.isometric);
-		ImGui::Checkbox("Fixed Mass##1", &m_tuning1.fixedEffectiveMass);
-		ImGui::Checkbox("Warm Start##1", &m_tuning1.warmStart);
-
-		static int stretchModel1 = m_tuning1.stretchingModel;
-		if (ImGui::BeginCombo("Stretch Model##1", stretchModels[stretchModel1], comboFlags))
-		{
-			for (int i = 0; i < IM_ARRAYSIZE(stretchModels); ++i)
-			{
-				bool isSelected = (stretchModel1 == i);
-				if (ImGui::Selectable(stretchModels[i], isSelected))
-				{
-					stretchModel1 = i;
-					m_tuning1.stretchingModel = b2StretchingModel(i);
-				}
-
-				if (isSelected)
-				{
-					ImGui::SetItemDefaultFocus();
-				}
-			}
-			ImGui::EndCombo();
-		}
-
-		ImGui::SliderFloat("Damping##S1", &m_tuning1.stretchDamping, 0.0f, 4.0f, "%.1f");
-		ImGui::SliderFloat("Hertz##S1", &m_tuning1.stretchHertz, 0.0f, 60.0f, "%.0f");
-		ImGui::SliderFloat("Stiffness##S1", &m_tuning1.stretchStiffness, 0.0f, 1.0f, "%.1f");
-
-		ImGui::SliderInt("Iterations##1", &m_iterations1, 1, 100, "%d");
-
-		ImGui::Separator();
-
-		ImGui::Text("Rope 2");
-		static int bendModel2 = m_tuning2.bendingModel;
-		if (ImGui::BeginCombo("Bend Model##2", bendModels[bendModel2], comboFlags))
-		{
-			for (int i = 0; i < IM_ARRAYSIZE(bendModels); ++i)
-			{
-				bool isSelected = (bendModel2 == i);
-				if (ImGui::Selectable(bendModels[i], isSelected))
-				{
-					bendModel2 = i;
-					m_tuning2.bendingModel = b2BendingModel(i);
-				}
-
-				if (isSelected)
-				{
-					ImGui::SetItemDefaultFocus();
-				}
-			}
-			ImGui::EndCombo();
-		}
-
-		ImGui::SliderFloat("Damping##B2", &m_tuning2.bendDamping, 0.0f, 4.0f, "%.1f");
-		ImGui::SliderFloat("Hertz##B2", &m_tuning2.bendHertz, 0.0f, 60.0f, "%.0f");
-		ImGui::SliderFloat("Stiffness##B2", &m_tuning2.bendStiffness, 0.0f, 1.0f, "%.1f");
-
-		ImGui::Checkbox("Isometric##2", &m_tuning2.isometric);
-		ImGui::Checkbox("Fixed Mass##2", &m_tuning2.fixedEffectiveMass);
-		ImGui::Checkbox("Warm Start##2", &m_tuning2.warmStart);
-
-		static int stretchModel2 = m_tuning2.stretchingModel;
-		if (ImGui::BeginCombo("Stretch Model##2", stretchModels[stretchModel2], comboFlags))
-		{
-			for (int i = 0; i < IM_ARRAYSIZE(stretchModels); ++i)
-			{
-				bool isSelected = (stretchModel2 == i);
-				if (ImGui::Selectable(stretchModels[i], isSelected))
-				{
-					stretchModel2 = i;
-					m_tuning2.stretchingModel = b2StretchingModel(i);
-				}
-
-				if (isSelected)
-				{
-					ImGui::SetItemDefaultFocus();
-				}
-			}
-			ImGui::EndCombo();
-		}
-
-		ImGui::SliderFloat("Damping##S2", &m_tuning2.stretchDamping, 0.0f, 4.0f, "%.1f");
-		ImGui::SliderFloat("Hertz##S2", &m_tuning2.stretchHertz, 0.0f, 60.0f, "%.0f");
-		ImGui::SliderFloat("Stiffness##S2", &m_tuning2.stretchStiffness, 0.0f, 1.0f, "%.1f");
-
-		ImGui::SliderInt("Iterations##2", &m_iterations2, 1, 100, "%d");
-
-		ImGui::Separator();
-
-		ImGui::SliderFloat("Speed", &m_speed, 10.0f, 100.0f, "%.0f");
-
-		if (ImGui::Button("Reset"))
-		{
-			m_position1.Set(-5.0f, 15.0f);
-			m_position2.Set(5.0f, 15.0f);
-			m_rope1.Reset(m_position1);
-			m_rope2.Reset(m_position2);
-		}
+
+        const ImGuiComboFlags comboFlags = 0;
+        const char* bendModels[]         = {"Spring", "PBD Ang", "XPBD Ang", "PBD Dist", "PBD Height", "PBD Triangle"};
+        const char* stretchModels[]      = {"PBD", "XPBD"};
+
+        ImGui::Text("Rope 1");
+        static int bendModel1 = m_tuning1.bendingModel;
+        if (ImGui::BeginCombo("Bend Model##1", bendModels[bendModel1], comboFlags))
+        {
+            for (int i = 0; i < IM_ARRAYSIZE(bendModels); ++i)
+            {
+                bool isSelected = (bendModel1 == i);
+                if (ImGui::Selectable(bendModels[i], isSelected))
+                {
+                    bendModel1             = i;
+                    m_tuning1.bendingModel = b2BendingModel(i);
+                }
+
+                if (isSelected)
+                {
+                    ImGui::SetItemDefaultFocus();
+                }
+            }
+            ImGui::EndCombo();
+        }
+
+        ImGui::SliderFloat("Damping##B1", &m_tuning1.bendDamping, 0.0f, 4.0f, "%.1f");
+        ImGui::SliderFloat("Hertz##B1", &m_tuning1.bendHertz, 0.0f, 60.0f, "%.0f");
+        ImGui::SliderFloat("Stiffness##B1", &m_tuning1.bendStiffness, 0.0f, 1.0f, "%.1f");
+
+        ImGui::Checkbox("Isometric##1", &m_tuning1.isometric);
+        ImGui::Checkbox("Fixed Mass##1", &m_tuning1.fixedEffectiveMass);
+        ImGui::Checkbox("Warm Start##1", &m_tuning1.warmStart);
+
+        static int stretchModel1 = m_tuning1.stretchingModel;
+        if (ImGui::BeginCombo("Stretch Model##1", stretchModels[stretchModel1], comboFlags))
+        {
+            for (int i = 0; i < IM_ARRAYSIZE(stretchModels); ++i)
+            {
+                bool isSelected = (stretchModel1 == i);
+                if (ImGui::Selectable(stretchModels[i], isSelected))
+                {
+                    stretchModel1             = i;
+                    m_tuning1.stretchingModel = b2StretchingModel(i);
+                }
+
+                if (isSelected)
+                {
+                    ImGui::SetItemDefaultFocus();
+                }
+            }
+            ImGui::EndCombo();
+        }
+
+        ImGui::SliderFloat("Damping##S1", &m_tuning1.stretchDamping, 0.0f, 4.0f, "%.1f");
+        ImGui::SliderFloat("Hertz##S1", &m_tuning1.stretchHertz, 0.0f, 60.0f, "%.0f");
+        ImGui::SliderFloat("Stiffness##S1", &m_tuning1.stretchStiffness, 0.0f, 1.0f, "%.1f");
+
+        ImGui::SliderInt("Iterations##1", &m_iterations1, 1, 100, "%d");
+
+        ImGui::Separator();
+
+        ImGui::Text("Rope 2");
+        static int bendModel2 = m_tuning2.bendingModel;
+        if (ImGui::BeginCombo("Bend Model##2", bendModels[bendModel2], comboFlags))
+        {
+            for (int i = 0; i < IM_ARRAYSIZE(bendModels); ++i)
+            {
+                bool isSelected = (bendModel2 == i);
+                if (ImGui::Selectable(bendModels[i], isSelected))
+                {
+                    bendModel2             = i;
+                    m_tuning2.bendingModel = b2BendingModel(i);
+                }
+
+                if (isSelected)
+                {
+                    ImGui::SetItemDefaultFocus();
+                }
+            }
+            ImGui::EndCombo();
+        }
+
+        ImGui::SliderFloat("Damping##B2", &m_tuning2.bendDamping, 0.0f, 4.0f, "%.1f");
+        ImGui::SliderFloat("Hertz##B2", &m_tuning2.bendHertz, 0.0f, 60.0f, "%.0f");
+        ImGui::SliderFloat("Stiffness##B2", &m_tuning2.bendStiffness, 0.0f, 1.0f, "%.1f");
+
+        ImGui::Checkbox("Isometric##2", &m_tuning2.isometric);
+        ImGui::Checkbox("Fixed Mass##2", &m_tuning2.fixedEffectiveMass);
+        ImGui::Checkbox("Warm Start##2", &m_tuning2.warmStart);
+
+        static int stretchModel2 = m_tuning2.stretchingModel;
+        if (ImGui::BeginCombo("Stretch Model##2", stretchModels[stretchModel2], comboFlags))
+        {
+            for (int i = 0; i < IM_ARRAYSIZE(stretchModels); ++i)
+            {
+                bool isSelected = (stretchModel2 == i);
+                if (ImGui::Selectable(stretchModels[i], isSelected))
+                {
+                    stretchModel2             = i;
+                    m_tuning2.stretchingModel = b2StretchingModel(i);
+                }
+
+                if (isSelected)
+                {
+                    ImGui::SetItemDefaultFocus();
+                }
+            }
+            ImGui::EndCombo();
+        }
+
+        ImGui::SliderFloat("Damping##S2", &m_tuning2.stretchDamping, 0.0f, 4.0f, "%.1f");
+        ImGui::SliderFloat("Hertz##S2", &m_tuning2.stretchHertz, 0.0f, 60.0f, "%.0f");
+        ImGui::SliderFloat("Stiffness##S2", &m_tuning2.stretchStiffness, 0.0f, 1.0f, "%.1f");
+
+        ImGui::SliderInt("Iterations##2", &m_iterations2, 1, 100, "%d");
+
+        ImGui::Separator();
+
+        ImGui::SliderFloat("Speed", &m_speed, 10.0f, 100.0f, "%.0f");
+
+        if (ImGui::Button("Reset"))
+        {
+            m_position1.Set(-5.0f, 15.0f);
+            m_position2.Set(5.0f, 15.0f);
+            m_rope1.Reset(m_position1);
+            m_rope2.Reset(m_position2);
+        }
 
         ImGui::PopItemWidth();
 
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		float dt = settings.m_hertz > 0.0f ? 1.0f / settings.m_hertz : 0.0f;
-
-		if (settings.m_pause == 1 && settings.m_singleStep == 0)
-		{
-			dt = 0.0f;
-		}
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_COMMA) == GLFW_PRESS)
-		//{
-		//	m_position1.x -= m_speed * dt;
-		//	m_position2.x -= m_speed * dt;
-		//}
-
-		//if (glfwGetKey(g_mainWindow, GLFW_KEY_PERIOD) == GLFW_PRESS)
-		//{
-		//	m_position1.x += m_speed * dt;
-		//	m_position2.x += m_speed * dt;
-		//}
-
-		m_rope1.SetTuning(m_tuning1);
-		m_rope2.SetTuning(m_tuning2);
-		m_rope1.Step(dt, m_iterations1, m_position1);
-		m_rope2.Step(dt, m_iterations2, m_position2);
-
-		Test::Step(settings);
-
-		m_rope1.Draw(&g_debugDraw);
-		m_rope2.Draw(&g_debugDraw);
-
-		DrawString(5, m_textLine, "Press comma and period to move left and right");
-		
-	}
-
-	static Test* Create()
-	{
-		return new Rope;
-	}
-
-	b2Rope m_rope1;
-	b2Rope m_rope2;
-	b2RopeTuning m_tuning1;
-	b2RopeTuning m_tuning2;
-	int32 m_iterations1;
-	int32 m_iterations2;
-	b2Vec2 m_position1;
-	b2Vec2 m_position2;
-	float m_speed;
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        float dt = settings.m_hertz > 0.0f ? 1.0f / settings.m_hertz : 0.0f;
+
+        if (settings.m_pause == 1 && settings.m_singleStep == 0)
+        {
+            dt = 0.0f;
+        }
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_COMMA) == GLFW_PRESS)
+        //{
+        //	m_position1.x -= m_speed * dt;
+        //	m_position2.x -= m_speed * dt;
+        // }
+
+        // if (glfwGetKey(g_mainWindow, GLFW_KEY_PERIOD) == GLFW_PRESS)
+        //{
+        //	m_position1.x += m_speed * dt;
+        //	m_position2.x += m_speed * dt;
+        // }
+
+        m_rope1.SetTuning(m_tuning1);
+        m_rope2.SetTuning(m_tuning2);
+        m_rope1.Step(dt, m_iterations1, m_position1);
+        m_rope2.Step(dt, m_iterations2, m_position2);
+
+        Test::Step(settings);
+
+        m_rope1.Draw(&g_debugDraw);
+        m_rope2.Draw(&g_debugDraw);
+
+        DrawString(5, m_textLine, "Press comma and period to move left and right");
+    }
+
+    static Test* Create() { return new Rope; }
+
+    b2Rope m_rope1;
+    b2Rope m_rope2;
+    b2RopeTuning m_tuning1;
+    b2RopeTuning m_tuning2;
+    int32 m_iterations1;
+    int32 m_iterations2;
+    b2Vec2 m_position1;
+    b2Vec2 m_position2;
+    float m_speed;
 };
 
 static int testIndex = RegisterTest("Rope", "Bending", Rope::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/sensor.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/sensor.cpp
index af9e88c1e13e..b7b4b9bdb04c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/sensor.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/sensor.cpp
@@ -27,23 +27,22 @@
 class Sensors : public Test
 {
 public:
-
-	enum
-	{
-		e_count = 7
-	};
-
-	Sensors()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			{
-				b2EdgeShape shape;
-				shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-				ground->CreateFixture(&shape, 0.0f);
-			}
+    enum
+    {
+        e_count = 7
+    };
+
+    Sensors()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            {
+                b2EdgeShape shape;
+                shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+                ground->CreateFixture(&shape, 0.0f);
+            }
 
 #if 0
 			{
@@ -53,143 +52,140 @@ class Sensors : public Test
 				m_sensor = ground->CreateFixture(&sd);
 			}
 #else
-			{
-				b2CircleShape shape;
-				shape.m_radius = 5.0f;
-				shape.m_p.Set(0.0f, 10.0f);
-
-				b2FixtureDef fd;
-				fd.shape = &shape;
-				fd.isSensor = true;
-				m_sensor = ground->CreateFixture(&fd);
-			}
+            {
+                b2CircleShape shape;
+                shape.m_radius = 5.0f;
+                shape.m_p.Set(0.0f, 10.0f);
+
+                b2FixtureDef fd;
+                fd.shape    = &shape;
+                fd.isSensor = true;
+                m_sensor    = ground->CreateFixture(&fd);
+            }
 #endif
-		}
-
-		{
-			b2CircleShape shape;
-			shape.m_radius = 1.0f;
-
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-10.0f + 3.0f * i, 20.0f);
-				bd.userData.pointer = i;
-
-				m_touching[i] = false;
-				m_bodies[i] = m_world->CreateBody(&bd);
-
-				m_bodies[i]->CreateFixture(&shape, 1.0f);
-			}
-		}
-
-		m_force = 100.0f;
-	}
-
-	// Implement contact listener.
-	void BeginContact(b2Contact* contact) override
-	{
-		b2Fixture* fixtureA = contact->GetFixtureA();
-		b2Fixture* fixtureB = contact->GetFixtureB();
-
-		if (fixtureA == m_sensor)
-		{
-			uintptr_t index = fixtureB->GetBody()->GetUserData().pointer;
-			if (index < e_count)
-			{
-				m_touching[index] = true;
-			}
-		}
-
-		if (fixtureB == m_sensor)
-		{
-			uintptr_t index = fixtureA->GetBody()->GetUserData().pointer;
-			if (index < e_count)
-			{
-				m_touching[index] = true;
-			}
-		}
-	}
-
-	// Implement contact listener.
-	void EndContact(b2Contact* contact) override
-	{
-		b2Fixture* fixtureA = contact->GetFixtureA();
-		b2Fixture* fixtureB = contact->GetFixtureB();
-
-		if (fixtureA == m_sensor)
-		{
-			uintptr_t index = fixtureB->GetBody()->GetUserData().pointer;
-			if (index < e_count)
-			{
-				m_touching[index] = false;
-			}
-		}
-
-		if (fixtureB == m_sensor)
-		{
-			uintptr_t index = fixtureA->GetBody()->GetUserData().pointer;
-			if (index < e_count)
-			{
-				m_touching[index] = false;
-			}
-		}
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 60.0f));
-		ImGui::Begin("Sensor Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		ImGui::SliderFloat("Force", &m_force, 0.0f, 2000.0f, "%.0f");
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		// Traverse the contact results. Apply a force on shapes
-		// that overlap the sensor.
-		for (int32 i = 0; i < e_count; ++i)
-		{
-			if (m_touching[i] == false)
-			{
-				continue;
-			}
-
-			b2Body* body = m_bodies[i];
-			b2Body* ground = m_sensor->GetBody();
-
-			b2CircleShape* circle = (b2CircleShape*)m_sensor->GetShape();
-			b2Vec2 center = ground->GetWorldPoint(circle->m_p);
-
-			b2Vec2 position = body->GetPosition();
-
-			b2Vec2 d = center - position;
-			if (d.LengthSquared() < FLT_EPSILON * FLT_EPSILON)
-			{
-				continue;
-			}
-
-			d.Normalize();
-			b2Vec2 F = m_force * d;
-			body->ApplyForce(F, position, false);
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Sensors;
-	}
-
-	b2Fixture* m_sensor;
-	b2Body* m_bodies[e_count];
-	float m_force;
-	bool m_touching[e_count];
+        }
+
+        {
+            b2CircleShape shape;
+            shape.m_radius = 1.0f;
+
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-10.0f + 3.0f * i, 20.0f);
+                bd.userData.pointer = i;
+
+                m_touching[i] = false;
+                m_bodies[i]   = m_world->CreateBody(&bd);
+
+                m_bodies[i]->CreateFixture(&shape, 1.0f);
+            }
+        }
+
+        m_force = 100.0f;
+    }
+
+    // Implement contact listener.
+    void BeginContact(b2Contact* contact) override
+    {
+        b2Fixture* fixtureA = contact->GetFixtureA();
+        b2Fixture* fixtureB = contact->GetFixtureB();
+
+        if (fixtureA == m_sensor)
+        {
+            uintptr_t index = fixtureB->GetBody()->GetUserData().pointer;
+            if (index < e_count)
+            {
+                m_touching[index] = true;
+            }
+        }
+
+        if (fixtureB == m_sensor)
+        {
+            uintptr_t index = fixtureA->GetBody()->GetUserData().pointer;
+            if (index < e_count)
+            {
+                m_touching[index] = true;
+            }
+        }
+    }
+
+    // Implement contact listener.
+    void EndContact(b2Contact* contact) override
+    {
+        b2Fixture* fixtureA = contact->GetFixtureA();
+        b2Fixture* fixtureB = contact->GetFixtureB();
+
+        if (fixtureA == m_sensor)
+        {
+            uintptr_t index = fixtureB->GetBody()->GetUserData().pointer;
+            if (index < e_count)
+            {
+                m_touching[index] = false;
+            }
+        }
+
+        if (fixtureB == m_sensor)
+        {
+            uintptr_t index = fixtureA->GetBody()->GetUserData().pointer;
+            if (index < e_count)
+            {
+                m_touching[index] = false;
+            }
+        }
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 60.0f));
+        ImGui::Begin("Sensor Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        ImGui::SliderFloat("Force", &m_force, 0.0f, 2000.0f, "%.0f");
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        // Traverse the contact results. Apply a force on shapes
+        // that overlap the sensor.
+        for (int32 i = 0; i < e_count; ++i)
+        {
+            if (m_touching[i] == false)
+            {
+                continue;
+            }
+
+            b2Body* body   = m_bodies[i];
+            b2Body* ground = m_sensor->GetBody();
+
+            b2CircleShape* circle = (b2CircleShape*)m_sensor->GetShape();
+            b2Vec2 center         = ground->GetWorldPoint(circle->m_p);
+
+            b2Vec2 position = body->GetPosition();
+
+            b2Vec2 d = center - position;
+            if (d.LengthSquared() < FLT_EPSILON * FLT_EPSILON)
+            {
+                continue;
+            }
+
+            d.Normalize();
+            b2Vec2 F = m_force * d;
+            body->ApplyForce(F, position, false);
+        }
+    }
+
+    static Test* Create() { return new Sensors; }
+
+    b2Fixture* m_sensor;
+    b2Body* m_bodies[e_count];
+    float m_force;
+    bool m_touching[e_count];
 };
 
 static int testIndex = RegisterTest("Collision", "Sensors", Sensors::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/settings.h b/tests/cpp-tests/Classes/Box2DTestBed/tests/settings.h
index a34f6fda0c54..7ba71423e898 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/settings.h
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/settings.h
@@ -25,62 +25,59 @@
 
 struct Settings
 {
-	Settings()
-	{
-		Reset();
-	}
+    Settings() { Reset(); }
 
-	void Reset()
-	{
-		m_testIndex = 0;
-		m_windowWidth = 1600;
-		m_windowHeight = 900;
-		m_hertz = 60.0f;
-		m_velocityIterations = 8;
-		m_positionIterations = 3;
-		m_drawShapes = true;
-		m_drawJoints = true;
-		m_drawAABBs = false;
-		m_drawContactPoints = false;
-		m_drawContactNormals = false;
-		m_drawContactImpulse = false;
-		m_drawFrictionImpulse = false;
-		m_drawCOMs = false;
-		m_drawStats = false;
-		m_drawProfile = false;
-		m_enableWarmStarting = true;
-		m_enableContinuous = true;
-		m_enableSubStepping = false;
-		m_enableSleep = true;
-		m_pause = false;
-		m_singleStep = false;
-	}
+    void Reset()
+    {
+        m_testIndex           = 0;
+        m_windowWidth         = 1600;
+        m_windowHeight        = 900;
+        m_hertz               = 60.0f;
+        m_velocityIterations  = 8;
+        m_positionIterations  = 3;
+        m_drawShapes          = true;
+        m_drawJoints          = true;
+        m_drawAABBs           = false;
+        m_drawContactPoints   = false;
+        m_drawContactNormals  = false;
+        m_drawContactImpulse  = false;
+        m_drawFrictionImpulse = false;
+        m_drawCOMs            = false;
+        m_drawStats           = false;
+        m_drawProfile         = false;
+        m_enableWarmStarting  = true;
+        m_enableContinuous    = true;
+        m_enableSubStepping   = false;
+        m_enableSleep         = true;
+        m_pause               = false;
+        m_singleStep          = false;
+    }
 
-	void Save();
-	void Load();
+    void Save();
+    void Load();
 
-	int m_testIndex;
-	int m_windowWidth;
-	int m_windowHeight;
-	float m_hertz;
-	int m_velocityIterations;
-	int m_positionIterations;
-	bool m_drawShapes;
-	bool m_drawJoints;
-	bool m_drawAABBs;
-	bool m_drawContactPoints;
-	bool m_drawContactNormals;
-	bool m_drawContactImpulse;
-	bool m_drawFrictionImpulse;
-	bool m_drawCOMs;
-	bool m_drawStats;
-	bool m_drawProfile;
-	bool m_enableWarmStarting;
-	bool m_enableContinuous;
-	bool m_enableSubStepping;
-	bool m_enableSleep;
-	bool m_pause;
-	bool m_singleStep;
+    int m_testIndex;
+    int m_windowWidth;
+    int m_windowHeight;
+    float m_hertz;
+    int m_velocityIterations;
+    int m_positionIterations;
+    bool m_drawShapes;
+    bool m_drawJoints;
+    bool m_drawAABBs;
+    bool m_drawContactPoints;
+    bool m_drawContactNormals;
+    bool m_drawContactImpulse;
+    bool m_drawFrictionImpulse;
+    bool m_drawCOMs;
+    bool m_drawStats;
+    bool m_drawProfile;
+    bool m_enableWarmStarting;
+    bool m_enableContinuous;
+    bool m_enableSubStepping;
+    bool m_enableSleep;
+    bool m_pause;
+    bool m_singleStep;
 };
 
 #endif
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_cast.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_cast.cpp
index 2c942add2890..60771b589681 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_cast.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_cast.cpp
@@ -26,168 +26,164 @@
 class ShapeCast : public Test
 {
 public:
-	enum
-	{
-		e_vertexCount = 8
-	};
+    enum
+    {
+        e_vertexCount = 8
+    };
 
-	ShapeCast()
-	{
+    ShapeCast()
+    {
 #if 1
-		m_vAs[0].Set(-0.5f, 1.0f);
-		m_vAs[1].Set(0.5f, 1.0f);
-		m_vAs[2].Set(0.0f, 0.0f);
-		m_countA = 3;
-		m_radiusA = b2_polygonRadius;
-
-		m_vBs[0].Set(-0.5f, -0.5f);
-		m_vBs[1].Set(0.5f, -0.5f);
-		m_vBs[2].Set(0.5f, 0.5f);
-		m_vBs[3].Set(-0.5f, 0.5f);
-		m_countB = 4;
-		m_radiusB = b2_polygonRadius;
-
-		m_transformA.p.Set(0.0f, 0.25f);
-		m_transformA.q.SetIdentity();
-		m_transformB.p.Set(-4.0f, 0.0f);
-		m_transformB.q.SetIdentity();
-		m_translationB.Set(8.0f, 0.0f);
+        m_vAs[0].Set(-0.5f, 1.0f);
+        m_vAs[1].Set(0.5f, 1.0f);
+        m_vAs[2].Set(0.0f, 0.0f);
+        m_countA  = 3;
+        m_radiusA = b2_polygonRadius;
+
+        m_vBs[0].Set(-0.5f, -0.5f);
+        m_vBs[1].Set(0.5f, -0.5f);
+        m_vBs[2].Set(0.5f, 0.5f);
+        m_vBs[3].Set(-0.5f, 0.5f);
+        m_countB  = 4;
+        m_radiusB = b2_polygonRadius;
+
+        m_transformA.p.Set(0.0f, 0.25f);
+        m_transformA.q.SetIdentity();
+        m_transformB.p.Set(-4.0f, 0.0f);
+        m_transformB.q.SetIdentity();
+        m_translationB.Set(8.0f, 0.0f);
 #elif 0
-		m_vAs[0].Set(0.0f, 0.0f);
-		m_countA = 1;
-		m_radiusA = 0.5f;
-
-		m_vBs[0].Set(0.0f, 0.0f);
-		m_countB = 1;
-		m_radiusB = 0.5f;
-
-		m_transformA.p.Set(0.0f, 0.25f);
-		m_transformA.q.SetIdentity();
-		m_transformB.p.Set(-4.0f, 0.0f);
-		m_transformB.q.SetIdentity();
-		m_translationB.Set(8.0f, 0.0f);
+        m_vAs[0].Set(0.0f, 0.0f);
+        m_countA  = 1;
+        m_radiusA = 0.5f;
+
+        m_vBs[0].Set(0.0f, 0.0f);
+        m_countB  = 1;
+        m_radiusB = 0.5f;
+
+        m_transformA.p.Set(0.0f, 0.25f);
+        m_transformA.q.SetIdentity();
+        m_transformB.p.Set(-4.0f, 0.0f);
+        m_transformB.q.SetIdentity();
+        m_translationB.Set(8.0f, 0.0f);
 #else
-		m_vAs[0].Set(0.0f, 0.0f);
-		m_vAs[1].Set(2.0f, 0.0f);
-		m_countA = 2;
-		m_radiusA = b2_polygonRadius;
-
-		m_vBs[0].Set(0.0f, 0.0f);
-		m_countB = 1;
-		m_radiusB = 0.25f;
-
-		// Initial overlap
-		m_transformA.p.Set(0.0f, 0.0f);
-		m_transformA.q.SetIdentity();
-		m_transformB.p.Set(-0.244360745f, 0.05999358f);
-		m_transformB.q.SetIdentity();
-		m_translationB.Set(0.0f, 0.0399999991f);
+        m_vAs[0].Set(0.0f, 0.0f);
+        m_vAs[1].Set(2.0f, 0.0f);
+        m_countA  = 2;
+        m_radiusA = b2_polygonRadius;
+
+        m_vBs[0].Set(0.0f, 0.0f);
+        m_countB  = 1;
+        m_radiusB = 0.25f;
+
+        // Initial overlap
+        m_transformA.p.Set(0.0f, 0.0f);
+        m_transformA.q.SetIdentity();
+        m_transformB.p.Set(-0.244360745f, 0.05999358f);
+        m_transformB.q.SetIdentity();
+        m_translationB.Set(0.0f, 0.0399999991f);
 #endif
-	}
-
-	static Test* Create()
-	{
-		return new ShapeCast;
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		b2ShapeCastInput input;
-		input.proxyA.Set(m_vAs, m_countA, m_radiusA);
-		input.proxyB.Set(m_vBs, m_countB, m_radiusB);
-		input.transformA = m_transformA;
-		input.transformB = m_transformB;
-		input.translationB = m_translationB;
-
-		b2ShapeCastOutput output;
-		bool hit = b2ShapeCast(&output, &input);
-
-		b2Transform transformB2;
-		transformB2.q = m_transformB.q;
-		transformB2.p = m_transformB.p + output.lambda * input.translationB;
-
-		b2DistanceInput distanceInput;
-		distanceInput.proxyA.Set(m_vAs, m_countA, m_radiusA);
-		distanceInput.proxyB.Set(m_vBs, m_countB, m_radiusB);
-		distanceInput.transformA = m_transformA;
-		distanceInput.transformB = transformB2;
-		distanceInput.useRadii = false;
-		b2SimplexCache simplexCache;
-		simplexCache.count = 0;
-		b2DistanceOutput distanceOutput;
-
-		b2Distance(&distanceOutput, &simplexCache, &distanceInput);
-
-		DrawString(5, m_textLine, "hit = %s, iters = %d, lambda = %g, distance = %g",
-			hit ? "true" : "false", output.iterations, output.lambda, distanceOutput.distance);
-		
-
-		b2Vec2 vertices[b2_maxPolygonVertices];
-
-		for (int32 i = 0; i < m_countA; ++i)
-		{
-			vertices[i] = b2Mul(m_transformA, m_vAs[i]);
-		}
-
-		if (m_countA == 1)
-		{
-			g_debugDraw.DrawCircle(vertices[0], m_radiusA, b2Color(0.9f, 0.9f, 0.9f));
-		}
-		else
-		{
-			g_debugDraw.DrawPolygon(vertices, m_countA, b2Color(0.9f, 0.9f, 0.9f));
-		}
-
-		for (int32 i = 0; i < m_countB; ++i)
-		{
-			vertices[i] = b2Mul(m_transformB, m_vBs[i]);
-		}
-
-		if (m_countB == 1)
-		{
-			g_debugDraw.DrawCircle(vertices[0], m_radiusB, b2Color(0.5f, 0.9f, 0.5f));
-		}
-		else
-		{
-			g_debugDraw.DrawPolygon(vertices, m_countB, b2Color(0.5f, 0.9f, 0.5f));
-		}
-
-		for (int32 i = 0; i < m_countB; ++i)
-		{
-			vertices[i] = b2Mul(transformB2, m_vBs[i]);
-		}
-
-		if (m_countB == 1)
-		{
-			g_debugDraw.DrawCircle(vertices[0], m_radiusB, b2Color(0.5f, 0.7f, 0.9f));
-		}
-		else
-		{
-			g_debugDraw.DrawPolygon(vertices, m_countB, b2Color(0.5f, 0.7f, 0.9f));
-		}
-
-		if (hit)
-		{
-			b2Vec2 p1 = output.point;
-			g_debugDraw.DrawPoint(p1, 10.0f, b2Color(0.9f, 0.3f, 0.3f));
-			b2Vec2 p2 = p1 + output.normal;
-			g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.3f, 0.3f));
-		}
-	}
-
-	b2Vec2 m_vAs[b2_maxPolygonVertices];
-	int32 m_countA;
-	float m_radiusA;
-
-	b2Vec2 m_vBs[b2_maxPolygonVertices];
-	int32 m_countB;
-	float m_radiusB;
-
-	b2Transform m_transformA;
-	b2Transform m_transformB;
-	b2Vec2 m_translationB;
+    }
+
+    static Test* Create() { return new ShapeCast; }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        b2ShapeCastInput input;
+        input.proxyA.Set(m_vAs, m_countA, m_radiusA);
+        input.proxyB.Set(m_vBs, m_countB, m_radiusB);
+        input.transformA   = m_transformA;
+        input.transformB   = m_transformB;
+        input.translationB = m_translationB;
+
+        b2ShapeCastOutput output;
+        bool hit = b2ShapeCast(&output, &input);
+
+        b2Transform transformB2;
+        transformB2.q = m_transformB.q;
+        transformB2.p = m_transformB.p + output.lambda * input.translationB;
+
+        b2DistanceInput distanceInput;
+        distanceInput.proxyA.Set(m_vAs, m_countA, m_radiusA);
+        distanceInput.proxyB.Set(m_vBs, m_countB, m_radiusB);
+        distanceInput.transformA = m_transformA;
+        distanceInput.transformB = transformB2;
+        distanceInput.useRadii   = false;
+        b2SimplexCache simplexCache;
+        simplexCache.count = 0;
+        b2DistanceOutput distanceOutput;
+
+        b2Distance(&distanceOutput, &simplexCache, &distanceInput);
+
+        DrawString(5, m_textLine, "hit = %s, iters = %d, lambda = %g, distance = %g", hit ? "true" : "false",
+                   output.iterations, output.lambda, distanceOutput.distance);
+
+        b2Vec2 vertices[b2_maxPolygonVertices];
+
+        for (int32 i = 0; i < m_countA; ++i)
+        {
+            vertices[i] = b2Mul(m_transformA, m_vAs[i]);
+        }
+
+        if (m_countA == 1)
+        {
+            g_debugDraw.DrawCircle(vertices[0], m_radiusA, b2Color(0.9f, 0.9f, 0.9f));
+        }
+        else
+        {
+            g_debugDraw.DrawPolygon(vertices, m_countA, b2Color(0.9f, 0.9f, 0.9f));
+        }
+
+        for (int32 i = 0; i < m_countB; ++i)
+        {
+            vertices[i] = b2Mul(m_transformB, m_vBs[i]);
+        }
+
+        if (m_countB == 1)
+        {
+            g_debugDraw.DrawCircle(vertices[0], m_radiusB, b2Color(0.5f, 0.9f, 0.5f));
+        }
+        else
+        {
+            g_debugDraw.DrawPolygon(vertices, m_countB, b2Color(0.5f, 0.9f, 0.5f));
+        }
+
+        for (int32 i = 0; i < m_countB; ++i)
+        {
+            vertices[i] = b2Mul(transformB2, m_vBs[i]);
+        }
+
+        if (m_countB == 1)
+        {
+            g_debugDraw.DrawCircle(vertices[0], m_radiusB, b2Color(0.5f, 0.7f, 0.9f));
+        }
+        else
+        {
+            g_debugDraw.DrawPolygon(vertices, m_countB, b2Color(0.5f, 0.7f, 0.9f));
+        }
+
+        if (hit)
+        {
+            b2Vec2 p1 = output.point;
+            g_debugDraw.DrawPoint(p1, 10.0f, b2Color(0.9f, 0.3f, 0.3f));
+            b2Vec2 p2 = p1 + output.normal;
+            g_debugDraw.DrawSegment(p1, p2, b2Color(0.9f, 0.3f, 0.3f));
+        }
+    }
+
+    b2Vec2 m_vAs[b2_maxPolygonVertices];
+    int32 m_countA;
+    float m_radiusA;
+
+    b2Vec2 m_vBs[b2_maxPolygonVertices];
+    int32 m_countB;
+    float m_radiusB;
+
+    b2Transform m_transformA;
+    b2Transform m_transformB;
+    b2Vec2 m_translationB;
 };
 
 static int testIndex = RegisterTest("Collision", "Shape Cast", ShapeCast::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_editing.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_editing.cpp
index 357ed8fa280a..c7b753b52400 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_editing.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/shape_editing.cpp
@@ -25,84 +25,79 @@
 class ShapeEditing : public Test
 {
 public:
-
-	ShapeEditing()
-	{
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		b2BodyDef bd;
-		bd.type = b2_dynamicBody;
-		bd.position.Set(0.0f, 10.0f);
-		m_body = m_world->CreateBody(&bd);
-
-		b2PolygonShape shape;
-		shape.SetAsBox(4.0f, 4.0f, b2Vec2(0.0f, 0.0f), 0.0f);
-		m_fixture1 = m_body->CreateFixture(&shape, 10.0f);
-
-		m_fixture2 = NULL;
-
-		m_sensor = false;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_C:
-			if (m_fixture2 == NULL)
-			{
-				b2CircleShape shape;
-				shape.m_radius = 3.0f;
-				shape.m_p.Set(0.5f, -4.0f);
-				m_fixture2 = m_body->CreateFixture(&shape, 10.0f);
-				m_body->SetAwake(true);
-			}
-			break;
-
-		case GLFW_KEY_D:
-			if (m_fixture2 != NULL)
-			{
-				m_body->DestroyFixture(m_fixture2);
-				m_fixture2 = NULL;
-				m_body->SetAwake(true);
-			}
-			break;
-
-		case GLFW_KEY_S:
-			if (m_fixture2 != NULL)
-			{
-				m_sensor = !m_sensor;
-				m_fixture2->SetSensor(m_sensor);
-			}
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Press: (c) create a shape, (d) destroy a shape.");
-		
-		DrawString(5, m_textLine, "sensor = %d", m_sensor);
-		
-	}
-
-	static Test* Create()
-	{
-		return new ShapeEditing;
-	}
-
-	b2Body* m_body;
-	b2Fixture* m_fixture1;
-	b2Fixture* m_fixture2;
-	bool m_sensor;
+    ShapeEditing()
+    {
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        b2BodyDef bd;
+        bd.type = b2_dynamicBody;
+        bd.position.Set(0.0f, 10.0f);
+        m_body = m_world->CreateBody(&bd);
+
+        b2PolygonShape shape;
+        shape.SetAsBox(4.0f, 4.0f, b2Vec2(0.0f, 0.0f), 0.0f);
+        m_fixture1 = m_body->CreateFixture(&shape, 10.0f);
+
+        m_fixture2 = NULL;
+
+        m_sensor = false;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_C:
+            if (m_fixture2 == NULL)
+            {
+                b2CircleShape shape;
+                shape.m_radius = 3.0f;
+                shape.m_p.Set(0.5f, -4.0f);
+                m_fixture2 = m_body->CreateFixture(&shape, 10.0f);
+                m_body->SetAwake(true);
+            }
+            break;
+
+        case GLFW_KEY_D:
+            if (m_fixture2 != NULL)
+            {
+                m_body->DestroyFixture(m_fixture2);
+                m_fixture2 = NULL;
+                m_body->SetAwake(true);
+            }
+            break;
+
+        case GLFW_KEY_S:
+            if (m_fixture2 != NULL)
+            {
+                m_sensor = !m_sensor;
+                m_fixture2->SetSensor(m_sensor);
+            }
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Press: (c) create a shape, (d) destroy a shape.");
+
+        DrawString(5, m_textLine, "sensor = %d", m_sensor);
+    }
+
+    static Test* Create() { return new ShapeEditing; }
+
+    b2Body* m_body;
+    b2Fixture* m_fixture1;
+    b2Fixture* m_fixture2;
+    bool m_sensor;
 };
 
 static int testIndex = RegisterTest("Examples", "Shape Editing", ShapeEditing::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/skier.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/skier.cpp
index c5ff52534002..05529640a25c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/skier.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/skier.cpp
@@ -10,141 +10,137 @@ Test case for collision/jerking issue.
 class Skier : public Test
 {
 public:
-	Skier()
-	{		
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			float const PlatformWidth = 8.0f;
-
-			/*
-			First angle is from the horizontal and should be negative for a downward slope.
-			Second angle is relative to the preceding slope, and should be positive, creating a kind of
-			loose 'Z'-shape from the 3 edges.
-			If A1 = -10, then A2 <= ~1.5 will result in the collision glitch.
-			If A1 = -30, then A2 <= ~10.0 will result in the glitch.
-			*/
-			float const Angle1Degrees = -30.0f;
-			float const Angle2Degrees = 10.0f;
-			
-			/*
-			The larger the value of SlopeLength, the less likely the glitch will show up.
-			*/
-			float const SlopeLength = 2.0f;
-
-			float const SurfaceFriction = 0.2f;
-
-			// Convert to radians
-			float const Slope1Incline = -Angle1Degrees * b2_pi / 180.0f;
-			float const Slope2Incline = Slope1Incline - Angle2Degrees * b2_pi / 180.0f;
-			//
-
-			m_platform_width = PlatformWidth;
-
-			// Horizontal platform
-			b2Vec2 v1(-PlatformWidth, 0.0f);
-			b2Vec2 v2(0.0f, 0.0f);
-			b2Vec2 v3(SlopeLength * cosf(Slope1Incline), -SlopeLength * sinf(Slope1Incline));
-			b2Vec2 v4(v3.x + SlopeLength * cosf(Slope2Incline), v3.y - SlopeLength * sinf(Slope2Incline));
-			b2Vec2 v5(v4.x, v4.y - 1.0f);
-
-			b2Vec2 vertices[5] = { v5, v4, v3, v2, v1 };
-
-			b2ChainShape shape;
-			shape.CreateLoop(vertices, 5);
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 0.0f;
-			fd.friction = SurfaceFriction;
-
-			ground->CreateFixture(&fd);
-		}
-
-		{
-			float const BodyWidth = 1.0f;
-			float const BodyHeight = 2.5f;
-			float const SkiLength = 3.0f;
-
-			/*
-			Larger values for this seem to alleviate the issue to some extent.
-			*/
-			float const SkiThickness = 0.3f;
-
-			float const SkiFriction = 0.0f;
-			float const SkiRestitution = 0.15f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			float initial_y = BodyHeight / 2 + SkiThickness;
-			bd.position.Set(-m_platform_width / 2, initial_y);
-
-			b2Body* skier = m_world->CreateBody(&bd);
-
-			b2PolygonShape ski;
-			b2Vec2 verts[4];
-			verts[0].Set(-SkiLength / 2 - SkiThickness, -BodyHeight / 2);
-			verts[1].Set(-SkiLength / 2, -BodyHeight / 2 - SkiThickness);
-			verts[2].Set(SkiLength / 2, -BodyHeight / 2 - SkiThickness);
-			verts[3].Set(SkiLength / 2 + SkiThickness, -BodyHeight / 2);
-			ski.Set(verts, 4);
-
-			b2FixtureDef fd;
-			fd.density = 1.0f;
-
-			fd.friction = SkiFriction;
-			fd.restitution = SkiRestitution;
-
-			fd.shape = &ski;
-			skier->CreateFixture(&fd);
-
-			skier->SetLinearVelocity(b2Vec2(0.5f, 0.0f));
-
-			m_skier = skier;
-		}
-
-		//g_camera.m_center = b2Vec2(m_platform_width / 2.0f, 0.0f);
-		//g_camera.m_zoom = 0.4f;
-		m_fixed_camera = true;
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-			case GLFW_KEY_C:
-			m_fixed_camera = !m_fixed_camera;
-			if(m_fixed_camera)
-			{
-		//		g_camera.m_center = b2Vec2(m_platform_width / 2.0f, 0.0f);
-			}
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		DrawString(5, m_textLine, "Keys: c = Camera fixed/tracking");
-		
-
-		if(!m_fixed_camera)
-		{
-			//g_camera.m_center = m_skier->GetPosition();
-		}
-
-		Test::Step(settings);
-	}
-
-	static Test* Create()
-	{
-		return new Skier;
-	}
-
-	b2Body* m_skier;
-	float m_platform_width;
-	bool m_fixed_camera;
+    Skier()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            float const PlatformWidth = 8.0f;
+
+            /*
+            First angle is from the horizontal and should be negative for a downward slope.
+            Second angle is relative to the preceding slope, and should be positive, creating a kind of
+            loose 'Z'-shape from the 3 edges.
+            If A1 = -10, then A2 <= ~1.5 will result in the collision glitch.
+            If A1 = -30, then A2 <= ~10.0 will result in the glitch.
+            */
+            float const Angle1Degrees = -30.0f;
+            float const Angle2Degrees = 10.0f;
+
+            /*
+            The larger the value of SlopeLength, the less likely the glitch will show up.
+            */
+            float const SlopeLength = 2.0f;
+
+            float const SurfaceFriction = 0.2f;
+
+            // Convert to radians
+            float const Slope1Incline = -Angle1Degrees * b2_pi / 180.0f;
+            float const Slope2Incline = Slope1Incline - Angle2Degrees * b2_pi / 180.0f;
+            //
+
+            m_platform_width = PlatformWidth;
+
+            // Horizontal platform
+            b2Vec2 v1(-PlatformWidth, 0.0f);
+            b2Vec2 v2(0.0f, 0.0f);
+            b2Vec2 v3(SlopeLength * cosf(Slope1Incline), -SlopeLength * sinf(Slope1Incline));
+            b2Vec2 v4(v3.x + SlopeLength * cosf(Slope2Incline), v3.y - SlopeLength * sinf(Slope2Incline));
+            b2Vec2 v5(v4.x, v4.y - 1.0f);
+
+            b2Vec2 vertices[5] = {v5, v4, v3, v2, v1};
+
+            b2ChainShape shape;
+            shape.CreateLoop(vertices, 5);
+            b2FixtureDef fd;
+            fd.shape    = &shape;
+            fd.density  = 0.0f;
+            fd.friction = SurfaceFriction;
+
+            ground->CreateFixture(&fd);
+        }
+
+        {
+            float const BodyWidth  = 1.0f;
+            float const BodyHeight = 2.5f;
+            float const SkiLength  = 3.0f;
+
+            /*
+            Larger values for this seem to alleviate the issue to some extent.
+            */
+            float const SkiThickness = 0.3f;
+
+            float const SkiFriction    = 0.0f;
+            float const SkiRestitution = 0.15f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            float initial_y = BodyHeight / 2 + SkiThickness;
+            bd.position.Set(-m_platform_width / 2, initial_y);
+
+            b2Body* skier = m_world->CreateBody(&bd);
+
+            b2PolygonShape ski;
+            b2Vec2 verts[4];
+            verts[0].Set(-SkiLength / 2 - SkiThickness, -BodyHeight / 2);
+            verts[1].Set(-SkiLength / 2, -BodyHeight / 2 - SkiThickness);
+            verts[2].Set(SkiLength / 2, -BodyHeight / 2 - SkiThickness);
+            verts[3].Set(SkiLength / 2 + SkiThickness, -BodyHeight / 2);
+            ski.Set(verts, 4);
+
+            b2FixtureDef fd;
+            fd.density = 1.0f;
+
+            fd.friction    = SkiFriction;
+            fd.restitution = SkiRestitution;
+
+            fd.shape = &ski;
+            skier->CreateFixture(&fd);
+
+            skier->SetLinearVelocity(b2Vec2(0.5f, 0.0f));
+
+            m_skier = skier;
+        }
+
+        // g_camera.m_center = b2Vec2(m_platform_width / 2.0f, 0.0f);
+        // g_camera.m_zoom = 0.4f;
+        m_fixed_camera = true;
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_C:
+            m_fixed_camera = !m_fixed_camera;
+            if (m_fixed_camera)
+            {
+                //		g_camera.m_center = b2Vec2(m_platform_width / 2.0f, 0.0f);
+            }
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        DrawString(5, m_textLine, "Keys: c = Camera fixed/tracking");
+
+        if (!m_fixed_camera)
+        {
+            // g_camera.m_center = m_skier->GetPosition();
+        }
+
+        Test::Step(settings);
+    }
+
+    static Test* Create() { return new Skier; }
+
+    b2Body* m_skier;
+    float m_platform_width;
+    bool m_fixed_camera;
 };
 
 static int testIndex = RegisterTest("Bugs", "Skier", Skier::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_1.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_1.cpp
index 395b93939edb..e09e8ade1992 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_1.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_1.cpp
@@ -26,81 +26,78 @@
 class SliderCrank1 : public Test
 {
 public:
-	SliderCrank1()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
+    SliderCrank1()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
             bd.position.Set(0.0f, 17.0f);
-			ground = m_world->CreateBody(&bd);
-		}
-        
-		{
-			b2Body* prevBody = ground;
-            
-			// Define crank.
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(4.0f, 1.0f);
-                
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(-8.0f, 20.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-                
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(-12.0f, 20.0f));
-				m_world->CreateJoint(&rjd);
-                
-				prevBody = body;
-			}
-            
-			// Define connecting rod
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(8.0f, 1.0f);
-                
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(4.0f, 20.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-                
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(-4.0f, 20.0f));
-				m_world->CreateJoint(&rjd);
-                
-				prevBody = body;
-			}
-            
-			// Define piston
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(3.0f, 3.0f);
-                
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.fixedRotation = true;
-				bd.position.Set(12.0f, 20.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-                
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(12.0f, 20.0f));
-				m_world->CreateJoint(&rjd);
-                
-				b2PrismaticJointDef pjd;
-				pjd.Initialize(ground, body, b2Vec2(12.0f, 17.0f), b2Vec2(1.0f, 0.0f));
-				m_world->CreateJoint(&pjd);
-			}
-  		}
-	}
-    
-	static Test* Create()
-	{
-		return new SliderCrank1;
-	}
+            ground = m_world->CreateBody(&bd);
+        }
+
+        {
+            b2Body* prevBody = ground;
+
+            // Define crank.
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(4.0f, 1.0f);
+
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(-8.0f, 20.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(-12.0f, 20.0f));
+                m_world->CreateJoint(&rjd);
+
+                prevBody = body;
+            }
+
+            // Define connecting rod
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(8.0f, 1.0f);
+
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(4.0f, 20.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(-4.0f, 20.0f));
+                m_world->CreateJoint(&rjd);
+
+                prevBody = body;
+            }
+
+            // Define piston
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(3.0f, 3.0f);
+
+                b2BodyDef bd;
+                bd.type          = b2_dynamicBody;
+                bd.fixedRotation = true;
+                bd.position.Set(12.0f, 20.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(12.0f, 20.0f));
+                m_world->CreateJoint(&rjd);
+
+                b2PrismaticJointDef pjd;
+                pjd.Initialize(ground, body, b2Vec2(12.0f, 17.0f), b2Vec2(1.0f, 0.0f));
+                m_world->CreateJoint(&pjd);
+            }
+        }
+    }
+
+    static Test* Create() { return new SliderCrank1; }
 };
 
 static int testIndex = RegisterTest("Examples", "Slider Crank 1", SliderCrank1::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_2.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_2.cpp
index 22119e803a16..f55a05859cf6 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_2.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/slider_crank_2.cpp
@@ -28,133 +28,129 @@
 class SliderCrank2 : public Test
 {
 public:
-	SliderCrank2()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2Body* prevBody = ground;
-
-			// Define crank.
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(0.5f, 2.0f);
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.0f, 7.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(0.0f, 5.0f));
-				rjd.motorSpeed = 1.0f * b2_pi;
-				rjd.maxMotorTorque = 10000.0f;
-				rjd.enableMotor = true;
-				m_joint1 = (b2RevoluteJoint*)m_world->CreateJoint(&rjd);
-
-				prevBody = body;
-			}
-
-			// Define follower.
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(0.5f, 4.0f);
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.0f, 13.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(0.0f, 9.0f));
-				rjd.enableMotor = false;
-				m_world->CreateJoint(&rjd);
-
-				prevBody = body;
-			}
-
-			// Define piston
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(1.5f, 1.5f);
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.fixedRotation = true;
-				bd.position.Set(0.0f, 17.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-
-				b2RevoluteJointDef rjd;
-				rjd.Initialize(prevBody, body, b2Vec2(0.0f, 17.0f));
-				m_world->CreateJoint(&rjd);
-
-				b2PrismaticJointDef pjd;
-				pjd.Initialize(ground, body, b2Vec2(0.0f, 17.0f), b2Vec2(0.0f, 1.0f));
-
-				pjd.maxMotorForce = 1000.0f;
-				pjd.enableMotor = true;
-
-				m_joint2 = (b2PrismaticJoint*)m_world->CreateJoint(&pjd);
-			}
-
-			// Create a payload
-			{
-				b2PolygonShape shape;
-				shape.SetAsBox(1.5f, 1.5f);
-
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.0f, 23.0f);
-				b2Body* body = m_world->CreateBody(&bd);
-				body->CreateFixture(&shape, 2.0f);
-			}
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_F:
-			m_joint2->EnableMotor(!m_joint2->IsMotorEnabled());
-			m_joint2->GetBodyB()->SetAwake(true);
-			break;
-
-		case GLFW_KEY_M:
-			m_joint1->EnableMotor(!m_joint1->IsMotorEnabled());
-			m_joint1->GetBodyB()->SetAwake(true);
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Keys: (f) toggle friction, (m) toggle motor");
-		
-		float torque = m_joint1->GetMotorTorque(settings.m_hertz);
-		DrawString(5, m_textLine, "Motor Torque = %5.0f", (float) torque);
-		
-	}
-
-	static Test* Create()
-	{
-		return new SliderCrank2;
-	}
-
-	b2RevoluteJoint* m_joint1;
-	b2PrismaticJoint* m_joint2;
+    SliderCrank2()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2Body* prevBody = ground;
+
+            // Define crank.
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(0.5f, 2.0f);
+
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.0f, 7.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(0.0f, 5.0f));
+                rjd.motorSpeed     = 1.0f * b2_pi;
+                rjd.maxMotorTorque = 10000.0f;
+                rjd.enableMotor    = true;
+                m_joint1           = (b2RevoluteJoint*)m_world->CreateJoint(&rjd);
+
+                prevBody = body;
+            }
+
+            // Define follower.
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(0.5f, 4.0f);
+
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.0f, 13.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(0.0f, 9.0f));
+                rjd.enableMotor = false;
+                m_world->CreateJoint(&rjd);
+
+                prevBody = body;
+            }
+
+            // Define piston
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(1.5f, 1.5f);
+
+                b2BodyDef bd;
+                bd.type          = b2_dynamicBody;
+                bd.fixedRotation = true;
+                bd.position.Set(0.0f, 17.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+
+                b2RevoluteJointDef rjd;
+                rjd.Initialize(prevBody, body, b2Vec2(0.0f, 17.0f));
+                m_world->CreateJoint(&rjd);
+
+                b2PrismaticJointDef pjd;
+                pjd.Initialize(ground, body, b2Vec2(0.0f, 17.0f), b2Vec2(0.0f, 1.0f));
+
+                pjd.maxMotorForce = 1000.0f;
+                pjd.enableMotor   = true;
+
+                m_joint2 = (b2PrismaticJoint*)m_world->CreateJoint(&pjd);
+            }
+
+            // Create a payload
+            {
+                b2PolygonShape shape;
+                shape.SetAsBox(1.5f, 1.5f);
+
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.0f, 23.0f);
+                b2Body* body = m_world->CreateBody(&bd);
+                body->CreateFixture(&shape, 2.0f);
+            }
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_F:
+            m_joint2->EnableMotor(!m_joint2->IsMotorEnabled());
+            m_joint2->GetBodyB()->SetAwake(true);
+            break;
+
+        case GLFW_KEY_M:
+            m_joint1->EnableMotor(!m_joint1->IsMotorEnabled());
+            m_joint1->GetBodyB()->SetAwake(true);
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Keys: (f) toggle friction, (m) toggle motor");
+
+        float torque = m_joint1->GetMotorTorque(settings.m_hertz);
+        DrawString(5, m_textLine, "Motor Torque = %5.0f", (float)torque);
+    }
+
+    static Test* Create() { return new SliderCrank2; }
+
+    b2RevoluteJoint* m_joint1;
+    b2PrismaticJoint* m_joint2;
 };
 
 static int testIndex = RegisterTest("Examples", "Slider Crank 2", SliderCrank2::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/test.h b/tests/cpp-tests/Classes/Box2DTestBed/tests/test.h
index 0d81acaa7221..f2a465e72925 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/test.h
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/test.h
@@ -1,20 +1,20 @@
 /*
-* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-*/
+ * Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
 
 #ifndef TEST_H
 #define TEST_H
@@ -27,123 +27,121 @@
 class Test;
 struct Settings;
 
-#define	RAND_LIMIT	32767
+#define RAND_LIMIT 32767
 #define DRAW_STRING_NEW_LINE 25
 
 /// Random number in range [-1,1]
 inline float RandomFloat()
 {
-	float r = (float)(std::rand() & (RAND_LIMIT));
-	r /= RAND_LIMIT;
-	r = 2.0f * r - 1.0f;
-	return r;
+    float r = (float)(std::rand() & (RAND_LIMIT));
+    r /= RAND_LIMIT;
+    r = 2.0f * r - 1.0f;
+    return r;
 }
 
 /// Random floating point number in range [lo, hi]
 inline float RandomFloat(float lo, float hi)
 {
-	float r = (float)(std::rand() & (RAND_LIMIT));
-	r /= RAND_LIMIT;
-	r = (hi - lo) * r + lo;
-	return r;
+    float r = (float)(std::rand() & (RAND_LIMIT));
+    r /= RAND_LIMIT;
+    r = (hi - lo) * r + lo;
+    return r;
 }
 
-
 // This is called when a joint in the world is implicitly destroyed
 // because an attached body is destroyed. This gives us a chance to
 // nullify the mouse joint.
 class DestructionListener : public b2DestructionListener
 {
 public:
-	void SayGoodbye(b2Fixture* fixture) { B2_NOT_USED(fixture); }
-	void SayGoodbye(b2Joint* joint);
+    void SayGoodbye(b2Fixture* fixture) { B2_NOT_USED(fixture); }
+    void SayGoodbye(b2Joint* joint);
 
-	Test* test;
+    Test* test;
 };
 
 const int32 k_maxContactPoints = 2048;
 
 struct ContactPoint
 {
-	b2Fixture* fixtureA;
-	b2Fixture* fixtureB;
-	b2Vec2 normal;
-	b2Vec2 position;
-	b2PointState state;
-	float normalImpulse;
-	float tangentImpulse;
-	float separation;
+    b2Fixture* fixtureA;
+    b2Fixture* fixtureB;
+    b2Vec2 normal;
+    b2Vec2 position;
+    b2PointState state;
+    float normalImpulse;
+    float tangentImpulse;
+    float separation;
 };
 class Test : public b2ContactListener
 {
 public:
-
-	Test();
-	virtual ~Test();
-
-	void DrawTitle(const char* string);
-	virtual void Step(Settings& settings);
-	virtual void UpdateUI() {}
-	virtual void Keyboard(int key) { B2_NOT_USED(key); }
-	virtual void KeyboardUp(int key) { B2_NOT_USED(key); }
-	void ShiftMouseDown(const b2Vec2& p);
-	virtual bool MouseDown(const b2Vec2& p);
-	virtual void MouseUp(const b2Vec2& p);
-	virtual void MouseMove(const b2Vec2& p);
-	void LaunchBomb();
-	void LaunchBomb(const b2Vec2& position, const b2Vec2& velocity);
-
-	void SpawnBomb(const b2Vec2& worldPt);
-	void CompleteBombSpawn(const b2Vec2& p);
-
-	// Let derived tests know that a joint was destroyed.
-	virtual void JointDestroyed(b2Joint* joint) { B2_NOT_USED(joint); }
-
-	// Callbacks for derived classes.
-	virtual void BeginContact(b2Contact* contact)  override { B2_NOT_USED(contact); }
-	virtual void EndContact(b2Contact* contact)  override { B2_NOT_USED(contact); }
-	virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override;
-	virtual void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) override
-	{
-		B2_NOT_USED(contact);
-		B2_NOT_USED(impulse);
-	}
-
-	void ShiftOrigin(const b2Vec2& newOrigin);
-
-	void initShader(void);
-	void DrawString(int x, int y, const char* fmt, ...);
-	void DrawString(const b2Vec2& p, const char* fmt, ...);
-	void DrawAABB(b2AABB* aabb, const b2Color& color);
-	void Flush();
-
-	cocos2d::extension::PhysicsDebugNodeBox2D g_debugDraw;
-	cocos2d::DrawNode* debugDrawNode;
-	std::string debugString = "";
-
-	b2World* m_world;
+    Test();
+    virtual ~Test();
+
+    void DrawTitle(const char* string);
+    virtual void Step(Settings& settings);
+    virtual void UpdateUI() {}
+    virtual void Keyboard(int key) { B2_NOT_USED(key); }
+    virtual void KeyboardUp(int key) { B2_NOT_USED(key); }
+    void ShiftMouseDown(const b2Vec2& p);
+    virtual bool MouseDown(const b2Vec2& p);
+    virtual void MouseUp(const b2Vec2& p);
+    virtual void MouseMove(const b2Vec2& p);
+    void LaunchBomb();
+    void LaunchBomb(const b2Vec2& position, const b2Vec2& velocity);
+
+    void SpawnBomb(const b2Vec2& worldPt);
+    void CompleteBombSpawn(const b2Vec2& p);
+
+    // Let derived tests know that a joint was destroyed.
+    virtual void JointDestroyed(b2Joint* joint) { B2_NOT_USED(joint); }
+
+    // Callbacks for derived classes.
+    virtual void BeginContact(b2Contact* contact) override { B2_NOT_USED(contact); }
+    virtual void EndContact(b2Contact* contact) override { B2_NOT_USED(contact); }
+    virtual void PreSolve(b2Contact* contact, const b2Manifold* oldManifold) override;
+    virtual void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse) override
+    {
+        B2_NOT_USED(contact);
+        B2_NOT_USED(impulse);
+    }
+
+    void ShiftOrigin(const b2Vec2& newOrigin);
+
+    void initShader(void);
+    void DrawString(int x, int y, const char* fmt, ...);
+    void DrawString(const b2Vec2& p, const char* fmt, ...);
+    void DrawAABB(b2AABB* aabb, const b2Color& color);
+    void Flush();
+
+    cocos2d::extension::PhysicsDebugNodeBox2D g_debugDraw;
+    cocos2d::DrawNode* debugDrawNode;
+    std::string debugString = "";
+
+    b2World* m_world;
 
 protected:
-	friend class DestructionListener;
-	friend class BoundaryListener;
-	friend class ContactListener;
-
-	b2Body* m_groundBody;
-	b2AABB m_worldAABB;
-	ContactPoint m_points[k_maxContactPoints];
-	int32 m_pointCount;
-	DestructionListener m_destructionListener;
-	int32 m_textLine;
-
-	b2Body* m_bomb;
-	b2MouseJoint* m_mouseJoint;
-	b2Vec2 m_bombSpawnPoint;
-	bool m_bombSpawning;
-	b2Vec2 m_mouseWorld;
-	int32 m_stepCount;
-	int32 m_textIncrement;
-	b2Profile m_maxProfile;
-	b2Profile m_totalProfile;
+    friend class DestructionListener;
+    friend class BoundaryListener;
+    friend class ContactListener;
+
+    b2Body* m_groundBody;
+    b2AABB m_worldAABB;
+    ContactPoint m_points[k_maxContactPoints];
+    int32 m_pointCount;
+    DestructionListener m_destructionListener;
+    int32 m_textLine;
+
+    b2Body* m_bomb;
+    b2MouseJoint* m_mouseJoint;
+    b2Vec2 m_bombSpawnPoint;
+    bool m_bombSpawning;
+    b2Vec2 m_mouseWorld;
+    int32 m_stepCount;
+    int32 m_textIncrement;
+    b2Profile m_maxProfile;
+    b2Profile m_totalProfile;
 };
 
 typedef Test* TestCreateFcn();
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/theo_jansen.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/theo_jansen.cpp
index 4ff62c7a5d30..cab814037c1c 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/theo_jansen.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/theo_jansen.cpp
@@ -28,239 +28,234 @@
 class TheoJansen : public Test
 {
 public:
-
-	void CreateLeg(float s, const b2Vec2& wheelAnchor)
-	{
-		b2Vec2 p1(5.4f * s, -6.1f);
-		b2Vec2 p2(7.2f * s, -1.2f);
-		b2Vec2 p3(4.3f * s, -1.9f);
-		b2Vec2 p4(3.1f * s, 0.8f);
-		b2Vec2 p5(6.0f * s, 1.5f);
-		b2Vec2 p6(2.5f * s, 3.7f);
-
-		b2FixtureDef fd1, fd2;
-		fd1.filter.groupIndex = -1;
-		fd2.filter.groupIndex = -1;
-		fd1.density = 1.0f;
-		fd2.density = 1.0f;
-
-		b2PolygonShape poly1, poly2;
-
-		if (s > 0.0f)
-		{
-			b2Vec2 vertices[3];
-
-			vertices[0] = p1;
-			vertices[1] = p2;
-			vertices[2] = p3;
-			poly1.Set(vertices, 3);
-
-			vertices[0] = b2Vec2_zero;
-			vertices[1] = p5 - p4;
-			vertices[2] = p6 - p4;
-			poly2.Set(vertices, 3);
-		}
-		else
-		{
-			b2Vec2 vertices[3];
-
-			vertices[0] = p1;
-			vertices[1] = p3;
-			vertices[2] = p2;
-			poly1.Set(vertices, 3);
-
-			vertices[0] = b2Vec2_zero;
-			vertices[1] = p6 - p4;
-			vertices[2] = p5 - p4;
-			poly2.Set(vertices, 3);
-		}
-
-		fd1.shape = &poly1;
-		fd2.shape = &poly2;
-
-		b2BodyDef bd1, bd2;
-		bd1.type = b2_dynamicBody;
-		bd2.type = b2_dynamicBody;
-		bd1.position = m_offset;
-		bd2.position = p4 + m_offset;
-
-		bd1.angularDamping = 10.0f;
-		bd2.angularDamping = 10.0f;
-
-		b2Body* body1 = m_world->CreateBody(&bd1);
-		b2Body* body2 = m_world->CreateBody(&bd2);
-
-		body1->CreateFixture(&fd1);
-		body2->CreateFixture(&fd2);
-
-		{
-			b2DistanceJointDef jd;
-
-			// Using a soft distance constraint can reduce some jitter.
-			// It also makes the structure seem a bit more fluid by
-			// acting like a suspension system.
-			float dampingRatio = 0.5f;
-			float frequencyHz = 10.0f;
-
-			jd.Initialize(body1, body2, p2 + m_offset, p5 + m_offset);
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_world->CreateJoint(&jd);
-
-			jd.Initialize(body1, body2, p3 + m_offset, p4 + m_offset);
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_world->CreateJoint(&jd);
-
-			jd.Initialize(body1, m_wheel, p3 + m_offset, wheelAnchor + m_offset);
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_world->CreateJoint(&jd);
-
-			jd.Initialize(body2, m_wheel, p6 + m_offset, wheelAnchor + m_offset);
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_world->CreateJoint(&jd);
-		}
-
-		{
-			b2RevoluteJointDef jd;
-			jd.Initialize(body2, m_chassis, p4 + m_offset);
-			m_world->CreateJoint(&jd);
-		}
-	}
-
-	TheoJansen()
-	{
-		m_offset.Set(0.0f, 8.0f);
-		m_motorSpeed = 2.0f;
-		m_motorOn = true;
-		b2Vec2 pivot(0.0f, 0.8f);
-
-		// Ground
-		{
-			b2BodyDef bd;
-			b2Body* ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(50.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(-50.0f, 10.0f));
-			ground->CreateFixture(&shape, 0.0f);
-
-			shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(50.0f, 10.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		// Balls
-		for (int32 i = 0; i < 40; ++i)
-		{
-			b2CircleShape shape;
-			shape.m_radius = 0.25f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(-40.0f + 2.0f * i, 0.5f);
-
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 1.0f);
-		}
-
-		// Chassis
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(2.5f, 1.0f);
-
-			b2FixtureDef sd;
-			sd.density = 1.0f;
-			sd.shape = &shape;
-			sd.filter.groupIndex = -1;
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = pivot + m_offset;
-			m_chassis = m_world->CreateBody(&bd);
-			m_chassis->CreateFixture(&sd);
-		}
-
-		{
-			b2CircleShape shape;
-			shape.m_radius = 1.6f;
-
-			b2FixtureDef sd;
-			sd.density = 1.0f;
-			sd.shape = &shape;
-			sd.filter.groupIndex = -1;
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position = pivot + m_offset;
-			m_wheel = m_world->CreateBody(&bd);
-			m_wheel->CreateFixture(&sd);
-		}
-
-		{
-			b2RevoluteJointDef jd;
-			jd.Initialize(m_wheel, m_chassis, pivot + m_offset);
-			jd.collideConnected = false;
-			jd.motorSpeed = m_motorSpeed;
-			jd.maxMotorTorque = 400.0f;
-			jd.enableMotor = m_motorOn;
-			m_motorJoint = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-		}
-
-		b2Vec2 wheelAnchor;
-		
-		wheelAnchor = pivot + b2Vec2(0.0f, -0.8f);
-
-		CreateLeg(-1.0f, wheelAnchor);
-		CreateLeg(1.0f, wheelAnchor);
-
-		m_wheel->SetTransform(m_wheel->GetPosition(), 120.0f * b2_pi / 180.0f);
-		CreateLeg(-1.0f, wheelAnchor);
-		CreateLeg(1.0f, wheelAnchor);
-
-		m_wheel->SetTransform(m_wheel->GetPosition(), -120.0f * b2_pi / 180.0f);
-		CreateLeg(-1.0f, wheelAnchor);
-		CreateLeg(1.0f, wheelAnchor);
-	}
-
-	void Step(Settings& settings) override
-	{
-		DrawString(5, m_textLine, "Keys: left = a, brake = s, right = d, toggle motor = m");
-		
-
-		Test::Step(settings);
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_A:
-			m_motorJoint->SetMotorSpeed(-m_motorSpeed);
-			break;
-
-		case GLFW_KEY_S:
-			m_motorJoint->SetMotorSpeed(0.0f);
-			break;
-
-		case GLFW_KEY_D:
-			m_motorJoint->SetMotorSpeed(m_motorSpeed);
-			break;
-
-		case GLFW_KEY_M:
-			m_motorJoint->EnableMotor(!m_motorJoint->IsMotorEnabled());
-			break;
-		}
-	}
-
-	static Test* Create()
-	{
-		return new TheoJansen;
-	}
-
-	b2Vec2 m_offset;
-	b2Body* m_chassis;
-	b2Body* m_wheel;
-	b2RevoluteJoint* m_motorJoint;
-	bool m_motorOn;
-	float m_motorSpeed;
+    void CreateLeg(float s, const b2Vec2& wheelAnchor)
+    {
+        b2Vec2 p1(5.4f * s, -6.1f);
+        b2Vec2 p2(7.2f * s, -1.2f);
+        b2Vec2 p3(4.3f * s, -1.9f);
+        b2Vec2 p4(3.1f * s, 0.8f);
+        b2Vec2 p5(6.0f * s, 1.5f);
+        b2Vec2 p6(2.5f * s, 3.7f);
+
+        b2FixtureDef fd1, fd2;
+        fd1.filter.groupIndex = -1;
+        fd2.filter.groupIndex = -1;
+        fd1.density           = 1.0f;
+        fd2.density           = 1.0f;
+
+        b2PolygonShape poly1, poly2;
+
+        if (s > 0.0f)
+        {
+            b2Vec2 vertices[3];
+
+            vertices[0] = p1;
+            vertices[1] = p2;
+            vertices[2] = p3;
+            poly1.Set(vertices, 3);
+
+            vertices[0] = b2Vec2_zero;
+            vertices[1] = p5 - p4;
+            vertices[2] = p6 - p4;
+            poly2.Set(vertices, 3);
+        }
+        else
+        {
+            b2Vec2 vertices[3];
+
+            vertices[0] = p1;
+            vertices[1] = p3;
+            vertices[2] = p2;
+            poly1.Set(vertices, 3);
+
+            vertices[0] = b2Vec2_zero;
+            vertices[1] = p6 - p4;
+            vertices[2] = p5 - p4;
+            poly2.Set(vertices, 3);
+        }
+
+        fd1.shape = &poly1;
+        fd2.shape = &poly2;
+
+        b2BodyDef bd1, bd2;
+        bd1.type     = b2_dynamicBody;
+        bd2.type     = b2_dynamicBody;
+        bd1.position = m_offset;
+        bd2.position = p4 + m_offset;
+
+        bd1.angularDamping = 10.0f;
+        bd2.angularDamping = 10.0f;
+
+        b2Body* body1 = m_world->CreateBody(&bd1);
+        b2Body* body2 = m_world->CreateBody(&bd2);
+
+        body1->CreateFixture(&fd1);
+        body2->CreateFixture(&fd2);
+
+        {
+            b2DistanceJointDef jd;
+
+            // Using a soft distance constraint can reduce some jitter.
+            // It also makes the structure seem a bit more fluid by
+            // acting like a suspension system.
+            float dampingRatio = 0.5f;
+            float frequencyHz  = 10.0f;
+
+            jd.Initialize(body1, body2, p2 + m_offset, p5 + m_offset);
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_world->CreateJoint(&jd);
+
+            jd.Initialize(body1, body2, p3 + m_offset, p4 + m_offset);
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_world->CreateJoint(&jd);
+
+            jd.Initialize(body1, m_wheel, p3 + m_offset, wheelAnchor + m_offset);
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_world->CreateJoint(&jd);
+
+            jd.Initialize(body2, m_wheel, p6 + m_offset, wheelAnchor + m_offset);
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_world->CreateJoint(&jd);
+        }
+
+        {
+            b2RevoluteJointDef jd;
+            jd.Initialize(body2, m_chassis, p4 + m_offset);
+            m_world->CreateJoint(&jd);
+        }
+    }
+
+    TheoJansen()
+    {
+        m_offset.Set(0.0f, 8.0f);
+        m_motorSpeed = 2.0f;
+        m_motorOn    = true;
+        b2Vec2 pivot(0.0f, 0.8f);
+
+        // Ground
+        {
+            b2BodyDef bd;
+            b2Body* ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(50.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(-50.0f, 10.0f));
+            ground->CreateFixture(&shape, 0.0f);
+
+            shape.SetTwoSided(b2Vec2(50.0f, 0.0f), b2Vec2(50.0f, 10.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        // Balls
+        for (int32 i = 0; i < 40; ++i)
+        {
+            b2CircleShape shape;
+            shape.m_radius = 0.25f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(-40.0f + 2.0f * i, 0.5f);
+
+            b2Body* body = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 1.0f);
+        }
+
+        // Chassis
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(2.5f, 1.0f);
+
+            b2FixtureDef sd;
+            sd.density           = 1.0f;
+            sd.shape             = &shape;
+            sd.filter.groupIndex = -1;
+            b2BodyDef bd;
+            bd.type     = b2_dynamicBody;
+            bd.position = pivot + m_offset;
+            m_chassis   = m_world->CreateBody(&bd);
+            m_chassis->CreateFixture(&sd);
+        }
+
+        {
+            b2CircleShape shape;
+            shape.m_radius = 1.6f;
+
+            b2FixtureDef sd;
+            sd.density           = 1.0f;
+            sd.shape             = &shape;
+            sd.filter.groupIndex = -1;
+            b2BodyDef bd;
+            bd.type     = b2_dynamicBody;
+            bd.position = pivot + m_offset;
+            m_wheel     = m_world->CreateBody(&bd);
+            m_wheel->CreateFixture(&sd);
+        }
+
+        {
+            b2RevoluteJointDef jd;
+            jd.Initialize(m_wheel, m_chassis, pivot + m_offset);
+            jd.collideConnected = false;
+            jd.motorSpeed       = m_motorSpeed;
+            jd.maxMotorTorque   = 400.0f;
+            jd.enableMotor      = m_motorOn;
+            m_motorJoint        = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+        }
+
+        b2Vec2 wheelAnchor;
+
+        wheelAnchor = pivot + b2Vec2(0.0f, -0.8f);
+
+        CreateLeg(-1.0f, wheelAnchor);
+        CreateLeg(1.0f, wheelAnchor);
+
+        m_wheel->SetTransform(m_wheel->GetPosition(), 120.0f * b2_pi / 180.0f);
+        CreateLeg(-1.0f, wheelAnchor);
+        CreateLeg(1.0f, wheelAnchor);
+
+        m_wheel->SetTransform(m_wheel->GetPosition(), -120.0f * b2_pi / 180.0f);
+        CreateLeg(-1.0f, wheelAnchor);
+        CreateLeg(1.0f, wheelAnchor);
+    }
+
+    void Step(Settings& settings) override
+    {
+        DrawString(5, m_textLine, "Keys: left = a, brake = s, right = d, toggle motor = m");
+
+        Test::Step(settings);
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_A:
+            m_motorJoint->SetMotorSpeed(-m_motorSpeed);
+            break;
+
+        case GLFW_KEY_S:
+            m_motorJoint->SetMotorSpeed(0.0f);
+            break;
+
+        case GLFW_KEY_D:
+            m_motorJoint->SetMotorSpeed(m_motorSpeed);
+            break;
+
+        case GLFW_KEY_M:
+            m_motorJoint->EnableMotor(!m_motorJoint->IsMotorEnabled());
+            break;
+        }
+    }
+
+    static Test* Create() { return new TheoJansen; }
+
+    b2Vec2 m_offset;
+    b2Body* m_chassis;
+    b2Body* m_wheel;
+    b2RevoluteJoint* m_motorJoint;
+    bool m_motorOn;
+    float m_motorSpeed;
 };
 
 static int testIndex = RegisterTest("Examples", "Theo Jansen", TheoJansen::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/tiles.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/tiles.cpp
index 945786219669..e5b9b5dd5f40 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/tiles.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/tiles.cpp
@@ -27,133 +27,127 @@
 class Tiles : public Test
 {
 public:
-	enum
-	{
-		e_count = 20
-	};
-
-	Tiles()
-	{
-		m_fixtureCount = 0;
-		b2Timer timer;
-
-		{
-			float a = 0.5f;
-			b2BodyDef bd;
-			bd.position.y = -a;
-			b2Body* ground = m_world->CreateBody(&bd);
+    enum
+    {
+        e_count = 20
+    };
+
+    Tiles()
+    {
+        m_fixtureCount = 0;
+        b2Timer timer;
+
+        {
+            float a = 0.5f;
+            b2BodyDef bd;
+            bd.position.y  = -a;
+            b2Body* ground = m_world->CreateBody(&bd);
 
 #if 1
-			int32 N = 200;
-			int32 M = 10;
-			b2Vec2 position;
-			position.y = 0.0f;
-			for (int32 j = 0; j < M; ++j)
-			{
-				position.x = -N * a;
-				for (int32 i = 0; i < N; ++i)
-				{
-					b2PolygonShape shape;
-					shape.SetAsBox(a, a, position, 0.0f);
-					ground->CreateFixture(&shape, 0.0f);
-					++m_fixtureCount;
-					position.x += 2.0f * a;
-				}
-				position.y -= 2.0f * a;
-			}
+            int32 N = 200;
+            int32 M = 10;
+            b2Vec2 position;
+            position.y = 0.0f;
+            for (int32 j = 0; j < M; ++j)
+            {
+                position.x = -N * a;
+                for (int32 i = 0; i < N; ++i)
+                {
+                    b2PolygonShape shape;
+                    shape.SetAsBox(a, a, position, 0.0f);
+                    ground->CreateFixture(&shape, 0.0f);
+                    ++m_fixtureCount;
+                    position.x += 2.0f * a;
+                }
+                position.y -= 2.0f * a;
+            }
 #else
-			int32 N = 200;
-			int32 M = 10;
-			b2Vec2 position;
-			position.x = -N * a;
-			for (int32 i = 0; i < N; ++i)
-			{
-				position.y = 0.0f;
-				for (int32 j = 0; j < M; ++j)
-				{
-					b2PolygonShape shape;
-					shape.SetAsBox(a, a, position, 0.0f);
-					ground->CreateFixture(&shape, 0.0f);
-					position.y -= 2.0f * a;
-				}
-				position.x += 2.0f * a;
-			}
+            int32 N = 200;
+            int32 M = 10;
+            b2Vec2 position;
+            position.x = -N * a;
+            for (int32 i = 0; i < N; ++i)
+            {
+                position.y = 0.0f;
+                for (int32 j = 0; j < M; ++j)
+                {
+                    b2PolygonShape shape;
+                    shape.SetAsBox(a, a, position, 0.0f);
+                    ground->CreateFixture(&shape, 0.0f);
+                    position.y -= 2.0f * a;
+                }
+                position.x += 2.0f * a;
+            }
 #endif
-		}
-
-		{
-			float a = 0.5f;
-			b2PolygonShape shape;
-			shape.SetAsBox(a, a);
-
-			b2Vec2 x(-7.0f, 0.75f);
-			b2Vec2 y;
-			b2Vec2 deltaX(0.5625f, 1.25f);
-			b2Vec2 deltaY(1.125f, 0.0f);
-
-			for (int32 i = 0; i < e_count; ++i)
-			{
-				y = x;
-
-				for (int32 j = i; j < e_count; ++j)
-				{
-					b2BodyDef bd;
-					bd.type = b2_dynamicBody;
-					bd.position = y;
-
-					//if (i == 0 && j == 0)
-					//{
-					//	bd.allowSleep = false;
-					//}
-					//else
-					//{
-					//	bd.allowSleep = true;
-					//}
-
-					b2Body* body = m_world->CreateBody(&bd);
-					body->CreateFixture(&shape, 5.0f);
-					++m_fixtureCount;
-					y += deltaY;
-				}
-
-				x += deltaX;
-			}
-		}
-
-		m_createTime = timer.GetMilliseconds();
-	}
-
-	void Step(Settings& settings) override
-	{
-		const b2ContactManager& cm = m_world->GetContactManager();
-		int32 height = cm.m_broadPhase.GetTreeHeight();
-		int32 leafCount = cm.m_broadPhase.GetProxyCount();
-		int32 minimumNodeCount = 2 * leafCount - 1;
-		float minimumHeight = ceilf(logf(float(minimumNodeCount)) / logf(2.0f));
-		DrawString(5, m_textLine, "dynamic tree height = %d, min = %d", height, int32(minimumHeight));
-		
-
-		Test::Step(settings);
-
-		DrawString(5, m_textLine, "create time = %6.2f ms, fixture count = %d",
-			m_createTime, m_fixtureCount);
-		
-
-		//b2DynamicTree* tree = &m_world->m_contactManager.m_broadPhase.m_tree;
-
-		//if (m_stepCount == 400)
-		//{
-		//	tree->RebuildBottomUp();
-		//}
-	}
-
-	static Test* Create()
-	{
-		return new Tiles;
-	}
-
-	int32 m_fixtureCount;
-	float m_createTime;
+        }
+
+        {
+            float a = 0.5f;
+            b2PolygonShape shape;
+            shape.SetAsBox(a, a);
+
+            b2Vec2 x(-7.0f, 0.75f);
+            b2Vec2 y;
+            b2Vec2 deltaX(0.5625f, 1.25f);
+            b2Vec2 deltaY(1.125f, 0.0f);
+
+            for (int32 i = 0; i < e_count; ++i)
+            {
+                y = x;
+
+                for (int32 j = i; j < e_count; ++j)
+                {
+                    b2BodyDef bd;
+                    bd.type     = b2_dynamicBody;
+                    bd.position = y;
+
+                    // if (i == 0 && j == 0)
+                    //{
+                    //	bd.allowSleep = false;
+                    // }
+                    // else
+                    //{
+                    //	bd.allowSleep = true;
+                    // }
+
+                    b2Body* body = m_world->CreateBody(&bd);
+                    body->CreateFixture(&shape, 5.0f);
+                    ++m_fixtureCount;
+                    y += deltaY;
+                }
+
+                x += deltaX;
+            }
+        }
+
+        m_createTime = timer.GetMilliseconds();
+    }
+
+    void Step(Settings& settings) override
+    {
+        const b2ContactManager& cm = m_world->GetContactManager();
+        int32 height               = cm.m_broadPhase.GetTreeHeight();
+        int32 leafCount            = cm.m_broadPhase.GetProxyCount();
+        int32 minimumNodeCount     = 2 * leafCount - 1;
+        float minimumHeight        = ceilf(logf(float(minimumNodeCount)) / logf(2.0f));
+        DrawString(5, m_textLine, "dynamic tree height = %d, min = %d", height, int32(minimumHeight));
+
+        Test::Step(settings);
+
+        DrawString(5, m_textLine, "create time = %6.2f ms, fixture count = %d", m_createTime, m_fixtureCount);
+
+        // b2DynamicTree* tree = &m_world->m_contactManager.m_broadPhase.m_tree;
+
+        // if (m_stepCount == 400)
+        //{
+        //	tree->RebuildBottomUp();
+        // }
+    }
+
+    static Test* Create() { return new Tiles; }
+
+    int32 m_fixtureCount;
+    float m_createTime;
 };
 
 static int testIndex = RegisterTest("Benchmark", "Tiles", Tiles::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/time_of_impact.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/time_of_impact.cpp
index 3face36e2270..f33b53476ddd 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/time_of_impact.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/time_of_impact.cpp
@@ -26,90 +26,85 @@
 class TimeOfImpact : public Test
 {
 public:
-	TimeOfImpact()
-	{
-		m_shapeA.SetAsBox(25.0f, 5.0f);
-		m_shapeB.SetAsBox(2.5f, 2.5f);
-	}
-
-	static Test* Create()
-	{
-		return new TimeOfImpact;
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		b2Sweep sweepA;
-		sweepA.c0.Set(24.0f, -60.0f);
-		sweepA.a0 = 2.95f;
-		sweepA.c = sweepA.c0;
-		sweepA.a = sweepA.a0;
-		sweepA.localCenter.SetZero();
-
-		b2Sweep sweepB;
-		sweepB.c0.Set(53.474274f, -50.252514f);
-		sweepB.a0 = 513.36676f; // - 162.0f * b2_pi;
-		sweepB.c.Set(54.595478f, -51.083473f);
-		sweepB.a = 513.62781f; //  - 162.0f * b2_pi;
-		sweepB.localCenter.SetZero();
-
-		//sweepB.a0 -= 300.0f * b2_pi;
-		//sweepB.a -= 300.0f * b2_pi;
-
-		b2TOIInput input;
-		input.proxyA.Set(&m_shapeA, 0);
-		input.proxyB.Set(&m_shapeB, 0);
-		input.sweepA = sweepA;
-		input.sweepB = sweepB;
-		input.tMax = 1.0f;
-
-		b2TOIOutput output;
-
-		b2TimeOfImpact(&output, &input);
-
-		DrawString(5, m_textLine, "toi = %g", output.t);
-		
-
-		extern B2_API int32 b2_toiMaxIters, b2_toiMaxRootIters;
-		DrawString(5, m_textLine, "max toi iters = %d, max root iters = %d", b2_toiMaxIters, b2_toiMaxRootIters);
-		
-
-		b2Vec2 vertices[b2_maxPolygonVertices];
-
-		b2Transform transformA;
-		sweepA.GetTransform(&transformA, 0.0f);
-		for (int32 i = 0; i < m_shapeA.m_count; ++i)
-		{
-			vertices[i] = b2Mul(transformA, m_shapeA.m_vertices[i]);
-		}
-		g_debugDraw.DrawPolygon(vertices, m_shapeA.m_count, b2Color(0.9f, 0.9f, 0.9f));
-
-		b2Transform transformB;
-		sweepB.GetTransform(&transformB, 0.0f);
-		
-		//b2Vec2 localPoint(2.0f, -0.1f);
-
-		for (int32 i = 0; i < m_shapeB.m_count; ++i)
-		{
-			vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
-		}
-		g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.5f, 0.9f, 0.5f));
-
-		sweepB.GetTransform(&transformB, output.t);
-		for (int32 i = 0; i < m_shapeB.m_count; ++i)
-		{
-			vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
-	}
-		g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.5f, 0.7f, 0.9f));
-
-		sweepB.GetTransform(&transformB, 1.0f);
-		for (int32 i = 0; i < m_shapeB.m_count; ++i)
-		{
-			vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
-		}
-		g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.9f, 0.5f, 0.5f));
+    TimeOfImpact()
+    {
+        m_shapeA.SetAsBox(25.0f, 5.0f);
+        m_shapeB.SetAsBox(2.5f, 2.5f);
+    }
+
+    static Test* Create() { return new TimeOfImpact; }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        b2Sweep sweepA;
+        sweepA.c0.Set(24.0f, -60.0f);
+        sweepA.a0 = 2.95f;
+        sweepA.c  = sweepA.c0;
+        sweepA.a  = sweepA.a0;
+        sweepA.localCenter.SetZero();
+
+        b2Sweep sweepB;
+        sweepB.c0.Set(53.474274f, -50.252514f);
+        sweepB.a0 = 513.36676f;  // - 162.0f * b2_pi;
+        sweepB.c.Set(54.595478f, -51.083473f);
+        sweepB.a = 513.62781f;  //  - 162.0f * b2_pi;
+        sweepB.localCenter.SetZero();
+
+        // sweepB.a0 -= 300.0f * b2_pi;
+        // sweepB.a -= 300.0f * b2_pi;
+
+        b2TOIInput input;
+        input.proxyA.Set(&m_shapeA, 0);
+        input.proxyB.Set(&m_shapeB, 0);
+        input.sweepA = sweepA;
+        input.sweepB = sweepB;
+        input.tMax   = 1.0f;
+
+        b2TOIOutput output;
+
+        b2TimeOfImpact(&output, &input);
+
+        DrawString(5, m_textLine, "toi = %g", output.t);
+
+        extern B2_API int32 b2_toiMaxIters, b2_toiMaxRootIters;
+        DrawString(5, m_textLine, "max toi iters = %d, max root iters = %d", b2_toiMaxIters, b2_toiMaxRootIters);
+
+        b2Vec2 vertices[b2_maxPolygonVertices];
+
+        b2Transform transformA;
+        sweepA.GetTransform(&transformA, 0.0f);
+        for (int32 i = 0; i < m_shapeA.m_count; ++i)
+        {
+            vertices[i] = b2Mul(transformA, m_shapeA.m_vertices[i]);
+        }
+        g_debugDraw.DrawPolygon(vertices, m_shapeA.m_count, b2Color(0.9f, 0.9f, 0.9f));
+
+        b2Transform transformB;
+        sweepB.GetTransform(&transformB, 0.0f);
+
+        // b2Vec2 localPoint(2.0f, -0.1f);
+
+        for (int32 i = 0; i < m_shapeB.m_count; ++i)
+        {
+            vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
+        }
+        g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.5f, 0.9f, 0.5f));
+
+        sweepB.GetTransform(&transformB, output.t);
+        for (int32 i = 0; i < m_shapeB.m_count; ++i)
+        {
+            vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
+        }
+        g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.5f, 0.7f, 0.9f));
+
+        sweepB.GetTransform(&transformB, 1.0f);
+        for (int32 i = 0; i < m_shapeB.m_count; ++i)
+        {
+            vertices[i] = b2Mul(transformB, m_shapeB.m_vertices[i]);
+        }
+        g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.9f, 0.5f, 0.5f));
 
 #if 0
 		for (float t = 0.0f; t < 1.0f; t += 0.1f)
@@ -122,10 +117,10 @@ class TimeOfImpact : public Test
 			g_debugDraw.DrawPolygon(vertices, m_shapeB.m_count, b2Color(0.9f, 0.5f, 0.5f));
 		}
 #endif
-	}
+    }
 
-	b2PolygonShape m_shapeA;
-	b2PolygonShape m_shapeB;
+    b2PolygonShape m_shapeA;
+    b2PolygonShape m_shapeB;
 };
 
 static int testIndex = RegisterTest("Collision", "Time of Impact", TimeOfImpact::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/tumbler.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/tumbler.cpp
index f7972bc777cb..e19ffae13f29 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/tumbler.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/tumbler.cpp
@@ -25,78 +25,74 @@
 class Tumbler : public Test
 {
 public:
-
-	enum
-	{
-		e_count = 800
-	};
-
-	Tumbler()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-		}
-
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.allowSleep = false;
-			bd.position.Set(0.0f, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 10.0f, b2Vec2( 10.0f, 0.0f), 0.0);
-			body->CreateFixture(&shape, 5.0f);
-			shape.SetAsBox(0.5f, 10.0f, b2Vec2(-10.0f, 0.0f), 0.0);
-			body->CreateFixture(&shape, 5.0f);
-			shape.SetAsBox(10.0f, 0.5f, b2Vec2(0.0f, 10.0f), 0.0);
-			body->CreateFixture(&shape, 5.0f);
-			shape.SetAsBox(10.0f, 0.5f, b2Vec2(0.0f, -10.0f), 0.0);
-			body->CreateFixture(&shape, 5.0f);
-
-			b2RevoluteJointDef jd;
-			jd.bodyA = ground;
-			jd.bodyB = body;
-			jd.localAnchorA.Set(0.0f, 10.0f);
-			jd.localAnchorB.Set(0.0f, 0.0f);
-			jd.referenceAngle = 0.0f;
-			jd.motorSpeed = 0.05f * b2_pi;
-			jd.maxMotorTorque = 1e8f;
-			jd.enableMotor = true;
-			m_joint = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
-		}
-
-		m_count = 0;
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		if (m_count < e_count)
-		{
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 10.0f);
-			b2Body* body = m_world->CreateBody(&bd);
-
-			b2PolygonShape shape;
-			shape.SetAsBox(0.125f, 0.125f);
-			body->CreateFixture(&shape, 1.0f);
-
-			++m_count;
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Tumbler;
-	}
-
-	b2RevoluteJoint* m_joint;
-	int32 m_count;
+    enum
+    {
+        e_count = 800
+    };
+
+    Tumbler()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+        }
+
+        {
+            b2BodyDef bd;
+            bd.type       = b2_dynamicBody;
+            bd.allowSleep = false;
+            bd.position.Set(0.0f, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 10.0f, b2Vec2(10.0f, 0.0f), 0.0);
+            body->CreateFixture(&shape, 5.0f);
+            shape.SetAsBox(0.5f, 10.0f, b2Vec2(-10.0f, 0.0f), 0.0);
+            body->CreateFixture(&shape, 5.0f);
+            shape.SetAsBox(10.0f, 0.5f, b2Vec2(0.0f, 10.0f), 0.0);
+            body->CreateFixture(&shape, 5.0f);
+            shape.SetAsBox(10.0f, 0.5f, b2Vec2(0.0f, -10.0f), 0.0);
+            body->CreateFixture(&shape, 5.0f);
+
+            b2RevoluteJointDef jd;
+            jd.bodyA = ground;
+            jd.bodyB = body;
+            jd.localAnchorA.Set(0.0f, 10.0f);
+            jd.localAnchorB.Set(0.0f, 0.0f);
+            jd.referenceAngle = 0.0f;
+            jd.motorSpeed     = 0.05f * b2_pi;
+            jd.maxMotorTorque = 1e8f;
+            jd.enableMotor    = true;
+            m_joint           = (b2RevoluteJoint*)m_world->CreateJoint(&jd);
+        }
+
+        m_count = 0;
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        if (m_count < e_count)
+        {
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 10.0f);
+            b2Body* body = m_world->CreateBody(&bd);
+
+            b2PolygonShape shape;
+            shape.SetAsBox(0.125f, 0.125f);
+            body->CreateFixture(&shape, 1.0f);
+
+            ++m_count;
+        }
+    }
+
+    static Test* Create() { return new Tumbler; }
+
+    b2RevoluteJoint* m_joint;
+    int32 m_count;
 };
 
 static int testIndex = RegisterTest("Benchmark", "Tumbler", Tumbler::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/web.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/web.cpp
index fdacf8aa8034..658bc9f87bc0 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/web.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/web.cpp
@@ -26,193 +26,190 @@
 class Web : public Test
 {
 public:
-	Web()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.5f);
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-
-			bd.position.Set(-5.0f, 5.0f);
-			m_bodies[0] = m_world->CreateBody(&bd);
-			m_bodies[0]->CreateFixture(&shape, 5.0f);
-
-			bd.position.Set(5.0f, 5.0f);
-			m_bodies[1] = m_world->CreateBody(&bd);
-			m_bodies[1]->CreateFixture(&shape, 5.0f);
-
-			bd.position.Set(5.0f, 15.0f);
-			m_bodies[2] = m_world->CreateBody(&bd);
-			m_bodies[2]->CreateFixture(&shape, 5.0f);
-
-			bd.position.Set(-5.0f, 15.0f);
-			m_bodies[3] = m_world->CreateBody(&bd);
-			m_bodies[3]->CreateFixture(&shape, 5.0f);
-
-			b2DistanceJointDef jd;
-			b2Vec2 p1, p2, d;
-
-			float frequencyHz = 2.0f;
-			float dampingRatio = 0.0f;
-
-			jd.bodyA = ground;
-			jd.bodyB = m_bodies[0];
-			jd.localAnchorA.Set(-10.0f, 0.0f);
-			jd.localAnchorB.Set(-0.5f, -0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[0] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = ground;
-			jd.bodyB = m_bodies[1];
-			jd.localAnchorA.Set(10.0f, 0.0f);
-			jd.localAnchorB.Set(0.5f, -0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[1] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = ground;
-			jd.bodyB = m_bodies[2];
-			jd.localAnchorA.Set(10.0f, 20.0f);
-			jd.localAnchorB.Set(0.5f, 0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[2] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = ground;
-			jd.bodyB = m_bodies[3];
-			jd.localAnchorA.Set(-10.0f, 20.0f);
-			jd.localAnchorB.Set(-0.5f, 0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[3] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = m_bodies[0];
-			jd.bodyB = m_bodies[1];
-			jd.localAnchorA.Set(0.5f, 0.0f);
-			jd.localAnchorB.Set(-0.5f, 0.0f);;
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[4] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = m_bodies[1];
-			jd.bodyB = m_bodies[2];
-			jd.localAnchorA.Set(0.0f, 0.5f);
-			jd.localAnchorB.Set(0.0f, -0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[5] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = m_bodies[2];
-			jd.bodyB = m_bodies[3];
-			jd.localAnchorA.Set(-0.5f, 0.0f);
-			jd.localAnchorB.Set(0.5f, 0.0f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[6] = m_world->CreateJoint(&jd);
-
-			jd.bodyA = m_bodies[3];
-			jd.bodyB = m_bodies[0];
-			jd.localAnchorA.Set(0.0f, -0.5f);
-			jd.localAnchorB.Set(0.0f, 0.5f);
-			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
-			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
-			d = p2 - p1;
-			jd.length = d.Length();
-			b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
-			m_joints[7] = m_world->CreateJoint(&jd);
-		}
-	}
-
-	void Keyboard(int key) override
-	{
-		switch (key)
-		{
-		case GLFW_KEY_B:
-			for (int32 i = 0; i < 4; ++i)
-			{
-				if (m_bodies[i])
-				{
-					m_world->DestroyBody(m_bodies[i]);
-					m_bodies[i] = NULL;
-					break;
-				}
-			}
-			break;
-
-		case GLFW_KEY_J:
-			for (int32 i = 0; i < 8; ++i)
-			{
-				if (m_joints[i])
-				{
-					m_world->DestroyJoint(m_joints[i]);
-					m_joints[i] = NULL;
-					break;
-				}
-			}
-			break;
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-		DrawString(5, m_textLine, "Press: (b) to delete a body, (j) to delete a joint");
-		
-	}
-
-	void JointDestroyed(b2Joint* joint) override
-	{
-		for (int32 i = 0; i < 8; ++i)
-		{
-			if (m_joints[i] == joint)
-			{
-				m_joints[i] = NULL;
-				break;
-			}
-		}
-	}
-
-	static Test* Create()
-	{
-		return new Web;
-	}
-
-	b2Body* m_bodies[4];
-	b2Joint* m_joints[8];
+    Web()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.5f);
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+
+            bd.position.Set(-5.0f, 5.0f);
+            m_bodies[0] = m_world->CreateBody(&bd);
+            m_bodies[0]->CreateFixture(&shape, 5.0f);
+
+            bd.position.Set(5.0f, 5.0f);
+            m_bodies[1] = m_world->CreateBody(&bd);
+            m_bodies[1]->CreateFixture(&shape, 5.0f);
+
+            bd.position.Set(5.0f, 15.0f);
+            m_bodies[2] = m_world->CreateBody(&bd);
+            m_bodies[2]->CreateFixture(&shape, 5.0f);
+
+            bd.position.Set(-5.0f, 15.0f);
+            m_bodies[3] = m_world->CreateBody(&bd);
+            m_bodies[3]->CreateFixture(&shape, 5.0f);
+
+            b2DistanceJointDef jd;
+            b2Vec2 p1, p2, d;
+
+            float frequencyHz  = 2.0f;
+            float dampingRatio = 0.0f;
+
+            jd.bodyA = ground;
+            jd.bodyB = m_bodies[0];
+            jd.localAnchorA.Set(-10.0f, 0.0f);
+            jd.localAnchorB.Set(-0.5f, -0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[0] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = ground;
+            jd.bodyB = m_bodies[1];
+            jd.localAnchorA.Set(10.0f, 0.0f);
+            jd.localAnchorB.Set(0.5f, -0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[1] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = ground;
+            jd.bodyB = m_bodies[2];
+            jd.localAnchorA.Set(10.0f, 20.0f);
+            jd.localAnchorB.Set(0.5f, 0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[2] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = ground;
+            jd.bodyB = m_bodies[3];
+            jd.localAnchorA.Set(-10.0f, 20.0f);
+            jd.localAnchorB.Set(-0.5f, 0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[3] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = m_bodies[0];
+            jd.bodyB = m_bodies[1];
+            jd.localAnchorA.Set(0.5f, 0.0f);
+            jd.localAnchorB.Set(-0.5f, 0.0f);
+            ;
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[4] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = m_bodies[1];
+            jd.bodyB = m_bodies[2];
+            jd.localAnchorA.Set(0.0f, 0.5f);
+            jd.localAnchorB.Set(0.0f, -0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[5] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = m_bodies[2];
+            jd.bodyB = m_bodies[3];
+            jd.localAnchorA.Set(-0.5f, 0.0f);
+            jd.localAnchorB.Set(0.5f, 0.0f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[6] = m_world->CreateJoint(&jd);
+
+            jd.bodyA = m_bodies[3];
+            jd.bodyB = m_bodies[0];
+            jd.localAnchorA.Set(0.0f, -0.5f);
+            jd.localAnchorB.Set(0.0f, 0.5f);
+            p1        = jd.bodyA->GetWorldPoint(jd.localAnchorA);
+            p2        = jd.bodyB->GetWorldPoint(jd.localAnchorB);
+            d         = p2 - p1;
+            jd.length = d.Length();
+            b2LinearStiffness(jd.stiffness, jd.damping, frequencyHz, dampingRatio, jd.bodyA, jd.bodyB);
+            m_joints[7] = m_world->CreateJoint(&jd);
+        }
+    }
+
+    void Keyboard(int key) override
+    {
+        switch (key)
+        {
+        case GLFW_KEY_B:
+            for (int32 i = 0; i < 4; ++i)
+            {
+                if (m_bodies[i])
+                {
+                    m_world->DestroyBody(m_bodies[i]);
+                    m_bodies[i] = NULL;
+                    break;
+                }
+            }
+            break;
+
+        case GLFW_KEY_J:
+            for (int32 i = 0; i < 8; ++i)
+            {
+                if (m_joints[i])
+                {
+                    m_world->DestroyJoint(m_joints[i]);
+                    m_joints[i] = NULL;
+                    break;
+                }
+            }
+            break;
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+        DrawString(5, m_textLine, "Press: (b) to delete a body, (j) to delete a joint");
+    }
+
+    void JointDestroyed(b2Joint* joint) override
+    {
+        for (int32 i = 0; i < 8; ++i)
+        {
+            if (m_joints[i] == joint)
+            {
+                m_joints[i] = NULL;
+                break;
+            }
+        }
+    }
+
+    static Test* Create() { return new Web; }
+
+    b2Body* m_bodies[4];
+    b2Joint* m_joints[8];
 };
 
 static int testIndex = RegisterTest("Examples", "Web", Web::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/wheel_joint.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/wheel_joint.cpp
index 6be76ff26252..0388e757088a 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/wheel_joint.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/wheel_joint.cpp
@@ -28,99 +28,94 @@
 class WheelJoint : public Test
 {
 public:
-	WheelJoint()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		m_enableLimit = true;
-		m_enableMotor = false;
-		m_motorSpeed = 10.0f;
-
-		{
-			b2CircleShape shape;
-			shape.m_radius = 2.0f;
-
-			b2BodyDef bd;
-			bd.type = b2_dynamicBody;
-			bd.position.Set(0.0f, 10.0f);
-			bd.allowSleep = false;
-			b2Body* body = m_world->CreateBody(&bd);
-			body->CreateFixture(&shape, 5.0f);
-
-			b2WheelJointDef jd;
-
-			// Horizontal
-			jd.Initialize(ground, body, bd.position, b2Vec2(0.0f, 1.0f));
-
-			jd.motorSpeed = m_motorSpeed;
-			jd.maxMotorTorque = 10000.0f;
-			jd.enableMotor = m_enableMotor;
-			jd.lowerTranslation = -3.0f;
-			jd.upperTranslation = 3.0f;
-			jd.enableLimit = m_enableLimit;
-
-			float hertz = 1.0f;
-			float dampingRatio = 0.7f;
-			b2LinearStiffness(jd.stiffness, jd.damping, hertz, dampingRatio, ground, body);
-
-			m_joint = (b2WheelJoint*)m_world->CreateJoint(&jd);
-		}
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		float torque = m_joint->GetMotorTorque(settings.m_hertz);
-		DrawString(5, m_textLine, "Motor Torque = %4.0f", torque);
-		
-
-		b2Vec2 F = m_joint->GetReactionForce(settings.m_hertz);
-		DrawString(5, m_textLine, "Reaction Force = (%4.1f, %4.1f)", F.x, F.y);
-		
-	}
-
-	void UpdateUI() override
-	{
-		//ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Checkbox("Limit", &m_enableLimit))
-		{
-			m_joint->EnableLimit(m_enableLimit);
-		}
-
-		if (ImGui::Checkbox("Motor", &m_enableMotor))
-		{
-			m_joint->EnableMotor(m_enableMotor);
-		}
-
-		if (ImGui::SliderFloat("Speed", &m_motorSpeed, -100.0f, 100.0f, "%.0f"))
-		{
-			m_joint->SetMotorSpeed(m_motorSpeed);
-		}
-
-		ImGui::End();
-	}
-
-	static Test* Create()
-	{
-		return new WheelJoint;
-	}
-
-	b2WheelJoint* m_joint;
-	float m_motorSpeed;
-	bool m_enableMotor;
-	bool m_enableLimit;
+    WheelJoint()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        m_enableLimit = true;
+        m_enableMotor = false;
+        m_motorSpeed  = 10.0f;
+
+        {
+            b2CircleShape shape;
+            shape.m_radius = 2.0f;
+
+            b2BodyDef bd;
+            bd.type = b2_dynamicBody;
+            bd.position.Set(0.0f, 10.0f);
+            bd.allowSleep = false;
+            b2Body* body  = m_world->CreateBody(&bd);
+            body->CreateFixture(&shape, 5.0f);
+
+            b2WheelJointDef jd;
+
+            // Horizontal
+            jd.Initialize(ground, body, bd.position, b2Vec2(0.0f, 1.0f));
+
+            jd.motorSpeed       = m_motorSpeed;
+            jd.maxMotorTorque   = 10000.0f;
+            jd.enableMotor      = m_enableMotor;
+            jd.lowerTranslation = -3.0f;
+            jd.upperTranslation = 3.0f;
+            jd.enableLimit      = m_enableLimit;
+
+            float hertz        = 1.0f;
+            float dampingRatio = 0.7f;
+            b2LinearStiffness(jd.stiffness, jd.damping, hertz, dampingRatio, ground, body);
+
+            m_joint = (b2WheelJoint*)m_world->CreateJoint(&jd);
+        }
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        float torque = m_joint->GetMotorTorque(settings.m_hertz);
+        DrawString(5, m_textLine, "Motor Torque = %4.0f", torque);
+
+        b2Vec2 F = m_joint->GetReactionForce(settings.m_hertz);
+        DrawString(5, m_textLine, "Reaction Force = (%4.1f, %4.1f)", F.x, F.y);
+    }
+
+    void UpdateUI() override
+    {
+        // ImGui::SetNextWindowPos(ImVec2(10.0f, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Joint Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Checkbox("Limit", &m_enableLimit))
+        {
+            m_joint->EnableLimit(m_enableLimit);
+        }
+
+        if (ImGui::Checkbox("Motor", &m_enableMotor))
+        {
+            m_joint->EnableMotor(m_enableMotor);
+        }
+
+        if (ImGui::SliderFloat("Speed", &m_motorSpeed, -100.0f, 100.0f, "%.0f"))
+        {
+            m_joint->SetMotorSpeed(m_motorSpeed);
+        }
+
+        ImGui::End();
+    }
+
+    static Test* Create() { return new WheelJoint; }
+
+    b2WheelJoint* m_joint;
+    float m_motorSpeed;
+    bool m_enableMotor;
+    bool m_enableLimit;
 };
 
 static int testIndex = RegisterTest("Joints", "Wheel", WheelJoint::Create);
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/tests/wrecking_ball.cpp b/tests/cpp-tests/Classes/Box2DTestBed/tests/wrecking_ball.cpp
index c1722a61cbb0..4ea57671db63 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/tests/wrecking_ball.cpp
+++ b/tests/cpp-tests/Classes/Box2DTestBed/tests/wrecking_ball.cpp
@@ -34,132 +34,128 @@
 class WreckingBall : public Test
 {
 public:
-	WreckingBall()
-	{
-		b2Body* ground = NULL;
-		{
-			b2BodyDef bd;
-			ground = m_world->CreateBody(&bd);
-
-			b2EdgeShape shape;
-			shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
-			ground->CreateFixture(&shape, 0.0f);
-		}
-
-		{
-			b2PolygonShape shape;
-			shape.SetAsBox(0.5f, 0.125f);
-
-			b2FixtureDef fd;
-			fd.shape = &shape;
-			fd.density = 20.0f;
-			fd.friction = 0.2f;
-			fd.filter.categoryBits = 0x0001;
-			fd.filter.maskBits = 0xFFFF & ~0x0002;
-
-			b2RevoluteJointDef jd;
-			jd.collideConnected = false;
-
-			const int32 N = 10;
-			const float y = 15.0f;
-			m_distanceJointDef.localAnchorA.Set(0.0f, y);
-
-			b2Body* prevBody = ground;
-			for (int32 i = 0; i < N; ++i)
-			{
-				b2BodyDef bd;
-				bd.type = b2_dynamicBody;
-				bd.position.Set(0.5f + 1.0f * i, y);
-				if (i == N - 1)
-				{
-					bd.position.Set(1.0f * i, y);
-					bd.angularDamping = 0.4f;
-				}
-
-				b2Body* body = m_world->CreateBody(&bd);
-
-				if (i == N - 1)
-				{
-					b2CircleShape circleShape;
-					circleShape.m_radius = 1.5f;
-					b2FixtureDef sfd;
-					sfd.shape = &circleShape;
-					sfd.density = 100.0f;
-					sfd.filter.categoryBits = 0x0002;
-					body->CreateFixture(&sfd);
-				}
-				else
-				{
-					body->CreateFixture(&fd);
-				}
-
-				b2Vec2 anchor(float(i), y);
-				jd.Initialize(prevBody, body, anchor);
-				m_world->CreateJoint(&jd);
-
-				prevBody = body;
-			}
-
-			m_distanceJointDef.localAnchorB.SetZero();
-
-			float extraLength = 0.01f;
-			m_distanceJointDef.minLength = 0.0f;
-			m_distanceJointDef.maxLength = N - 1.0f + extraLength;
-			m_distanceJointDef.bodyB = prevBody;
-		}
-
-		{
-			m_distanceJointDef.bodyA = ground;
-			m_distanceJoint = m_world->CreateJoint(&m_distanceJointDef);
-			m_stabilize = true;
-		}
-	}
-
-	void UpdateUI() override
-	{
-//		ImGui::SetNextWindowPos(ImVec2(Test::g_debugDraw.debugNodeOffset.x, 100.0f));
-		ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
-		ImGui::Begin("Wrecking Ball Controls", nullptr, ImGuiWindowFlags_NoResize);
-
-		if (ImGui::Checkbox("Stabilize", &m_stabilize))
-		{
-			if (m_stabilize == true && m_distanceJoint == nullptr)
-			{
-				m_distanceJoint = m_world->CreateJoint(&m_distanceJointDef);
-			}
-			else if (m_stabilize == false && m_distanceJoint != nullptr)
-			{
-				m_world->DestroyJoint(m_distanceJoint);
-				m_distanceJoint = nullptr;
-			}
-		}
-
-		ImGui::End();
-	}
-
-	void Step(Settings& settings) override
-	{
-		Test::Step(settings);
-
-		if (m_distanceJoint)
-		{
-			DrawString(5, m_textLine, "Distance Joint ON");
-		}
-		else
-		{
-			DrawString(5, m_textLine, "Distance Joint OFF");
-		}
-		
-	}
-
-	static Test* Create()
-	{
-		return new WreckingBall;
-	}
-
-	b2DistanceJointDef m_distanceJointDef;
-	b2Joint* m_distanceJoint;
-	bool m_stabilize;
+    WreckingBall()
+    {
+        b2Body* ground = NULL;
+        {
+            b2BodyDef bd;
+            ground = m_world->CreateBody(&bd);
+
+            b2EdgeShape shape;
+            shape.SetTwoSided(b2Vec2(-40.0f, 0.0f), b2Vec2(40.0f, 0.0f));
+            ground->CreateFixture(&shape, 0.0f);
+        }
+
+        {
+            b2PolygonShape shape;
+            shape.SetAsBox(0.5f, 0.125f);
+
+            b2FixtureDef fd;
+            fd.shape               = &shape;
+            fd.density             = 20.0f;
+            fd.friction            = 0.2f;
+            fd.filter.categoryBits = 0x0001;
+            fd.filter.maskBits     = 0xFFFF & ~0x0002;
+
+            b2RevoluteJointDef jd;
+            jd.collideConnected = false;
+
+            const int32 N = 10;
+            const float y = 15.0f;
+            m_distanceJointDef.localAnchorA.Set(0.0f, y);
+
+            b2Body* prevBody = ground;
+            for (int32 i = 0; i < N; ++i)
+            {
+                b2BodyDef bd;
+                bd.type = b2_dynamicBody;
+                bd.position.Set(0.5f + 1.0f * i, y);
+                if (i == N - 1)
+                {
+                    bd.position.Set(1.0f * i, y);
+                    bd.angularDamping = 0.4f;
+                }
+
+                b2Body* body = m_world->CreateBody(&bd);
+
+                if (i == N - 1)
+                {
+                    b2CircleShape circleShape;
+                    circleShape.m_radius = 1.5f;
+                    b2FixtureDef sfd;
+                    sfd.shape               = &circleShape;
+                    sfd.density             = 100.0f;
+                    sfd.filter.categoryBits = 0x0002;
+                    body->CreateFixture(&sfd);
+                }
+                else
+                {
+                    body->CreateFixture(&fd);
+                }
+
+                b2Vec2 anchor(float(i), y);
+                jd.Initialize(prevBody, body, anchor);
+                m_world->CreateJoint(&jd);
+
+                prevBody = body;
+            }
+
+            m_distanceJointDef.localAnchorB.SetZero();
+
+            float extraLength            = 0.01f;
+            m_distanceJointDef.minLength = 0.0f;
+            m_distanceJointDef.maxLength = N - 1.0f + extraLength;
+            m_distanceJointDef.bodyB     = prevBody;
+        }
+
+        {
+            m_distanceJointDef.bodyA = ground;
+            m_distanceJoint          = m_world->CreateJoint(&m_distanceJointDef);
+            m_stabilize              = true;
+        }
+    }
+
+    void UpdateUI() override
+    {
+        //		ImGui::SetNextWindowPos(ImVec2(Test::g_debugDraw.debugNodeOffset.x, 100.0f));
+        ImGui::SetNextWindowSize(ImVec2(200.0f, 100.0f));
+        ImGui::Begin("Wrecking Ball Controls", nullptr, ImGuiWindowFlags_NoResize);
+
+        if (ImGui::Checkbox("Stabilize", &m_stabilize))
+        {
+            if (m_stabilize == true && m_distanceJoint == nullptr)
+            {
+                m_distanceJoint = m_world->CreateJoint(&m_distanceJointDef);
+            }
+            else if (m_stabilize == false && m_distanceJoint != nullptr)
+            {
+                m_world->DestroyJoint(m_distanceJoint);
+                m_distanceJoint = nullptr;
+            }
+        }
+
+        ImGui::End();
+    }
+
+    void Step(Settings& settings) override
+    {
+        Test::Step(settings);
+
+        if (m_distanceJoint)
+        {
+            DrawString(5, m_textLine, "Distance Joint ON");
+        }
+        else
+        {
+            DrawString(5, m_textLine, "Distance Joint OFF");
+        }
+    }
+
+    static Test* Create() { return new WreckingBall; }
+
+    b2DistanceJointDef m_distanceJointDef;
+    b2Joint* m_distanceJoint;
+    bool m_stabilize;
 };
 
 static int testIndex = RegisterTest("Examples", "Wrecking Ball", WreckingBall::Create);
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp
index 217b173caa9e..34e10a024421 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,22 +38,21 @@ bool Bug1159Layer::init()
         auto sprite_a = LayerColor::create(Color4B(255, 0, 0, 255), 700, 700);
         sprite_a->setAnchorPoint(Vec2(0.5f, 0.5f));
         sprite_a->setIgnoreAnchorPointForPosition(false);
-        sprite_a->setPosition(0.0f, s.height/2);
+        sprite_a->setPosition(0.0f, s.height / 2);
         addChild(sprite_a);
 
-        sprite_a->runAction(RepeatForever::create(Sequence::create(
-                                                        MoveTo::create(1.0f, Vec2(1024.0f, 384.0f)),
-                                                        MoveTo::create(1.0f, Vec2(0.0f, 384.0f)),
-                                                        nullptr)));
+        sprite_a->runAction(RepeatForever::create(Sequence::create(MoveTo::create(1.0f, Vec2(1024.0f, 384.0f)),
+                                                                   MoveTo::create(1.0f, Vec2(0.0f, 384.0f)), nullptr)));
 
         auto sprite_b = LayerColor::create(Color4B(0, 0, 255, 255), 400, 400);
         sprite_b->setAnchorPoint(Vec2(0.5f, 0.5f));
         sprite_b->setIgnoreAnchorPointForPosition(false);
-        sprite_b->setPosition(s.width/2, s.height/2);
+        sprite_b->setPosition(s.width / 2, s.height / 2);
         addChild(sprite_b);
 
-        auto label = MenuItemLabel::create(Label::createWithSystemFont("Flip Me", "Helvetica", 24), CC_CALLBACK_1(Bug1159Layer::callBack, this) );
-        auto menu = Menu::create(label, nullptr);
+        auto label = MenuItemLabel::create(Label::createWithSystemFont("Flip Me", "Helvetica", 24),
+                                           CC_CALLBACK_1(Bug1159Layer::callBack, this));
+        auto menu  = Menu::create(label, nullptr);
         menu->setPosition(s.width - 200.0f, 50.0f);
         addChild(menu);
 
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1159.h b/tests/cpp-tests/Classes/BugsTest/Bug-1159.h
index 1a0e5a6a4998..1db64c6c2dd7 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-1159.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-1159.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,11 +32,11 @@ class Bug1159Layer : public BugsTestBase
 public:
     virtual bool init() override;
     virtual void onExit() override;
-    virtual std::string title() const override { return "Bug1159";}
+    virtual std::string title() const override { return "Bug1159"; }
 
     void callBack(cocos2d::Ref* sender);
 
     CREATE_FUNC(Bug1159Layer);
 };
 
-#endif // __BUG_1159_H__
+#endif  // __BUG_1159_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp
index 0680e587abe7..7b35bba3aca3 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,23 +31,23 @@
 
 USING_NS_CC;
 
-int check_for_error( Vec2 p1, Vec2 p2, Vec2 p3, Vec2 p4, float s, float t );
+int check_for_error(Vec2 p1, Vec2 p2, Vec2 p3, Vec2 p4, float s, float t);
 
-int check_for_error( Vec2 p1, Vec2 p2, Vec2 p3, Vec2 p4, float s, float t )
+int check_for_error(Vec2 p1, Vec2 p2, Vec2 p3, Vec2 p4, float s, float t)
 {
     //    the hit point is        p3 + t * (p4 - p3);
     //    the hit point also is    p1 + s * (p2 - p1);
-    
-    auto p4_p3 = p4 - p3;
-    auto p4_p3_t = p4_p3 * t;
+
+    auto p4_p3     = p4 - p3;
+    auto p4_p3_t   = p4_p3 * t;
     auto hitPoint1 = p3 + p4_p3_t;
-    
-    auto p2_p1 = p2 - p1;
-    auto p2_p1_s = p2_p1 * s;
+
+    auto p2_p1     = p2 - p1;
+    auto p2_p1_s   = p2_p1 * s;
     auto hitPoint2 = p1 + p2_p1_s;
-    
+
     // Since float has rounding errors, only check if diff is < 0.05
-    if( (fabs( hitPoint1.x - hitPoint2.x) > 0.1f) || ( fabs(hitPoint1.y - hitPoint2.y) > 0.1f) )
+    if ((fabs(hitPoint1.x - hitPoint2.x) > 0.1f) || (fabs(hitPoint1.y - hitPoint2.y) > 0.1f))
     {
         log("ERROR: (%f,%f) != (%f,%f)", hitPoint1.x, hitPoint1.y, hitPoint2.x, hitPoint2.y);
         return 1;
@@ -60,20 +60,20 @@ bool Bug1174Layer::init()
 {
     if (BugsTestBase::init())
     {
-//         // seed
-//         std::srand(0);
-
-        Vec2 A,B,C,D,p1,p2,p3,p4;
-        float s,t;
-        
-        int err=0;
-        int ok=0;
-        
+        //         // seed
+        //         std::srand(0);
+
+        Vec2 A, B, C, D, p1, p2, p3, p4;
+        float s, t;
+
+        int err = 0;
+        int ok  = 0;
+
         //
         // Test 1.
         //
         log("Test1 - Start");
-        for( int i=0; i < 10000; i++)
+        for (int i = 0; i < 10000; i++)
         {
             // A | b
             // -----
@@ -92,19 +92,20 @@ bool Bug1174Layer::init()
             // c | d
             float bx = CCRANDOM_0_1() * 5000;
             float by = CCRANDOM_0_1() * 5000;
-            
+
             // a | b
             // -----
             // C | d
             float cx = CCRANDOM_0_1() * -5000;
             float cy = CCRANDOM_0_1() * -5000;
-            
-            A = Vec2(ax,ay);
-            B = Vec2(bx,by);
-            C = Vec2(cx,cy);
-            D = Vec2(dx,dy);
-            if( Vec2::isLineIntersect( A, D, B, C, &s, &t) ) {
-                if( check_for_error(A, D, B, C, s, t) )
+
+            A = Vec2(ax, ay);
+            B = Vec2(bx, by);
+            C = Vec2(cx, cy);
+            D = Vec2(dx, dy);
+            if (Vec2::isLineIntersect(A, D, B, C, &s, &t))
+            {
+                if (check_for_error(A, D, B, C, s, t))
                     err++;
                 else
                     ok++;
@@ -116,69 +117,68 @@ bool Bug1174Layer::init()
         // Test 2.
         //
         log("Test2 - Start");
-        
-        p1 = Vec2(220,480);
-        p2 = Vec2(304,325);
-        p3 = Vec2(264,416);
-        p4 = Vec2(186,416);
-        s = 0.0f;
-        t = 0.0f;
-        if( Vec2::isLineIntersect(p1, p2, p3, p4, &s, &t) )
-            check_for_error(p1, p2, p3, p4, s,t );
+
+        p1 = Vec2(220, 480);
+        p2 = Vec2(304, 325);
+        p3 = Vec2(264, 416);
+        p4 = Vec2(186, 416);
+        s  = 0.0f;
+        t  = 0.0f;
+        if (Vec2::isLineIntersect(p1, p2, p3, p4, &s, &t))
+            check_for_error(p1, p2, p3, p4, s, t);
 
         log("Test2 - End");
 
-        
         //
         // Test 3
         //
         log("Test3 - Start");
-        
-        ok=0;
-        err=0;
-        for( int i=0;i<10000;i++)
+
+        ok  = 0;
+        err = 0;
+        for (int i = 0; i < 10000; i++)
         {
             // A | b
             // -----
             // c | d
             float ax = CCRANDOM_0_1() * -500;
             float ay = CCRANDOM_0_1() * 500;
-            p1 = Vec2(ax,ay);
-            
+            p1       = Vec2(ax, ay);
+
             // a | b
             // -----
             // c | D
             float dx = CCRANDOM_0_1() * 500;
             float dy = CCRANDOM_0_1() * -500;
-            p2 = Vec2(dx,dy);
-            
-            
+            p2       = Vec2(dx, dy);
+
             //////
-            
-            float y = ay - ((ay - dy) /2.0f);
+
+            float y = ay - ((ay - dy) / 2.0f);
 
             // a | b
             // -----
             // C | d
             float cx = CCRANDOM_0_1() * -500;
-            p3 = Vec2(cx,y);
-            
+            p3       = Vec2(cx, y);
+
             // a | B
             // -----
             // c | d
             float bx = CCRANDOM_0_1() * 500;
-            p4 = Vec2(bx,y);
+            p4       = Vec2(bx, y);
 
             s = 0.0f;
             t = 0.0f;
-            if( Vec2::isLineIntersect(p1, p2, p3, p4, &s, &t) ) {
-                if( check_for_error(p1, p2, p3, p4, s,t ) )
+            if (Vec2::isLineIntersect(p1, p2, p3, p4, &s, &t))
+            {
+                if (check_for_error(p1, p2, p3, p4, s, t))
                     err++;
                 else
                     ok++;
             }
         }
-        
+
         log("Test3 - End. OK=%i, err=%i", ok, err);
         return true;
     }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-1174.h b/tests/cpp-tests/Classes/BugsTest/Bug-1174.h
index 97cdf5291906..d813835e4775 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-1174.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-1174.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ class Bug1174Layer : public BugsTestBase
     CREATE_FUNC(Bug1174Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug1174";}
+    virtual std::string title() const override { return "Bug1174"; }
 };
 
-#endif // __BUG_1174_H__
+#endif  // __BUG_1174_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp
index 0d6ffb0af42c..f3cae71e5950 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,45 +45,44 @@ Bug12847Layer::~Bug12847Layer()
     Director::getInstance()->setProjection(_projection);
 }
 
-
 bool Bug12847Layer::init()
 {
     if (BugsTestBase::init())
     {
         Director::getInstance()->setProjection(Director::Projection::_2D);
         auto _visibleSize = Director::getInstance()->getVisibleSize();
-        
-        //Create with Sprite
+
+        // Create with Sprite
         {
             sprite1 = Sprite::create("Images/bug12847_sprite.png");
             sprite1->getTexture()->setAliasTexParameters();
-            sprite1->setPosition(Vec2(_visibleSize.width/3, 50.0f));
+            sprite1->setPosition(Vec2(_visibleSize.width / 3, 50.0f));
             this->addChild(sprite1, 1);
-            
+
             sprite2 = Sprite::create("Images/bug12847_sprite.png");
             sprite2->getTexture()->setAliasTexParameters();
             sprite2->setPosition(sprite1->getPosition() + Vec2(0.0f, sprite1->getContentSize().height));
             this->addChild(sprite2, 1);
         }
-        //Create with SpriteFrame
+        // Create with SpriteFrame
         {
             SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/bug12847_spriteframe.plist");
-            
+
             sprite3 = Sprite::createWithSpriteFrameName("bug12847_sprite2.png");
             sprite3->getTexture()->setAliasTexParameters();
-            sprite3->setPosition(Vec2(_visibleSize.width * 2/3, 50.0f));
+            sprite3->setPosition(Vec2(_visibleSize.width * 2 / 3, 50.0f));
             this->addChild(sprite3, 1);
-            
+
             sprite4 = Sprite::createWithSpriteFrameName("bug12847_sprite2.png");
             sprite4->getTexture()->setAliasTexParameters();
             sprite4->setPosition(sprite3->getPosition() + Vec2(0.0f, sprite3->getContentSize().height));
             this->addChild(sprite4, 1);
         }
-        
+
         this->scheduleUpdate();
         return true;
     }
-    
+
     return false;
 }
 
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-12847.h b/tests/cpp-tests/Classes/BugsTest/Bug-12847.h
index c34ed2e072c7..864b26b3394f 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-12847.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-12847.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,20 +31,19 @@ class Bug12847Layer : public BugsTestBase
 {
 public:
     CREATE_FUNC(Bug12847Layer);
-    
+
     Bug12847Layer();
     virtual ~Bug12847Layer();
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug1287";}
-    
+    virtual std::string title() const override { return "Bug1287"; }
+
 protected:
     virtual void update(float dt) override;
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
 private:
-    
     cocos2d::Sprite* sprite1;
     cocos2d::Sprite* sprite2;
     cocos2d::Sprite* sprite3;
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-14327.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-14327.cpp
index a5f56f5751b1..94723fdf4641 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-14327.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-14327.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,9 +41,9 @@ bool Bug14327Layer::init()
 {
     if (BugsTestBase::init())
     {
-        auto glview = Director::getInstance()->getOpenGLView();
+        auto glview        = Director::getInstance()->getOpenGLView();
         auto visibleOrigin = glview->getVisibleOrigin();
-        auto visibleSize = glview->getVisibleSize();
+        auto visibleSize   = glview->getVisibleSize();
 
         auto pBg = Sprite::create("Images/HelloWorld.png");
         pBg->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
@@ -52,10 +52,10 @@ bool Bug14327Layer::init()
         _removeTime = time(nullptr) + 20;
 
         _TTFShowTime = Label::createWithSystemFont("Edit control will be removed after 00:20!", "Arial", 20);
-        _TTFShowTime->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 60));
+        _TTFShowTime->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 60));
         this->addChild(_TTFShowTime);
 
-
         auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
 
         std::string pNormalSprite = "extensions/green_edit.png";
@@ -97,14 +97,15 @@ void Bug14327Layer::editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox)
     log("editBox %p DidBegin !", editBox);
 }
 
-void Bug14327Layer::editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox, cocos2d::ui::EditBoxDelegate::EditBoxEndAction EditBoxEndAction)
+void Bug14327Layer::editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox,
+                                                   cocos2d::ui::EditBoxDelegate::EditBoxEndAction EditBoxEndAction)
 {
     log("editBox %p DidEnd !", editBox);
 }
 
-void Bug14327Layer::editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)
+void Bug14327Layer::editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text)
 {
-    log("editBox %p TextChanged, text: %s ", editBox, text.c_str());
+    log("editBox %p TextChanged, text: %s ", editBox, text.data());
 }
 
 void Bug14327Layer::editBoxReturn(ui::EditBox* editBox)
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-14327.h b/tests/cpp-tests/Classes/BugsTest/Bug-14327.h
index db1b6e3bfa77..96e1cf157a0a 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-14327.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-14327.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,10 +27,9 @@
 
 #include "BugsTest.h"
 
-
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 
-#include "ui/UIEditBox/UIEditBox.h"
+#    include "ui/UIEditBox/UIEditBox.h"
 
 class Bug14327Layer : public BugsTestBase, public cocos2d::ui::EditBoxDelegate
 {
@@ -38,11 +37,13 @@ class Bug14327Layer : public BugsTestBase, public cocos2d::ui::EditBoxDelegate
     CREATE_FUNC(Bug14327Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug14327";}
+    virtual std::string title() const override { return "Bug14327"; }
 
     virtual void editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox) override;
-    virtual void editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox, cocos2d::ui::EditBoxDelegate::EditBoxEndAction EditBoxEndAction) override;
-    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text) override;
+    virtual void editBoxEditingDidEndWithAction(
+        cocos2d::ui::EditBox* editBox,
+        cocos2d::ui::EditBoxDelegate::EditBoxEndAction EditBoxEndAction) override;
+    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text) override;
     virtual void editBoxReturn(cocos2d::ui::EditBox* editBox) override;
 
 protected:
@@ -50,7 +51,7 @@ class Bug14327Layer : public BugsTestBase, public cocos2d::ui::EditBoxDelegate
 
 private:
     time_t _removeTime;
-    cocos2d::Label *_TTFShowTime;
+    cocos2d::Label* _TTFShowTime;
     cocos2d::ui::EditBox* _edit;
 };
 
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-15594.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-15594.cpp
index c53821668ab0..95c3a4011a4d 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-15594.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-15594.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,24 +34,23 @@
 
 #include "Bug-15594.h"
 
-
 USING_NS_CC;
 
 bool Bug15594Layer::init()
 {
-     if (BugsTestBase::init())
-     {
+    if (BugsTestBase::init())
+    {
         auto sprite3d = Sprite3D::create("Images/bugs/bug15594.c3t", "Images/bugs/bug15594.jpg");
         addChild(sprite3d);
         auto size = Director::getInstance()->getWinSize();
-        sprite3d->setPosition(size/2);
+        sprite3d->setPosition(size / 2);
 
         auto animation = Animation3D::create("Images/bugs/bug15594.c3t");
-        auto animate = Animate3D::create(animation);
-        auto repeat = RepeatForever::create(animate);
+        auto animate   = Animate3D::create(animation);
+        auto repeat    = RepeatForever::create(animate);
         sprite3d->runAction(repeat);
-         return true;
-     }
+        return true;
+    }
 
     return false;
 }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-15594.h b/tests/cpp-tests/Classes/BugsTest/Bug-15594.h
index abd4abde46b6..d55aa26c559d 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-15594.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-15594.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,7 @@ class Bug15594Layer : public BugsTestBase
     CREATE_FUNC(Bug15594Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug15594";}
+    virtual std::string title() const override { return "Bug15594"; }
 };
 
 #endif /* defined(__cocos2d_tests__Bug_15594__) */
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-15776.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-15776.cpp
index 1ea56ddd9e6d..5a3d08c069e3 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-15776.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-15776.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,10 +32,8 @@
 
 #include "Bug-15776.h"
 
-
 USING_NS_CC;
 
-
 //
 // IMPORTANT:
 // THIS TEST WILL CRASH ON TextureCache::addImage()
@@ -46,7 +44,7 @@ bool Bug15776Layer::init()
 {
     if (BugsTestBase::init())
     {
-        cocos2d::Image *cocos2dxImage = new cocos2d::Image();
+        cocos2d::Image* cocos2dxImage = new cocos2d::Image();
         cocos2dxImage->initWithImageData(nullptr, 0, false);
         // should not crash. invalid cocos2dImage
         auto texture2d = Director::getInstance()->getTextureCache()->addImage(cocos2dxImage, "unused");
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-15776.h b/tests/cpp-tests/Classes/BugsTest/Bug-15776.h
index 97d21f907cb7..3485f8bcf524 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-15776.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-15776.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -46,5 +46,4 @@ class Bug15776Layer : public BugsTestBase
     virtual std::string subtitle() const override;
 };
 
-
 #endif /* Bug_15776_hpp */
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-350.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-350.cpp
index 73e500f95877..f1e4ac21c20c 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-350.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-350.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 //
-// Bug-350 
+// Bug-350
 // http://code.google.com/p/cocos2d-iphone/issues/detail?id=350
 //
 
@@ -35,9 +35,9 @@ bool Bug350Layer::init()
 {
     if (BugsTestBase::init())
     {
-        auto size = Director::getInstance()->getWinSize();
+        auto size       = Director::getInstance()->getWinSize();
         auto background = Sprite::create("Hello.png");
-        background->setPosition(size.width/2, size.height/2);
+        background->setPosition(size.width / 2, size.height / 2);
         addChild(background);
         return true;
     }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-350.h b/tests/cpp-tests/Classes/BugsTest/Bug-350.h
index 4e8982f70e34..8f1d5d44a2da 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-350.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-350.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ class Bug350Layer : public BugsTestBase
     CREATE_FUNC(Bug350Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug350";}
+    virtual std::string title() const override { return "Bug350"; }
 };
 
-#endif // __BUG_350_H__
+#endif  // __BUG_350_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-422.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-422.cpp
index 28b1d56776cb..542ba9a8f433 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-422.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-422.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -52,21 +52,21 @@ void Bug422Layer::reset()
     // The menu will be removed, but the instance will be alive
     // and then a new node will be allocated occupying the memory.
     // => CRASH BOOM BANG
-    auto node = getChildByTag(localtag-1);
+    auto node = getChildByTag(localtag - 1);
     log("Menu: %p", node);
     removeChild(node, true);
-//    [self removeChildByTag:localtag-1 cleanup:NO];
+    //    [self removeChildByTag:localtag-1 cleanup:NO];
 
-    auto item1 = MenuItemFont::create("One", CC_CALLBACK_1(Bug422Layer::menuCallback, this) );
+    auto item1 = MenuItemFont::create("One", CC_CALLBACK_1(Bug422Layer::menuCallback, this));
     log("MenuItemFont: %p", item1);
-	MenuItem *item2 = MenuItemFont::create("Two", CC_CALLBACK_1(Bug422Layer::menuCallback, this) );
-    auto menu = Menu::create(item1, item2, nullptr);
+    MenuItem* item2 = MenuItemFont::create("Two", CC_CALLBACK_1(Bug422Layer::menuCallback, this));
+    auto menu       = Menu::create(item1, item2, nullptr);
     menu->alignItemsVertically();
 
     float x = CCRANDOM_0_1() * 50;
     float y = CCRANDOM_0_1() * 50;
-    menu->setPosition(menu->getPosition() + Vec2(x,y));
-    addChild(menu, 0, localtag);    
+    menu->setPosition(menu->getPosition() + Vec2(x, y));
+    addChild(menu, 0, localtag);
 
     //[self check:self];
 }
@@ -74,7 +74,8 @@ void Bug422Layer::reset()
 void Bug422Layer::check(Node* t)
 {
     auto& children = t->getChildren();
-    for(const auto &child : children) {
+    for (const auto& child : children)
+    {
         log("%p, rc: %d", child, child->getReferenceCount());
         check(child);
     }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-422.h b/tests/cpp-tests/Classes/BugsTest/Bug-422.h
index 21c39580ad2f..dd229fffbf52 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-422.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-422.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,11 +33,11 @@ class Bug422Layer : public BugsTestBase
     CREATE_FUNC(Bug422Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug422";}
+    virtual std::string title() const override { return "Bug422"; }
 
     void reset();
     void check(Node* target);
     void menuCallback(cocos2d::Ref* sender);
 };
 
-#endif // __BUG_422_H__
+#endif  // __BUG_422_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp
index 4b5db044aecc..eae96810a9d8 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,27 +34,27 @@ USING_NS_CC;
 
 bool Bug458Layer::init()
 {
-    if(BugsTestBase::init())
+    if (BugsTestBase::init())
     {
         // ask director the the window size
         auto size = Director::getInstance()->getWinSize();
 
-        auto question = new QuestionContainerSprite();
+        auto question  = new QuestionContainerSprite();
         auto question2 = new QuestionContainerSprite();
         question->init();
         question2->init();
 
-//        [question setContentSize:CGSizeMake(50,50)];
-//        [question2 setContentSize:CGSizeMake(50,50)];
-        
-        auto sprite = MenuItemSprite::create(question2, question, CC_CALLBACK_1(Bug458Layer::selectAnswer, this) );
-        auto layer = LayerColor::create(Color4B(0,0,255,255), 100, 100);
+        //        [question setContentSize:CGSizeMake(50,50)];
+        //        [question2 setContentSize:CGSizeMake(50,50)];
+
+        auto sprite = MenuItemSprite::create(question2, question, CC_CALLBACK_1(Bug458Layer::selectAnswer, this));
+        auto layer  = LayerColor::create(Color4B(0, 0, 255, 255), 100, 100);
         question->release();
         question2->release();
 
-        auto layer2 = LayerColor::create(Color4B(255,0,0,255), 100, 100);
-        auto sprite2 = MenuItemSprite::create(layer, layer2, CC_CALLBACK_1(Bug458Layer::selectAnswer, this) );
-        auto menu = Menu::create(sprite, sprite2, nullptr);
+        auto layer2  = LayerColor::create(Color4B(255, 0, 0, 255), 100, 100);
+        auto sprite2 = MenuItemSprite::create(layer, layer2, CC_CALLBACK_1(Bug458Layer::selectAnswer, this));
+        auto menu    = Menu::create(sprite, sprite2, nullptr);
         menu->alignItemsVerticallyWithPadding(100);
         menu->setPosition(size.width / 2, size.height / 2);
 
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h
index 59a2509840e9..dc033564ec8a 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,4 +36,4 @@ class Bug458Layer : public BugsTestBase
     void selectAnswer(cocos2d::Ref* sender);
 };
 
-#endif // __BUG_458_H__
+#endif  // __BUG_458_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
index b5f94bea11c2..e65c5ee32bd2 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,24 +32,24 @@ bool QuestionContainerSprite::init()
 {
     if (Sprite::init())
     {
-        //Add label
+        // Add label
         auto label = Label::createWithTTF("Answer 1", "fonts/arial.ttf", 12);
         label->setTag(100);
 
-        //Add the background
-        auto size = Director::getInstance()->getWinSize();
+        // Add the background
+        auto size   = Director::getInstance()->getWinSize();
         auto corner = Sprite::create("Images/bugs/corner.png");
 
-        int width = size.width * 0.9f - (corner->getContentSize().width * 2);
-        int height = size.height * 0.15f  - (corner->getContentSize().height * 2);
+        int width  = size.width * 0.9f - (corner->getContentSize().width * 2);
+        int height = size.height * 0.15f - (corner->getContentSize().height * 2);
         auto layer = LayerColor::create(Color4B(255, 255, 255, 255 * .75), width, height);
         layer->setPosition(Vec2(-width / 2, -height / 2));
 
-        //First button is blue,
-        //Second is red
-        //Used for testing - change later
+        // First button is blue,
+        // Second is red
+        // Used for testing - change later
         static int a = 0;
-        
+
         if (a == 0)
             label->setColor(Color3B::BLUE);
         else
@@ -60,7 +60,8 @@ bool QuestionContainerSprite::init()
         a++;
         addChild(layer);
 
-        corner->setPosition(Vec2(-(width / 2 + corner->getContentSize().width / 2), -(height / 2 + corner->getContentSize().height / 2)));
+        corner->setPosition(Vec2(-(width / 2 + corner->getContentSize().width / 2),
+                                 -(height / 2 + corner->getContentSize().height / 2)));
         addChild(corner);
 
         auto corner2 = Sprite::create("Images/bugs/corner.png");
@@ -81,25 +82,29 @@ bool QuestionContainerSprite::init()
 
         auto edge = Sprite::create("Images/bugs/edge.png");
         edge->setScaleX(width);
-        edge->setPosition(Vec2(corner->getPosition().x + (corner->getContentSize().width / 2) + (width / 2), corner->getPosition().y));
+        edge->setPosition(Vec2(corner->getPosition().x + (corner->getContentSize().width / 2) + (width / 2),
+                               corner->getPosition().y));
         addChild(edge);
-        
+
         auto edge2 = Sprite::create("Images/bugs/edge.png");
         edge2->setScaleX(width);
-        edge2->setPosition(Vec2(corner->getPosition().x + (corner->getContentSize().width / 2) + (width / 2), -corner->getPosition().y));
+        edge2->setPosition(Vec2(corner->getPosition().x + (corner->getContentSize().width / 2) + (width / 2),
+                                -corner->getPosition().y));
         edge2->setFlippedY(true);
         addChild(edge2);
 
         auto edge3 = Sprite::create("Images/bugs/edge.png");
         edge3->setRotation(90);
         edge3->setScaleX(height);
-        edge3->setPosition(Vec2(corner->getPosition().x, corner->getPosition().y + (corner->getContentSize().height / 2) + (height / 2)));
+        edge3->setPosition(Vec2(corner->getPosition().x,
+                                corner->getPosition().y + (corner->getContentSize().height / 2) + (height / 2)));
         addChild(edge3);
 
         auto edge4 = Sprite::create("Images/bugs/edge.png");
         edge4->setRotation(270);
         edge4->setScaleX(height);
-        edge4->setPosition(Vec2(-corner->getPosition().x, corner->getPosition().y + (corner->getContentSize().height / 2) + (height / 2)));
+        edge4->setPosition(Vec2(-corner->getPosition().x,
+                                corner->getPosition().y + (corner->getContentSize().height / 2) + (height / 2)));
         addChild(edge4);
 
         addChild(label);
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
index 6e31c7744818..efc407f95a61 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,10 +27,10 @@
 
 #include "cocos2d.h"
 
-class QuestionContainerSprite : public cocos2d::Sprite 
+class QuestionContainerSprite : public cocos2d::Sprite
 {
 public:
     virtual bool init() override;
 };
 
-#endif // __QUESTION_CONTAINER_SPRITE_H__
+#endif  // __QUESTION_CONTAINER_SPRITE_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-624.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-624.cpp
index 038423e61316..62967df87240 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-624.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-624.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -43,23 +43,23 @@ Bug624Layer::~Bug624Layer()
 
 bool Bug624Layer::init()
 {
-    if(BugsTestBase::init())
+    if (BugsTestBase::init())
     {
-        auto size = Director::getInstance()->getWinSize();
+        auto size  = Director::getInstance()->getWinSize();
         auto label = Label::createWithTTF("Layer1", "fonts/Marker Felt.ttf", 36.0f);
 
-        label->setPosition(size.width/2, size.height/2);
+        label->setPosition(size.width / 2, size.height / 2);
         addChild(label);
-        
+
         Device::setAccelerometerEnabled(true);
-        auto listener = EventListenerAcceleration::create(CC_CALLBACK_2(Bug624Layer::onAcceleration,  this));
+        auto listener = EventListenerAcceleration::create(CC_CALLBACK_2(Bug624Layer::onAcceleration, this));
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
         schedule(CC_SCHEDULE_SELECTOR(Bug624Layer::switchLayer), 5.0f);
 
         return true;
     }
-    
+
     return false;
 }
 
@@ -67,13 +67,13 @@ void Bug624Layer::switchLayer(float dt)
 {
     unschedule(CC_SCHEDULE_SELECTOR(Bug624Layer::switchLayer));
 
-    auto scene = Scene::create();    
+    auto scene = Scene::create();
     scene->addChild(Bug624Layer2::create(), 0);
     Director::getInstance()->replaceScene(TransitionFade::create(2.0f, scene, Color3B::WHITE));
 }
 
 void Bug624Layer::onAcceleration(Acceleration* acc, Event* event)
-{    
+{
     log("Layer1 accel");
 }
 
@@ -89,19 +89,18 @@ Bug624Layer2::~Bug624Layer2()
 
 bool Bug624Layer2::init()
 {
-    if(BugsTestBase::init())
+    if (BugsTestBase::init())
     {
-        auto size = Director::getInstance()->getWinSize();
+        auto size  = Director::getInstance()->getWinSize();
         auto label = Label::createWithTTF("Layer2", "fonts/Marker Felt.ttf", 36.0f);
 
-        label->setPosition(size.width/2, size.height/2);
+        label->setPosition(size.width / 2, size.height / 2);
         addChild(label);
-        
+
         Device::setAccelerometerEnabled(true);
         auto listener = EventListenerAcceleration::create(CC_CALLBACK_2(Bug624Layer2::onAcceleration, this));
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-        
-        
+
         schedule(CC_SCHEDULE_SELECTOR(Bug624Layer2::switchLayer), 5.0f);
 
         return true;
@@ -114,12 +113,12 @@ void Bug624Layer2::switchLayer(float dt)
 {
     unschedule(CC_SCHEDULE_SELECTOR(Bug624Layer::switchLayer));
 
-    auto scene = Scene::create();    
+    auto scene = Scene::create();
     scene->addChild(Bug624Layer::create(), 0);
     Director::getInstance()->replaceScene(TransitionFade::create(2.0f, scene, Color3B::RED));
 }
 
 void Bug624Layer2::onAcceleration(Acceleration* acc, Event* event)
-{    
+{
     log("Layer2 accel");
 }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-624.h b/tests/cpp-tests/Classes/BugsTest/Bug-624.h
index 37aa5a2b5066..f71b73e8a4c3 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-624.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-624.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,7 +34,7 @@ class Bug624Layer : public BugsTestBase
     virtual bool init() override;
     void switchLayer(float dt);
     virtual void onAcceleration(cocos2d::Acceleration* acc, cocos2d::Event* event);
-    virtual std::string title() const override { return "Bug624";}
+    virtual std::string title() const override { return "Bug624"; }
 
     CREATE_FUNC(Bug624Layer);
 };
@@ -46,9 +46,9 @@ class Bug624Layer2 : public BugsTestBase
     virtual bool init() override;
     void switchLayer(float dt);
     virtual void onAcceleration(cocos2d::Acceleration* acc, cocos2d::Event* event);
-    virtual std::string title() const override { return "Bug624-2";}
+    virtual std::string title() const override { return "Bug624-2"; }
 
     CREATE_FUNC(Bug624Layer2);
 };
 
-#endif // __BUG_624_H__
+#endif  // __BUG_624_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-886.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-886.cpp
index c7c1209a873d..9dd133ee0bad 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-886.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-886.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,11 +33,11 @@ USING_NS_CC;
 
 bool Bug886Layer::init()
 {
-    if(BugsTestBase::init())
+    if (BugsTestBase::init())
     {
         // ask director the the window size
         //        auto size = [[Director sharedDirector] winSize];
-        
+
         auto sprite = Sprite::create("Images/bugs/bug886.jpg");
         sprite->setAnchorPoint(Vec2::ZERO);
         sprite->setPosition(Vec2::ZERO);
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-886.h b/tests/cpp-tests/Classes/BugsTest/Bug-886.h
index a3f189373565..aac1e9850cf4 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-886.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-886.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ class Bug886Layer : public BugsTestBase
     CREATE_FUNC(Bug886Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug886";}
+    virtual std::string title() const override { return "Bug886"; }
 };
 
-#endif // __BUG_886_H__
+#endif  // __BUG_886_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-899.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-899.cpp
index cddfdb0b0d66..f759c4076884 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-899.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-899.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,7 +35,7 @@ USING_NS_CC;
 
 bool Bug899Layer::init()
 {
-//    Director::getInstance()->enableRetinaDisplay(true);
+    //    Director::getInstance()->enableRetinaDisplay(true);
     if (BugsTestBase::init())
     {
         auto bg = Sprite::create("Images/bugs/RetinaDisplay.jpg");
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-899.h b/tests/cpp-tests/Classes/BugsTest/Bug-899.h
index e61494ffdb2b..37b7bf8d5318 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-899.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-899.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ class Bug899Layer : public BugsTestBase
     CREATE_FUNC(Bug899Layer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug899";}
+    virtual std::string title() const override { return "Bug899"; }
 };
 
-#endif // __BUG_899_H__
+#endif  // __BUG_899_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-914.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-914.cpp
index f80774c7d1a9..bd1d4b61ed6c 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-914.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-914.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 // Import the interfaces
-#include"Bug-914.h"
+#include "Bug-914.h"
 
 USING_NS_CC;
 
@@ -34,22 +34,22 @@ bool Bug914Layer::init()
     // Apple recommends to re-assign "self" with the "super" return value
     if (BugsTestBase::init())
     {
-        auto listener = EventListenerTouchAllAtOnce::create();
+        auto listener            = EventListenerTouchAllAtOnce::create();
         listener->onTouchesBegan = CC_CALLBACK_2(Bug914Layer::onTouchesBegan, this);
         listener->onTouchesMoved = CC_CALLBACK_2(Bug914Layer::onTouchesMoved, this);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-        
+
         // ask director the the window size
         auto size = Director::getInstance()->getWinSize();
-        LayerColor *layer;
-        for( int i=0;i < 5;i++)
+        LayerColor* layer;
+        for (int i = 0; i < 5; i++)
         {
-            layer = LayerColor::create(Color4B(i*20, i*20, i*20,255));
-            layer->setContentSize(Size(i*100.0f, i*100.0f));
-            layer->setPosition(size.width/2, size.height/2);
+            layer = LayerColor::create(Color4B(i * 20, i * 20, i * 20, 255));
+            layer->setContentSize(Size(i * 100.0f, i * 100.0f));
+            layer->setPosition(size.width / 2, size.height / 2);
             layer->setAnchorPoint(Vec2(0.5f, 0.5f));
             layer->setIgnoreAnchorPointForPosition(false);
-            addChild(layer, -1-i);
+            addChild(layer, -1 - i);
         }
 
         // create and initialize a Label
@@ -58,11 +58,11 @@ bool Bug914Layer::init()
 
         auto menu = Menu::create(item1, nullptr);
         menu->alignItemsVertically();
-        menu->setPosition(size.width/2, 100);
+        menu->setPosition(size.width / 2, 100);
         addChild(menu);
 
         // position the label on the center of the screen
-        label->setPosition(size.width /2 , size.height/2);
+        label->setPosition(size.width / 2, size.height / 2);
 
         // add the label as a child to this Layer
         addChild(label);
@@ -71,12 +71,12 @@ bool Bug914Layer::init()
     return false;
 }
 
-void Bug914Layer::onTouchesMoved(const std::vector<Touch*>& touches, Event * event)
+void Bug914Layer::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     log("Number of touches: %d", (int)touches.size());
 }
 
-void Bug914Layer::onTouchesBegan(const std::vector<Touch*>& touches, Event * event)
+void Bug914Layer::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
     onTouchesMoved(touches, event);
 }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-914.h b/tests/cpp-tests/Classes/BugsTest/Bug-914.h
index c78952933f07..cd9d08f5aa1e 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-914.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-914.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,7 @@ class Bug914Layer : public BugsTestBase
 {
 public:
     virtual bool init() override;
-    virtual std::string title() const override { return "Bug914";}
+    virtual std::string title() const override { return "Bug914"; }
 
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
@@ -40,4 +40,4 @@ class Bug914Layer : public BugsTestBase
     CREATE_FUNC(Bug914Layer);
 };
 
-#endif // __BUG_914_H__
+#endif  // __BUG_914_H__
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.cpp
index 3ed147bb4bb3..a1f2b51289f9 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,7 +38,7 @@ bool BugDrawNodeLayer::init()
 {
     if (BugsTestBase::init())
     {
-        auto size = Director::getInstance()->getWinSize();
+        auto size       = Director::getInstance()->getWinSize();
         auto testSprite = Sprite::create("Images/close.png");
         BlendFunc blend;
         blend.src = backend::BlendFactor::ZERO;
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.h b/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.h
index e48afef9b77e..47b947213890 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-CCDrawNode.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ class BugDrawNodeLayer : public BugsTestBase
     CREATE_FUNC(BugDrawNodeLayer);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "BugDrawNode";}
+    virtual std::string title() const override { return "BugDrawNode"; }
 };
 
 #endif
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-Child.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-Child.cpp
index abab81548f41..b53d10ff9447 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-Child.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-Child.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,37 +39,37 @@ bool BugChild::init()
     if (BugsTestBase::init())
     {
         auto size = Director::getInstance()->getWinSize();
-        
+
         // create and initialize a Label
         auto item1 = MenuItemFont::create("Switch Child", CC_CALLBACK_1(BugChild::switchChild, this));
-        
+
         menu = Menu::create(item1, nullptr);
-        
+
         menu->alignItemsVertically();
-        menu->setPosition(size.width/2, 100);
+        menu->setPosition(size.width / 2, 100);
         addChild(menu);
-        
+
         parent1 = Sprite::create("Images/grossini.png");
-        parent1->setPosition(size.width/4, size.height/2);
+        parent1->setPosition(size.width / 4, size.height / 2);
         addChild(parent1);
-        
+
         parent2 = Sprite::create("Images/grossinis_sister1.png");
-        parent2->setPosition(size.width*3/4, size.height/2);
+        parent2->setPosition(size.width * 3 / 4, size.height / 2);
         addChild(parent2);
-        
+
         child = Sprite::create("Images/grossinis_sister2.png");
         child->setPosition(20, 20);
         child->retain();
         parent1->addChild(child);
         return true;
     }
-    
+
     return false;
 }
 
-void BugChild::switchChild(Ref *sender)
+void BugChild::switchChild(Ref* sender)
 {
-    if(parent1->getChildrenCount() > 0)
+    if (parent1->getChildrenCount() > 0)
     {
         parent1->removeChild(child, false);
         parent2->addChild(child);
@@ -85,49 +85,49 @@ void BugChild::switchChild(Ref *sender)
 
 bool BugCameraMask::init()
 {
-    if (!BugsTestBase::init()) return false;
-    
+    if (!BugsTestBase::init())
+        return false;
+
     auto size = Director::getInstance()->getWinSize();
-    
+
     auto node = Node::create();
-    node->setPosition(size.width/4, size.height/3);
+    node->setPosition(size.width / 4, size.height / 3);
     _sprite = Sprite::create("Images/grossini.png");
     node->addChild(_sprite);
     node->setCameraMask((unsigned short)CameraFlag::USER1);
-    auto move = MoveBy::create(2, Vec2(200,0));
-    
+    auto move = MoveBy::create(2, Vec2(200, 0));
+
     node->runAction(RepeatForever::create(Sequence::createWithTwoActions(move, move->reverse())));
     addChild(node);
-    
+
     auto camera = Camera::create();
     camera->setCameraFlag(CameraFlag::USER1);
     addChild(camera);
-    
-    
+
     auto item1 = MenuItemFont::create("Switch Child", CC_CALLBACK_1(BugCameraMask::switchSpriteFlag, this));
-    
+
     auto menu = Menu::create(item1, nullptr);
-    
+
     menu->alignItemsVertically();
-    menu->setPosition(size.width/2, 100);
+    menu->setPosition(size.width / 2, 100);
     addChild(menu);
-    
+
     _spriteMaskLabel = Label::create();
-    _spriteMaskLabel->setPosition(size.width/2, 120);
+    _spriteMaskLabel->setPosition(size.width / 2, 120);
     addChild(_spriteMaskLabel);
     updateSpriteMaskLabel();
-    
+
     auto label = Label::create();
-    label->setPosition(size.width/2, size.height * 0.9f);
+    label->setPosition(size.width / 2, size.height * 0.9f);
     label->setString("Sprite should always run action.");
     addChild(label);
-    
+
     return true;
 }
 
-void BugCameraMask::switchSpriteFlag(Ref *sender)
+void BugCameraMask::switchSpriteFlag(Ref* sender)
 {
-    if((unsigned short) CameraFlag::USER1 == _sprite->getCameraMask())
+    if ((unsigned short)CameraFlag::USER1 == _sprite->getCameraMask())
     {
         _sprite->setCameraMask((unsigned short)CameraFlag::DEFAULT);
     }
@@ -135,13 +135,14 @@ void BugCameraMask::switchSpriteFlag(Ref *sender)
     {
         _sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     }
-    
+
     updateSpriteMaskLabel();
 }
 
 void BugCameraMask::updateSpriteMaskLabel()
 {
     std::stringstream stream;
-    stream << "The camera Mask is " << (_sprite->getCameraMask() == 1 ? "CameraFlag::Default" : "CameraFlag::User1") << std::endl;
+    stream << "The camera Mask is " << (_sprite->getCameraMask() == 1 ? "CameraFlag::Default" : "CameraFlag::User1")
+           << std::endl;
     _spriteMaskLabel->setString(stream.str());
 }
diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-Child.h b/tests/cpp-tests/Classes/BugsTest/Bug-Child.h
index fb603362f6af..df83634926f9 100644
--- a/tests/cpp-tests/Classes/BugsTest/Bug-Child.h
+++ b/tests/cpp-tests/Classes/BugsTest/Bug-Child.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,17 +41,16 @@ class BugChild : public BugsTestBase
     CREATE_FUNC(BugChild);
 
     virtual bool init() override;
-    virtual std::string title() const override { return "BugChild";}
-    
+    virtual std::string title() const override { return "BugChild"; }
+
     void switchChild(cocos2d::Ref* sender);
-    
+
 protected:
-    
     cocos2d::Sprite* parent1;
     cocos2d::Sprite* parent2;
-    
+
     cocos2d::Sprite* child;
-    
+
     cocos2d::Menu* menu;
 };
 
@@ -59,10 +58,10 @@ class BugCameraMask : public BugsTestBase
 {
 public:
     CREATE_FUNC(BugCameraMask);
-    
+
     virtual bool init() override;
-    virtual std::string title() const override { return "BugCameraMask";}
-    
+    virtual std::string title() const override { return "BugCameraMask"; }
+
     void switchSpriteFlag(cocos2d::Ref* sender);
     void updateSpriteMaskLabel();
     Node* _sprite;
diff --git a/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp b/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp
index a35705ebae74..074dd6f2195a 100644
--- a/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp
+++ b/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,7 +39,7 @@
 #include "Bug-15776.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-#include "Bug-14327.h"
+#    include "Bug-14327.h"
 #endif
 
 BugsTests::BugsTests()
@@ -58,9 +58,9 @@ BugsTests::BugsTests()
     ADD_TEST_CASE(BugDrawNodeLayer);
     ADD_TEST_CASE(Bug12847Layer);
     ADD_TEST_CASE(Bug15594Layer);
-    
+
     // NOTE: comment this out because it currently crashes during autotest
-    //ADD_TEST_CASE(Bug15776Layer);
+    // ADD_TEST_CASE(Bug15776Layer);
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
     ADD_TEST_CASE(Bug14327Layer);
diff --git a/tests/cpp-tests/Classes/BugsTest/BugsTest.h b/tests/cpp-tests/Classes/BugsTest/BugsTest.h
index d06a1cc9c7d4..dacd08fc05e1 100644
--- a/tests/cpp-tests/Classes/BugsTest/BugsTest.h
+++ b/tests/cpp-tests/Classes/BugsTest/BugsTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,7 +30,7 @@
 class BugsTestBase : public TestCase
 {
 public:
-    virtual std::string title() const override {return "No Test Title set";}
+    virtual std::string title() const override { return "No Test Title set"; }
 };
 
 DEFINE_TEST_SUITE(BugsTests);
diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
index a833ad3fb803..158543505ed7 100644
--- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
+++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
@@ -27,17 +27,19 @@ THE SOFTWARE.
 #include "Camera3DTest.h"
 #include "testResource.h"
 #include "ui/UISlider.h"
-#include  "platform/CCFileUtils.h"
+#include "platform/CCFileUtils.h"
 #include "renderer/backend/Device.h"
 
 USING_NS_CC;
 
-#define SET_UNIFORM(name, addr, size) do {                      \
-        auto _loc_ = _programState1->getUniformLocation(name);  \
-        _programState1->setUniform(_loc_, (addr), (size));      \
-        _loc_ = _programState2->getUniformLocation(name);       \
-        _programState2->setUniform(_loc_, (addr), (size));      \
-    } while(false) 
+#define SET_UNIFORM(name, addr, size)                          \
+    do                                                         \
+    {                                                          \
+        auto _loc_ = _programState1->getUniformLocation(name); \
+        _programState1->setUniform(_loc_, (addr), (size));     \
+        _loc_ = _programState2->getUniformLocation(name);      \
+        _programState2->setUniform(_loc_, (addr), (size));     \
+    } while (false)
 
 enum
 {
@@ -53,7 +55,7 @@ Camera3DTests::Camera3DTests()
     ADD_TEST_CASE(CameraCullingDemo);
     ADD_TEST_CASE(FogTestDemo);
     ADD_TEST_CASE(CameraArcBallDemo);
-    //ADD_TEST_CASE(CameraFrameBufferTest); //TODO render target
+    // ADD_TEST_CASE(CameraFrameBufferTest); //TODO render target
     ADD_TEST_CASE(BackgroundColorBrushTest);
 }
 
@@ -66,9 +68,9 @@ CameraRotationTest::CameraRotationTest()
 {
 
     auto s = Director::getInstance()->getWinSize();
-    
+
     _camControlNode = Node::create();
-    _camControlNode->setPositionNormalized(Vec2(0.5f,0.5f));
+    _camControlNode->setPositionNormalized(Vec2(0.5f, 0.5f));
     addChild(_camControlNode);
 
     _camNode = Node::create();
@@ -76,61 +78,59 @@ CameraRotationTest::CameraRotationTest()
     _camControlNode->addChild(_camNode);
 
     auto sp3d = Sprite3D::create();
-    sp3d->setPosition(s.width/2, s.height/2);
+    sp3d->setPosition(s.width / 2, s.height / 2);
     addChild(sp3d);
-    
+
     auto lship = Label::create();
     lship->setString("Ship");
     lship->setPosition(0, 20);
     sp3d->addChild(lship);
-    
-    //Billboards
-    //Yellow is at the back
+
+    // Billboards
+    // Yellow is at the back
     bill1 = BillBoard::create("Images/Icon.png");
     bill1->setPosition3D(Vec3(50.0f, 10.0f, -10.0f));
     bill1->setColor(Color3B::YELLOW);
     bill1->setScale(0.6f);
     sp3d->addChild(bill1);
-    
+
     l1 = Label::create();
-    l1->setPosition(Vec2(0.0f,-10.0f));
+    l1->setPosition(Vec2(0.0f, -10.0f));
     l1->setString("Billboard1");
     l1->setColor(Color3B::WHITE);
     l1->setScale(3);
     bill1->addChild(l1);
 
     auto p1 = ParticleSystemQuad::create("Particles/SmallSun.plist");
-    p1->setPosition(30.0f,80.0f);
+    p1->setPosition(30.0f, 80.0f);
     bill1->addChild(p1);
-    
+
     bill2 = BillBoard::create("Images/Icon.png");
     bill2->setPosition3D(Vec3(-50.0f, -10.0f, 10.0f));
     bill2->setScale(0.6f);
     sp3d->addChild(bill2);
-    
+
     l2 = Label::create();
     l2->setString("Billboard2");
-    l2->setPosition(Vec2(0.0f,-10.0f));
+    l2->setPosition(Vec2(0.0f, -10.0f));
     l2->setColor(Color3B::WHITE);
     l2->setScale(3);
     bill2->addChild(l2);
-    
+
     auto p2 = ParticleSystemQuad::create("Particles/SmallSun.plist");
-    p2->setPosition(30,80);
+    p2->setPosition(30, 80);
     bill2->addChild(p2);
 
-    //3D models
+    // 3D models
     auto model = Sprite3D::create("Sprite3DTest/boss1.obj");
     model->setScale(4);
     model->setTexture("Sprite3DTest/boss.png");
-    model->setPosition3D(Vec3(s.width/2, s.height/2, 0));
+    model->setPosition3D(Vec3(s.width / 2, s.height / 2, 0));
     addChild(model);
 
-    //Listener
-    _lis = EventListenerTouchOneByOne::create();
-    _lis->onTouchBegan = [](Touch* t, Event* e) {
-        return true;
-    };
+    // Listener
+    _lis               = EventListenerTouchOneByOne::create();
+    _lis->onTouchBegan = [](Touch* t, Event* e) { return true; };
 
     _lis->onTouchMoved = [this](Touch* t, Event* e) {
         float dx = t->getDelta().x;
@@ -146,7 +146,7 @@ CameraRotationTest::CameraRotationTest()
     };
 
     Director::getInstance()->getEventDispatcher()->addEventListenerWithSceneGraphPriority(_lis, this);
-    
+
     schedule(CC_SCHEDULE_SELECTOR(CameraRotationTest::update));
 }
 
@@ -175,9 +175,7 @@ void CameraRotationTest::onExit()
     CameraBaseTest::onExit();
 }
 
-void CameraRotationTest::update(float dt)
-{
-}
+void CameraRotationTest::update(float dt) {}
 
 //------------------------------------------------------------------
 //
@@ -185,80 +183,75 @@ void CameraRotationTest::update(float dt)
 //
 //------------------------------------------------------------------
 Camera3DTestDemo::Camera3DTestDemo()
-: _cameraType(CameraType::Free)
-, _incRot(nullptr)
-, _decRot(nullptr)
-, _camera(nullptr)
-, _bZoomOut(false)
-, _bZoomIn(false)
-, _bRotateLeft(false)
-, _bRotateRight(false)
-{
-}
-Camera3DTestDemo::~Camera3DTestDemo()
-{
-}
-void Camera3DTestDemo::reachEndCallBack()
-{
-}
+    : _cameraType(CameraType::Free)
+    , _incRot(nullptr)
+    , _decRot(nullptr)
+    , _camera(nullptr)
+    , _bZoomOut(false)
+    , _bZoomIn(false)
+    , _bRotateLeft(false)
+    , _bRotateRight(false)
+{}
+Camera3DTestDemo::~Camera3DTestDemo() {}
+void Camera3DTestDemo::reachEndCallBack() {}
 std::string Camera3DTestDemo::title() const
 {
     return "Testing Camera";
 }
 
-void Camera3DTestDemo::scaleCameraCallback(Ref* sender,float value)
+void Camera3DTestDemo::scaleCameraCallback(Ref* sender, float value)
 {
-    if(_camera&& _cameraType!=CameraType::FirstPerson)
+    if (_camera && _cameraType != CameraType::FirstPerson)
     {
-        Vec3 cameraPos=  _camera->getPosition3D();
-        cameraPos+= cameraPos.getNormalized()*value;
+        Vec3 cameraPos = _camera->getPosition3D();
+        cameraPos += cameraPos.getNormalized() * value;
         _camera->setPosition3D(cameraPos);
     }
 }
-void Camera3DTestDemo::rotateCameraCallback(Ref* sender,float value)
+void Camera3DTestDemo::rotateCameraCallback(Ref* sender, float value)
 {
-    if(_cameraType==CameraType::Free || _cameraType==CameraType::FirstPerson)
+    if (_cameraType == CameraType::Free || _cameraType == CameraType::FirstPerson)
     {
-        Vec3  rotation3D= _camera->getRotation3D();
-        rotation3D.y+= value;
+        Vec3 rotation3D = _camera->getRotation3D();
+        rotation3D.y += value;
         _camera->setRotation3D(rotation3D);
     }
 }
 void Camera3DTestDemo::SwitchViewCallback(Ref* sender, CameraType cameraType)
 {
-    if(_cameraType==cameraType)
+    if (_cameraType == cameraType)
     {
-        return ;
+        return;
     }
     _cameraType = cameraType;
-    if(_cameraType==CameraType::Free)
+    if (_cameraType == CameraType::Free)
     {
         _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D());
         _camera->lookAt(_sprite3D->getPosition3D());
-        
+
         _RotateRightlabel->setColor(Color3B::WHITE);
         _RotateLeftlabel->setColor(Color3B::WHITE);
         _ZoomInlabel->setColor(Color3B::WHITE);
         _ZoomOutlabel->setColor(Color3B::WHITE);
     }
-    else if(_cameraType==CameraType::FirstPerson)
+    else if (_cameraType == CameraType::FirstPerson)
     {
         Vec3 newFaceDir;
         _sprite3D->getWorldToNodeTransform().getForwardVector(&newFaceDir);
         newFaceDir.normalize();
-        _camera->setPosition3D(Vec3(0,35,0) + _sprite3D->getPosition3D());
-        _camera->lookAt(_sprite3D->getPosition3D() + newFaceDir*50);
-        
+        _camera->setPosition3D(Vec3(0, 35, 0) + _sprite3D->getPosition3D());
+        _camera->lookAt(_sprite3D->getPosition3D() + newFaceDir * 50);
+
         _RotateRightlabel->setColor(Color3B::WHITE);
         _RotateLeftlabel->setColor(Color3B::WHITE);
         _ZoomInlabel->setColor(Color3B::GRAY);
         _ZoomOutlabel->setColor(Color3B::GRAY);
     }
-    else if(_cameraType==CameraType::ThirdPerson)
+    else if (_cameraType == CameraType::ThirdPerson)
     {
         _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D());
         _camera->lookAt(_sprite3D->getPosition3D());
-        
+
         _RotateRightlabel->setColor(Color3B::GRAY);
         _RotateLeftlabel->setColor(Color3B::GRAY);
         _ZoomInlabel->setColor(Color3B::WHITE);
@@ -268,112 +261,115 @@ void Camera3DTestDemo::SwitchViewCallback(Ref* sender, CameraType cameraType)
 void Camera3DTestDemo::onEnter()
 {
     CameraBaseTest::onEnter();
-    _sprite3D=nullptr;
-    auto s = Director::getInstance()->getWinSize();
-    auto listener = EventListenerTouchAllAtOnce::create();
+    _sprite3D                = nullptr;
+    auto s                   = Director::getInstance()->getWinSize();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(Camera3DTestDemo::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    auto layer3D=Layer::create();
-    addChild(layer3D,0);
-    _layer3D=layer3D;
-    _curState=State_None;
-    addNewSpriteWithCoords( Vec3(0,0,0),"Sprite3DTest/girl.c3b",true,0.2f,true);
+    auto layer3D = Layer::create();
+    addChild(layer3D, 0);
+    _layer3D  = layer3D;
+    _curState = State_None;
+    addNewSpriteWithCoords(Vec3(0, 0, 0), "Sprite3DTest/girl.c3b", true, 0.2f, true);
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
-    
+
     auto containerForLabel1 = Node::create();
-    _ZoomOutlabel = Label::createWithTTF(ttfConfig,"zoom out");
-    _ZoomOutlabel->setPosition(s.width-50, VisibleRect::top().y-20);
+    _ZoomOutlabel           = Label::createWithTTF(ttfConfig, "zoom out");
+    _ZoomOutlabel->setPosition(s.width - 50, VisibleRect::top().y - 20);
     containerForLabel1->addChild(_ZoomOutlabel);
     addChild(containerForLabel1, 10);
-    
+
     auto listener1 = EventListenerTouchOneByOne::create();
     listener1->setSwallowTouches(true);
-    
+
     listener1->onTouchBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesZoomOut, this);
     listener1->onTouchEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesZoomOutEnd, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, _ZoomOutlabel);
-    
+
     auto containerForLabel2 = Node::create();
-    _ZoomInlabel = Label::createWithTTF(ttfConfig,"zoom in");
-    _ZoomInlabel->setPosition(s.width-50, VisibleRect::top().y-70);
+    _ZoomInlabel            = Label::createWithTTF(ttfConfig, "zoom in");
+    _ZoomInlabel->setPosition(s.width - 50, VisibleRect::top().y - 70);
     containerForLabel2->addChild(_ZoomInlabel);
     addChild(containerForLabel2, 10);
-    
+
     auto listener2 = EventListenerTouchOneByOne::create();
     listener2->setSwallowTouches(true);
-    
+
     listener2->onTouchBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesZoomIn, this);
     listener2->onTouchEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesZoomInEnd, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener2, _ZoomInlabel);
-    
+
     auto containerForLabel3 = Node::create();
-    _RotateLeftlabel = Label::createWithTTF(ttfConfig,"rotate left");
-    _RotateLeftlabel->setPosition(s.width-50, VisibleRect::top().y-120);
+    _RotateLeftlabel        = Label::createWithTTF(ttfConfig, "rotate left");
+    _RotateLeftlabel->setPosition(s.width - 50, VisibleRect::top().y - 120);
     containerForLabel3->addChild(_RotateLeftlabel);
     addChild(containerForLabel3, 10);
-    
+
     auto listener3 = EventListenerTouchOneByOne::create();
     listener3->setSwallowTouches(true);
-    
+
     listener3->onTouchBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesRotateLeft, this);
     listener3->onTouchEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesRotateLeftEnd, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener3, _RotateLeftlabel);
-    
+
     auto containerForLabel4 = Node::create();
-    _RotateRightlabel = Label::createWithTTF(ttfConfig,"rotate right");
-    _RotateRightlabel->setPosition(s.width-50, VisibleRect::top().y-170);
+    _RotateRightlabel       = Label::createWithTTF(ttfConfig, "rotate right");
+    _RotateRightlabel->setPosition(s.width - 50, VisibleRect::top().y - 170);
     containerForLabel4->addChild(_RotateRightlabel);
     addChild(containerForLabel4, 10);
-    
+
     auto listener4 = EventListenerTouchOneByOne::create();
     listener4->setSwallowTouches(true);
-    
+
     listener4->onTouchBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesRotateRight, this);
     listener4->onTouchEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesRotateRightEnd, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener4, _RotateRightlabel);
-    
-    auto label1 = Label::createWithTTF(ttfConfig,"free ");
-    auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::Free));
-    auto label2 = Label::createWithTTF(ttfConfig,"third person");
-    auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::ThirdPerson));
-    auto label3 = Label::createWithTTF(ttfConfig,"first person");
-    auto menuItem3 = MenuItemLabel::create(label3, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::FirstPerson));
+
+    auto label1 = Label::createWithTTF(ttfConfig, "free ");
+    auto menuItem1 =
+        MenuItemLabel::create(label1, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback, this, CameraType::Free));
+    auto label2    = Label::createWithTTF(ttfConfig, "third person");
+    auto menuItem2 = MenuItemLabel::create(
+        label2, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback, this, CameraType::ThirdPerson));
+    auto label3    = Label::createWithTTF(ttfConfig, "first person");
+    auto menuItem3 = MenuItemLabel::create(
+        label3, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback, this, CameraType::FirstPerson));
     auto menu = Menu::create(menuItem1, menuItem2, menuItem3, nullptr);
-    
+
     menu->setPosition(Vec2::ZERO);
-    
-    menuItem1->setPosition(VisibleRect::left().x+100, VisibleRect::top().y-50);
-    menuItem2->setPosition(VisibleRect::left().x+100, VisibleRect::top().y -100);
-    menuItem3->setPosition(VisibleRect::left().x+100, VisibleRect::top().y -150);
+
+    menuItem1->setPosition(VisibleRect::left().x + 100, VisibleRect::top().y - 50);
+    menuItem2->setPosition(VisibleRect::left().x + 100, VisibleRect::top().y - 100);
+    menuItem3->setPosition(VisibleRect::left().x + 100, VisibleRect::top().y - 150);
     addChild(menu, 0);
     schedule(CC_SCHEDULE_SELECTOR(Camera3DTestDemo::updateCamera), 0.0f);
     if (_camera == nullptr)
     {
-        _camera=Camera::createPerspective(60, (float)s.width/s.height, 1, 1000);
+        _camera = Camera::createPerspective(60, (float)s.width / s.height, 1, 1000);
         _camera->setCameraFlag(CameraFlag::USER1);
         _layer3D->addChild(_camera);
     }
-    SwitchViewCallback(this,CameraType::ThirdPerson);
-    DrawNode3D* line =DrawNode3D::create();
-    //draw x
-    for( int j =-20; j<=20 ;j++)
+    SwitchViewCallback(this, CameraType::ThirdPerson);
+    DrawNode3D* line = DrawNode3D::create();
+    // draw x
+    for (int j = -20; j <= 20; j++)
     {
-        line->drawLine(Vec3(-100.0f, 0.0f, 5.0f*j),Vec3(100.0f,0.0f,5.0f*j),Color4F(1,0,0,1));
+        line->drawLine(Vec3(-100.0f, 0.0f, 5.0f * j), Vec3(100.0f, 0.0f, 5.0f * j), Color4F(1, 0, 0, 1));
     }
-    //draw z
-    for( int j =-20; j<=20 ;j++)
+    // draw z
+    for (int j = -20; j <= 20; j++)
     {
-        line->drawLine(Vec3(5.0f*j, 0.0f, -100.0f),Vec3(5.0f*j,0.0f,100.0f),Color4F(0,0,1,1));
+        line->drawLine(Vec3(5.0f * j, 0.0f, -100.0f), Vec3(5.0f * j, 0.0f, 100.0f), Color4F(0, 0, 1, 1));
     }
-    //draw y
-    line->drawLine(Vec3(0.0f, -50.0f, 0.0f),Vec3(0,0,0),Color4F(0,0.5,0,1));
-    line->drawLine(Vec3(0, 0, 0),Vec3(0,50.0f,0),Color4F(0,1,0,1));
+    // draw y
+    line->drawLine(Vec3(0.0f, -50.0f, 0.0f), Vec3(0, 0, 0), Color4F(0, 0.5, 0, 1));
+    line->drawLine(Vec3(0, 0, 0), Vec3(0, 50.0f, 0), Color4F(0, 1, 0, 1));
     _layer3D->addChild(line);
 
     _layer3D->setCameraMask(2);
@@ -387,191 +383,192 @@ void Camera3DTestDemo::onExit()
     }
 }
 
-void Camera3DTestDemo::addNewSpriteWithCoords(Vec3 p,std::string fileName,bool playAnimation,float scale,bool bindCamera)
+void Camera3DTestDemo::addNewSpriteWithCoords(Vec3 p,
+                                              std::string fileName,
+                                              bool playAnimation,
+                                              float scale,
+                                              bool bindCamera)
 {
     auto sprite = Sprite3D::create(fileName);
     _layer3D->addChild(sprite);
-    float globalZOrder=sprite->getGlobalZOrder();
-    sprite->setPosition3D( Vec3( p.x, p.y,p.z) );
+    float globalZOrder = sprite->getGlobalZOrder();
+    sprite->setPosition3D(Vec3(p.x, p.y, p.z));
     sprite->setGlobalZOrder(globalZOrder);
-    if(playAnimation)
+    if (playAnimation)
     {
-        auto animation = Animation3D::create(fileName,"Take 001");
+        auto animation = Animation3D::create(fileName, "Take 001");
         if (animation)
         {
             auto animate = Animate3D::create(animation);
             sprite->runAction(RepeatForever::create(animate));
         }
     }
-    if(bindCamera)
+    if (bindCamera)
     {
-        _sprite3D=sprite;
+        _sprite3D = sprite;
     }
-    sprite->setScale(scale);  
-}
-void Camera3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event  *event)
-{
+    sprite->setScale(scale);
 }
-void Camera3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Camera3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
+void Camera3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    if(touches.size()==1)
+    if (touches.size() == 1)
     {
-        auto touch = touches[0];
+        auto touch    = touches[0];
         auto location = touch->getLocation();
-        Point newPos = touch->getPreviousLocation()-location;
-        if(_cameraType==CameraType::Free || _cameraType==CameraType::FirstPerson)
+        Point newPos  = touch->getPreviousLocation() - location;
+        if (_cameraType == CameraType::Free || _cameraType == CameraType::FirstPerson)
         {
             Vec3 cameraDir;
             Vec3 cameraRightDir;
             _camera->getNodeToWorldTransform().getForwardVector(&cameraDir);
             cameraDir.normalize();
-            cameraDir.y=0;
+            cameraDir.y = 0;
             _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
             cameraRightDir.normalize();
-            cameraRightDir.y=0;
-            Vec3 cameraPos=  _camera->getPosition3D();
-            cameraPos+=cameraDir*newPos.y*0.1f;
-            cameraPos+=cameraRightDir*newPos.x*0.1f;
+            cameraRightDir.y = 0;
+            Vec3 cameraPos   = _camera->getPosition3D();
+            cameraPos += cameraDir * newPos.y * 0.1f;
+            cameraPos += cameraRightDir * newPos.x * 0.1f;
             _camera->setPosition3D(cameraPos);
-            if(_sprite3D &&  _cameraType==CameraType::FirstPerson)
+            if (_sprite3D && _cameraType == CameraType::FirstPerson)
             {
-                _sprite3D->setPosition3D(Vec3(_camera->getPositionX(),0,_camera->getPositionZ()));
-                _targetPos=_sprite3D->getPosition3D();
+                _sprite3D->setPosition3D(Vec3(_camera->getPositionX(), 0, _camera->getPositionZ()));
+                _targetPos = _sprite3D->getPosition3D();
             }
         }
     }
 }
 void Camera3DTestDemo::move3D(float elapsedTime)
 {
-    if(_sprite3D)
+    if (_sprite3D)
     {
-        Vec3 curPos=  _sprite3D->getPosition3D();
+        Vec3 curPos     = _sprite3D->getPosition3D();
         Vec3 newFaceDir = _targetPos - curPos;
-        newFaceDir.y = 0.0f;
+        newFaceDir.y    = 0.0f;
         newFaceDir.normalize();
         Vec3 offset = newFaceDir * 25.0f * elapsedTime;
-        curPos+=offset;
+        curPos += offset;
         _sprite3D->setPosition3D(curPos);
-        if(_cameraType==CameraType::ThirdPerson)
+        if (_cameraType == CameraType::ThirdPerson)
         {
-            Vec3 cameraPos= _camera->getPosition3D();
-            cameraPos.x+=offset.x;
-            cameraPos.z+=offset.z;
+            Vec3 cameraPos = _camera->getPosition3D();
+            cameraPos.x += offset.x;
+            cameraPos.z += offset.z;
             _camera->setPosition3D(cameraPos);
         }
     }
 }
 void Camera3DTestDemo::updateState(float elapsedTime)
 {
-    if(_sprite3D)
+    if (_sprite3D)
     {
-        Vec3 curPos=  _sprite3D->getPosition3D();
+        Vec3 curPos = _sprite3D->getPosition3D();
         Vec3 curFaceDir;
         _sprite3D->getNodeToWorldTransform().getForwardVector(&curFaceDir);
-        curFaceDir=-curFaceDir;
+        curFaceDir = -curFaceDir;
         curFaceDir.normalize();
         Vec3 newFaceDir = _targetPos - curPos;
-        newFaceDir.y = 0.0f;
+        newFaceDir.y    = 0.0f;
         newFaceDir.normalize();
-        float cosAngle = std::fabs(Vec3::dot(curFaceDir,newFaceDir) - 1.0f);
-        float dist = curPos.distanceSquared(_targetPos);
-        if(dist<=4.0f)
+        float cosAngle = std::fabs(Vec3::dot(curFaceDir, newFaceDir) - 1.0f);
+        float dist     = curPos.distanceSquared(_targetPos);
+        if (dist <= 4.0f)
         {
-            if(cosAngle<=0.01f)
+            if (cosAngle <= 0.01f)
                 _curState = State_Idle;
             else
                 _curState = State_Rotate;
         }
         else
         {
-            if(cosAngle>0.01f)
+            if (cosAngle > 0.01f)
                 _curState = State_Rotate | State_Move;
             else
                 _curState = State_Move;
         }
     }
 }
-void Camera3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Camera3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
-        auto touch = item;
+        auto touch    = item;
         auto location = touch->getLocationInView();
-        if(_camera)
+        if (_camera)
         {
-            if(_sprite3D && _cameraType==CameraType::ThirdPerson && _bZoomOut == false && _bZoomIn == false && _bRotateLeft == false && _bRotateRight == false)
+            if (_sprite3D && _cameraType == CameraType::ThirdPerson && _bZoomOut == false && _bZoomIn == false &&
+                _bRotateLeft == false && _bRotateRight == false)
             {
                 Vec3 nearP(location.x, location.y, -1.0f), farP(location.x, location.y, 1.0f);
-                
+
                 auto size = Director::getInstance()->getWinSize();
-                nearP = _camera->unproject(nearP);
-                farP = _camera->unproject(farP);
+                nearP     = _camera->unproject(nearP);
+                farP      = _camera->unproject(farP);
                 Vec3 dir(farP - nearP);
-                float dist=0.0f;
-                float ndd = Vec3::dot(Vec3(0,1,0),dir);
-                if(ndd == 0)
-                    dist=0.0f;
-                float ndo = Vec3::dot(Vec3(0,1,0),nearP);
-                dist= (0 - ndo) / ndd;
-                Vec3 p =   nearP + dist *  dir;
-                
-                if( p.x > 100)
+                float dist = 0.0f;
+                float ndd  = Vec3::dot(Vec3(0, 1, 0), dir);
+                if (ndd == 0)
+                    dist = 0.0f;
+                float ndo = Vec3::dot(Vec3(0, 1, 0), nearP);
+                dist      = (0 - ndo) / ndd;
+                Vec3 p    = nearP + dist * dir;
+
+                if (p.x > 100)
                     p.x = 100;
-                if( p.x < -100)
+                if (p.x < -100)
                     p.x = -100;
-                if( p.z > 100)
+                if (p.z > 100)
                     p.z = 100;
-                if( p.z < -100)
+                if (p.z < -100)
                     p.z = -100;
-                
-                _targetPos=p;
+
+                _targetPos = p;
             }
         }
     }
 }
-void onTouchesCancelled(const std::vector<Touch*>& touches, cocos2d::Event  *event)
-{
-}
+void onTouchesCancelled(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
 void Camera3DTestDemo::updateCamera(float fDelta)
 {
-    if(_sprite3D)
+    if (_sprite3D)
     {
-        if( _cameraType==CameraType::ThirdPerson)
+        if (_cameraType == CameraType::ThirdPerson)
         {
             updateState(fDelta);
-            if(isState(_curState,State_Move))
+            if (isState(_curState, State_Move))
             {
                 move3D(fDelta);
-                if(isState(_curState,State_Rotate))
+                if (isState(_curState, State_Rotate))
                 {
                     Vec3 curPos = _sprite3D->getPosition3D();
-                    
+
                     Vec3 newFaceDir = _targetPos - curPos;
-                    newFaceDir.y = 0;
+                    newFaceDir.y    = 0;
                     newFaceDir.normalize();
                     Vec3 up;
                     _sprite3D->getNodeToWorldTransform().getUpVector(&up);
                     up.normalize();
                     Vec3 right;
-                    Vec3::cross(-newFaceDir,up,&right);
+                    Vec3::cross(-newFaceDir, up, &right);
                     right.normalize();
-                    Vec3 pos = Vec3(0,0,0);
+                    Vec3 pos = Vec3(0, 0, 0);
                     Mat4 mat;
                     mat.m[0] = right.x;
                     mat.m[1] = right.y;
                     mat.m[2] = right.z;
                     mat.m[3] = 0.0f;
-                    
+
                     mat.m[4] = up.x;
                     mat.m[5] = up.y;
                     mat.m[6] = up.z;
                     mat.m[7] = 0.0f;
-                    
+
                     mat.m[8]  = newFaceDir.x;
                     mat.m[9]  = newFaceDir.y;
                     mat.m[10] = newFaceDir.z;
                     mat.m[11] = 0.0f;
-                    
+
                     mat.m[12] = pos.x;
                     mat.m[13] = pos.y;
                     mat.m[14] = pos.z;
@@ -580,24 +577,24 @@ void Camera3DTestDemo::updateCamera(float fDelta)
                 }
             }
         }
-        if(_bZoomOut == true)
+        if (_bZoomOut == true)
         {
-            if(_camera)
+            if (_camera)
             {
-                if(_cameraType == CameraType::ThirdPerson)
+                if (_cameraType == CameraType::ThirdPerson)
                 {
-                    Vec3 lookDir = _camera->getPosition3D() - _sprite3D->getPosition3D();
+                    Vec3 lookDir   = _camera->getPosition3D() - _sprite3D->getPosition3D();
                     Vec3 cameraPos = _camera->getPosition3D();
-                    if(lookDir.length() <= 300)
+                    if (lookDir.length() <= 300)
                     {
                         cameraPos += lookDir.getNormalized();
                         _camera->setPosition3D(cameraPos);
                     }
                 }
-                else if(_cameraType == CameraType::Free)
+                else if (_cameraType == CameraType::Free)
                 {
                     Vec3 cameraPos = _camera->getPosition3D();
-                    if(cameraPos.length() <= 300)
+                    if (cameraPos.length() <= 300)
                     {
                         cameraPos += cameraPos.getNormalized();
                         _camera->setPosition3D(cameraPos);
@@ -605,24 +602,24 @@ void Camera3DTestDemo::updateCamera(float fDelta)
                 }
             }
         }
-        if(_bZoomIn == true)
+        if (_bZoomIn == true)
         {
-            if(_camera)
+            if (_camera)
             {
-                if(_cameraType == CameraType::ThirdPerson)
+                if (_cameraType == CameraType::ThirdPerson)
                 {
-                    Vec3 lookDir = _camera->getPosition3D() - _sprite3D->getPosition3D();
+                    Vec3 lookDir   = _camera->getPosition3D() - _sprite3D->getPosition3D();
                     Vec3 cameraPos = _camera->getPosition3D();
-                    if(lookDir.length() >= 50)
+                    if (lookDir.length() >= 50)
                     {
                         cameraPos -= lookDir.getNormalized();
                         _camera->setPosition3D(cameraPos);
                     }
                 }
-                else if(_cameraType == CameraType::Free)
+                else if (_cameraType == CameraType::Free)
                 {
                     Vec3 cameraPos = _camera->getPosition3D();
-                    if(cameraPos.length() >= 50)
+                    if (cameraPos.length() >= 50)
                     {
                         cameraPos -= cameraPos.getNormalized();
                         _camera->setPosition3D(cameraPos);
@@ -630,21 +627,21 @@ void Camera3DTestDemo::updateCamera(float fDelta)
                 }
             }
         }
-        if(_bRotateLeft == true)
+        if (_bRotateLeft == true)
         {
-            if(_cameraType==CameraType::Free || _cameraType==CameraType::FirstPerson)
+            if (_cameraType == CameraType::Free || _cameraType == CameraType::FirstPerson)
             {
-                Vec3  rotation3D= _camera->getRotation3D();
-                rotation3D.y+= 1;
+                Vec3 rotation3D = _camera->getRotation3D();
+                rotation3D.y += 1;
                 _camera->setRotation3D(rotation3D);
             }
         }
-        if(_bRotateRight == true)
+        if (_bRotateRight == true)
         {
-            if(_cameraType==CameraType::Free || _cameraType==CameraType::FirstPerson)
+            if (_cameraType == CameraType::Free || _cameraType == CameraType::FirstPerson)
             {
-                Vec3  rotation3D= _camera->getRotation3D();
-                rotation3D.y-= 1;
+                Vec3 rotation3D = _camera->getRotation3D();
+                rotation3D.y -= 1;
                 _camera->setRotation3D(rotation3D);
             }
         }
@@ -653,11 +650,11 @@ void Camera3DTestDemo::updateCamera(float fDelta)
 bool Camera3DTestDemo::onTouchesCommon(Touch* touch, Event* event, bool* touchProperty)
 {
     auto target = static_cast<Label*>(event->getCurrentTarget());
-    
+
     Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation());
-    Size s = target->getContentSize();
-    Rect rect = Rect(0, 0, s.width, s.height);
-    
+    Size s              = target->getContentSize();
+    Rect rect           = Rect(0, 0, s.width, s.height);
+
     if (rect.containsPoint(locationInNode))
     {
         *touchProperty = true;
@@ -665,7 +662,7 @@ bool Camera3DTestDemo::onTouchesCommon(Touch* touch, Event* event, bool* touchPr
     }
     return false;
 }
-bool Camera3DTestDemo::isState(unsigned int state,unsigned int bit) const
+bool Camera3DTestDemo::isState(unsigned int state, unsigned int bit) const
 {
     return (state & bit) == bit;
 }
@@ -705,19 +702,16 @@ void Camera3DTestDemo::onTouchesRotateRightEnd(Touch* touch, Event* event)
 ////////////////////////////////////////////////////////////
 // CameraCullingDemo
 CameraCullingDemo::CameraCullingDemo()
-: _layer3D(nullptr)
-, _cameraType(CameraType::FirstPerson)
-, _cameraFirst(nullptr)
-, _cameraThird(nullptr)
-, _moveAction(nullptr)
-, _drawAABB(nullptr)
-, _drawFrustum(nullptr)
-, _row(3)
-{
-}
-CameraCullingDemo::~CameraCullingDemo()
-{
-}
+    : _layer3D(nullptr)
+    , _cameraType(CameraType::FirstPerson)
+    , _cameraFirst(nullptr)
+    , _cameraThird(nullptr)
+    , _moveAction(nullptr)
+    , _drawAABB(nullptr)
+    , _drawFrustum(nullptr)
+    , _row(3)
+{}
+CameraCullingDemo::~CameraCullingDemo() {}
 
 std::string CameraCullingDemo::title() const
 {
@@ -729,59 +723,59 @@ void CameraCullingDemo::onEnter()
     CameraBaseTest::onEnter();
 
     schedule(CC_SCHEDULE_SELECTOR(CameraCullingDemo::update), 0.0f);
-    
+
     auto s = Director::getInstance()->getWinSize();
     /*auto listener = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(Camera3DTestDemo::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);*/
-    auto layer3D=Layer::create();
-    addChild(layer3D,0);
-    _layer3D=layer3D;
-    
+    auto layer3D = Layer::create();
+    addChild(layer3D, 0);
+    _layer3D = layer3D;
+
     // switch camera
     MenuItemFont::setFontName("fonts/arial.ttf");
     MenuItemFont::setFontSize(20);
-    
-    auto menuItem1 = MenuItemFont::create("Switch Camera", CC_CALLBACK_1(CameraCullingDemo::switchViewCallback,this));
-    menuItem1->setColor(Color3B(0,200,20));
-    auto menu = Menu::create(menuItem1,NULL);
+
+    auto menuItem1 = MenuItemFont::create("Switch Camera", CC_CALLBACK_1(CameraCullingDemo::switchViewCallback, this));
+    menuItem1->setColor(Color3B(0, 200, 20));
+    auto menu = Menu::create(menuItem1, NULL);
     menu->setPosition(Vec2::ZERO);
-    menuItem1->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y -70);
+    menuItem1->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y - 70);
     addChild(menu, 1);
-    
+
     // + -
     MenuItemFont::setFontSize(40);
     auto decrease = MenuItemFont::create(" - ", CC_CALLBACK_1(CameraCullingDemo::delSpriteCallback, this));
-    decrease->setColor(Color3B(0,200,20));
+    decrease->setColor(Color3B(0, 200, 20));
     auto increase = MenuItemFont::create(" + ", CC_CALLBACK_1(CameraCullingDemo::addSpriteCallback, this));
-    increase->setColor(Color3B(0,200,20));
-    
+    increase->setColor(Color3B(0, 200, 20));
+
     menu = Menu::create(decrease, increase, nullptr);
     menu->alignItemsHorizontally();
-    menu->setPosition(Vec2(s.width - 60, VisibleRect::top().y -70));
+    menu->setPosition(Vec2(s.width - 60, VisibleRect::top().y - 70));
     addChild(menu, 1);
-    
+
     TTFConfig ttfCount("fonts/Marker Felt.ttf", 30);
-    _labelSprite3DCount = Label::createWithTTF(ttfCount,"0 sprits");
-    _labelSprite3DCount->setColor(Color3B(0,200,20));
-    _labelSprite3DCount->setPosition(Vec2(s.width/2, VisibleRect::top().y -70));
+    _labelSprite3DCount = Label::createWithTTF(ttfCount, "0 sprits");
+    _labelSprite3DCount->setColor(Color3B(0, 200, 20));
+    _labelSprite3DCount->setPosition(Vec2(s.width / 2, VisibleRect::top().y - 70));
     addChild(_labelSprite3DCount);
-    
+
     // aabb drawNode3D
     _drawAABB = DrawNode3D::create();
-    _drawAABB->setCameraMask((unsigned short) CameraFlag::USER1);
+    _drawAABB->setCameraMask((unsigned short)CameraFlag::USER1);
     addChild(_drawAABB);
-    
+
     // frustum drawNode3D
     _drawFrustum = DrawNode3D::create();
-    _drawFrustum->setCameraMask((unsigned short) CameraFlag::USER1);
+    _drawFrustum->setCameraMask((unsigned short)CameraFlag::USER1);
     addChild(_drawFrustum);
-    
+
     // set camera
     switchViewCallback(this);
-    
+
     // add sprite
     addSpriteCallback(nullptr);
 }
@@ -803,13 +797,13 @@ void CameraCullingDemo::update(float dt)
 {
     _drawAABB->clear();
 
-    if(_cameraType == CameraType::ThirdPerson)
+    if (_cameraType == CameraType::ThirdPerson)
         drawCameraFrustum();
 
     Vector<Node*>& children = _layer3D->getChildren();
     Vec3 corners[8];
 
-    for (const auto& iter: children)
+    for (const auto& iter : children)
     {
         const AABB& aabb = static_cast<Sprite3D*>(iter)->getAABB();
         if (_cameraFirst->isVisibleInFrustum(&aabb))
@@ -825,11 +819,12 @@ void CameraCullingDemo::reachEndCallBack()
     _cameraFirst->stopActionByTag(100);
     auto inverse = MoveTo::create(4.f, Vec2(-_cameraFirst->getPositionX(), 0.0f));
     inverse->retain();
-    
+
     _moveAction->release();
     _moveAction = inverse;
-    auto rot = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f));
-    auto seq = Sequence::create(rot, _moveAction, CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr);
+    auto rot    = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f));
+    auto seq    = Sequence::create(rot, _moveAction,
+                                   CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr);
     seq->setTag(100);
     _cameraFirst->runAction(seq);
 }
@@ -837,37 +832,38 @@ void CameraCullingDemo::reachEndCallBack()
 void CameraCullingDemo::switchViewCallback(Ref* sender)
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     if (_cameraFirst == nullptr)
     {
-        _cameraFirst = Camera::createPerspective(30.0f, (float)s.width/s.height, 10.0f, 200.0f);
+        _cameraFirst = Camera::createPerspective(30.0f, (float)s.width / s.height, 10.0f, 200.0f);
         _cameraFirst->setCameraFlag(CameraFlag::USER8);
-        _cameraFirst->setPosition3D(Vec3(-100.0f,0.0f,0.0f));
-        _cameraFirst->lookAt(Vec3(1000.0f,0.0f,0.0f));
+        _cameraFirst->setPosition3D(Vec3(-100.0f, 0.0f, 0.0f));
+        _cameraFirst->lookAt(Vec3(1000.0f, 0.0f, 0.0f));
         _moveAction = MoveTo::create(4.f, Vec2(-_cameraFirst->getPositionX(), 0.0f));
         _moveAction->retain();
-        auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr);
+        auto seq = Sequence::create(
+            _moveAction, CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr);
         seq->setTag(100);
         _cameraFirst->runAction(seq);
         addChild(_cameraFirst);
     }
-    
+
     if (_cameraThird == nullptr)
     {
-        _cameraThird = Camera::createPerspective(60, (float)s.width/s.height, 1, 1000);
+        _cameraThird = Camera::createPerspective(60, (float)s.width / s.height, 1, 1000);
         _cameraThird->setCameraFlag(CameraFlag::USER8);
         _cameraThird->setPosition3D(Vec3(0.0f, 130.0f, 130.0f));
-        _cameraThird->lookAt(Vec3(0,0,0));
+        _cameraThird->lookAt(Vec3(0, 0, 0));
         addChild(_cameraThird);
     }
-    
-    if(_cameraType == CameraType::FirstPerson)
+
+    if (_cameraType == CameraType::FirstPerson)
     {
         _cameraType = CameraType::ThirdPerson;
         _cameraThird->setCameraFlag(CameraFlag::USER1);
         _cameraFirst->setCameraFlag(CameraFlag::USER8);
     }
-    else if(_cameraType == CameraType::ThirdPerson)
+    else if (_cameraType == CameraType::ThirdPerson)
     {
         _cameraType = CameraType::FirstPerson;
         _cameraFirst->setCameraFlag(CameraFlag::USER1);
@@ -881,7 +877,7 @@ void CameraCullingDemo::addSpriteCallback(Ref* sender)
     _layer3D->removeAllChildren();
     _objects.clear();
     _drawAABB->clear();
-    
+
     ++_row;
     for (int x = -_row; x < _row; x++)
     {
@@ -889,28 +885,29 @@ void CameraCullingDemo::addSpriteCallback(Ref* sender)
         {
             auto sprite = Sprite3D::create("Sprite3DTest/orc.c3b");
             sprite->setPosition3D(Vec3(x * 30.0f, 0.0f, z * 30.0f));
-            sprite->setRotation3D(Vec3(0.0f,180.0f,0.0f));
+            sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
             _objects.push_back(sprite);
             _layer3D->addChild(sprite);
         }
     }
-    
+
     // set layer mask.
-    _layer3D->setCameraMask( (unsigned short) CameraFlag::USER1);
-    
+    _layer3D->setCameraMask((unsigned short)CameraFlag::USER1);
+
     // update sprite number
     char szText[16];
-    sprintf(szText,"%d sprits", static_cast<int32_t>(_layer3D->getChildrenCount()));
+    sprintf(szText, "%d sprits", static_cast<int32_t>(_layer3D->getChildrenCount()));
     _labelSprite3DCount->setString(szText);
 }
 
 void CameraCullingDemo::delSpriteCallback(Ref* sender)
 {
-    if (_row == 0) return;
-    
+    if (_row == 0)
+        return;
+
     _layer3D->removeAllChildren();
     _objects.clear();
-    
+
     --_row;
     for (int x = -_row; x < _row; x++)
     {
@@ -922,13 +919,13 @@ void CameraCullingDemo::delSpriteCallback(Ref* sender)
             _layer3D->addChild(sprite);
         }
     }
-    
+
     // set layer mask.
-    _layer3D->setCameraMask((unsigned short) CameraFlag::USER1);
-    
+    _layer3D->setCameraMask((unsigned short)CameraFlag::USER1);
+
     // update sprite number
     char szText[16];
-    sprintf(szText,"%l sprits", static_cast<int32_t>(_layer3D->getChildrenCount()));
+    sprintf(szText, "%l sprits", static_cast<int32_t>(_layer3D->getChildrenCount()));
     _labelSprite3DCount->setString(szText);
 }
 
@@ -936,47 +933,47 @@ void CameraCullingDemo::drawCameraFrustum()
 {
     _drawFrustum->clear();
     auto size = Director::getInstance()->getWinSize();
-    
+
     Color4F color(1.f, 1.f, 0.f, 1);
-    
+
     // top-left
-    Vec3 tl_0,tl_1;
-    Vec3 src(0,0,0);
+    Vec3 tl_0, tl_1;
+    Vec3 src(0, 0, 0);
     tl_0 = _cameraFirst->unproject(src);
-    src = Vec3(0,0,1);
+    src  = Vec3(0, 0, 1);
     tl_1 = _cameraFirst->unproject(src);
-    
+
     // top-right
-    Vec3 tr_0,tr_1;
-    src = Vec3(size.width,0,0);
+    Vec3 tr_0, tr_1;
+    src  = Vec3(size.width, 0, 0);
     tr_0 = _cameraFirst->unproject(src);
-    src = Vec3(size.width,0,1);
+    src  = Vec3(size.width, 0, 1);
     tr_1 = _cameraFirst->unproject(src);
-    
+
     // bottom-left
-    Vec3 bl_0,bl_1;
-    src = Vec3(0,size.height,0);
+    Vec3 bl_0, bl_1;
+    src  = Vec3(0, size.height, 0);
     bl_0 = _cameraFirst->unproject(src);
-    src = Vec3(0,size.height,1);
+    src  = Vec3(0, size.height, 1);
     bl_1 = _cameraFirst->unproject(src);
-    
+
     // bottom-right
-    Vec3 br_0,br_1;
-    src = Vec3(size.width,size.height,0);
+    Vec3 br_0, br_1;
+    src  = Vec3(size.width, size.height, 0);
     br_0 = _cameraFirst->unproject(src);
-    src = Vec3(size.width,size.height,1);
+    src  = Vec3(size.width, size.height, 1);
     br_1 = _cameraFirst->unproject(src);
-    
+
     _drawFrustum->drawLine(tl_0, tl_1, color);
     _drawFrustum->drawLine(tr_0, tr_1, color);
     _drawFrustum->drawLine(bl_0, bl_1, color);
     _drawFrustum->drawLine(br_0, br_1, color);
-    
+
     _drawFrustum->drawLine(tl_0, tr_0, color);
     _drawFrustum->drawLine(tr_0, br_0, color);
     _drawFrustum->drawLine(br_0, bl_0, color);
     _drawFrustum->drawLine(bl_0, tl_0, color);
-    
+
     _drawFrustum->drawLine(tl_1, tr_1, color);
     _drawFrustum->drawLine(tr_1, br_1, color);
     _drawFrustum->drawLine(br_1, bl_1, color);
@@ -986,23 +983,20 @@ void CameraCullingDemo::drawCameraFrustum()
 ////////////////////////////////////////////////////////////
 // CameraArcBallDemo
 CameraArcBallDemo::CameraArcBallDemo()
-: CameraBaseTest()
-, _layer3D(nullptr)
-, _cameraType(CameraType::Free)
-, _camera(nullptr)
-, _drawGrid(nullptr)
-, _radius(1.0f)
-, _distanceZ(50.0f)
-, _operate(OperateCamType::RotateCamera)
-, _center(Vec3(0,0,0))
-, _target(0)
-, _sprite3D1(nullptr)
-, _sprite3D2(nullptr)
-{
-}
-CameraArcBallDemo::~CameraArcBallDemo()
-{
-}
+    : CameraBaseTest()
+    , _layer3D(nullptr)
+    , _cameraType(CameraType::Free)
+    , _camera(nullptr)
+    , _drawGrid(nullptr)
+    , _radius(1.0f)
+    , _distanceZ(50.0f)
+    , _operate(OperateCamType::RotateCamera)
+    , _center(Vec3(0, 0, 0))
+    , _target(0)
+    , _sprite3D1(nullptr)
+    , _sprite3D2(nullptr)
+{}
+CameraArcBallDemo::~CameraArcBallDemo() {}
 
 std::string CameraArcBallDemo::title() const
 {
@@ -1014,32 +1008,34 @@ void CameraArcBallDemo::onEnter()
     CameraBaseTest::onEnter();
     _rotationQuat.set(0.0f, 0.0f, 0.0f, 1.0f);
     schedule(CC_SCHEDULE_SELECTOR(CameraArcBallDemo::update), 0.0f);
-    auto s = Director::getInstance()->getWinSize();
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto s                   = Director::getInstance()->getWinSize();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(CameraArcBallDemo::onTouchsMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     // switch camera
     MenuItemFont::setFontName("fonts/arial.ttf");
     MenuItemFont::setFontSize(20);
-    
-    auto menuItem1 = MenuItemFont::create("Switch Operation", CC_CALLBACK_1(CameraArcBallDemo::switchOperateCallback,this));
-    menuItem1->setColor(Color3B(0,200,20));
-    auto menuItem2 = MenuItemFont::create("Switch Target", CC_CALLBACK_1(CameraArcBallDemo::switchTargetCallback,this));
-    menuItem2->setColor(Color3B(0,200,20));
-    auto menu = Menu::create(menuItem1,menuItem2,NULL);
+
+    auto menuItem1 =
+        MenuItemFont::create("Switch Operation", CC_CALLBACK_1(CameraArcBallDemo::switchOperateCallback, this));
+    menuItem1->setColor(Color3B(0, 200, 20));
+    auto menuItem2 =
+        MenuItemFont::create("Switch Target", CC_CALLBACK_1(CameraArcBallDemo::switchTargetCallback, this));
+    menuItem2->setColor(Color3B(0, 200, 20));
+    auto menu = Menu::create(menuItem1, menuItem2, NULL);
     menu->setPosition(Vec2::ZERO);
-    menuItem1->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y -70);
-    menuItem2->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y -100);
+    menuItem1->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y - 70);
+    menuItem2->setPosition(VisibleRect::left().x + 80, VisibleRect::top().y - 100);
     addChild(menu, 1);
 
-    auto layer3D=Layer::create();
-    addChild(layer3D,0);
-    _layer3D=layer3D;
+    auto layer3D = Layer::create();
+    addChild(layer3D, 0);
+    _layer3D = layer3D;
 
     if (_camera == nullptr)
     {
-        _camera=Camera::createPerspective(60, (float)s.width/s.height, 1, 1000);
+        _camera = Camera::createPerspective(60, (float)s.width / s.height, 1, 1000);
         _camera->setCameraFlag(CameraFlag::USER1);
         _camera->setPosition3D(Vec3(0.0f, 10.0f, 50.0f));
         _camera->lookAt(Vec3(0, 0, 0), Vec3(0.0f, 1.0f, 0.0f));
@@ -1049,36 +1045,35 @@ void CameraArcBallDemo::onEnter()
 
     _sprite3D1 = Sprite3D::create("Sprite3DTest/orc.c3b");
     _sprite3D1->setScale(0.5);
-    _sprite3D1->setRotation3D(Vec3(0.0f,180.0f,0.0f));
-    _sprite3D1->setPosition3D(Vec3(0,0,0));
+    _sprite3D1->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
+    _sprite3D1->setPosition3D(Vec3(0, 0, 0));
     _layer3D->addChild(_sprite3D1);
 
     _sprite3D2 = Sprite3D::create("Sprite3DTest/boss.c3b");
     _sprite3D2->setScale(0.6f);
-    _sprite3D2->setRotation3D(Vec3(-90.0f,0.0f,0.0f));
-    _sprite3D2->setPosition3D(Vec3(20.0f,0.0f,0.0f));
+    _sprite3D2->setRotation3D(Vec3(-90.0f, 0.0f, 0.0f));
+    _sprite3D2->setPosition3D(Vec3(20.0f, 0.0f, 0.0f));
     _layer3D->addChild(_sprite3D2);
 
-    _drawGrid =DrawNode3D::create();
+    _drawGrid = DrawNode3D::create();
 
-    //draw x
-    for( int j =-20; j<=20 ;j++)
+    // draw x
+    for (int j = -20; j <= 20; j++)
     {
-        _drawGrid->drawLine(Vec3(-100.0f, 0, 5.0f*j),Vec3(100.0f,0,5.0f*j),Color4F(1,0,0,1));
+        _drawGrid->drawLine(Vec3(-100.0f, 0, 5.0f * j), Vec3(100.0f, 0, 5.0f * j), Color4F(1, 0, 0, 1));
     }
-    //draw z
-    for( int j =-20; j<=20 ;j++)
+    // draw z
+    for (int j = -20; j <= 20; j++)
     {
-        _drawGrid->drawLine(Vec3(5.0f*j, 0, -100.0f),Vec3(5.0f*j,0,100.0f),Color4F(0,0,1,1));
+        _drawGrid->drawLine(Vec3(5.0f * j, 0, -100.0f), Vec3(5.0f * j, 0, 100.0f), Color4F(0, 0, 1, 1));
     }
-    //draw y
-    _drawGrid->drawLine(Vec3(0, 0, 0),Vec3(0,50.0f,0),Color4F(0,1,0,1));
+    // draw y
+    _drawGrid->drawLine(Vec3(0, 0, 0), Vec3(0, 50.0f, 0), Color4F(0, 1, 0, 1));
     _layer3D->addChild(_drawGrid);
 
     _layer3D->setCameraMask(2);
 
     updateCameraTransform();
-
 }
 
 void CameraArcBallDemo::onExit()
@@ -1090,74 +1085,77 @@ void CameraArcBallDemo::onExit()
     }
 }
 
-void CameraArcBallDemo::onTouchsMoved( const std::vector<Touch*> &touchs, Event *event )
+void CameraArcBallDemo::onTouchsMoved(const std::vector<Touch*>& touchs, Event* event)
 {
     if (!touchs.empty())
     {
-        if(_operate == OperateCamType::RotateCamera)           //arc ball rotate
+        if (_operate == OperateCamType::RotateCamera)  // arc ball rotate
         {
             Size visibleSize = Director::getInstance()->getVisibleSize();
             Vec2 prelocation = touchs[0]->getPreviousLocationInView();
-            Vec2 location = touchs[0]->getLocationInView();
-            location.x = 2.0f * (location.x) / (visibleSize.width) - 1.0f;
-            location.y = 2.0f * (visibleSize.height - location.y) / (visibleSize.height) - 1.0f;
-            prelocation.x = 2.0f * (prelocation.x) / (visibleSize.width) - 1.0f;
-            prelocation.y = 2.0f * (visibleSize.height - prelocation.y) / (visibleSize.height) - 1.0f;
+            Vec2 location    = touchs[0]->getLocationInView();
+            location.x       = 2.0f * (location.x) / (visibleSize.width) - 1.0f;
+            location.y       = 2.0f * (visibleSize.height - location.y) / (visibleSize.height) - 1.0f;
+            prelocation.x    = 2.0f * (prelocation.x) / (visibleSize.width) - 1.0f;
+            prelocation.y    = 2.0f * (visibleSize.height - prelocation.y) / (visibleSize.height) - 1.0f;
 
             Vec3 axes;
             float angle;
-            calculateArcBall(axes, angle, prelocation.x, prelocation.y, location.x, location.y);    //calculate  rotation quaternion parameters
-            Quaternion quat(axes, angle);                                                           //get rotation quaternion
+            calculateArcBall(axes, angle, prelocation.x, prelocation.y, location.x,
+                             location.y);  // calculate  rotation quaternion parameters
+            Quaternion quat(axes, angle);  // get rotation quaternion
             _rotationQuat = quat * _rotationQuat;
 
-            updateCameraTransform();                                                                //update camera Transform
+            updateCameraTransform();  // update camera Transform
         }
-        else if(_operate == OperateCamType::MoveCamera)         //camera zoom 
+        else if (_operate == OperateCamType::MoveCamera)  // camera zoom
         {
             Point newPos = touchs[0]->getPreviousLocation() - touchs[0]->getLocation();
-            _distanceZ -= newPos.y*0.1f;
+            _distanceZ -= newPos.y * 0.1f;
 
             updateCameraTransform();
         }
     }
 }
 
-void CameraArcBallDemo::calculateArcBall( cocos2d::Vec3 & axis, float & angle, float p1x, float p1y, float p2x, float p2y )
+void CameraArcBallDemo::calculateArcBall(cocos2d::Vec3& axis, float& angle, float p1x, float p1y, float p2x, float p2y)
 {
     Mat4 rotation_matrix;
     Mat4::createRotation(_rotationQuat, &rotation_matrix);
 
-    Vec3 uv = rotation_matrix * Vec3(0.0f,1.0f,0.0f); //rotation y
-    Vec3 sv = rotation_matrix * Vec3(1.0f,0.0f,0.0f); //rotation x
-    Vec3 lv = rotation_matrix * Vec3(0.0f,0.0f,-1.0f);//rotation z
+    Vec3 uv = rotation_matrix * Vec3(0.0f, 1.0f, 0.0f);   // rotation y
+    Vec3 sv = rotation_matrix * Vec3(1.0f, 0.0f, 0.0f);   // rotation x
+    Vec3 lv = rotation_matrix * Vec3(0.0f, 0.0f, -1.0f);  // rotation z
 
-    Vec3 p1 = sv * p1x + uv * p1y - lv * projectToSphere(_radius, p1x, p1y); //start point screen transform to 3d
-    Vec3 p2 = sv * p2x + uv * p2y - lv * projectToSphere(_radius, p2x, p2y); //end point screen transform to 3d
+    Vec3 p1 = sv * p1x + uv * p1y - lv * projectToSphere(_radius, p1x, p1y);  // start point screen transform to 3d
+    Vec3 p2 = sv * p2x + uv * p2y - lv * projectToSphere(_radius, p2x, p2y);  // end point screen transform to 3d
 
-    Vec3::cross(p2, p1, &axis);  //calculate rotation axis
+    Vec3::cross(p2, p1, &axis);  // calculate rotation axis
     axis.normalize();
 
     float t = (p2 - p1).length() / (2.0f * _radius);
-    //clamp -1 to 1
-    if (t > 1.0) t = 1.0;
-    if (t < -1.0) t = -1.0;
-    angle = asin(t);           //rotation angle
+    // clamp -1 to 1
+    if (t > 1.0)
+        t = 1.0;
+    if (t < -1.0)
+        t = -1.0;
+    angle = asin(t);  // rotation angle
 }
 
 /* project an x,y pair onto a sphere of radius r or a
 hyperbolic sheet if we are away from the center of the sphere. */
-float CameraArcBallDemo::projectToSphere( float r, float x, float y )
+float CameraArcBallDemo::projectToSphere(float r, float x, float y)
 {
     float d, t, z;
-    d = sqrt(x*x + y*y);
-    if (d < r * 0.70710678118654752440)//inside sphere
+    d = sqrt(x * x + y * y);
+    if (d < r * 0.70710678118654752440)  // inside sphere
     {
-        z = sqrt(r*r - d*d);
-    }                         
-    else                               //on hyperbola
+        z = sqrt(r * r - d * d);
+    }
+    else  // on hyperbola
     {
         t = r / 1.41421356237309504880f;
-        z = t*t / d;
+        z = t * t / d;
     }
     return z;
 }
@@ -1174,11 +1172,11 @@ void CameraArcBallDemo::updateCameraTransform()
 
 void CameraArcBallDemo::switchOperateCallback(Ref* sender)
 {
-    if(_operate == OperateCamType::MoveCamera)
+    if (_operate == OperateCamType::MoveCamera)
     {
         _operate = OperateCamType::RotateCamera;
     }
-    else if(_operate == OperateCamType::RotateCamera)
+    else if (_operate == OperateCamType::RotateCamera)
     {
         _operate = OperateCamType::MoveCamera;
     }
@@ -1186,13 +1184,13 @@ void CameraArcBallDemo::switchOperateCallback(Ref* sender)
 
 void CameraArcBallDemo::switchTargetCallback(Ref* sender)
 {
-    if(_target == 0)
+    if (_target == 0)
     {
         _target = 1;
         _center = _sprite3D2->getPosition3D();
         updateCameraTransform();
     }
-    else if(_target == 1)
+    else if (_target == 1)
     {
         _target = 0;
         _center = _sprite3D1->getPosition3D();
@@ -1202,15 +1200,12 @@ void CameraArcBallDemo::switchTargetCallback(Ref* sender)
 
 void CameraArcBallDemo::update(float dt)
 {
-     //updateCameraTransform();
+    // updateCameraTransform();
 }
 
 ////////////////////////////////////////////////////////////
 // FogTestDemo
-FogTestDemo::FogTestDemo()
-: CameraBaseTest()
-{
-}
+FogTestDemo::FogTestDemo() : CameraBaseTest() {}
 FogTestDemo::~FogTestDemo()
 {
     CC_SAFE_RELEASE_NULL(_programState1);
@@ -1226,159 +1221,152 @@ void FogTestDemo::onEnter()
 {
     CameraBaseTest::onEnter();
     schedule(CC_SCHEDULE_SELECTOR(FogTestDemo::update), 0.0f);
-    Director::getInstance()->setClearColor(Color4F(0.5,0.5,0.5,1));
+    Director::getInstance()->setClearColor(Color4F(0.5, 0.5, 0.5, 1));
 
-    auto s = Director::getInstance()->getWinSize();
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto s                   = Director::getInstance()->getWinSize();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(FogTestDemo::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     // switch fog type
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
-    
-    auto label1 = Label::createWithTTF(ttfConfig,"Linear ");
-    auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(FogTestDemo::switchTypeCallback,this,0));
-    auto label2 = Label::createWithTTF(ttfConfig,"Exp");
-    auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(FogTestDemo::switchTypeCallback,this,1));
-    auto label3 = Label::createWithTTF(ttfConfig,"Exp2");
-    auto menuItem3 = MenuItemLabel::create(label3, CC_CALLBACK_1(FogTestDemo::switchTypeCallback,this,2));
-    auto menu = Menu::create(menuItem1, menuItem2, menuItem3, nullptr);
-    
+
+    auto label1    = Label::createWithTTF(ttfConfig, "Linear ");
+    auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(FogTestDemo::switchTypeCallback, this, 0));
+    auto label2    = Label::createWithTTF(ttfConfig, "Exp");
+    auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(FogTestDemo::switchTypeCallback, this, 1));
+    auto label3    = Label::createWithTTF(ttfConfig, "Exp2");
+    auto menuItem3 = MenuItemLabel::create(label3, CC_CALLBACK_1(FogTestDemo::switchTypeCallback, this, 2));
+    auto menu      = Menu::create(menuItem1, menuItem2, menuItem3, nullptr);
+
     menu->setPosition(Vec2::ZERO);
-    
-    menuItem1->setPosition(VisibleRect::left().x+60, VisibleRect::top().y-50);
-    menuItem2->setPosition(VisibleRect::left().x+60, VisibleRect::top().y -100);
-    menuItem3->setPosition(VisibleRect::left().x+60, VisibleRect::top().y -150);
-    addChild(menu, 0);
 
+    menuItem1->setPosition(VisibleRect::left().x + 60, VisibleRect::top().y - 50);
+    menuItem2->setPosition(VisibleRect::left().x + 60, VisibleRect::top().y - 100);
+    menuItem3->setPosition(VisibleRect::left().x + 60, VisibleRect::top().y - 150);
+    addChild(menu, 0);
 
-    auto layer3D=Layer::create();
-    addChild(layer3D,0);
-    _layer3D=layer3D;
+    auto layer3D = Layer::create();
+    addChild(layer3D, 0);
+    _layer3D = layer3D;
 
     CC_SAFE_RELEASE_NULL(_programState1);
     CC_SAFE_RELEASE_NULL(_programState2);
 
     auto vertexSource = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.vert");
-    auto fragSource = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.frag");
-    auto program = backend::Device::getInstance()->newProgram(vertexSource, fragSource);
-    _programState1 = new backend::ProgramState(program);
-    _programState2 = new backend::ProgramState(program);
+    auto fragSource   = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.frag");
+    auto program      = backend::Device::getInstance()->newProgram(vertexSource, fragSource);
+    _programState1    = new backend::ProgramState(program);
+    _programState2    = new backend::ProgramState(program);
     CC_SAFE_RELEASE(program);
-    
+
     _sprite3D1 = Sprite3D::create("Sprite3DTest/teapot.c3b");
     _sprite3D2 = Sprite3D::create("Sprite3DTest/teapot.c3b");
 
     _sprite3D1->setProgramState(_programState1);
     _sprite3D2->setProgramState(_programState2);
 
-    auto    fogColor    = Vec4(0.5, 0.5, 0.5, 1.0);
-    float   fogStart    = 10;
-    float   fogEnd      = 60;
-    int     fogEquation = 0;
+    auto fogColor   = Vec4(0.5, 0.5, 0.5, 1.0);
+    float fogStart  = 10;
+    float fogEnd    = 60;
+    int fogEquation = 0;
 
-    SET_UNIFORM("u_fogColor",    &fogColor,      sizeof(fogColor));
-    SET_UNIFORM("u_fogStart",    &fogStart,      sizeof(fogStart));
-    SET_UNIFORM("u_fogEnd",      &fogEnd,        sizeof(fogEnd));
-    SET_UNIFORM("u_fogEquation", &fogEquation,   sizeof(fogEquation));
+    SET_UNIFORM("u_fogColor", &fogColor, sizeof(fogColor));
+    SET_UNIFORM("u_fogStart", &fogStart, sizeof(fogStart));
+    SET_UNIFORM("u_fogEnd", &fogEnd, sizeof(fogEnd));
+    SET_UNIFORM("u_fogEquation", &fogEquation, sizeof(fogEquation));
 
     _layer3D->addChild(_sprite3D1);
-    _sprite3D1->setPosition3D( Vec3( 0, 0,0 ) );
+    _sprite3D1->setPosition3D(Vec3(0, 0, 0));
     _sprite3D1->setScale(2.0f);
-    _sprite3D1->setRotation3D(Vec3(-90.0f,180.0f,0.0f));
+    _sprite3D1->setRotation3D(Vec3(-90.0f, 180.0f, 0.0f));
 
     _layer3D->addChild(_sprite3D2);
-    _sprite3D2->setPosition3D( Vec3( 0.0f, 0.0f,-20.0f) );
+    _sprite3D2->setPosition3D(Vec3(0.0f, 0.0f, -20.0f));
     _sprite3D2->setScale(2.0f);
-    _sprite3D2->setRotation3D(Vec3(-90.0f,180.0f,0.0f));
+    _sprite3D2->setRotation3D(Vec3(-90.0f, 180.0f, 0.0f));
 
     if (_camera == nullptr)
     {
-        _camera=Camera::createPerspective(60, (float)s.width/s.height, 1, 1000);
+        _camera = Camera::createPerspective(60, (float)s.width / s.height, 1, 1000);
         _camera->setCameraFlag(CameraFlag::USER1);
         _camera->setPosition3D(Vec3(0.0f, 30.0f, 40.0f));
-        _camera->lookAt(Vec3(0,0,0), Vec3(0.0f, 1.0f, 0.0f));
+        _camera->lookAt(Vec3(0, 0, 0), Vec3(0.0f, 1.0f, 0.0f));
 
         _layer3D->addChild(_camera);
     }
     _layer3D->setCameraMask(2);
 
-
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED,
-                                                            [this](EventCustom*)
-                                                            {
-                                                                Director::getInstance()->setClearColor(Color4F(0.5,0.5,0.5,1));
-                                                                CC_SAFE_RELEASE_NULL(_programState1);
-                                                                CC_SAFE_RELEASE_NULL(_programState2);
-
-                                                                auto vertexSource = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.vert");
-                                                                auto fragSource = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.frag");
-                                                                auto program = backend::Device::getInstance()->newProgram(vertexSource, fragSource);
-                                                                _programState1 = new backend::ProgramState(program);
-                                                                _programState2 = new backend::ProgramState(program);
-
-                                                                _sprite3D1->setProgramState(_programState1);
-                                                                _sprite3D2->setProgramState(_programState2);
-                                                                CC_SAFE_RELEASE(program);
-                                                                
-                                                                auto    fogColor    = Vec4(0.5, 0.5, 0.5, 1.0);
-                                                                float   fogStart    = 10;
-                                                                float   fogEnd      = 60;
-                                                                int     fogEquation = 0;
-
-                                                                SET_UNIFORM("u_fogColor",    &fogColor,      sizeof(fogColor));
-                                                                SET_UNIFORM("u_fogStart",    &fogStart,      sizeof(fogStart));
-                                                                SET_UNIFORM("u_fogEnd",      &fogEnd,        sizeof(fogEnd));
-                                                                SET_UNIFORM("u_fogEquation", &fogEquation,   sizeof(fogEquation));
-                                                            }
-                                                            );
+    _backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom*) {
+        Director::getInstance()->setClearColor(Color4F(0.5, 0.5, 0.5, 1));
+        CC_SAFE_RELEASE_NULL(_programState1);
+        CC_SAFE_RELEASE_NULL(_programState2);
+
+        auto vertexSource = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.vert");
+        auto fragSource   = FileUtils::getInstance()->getStringFromFile("Sprite3DTest/fog.frag");
+        auto program      = backend::Device::getInstance()->newProgram(vertexSource, fragSource);
+        _programState1    = new backend::ProgramState(program);
+        _programState2    = new backend::ProgramState(program);
+
+        _sprite3D1->setProgramState(_programState1);
+        _sprite3D2->setProgramState(_programState2);
+        CC_SAFE_RELEASE(program);
+
+        auto fogColor   = Vec4(0.5, 0.5, 0.5, 1.0);
+        float fogStart  = 10;
+        float fogEnd    = 60;
+        int fogEquation = 0;
+
+        SET_UNIFORM("u_fogColor", &fogColor, sizeof(fogColor));
+        SET_UNIFORM("u_fogStart", &fogStart, sizeof(fogStart));
+        SET_UNIFORM("u_fogEnd", &fogEnd, sizeof(fogEnd));
+        SET_UNIFORM("u_fogEquation", &fogEquation, sizeof(fogEquation));
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, -1);
 #endif
-
 }
 
-void FogTestDemo::switchTypeCallback(Ref* sender,int type)
+void FogTestDemo::switchTypeCallback(Ref* sender, int type)
 {
-    if(type == 0)
+    if (type == 0)
     {
         auto fogColor   = Vec4(0.5, 0.5, 0.5, 1.0);
         float fogStart  = 10;
         float fogEnd    = 60;
         int fogEquation = 0;
 
-        SET_UNIFORM("u_fogColor",    &fogColor,      sizeof(fogColor));
-        SET_UNIFORM("u_fogStart",    &fogStart,      sizeof(fogStart));
-        SET_UNIFORM("u_fogEnd",      &fogEnd,        sizeof(fogEnd));
-        SET_UNIFORM("u_fogEquation", &fogEquation,   sizeof(fogEquation));
-
+        SET_UNIFORM("u_fogColor", &fogColor, sizeof(fogColor));
+        SET_UNIFORM("u_fogStart", &fogStart, sizeof(fogStart));
+        SET_UNIFORM("u_fogEnd", &fogEnd, sizeof(fogEnd));
+        SET_UNIFORM("u_fogEquation", &fogEquation, sizeof(fogEquation));
     }
-    else if(type == 1)
+    else if (type == 1)
     {
-        auto    fogColor    = Vec4(0.5, 0.5, 0.5, 1.0);
-        float   fogDensity  = 0.03f;
-        int     fogEquation = 1;
+        auto fogColor    = Vec4(0.5, 0.5, 0.5, 1.0);
+        float fogDensity = 0.03f;
+        int fogEquation  = 1;
 
-        SET_UNIFORM("u_fogColor",    &fogColor,      sizeof(fogColor));
-        SET_UNIFORM("u_fogDensity",  &fogDensity,    sizeof(fogDensity));
-        SET_UNIFORM("u_fogEquation", &fogEquation,   sizeof(fogEquation));
+        SET_UNIFORM("u_fogColor", &fogColor, sizeof(fogColor));
+        SET_UNIFORM("u_fogDensity", &fogDensity, sizeof(fogDensity));
+        SET_UNIFORM("u_fogEquation", &fogEquation, sizeof(fogEquation));
     }
-    else if(type == 2)
+    else if (type == 2)
     {
-        auto    fogColor = Vec4(0.5, 0.5, 0.5, 1.0);
-        float   fogDensity = 0.03f;
-        int     fogEquation = 2;
+        auto fogColor    = Vec4(0.5, 0.5, 0.5, 1.0);
+        float fogDensity = 0.03f;
+        int fogEquation  = 2;
 
-        SET_UNIFORM("u_fogColor",    &fogColor,      sizeof(fogColor));
-        SET_UNIFORM("u_fogDensity",  &fogDensity,    sizeof(fogDensity));
-        SET_UNIFORM("u_fogEquation", &fogEquation,   sizeof(fogEquation));
+        SET_UNIFORM("u_fogColor", &fogColor, sizeof(fogColor));
+        SET_UNIFORM("u_fogDensity", &fogDensity, sizeof(fogDensity));
+        SET_UNIFORM("u_fogEquation", &fogEquation, sizeof(fogEquation));
     }
 }
 
 void FogTestDemo::onExit()
 {
     CameraBaseTest::onExit();
-    Director::getInstance()->setClearColor(Color4F(0,0,0,1));
+    Director::getInstance()->setClearColor(Color4F(0, 0, 0, 1));
     if (_camera)
     {
         _camera = nullptr;
@@ -1389,108 +1377,102 @@ void FogTestDemo::onExit()
 #endif
 }
 
-void FogTestDemo::update(float dt)
-{
-}
+void FogTestDemo::update(float dt) {}
 
-void FogTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void FogTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    if(touches.size()==1)
+    if (touches.size() == 1)
     {
         Vec2 prelocation = touches[0]->getPreviousLocationInView();
-        Vec2 location = touches[0]->getLocationInView();
-        Vec2 newPos = prelocation - location;
-        if(_cameraType==CameraType::Free)
+        Vec2 location    = touches[0]->getLocationInView();
+        Vec2 newPos      = prelocation - location;
+        if (_cameraType == CameraType::Free)
         {
             Vec3 cameraDir;
             Vec3 cameraRightDir;
             _camera->getNodeToWorldTransform().getForwardVector(&cameraDir);
             cameraDir.normalize();
-            cameraDir.y=0;
+            cameraDir.y = 0;
             _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
             cameraRightDir.normalize();
-            cameraRightDir.y=0;
-            Vec3 cameraPos=  _camera->getPosition3D();
-            cameraPos-=cameraDir*newPos.y*0.1f;
-            cameraPos+=cameraRightDir*newPos.x*0.1f;
+            cameraRightDir.y = 0;
+            Vec3 cameraPos   = _camera->getPosition3D();
+            cameraPos -= cameraDir * newPos.y * 0.1f;
+            cameraPos += cameraRightDir * newPos.x * 0.1f;
             _camera->setPosition3D(cameraPos);
         }
     }
 }
 
-//CameraFrameBufferTest::CameraFrameBufferTest()
+// CameraFrameBufferTest::CameraFrameBufferTest()
 //{
-//    
-//}
 //
-//CameraFrameBufferTest::~CameraFrameBufferTest()
+// }
+//
+// CameraFrameBufferTest::~CameraFrameBufferTest()
 //{
-//    
-//}
 //
-//std::string CameraFrameBufferTest::title() const
+// }
+//
+// std::string CameraFrameBufferTest::title() const
 //{
-//    return "Camera FrameBuffer Object Test";
-//}
+//     return "Camera FrameBuffer Object Test";
+// }
 //
-//void CameraFrameBufferTest::onEnter()
+// void CameraFrameBufferTest::onEnter()
 //{
-//    auto sizeInpixels = Director::getInstance()->getWinSizeInPixels();
-//    auto size = Director::getInstance()->getWinSize();
-//    auto fboSize = Size(sizeInpixels.width * 1, sizeInpixels.height * 1.5);
-//    auto fbo = experimental::FrameBuffer::create(1, fboSize.width, fboSize.height);
-//    
-//    CameraBaseTest::onEnter();
-//    //auto sprite = Sprite::createWithTexture(fbo);
-//    //sprite->setPosition(Vec2(100,100));
-//    //std::string filename = "Sprite3DTest/girl.c3b";
-//    //auto sprite = Sprite3D::create(filename);
-//    //sprite->setScale(1.0);
-//    //auto animation = Animation3D::create(filename);
-//    //if (animation)
-//    //{
-//    //    auto animate = Animate3D::create(animation);
-//        
-//    //    sprite->runAction(RepeatForever::create(animate));
-//    //}
-//    //sprite->setPosition(Vec2(100,100));
-//    auto rt = experimental::RenderTarget::create(fboSize.width, fboSize.height);
-//    auto rtDS = experimental::RenderTargetDepthStencil::create(fboSize.width, fboSize.height);
-//    fbo->attachRenderTarget(rt);
-//    fbo->attachDepthStencilTarget(rtDS);
-//    auto sprite = Sprite::createWithTexture(fbo->getRenderTarget()->getTexture());
-//    sprite->setScale(0.3f);
-//    sprite->runAction(RepeatForever::create(RotateBy::create(1, 90)));
-//    sprite->setPosition(size.width/2, size.height/2);
-//    addChild(sprite);
-//    
-//    auto sprite2 = Sprite::create(s_pathGrossini);
-//    sprite2->setPosition(Vec2(size.width/5,size.height/5));
-//    addChild(sprite2);
-//    sprite2->setCameraMask((unsigned short)CameraFlag::USER1);
-//    auto move = MoveBy::create(1.0, Vec2(100,100));
-//    sprite2->runAction(
-//                       RepeatForever::create(
-//                                             Sequence::createWithTwoActions(
-//                                                                            move, move->reverse())
-//                                             )
-//                       );
-//    
-//    auto camera = Camera::create();
-//    camera->setCameraFlag(CameraFlag::USER1);
-//    camera->setDepth(-1);
-//    camera->setFrameBufferObject(fbo);
-//    fbo->setClearColor(Color4F(1,1,1,1));
-//    addChild(camera);
-//}
-
-BackgroundColorBrushTest::BackgroundColorBrushTest()
-{
-}
+//     auto sizeInpixels = Director::getInstance()->getWinSizeInPixels();
+//     auto size = Director::getInstance()->getWinSize();
+//     auto fboSize = Size(sizeInpixels.width * 1, sizeInpixels.height * 1.5);
+//     auto fbo = experimental::FrameBuffer::create(1, fboSize.width, fboSize.height);
+//
+//     CameraBaseTest::onEnter();
+//     //auto sprite = Sprite::createWithTexture(fbo);
+//     //sprite->setPosition(Vec2(100,100));
+//     //std::string filename = "Sprite3DTest/girl.c3b";
+//     //auto sprite = Sprite3D::create(filename);
+//     //sprite->setScale(1.0);
+//     //auto animation = Animation3D::create(filename);
+//     //if (animation)
+//     //{
+//     //    auto animate = Animate3D::create(animation);
+//
+//     //    sprite->runAction(RepeatForever::create(animate));
+//     //}
+//     //sprite->setPosition(Vec2(100,100));
+//     auto rt = experimental::RenderTarget::create(fboSize.width, fboSize.height);
+//     auto rtDS = experimental::RenderTargetDepthStencil::create(fboSize.width, fboSize.height);
+//     fbo->attachRenderTarget(rt);
+//     fbo->attachDepthStencilTarget(rtDS);
+//     auto sprite = Sprite::createWithTexture(fbo->getRenderTarget()->getTexture());
+//     sprite->setScale(0.3f);
+//     sprite->runAction(RepeatForever::create(RotateBy::create(1, 90)));
+//     sprite->setPosition(size.width/2, size.height/2);
+//     addChild(sprite);
+//
+//     auto sprite2 = Sprite::create(s_pathGrossini);
+//     sprite2->setPosition(Vec2(size.width/5,size.height/5));
+//     addChild(sprite2);
+//     sprite2->setCameraMask((unsigned short)CameraFlag::USER1);
+//     auto move = MoveBy::create(1.0, Vec2(100,100));
+//     sprite2->runAction(
+//                        RepeatForever::create(
+//                                              Sequence::createWithTwoActions(
+//                                                                             move, move->reverse())
+//                                              )
+//                        );
+//
+//     auto camera = Camera::create();
+//     camera->setCameraFlag(CameraFlag::USER1);
+//     camera->setDepth(-1);
+//     camera->setFrameBufferObject(fbo);
+//     fbo->setClearColor(Color4F(1,1,1,1));
+//     addChild(camera);
+// }
 
-BackgroundColorBrushTest::~BackgroundColorBrushTest()
-{
-}
+BackgroundColorBrushTest::BackgroundColorBrushTest() {}
+
+BackgroundColorBrushTest::~BackgroundColorBrushTest() {}
 
 std::string BackgroundColorBrushTest::title() const
 {
@@ -1505,18 +1487,18 @@ std::string BackgroundColorBrushTest::subtitle() const
 void BackgroundColorBrushTest::onEnter()
 {
     CameraBaseTest::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     {
         // 1st Camera
-        auto camera = Camera::createPerspective(60.0f, (float)s.width/s.height, 1.0f, 1000.0f);
+        auto camera = Camera::createPerspective(60.0f, (float)s.width / s.height, 1.0f, 1000.0f);
         camera->setPosition3D(Vec3(0.0f, 0.0f, 200.0f));
         camera->lookAt(Vec3::ZERO);
         camera->setDepth(-2);
         camera->setCameraFlag(CameraFlag::USER1);
         addChild(camera);
-        
+
         // 3D model
         auto model = Sprite3D::create("Sprite3DTest/boss1.obj");
         model->setScale(4);
@@ -1526,15 +1508,15 @@ void BackgroundColorBrushTest::onEnter()
         addChild(model);
         model->runAction(RepeatForever::create(RotateBy::create(1.f, Vec3(10.0f, 20.0f, 30.0f))));
     }
-    
+
     {
         auto base = Node::create();
         base->setContentSize(s);
         base->setCameraMask(static_cast<unsigned short>(CameraFlag::USER2));
         addChild(base);
-        
+
         // 2nd Camera
-        auto camera = Camera::createPerspective(60, (float)s.width/s.height, 1, 1000);
+        auto camera     = Camera::createPerspective(60, (float)s.width / s.height, 1, 1000);
         auto colorBrush = CameraBackgroundBrush::createColorBrush(Color4F(.1f, .1f, 1.f, .5f), 1.f);
         camera->setBackgroundBrush(colorBrush);
         camera->setPosition3D(Vec3(0.0f, 0.0f, 200.0f));
@@ -1542,19 +1524,19 @@ void BackgroundColorBrushTest::onEnter()
         camera->setDepth(-1);
         camera->setCameraFlag(CameraFlag::USER2);
         base->addChild(camera);
-        
+
         // for alpha setting
         auto slider = ui::Slider::create();
         slider->loadBarTexture("cocosui/sliderTrack.png");
         slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
         slider->loadProgressBarTexture("cocosui/sliderProgress.png");
-        slider->setPosition(Vec2(s.width/2, s.height/4));
+        slider->setPosition(Vec2(s.width / 2, s.height / 4));
         slider->setPercent(50);
-        slider->addEventListener([slider, colorBrush](Ref*, ui::Slider::EventType){
-            colorBrush->setColor(Color4F(.1f, .1f, 1.f, (float)slider->getPercent()/100.f));
+        slider->addEventListener([slider, colorBrush](Ref*, ui::Slider::EventType) {
+            colorBrush->setColor(Color4F(.1f, .1f, 1.f, (float)slider->getPercent() / 100.f));
         });
         addChild(slider);
-        
+
         // 3D model for 2nd camera
         auto model = Sprite3D::create("Sprite3DTest/boss1.obj");
         model->setScale(4);
diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
index 75b4e244dbf6..f15d82be427a 100644
--- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
+++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
@@ -33,33 +33,34 @@ THE SOFTWARE.
 
 #include <string>
 
-namespace cocos2d {
-    class Sprite3D;
-    class Delay;
-}
+namespace cocos2d
+{
+class Sprite3D;
+class Delay;
+}  // namespace cocos2d
 
 enum State
 {
-    State_None = 0,
-    State_Idle = 0x01,
-    State_Move = 0x02,
-    State_Rotate = 0x04,
-    State_Speak = 0x08,
-    State_MeleeAttack = 0x10,
+    State_None         = 0,
+    State_Idle         = 0x01,
+    State_Move         = 0x02,
+    State_Rotate       = 0x04,
+    State_Speak        = 0x08,
+    State_MeleeAttack  = 0x10,
     State_RemoteAttack = 0x20,
-    State_Attack = 0x40,
+    State_Attack       = 0x40,
 };
 enum class CameraType
 {
-    Free = 0,
+    Free        = 0,
     FirstPerson = 1,
     ThirdPerson = 2,
 };
 
 enum class OperateCamType
 {
-    MoveCamera=0,
-    RotateCamera=1,
+    MoveCamera   = 0,
+    RotateCamera = 1,
 };
 
 DEFINE_TEST_SUITE(Camera3DTests);
@@ -67,7 +68,6 @@ DEFINE_TEST_SUITE(Camera3DTests);
 class CameraBaseTest : public TestCase
 {
 public:
-    
 protected:
     cocos2d::BillBoard* bill1;
     cocos2d::BillBoard* bill2;
@@ -75,7 +75,8 @@ class CameraBaseTest : public TestCase
     cocos2d::Label* l2;
 };
 
-class CameraRotationTest : public CameraBaseTest {
+class CameraRotationTest : public CameraBaseTest
+{
 
 public:
     CREATE_FUNC(CameraRotationTest);
@@ -92,7 +93,6 @@ class CameraRotationTest : public CameraBaseTest {
     virtual std::string subtitle() const override;
 
 protected:
-
     cocos2d::Node* _camControlNode;
     cocos2d::Node* _camNode;
     cocos2d::EventListenerTouchOneByOne* _lis;
@@ -109,41 +109,46 @@ class Camera3DTestDemo : public CameraBaseTest
     virtual void onExit() override;
     // overrides
     virtual std::string title() const override;
-    void addNewSpriteWithCoords(cocos2d::Vec3 p,std::string fileName,bool playAnimation=false,float scale=1.0f,bool bindCamera=false);
-
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-
-    void scaleCameraCallback(cocos2d::Ref* sender,float value);
-    void rotateCameraCallback(cocos2d::Ref* sender,float value);
-    void SwitchViewCallback(cocos2d::Ref* sender,CameraType cameraType);
+    void addNewSpriteWithCoords(cocos2d::Vec3 p,
+                                std::string fileName,
+                                bool playAnimation = false,
+                                float scale        = 1.0f,
+                                bool bindCamera    = false);
+
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
+    void scaleCameraCallback(cocos2d::Ref* sender, float value);
+    void rotateCameraCallback(cocos2d::Ref* sender, float value);
+    void SwitchViewCallback(cocos2d::Ref* sender, CameraType cameraType);
     void updateCamera(float fDelta);
     void move3D(float elapsedTime);
     void updateState(float elapsedTime);
-    bool isState(unsigned int state,unsigned int bit) const;
+    bool isState(unsigned int state, unsigned int bit) const;
     void reachEndCallBack();
-    
+
     bool onTouchesCommon(cocos2d::Touch* touch, cocos2d::Event* event, bool* touchProperty);
     bool onTouchesZoomOut(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchesZoomOutEnd(cocos2d::Touch* touch, cocos2d::Event* event);
     bool onTouchesZoomIn(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchesZoomInEnd(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
     bool onTouchesRotateLeft(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchesRotateLeftEnd(cocos2d::Touch* touch, cocos2d::Event* event);
     bool onTouchesRotateRight(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchesRotateRightEnd(cocos2d::Touch* touch, cocos2d::Event* event);
+
 protected:
-    std::string    _title;
-    cocos2d::Layer*         _layer3D;
-    cocos2d::Sprite3D*      _sprite3D;
-    cocos2d::Vec3           _targetPos;
-    CameraType     _cameraType;
-    cocos2d::MenuItem*      _incRot;
-    cocos2d::MenuItem*      _decRot;
-    unsigned int   _curState;
-    cocos2d::Camera*      _camera;
+    std::string _title;
+    cocos2d::Layer* _layer3D;
+    cocos2d::Sprite3D* _sprite3D;
+    cocos2d::Vec3 _targetPos;
+    CameraType _cameraType;
+    cocos2d::MenuItem* _incRot;
+    cocos2d::MenuItem* _decRot;
+    unsigned int _curState;
+    cocos2d::Camera* _camera;
     cocos2d::MoveTo* _moveAction;
     bool _bZoomOut;
     bool _bZoomIn;
@@ -161,12 +166,12 @@ class CameraCullingDemo : public CameraBaseTest
     CREATE_FUNC(CameraCullingDemo);
     CameraCullingDemo();
     virtual ~CameraCullingDemo();
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
     virtual void update(float dt) override;
-    
+
     // overrides
     virtual std::string title() const override;
     void reachEndCallBack();
@@ -175,18 +180,18 @@ class CameraCullingDemo : public CameraBaseTest
     void delSpriteCallback(cocos2d::Ref* sender);
 
     void drawCameraFrustum();
-    
+
 protected:
-    cocos2d::Label*                  _labelSprite3DCount;
-    cocos2d::Layer*                  _layer3D;
-    std::vector<cocos2d::Sprite3D*>  _objects;
-    CameraType                       _cameraType;
-    cocos2d::Camera*                 _cameraFirst;
-    cocos2d::Camera*                 _cameraThird;
-    cocos2d::MoveBy*                 _moveAction;
-    cocos2d::DrawNode3D*             _drawAABB;
-    cocos2d::DrawNode3D*             _drawFrustum;
-    int                     _row;
+    cocos2d::Label* _labelSprite3DCount;
+    cocos2d::Layer* _layer3D;
+    std::vector<cocos2d::Sprite3D*> _objects;
+    CameraType _cameraType;
+    cocos2d::Camera* _cameraFirst;
+    cocos2d::Camera* _cameraThird;
+    cocos2d::MoveBy* _moveAction;
+    cocos2d::DrawNode3D* _drawAABB;
+    cocos2d::DrawNode3D* _drawFrustum;
+    int _row;
 };
 
 class CameraArcBallDemo : public CameraBaseTest
@@ -195,35 +200,40 @@ class CameraArcBallDemo : public CameraBaseTest
     CREATE_FUNC(CameraArcBallDemo);
     CameraArcBallDemo();
     virtual ~CameraArcBallDemo();
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
     virtual void update(float dt) override;
-    
+
     // overrides
     virtual std::string title() const override;
 
     void switchOperateCallback(cocos2d::Ref* sender);
     void switchTargetCallback(cocos2d::Ref* sender);
-    void onTouchsMoved(const std::vector<cocos2d::Touch*> &touchs, cocos2d::Event *event);
+    void onTouchsMoved(const std::vector<cocos2d::Touch*>& touchs, cocos2d::Event* event);
     void updateCameraTransform();
-    void calculateArcBall( cocos2d::Vec3 & axis, float & angle, float p1x, float p1y, float p2x, float p2y );//calculate  rotation quaternion parameters
-    float projectToSphere( float r, float x, float y );//points on the screen project to arc ball
+    void calculateArcBall(cocos2d::Vec3& axis,
+                          float& angle,
+                          float p1x,
+                          float p1y,
+                          float p2x,
+                          float p2y);                  // calculate  rotation quaternion parameters
+    float projectToSphere(float r, float x, float y);  // points on the screen project to arc ball
 
 protected:
-    cocos2d::Layer*                  _layer3D;
-    CameraType                       _cameraType;
-    cocos2d::Camera*                 _camera;
-    cocos2d::DrawNode3D*             _drawGrid;
-    cocos2d::Quaternion              _rotationQuat;      //rotation Quaternion
-    float                            _radius;            //arc ball radius
-    float                            _distanceZ;
-    OperateCamType                   _operate;           //switch rotate or zoom
-    cocos2d::Vec3                    _center;            //camera look target
-    int                              _target;            //switch camera look target
-    cocos2d::Sprite3D*               _sprite3D1;
-    cocos2d::Sprite3D*               _sprite3D2;
+    cocos2d::Layer* _layer3D;
+    CameraType _cameraType;
+    cocos2d::Camera* _camera;
+    cocos2d::DrawNode3D* _drawGrid;
+    cocos2d::Quaternion _rotationQuat;  // rotation Quaternion
+    float _radius;                      // arc ball radius
+    float _distanceZ;
+    OperateCamType _operate;  // switch rotate or zoom
+    cocos2d::Vec3 _center;    // camera look target
+    int _target;              // switch camera look target
+    cocos2d::Sprite3D* _sprite3D1;
+    cocos2d::Sprite3D* _sprite3D2;
 };
 
 class FogTestDemo : public CameraBaseTest
@@ -232,44 +242,44 @@ class FogTestDemo : public CameraBaseTest
     CREATE_FUNC(FogTestDemo);
     FogTestDemo();
     virtual ~FogTestDemo();
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
     virtual void update(float dt) override;
-    
+
     // overrides
     virtual std::string title() const override;
 
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
+    void switchTypeCallback(cocos2d::Ref* sender, int type);
 
-    void switchTypeCallback(cocos2d::Ref* sender,int type);
-    
 protected:
-    CameraType                      _cameraType     = CameraType::Free;
-    cocos2d::Layer*                 _layer3D        = nullptr;
-    cocos2d::Camera*                _camera         = nullptr;
-    cocos2d::Sprite3D*              _sprite3D1      = nullptr;
-    cocos2d::Sprite3D*              _sprite3D2      = nullptr;
-    cocos2d::backend::ProgramState* _programState1  = nullptr;
-    cocos2d::backend::ProgramState* _programState2  = nullptr;
+    CameraType _cameraType                         = CameraType::Free;
+    cocos2d::Layer* _layer3D                       = nullptr;
+    cocos2d::Camera* _camera                       = nullptr;
+    cocos2d::Sprite3D* _sprite3D1                  = nullptr;
+    cocos2d::Sprite3D* _sprite3D2                  = nullptr;
+    cocos2d::backend::ProgramState* _programState1 = nullptr;
+    cocos2d::backend::ProgramState* _programState2 = nullptr;
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
 };
 
-//class CameraFrameBufferTest : public CameraBaseTest
+// class CameraFrameBufferTest : public CameraBaseTest
 //{
-//public:
-//    CREATE_FUNC(CameraFrameBufferTest);
-//    CameraFrameBufferTest();
-//    virtual ~CameraFrameBufferTest();
-//    // overrides
-//    virtual std::string title() const override;
-//    
-//    virtual void onEnter() override;
-//};
+// public:
+//     CREATE_FUNC(CameraFrameBufferTest);
+//     CameraFrameBufferTest();
+//     virtual ~CameraFrameBufferTest();
+//     // overrides
+//     virtual std::string title() const override;
+//
+//     virtual void onEnter() override;
+// };
 
 class BackgroundColorBrushTest : public CameraBaseTest
 {
@@ -277,11 +287,10 @@ class BackgroundColorBrushTest : public CameraBaseTest
     CREATE_FUNC(BackgroundColorBrushTest);
     BackgroundColorBrushTest();
     virtual ~BackgroundColorBrushTest();
-    
+
     // overrides
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void onEnter() override;
 };
-
diff --git a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp
index 5e140b8fb87b..fed2238abd58 100644
--- a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp
+++ b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
  Copyright (c) 2021 @aismann; Peter Eismann, Germany; dreifrankensoft
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,32 +33,33 @@
 
 #include "ChipmunkTest.h"
 
-
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-enum {
+enum
+{
     kTagParentNode = 1,
 };
 
-enum {
+enum
+{
     Z_PHYSICS_DEBUG = 100,
 };
 
 // callback to remove Shapes from the Space
 
 ChipmunkTest::ChipmunkTest()
-{   
+{
     // enable events
 
-    auto touchListener = EventListenerTouchAllAtOnce::create();
+    auto touchListener            = EventListenerTouchAllAtOnce::create();
     touchListener->onTouchesEnded = CC_CALLBACK_2(ChipmunkTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     Device::setAccelerometerEnabled(true);
     auto accListener = EventListenerAcceleration::create(CC_CALLBACK_2(ChipmunkTest::onAcceleration, this));
     _eventDispatcher->addEventListenerWithSceneGraphPriority(accListener, this);
-    
+
     // title
     auto label = Label::createWithTTF("Multi touch the screen", "fonts/Marker Felt.ttf", 36.0f);
     label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 30);
@@ -74,16 +75,16 @@ ChipmunkTest::ChipmunkTest()
 
 #if 1
     // Use batch node. Faster
-    auto parent = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 100);
+    auto parent    = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 100);
     _spriteTexture = parent->getTexture();
 #else
     // doesn't use batch node. Slower
     _spriteTexture = Director::getInstance()->getTextureCache()->addImage("Images/grossini_dance_atlas.png");
-    auto parent = Node::create();
+    auto parent    = Node::create();
 #endif
     addChild(parent, 0, kTagParentNode);
 
-    addNewSpriteAtPosition(cocos2d::Vec2(200.0f,200.0f));
+    addNewSpriteAtPosition(cocos2d::Vec2(200.0f, 200.0f));
 
     // menu for debug layer
     MenuItemFont::setFontSize(18);
@@ -91,29 +92,28 @@ ChipmunkTest::ChipmunkTest()
 
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
-    menu->setPosition(VisibleRect::right().x-100, VisibleRect::top().y-60);
-
+    menu->setPosition(VisibleRect::right().x - 100, VisibleRect::top().y - 60);
 
     scheduleUpdate();
-    
 }
 
 void ChipmunkTest::toggleDebugCallback(Ref* sender)
 {
-    _debugLayer->setVisible(! _debugLayer->isVisible());
+    _debugLayer->setVisible(!_debugLayer->isVisible());
 }
 
 ChipmunkTest::~ChipmunkTest()
 {
     // manually Free rogue shapes
-    for( int i=0;i<4;i++) {
-        cpShapeFree( _walls[i] );
+    for (int i = 0; i < 4; i++)
+    {
+        cpShapeFree(_walls[i]);
     }
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-	cpSpaceFree(_space);
+    cpSpaceFree(_space);
 #else
-	cpHastySpaceFree(_space);
+    cpHastySpaceFree(_space);
 #endif
 
     Device::setAccelerometerEnabled(false);
@@ -123,13 +123,13 @@ void ChipmunkTest::initPhysics()
 {
 
     // init chipmunk
-    //cpInitChipmunk();
+    // cpInitChipmunk();
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-	_space = cpSpaceNew();
+    _space = cpSpaceNew();
 #else
-	_space = cpHastySpaceNew();
-	cpHastySpaceSetThreads(_space, 0);
+    _space = cpHastySpaceNew();
+    cpHastySpaceSetThreads(_space, 0);
 #endif
 
     cpSpaceSetGravity(_space, cpv(0.0f, -100.0f));
@@ -139,27 +139,27 @@ void ChipmunkTest::initPhysics()
     // We have to free them manually
     //
     // bottom
-    _walls[0] = cpSegmentShapeNew( cpSpaceGetStaticBody(_space),
-        cpv(VisibleRect::leftBottom().x,VisibleRect::leftBottom().y),
-        cpv(VisibleRect::rightBottom().x, VisibleRect::rightBottom().y), 0.0f);
+    _walls[0] =
+        cpSegmentShapeNew(cpSpaceGetStaticBody(_space), cpv(VisibleRect::leftBottom().x, VisibleRect::leftBottom().y),
+                          cpv(VisibleRect::rightBottom().x, VisibleRect::rightBottom().y), 0.0f);
 
     // top
-    _walls[1] = cpSegmentShapeNew( cpSpaceGetStaticBody(_space),
-        cpv(VisibleRect::leftTop().x, VisibleRect::leftTop().y),
-        cpv(VisibleRect::rightTop().x, VisibleRect::rightTop().y), 0.0f);
+    _walls[1] = cpSegmentShapeNew(cpSpaceGetStaticBody(_space), cpv(VisibleRect::leftTop().x, VisibleRect::leftTop().y),
+                                  cpv(VisibleRect::rightTop().x, VisibleRect::rightTop().y), 0.0f);
 
     // left
-    _walls[2] = cpSegmentShapeNew( cpSpaceGetStaticBody(_space),
-        cpv(VisibleRect::leftBottom().x,VisibleRect::leftBottom().y),
-        cpv(VisibleRect::leftTop().x,VisibleRect::leftTop().y), 0.0f);
+    _walls[2] =
+        cpSegmentShapeNew(cpSpaceGetStaticBody(_space), cpv(VisibleRect::leftBottom().x, VisibleRect::leftBottom().y),
+                          cpv(VisibleRect::leftTop().x, VisibleRect::leftTop().y), 0.0f);
 
     // right
-    _walls[3] = cpSegmentShapeNew( cpSpaceGetStaticBody(_space), 
-        cpv(VisibleRect::rightBottom().x, VisibleRect::rightBottom().y),
-        cpv(VisibleRect::rightTop().x, VisibleRect::rightTop().y), 0.0f);
+    _walls[3] =
+        cpSegmentShapeNew(cpSpaceGetStaticBody(_space), cpv(VisibleRect::rightBottom().x, VisibleRect::rightBottom().y),
+                          cpv(VisibleRect::rightTop().x, VisibleRect::rightTop().y), 0.0f);
+
+    for (int i = 0; i < 4; i++)
+    {
 
-    for( int i=0;i<4;i++) {
-        
         cpShapeSetElasticity(_walls[i], 1.0f);
         cpShapeSetFriction(_walls[i], 1.0f);
         cpSpaceAddShape(_space, _walls[i]);
@@ -168,21 +168,21 @@ void ChipmunkTest::initPhysics()
     // Physics debug layer
     _debugLayer = PhysicsDebugNodeChipmunk2D::create(_space);
     this->addChild(_debugLayer, Z_PHYSICS_DEBUG);
-
 }
 
 void ChipmunkTest::update(float delta)
 {
     // Should use a fixed size step based on the animation interval.
     int steps = 2;
-    float dt = Director::getInstance()->getAnimationInterval()/(float)steps;
+    float dt  = Director::getInstance()->getAnimationInterval() / (float)steps;
 
-    for(int i=0; i<steps; i++){
+    for (int i = 0; i < steps; i++)
+    {
 
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-		cpSpaceStep(_space, dt);
+        cpSpaceStep(_space, dt);
 #else
-		cpHastySpaceStep(_space, dt);
+        cpHastySpaceStep(_space, dt);
 #endif
     }
 }
@@ -214,16 +214,15 @@ void ChipmunkTest::addNewSpriteAtPosition(cocos2d::Vec2 pos)
     posx = (posx % 4) * 85;
     posy = (posy % 3) * 121;
 
-
-    int num = 4;
+    int num        = 4;
     cpVect verts[] = {
-        cpv(-24,-54),
+        cpv(-24, -54),
         cpv(-24, 54),
-        cpv( 24, 54),
-        cpv( 24,-54),
+        cpv(24, 54),
+        cpv(24, -54),
     };
 
-    cpBody *body = cpBodyNew(1.0f, cpMomentForPoly(1.0f, num, verts, cpvzero, 0.0f));
+    cpBody* body = cpBodyNew(1.0f, cpMomentForPoly(1.0f, num, verts, cpvzero, 0.0f));
 
     cpBodySetPosition(body, cpv(pos.x, pos.y));
     cpSpaceAddBody(_space, body);
@@ -238,7 +237,6 @@ void ChipmunkTest::addNewSpriteAtPosition(cocos2d::Vec2 pos)
 
     sprite->setCPBody(body);
     sprite->setPosition(pos);
-
 }
 
 void ChipmunkTest::onEnter()
@@ -248,30 +246,30 @@ void ChipmunkTest::onEnter()
 
 void ChipmunkTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    //Add a new body/atlas sprite at the touched location
+    // Add a new body/atlas sprite at the touched location
 
-    for( auto &touch: touches)
+    for (auto& touch : touches)
     {
         auto location = touch->getLocation();
 
-        addNewSpriteAtPosition( location );
+        addNewSpriteAtPosition(location);
     }
 }
 
 void ChipmunkTest::onAcceleration(Acceleration* acc, Event* event)
 {
-    static float prevX=0, prevY=0;
+    static float prevX = 0, prevY = 0;
 
 #define kFilterFactor 0.05f
 
-    float accelX = (float) acc->x * kFilterFactor + (1- kFilterFactor)*prevX;
-    float accelY = (float) acc->y * kFilterFactor + (1- kFilterFactor)*prevY;
+    float accelX = (float)acc->x * kFilterFactor + (1 - kFilterFactor) * prevX;
+    float accelY = (float)acc->y * kFilterFactor + (1 - kFilterFactor) * prevY;
 
     prevX = accelX;
     prevY = accelY;
 
-    auto v = cocos2d::Vec2( accelX, accelY);
-    v = v * 200;
+    auto v = cocos2d::Vec2(accelX, accelY);
+    v      = v * 200;
     cpSpaceSetGravity(_space, cpv(v.x, v.y));
 }
 
@@ -279,4 +277,3 @@ ChipmunkTests::ChipmunkTests()
 {
     ADD_TEST_CASE(ChipmunkTest);
 }
-
diff --git a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h
index b8d4bdea98df..9cc7c87ff21f 100644
--- a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h
+++ b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h
@@ -3,17 +3,17 @@
  Copyright (c) 2021 @aismann; Peter Eismann, Germany; dreifrankensoft
 
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -53,10 +53,10 @@ class ChipmunkTest : public TestCase
     virtual void onAcceleration(cocos2d::Acceleration* acc, cocos2d::Event* event);
 
 private:
-    cocos2d::Texture2D* _spriteTexture; // weak ref  
-    cocos2d::extension::PhysicsDebugNodeChipmunk2D* _debugLayer; // weak ref
+    cocos2d::Texture2D* _spriteTexture;                           // weak ref
+    cocos2d::extension::PhysicsDebugNodeChipmunk2D* _debugLayer;  // weak ref
 
-    cpSpace* _space; // strong ref
+    cpSpace* _space;  // strong ref
     cpShape* _walls[4];
 };
 
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.cpp b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.cpp
index cbab6df3ee6a..f40ab497cad1 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.cpp
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.cpp
@@ -20,7 +20,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -32,20 +31,20 @@
 
 #include "ChipmunkTestBed.h"
 
-
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-enum {
-	kTagParentNode = 1,
+enum
+{
+    kTagParentNode = 1,
 };
 
-enum {
-	Z_PHYSICS_DEBUG = 100,
+enum
+{
+    Z_PHYSICS_DEBUG = 100,
 };
 
-
-extern ChipmunkDemo Example; // Use as template for new Chipmunk2D demos
+extern ChipmunkDemo Example;  // Use as template for new Chipmunk2D demos
 extern ChipmunkDemo LogoSmash;
 extern ChipmunkDemo PyramidStack;
 extern ChipmunkDemo Plink;
@@ -73,391 +72,431 @@ extern ChipmunkDemo bench_list[];
 extern int bench_count;
 int bench = 16;
 
-
-static Vec2 cpVert2Point(const cpVect& vert) {
-	return Vec2(vert.x, vert.y) + physicsDebugNodeOffset;
+static Vec2 cpVert2Point(const cpVect& vert)
+{
+    return Vec2(vert.x, vert.y) + physicsDebugNodeOffset;
 }
 
-ChipmunkDemo demos[] = { LogoSmash, PyramidStack, Plink, Tumble, PyramidTopple, Planet, Springies, Pump, TheoJansen,
-	Query, OneWay, Joints, Tank, Chains, Crane, ContactGraph, Buoyancy, PlatformerPlayer, Slice, Convex, Unicycle,
-	Sticky, Shatter };
+ChipmunkDemo demos[] = {LogoSmash, PyramidStack, Plink,      Tumble,       PyramidTopple, Planet,
+                        Springies, Pump,         TheoJansen, Query,        OneWay,        Joints,
+                        Tank,      Chains,       Crane,      ContactGraph, Buoyancy,      PlatformerPlayer,
+                        Slice,     Convex,       Unicycle,   Sticky,       Shatter};
 
 int demo_count = sizeof(demos);
 
 cpVect ChipmunkDemoMouse;
 cpVect ChipmunkDemoKeyboard;
 cpBool ChipmunkDemoRightClick = cpFalse;
-cpBool ChipmunkDemoRightDown = cpFalse;
-cpBool ChipmunkDemoLeftDown = cpFalse;
+cpBool ChipmunkDemoRightDown  = cpFalse;
+cpBool ChipmunkDemoLeftDown   = cpFalse;
 double ChipmunkDemoTime;
 
-cpBody* mouse_body = cpBodyNewKinematic();
+cpBody* mouse_body        = cpBodyNewKinematic();
 cpConstraint* mouse_joint = NULL;
 
 char const* ChipmunkDemoMessageString = NULL;
 
 #define GRABBABLE_MASK_BIT (1 << 31)
-cpShapeFilter GRAB_FILTER = { CP_NO_GROUP, (unsigned int)GRABBABLE_MASK_BIT, (unsigned int)GRABBABLE_MASK_BIT };
-cpShapeFilter NOT_GRABBABLE_FILTER = { CP_NO_GROUP, ~GRABBABLE_MASK_BIT, ~GRABBABLE_MASK_BIT };
-
+cpShapeFilter GRAB_FILTER          = {CP_NO_GROUP, (unsigned int)GRABBABLE_MASK_BIT, (unsigned int)GRABBABLE_MASK_BIT};
+cpShapeFilter NOT_GRABBABLE_FILTER = {CP_NO_GROUP, ~GRABBABLE_MASK_BIT, ~GRABBABLE_MASK_BIT};
 
 cocos2d::DrawNode* drawCP = NULL;
 
-void ChipmunkDemoDefaultDrawImpl(cpSpace* space) {};
+void ChipmunkDemoDefaultDrawImpl(cpSpace* space){};
 
-void ChipmunkDebugDrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor fillColor) {
+void ChipmunkDebugDrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor fillColor)
+{
 
-drawCP->drawPoint(Vec2(pos.x, pos.y) + physicsDebugNodeOffset, size, Color4F(fillColor.r, fillColor.g, fillColor.b, fillColor.a));
+    drawCP->drawPoint(Vec2(pos.x, pos.y) + physicsDebugNodeOffset, size,
+                      Color4F(fillColor.r, fillColor.g, fillColor.b, fillColor.a));
 }
 
-void ChipmunkDebugDrawCircle(cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor) {
+void ChipmunkDebugDrawCircle(cpVect pos,
+                             cpFloat angle,
+                             cpFloat radius,
+                             cpSpaceDebugColor outlineColor,
+                             cpSpaceDebugColor fillColor)
+{
 
-	drawCP->drawCircle(Vec2(pos.x, pos.y) + physicsDebugNodeOffset, 100, CC_DEGREES_TO_RADIANS(90), 50, true, 1.0f,
-		2.0f, Color4F(fillColor.r, fillColor.g, fillColor.b, fillColor.a));
+    drawCP->drawCircle(Vec2(pos.x, pos.y) + physicsDebugNodeOffset, 100, CC_DEGREES_TO_RADIANS(90), 50, true, 1.0f,
+                       2.0f, Color4F(fillColor.r, fillColor.g, fillColor.b, fillColor.a));
 }
 
-void ChipmunkDebugDrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color) {
-	drawCP->drawLine(Vec2(a.x, a.y) + physicsDebugNodeOffset, Vec2(b.x, b.y) + physicsDebugNodeOffset,
-		Color4F(color.r, color.g, color.b, color.a));
+void ChipmunkDebugDrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color)
+{
+    drawCP->drawLine(Vec2(a.x, a.y) + physicsDebugNodeOffset, Vec2(b.x, b.y) + physicsDebugNodeOffset,
+                     Color4F(color.r, color.g, color.b, color.a));
 }
 
-void ChipmunkDebugDrawFatSegment(cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor) {
+void ChipmunkDebugDrawFatSegment(cpVect a,
+                                 cpVect b,
+                                 cpFloat radius,
+                                 cpSpaceDebugColor outlineColor,
+                                 cpSpaceDebugColor fillColor)
+{
 
-	drawCP->drawSegment(Vec2(a.x, a.y) + physicsDebugNodeOffset, Vec2(b.x, b.y) + physicsDebugNodeOffset, radius,
-		Color4F(outlineColor.r, outlineColor.g, outlineColor.b, outlineColor.a));
+    drawCP->drawSegment(Vec2(a.x, a.y) + physicsDebugNodeOffset, Vec2(b.x, b.y) + physicsDebugNodeOffset, radius,
+                        Color4F(outlineColor.r, outlineColor.g, outlineColor.b, outlineColor.a));
 }
 
+void ChipmunkDebugDrawPolygon(int count,
+                              const cpVect* verts,
+                              cpFloat radius,
+                              cpSpaceDebugColor outlineColor,
+                              cpSpaceDebugColor fillColor)
+{
 
-void ChipmunkDebugDrawPolygon(int count, const cpVect* verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor) {
-
-	Vec2* vec = new Vec2[count];
-	for (size_t i = 0; i < count; i++) {
-		vec[i] = cpVert2Point(verts[i]);
-	}
-	drawCP->drawPolygon(vec, count, Color4F(1.0f, 0.0f, 0.0f, 0.5f), radius, Color4F(0.0f, 0.0f, 1.0f, 1.0f));
+    Vec2* vec = new Vec2[count];
+    for (size_t i = 0; i < count; i++)
+    {
+        vec[i] = cpVert2Point(verts[i]);
+    }
+    drawCP->drawPolygon(vec, count, Color4F(1.0f, 0.0f, 0.0f, 0.5f), radius, Color4F(0.0f, 0.0f, 1.0f, 1.0f));
 
-	delete[] vec;
+    delete[] vec;
 }
 
-void ChipmunkDebugDrawBB(cpBB bb, cpSpaceDebugColor color) {
-	Vec2 verts[] = {
-		Vec2(bb.r, bb.b) + physicsDebugNodeOffset,
-		Vec2(bb.r, bb.t) + physicsDebugNodeOffset,
-		Vec2(bb.l, bb.t) + physicsDebugNodeOffset,
-		Vec2(bb.l, bb.b) + physicsDebugNodeOffset,
-	};
-	drawCP->drawPolygon(verts, sizeof(verts) / sizeof(verts[0]), Color4F(1.0f, 0.0f, 0.0f, 0.0f), 1, Color4F(0.0f, 0.0f, 1.0f, 1.0f));
+void ChipmunkDebugDrawBB(cpBB bb, cpSpaceDebugColor color)
+{
+    Vec2 verts[] = {
+        Vec2(bb.r, bb.b) + physicsDebugNodeOffset,
+        Vec2(bb.r, bb.t) + physicsDebugNodeOffset,
+        Vec2(bb.l, bb.t) + physicsDebugNodeOffset,
+        Vec2(bb.l, bb.b) + physicsDebugNodeOffset,
+    };
+    drawCP->drawPolygon(verts, sizeof(verts) / sizeof(verts[0]), Color4F(1.0f, 0.0f, 0.0f, 0.0f), 1,
+                        Color4F(0.0f, 0.0f, 1.0f, 1.0f));
 }
 
-
 cocos2d::Label* label;
 
-
-static int max_arbiters = 0;
-static int max_points = 0;
+static int max_arbiters    = 0;
+static int max_points      = 0;
 static int max_constraints = 0;
 
-void ChipmunkTestBed::DrawInfo() {
-	int arbiters = _space->arbiters->num;
-	int points = 0;
+void ChipmunkTestBed::DrawInfo()
+{
+    int arbiters = _space->arbiters->num;
+    int points   = 0;
 
-	for (int i = 0; i < arbiters; i++)
-		points += ((cpArbiter*)(_space->arbiters->arr[i]))->count;
+    for (int i = 0; i < arbiters; i++)
+        points += ((cpArbiter*)(_space->arbiters->arr[i]))->count;
 
-	int constraints = (_space->constraints->num + points) * _space->iterations;
+    int constraints = (_space->constraints->num + points) * _space->iterations;
 
-	max_arbiters = arbiters > max_arbiters ? arbiters : max_arbiters;
-	max_points = points > max_points ? points : max_points;
-	max_constraints = constraints > max_constraints ? constraints : max_constraints;
+    max_arbiters    = arbiters > max_arbiters ? arbiters : max_arbiters;
+    max_points      = points > max_points ? points : max_points;
+    max_constraints = constraints > max_constraints ? constraints : max_constraints;
 
-	char buffer[1024];
-	const char* format = "Arbiters: %d (%d) - "
-		"Contact Points: %d (%d)\n"
-		"Other Constraints: %d, Iterations: %d\n"
-		"Constraints x Iterations: %d (%d)\n"
-		"Time:% 5.2fs, KE:% 5.2e";
+    char buffer[1024];
+    const char* format =
+        "Arbiters: %d (%d) - "
+        "Contact Points: %d (%d)\n"
+        "Other Constraints: %d, Iterations: %d\n"
+        "Constraints x Iterations: %d (%d)\n"
+        "Time:% 5.2fs, KE:% 5.2e";
 
-	cpArray* bodies = _space->dynamicBodies;
-	cpFloat ke = 0.0f;
-	for (int i = 0; i < bodies->num; i++) {
-		cpBody* body = (cpBody*)bodies->arr[i];
-		if (body->m == INFINITY || body->i == INFINITY)
-			continue;
+    cpArray* bodies = _space->dynamicBodies;
+    cpFloat ke      = 0.0f;
+    for (int i = 0; i < bodies->num; i++)
+    {
+        cpBody* body = (cpBody*)bodies->arr[i];
+        if (body->m == INFINITY || body->i == INFINITY)
+            continue;
 
-		ke += body->m * cpvdot(body->v, body->v) + body->i * body->w * body->w;
-	}
+        ke += body->m * cpvdot(body->v, body->v) + body->i * body->w * body->w;
+    }
 
-	sprintf(buffer, format, arbiters, max_arbiters, points, max_points, _space->constraints->num, _space->iterations,
-		constraints, max_constraints, ChipmunkDemoTime, (ke < 1e-10f ? 0.0f : ke));
+    sprintf(buffer, format, arbiters, max_arbiters, points, max_points, _space->constraints->num, _space->iterations,
+            constraints, max_constraints, ChipmunkDemoTime, (ke < 1e-10f ? 0.0f : ke));
 
-	drawInfo->setString(buffer);
+    drawInfo->setString(buffer);
 }
 
-
 static char PrintStringBuffer[1024 * 8];
 static char* PrintStringCursor;
-void ChipmunkDemoPrintString(char const* fmt, ...) {
-	if (PrintStringCursor == NULL) {
-		return;
-	}
-
-	ChipmunkDemoMessageString = PrintStringBuffer;
-
-	va_list args;
-	va_start(args, fmt);
-	int remaining = sizeof(PrintStringBuffer) - (PrintStringCursor - PrintStringBuffer);
-	int would_write = vsnprintf(PrintStringCursor, remaining, fmt, args);
-	if (would_write > 0 && would_write < remaining) {
-		PrintStringCursor += would_write;
-	}
-	else {
-		// encoding error or overflow, prevent further use until reinitialized
-		PrintStringCursor = NULL;
-	}
-	va_end(args);
-
-	label->setString(ChipmunkDemoMessageString);
-}
-
-cpSpaceDebugColor RGBAColor(float r, float g, float b, float a) {
-	cpSpaceDebugColor color = { r, g, b, a };
-	return color;
+void ChipmunkDemoPrintString(char const* fmt, ...)
+{
+    if (PrintStringCursor == NULL)
+    {
+        return;
+    }
+
+    ChipmunkDemoMessageString = PrintStringBuffer;
+
+    va_list args;
+    va_start(args, fmt);
+    int remaining   = sizeof(PrintStringBuffer) - (PrintStringCursor - PrintStringBuffer);
+    int would_write = vsnprintf(PrintStringCursor, remaining, fmt, args);
+    if (would_write > 0 && would_write < remaining)
+    {
+        PrintStringCursor += would_write;
+    }
+    else
+    {
+        // encoding error or overflow, prevent further use until reinitialized
+        PrintStringCursor = NULL;
+    }
+    va_end(args);
+
+    label->setString(ChipmunkDemoMessageString);
+}
+
+cpSpaceDebugColor RGBAColor(float r, float g, float b, float a)
+{
+    cpSpaceDebugColor color = {r, g, b, a};
+    return color;
 };
 
-cpSpaceDebugColor LAColor(float l, float a) {
-	cpSpaceDebugColor color = { l, l, l, a };
-	return color;
+cpSpaceDebugColor LAColor(float l, float a)
+{
+    cpSpaceDebugColor color = {l, l, l, a};
+    return color;
 }
 
-
-static void ShapeFreeWrap(cpSpace* space, cpShape* shape, void* unused) {
-	cpSpaceRemoveShape(space, shape);
-	cpShapeFree(shape);
+static void ShapeFreeWrap(cpSpace* space, cpShape* shape, void* unused)
+{
+    cpSpaceRemoveShape(space, shape);
+    cpShapeFree(shape);
 }
 
-static void PostShapeFree(cpShape* shape, cpSpace* space) {
-	cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ShapeFreeWrap, shape, NULL);
+static void PostShapeFree(cpShape* shape, cpSpace* space)
+{
+    cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ShapeFreeWrap, shape, NULL);
 }
 
-static void ConstraintFreeWrap(cpSpace* space, cpConstraint* constraint, void* unused) {
-	cpSpaceRemoveConstraint(space, constraint);
-	cpConstraintFree(constraint);
+static void ConstraintFreeWrap(cpSpace* space, cpConstraint* constraint, void* unused)
+{
+    cpSpaceRemoveConstraint(space, constraint);
+    cpConstraintFree(constraint);
 }
 
-static void PostConstraintFree(cpConstraint* constraint, cpSpace* space) {
-	cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ConstraintFreeWrap, constraint, NULL);
+static void PostConstraintFree(cpConstraint* constraint, cpSpace* space)
+{
+    cpSpaceAddPostStepCallback(space, (cpPostStepFunc)ConstraintFreeWrap, constraint, NULL);
 }
 
-static void BodyFreeWrap(cpSpace* space, cpBody* body, void* unused) {
-	cpSpaceRemoveBody(space, body);
-	cpBodyFree(body);
+static void BodyFreeWrap(cpSpace* space, cpBody* body, void* unused)
+{
+    cpSpaceRemoveBody(space, body);
+    cpBodyFree(body);
 }
 
-static void PostBodyFree(cpBody* body, cpSpace* space) {
-	cpSpaceAddPostStepCallback(space, (cpPostStepFunc)BodyFreeWrap, body, NULL);
+static void PostBodyFree(cpBody* body, cpSpace* space)
+{
+    cpSpaceAddPostStepCallback(space, (cpPostStepFunc)BodyFreeWrap, body, NULL);
 }
 
 // Safe and future proof way to remove and free all objects that have been added to the space.
-void ChipmunkDemoFreeSpaceChildren(cpSpace* space) {
-	// Must remove these BEFORE freeing the body or you will access dangling pointers.
-	cpSpaceEachShape(space, (cpSpaceShapeIteratorFunc)PostShapeFree, space);
-	cpSpaceEachConstraint(space, (cpSpaceConstraintIteratorFunc)PostConstraintFree, space);
-	cpSpaceEachBody(space, (cpSpaceBodyIteratorFunc)PostBodyFree, space);
-}
-
-
-void updateMouseBody(void) {
-	cpVect new_point = cpvlerp(mouse_body->p, ChipmunkDemoMouse, 0.25f);
-	mouse_body->v = cpvmult(cpvsub(new_point, mouse_body->p), 60.0f);
-	mouse_body->p = new_point;
-}
-
-ChipmunkTestBed::ChipmunkTestBed() {
-	// halx99: since adxe init scene default camera at 'initWithXXX' function, only change design size at scene
-	// construct is ok see also: https://github.com/adxeproject/adxe/commit/581a7921554c09746616759d5a5ca6ce9d3eaa22
-	auto director = Director::getInstance();
-	auto glview = director->getOpenGLView();
-	Size designSize(960 * 0.85, 640 * 0.85);
-	glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER);
-
-	// creating a keyboard event listener
-	auto listener = EventListenerKeyboard::create();
-	listener->onKeyPressed = [](EventKeyboard::KeyCode keyCode, Event* event) {
-		if ((int)keyCode == 26) // Left
-		{
-			ChipmunkDemoKeyboard.x--;
-		}
-		if ((int)keyCode == 27) // Right
-		{
-			ChipmunkDemoKeyboard.x++;
-		}
-		if ((int)keyCode == 28) // Up
-		{
-			ChipmunkDemoKeyboard.y++;
-		}
-		if ((int)keyCode == 29) // Down
-		{
-			ChipmunkDemoKeyboard.y--;
-		}
-	};
-
-	listener->onKeyReleased = [](EventKeyboard::KeyCode keyCode, Event* event)
-	{
-		ChipmunkDemoKeyboard = { 0, 0 };
-	};
-
-	_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-
-	// creating a mouse event listener
-	_mouseListener = EventListenerMouse::create();
-	_mouseListener->onMouseMove = CC_CALLBACK_1(ChipmunkTestBed::onMouseMove, this);
-	_mouseListener->onMouseUp = CC_CALLBACK_1(ChipmunkTestBed::onMouseUp, this);
-	_mouseListener->onMouseDown = CC_CALLBACK_1(ChipmunkTestBed::onMouseDown, this);
-	_eventDispatcher->addEventListenerWithSceneGraphPriority(_mouseListener, this);
-
-	// Some info text
-	auto label1 = Label::createWithTTF("Use the mouse to grab objects.", "fonts/Marker Felt.ttf", 12.0f);
-	label1->setPosition(VisibleRect::center().x, VisibleRect::top().y - 100);
-	label1->setColor(Color3B::WHITE);
-	this->addChild(label1, 1000);
-
-	// ChipmunkDemoMessageString
-	label = Label::createWithTTF("", "fonts/Marker Felt.ttf", 12.0f);
-	label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 130);
-	label->setColor(Color3B::MAGENTA);
-	this->addChild(label, 1000);
-
-	drawInfo = Label::createWithTTF("Use the mouse to grab objects.", "fonts/Marker Felt.ttf", 12.0f);
-	drawInfo->setAnchorPoint(Vec2(0, 0));
-	drawInfo->setPosition(VisibleRect::left().x + 10, VisibleRect::top().y - 60);
-	drawInfo->setColor(Color3B::WHITE);
-	this->addChild(drawInfo, 1000);
-
-
-	draw = DrawNode::create();
-	addChild(draw, 100);
-
-	drawCP = draw;
-
-	scheduleUpdate();
-}
-
-
-ChipmunkTestBed::~ChipmunkTestBed()
+void ChipmunkDemoFreeSpaceChildren(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(_space);
-	_eventDispatcher->removeEventListener(_mouseListener);
+    // Must remove these BEFORE freeing the body or you will access dangling pointers.
+    cpSpaceEachShape(space, (cpSpaceShapeIteratorFunc)PostShapeFree, space);
+    cpSpaceEachConstraint(space, (cpSpaceConstraintIteratorFunc)PostConstraintFree, space);
+    cpSpaceEachBody(space, (cpSpaceBodyIteratorFunc)PostBodyFree, space);
 }
 
-
-void ChipmunkTestBed::initPhysics() {
-	if (ChipmunkDemoMessageString) {
-		label->setString(ChipmunkDemoMessageString);
-	}
-	else {
-		label->setString("");
-	}
-	drawCP->clear();
-	// Physics debug layer
-	_debugLayer = PhysicsDebugNodeChipmunk2D::create(_space);
-	this->addChild(_debugLayer, Z_PHYSICS_DEBUG);
+void updateMouseBody(void)
+{
+    cpVect new_point = cpvlerp(mouse_body->p, ChipmunkDemoMouse, 0.25f);
+    mouse_body->v    = cpvmult(cpvsub(new_point, mouse_body->p), 60.0f);
+    mouse_body->p    = new_point;
 }
 
-void ChipmunkTestBed::update(float delta) {
-	//#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-	//    cpSpaceStep(_space, delta);
-	//#else
-	//    cpHastySpaceStep(_space, delta);
-	//#endif
+ChipmunkTestBed::ChipmunkTestBed()
+{
+    // halx99: since adxe init scene default camera at 'initWithXXX' function, only change design size at scene
+    // construct is ok see also: https://github.com/adxeproject/adxe/commit/581a7921554c09746616759d5a5ca6ce9d3eaa22
+    auto director = Director::getInstance();
+    auto glview   = director->getOpenGLView();
+    Size designSize(960 * 0.85, 640 * 0.85);
+    glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER);
+
+    // creating a keyboard event listener
+    auto listener          = EventListenerKeyboard::create();
+    listener->onKeyPressed = [](EventKeyboard::KeyCode keyCode, Event* event) {
+        if ((int)keyCode == 26)  // Left
+        {
+            ChipmunkDemoKeyboard.x--;
+        }
+        if ((int)keyCode == 27)  // Right
+        {
+            ChipmunkDemoKeyboard.x++;
+        }
+        if ((int)keyCode == 28)  // Up
+        {
+            ChipmunkDemoKeyboard.y++;
+        }
+        if ((int)keyCode == 29)  // Down
+        {
+            ChipmunkDemoKeyboard.y--;
+        }
+    };
+
+    listener->onKeyReleased = [](EventKeyboard::KeyCode keyCode, Event* event) { ChipmunkDemoKeyboard = {0, 0}; };
+
+    _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
+
+    // creating a mouse event listener
+    _mouseListener              = EventListenerMouse::create();
+    _mouseListener->onMouseMove = CC_CALLBACK_1(ChipmunkTestBed::onMouseMove, this);
+    _mouseListener->onMouseUp   = CC_CALLBACK_1(ChipmunkTestBed::onMouseUp, this);
+    _mouseListener->onMouseDown = CC_CALLBACK_1(ChipmunkTestBed::onMouseDown, this);
+    _eventDispatcher->addEventListenerWithSceneGraphPriority(_mouseListener, this);
+
+    // Some info text
+    auto label1 = Label::createWithTTF("Use the mouse to grab objects.", "fonts/Marker Felt.ttf", 12.0f);
+    label1->setPosition(VisibleRect::center().x, VisibleRect::top().y - 100);
+    label1->setColor(Color3B::WHITE);
+    this->addChild(label1, 1000);
+
+    // ChipmunkDemoMessageString
+    label = Label::createWithTTF("", "fonts/Marker Felt.ttf", 12.0f);
+    label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 130);
+    label->setColor(Color3B::MAGENTA);
+    this->addChild(label, 1000);
+
+    drawInfo = Label::createWithTTF("Use the mouse to grab objects.", "fonts/Marker Felt.ttf", 12.0f);
+    drawInfo->setAnchorPoint(Vec2(0, 0));
+    drawInfo->setPosition(VisibleRect::left().x + 10, VisibleRect::top().y - 60);
+    drawInfo->setColor(Color3B::WHITE);
+    this->addChild(drawInfo, 1000);
+
+    draw = DrawNode::create();
+    addChild(draw, 100);
+
+    drawCP = draw;
+
+    scheduleUpdate();
 }
 
-void ChipmunkTestBed::createResetButton() {
-	auto reset = MenuItemImage::create("Images/r1.png", "Images/r2.png", CC_CALLBACK_1(ChipmunkTestBed::reset, this));
-	auto menu = Menu::create(reset, nullptr);
-	menu->setPosition(VisibleRect::center().x, VisibleRect::bottom().y);
-	this->addChild(menu, -1);
+ChipmunkTestBed::~ChipmunkTestBed()
+{
+    ChipmunkDemoFreeSpaceChildren(_space);
+    _eventDispatcher->removeEventListener(_mouseListener);
 }
 
-void ChipmunkTestBed::reset(Ref* sender) {
-	ChipmunkDemoFreeSpaceChildren(_space);
-	getTestSuite()->restartCurrTest();
+void ChipmunkTestBed::initPhysics()
+{
+    if (ChipmunkDemoMessageString)
+    {
+        label->setString(ChipmunkDemoMessageString);
+    }
+    else
+    {
+        label->setString("");
+    }
+    drawCP->clear();
+    // Physics debug layer
+    _debugLayer = PhysicsDebugNodeChipmunk2D::create(_space);
+    this->addChild(_debugLayer, Z_PHYSICS_DEBUG);
+}
+
+void ChipmunkTestBed::update(float delta)
+{
+    //#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+    //    cpSpaceStep(_space, delta);
+    //#else
+    //    cpHastySpaceStep(_space, delta);
+    //#endif
 }
 
-void ChipmunkTestBed::onEnter() {
-	TestCase::onEnter();
-	physicsDebugNodeOffset = VisibleRect::center();
-	physicsDebugNodeOffset.y += 20;
-	ChipmunkDemoMessageString = "";
-	label->setString("");
+void ChipmunkTestBed::createResetButton()
+{
+    auto reset = MenuItemImage::create("Images/r1.png", "Images/r2.png", CC_CALLBACK_1(ChipmunkTestBed::reset, this));
+    auto menu  = Menu::create(reset, nullptr);
+    menu->setPosition(VisibleRect::center().x, VisibleRect::bottom().y);
+    this->addChild(menu, -1);
 }
 
-
-void ChipmunkTestBed::onMouseDown(Event* event) {
-	EventMouse* e = (EventMouse*)event;
-
-	if ((int)e->getMouseButton() == 0) {
-		ChipmunkDemoLeftDown = cpTrue;
-		// give the mouse click a little radius to make it easier to click small shapes.
-		cpFloat radius = 5.0;
-
-		cpPointQueryInfo info = { 0 };
-		cpShape* shape = cpSpacePointQueryNearest(_space, ChipmunkDemoMouse, radius, GRAB_FILTER, &info);
-
-		if (shape && cpBodyGetMass(cpShapeGetBody(shape)) < INFINITY) {
-			// Use the closest point on the surface if the click is outside of the shape.
-			cpVect nearest = (info.distance > 0.0f ? info.point : ChipmunkDemoMouse);
-
-			cpBody* body = cpShapeGetBody(shape);
-			mouse_joint = cpPivotJointNew2(mouse_body, body, cpvzero, cpBodyWorldToLocal(body, nearest));
-			mouse_joint->maxForce = 50000.0f;
-			mouse_joint->errorBias = cpfpow(1.0f - 0.15f, 60.0f);
-			cpSpaceAddConstraint(_space, mouse_joint);
-		}
-	}
-	else if ((int)e->getMouseButton() == 1) {
-		if (mouse_joint) {
-			cpSpaceRemoveConstraint(_space, mouse_joint);
-			cpConstraintFree(mouse_joint);
-			mouse_joint = NULL;
-		}
-		ChipmunkDemoRightDown = cpTrue;
-		ChipmunkDemoRightClick = cpTrue;
-	}
+void ChipmunkTestBed::reset(Ref* sender)
+{
+    ChipmunkDemoFreeSpaceChildren(_space);
+    getTestSuite()->restartCurrTest();
 }
 
-void ChipmunkTestBed::onMouseUp(Event* event) {
-	EventMouse* e = (EventMouse*)event;
-	mousePresses = false;
-	if (mouse_joint) {
-		cpSpaceRemoveConstraint(_space, mouse_joint);
-		cpConstraintFree(mouse_joint);
-		mouse_joint = NULL;
-	}
-	ChipmunkDemoLeftDown = cpFalse;
-	ChipmunkDemoRightDown = cpFalse;
-	ChipmunkDemoRightClick = cpFalse;
+void ChipmunkTestBed::onEnter()
+{
+    TestCase::onEnter();
+    physicsDebugNodeOffset = VisibleRect::center();
+    physicsDebugNodeOffset.y += 20;
+    ChipmunkDemoMessageString = "";
+    label->setString("");
 }
 
-void ChipmunkTestBed::onMouseMove(Event* event) {
-	EventMouse* e = (EventMouse*)event;
+void ChipmunkTestBed::onMouseDown(Event* event)
+{
+    EventMouse* e = (EventMouse*)event;
+
+    if ((int)e->getMouseButton() == 0)
+    {
+        ChipmunkDemoLeftDown = cpTrue;
+        // give the mouse click a little radius to make it easier to click small shapes.
+        cpFloat radius = 5.0;
+
+        cpPointQueryInfo info = {0};
+        cpShape* shape        = cpSpacePointQueryNearest(_space, ChipmunkDemoMouse, radius, GRAB_FILTER, &info);
+
+        if (shape && cpBodyGetMass(cpShapeGetBody(shape)) < INFINITY)
+        {
+            // Use the closest point on the surface if the click is outside of the shape.
+            cpVect nearest = (info.distance > 0.0f ? info.point : ChipmunkDemoMouse);
+
+            cpBody* body           = cpShapeGetBody(shape);
+            mouse_joint            = cpPivotJointNew2(mouse_body, body, cpvzero, cpBodyWorldToLocal(body, nearest));
+            mouse_joint->maxForce  = 50000.0f;
+            mouse_joint->errorBias = cpfpow(1.0f - 0.15f, 60.0f);
+            cpSpaceAddConstraint(_space, mouse_joint);
+        }
+    }
+    else if ((int)e->getMouseButton() == 1)
+    {
+        if (mouse_joint)
+        {
+            cpSpaceRemoveConstraint(_space, mouse_joint);
+            cpConstraintFree(mouse_joint);
+            mouse_joint = NULL;
+        }
+        ChipmunkDemoRightDown  = cpTrue;
+        ChipmunkDemoRightClick = cpTrue;
+    }
+}
+
+void ChipmunkTestBed::onMouseUp(Event* event)
+{
+    EventMouse* e = (EventMouse*)event;
+    mousePresses  = false;
+    if (mouse_joint)
+    {
+        cpSpaceRemoveConstraint(_space, mouse_joint);
+        cpConstraintFree(mouse_joint);
+        mouse_joint = NULL;
+    }
+    ChipmunkDemoLeftDown   = cpFalse;
+    ChipmunkDemoRightDown  = cpFalse;
+    ChipmunkDemoRightClick = cpFalse;
+}
+
+void ChipmunkTestBed::onMouseMove(Event* event)
+{
+    EventMouse* e = (EventMouse*)event;
 
-	ChipmunkDemoMouse.x = e->getCursorX() - physicsDebugNodeOffset.x;
-	ChipmunkDemoMouse.y = e->getCursorY() - physicsDebugNodeOffset.y;
+    ChipmunkDemoMouse.x = e->getCursorX() - physicsDebugNodeOffset.x;
+    ChipmunkDemoMouse.y = e->getCursorY() - physicsDebugNodeOffset.y;
 
-	cpBodySetPosition(mouse_body, ChipmunkDemoMouse);
+    cpBodySetPosition(mouse_body, ChipmunkDemoMouse);
 }
 
+void ChipmunkTestBed::updateInit(ChipmunkDemo tt)
+{
+    PrintStringBuffer[0] = 0;
+    PrintStringCursor    = PrintStringBuffer;
 
-void ChipmunkTestBed::updateInit(ChipmunkDemo tt) {
-	PrintStringBuffer[0] = 0;
-	PrintStringCursor = PrintStringBuffer;
-
-
-	drawCP->clear();
-	updateMouseBody();
-	ChipmunkDemoTime += tt.timestep;
-	ChipmunkTestBed::DrawInfo();
-	tt.updateFunc(_space, tt.timestep);
+    drawCP->clear();
+    updateMouseBody();
+    ChipmunkDemoTime += tt.timestep;
+    ChipmunkTestBed::DrawInfo();
+    tt.updateFunc(_space, tt.timestep);
 }
 
 //------------------------------------------------------------------
@@ -465,22 +504,26 @@ void ChipmunkTestBed::updateInit(ChipmunkDemo tt) {
 // LogoSmashDemo
 //
 //------------------------------------------------------------------
-void LogoSmashDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
-	initPhysics();
+void LogoSmashDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
+    initPhysics();
 }
 
-std::string LogoSmashDemo::title() const {
-	return LogoSmash.name;
+std::string LogoSmashDemo::title() const
+{
+    return LogoSmash.name;
 }
 
-void LogoSmashDemo::initPhysics() {
-	_space = LogoSmash.initFunc();
-	ChipmunkTestBed::initPhysics();
+void LogoSmashDemo::initPhysics()
+{
+    _space = LogoSmash.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void LogoSmashDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(LogoSmash);
+void LogoSmashDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(LogoSmash);
 }
 
 //------------------------------------------------------------------
@@ -488,23 +531,27 @@ void LogoSmashDemo::update(float delta) {
 // PlinkDemo
 //
 //------------------------------------------------------------------
-void PlinkDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void PlinkDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string PlinkDemo::title() const {
-	return Plink.name;
+std::string PlinkDemo::title() const
+{
+    return Plink.name;
 }
 
-void PlinkDemo::initPhysics() {
-	_space = Plink.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PlinkDemo::initPhysics()
+{
+    _space = Plink.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PlinkDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Plink);
+void PlinkDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Plink);
 }
 
 //------------------------------------------------------------------
@@ -512,22 +559,26 @@ void PlinkDemo::update(float delta) {
 // TumbleDemo
 //
 //------------------------------------------------------------------
-void TumbleDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
-	initPhysics();
+void TumbleDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
+    initPhysics();
 }
 
-std::string TumbleDemo::title() const {
-	return Tumble.name;
+std::string TumbleDemo::title() const
+{
+    return Tumble.name;
 }
 
-void TumbleDemo::initPhysics() {
-	_space = Tumble.initFunc();
-	ChipmunkTestBed::initPhysics();
+void TumbleDemo::initPhysics()
+{
+    _space = Tumble.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void TumbleDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Tumble);
+void TumbleDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Tumble);
 }
 
 //------------------------------------------------------------------
@@ -535,71 +586,81 @@ void TumbleDemo::update(float delta) {
 // PyramidStackDemo
 //
 //------------------------------------------------------------------
-void PyramidStackDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
-	initPhysics();
+void PyramidStackDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
+    initPhysics();
 }
 
-std::string PyramidStackDemo::title() const {
-	return PyramidStack.name;
+std::string PyramidStackDemo::title() const
+{
+    return PyramidStack.name;
 }
 
-void PyramidStackDemo::initPhysics() {
-	_space = PyramidStack.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PyramidStackDemo::initPhysics()
+{
+    _space = PyramidStack.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PyramidStackDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(PyramidStack);
+void PyramidStackDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(PyramidStack);
 }
 
-
 //------------------------------------------------------------------
 //
 // PyramidToppleDemo
 //
 //------------------------------------------------------------------
-void PyramidToppleDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
-	initPhysics();
+void PyramidToppleDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
+    initPhysics();
 }
 
-std::string PyramidToppleDemo::title() const {
-	return PyramidTopple.name;
+std::string PyramidToppleDemo::title() const
+{
+    return PyramidTopple.name;
 }
 
-void PyramidToppleDemo::initPhysics() {
-	_space = PyramidTopple.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PyramidToppleDemo::initPhysics()
+{
+    _space = PyramidTopple.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PyramidToppleDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(PyramidTopple);
+void PyramidToppleDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(PyramidTopple);
 }
 
-
 //------------------------------------------------------------------
 //
 // ChainDemo
 //
 //------------------------------------------------------------------
-void ChainsDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void ChainsDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string ChainsDemo::title() const {
-	return Chains.name;
+std::string ChainsDemo::title() const
+{
+    return Chains.name;
 }
 
-void ChainsDemo::initPhysics() {
-	_space = Chains.initFunc();
-	ChipmunkTestBed::initPhysics();
+void ChainsDemo::initPhysics()
+{
+    _space = Chains.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void ChainsDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Chains);
+void ChainsDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Chains);
 }
 
 //------------------------------------------------------------------
@@ -607,23 +668,27 @@ void ChainsDemo::update(float delta) {
 // OneWayDemo
 //
 //------------------------------------------------------------------
-void OneWayDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void OneWayDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string OneWayDemo::title() const {
-	return OneWay.name;
+std::string OneWayDemo::title() const
+{
+    return OneWay.name;
 }
 
-void OneWayDemo::initPhysics() {
-	_space = OneWay.initFunc();
-	ChipmunkTestBed::initPhysics();
+void OneWayDemo::initPhysics()
+{
+    _space = OneWay.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void OneWayDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(OneWay);
+void OneWayDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(OneWay);
 }
 
 //------------------------------------------------------------------
@@ -631,23 +696,27 @@ void OneWayDemo::update(float delta) {
 // PlanetDemo
 //
 //------------------------------------------------------------------
-void PlanetDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void PlanetDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string PlanetDemo::title() const {
-	return Planet.name;
+std::string PlanetDemo::title() const
+{
+    return Planet.name;
 }
 
-void PlanetDemo::initPhysics() {
-	_space = Planet.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PlanetDemo::initPhysics()
+{
+    _space = Planet.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PlanetDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Planet);
+void PlanetDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Planet);
 }
 
 //------------------------------------------------------------------
@@ -655,153 +724,170 @@ void PlanetDemo::update(float delta) {
 // TheoJansenDemo
 //
 //------------------------------------------------------------------
-void TheoJansenDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void TheoJansenDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string TheoJansenDemo::title() const {
-	return TheoJansen.name;
+std::string TheoJansenDemo::title() const
+{
+    return TheoJansen.name;
 }
 
-void TheoJansenDemo::initPhysics() {
-	_space = TheoJansen.initFunc();
-	ChipmunkTestBed::initPhysics();
+void TheoJansenDemo::initPhysics()
+{
+    _space = TheoJansen.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void TheoJansenDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(TheoJansen);
+void TheoJansenDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(TheoJansen);
 }
 
-
 //------------------------------------------------------------------
 //
 // TankDemo
 //
 //------------------------------------------------------------------
-void TankDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void TankDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string TankDemo::title() const {
-	return Tank.name;
+std::string TankDemo::title() const
+{
+    return Tank.name;
 }
 
-void TankDemo::initPhysics() {
-	_space = Tank.initFunc();
-	ChipmunkTestBed::initPhysics();
+void TankDemo::initPhysics()
+{
+    _space = Tank.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void TankDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Tank);
+void TankDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Tank);
 }
 
-
 //------------------------------------------------------------------
 //
 // BenchDemo
 //
 //------------------------------------------------------------------
-void BenchDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void BenchDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png", [&](Ref* sender) {
-		bench = (bench > 0) ? bench - 1 : (bench_count - 1);
-		reset(sender);
-		});
+    auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png", [&](Ref* sender) {
+        bench = (bench > 0) ? bench - 1 : (bench_count - 1);
+        reset(sender);
+    });
 
-	auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png", [&](Ref* sender) {
-		bench = (bench < (bench_count - 1)) ? bench + 1 : 0;
-		reset(sender);
-		});
+    auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png", [&](Ref* sender) {
+        bench = (bench < (bench_count - 1)) ? bench + 1 : 0;
+        reset(sender);
+    });
 
-	auto s = Director::getInstance()->getWinSize();
+    auto s = Director::getInstance()->getWinSize();
 
-	auto menuPrev = Menu::create(itemPrev, nullptr);
-	menuPrev->alignItemsHorizontally();
-	menuPrev->setScale(0.4);
-	menuPrev->setAnchorPoint(Vec2(0.0f, 0.0f));
-	menuPrev->setPosition(Vec2(s.width / 2 - 45, 23.0f));
-	addChild(menuPrev);
+    auto menuPrev = Menu::create(itemPrev, nullptr);
+    menuPrev->alignItemsHorizontally();
+    menuPrev->setScale(0.4);
+    menuPrev->setAnchorPoint(Vec2(0.0f, 0.0f));
+    menuPrev->setPosition(Vec2(s.width / 2 - 45, 23.0f));
+    addChild(menuPrev);
 
-	auto menuNext = Menu::create(itemNext, nullptr);
-	menuNext->alignItemsHorizontally();
-	menuNext->setScale(0.4);
-	menuNext->setAnchorPoint(Vec2(0.0f, 0.0f));
-	menuNext->setPosition(Vec2(s.width / 2 + 45, 23.0f));
-	addChild(menuNext);
+    auto menuNext = Menu::create(itemNext, nullptr);
+    menuNext->alignItemsHorizontally();
+    menuNext->setScale(0.4);
+    menuNext->setAnchorPoint(Vec2(0.0f, 0.0f));
+    menuNext->setPosition(Vec2(s.width / 2 + 45, 23.0f));
+    addChild(menuNext);
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string BenchDemo::title() const {
-	return "Bench";
+std::string BenchDemo::title() const
+{
+    return "Bench";
 }
 
-std::string BenchDemo::subtitle() const {
-	std::string s = std::to_string(bench+1) + ". " + bench_list[bench].name;
-	return s.c_str();
+std::string BenchDemo::subtitle() const
+{
+    std::string s = std::to_string(bench + 1) + ". " + bench_list[bench].name;
+    return s.c_str();
 }
 
-void BenchDemo::initPhysics() {
-	_space = bench_list[bench].initFunc();
-	ChipmunkTestBed::initPhysics();
+void BenchDemo::initPhysics()
+{
+    _space = bench_list[bench].initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void BenchDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(bench_list[bench]);
+void BenchDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(bench_list[bench]);
 }
 
-
 //------------------------------------------------------------------
 //
 // SpringiesDemo
 //
 //------------------------------------------------------------------
-void SpringiesDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void SpringiesDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string SpringiesDemo::title() const {
-	return Springies.name;
+std::string SpringiesDemo::title() const
+{
+    return Springies.name;
 }
 
-void SpringiesDemo::initPhysics() {
-	_space = Springies.initFunc();
-	ChipmunkTestBed::initPhysics();
+void SpringiesDemo::initPhysics()
+{
+    _space = Springies.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void SpringiesDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Springies);
+void SpringiesDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Springies);
 }
 
-
 //------------------------------------------------------------------
 //
 // ShatterDemo
 //
 //------------------------------------------------------------------
-void ShatterDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
-	initPhysics();
+void ShatterDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
+    initPhysics();
 }
 
-std::string ShatterDemo::title() const {
-	return Shatter.name;
+std::string ShatterDemo::title() const
+{
+    return Shatter.name;
 }
 
-void ShatterDemo::initPhysics() {
-	_space = Shatter.initFunc();
-	ChipmunkTestBed::initPhysics();
+void ShatterDemo::initPhysics()
+{
+    _space = Shatter.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void ShatterDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Shatter);
+void ShatterDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Shatter);
 }
 
 //------------------------------------------------------------------
@@ -809,23 +895,27 @@ void ShatterDemo::update(float delta) {
 // StickyDemo
 //
 //------------------------------------------------------------------
-void StickyDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void StickyDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string StickyDemo::title() const {
-	return Sticky.name;
+std::string StickyDemo::title() const
+{
+    return Sticky.name;
 }
 
-void StickyDemo::initPhysics() {
-	_space = Sticky.initFunc();
-	ChipmunkTestBed::initPhysics();
+void StickyDemo::initPhysics()
+{
+    _space = Sticky.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void StickyDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Sticky);
+void StickyDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Sticky);
 }
 
 //------------------------------------------------------------------
@@ -833,23 +923,27 @@ void StickyDemo::update(float delta) {
 // CraneDemo
 //
 //------------------------------------------------------------------
-void CraneDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void CraneDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string CraneDemo::title() const {
-	return Crane.name;
+std::string CraneDemo::title() const
+{
+    return Crane.name;
 }
 
-void CraneDemo::initPhysics() {
-	_space = Crane.initFunc();
-	ChipmunkTestBed::initPhysics();
+void CraneDemo::initPhysics()
+{
+    _space = Crane.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void CraneDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Crane);
+void CraneDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Crane);
 }
 
 //------------------------------------------------------------------
@@ -857,23 +951,27 @@ void CraneDemo::update(float delta) {
 // JointsDemo
 //
 //------------------------------------------------------------------
-void JointsDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void JointsDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string JointsDemo::title() const {
-	return Joints.name;
+std::string JointsDemo::title() const
+{
+    return Joints.name;
 }
 
-void JointsDemo::initPhysics() {
-	_space = Joints.initFunc();
-	ChipmunkTestBed::initPhysics();
+void JointsDemo::initPhysics()
+{
+    _space = Joints.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void JointsDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Joints);
+void JointsDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Joints);
 }
 
 //------------------------------------------------------------------
@@ -881,23 +979,27 @@ void JointsDemo::update(float delta) {
 // ConvexDemo
 //
 //------------------------------------------------------------------
-void ConvexDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void ConvexDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string ConvexDemo::title() const {
-	return Convex.name;
+std::string ConvexDemo::title() const
+{
+    return Convex.name;
 }
 
-void ConvexDemo::initPhysics() {
-	_space = Convex.initFunc();
-	ChipmunkTestBed::initPhysics();
+void ConvexDemo::initPhysics()
+{
+    _space = Convex.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void ConvexDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Convex);
+void ConvexDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Convex);
 }
 
 //------------------------------------------------------------------
@@ -905,23 +1007,27 @@ void ConvexDemo::update(float delta) {
 // PumpDemo
 //
 //------------------------------------------------------------------
-void PumpDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void PumpDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string PumpDemo::title() const {
-	return Pump.name;
+std::string PumpDemo::title() const
+{
+    return Pump.name;
 }
 
-void PumpDemo::initPhysics() {
-	_space = Pump.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PumpDemo::initPhysics()
+{
+    _space = Pump.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PumpDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Pump);
+void PumpDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Pump);
 }
 
 //------------------------------------------------------------------
@@ -929,23 +1035,27 @@ void PumpDemo::update(float delta) {
 // PlatformerPlayerDemo
 //
 //------------------------------------------------------------------
-void PlatformerPlayerDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void PlatformerPlayerDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string PlatformerPlayerDemo::title() const {
-	return PlatformerPlayer.name;
+std::string PlatformerPlayerDemo::title() const
+{
+    return PlatformerPlayer.name;
 }
 
-void PlatformerPlayerDemo::initPhysics() {
-	_space = PlatformerPlayer.initFunc();
-	ChipmunkTestBed::initPhysics();
+void PlatformerPlayerDemo::initPhysics()
+{
+    _space = PlatformerPlayer.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void PlatformerPlayerDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(PlatformerPlayer);
+void PlatformerPlayerDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(PlatformerPlayer);
 }
 
 //------------------------------------------------------------------
@@ -953,23 +1063,27 @@ void PlatformerPlayerDemo::update(float delta) {
 // QueryDemo
 //
 //------------------------------------------------------------------
-void QueryDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void QueryDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string QueryDemo::title() const {
-	return Query.name;
+std::string QueryDemo::title() const
+{
+    return Query.name;
 }
 
-void QueryDemo::initPhysics() {
-	_space = Query.initFunc();
-	ChipmunkTestBed::initPhysics();
+void QueryDemo::initPhysics()
+{
+    _space = Query.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void QueryDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Query);
+void QueryDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Query);
 }
 
 //------------------------------------------------------------------
@@ -977,23 +1091,27 @@ void QueryDemo::update(float delta) {
 // ContactGraphDemo
 //
 //------------------------------------------------------------------
-void ContactGraphDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void ContactGraphDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string ContactGraphDemo::title() const {
-	return ContactGraph.name;
+std::string ContactGraphDemo::title() const
+{
+    return ContactGraph.name;
 }
 
-void ContactGraphDemo::initPhysics() {
-	_space = ContactGraph.initFunc();
-	ChipmunkTestBed::initPhysics();
+void ContactGraphDemo::initPhysics()
+{
+    _space = ContactGraph.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void ContactGraphDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(ContactGraph);
+void ContactGraphDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(ContactGraph);
 }
 
 //------------------------------------------------------------------
@@ -1001,23 +1119,27 @@ void ContactGraphDemo::update(float delta) {
 // BuoyancyDemo
 //
 //------------------------------------------------------------------
-void BuoyancyDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void BuoyancyDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string BuoyancyDemo::title() const {
-	return Buoyancy.name;
+std::string BuoyancyDemo::title() const
+{
+    return Buoyancy.name;
 }
 
-void BuoyancyDemo::initPhysics() {
-	_space = Buoyancy.initFunc();
-	ChipmunkTestBed::initPhysics();
+void BuoyancyDemo::initPhysics()
+{
+    _space = Buoyancy.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void BuoyancyDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Buoyancy);
+void BuoyancyDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Buoyancy);
 }
 
 //------------------------------------------------------------------
@@ -1025,23 +1147,27 @@ void BuoyancyDemo::update(float delta) {
 // SliceDemo
 //
 //------------------------------------------------------------------
-void SliceDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void SliceDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string SliceDemo::title() const {
-	return Slice.name;
+std::string SliceDemo::title() const
+{
+    return Slice.name;
 }
 
-void SliceDemo::initPhysics() {
-	_space = Slice.initFunc();
-	ChipmunkTestBed::initPhysics();
+void SliceDemo::initPhysics()
+{
+    _space = Slice.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void SliceDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Slice);
+void SliceDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Slice);
 }
 
 //------------------------------------------------------------------
@@ -1049,82 +1175,88 @@ void SliceDemo::update(float delta) {
 // UnicycleDemo
 //
 //------------------------------------------------------------------
-void UnicycleDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void UnicycleDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string UnicycleDemo::title() const {
-	return Unicycle.name;
+std::string UnicycleDemo::title() const
+{
+    return Unicycle.name;
 }
 
-void UnicycleDemo::initPhysics() {
-	_space = Unicycle.initFunc();
-	ChipmunkTestBed::initPhysics();
+void UnicycleDemo::initPhysics()
+{
+    _space = Unicycle.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void UnicycleDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Unicycle);
+void UnicycleDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Unicycle);
 }
 
-
 //------------------------------------------------------------------
 //
 // ExampleDemo
 //
 //------------------------------------------------------------------
-void ExampleDemo::onEnter() {
-	ChipmunkTestBed::onEnter();
+void ExampleDemo::onEnter()
+{
+    ChipmunkTestBed::onEnter();
 
-	initPhysics();
+    initPhysics();
 }
 
-std::string ExampleDemo::title() const {
-	return Example.name;
+std::string ExampleDemo::title() const
+{
+    return Example.name;
 }
 
-void ExampleDemo::initPhysics() {
-	_space = Example.initFunc();
-	ChipmunkTestBed::initPhysics();
+void ExampleDemo::initPhysics()
+{
+    _space = Example.initFunc();
+    ChipmunkTestBed::initPhysics();
 }
 
-void ExampleDemo::update(float delta) {
-	ChipmunkTestBed::updateInit(Example);
+void ExampleDemo::update(float delta)
+{
+    ChipmunkTestBed::updateInit(Example);
 }
 
-
-ChipmunkTestBedTests::ChipmunkTestBedTests() {
-	ADD_TEST_CASE(BenchDemo);
-	ADD_TEST_CASE(LogoSmashDemo);
-	ADD_TEST_CASE(PlinkDemo);
-	ADD_TEST_CASE(TumbleDemo);
-	ADD_TEST_CASE(PyramidToppleDemo);
-	ADD_TEST_CASE(PyramidStackDemo);
-	ADD_TEST_CASE(ChainsDemo);
-	ADD_TEST_CASE(OneWayDemo);
-	ADD_TEST_CASE(PlanetDemo);
-	ADD_TEST_CASE(TheoJansenDemo);
-	ADD_TEST_CASE(TankDemo);
-
-	ADD_TEST_CASE(SpringiesDemo);
-
-	ADD_TEST_CASE(ShatterDemo);
-	ADD_TEST_CASE(StickyDemo);
-	ADD_TEST_CASE(CraneDemo);
-	ADD_TEST_CASE(JointsDemo);
-
-	ADD_TEST_CASE(ConvexDemo);
-
-	ADD_TEST_CASE(PumpDemo);
-	ADD_TEST_CASE(PlatformerPlayerDemo);
-
-	ADD_TEST_CASE(QueryDemo);
-	ADD_TEST_CASE(ContactGraphDemo);
-	ADD_TEST_CASE(BuoyancyDemo);
-	ADD_TEST_CASE(SliceDemo);
-	ADD_TEST_CASE(UnicycleDemo);
-
-	ADD_TEST_CASE(ExampleDemo); //  the template for your one examples/Demos
+ChipmunkTestBedTests::ChipmunkTestBedTests()
+{
+    ADD_TEST_CASE(BenchDemo);
+    ADD_TEST_CASE(LogoSmashDemo);
+    ADD_TEST_CASE(PlinkDemo);
+    ADD_TEST_CASE(TumbleDemo);
+    ADD_TEST_CASE(PyramidToppleDemo);
+    ADD_TEST_CASE(PyramidStackDemo);
+    ADD_TEST_CASE(ChainsDemo);
+    ADD_TEST_CASE(OneWayDemo);
+    ADD_TEST_CASE(PlanetDemo);
+    ADD_TEST_CASE(TheoJansenDemo);
+    ADD_TEST_CASE(TankDemo);
+
+    ADD_TEST_CASE(SpringiesDemo);
+
+    ADD_TEST_CASE(ShatterDemo);
+    ADD_TEST_CASE(StickyDemo);
+    ADD_TEST_CASE(CraneDemo);
+    ADD_TEST_CASE(JointsDemo);
+
+    ADD_TEST_CASE(ConvexDemo);
+
+    ADD_TEST_CASE(PumpDemo);
+    ADD_TEST_CASE(PlatformerPlayerDemo);
+
+    ADD_TEST_CASE(QueryDemo);
+    ADD_TEST_CASE(ContactGraphDemo);
+    ADD_TEST_CASE(BuoyancyDemo);
+    ADD_TEST_CASE(SliceDemo);
+    ADD_TEST_CASE(UnicycleDemo);
+
+    ADD_TEST_CASE(ExampleDemo);  //  the template for your one examples/Demos
 }
-
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h
index 2cce89d31b40..c080f5711084 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h
@@ -20,9 +20,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
- //
- // cocos2d
- //
+//
+// cocos2d
+//
 #ifndef __CHIPMUNKTESTBED_H__
 #define __CHIPMUNKTESTBED_H__
 
@@ -33,290 +33,312 @@
 
 #include "demo/ChipmunkDemo.h"
 
-class ChipmunkTestBed : public TestCase {
+class ChipmunkTestBed : public TestCase
+{
 public:
-	CREATE_FUNC(ChipmunkTestBed);
+    CREATE_FUNC(ChipmunkTestBed);
 
-	ChipmunkTestBed();
-	~ChipmunkTestBed();
+    ChipmunkTestBed();
+    ~ChipmunkTestBed();
 
-	void onEnter() override;
-	void createResetButton();
-	void reset(cocos2d::Ref* sender);
+    void onEnter() override;
+    void createResetButton();
+    void reset(cocos2d::Ref* sender);
 
-	void update(float dt) override;
-	virtual void initPhysics();
+    void update(float dt) override;
+    virtual void initPhysics();
 
-	void onMouseDown(cocos2d::Event* event);
-	void onMouseUp(cocos2d::Event* event);
-	void onMouseMove(cocos2d::Event* event);
-	void DrawInfo();
-	void updateInit(ChipmunkDemo tt);
+    void onMouseDown(cocos2d::Event* event);
+    void onMouseUp(cocos2d::Event* event);
+    void onMouseMove(cocos2d::Event* event);
+    void DrawInfo();
+    void updateInit(ChipmunkDemo tt);
 
-	cpSpace* _space; // strong ref
-	cocos2d::extension::PhysicsDebugNodeChipmunk2D* _debugLayer; // weak ref
-	int keyPresses;
-	bool mousePresses = false;
+    cpSpace* _space;                                              // strong ref
+    cocos2d::extension::PhysicsDebugNodeChipmunk2D* _debugLayer;  // weak ref
+    int keyPresses;
+    bool mousePresses = false;
 
 private:
-	cocos2d::EventListenerMouse* _mouseListener;
-	cocos2d::Node* _trackNode;
-	cocos2d::DrawNode* draw;
-	cocos2d::Label* drawInfo;
-
+    cocos2d::EventListenerMouse* _mouseListener;
+    cocos2d::Node* _trackNode;
+    cocos2d::DrawNode* draw;
+    cocos2d::Label* drawInfo;
 };
 
-class LogoSmashDemo : public ChipmunkTestBed {
+class LogoSmashDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(LogoSmashDemo);
-	std::string title() const override;
-	void onEnter() override;
+    CREATE_FUNC(LogoSmashDemo);
+    std::string title() const override;
+    void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PlinkDemo : public ChipmunkTestBed {
+class PlinkDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PlinkDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    CREATE_FUNC(PlinkDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-
-class TumbleDemo : public ChipmunkTestBed {
+class TumbleDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(TumbleDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(TumbleDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PyramidStackDemo : public ChipmunkTestBed {
+class PyramidStackDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PyramidStackDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(PyramidStackDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PyramidToppleDemo : public ChipmunkTestBed {
+class PyramidToppleDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PyramidToppleDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(PyramidToppleDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class ChainsDemo : public ChipmunkTestBed {
+class ChainsDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(ChainsDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(ChainsDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class OneWayDemo : public ChipmunkTestBed {
+class OneWayDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(OneWayDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(OneWayDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PlanetDemo : public ChipmunkTestBed {
+class PlanetDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PlanetDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(PlanetDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class TheoJansenDemo : public ChipmunkTestBed {
+class TheoJansenDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(TheoJansenDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(TheoJansenDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class TankDemo : public ChipmunkTestBed {
+class TankDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(TankDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(TankDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class BenchDemo : public ChipmunkTestBed {
+class BenchDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(BenchDemo);
-	virtual std::string title() const override;
-	virtual std::string subtitle() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(BenchDemo);
+    virtual std::string title() const override;
+    virtual std::string subtitle() const override;
+    virtual void onEnter() override;
 
-
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class SpringiesDemo : public ChipmunkTestBed {
+class SpringiesDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(SpringiesDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(SpringiesDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class StickyDemo : public ChipmunkTestBed {
+class StickyDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(StickyDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(StickyDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class ShatterDemo : public ChipmunkTestBed {
+class ShatterDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(ShatterDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(ShatterDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class CraneDemo : public ChipmunkTestBed {
+class CraneDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(CraneDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(CraneDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class JointsDemo : public ChipmunkTestBed {
+class JointsDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(JointsDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(JointsDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class ConvexDemo : public ChipmunkTestBed {
+class ConvexDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(ConvexDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(ConvexDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PumpDemo : public ChipmunkTestBed {
+class PumpDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PumpDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(PumpDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class PlatformerPlayerDemo : public ChipmunkTestBed {
+class PlatformerPlayerDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(PlatformerPlayerDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(PlatformerPlayerDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class QueryDemo : public ChipmunkTestBed {
+class QueryDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(QueryDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(QueryDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-
-class ContactGraphDemo : public ChipmunkTestBed {
+class ContactGraphDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(ContactGraphDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(ContactGraphDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class BuoyancyDemo : public ChipmunkTestBed {
+class BuoyancyDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(BuoyancyDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(BuoyancyDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class SliceDemo : public ChipmunkTestBed {
+class SliceDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(SliceDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(SliceDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class UnicycleDemo : public ChipmunkTestBed {
+class UnicycleDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(UnicycleDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(UnicycleDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 
-class ExampleDemo : public ChipmunkTestBed {
+class ExampleDemo : public ChipmunkTestBed
+{
 public:
-	CREATE_FUNC(ExampleDemo);
-	virtual std::string title() const override;
-	virtual void onEnter() override;
+    CREATE_FUNC(ExampleDemo);
+    virtual std::string title() const override;
+    virtual void onEnter() override;
 
-	void initPhysics() override;
-	virtual void update(float dt) override;
+    void initPhysics() override;
+    virtual void update(float dt) override;
 };
 DEFINE_TEST_SUITE(ChipmunkTestBedTests);
 
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Bench.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Bench.c
index d99c0216da5c..d85a8d6fe1f4 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Bench.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Bench.c
@@ -4,485 +4,611 @@
 
 #define ENABLE_HASTY 0
 #if ENABLE_HASTY
-	#include "chipmunk/cpHastySpace.h"
-	
-	static cpSpace *MakeHastySpace(){
-		cpSpace *space = cpHastySpaceNew();
-		cpHastySpaceSetThreads(space, 0);
-		return space;
-	}
-	
-	#define BENCH_SPACE_NEW MakeHastySpace
-	#define BENCH_SPACE_FREE cpHastySpaceFree
-	#define BENCH_SPACE_STEP cpHastySpaceStep
+#    include "chipmunk/cpHastySpace.h"
+
+static cpSpace* MakeHastySpace()
+{
+    cpSpace* space = cpHastySpaceNew();
+    cpHastySpaceSetThreads(space, 0);
+    return space;
+}
+
+#    define BENCH_SPACE_NEW MakeHastySpace
+#    define BENCH_SPACE_FREE cpHastySpaceFree
+#    define BENCH_SPACE_STEP cpHastySpaceStep
 #else
-	#define BENCH_SPACE_NEW cpSpaceNew
-	#define BENCH_SPACE_FREE cpSpaceFree
-	#define BENCH_SPACE_STEP cpSpaceStep
+#    define BENCH_SPACE_NEW cpSpaceNew
+#    define BENCH_SPACE_FREE cpSpaceFree
+#    define BENCH_SPACE_STEP cpSpaceStep
 #endif
 
 const cpFloat bevel = 1.0;
 
 static cpVect simple_terrain_verts[] = {
-	{350.00, 425.07}, {336.00, 436.55}, {272.00, 435.39}, {258.00, 427.63}, {225.28, 420.00}, {202.82, 396.00},
-	{191.81, 388.00}, {189.00, 381.89}, {173.00, 380.39}, {162.59, 368.00}, {150.47, 319.00}, {128.00, 311.55},
-	{119.14, 286.00}, {126.84, 263.00}, {120.56, 227.00}, {141.14, 178.00}, {137.52, 162.00}, {146.51, 142.00},
-	{156.23, 136.00}, {158.00, 118.27}, {170.00, 100.77}, {208.43,  84.00}, {224.00,  69.65}, {249.30,  68.00},
-	{257.00,  54.77}, {363.00,  45.94}, {374.15,  54.00}, {386.00,  69.60}, {413.00,  70.73}, {456.00,  84.89},
-	{468.09,  99.00}, {467.09, 123.00}, {464.92, 135.00}, {469.00, 141.03}, {497.00, 148.67}, {513.85, 180.00},
-	{509.56, 223.00}, {523.51, 247.00}, {523.00, 277.00}, {497.79, 311.00}, {478.67, 348.00}, {467.90, 360.00},
-	{456.76, 382.00}, {432.95, 389.00}, {417.00, 411.32}, {373.00, 433.19}, {361.00, 430.02}, {350.00, 425.07},
+    {350.00, 425.07}, {336.00, 436.55}, {272.00, 435.39}, {258.00, 427.63}, {225.28, 420.00}, {202.82, 396.00},
+    {191.81, 388.00}, {189.00, 381.89}, {173.00, 380.39}, {162.59, 368.00}, {150.47, 319.00}, {128.00, 311.55},
+    {119.14, 286.00}, {126.84, 263.00}, {120.56, 227.00}, {141.14, 178.00}, {137.52, 162.00}, {146.51, 142.00},
+    {156.23, 136.00}, {158.00, 118.27}, {170.00, 100.77}, {208.43, 84.00},  {224.00, 69.65},  {249.30, 68.00},
+    {257.00, 54.77},  {363.00, 45.94},  {374.15, 54.00},  {386.00, 69.60},  {413.00, 70.73},  {456.00, 84.89},
+    {468.09, 99.00},  {467.09, 123.00}, {464.92, 135.00}, {469.00, 141.03}, {497.00, 148.67}, {513.85, 180.00},
+    {509.56, 223.00}, {523.51, 247.00}, {523.00, 277.00}, {497.79, 311.00}, {478.67, 348.00}, {467.90, 360.00},
+    {456.76, 382.00}, {432.95, 389.00}, {417.00, 411.32}, {373.00, 433.19}, {361.00, 430.02}, {350.00, 425.07},
 };
-static int simple_terrain_count = sizeof(simple_terrain_verts)/sizeof(cpVect);
-
-//cpBody bodies[1000] = {};
-//cpCircleShape circles[1000] = {};
-
-static void add_circle(cpSpace *space, int index, cpFloat radius){
-	cpFloat mass = radius*radius/25.0f;
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-//	cpBody *body = cpSpaceAddBody(space, cpBodyInit(&bodies[i], mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
-	
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-//	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeInit(&circles[i], body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0); cpShapeSetFriction(shape, 0.9);
+static int simple_terrain_count = sizeof(simple_terrain_verts) / sizeof(cpVect);
+
+// cpBody bodies[1000] = {};
+// cpCircleShape circles[1000] = {};
+
+static void add_circle(cpSpace* space, int index, cpFloat radius)
+{
+    cpFloat mass = radius * radius / 25.0f;
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+    //	cpBody *body = cpSpaceAddBody(space, cpBodyInit(&bodies[i], mass, cpMomentForCircle(mass, 0.0f, radius,
+    // cpvzero)));
+    cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    //	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeInit(&circles[i], body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0);
+    cpShapeSetFriction(shape, 0.9);
 }
 
-static void add_box(cpSpace *space, int index, cpFloat size){
-	cpFloat mass = size*size/100.0f;
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, size, size)));
-//	cpBody *body = cpSpaceAddBody(space, cpBodyInit(&bodies[i], mass, cpMomentForBox(mass, size, size)));
-	cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
-	
-	
-	cpShape *shape = cpSpaceAddShape(space, cpBoxShapeNew(body, size - bevel*2, size - bevel*2, 0.0));
-	cpPolyShapeSetRadius(shape, bevel);
-	cpShapeSetElasticity(shape, 0.0); cpShapeSetFriction(shape, 0.9);
+static void add_box(cpSpace* space, int index, cpFloat size)
+{
+    cpFloat mass = size * size / 100.0f;
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, size, size)));
+    //	cpBody *body = cpSpaceAddBody(space, cpBodyInit(&bodies[i], mass, cpMomentForBox(mass, size, size)));
+    cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
+
+    cpShape* shape = cpSpaceAddShape(space, cpBoxShapeNew(body, size - bevel * 2, size - bevel * 2, 0.0));
+    cpPolyShapeSetRadius(shape, bevel);
+    cpShapeSetElasticity(shape, 0.0);
+    cpShapeSetFriction(shape, 0.9);
 }
 
-static void add_hexagon(cpSpace *space, int index, cpFloat radius){
-	cpVect hexagon[6];
-	for(int i=0; i<6; i++){
-		cpFloat angle = -CP_PI*2.0f*i/6.0f;
-		hexagon[i] = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
-	}
-	
-	cpFloat mass = radius*radius;
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
-	cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
-	cpShapeSetElasticity(shape, 0.0); cpShapeSetFriction(shape, 0.9);
+static void add_hexagon(cpSpace* space, int index, cpFloat radius)
+{
+    cpVect hexagon[6];
+    for (int i = 0; i < 6; i++)
+    {
+        cpFloat angle = -CP_PI * 2.0f * i / 6.0f;
+        hexagon[i]    = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
+    }
+
+    cpFloat mass = radius * radius;
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
+    cpBodySetPosition(body, cpvmult(frand_unit_circle(), 180.0f));
+
+    cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
+    cpShapeSetElasticity(shape, 0.0);
+    cpShapeSetFriction(shape, 0.9);
 }
 
-
-static cpSpace *
-SetupSpace_simpleTerrain(){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpVect offset = cpv(-320, -240);
-	for(int i=0; i<(simple_terrain_count - 1); i++){
-		cpVect a = simple_terrain_verts[i], b = simple_terrain_verts[i+1];
-		cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
-	}
-	
-	return space;
+static cpSpace* SetupSpace_simpleTerrain()
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpVect offset = cpv(-320, -240);
+    for (int i = 0; i < (simple_terrain_count - 1); i++)
+    {
+        cpVect a = simple_terrain_verts[i], b = simple_terrain_verts[i + 1];
+        cpSpaceAddShape(space,
+                        cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
+    }
+
+    return space;
 }
 
-
 // SimpleTerrain constant sized objects
-static cpSpace *init_SimpleTerrainCircles_1000(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<1000; i++) add_circle(space, i, 5.0f);
-	
-	return space;
-}
+static cpSpace* init_SimpleTerrainCircles_1000(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 1000; i++)
+        add_circle(space, i, 5.0f);
 
-static cpSpace *init_SimpleTerrainCircles_500(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<500; i++) add_circle(space, i, 5.0f);
-	
-	return space;
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainCircles_100(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<100; i++) add_circle(space, i, 5.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainCircles_500(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 500; i++)
+        add_circle(space, i, 5.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainBoxes_1000(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<1000; i++) add_box(space, i, 10.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainCircles_100(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 100; i++)
+        add_circle(space, i, 5.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainBoxes_500(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<500; i++) add_box(space, i, 10.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainBoxes_1000(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 1000; i++)
+        add_box(space, i, 10.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainBoxes_100(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<100; i++) add_box(space, i, 10.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainBoxes_500(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 500; i++)
+        add_box(space, i, 10.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainHexagons_1000(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<1000; i++) add_hexagon(space, i, 5.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainBoxes_100(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 100; i++)
+        add_box(space, i, 10.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainHexagons_500(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<500; i++) add_hexagon(space, i, 5.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainHexagons_1000(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 1000; i++)
+        add_hexagon(space, i, 5.0f);
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainHexagons_100(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<100; i++) add_hexagon(space, i, 5.0f);
-	
-	return space;
+static cpSpace* init_SimpleTerrainHexagons_500(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 500; i++)
+        add_hexagon(space, i, 5.0f);
+
+    return space;
 }
 
+static cpSpace* init_SimpleTerrainHexagons_100(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 100; i++)
+        add_hexagon(space, i, 5.0f);
 
-// SimpleTerrain variable sized objects
-static cpFloat rand_size(){
-	return cpfpow(1.5, cpflerp(-1.5, 3.5, frand()));
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainVCircles_200(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<200; i++) add_circle(space, i, 5.0f*rand_size());
-	
-	return space;
+// SimpleTerrain variable sized objects
+static cpFloat rand_size()
+{
+    return cpfpow(1.5, cpflerp(-1.5, 3.5, frand()));
 }
 
-static cpSpace *init_SimpleTerrainVBoxes_200(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<200; i++) add_box(space, i, 8.0f*rand_size());
-	
-	return space;
+static cpSpace* init_SimpleTerrainVCircles_200(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 200; i++)
+        add_circle(space, i, 5.0f * rand_size());
+
+    return space;
 }
 
-static cpSpace *init_SimpleTerrainVHexagons_200(void){
-	cpSpace *space = SetupSpace_simpleTerrain();
-	for(int i=0; i<200; i++) add_hexagon(space, i, 5.0f*rand_size());
-	
-	return space;
+static cpSpace* init_SimpleTerrainVBoxes_200(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 200; i++)
+        add_box(space, i, 8.0f * rand_size());
+
+    return space;
 }
 
+static cpSpace* init_SimpleTerrainVHexagons_200(void)
+{
+    cpSpace* space = SetupSpace_simpleTerrain();
+    for (int i = 0; i < 200; i++)
+        add_hexagon(space, i, 5.0f * rand_size());
+
+    return space;
+}
 
 // ComplexTerrain
 static cpVect complex_terrain_verts[] = {
-	{ 46.78, 479.00}, { 35.00, 475.63}, { 27.52, 469.00}, { 23.52, 455.00}, { 23.78, 441.00}, { 28.41, 428.00}, { 49.61, 394.00}, { 59.00, 381.56}, { 80.00, 366.03}, { 81.46, 358.00}, { 86.31, 350.00}, { 77.74, 320.00},
-	{ 70.26, 278.00}, { 67.51, 270.00}, { 58.86, 260.00}, { 57.19, 247.00}, { 38.00, 235.60}, { 25.76, 221.00}, { 24.58, 209.00}, { 27.63, 202.00}, { 31.28, 198.00}, { 40.00, 193.72}, { 48.00, 193.73}, { 55.00, 196.70},
-	{ 62.10, 204.00}, { 71.00, 209.04}, { 79.00, 206.55}, { 88.00, 206.81}, { 95.88, 211.00}, {103.00, 220.49}, {131.00, 220.51}, {137.00, 222.66}, {143.08, 228.00}, {146.22, 234.00}, {147.08, 241.00}, {145.45, 248.00},
-	{142.31, 253.00}, {132.00, 259.30}, {115.00, 259.70}, {109.28, 270.00}, {112.91, 296.00}, {119.69, 324.00}, {129.00, 336.26}, {141.00, 337.59}, {153.00, 331.57}, {175.00, 325.74}, {188.00, 325.19}, {235.00, 317.46},
-	{250.00, 317.19}, {255.00, 309.12}, {262.62, 302.00}, {262.21, 295.00}, {248.00, 273.59}, {229.00, 257.93}, {221.00, 255.48}, {215.00, 251.59}, {210.79, 246.00}, {207.47, 234.00}, {203.25, 227.00}, {179.00, 205.90},
-	{148.00, 189.54}, {136.00, 181.45}, {120.00, 180.31}, {110.00, 181.65}, { 95.00, 179.31}, { 63.00, 166.96}, { 50.00, 164.23}, { 31.00, 154.49}, { 19.76, 145.00}, { 15.96, 136.00}, { 16.65, 127.00}, { 20.57, 120.00},
-	{ 28.00, 114.63}, { 40.00, 113.67}, { 65.00, 127.22}, { 73.00, 128.69}, { 81.96, 120.00}, { 77.58, 103.00}, { 78.18,  92.00}, { 59.11,  77.00}, { 52.00,  67.29}, { 31.29,  55.00}, { 25.67,  47.00}, { 24.65,  37.00},
-	{ 27.82,  29.00}, { 35.00,  22.55}, { 44.00,  20.35}, { 49.00,  20.81}, { 61.00,  25.69}, { 79.00,  37.81}, { 88.00,  49.64}, { 97.00,  56.65}, {109.00,  49.61}, {143.00,  38.96}, {197.00,  37.27}, {215.00,  35.30},
-	{222.00,  36.65}, {228.42,  41.00}, {233.30,  49.00}, {234.14,  57.00}, {231.00,  65.80}, {224.00,  72.38}, {218.00,  74.50}, {197.00,  76.62}, {145.00,  78.81}, {123.00,  87.41}, {117.59,  98.00}, {117.79, 104.00},
-	{119.00, 106.23}, {138.73, 120.00}, {148.00, 129.50}, {158.50, 149.00}, {203.93, 175.00}, {229.00, 196.60}, {238.16, 208.00}, {245.20, 221.00}, {275.45, 245.00}, {289.00, 263.24}, {303.60, 287.00}, {312.00, 291.57},
-	{339.25, 266.00}, {366.33, 226.00}, {363.43, 216.00}, {364.13, 206.00}, {353.00, 196.72}, {324.00, 181.05}, {307.00, 169.63}, {274.93, 156.00}, {256.00, 152.48}, {228.00, 145.13}, {221.09, 142.00}, {214.87, 135.00},
-	{212.67, 127.00}, {213.81, 119.00}, {219.32, 111.00}, {228.00, 106.52}, {236.00, 106.39}, {290.00, 119.40}, {299.33, 114.00}, {300.52, 109.00}, {300.30,  53.00}, {301.46,  47.00}, {305.00,  41.12}, {311.00,  36.37},
-	{317.00,  34.43}, {325.00,  34.81}, {334.90,  41.00}, {339.45,  50.00}, {339.82, 132.00}, {346.09, 139.00}, {350.00, 150.26}, {380.00, 167.38}, {393.00, 166.48}, {407.00, 155.54}, {430.00, 147.30}, {437.78, 135.00},
-	{433.13, 122.00}, {410.23,  78.00}, {401.59,  69.00}, {393.48,  56.00}, {392.80,  44.00}, {395.50,  38.00}, {401.00,  32.49}, {409.00,  29.41}, {420.00,  30.84}, {426.92,  36.00}, {432.32,  44.00}, {439.49,  51.00},
-	{470.13, 108.00}, {475.71, 124.00}, {483.00, 130.11}, {488.00, 139.43}, {529.00, 139.40}, {536.00, 132.52}, {543.73, 129.00}, {540.47, 115.00}, {541.11, 100.00}, {552.18,  68.00}, {553.78,  47.00}, {559.00,  39.76},
-	{567.00,  35.52}, {577.00,  35.45}, {585.00,  39.58}, {591.38,  50.00}, {591.67,  66.00}, {590.31,  79.00}, {579.76, 109.00}, {582.25, 119.00}, {583.66, 136.00}, {586.45, 143.00}, {586.44, 151.00}, {580.42, 168.00},
-	{577.15, 173.00}, {572.00, 177.13}, {564.00, 179.49}, {478.00, 178.81}, {443.00, 184.76}, {427.10, 190.00}, {424.00, 192.11}, {415.94, 209.00}, {408.82, 228.00}, {405.82, 241.00}, {411.00, 250.82}, {415.00, 251.50},
-	{428.00, 248.89}, {469.00, 246.29}, {505.00, 246.49}, {533.00, 243.60}, {541.87, 248.00}, {547.55, 256.00}, {548.48, 267.00}, {544.00, 276.00}, {534.00, 282.24}, {513.00, 285.46}, {468.00, 285.76}, {402.00, 291.70},
-	{392.00, 290.29}, {377.00, 294.46}, {367.00, 294.43}, {356.44, 304.00}, {354.22, 311.00}, {362.00, 321.36}, {390.00, 322.44}, {433.00, 330.16}, {467.00, 332.76}, {508.00, 347.64}, {522.00, 357.67}, {528.00, 354.46},
-	{536.00, 352.96}, {546.06, 336.00}, {553.47, 306.00}, {564.19, 282.00}, {567.84, 268.00}, {578.72, 246.00}, {585.00, 240.97}, {592.00, 238.91}, {600.00, 239.72}, {606.00, 242.82}, {612.36, 251.00}, {613.35, 263.00},
-	{588.75, 324.00}, {583.25, 350.00}, {572.12, 370.00}, {575.45, 378.00}, {575.20, 388.00}, {589.00, 393.81}, {599.20, 404.00}, {607.14, 416.00}, {609.96, 430.00}, {615.45, 441.00}, {613.44, 462.00}, {610.48, 469.00},
-	{603.00, 475.63}, {590.96, 479.00}, 
+    {46.78, 479.00},  {35.00, 475.63},  {27.52, 469.00},  {23.52, 455.00},  {23.78, 441.00},  {28.41, 428.00},
+    {49.61, 394.00},  {59.00, 381.56},  {80.00, 366.03},  {81.46, 358.00},  {86.31, 350.00},  {77.74, 320.00},
+    {70.26, 278.00},  {67.51, 270.00},  {58.86, 260.00},  {57.19, 247.00},  {38.00, 235.60},  {25.76, 221.00},
+    {24.58, 209.00},  {27.63, 202.00},  {31.28, 198.00},  {40.00, 193.72},  {48.00, 193.73},  {55.00, 196.70},
+    {62.10, 204.00},  {71.00, 209.04},  {79.00, 206.55},  {88.00, 206.81},  {95.88, 211.00},  {103.00, 220.49},
+    {131.00, 220.51}, {137.00, 222.66}, {143.08, 228.00}, {146.22, 234.00}, {147.08, 241.00}, {145.45, 248.00},
+    {142.31, 253.00}, {132.00, 259.30}, {115.00, 259.70}, {109.28, 270.00}, {112.91, 296.00}, {119.69, 324.00},
+    {129.00, 336.26}, {141.00, 337.59}, {153.00, 331.57}, {175.00, 325.74}, {188.00, 325.19}, {235.00, 317.46},
+    {250.00, 317.19}, {255.00, 309.12}, {262.62, 302.00}, {262.21, 295.00}, {248.00, 273.59}, {229.00, 257.93},
+    {221.00, 255.48}, {215.00, 251.59}, {210.79, 246.00}, {207.47, 234.00}, {203.25, 227.00}, {179.00, 205.90},
+    {148.00, 189.54}, {136.00, 181.45}, {120.00, 180.31}, {110.00, 181.65}, {95.00, 179.31},  {63.00, 166.96},
+    {50.00, 164.23},  {31.00, 154.49},  {19.76, 145.00},  {15.96, 136.00},  {16.65, 127.00},  {20.57, 120.00},
+    {28.00, 114.63},  {40.00, 113.67},  {65.00, 127.22},  {73.00, 128.69},  {81.96, 120.00},  {77.58, 103.00},
+    {78.18, 92.00},   {59.11, 77.00},   {52.00, 67.29},   {31.29, 55.00},   {25.67, 47.00},   {24.65, 37.00},
+    {27.82, 29.00},   {35.00, 22.55},   {44.00, 20.35},   {49.00, 20.81},   {61.00, 25.69},   {79.00, 37.81},
+    {88.00, 49.64},   {97.00, 56.65},   {109.00, 49.61},  {143.00, 38.96},  {197.00, 37.27},  {215.00, 35.30},
+    {222.00, 36.65},  {228.42, 41.00},  {233.30, 49.00},  {234.14, 57.00},  {231.00, 65.80},  {224.00, 72.38},
+    {218.00, 74.50},  {197.00, 76.62},  {145.00, 78.81},  {123.00, 87.41},  {117.59, 98.00},  {117.79, 104.00},
+    {119.00, 106.23}, {138.73, 120.00}, {148.00, 129.50}, {158.50, 149.00}, {203.93, 175.00}, {229.00, 196.60},
+    {238.16, 208.00}, {245.20, 221.00}, {275.45, 245.00}, {289.00, 263.24}, {303.60, 287.00}, {312.00, 291.57},
+    {339.25, 266.00}, {366.33, 226.00}, {363.43, 216.00}, {364.13, 206.00}, {353.00, 196.72}, {324.00, 181.05},
+    {307.00, 169.63}, {274.93, 156.00}, {256.00, 152.48}, {228.00, 145.13}, {221.09, 142.00}, {214.87, 135.00},
+    {212.67, 127.00}, {213.81, 119.00}, {219.32, 111.00}, {228.00, 106.52}, {236.00, 106.39}, {290.00, 119.40},
+    {299.33, 114.00}, {300.52, 109.00}, {300.30, 53.00},  {301.46, 47.00},  {305.00, 41.12},  {311.00, 36.37},
+    {317.00, 34.43},  {325.00, 34.81},  {334.90, 41.00},  {339.45, 50.00},  {339.82, 132.00}, {346.09, 139.00},
+    {350.00, 150.26}, {380.00, 167.38}, {393.00, 166.48}, {407.00, 155.54}, {430.00, 147.30}, {437.78, 135.00},
+    {433.13, 122.00}, {410.23, 78.00},  {401.59, 69.00},  {393.48, 56.00},  {392.80, 44.00},  {395.50, 38.00},
+    {401.00, 32.49},  {409.00, 29.41},  {420.00, 30.84},  {426.92, 36.00},  {432.32, 44.00},  {439.49, 51.00},
+    {470.13, 108.00}, {475.71, 124.00}, {483.00, 130.11}, {488.00, 139.43}, {529.00, 139.40}, {536.00, 132.52},
+    {543.73, 129.00}, {540.47, 115.00}, {541.11, 100.00}, {552.18, 68.00},  {553.78, 47.00},  {559.00, 39.76},
+    {567.00, 35.52},  {577.00, 35.45},  {585.00, 39.58},  {591.38, 50.00},  {591.67, 66.00},  {590.31, 79.00},
+    {579.76, 109.00}, {582.25, 119.00}, {583.66, 136.00}, {586.45, 143.00}, {586.44, 151.00}, {580.42, 168.00},
+    {577.15, 173.00}, {572.00, 177.13}, {564.00, 179.49}, {478.00, 178.81}, {443.00, 184.76}, {427.10, 190.00},
+    {424.00, 192.11}, {415.94, 209.00}, {408.82, 228.00}, {405.82, 241.00}, {411.00, 250.82}, {415.00, 251.50},
+    {428.00, 248.89}, {469.00, 246.29}, {505.00, 246.49}, {533.00, 243.60}, {541.87, 248.00}, {547.55, 256.00},
+    {548.48, 267.00}, {544.00, 276.00}, {534.00, 282.24}, {513.00, 285.46}, {468.00, 285.76}, {402.00, 291.70},
+    {392.00, 290.29}, {377.00, 294.46}, {367.00, 294.43}, {356.44, 304.00}, {354.22, 311.00}, {362.00, 321.36},
+    {390.00, 322.44}, {433.00, 330.16}, {467.00, 332.76}, {508.00, 347.64}, {522.00, 357.67}, {528.00, 354.46},
+    {536.00, 352.96}, {546.06, 336.00}, {553.47, 306.00}, {564.19, 282.00}, {567.84, 268.00}, {578.72, 246.00},
+    {585.00, 240.97}, {592.00, 238.91}, {600.00, 239.72}, {606.00, 242.82}, {612.36, 251.00}, {613.35, 263.00},
+    {588.75, 324.00}, {583.25, 350.00}, {572.12, 370.00}, {575.45, 378.00}, {575.20, 388.00}, {589.00, 393.81},
+    {599.20, 404.00}, {607.14, 416.00}, {609.96, 430.00}, {615.45, 441.00}, {613.44, 462.00}, {610.48, 469.00},
+    {603.00, 475.63}, {590.96, 479.00},
 };
-static int complex_terrain_count = sizeof(complex_terrain_verts)/sizeof(cpVect);
-
-static cpSpace *init_ComplexTerrainCircles_1000(void){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpVect offset = cpv(-320, -240);
-	for(int i=0; i<(complex_terrain_count - 1); i++){
-		cpVect a = complex_terrain_verts[i], b = complex_terrain_verts[i+1];
-		cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
-	}
-	
-	for(int i=0; i<1000; i++){
-		cpFloat radius = 5.0f;
-		cpFloat mass = radius*radius;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-		cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 180.0f), cpv(0.0f, 300.0f)));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-		cpShapeSetElasticity(shape, 0.0); cpShapeSetFriction(shape, 0.0);
-	}
-	
-	return space;
+static int complex_terrain_count = sizeof(complex_terrain_verts) / sizeof(cpVect);
+
+static cpSpace* init_ComplexTerrainCircles_1000(void)
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpVect offset = cpv(-320, -240);
+    for (int i = 0; i < (complex_terrain_count - 1); i++)
+    {
+        cpVect a = complex_terrain_verts[i], b = complex_terrain_verts[i + 1];
+        cpSpaceAddShape(space,
+                        cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
+    }
+
+    for (int i = 0; i < 1000; i++)
+    {
+        cpFloat radius = 5.0f;
+        cpFloat mass   = radius * radius;
+        cpBody* body   = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+        cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 180.0f), cpv(0.0f, 300.0f)));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+        cpShapeSetElasticity(shape, 0.0);
+        cpShapeSetFriction(shape, 0.0);
+    }
+
+    return space;
 }
 
-static cpSpace *init_ComplexTerrainHexagons_1000(void){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpVect offset = cpv(-320, -240);
-	for(int i=0; i<(complex_terrain_count - 1); i++){
-		cpVect a = complex_terrain_verts[i], b = complex_terrain_verts[i+1];
-		cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
-	}
-	
-	cpFloat radius = 5.0f;
-	cpVect hexagon[6];
-	for(int i=0; i<6; i++){
-		cpFloat angle = -CP_PI*2.0f*i/6.0f;
-		hexagon[i] = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
-	}
-	
-	for(int i=0; i<1000; i++){
-		cpFloat mass = radius*radius;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
-		cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 180.0f), cpv(0.0f, 300.0f)));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
-		cpShapeSetElasticity(shape, 0.0); cpShapeSetFriction(shape, 0.0);
-	}
-	
-	return space;
+static cpSpace* init_ComplexTerrainHexagons_1000(void)
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpVect offset = cpv(-320, -240);
+    for (int i = 0; i < (complex_terrain_count - 1); i++)
+    {
+        cpVect a = complex_terrain_verts[i], b = complex_terrain_verts[i + 1];
+        cpSpaceAddShape(space,
+                        cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
+    }
+
+    cpFloat radius = 5.0f;
+    cpVect hexagon[6];
+    for (int i = 0; i < 6; i++)
+    {
+        cpFloat angle = -CP_PI * 2.0f * i / 6.0f;
+        hexagon[i]    = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
+    }
+
+    for (int i = 0; i < 1000; i++)
+    {
+        cpFloat mass = radius * radius;
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
+        cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 180.0f), cpv(0.0f, 300.0f)));
+
+        cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
+        cpShapeSetElasticity(shape, 0.0);
+        cpShapeSetFriction(shape, 0.0);
+    }
+
+    return space;
 }
 
-
 // BouncyTerrain
 static cpVect bouncy_terrain_verts[] = {
-	{537.18,  23.00}, {520.50,  36.00}, {501.53,  63.00}, {496.14,  76.00}, {498.86,  86.00}, {504.00,  90.51}, {508.00,  91.36}, {508.77,  84.00}, {513.00,  77.73}, {519.00,  74.48}, {530.00,  74.67}, {545.00,  54.65},
-	{554.00,  48.77}, {562.00,  46.39}, {568.00,  45.94}, {568.61,  47.00}, {567.94,  55.00}, {571.27,  64.00}, {572.92,  80.00}, {572.00,  81.39}, {563.00,  79.93}, {556.00,  82.69}, {551.49,  88.00}, {549.00,  95.76},
-	{538.00,  93.40}, {530.00, 102.38}, {523.00, 104.00}, {517.00, 103.02}, {516.22, 109.00}, {518.96, 116.00}, {526.00, 121.15}, {534.00, 116.48}, {543.00, 116.77}, {549.28, 121.00}, {554.00, 130.17}, {564.00, 125.67},
-	{575.60, 129.00}, {573.31, 121.00}, {567.77, 111.00}, {575.00, 106.47}, {578.51, 102.00}, {580.25,  95.00}, {577.98,  87.00}, {582.00,  85.71}, {597.00,  89.46}, {604.80,  95.00}, {609.28, 104.00}, {610.55, 116.00},
-	{609.30, 125.00}, {600.80, 142.00}, {597.31, 155.00}, {584.00, 167.23}, {577.86, 175.00}, {583.52, 184.00}, {582.64, 195.00}, {591.00, 196.56}, {597.81, 201.00}, {607.45, 219.00}, {607.51, 246.00}, {600.00, 275.46},
-	{588.00, 267.81}, {579.00, 264.91}, {557.00, 264.41}, {552.98, 259.00}, {548.00, 246.18}, {558.00, 247.12}, {565.98, 244.00}, {571.10, 237.00}, {571.61, 229.00}, {568.25, 222.00}, {562.00, 217.67}, {544.00, 213.93},
-	{536.73, 214.00}, {535.60, 204.00}, {539.69, 181.00}, {542.84, 171.00}, {550.43, 161.00}, {540.00, 156.27}, {536.62, 152.00}, {534.70, 146.00}, {527.00, 141.88}, {518.59, 152.00}, {514.51, 160.00}, {510.33, 175.00},
-	{519.38, 183.00}, {520.52, 194.00}, {516.00, 201.27}, {505.25, 206.00}, {507.57, 223.00}, {519.90, 260.00}, {529.00, 260.48}, {534.00, 262.94}, {538.38, 268.00}, {540.00, 275.00}, {537.06, 284.00}, {530.00, 289.23},
-	{520.00, 289.23}, {513.00, 284.18}, {509.71, 286.00}, {501.69, 298.00}, {501.56, 305.00}, {504.30, 311.00}, {512.00, 316.43}, {521.00, 316.42}, {525.67, 314.00}, {535.00, 304.98}, {562.00, 294.80}, {573.00, 294.81},
-	{587.52, 304.00}, {600.89, 310.00}, {596.96, 322.00}, {603.28, 327.00}, {606.52, 333.00}, {605.38, 344.00}, {597.65, 352.00}, {606.36, 375.00}, {607.16, 384.00}, {603.40, 393.00}, {597.00, 398.14}, {577.00, 386.15},
-	{564.35, 373.00}, {565.21, 364.00}, {562.81, 350.00}, {553.00, 346.06}, {547.48, 338.00}, {547.48, 330.00}, {550.00, 323.30}, {544.00, 321.53}, {537.00, 322.70}, {532.00, 326.23}, {528.89, 331.00}, {527.83, 338.00},
-	{533.02, 356.00}, {542.00, 360.73}, {546.68, 369.00}, {545.38, 379.00}, {537.58, 386.00}, {537.63, 388.00}, {555.00, 407.47}, {563.00, 413.52}, {572.57, 418.00}, {582.72, 426.00}, {578.00, 431.12}, {563.21, 440.00},
-	{558.00, 449.27}, {549.00, 452.94}, {541.00, 451.38}, {536.73, 448.00}, {533.00, 441.87}, {520.00, 437.96}, {514.00, 429.69}, {490.00, 415.15}, {472.89, 399.00}, {472.03, 398.00}, {474.00, 396.71}, {486.00, 393.61},
-	{492.00, 385.85}, {492.00, 376.15}, {489.04, 371.00}, {485.00, 368.11}, {480.00, 376.27}, {472.00, 379.82}, {463.00, 378.38}, {455.08, 372.00}, {446.00, 377.69}, {439.00, 385.24}, {436.61, 391.00}, {437.52, 404.00},
-	{440.00, 409.53}, {463.53, 433.00}, {473.80, 441.00}, {455.00, 440.30}, {443.00, 436.18}, {436.00, 431.98}, {412.00, 440.92}, {397.00, 442.46}, {393.59, 431.00}, {393.71, 412.00}, {400.00, 395.10}, {407.32, 387.00},
-	{408.54, 380.00}, {407.42, 375.00}, {403.97, 370.00}, {399.00, 366.74}, {393.00, 365.68}, {391.23, 374.00}, {387.00, 380.27}, {381.00, 383.52}, {371.56, 384.00}, {364.98, 401.00}, {362.96, 412.00}, {363.63, 435.00},
-	{345.00, 433.55}, {344.52, 442.00}, {342.06, 447.00}, {337.00, 451.38}, {330.00, 453.00}, {325.00, 452.23}, {318.00, 448.17}, {298.00, 453.70}, {284.00, 451.49}, {278.62, 449.00}, {291.47, 408.00}, {291.77, 398.00},
-	{301.00, 393.83}, {305.00, 393.84}, {305.60, 403.00}, {310.00, 409.47}, {318.00, 413.07}, {325.00, 412.40}, {332.31, 407.00}, {335.07, 400.00}, {334.40, 393.00}, {329.00, 385.69}, {319.00, 382.79}, {301.00, 389.23},
-	{289.00, 389.97}, {265.00, 389.82}, {251.00, 385.85}, {245.00, 389.23}, {239.00, 389.94}, {233.00, 388.38}, {226.00, 382.04}, {206.00, 374.75}, {206.00, 394.00}, {204.27, 402.00}, {197.00, 401.79}, {191.00, 403.49},
-	{186.53, 407.00}, {183.60, 412.00}, {183.60, 422.00}, {189.00, 429.31}, {196.00, 432.07}, {203.00, 431.40}, {209.47, 427.00}, {213.00, 419.72}, {220.00, 420.21}, {227.00, 418.32}, {242.00, 408.41}, {258.98, 409.00},
-	{250.00, 435.43}, {239.00, 438.78}, {223.00, 448.19}, {209.00, 449.70}, {205.28, 456.00}, {199.00, 460.23}, {190.00, 460.52}, {182.73, 456.00}, {178.00, 446.27}, {160.00, 441.42}, {148.35, 435.00}, {149.79, 418.00},
-	{157.72, 401.00}, {161.00, 396.53}, {177.00, 385.00}, {180.14, 380.00}, {181.11, 374.00}, {180.00, 370.52}, {170.00, 371.68}, {162.72, 368.00}, {158.48, 361.00}, {159.56, 349.00}, {154.00, 342.53}, {146.00, 339.85},
-	{136.09, 343.00}, {130.64, 351.00}, {131.74, 362.00}, {140.61, 374.00}, {130.68, 387.00}, {120.75, 409.00}, {118.09, 421.00}, {117.92, 434.00}, {100.00, 432.40}, { 87.00, 427.48}, { 81.59, 423.00}, { 73.64, 409.00},
-	{ 72.57, 398.00}, { 74.62, 386.00}, { 78.80, 378.00}, { 88.00, 373.43}, { 92.49, 367.00}, { 93.32, 360.00}, { 91.30, 353.00}, {103.00, 342.67}, {109.00, 343.10}, {116.00, 340.44}, {127.33, 330.00}, {143.00, 327.24},
-	{154.30, 322.00}, {145.00, 318.06}, {139.77, 311.00}, {139.48, 302.00}, {144.95, 293.00}, {143.00, 291.56}, {134.00, 298.21}, {118.00, 300.75}, {109.40, 305.00}, { 94.67, 319.00}, { 88.00, 318.93}, { 81.00, 321.69},
-	{ 67.24, 333.00}, { 56.68, 345.00}, { 53.00, 351.40}, { 47.34, 333.00}, { 50.71, 314.00}, { 56.57, 302.00}, { 68.00, 287.96}, { 91.00, 287.24}, {110.00, 282.36}, {133.80, 271.00}, {147.34, 256.00}, {156.47, 251.00},
-	{157.26, 250.00}, {154.18, 242.00}, {154.48, 236.00}, {158.72, 229.00}, {166.71, 224.00}, {170.15, 206.00}, {170.19, 196.00}, {167.24, 188.00}, {160.00, 182.67}, {150.00, 182.66}, {143.60, 187.00}, {139.96, 195.00},
-	{139.50, 207.00}, {136.45, 221.00}, {136.52, 232.00}, {133.28, 238.00}, {129.00, 241.38}, {119.00, 243.07}, {115.00, 246.55}, {101.00, 253.16}, { 86.00, 257.32}, { 63.00, 259.24}, { 57.00, 257.31}, { 50.54, 252.00},
-	{ 47.59, 247.00}, { 46.30, 240.00}, { 47.58, 226.00}, { 50.00, 220.57}, { 58.00, 226.41}, { 69.00, 229.17}, { 79.00, 229.08}, { 94.50, 225.00}, {100.21, 231.00}, {107.00, 233.47}, {107.48, 224.00}, {109.94, 219.00},
-	{115.00, 214.62}, {122.57, 212.00}, {116.00, 201.49}, {104.00, 194.57}, { 90.00, 194.04}, { 79.00, 198.21}, { 73.00, 198.87}, { 62.68, 191.00}, { 62.58, 184.00}, { 64.42, 179.00}, { 75.00, 167.70}, { 80.39, 157.00},
-	{ 68.79, 140.00}, { 61.67, 126.00}, { 61.47, 117.00}, { 64.43, 109.00}, { 63.10,  96.00}, { 56.48,  82.00}, { 48.00,  73.88}, { 43.81,  66.00}, { 43.81,  56.00}, { 50.11,  46.00}, { 59.00,  41.55}, { 71.00,  42.64},
-	{ 78.00,  36.77}, { 83.00,  34.75}, { 99.00,  34.32}, {117.00,  38.92}, {133.00,  55.15}, {142.00,  50.70}, {149.74,  51.00}, {143.55,  68.00}, {153.28,  74.00}, {156.23,  79.00}, {157.00,  84.00}, {156.23,  89.00},
-	{153.28,  94.00}, {144.58,  99.00}, {151.52, 112.00}, {151.51, 124.00}, {150.00, 126.36}, {133.00, 130.25}, {126.71, 125.00}, {122.00, 117.25}, {114.00, 116.23}, {107.73, 112.00}, {104.48, 106.00}, {104.32,  99.00},
-	{106.94,  93.00}, {111.24,  89.00}, {111.60,  85.00}, {107.24,  73.00}, {102.00,  67.57}, { 99.79,  67.00}, { 99.23,  76.00}, { 95.00,  82.27}, { 89.00,  85.52}, { 79.84,  86.00}, { 86.73, 114.00}, { 98.00, 136.73},
-	{ 99.00, 137.61}, {109.00, 135.06}, {117.00, 137.94}, {122.52, 146.00}, {122.94, 151.00}, {121.00, 158.58}, {134.00, 160.97}, {153.00, 157.45}, {171.30, 150.00}, {169.06, 142.00}, {169.77, 136.00}, {174.00, 129.73},
-	{181.46, 126.00}, {182.22, 120.00}, {182.20, 111.00}, {180.06, 101.00}, {171.28,  85.00}, {171.75,  80.00}, {182.30,  53.00}, {189.47,  50.00}, {190.62,  38.00}, {194.00,  33.73}, {199.00,  30.77}, {208.00,  30.48},
-	{216.00,  34.94}, {224.00,  31.47}, {240.00,  30.37}, {247.00,  32.51}, {249.77,  35.00}, {234.75,  53.00}, {213.81,  93.00}, {212.08,  99.00}, {213.00, 101.77}, {220.00,  96.77}, {229.00,  96.48}, {236.28, 101.00},
-	{240.00, 107.96}, {245.08, 101.00}, {263.00,  65.32}, {277.47,  48.00}, {284.00,  47.03}, {286.94,  41.00}, {292.00,  36.62}, {298.00,  35.06}, {304.00,  35.77}, {314.00,  43.81}, {342.00,  32.56}, {359.00,  31.32},
-	{365.00,  32.57}, {371.00,  36.38}, {379.53,  48.00}, {379.70,  51.00}, {356.00,  52.19}, {347.00,  54.74}, {344.38,  66.00}, {341.00,  70.27}, {335.00,  73.52}, {324.00,  72.38}, {317.00,  65.75}, {313.00,  67.79},
-	{307.57,  76.00}, {315.00,  78.62}, {319.28,  82.00}, {322.23,  87.00}, {323.00,  94.41}, {334.00,  92.49}, {347.00,  87.47}, {349.62,  80.00}, {353.00,  75.73}, {359.00,  72.48}, {366.00,  72.32}, {372.00,  74.94},
-	{377.00,  81.34}, {382.00,  83.41}, {392.00,  83.40}, {399.00,  79.15}, {404.00,  85.74}, {411.00,  85.06}, {417.00,  86.62}, {423.38,  93.00}, {425.05, 104.00}, {438.00, 110.35}, {450.00, 112.17}, {452.62, 103.00},
-	{456.00,  98.73}, {462.00,  95.48}, {472.00,  95.79}, {471.28,  92.00}, {464.00,  84.62}, {445.00,  80.39}, {436.00,  75.33}, {428.00,  68.46}, {419.00,  68.52}, {413.00,  65.27}, {408.48,  58.00}, {409.87,  46.00},
-	{404.42,  39.00}, {408.00,  33.88}, {415.00,  29.31}, {429.00,  26.45}, {455.00,  28.77}, {470.00,  33.81}, {482.00,  42.16}, {494.00,  46.85}, {499.65,  36.00}, {513.00,  25.95}, {529.00,  22.42}, {537.18,  23.00}, 
+    {537.18, 23.00},  {520.50, 36.00},  {501.53, 63.00},  {496.14, 76.00},  {498.86, 86.00},  {504.00, 90.51},
+    {508.00, 91.36},  {508.77, 84.00},  {513.00, 77.73},  {519.00, 74.48},  {530.00, 74.67},  {545.00, 54.65},
+    {554.00, 48.77},  {562.00, 46.39},  {568.00, 45.94},  {568.61, 47.00},  {567.94, 55.00},  {571.27, 64.00},
+    {572.92, 80.00},  {572.00, 81.39},  {563.00, 79.93},  {556.00, 82.69},  {551.49, 88.00},  {549.00, 95.76},
+    {538.00, 93.40},  {530.00, 102.38}, {523.00, 104.00}, {517.00, 103.02}, {516.22, 109.00}, {518.96, 116.00},
+    {526.00, 121.15}, {534.00, 116.48}, {543.00, 116.77}, {549.28, 121.00}, {554.00, 130.17}, {564.00, 125.67},
+    {575.60, 129.00}, {573.31, 121.00}, {567.77, 111.00}, {575.00, 106.47}, {578.51, 102.00}, {580.25, 95.00},
+    {577.98, 87.00},  {582.00, 85.71},  {597.00, 89.46},  {604.80, 95.00},  {609.28, 104.00}, {610.55, 116.00},
+    {609.30, 125.00}, {600.80, 142.00}, {597.31, 155.00}, {584.00, 167.23}, {577.86, 175.00}, {583.52, 184.00},
+    {582.64, 195.00}, {591.00, 196.56}, {597.81, 201.00}, {607.45, 219.00}, {607.51, 246.00}, {600.00, 275.46},
+    {588.00, 267.81}, {579.00, 264.91}, {557.00, 264.41}, {552.98, 259.00}, {548.00, 246.18}, {558.00, 247.12},
+    {565.98, 244.00}, {571.10, 237.00}, {571.61, 229.00}, {568.25, 222.00}, {562.00, 217.67}, {544.00, 213.93},
+    {536.73, 214.00}, {535.60, 204.00}, {539.69, 181.00}, {542.84, 171.00}, {550.43, 161.00}, {540.00, 156.27},
+    {536.62, 152.00}, {534.70, 146.00}, {527.00, 141.88}, {518.59, 152.00}, {514.51, 160.00}, {510.33, 175.00},
+    {519.38, 183.00}, {520.52, 194.00}, {516.00, 201.27}, {505.25, 206.00}, {507.57, 223.00}, {519.90, 260.00},
+    {529.00, 260.48}, {534.00, 262.94}, {538.38, 268.00}, {540.00, 275.00}, {537.06, 284.00}, {530.00, 289.23},
+    {520.00, 289.23}, {513.00, 284.18}, {509.71, 286.00}, {501.69, 298.00}, {501.56, 305.00}, {504.30, 311.00},
+    {512.00, 316.43}, {521.00, 316.42}, {525.67, 314.00}, {535.00, 304.98}, {562.00, 294.80}, {573.00, 294.81},
+    {587.52, 304.00}, {600.89, 310.00}, {596.96, 322.00}, {603.28, 327.00}, {606.52, 333.00}, {605.38, 344.00},
+    {597.65, 352.00}, {606.36, 375.00}, {607.16, 384.00}, {603.40, 393.00}, {597.00, 398.14}, {577.00, 386.15},
+    {564.35, 373.00}, {565.21, 364.00}, {562.81, 350.00}, {553.00, 346.06}, {547.48, 338.00}, {547.48, 330.00},
+    {550.00, 323.30}, {544.00, 321.53}, {537.00, 322.70}, {532.00, 326.23}, {528.89, 331.00}, {527.83, 338.00},
+    {533.02, 356.00}, {542.00, 360.73}, {546.68, 369.00}, {545.38, 379.00}, {537.58, 386.00}, {537.63, 388.00},
+    {555.00, 407.47}, {563.00, 413.52}, {572.57, 418.00}, {582.72, 426.00}, {578.00, 431.12}, {563.21, 440.00},
+    {558.00, 449.27}, {549.00, 452.94}, {541.00, 451.38}, {536.73, 448.00}, {533.00, 441.87}, {520.00, 437.96},
+    {514.00, 429.69}, {490.00, 415.15}, {472.89, 399.00}, {472.03, 398.00}, {474.00, 396.71}, {486.00, 393.61},
+    {492.00, 385.85}, {492.00, 376.15}, {489.04, 371.00}, {485.00, 368.11}, {480.00, 376.27}, {472.00, 379.82},
+    {463.00, 378.38}, {455.08, 372.00}, {446.00, 377.69}, {439.00, 385.24}, {436.61, 391.00}, {437.52, 404.00},
+    {440.00, 409.53}, {463.53, 433.00}, {473.80, 441.00}, {455.00, 440.30}, {443.00, 436.18}, {436.00, 431.98},
+    {412.00, 440.92}, {397.00, 442.46}, {393.59, 431.00}, {393.71, 412.00}, {400.00, 395.10}, {407.32, 387.00},
+    {408.54, 380.00}, {407.42, 375.00}, {403.97, 370.00}, {399.00, 366.74}, {393.00, 365.68}, {391.23, 374.00},
+    {387.00, 380.27}, {381.00, 383.52}, {371.56, 384.00}, {364.98, 401.00}, {362.96, 412.00}, {363.63, 435.00},
+    {345.00, 433.55}, {344.52, 442.00}, {342.06, 447.00}, {337.00, 451.38}, {330.00, 453.00}, {325.00, 452.23},
+    {318.00, 448.17}, {298.00, 453.70}, {284.00, 451.49}, {278.62, 449.00}, {291.47, 408.00}, {291.77, 398.00},
+    {301.00, 393.83}, {305.00, 393.84}, {305.60, 403.00}, {310.00, 409.47}, {318.00, 413.07}, {325.00, 412.40},
+    {332.31, 407.00}, {335.07, 400.00}, {334.40, 393.00}, {329.00, 385.69}, {319.00, 382.79}, {301.00, 389.23},
+    {289.00, 389.97}, {265.00, 389.82}, {251.00, 385.85}, {245.00, 389.23}, {239.00, 389.94}, {233.00, 388.38},
+    {226.00, 382.04}, {206.00, 374.75}, {206.00, 394.00}, {204.27, 402.00}, {197.00, 401.79}, {191.00, 403.49},
+    {186.53, 407.00}, {183.60, 412.00}, {183.60, 422.00}, {189.00, 429.31}, {196.00, 432.07}, {203.00, 431.40},
+    {209.47, 427.00}, {213.00, 419.72}, {220.00, 420.21}, {227.00, 418.32}, {242.00, 408.41}, {258.98, 409.00},
+    {250.00, 435.43}, {239.00, 438.78}, {223.00, 448.19}, {209.00, 449.70}, {205.28, 456.00}, {199.00, 460.23},
+    {190.00, 460.52}, {182.73, 456.00}, {178.00, 446.27}, {160.00, 441.42}, {148.35, 435.00}, {149.79, 418.00},
+    {157.72, 401.00}, {161.00, 396.53}, {177.00, 385.00}, {180.14, 380.00}, {181.11, 374.00}, {180.00, 370.52},
+    {170.00, 371.68}, {162.72, 368.00}, {158.48, 361.00}, {159.56, 349.00}, {154.00, 342.53}, {146.00, 339.85},
+    {136.09, 343.00}, {130.64, 351.00}, {131.74, 362.00}, {140.61, 374.00}, {130.68, 387.00}, {120.75, 409.00},
+    {118.09, 421.00}, {117.92, 434.00}, {100.00, 432.40}, {87.00, 427.48},  {81.59, 423.00},  {73.64, 409.00},
+    {72.57, 398.00},  {74.62, 386.00},  {78.80, 378.00},  {88.00, 373.43},  {92.49, 367.00},  {93.32, 360.00},
+    {91.30, 353.00},  {103.00, 342.67}, {109.00, 343.10}, {116.00, 340.44}, {127.33, 330.00}, {143.00, 327.24},
+    {154.30, 322.00}, {145.00, 318.06}, {139.77, 311.00}, {139.48, 302.00}, {144.95, 293.00}, {143.00, 291.56},
+    {134.00, 298.21}, {118.00, 300.75}, {109.40, 305.00}, {94.67, 319.00},  {88.00, 318.93},  {81.00, 321.69},
+    {67.24, 333.00},  {56.68, 345.00},  {53.00, 351.40},  {47.34, 333.00},  {50.71, 314.00},  {56.57, 302.00},
+    {68.00, 287.96},  {91.00, 287.24},  {110.00, 282.36}, {133.80, 271.00}, {147.34, 256.00}, {156.47, 251.00},
+    {157.26, 250.00}, {154.18, 242.00}, {154.48, 236.00}, {158.72, 229.00}, {166.71, 224.00}, {170.15, 206.00},
+    {170.19, 196.00}, {167.24, 188.00}, {160.00, 182.67}, {150.00, 182.66}, {143.60, 187.00}, {139.96, 195.00},
+    {139.50, 207.00}, {136.45, 221.00}, {136.52, 232.00}, {133.28, 238.00}, {129.00, 241.38}, {119.00, 243.07},
+    {115.00, 246.55}, {101.00, 253.16}, {86.00, 257.32},  {63.00, 259.24},  {57.00, 257.31},  {50.54, 252.00},
+    {47.59, 247.00},  {46.30, 240.00},  {47.58, 226.00},  {50.00, 220.57},  {58.00, 226.41},  {69.00, 229.17},
+    {79.00, 229.08},  {94.50, 225.00},  {100.21, 231.00}, {107.00, 233.47}, {107.48, 224.00}, {109.94, 219.00},
+    {115.00, 214.62}, {122.57, 212.00}, {116.00, 201.49}, {104.00, 194.57}, {90.00, 194.04},  {79.00, 198.21},
+    {73.00, 198.87},  {62.68, 191.00},  {62.58, 184.00},  {64.42, 179.00},  {75.00, 167.70},  {80.39, 157.00},
+    {68.79, 140.00},  {61.67, 126.00},  {61.47, 117.00},  {64.43, 109.00},  {63.10, 96.00},   {56.48, 82.00},
+    {48.00, 73.88},   {43.81, 66.00},   {43.81, 56.00},   {50.11, 46.00},   {59.00, 41.55},   {71.00, 42.64},
+    {78.00, 36.77},   {83.00, 34.75},   {99.00, 34.32},   {117.00, 38.92},  {133.00, 55.15},  {142.00, 50.70},
+    {149.74, 51.00},  {143.55, 68.00},  {153.28, 74.00},  {156.23, 79.00},  {157.00, 84.00},  {156.23, 89.00},
+    {153.28, 94.00},  {144.58, 99.00},  {151.52, 112.00}, {151.51, 124.00}, {150.00, 126.36}, {133.00, 130.25},
+    {126.71, 125.00}, {122.00, 117.25}, {114.00, 116.23}, {107.73, 112.00}, {104.48, 106.00}, {104.32, 99.00},
+    {106.94, 93.00},  {111.24, 89.00},  {111.60, 85.00},  {107.24, 73.00},  {102.00, 67.57},  {99.79, 67.00},
+    {99.23, 76.00},   {95.00, 82.27},   {89.00, 85.52},   {79.84, 86.00},   {86.73, 114.00},  {98.00, 136.73},
+    {99.00, 137.61},  {109.00, 135.06}, {117.00, 137.94}, {122.52, 146.00}, {122.94, 151.00}, {121.00, 158.58},
+    {134.00, 160.97}, {153.00, 157.45}, {171.30, 150.00}, {169.06, 142.00}, {169.77, 136.00}, {174.00, 129.73},
+    {181.46, 126.00}, {182.22, 120.00}, {182.20, 111.00}, {180.06, 101.00}, {171.28, 85.00},  {171.75, 80.00},
+    {182.30, 53.00},  {189.47, 50.00},  {190.62, 38.00},  {194.00, 33.73},  {199.00, 30.77},  {208.00, 30.48},
+    {216.00, 34.94},  {224.00, 31.47},  {240.00, 30.37},  {247.00, 32.51},  {249.77, 35.00},  {234.75, 53.00},
+    {213.81, 93.00},  {212.08, 99.00},  {213.00, 101.77}, {220.00, 96.77},  {229.00, 96.48},  {236.28, 101.00},
+    {240.00, 107.96}, {245.08, 101.00}, {263.00, 65.32},  {277.47, 48.00},  {284.00, 47.03},  {286.94, 41.00},
+    {292.00, 36.62},  {298.00, 35.06},  {304.00, 35.77},  {314.00, 43.81},  {342.00, 32.56},  {359.00, 31.32},
+    {365.00, 32.57},  {371.00, 36.38},  {379.53, 48.00},  {379.70, 51.00},  {356.00, 52.19},  {347.00, 54.74},
+    {344.38, 66.00},  {341.00, 70.27},  {335.00, 73.52},  {324.00, 72.38},  {317.00, 65.75},  {313.00, 67.79},
+    {307.57, 76.00},  {315.00, 78.62},  {319.28, 82.00},  {322.23, 87.00},  {323.00, 94.41},  {334.00, 92.49},
+    {347.00, 87.47},  {349.62, 80.00},  {353.00, 75.73},  {359.00, 72.48},  {366.00, 72.32},  {372.00, 74.94},
+    {377.00, 81.34},  {382.00, 83.41},  {392.00, 83.40},  {399.00, 79.15},  {404.00, 85.74},  {411.00, 85.06},
+    {417.00, 86.62},  {423.38, 93.00},  {425.05, 104.00}, {438.00, 110.35}, {450.00, 112.17}, {452.62, 103.00},
+    {456.00, 98.73},  {462.00, 95.48},  {472.00, 95.79},  {471.28, 92.00},  {464.00, 84.62},  {445.00, 80.39},
+    {436.00, 75.33},  {428.00, 68.46},  {419.00, 68.52},  {413.00, 65.27},  {408.48, 58.00},  {409.87, 46.00},
+    {404.42, 39.00},  {408.00, 33.88},  {415.00, 29.31},  {429.00, 26.45},  {455.00, 28.77},  {470.00, 33.81},
+    {482.00, 42.16},  {494.00, 46.85},  {499.65, 36.00},  {513.00, 25.95},  {529.00, 22.42},  {537.18, 23.00},
 };
-static int bouncy_terrain_count = sizeof(bouncy_terrain_verts)/sizeof(cpVect);
-
-static cpSpace *init_BouncyTerrainCircles_500(void){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	
-	cpVect offset = cpv(-320, -240);
-	for(int i=0; i<(bouncy_terrain_count - 1); i++){
-		cpVect a = bouncy_terrain_verts[i], b = bouncy_terrain_verts[i+1];
-		cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
-		cpShapeSetElasticity(shape, 1.0);
-	}
-	
-	for(int i=0; i<500; i++){
-		cpFloat radius = 5.0f;
-		cpFloat mass = radius*radius;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-		cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 130.0f), cpvzero));
-		cpBodySetVelocity(body, cpvmult(frand_unit_circle(), 50.0f));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-		cpShapeSetElasticity(shape, 1.0);
-	}
-	
-	return space;
+static int bouncy_terrain_count = sizeof(bouncy_terrain_verts) / sizeof(cpVect);
+
+static cpSpace* init_BouncyTerrainCircles_500(void)
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+
+    cpVect offset = cpv(-320, -240);
+    for (int i = 0; i < (bouncy_terrain_count - 1); i++)
+    {
+        cpVect a = bouncy_terrain_verts[i], b = bouncy_terrain_verts[i + 1];
+        cpShape* shape = cpSpaceAddShape(
+            space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
+        cpShapeSetElasticity(shape, 1.0);
+    }
+
+    for (int i = 0; i < 500; i++)
+    {
+        cpFloat radius = 5.0f;
+        cpFloat mass   = radius * radius;
+        cpBody* body   = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+        cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 130.0f), cpvzero));
+        cpBodySetVelocity(body, cpvmult(frand_unit_circle(), 50.0f));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+        cpShapeSetElasticity(shape, 1.0);
+    }
+
+    return space;
 }
 
-static cpSpace *init_BouncyTerrainHexagons_500(void){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	
-	cpVect offset = cpv(-320, -240);
-	for(int i=0; i<(bouncy_terrain_count - 1); i++){
-		cpVect a = bouncy_terrain_verts[i], b = bouncy_terrain_verts[i+1];
-		cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
-		cpShapeSetElasticity(shape, 1.0);
-	}
-	
-	cpFloat radius = 5.0f;
-	cpVect hexagon[6];
-	for(int i=0; i<6; i++){
-		cpFloat angle = -CP_PI*2.0f*i/6.0f;
-		hexagon[i] = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
-	}
-	
-	for(int i=0; i<500; i++){
-		cpFloat mass = radius*radius;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
-		cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 130.0f), cpvzero));
-		cpBodySetVelocity(body, cpvmult(frand_unit_circle(), 50.0f));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
-		cpShapeSetElasticity(shape, 1.0);
-	}
-	
-	return space;
+static cpSpace* init_BouncyTerrainHexagons_500(void)
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+
+    cpVect offset = cpv(-320, -240);
+    for (int i = 0; i < (bouncy_terrain_count - 1); i++)
+    {
+        cpVect a = bouncy_terrain_verts[i], b = bouncy_terrain_verts[i + 1];
+        cpShape* shape = cpSpaceAddShape(
+            space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpvadd(a, offset), cpvadd(b, offset), 0.0f));
+        cpShapeSetElasticity(shape, 1.0);
+    }
+
+    cpFloat radius = 5.0f;
+    cpVect hexagon[6];
+    for (int i = 0; i < 6; i++)
+    {
+        cpFloat angle = -CP_PI * 2.0f * i / 6.0f;
+        hexagon[i]    = cpvmult(cpv(cos(angle), sin(angle)), radius - bevel);
+    }
+
+    for (int i = 0; i < 500; i++)
+    {
+        cpFloat mass = radius * radius;
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 6, hexagon, cpvzero, 0.0f)));
+        cpBodySetPosition(body, cpvadd(cpvmult(frand_unit_circle(), 130.0f), cpvzero));
+        cpBodySetVelocity(body, cpvmult(frand_unit_circle(), 50.0f));
+
+        cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 6, hexagon, cpTransformIdentity, bevel));
+        cpShapeSetElasticity(shape, 1.0);
+    }
+
+    return space;
 }
 
-
 // No collisions
 
 static cpFloat pentagon_mass   = 0.0f;
 static cpFloat pentagon_moment = 0.0f;
 
-static cpBool NoCollide_begin(cpArbiter *arb, cpSpace *space, void *data){
-    
-	// CCLOG("NoCollide_begin");
-
-	return cpTrue;
-}
+static cpBool NoCollide_begin(cpArbiter* arb, cpSpace* space, void* data)
+{
 
+    // CCLOG("NoCollide_begin");
 
-static cpSpace *init_NoCollide(void){
-	cpSpace *space = BENCH_SPACE_NEW();
-	cpSpaceSetIterations(space, 10);
-	
-	cpCollisionHandler *handler = cpSpaceAddCollisionHandler(space, 2, 2);
-	handler->beginFunc = NoCollide_begin;
-	
-	
-	float radius = 4.5f;
-	
-	cpShapeSetElasticity(cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-330-radius, -250-radius), cpv( 330+radius, -250-radius), 0.0f)), 1.0f);
-	cpShapeSetElasticity(cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv( 330+radius,  250+radius), cpv( 330+radius, -250-radius), 0.0f)), 1.0f);
-	cpShapeSetElasticity(cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv( 330+radius,  250+radius), cpv(-330-radius,  250+radius), 0.0f)), 1.0f);
-	cpShapeSetElasticity(cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-330-radius, -250-radius), cpv(-330-radius,  250+radius), 0.0f)), 1.0f);
-	
-	for(int x=-320; x<=320; x+=20){
-		for(int y=-240; y<=240; y+=20){
-			cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(cpSpaceGetStaticBody(space), radius, cpv(x, y)));
-			cpShapeSetElasticity(shape, 1.0);
-			cpShapeSetCollisionType(shape, 2);
-		}
-	}
-	
-	for(int y=10-240; y<=240; y+=40){
-		cpFloat mass = 7.0f;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-		cpBodySetPosition(body, cpv(-320.0f, y));
-		cpBodySetVelocity(body, cpv(100.0f, 0.0f));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-		cpShapeSetElasticity(shape, 1.0);
-		cpShapeSetCollisionType(shape, 2);
-	}
-	
-	for(int x=30-320; x<=320; x+=40){
-		cpFloat mass = 7.0f;
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-		cpBodySetPosition(body, cpv(x, -240.0f));
-		cpBodySetVelocity(body, cpv(0.0f, 100.0f));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-		cpShapeSetElasticity(shape, 1.0);
-		cpShapeSetCollisionType(shape, 2);
-	}
-	
-	return space;
+    return cpTrue;
 }
 
+static cpSpace* init_NoCollide(void)
+{
+    cpSpace* space = BENCH_SPACE_NEW();
+    cpSpaceSetIterations(space, 10);
+
+    cpCollisionHandler* handler = cpSpaceAddCollisionHandler(space, 2, 2);
+    handler->beginFunc          = NoCollide_begin;
+
+    float radius = 4.5f;
+
+    cpShapeSetElasticity(
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-330 - radius, -250 - radius),
+                                                 cpv(330 + radius, -250 - radius), 0.0f)),
+        1.0f);
+    cpShapeSetElasticity(
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(330 + radius, 250 + radius),
+                                                 cpv(330 + radius, -250 - radius), 0.0f)),
+        1.0f);
+    cpShapeSetElasticity(
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(330 + radius, 250 + radius),
+                                                 cpv(-330 - radius, 250 + radius), 0.0f)),
+        1.0f);
+    cpShapeSetElasticity(
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-330 - radius, -250 - radius),
+                                                 cpv(-330 - radius, 250 + radius), 0.0f)),
+        1.0f);
+
+    for (int x = -320; x <= 320; x += 20)
+    {
+        for (int y = -240; y <= 240; y += 20)
+        {
+            cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(cpSpaceGetStaticBody(space), radius, cpv(x, y)));
+            cpShapeSetElasticity(shape, 1.0);
+            cpShapeSetCollisionType(shape, 2);
+        }
+    }
+
+    for (int y = 10 - 240; y <= 240; y += 40)
+    {
+        cpFloat mass = 7.0f;
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+        cpBodySetPosition(body, cpv(-320.0f, y));
+        cpBodySetVelocity(body, cpv(100.0f, 0.0f));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+        cpShapeSetElasticity(shape, 1.0);
+        cpShapeSetCollisionType(shape, 2);
+    }
+
+    for (int x = 30 - 320; x <= 320; x += 40)
+    {
+        cpFloat mass = 7.0f;
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+        cpBodySetPosition(body, cpv(x, -240.0f));
+        cpBodySetVelocity(body, cpv(0.0f, 100.0f));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+        cpShapeSetElasticity(shape, 1.0);
+        cpShapeSetCollisionType(shape, 2);
+    }
+
+    return space;
+}
 
 // TODO ideas:
 // addition/removal
 // Memory usage? (too small to matter?)
 // http://forums.tigsource.com/index.php?topic=18077.msg518578#msg518578
 
-
 // Build benchmark list
-static void update(cpSpace *space, double dt){
-	BENCH_SPACE_STEP(space, dt);
+static void update(cpSpace* space, double dt)
+{
+    BENCH_SPACE_STEP(space, dt);
 }
 
-static void destroy(cpSpace *space){
-	ChipmunkDemoFreeSpaceChildren(space);
-	BENCH_SPACE_FREE(space);
+static void destroy(cpSpace* space)
+{
+    ChipmunkDemoFreeSpaceChildren(space);
+    BENCH_SPACE_FREE(space);
 }
 
 // Make a second demo declaration for this demo to use in the regular demo set.
 ChipmunkDemo BouncyHexagons = {
-	"Bouncy Hexagons",
-	1.0/60.0,
-	init_BouncyTerrainHexagons_500,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Bouncy Hexagons", 1.0 / 60.0, init_BouncyTerrainHexagons_500, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
 
-#define BENCH(n) {#n, 1.0/60.0, init_##n, update, 	ChipmunkDemoDefaultDrawImpl, destroy}
+#define BENCH(n)                                                               \
+    {                                                                          \
+#        n, 1.0 / 60.0, init_##n, update, ChipmunkDemoDefaultDrawImpl, destroy \
+    }
 ChipmunkDemo bench_list[] = {
-	BENCH(SimpleTerrainCircles_1000),
-	BENCH(SimpleTerrainCircles_500),
-	BENCH(SimpleTerrainCircles_100),
-	BENCH(SimpleTerrainBoxes_1000),
-	BENCH(SimpleTerrainBoxes_500),
-	BENCH(SimpleTerrainBoxes_100),
-	BENCH(SimpleTerrainHexagons_1000),
-	BENCH(SimpleTerrainHexagons_500),
-	BENCH(SimpleTerrainHexagons_100),
-	BENCH(SimpleTerrainVCircles_200),
-	BENCH(SimpleTerrainVBoxes_200),
-	BENCH(SimpleTerrainVHexagons_200),
-	BENCH(ComplexTerrainCircles_1000),
-	BENCH(ComplexTerrainHexagons_1000),
-	BENCH(BouncyTerrainCircles_500),
-	BENCH(BouncyTerrainHexagons_500),
-	BENCH(NoCollide),
+    BENCH(SimpleTerrainCircles_1000),
+    BENCH(SimpleTerrainCircles_500),
+    BENCH(SimpleTerrainCircles_100),
+    BENCH(SimpleTerrainBoxes_1000),
+    BENCH(SimpleTerrainBoxes_500),
+    BENCH(SimpleTerrainBoxes_100),
+    BENCH(SimpleTerrainHexagons_1000),
+    BENCH(SimpleTerrainHexagons_500),
+    BENCH(SimpleTerrainHexagons_100),
+    BENCH(SimpleTerrainVCircles_200),
+    BENCH(SimpleTerrainVBoxes_200),
+    BENCH(SimpleTerrainVHexagons_200),
+    BENCH(ComplexTerrainCircles_1000),
+    BENCH(ComplexTerrainHexagons_1000),
+    BENCH(BouncyTerrainCircles_500),
+    BENCH(BouncyTerrainHexagons_500),
+    BENCH(NoCollide),
 };
 
-int bench_count = sizeof(bench_list)/sizeof(ChipmunkDemo);
+int bench_count = sizeof(bench_list) / sizeof(ChipmunkDemo);
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Buoyancy.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Buoyancy.c
index 71b607e7790a..05224adbf800 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Buoyancy.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Buoyancy.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,10 +23,9 @@
 
 #include "ChipmunkDemo.h"
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
 #define FLUID_DENSITY 0.00014
@@ -35,193 +34,187 @@ update(cpSpace *space, double dt)
 char messageBuffer[1024];
 
 // Modified from chipmunk_private.h
-static inline cpFloat
-k_scalar_body(cpBody *body, cpVect point, cpVect n)
+static inline cpFloat k_scalar_body(cpBody* body, cpVect point, cpVect n)
 {
-	cpFloat rcn = cpvcross(cpvsub(point, cpBodyGetPosition(body)), n);
-	return 1.0f/cpBodyGetMass(body) + rcn*rcn/cpBodyGetMoment(body);
+    cpFloat rcn = cpvcross(cpvsub(point, cpBodyGetPosition(body)), n);
+    return 1.0f / cpBodyGetMass(body) + rcn * rcn / cpBodyGetMoment(body);
 }
 
-static cpBool
-waterPreSolve(cpArbiter *arb, cpSpace *space, void *ptr)
+static cpBool waterPreSolve(cpArbiter* arb, cpSpace* space, void* ptr)
 {
-	CP_ARBITER_GET_SHAPES(arb, water, poly);
-	cpBody *body = cpShapeGetBody(poly);
-	
-	// Get the top of the water sensor bounding box to use as the water level.
-	cpFloat level = cpShapeGetBB(water).t;
-	
-	// Clip the polygon against the water level
-	int count = cpPolyShapeGetCount(poly);
-	int clippedCount = 0;
+    CP_ARBITER_GET_SHAPES(arb, water, poly);
+    cpBody* body = cpShapeGetBody(poly);
+
+    // Get the top of the water sensor bounding box to use as the water level.
+    cpFloat level = cpShapeGetBB(water).t;
+
+    // Clip the polygon against the water level
+    int count        = cpPolyShapeGetCount(poly);
+    int clippedCount = 0;
 #ifdef _MSC_VER
-	// MSVC is pretty much the only compiler in existence that doesn't support variable sized arrays.
-	cpVect clipped[10];
+    // MSVC is pretty much the only compiler in existence that doesn't support variable sized arrays.
+    cpVect clipped[10];
 #else
-	cpVect clipped[count + 1];
+    cpVect clipped[count + 1];
 #endif
 
-	for(int i=0, j=count-1; i<count; j=i, i++){
-		cpVect a = cpBodyLocalToWorld(body, cpPolyShapeGetVert(poly, j));
-		cpVect b = cpBodyLocalToWorld(body, cpPolyShapeGetVert(poly, i));
-		
-		if(a.y < level){
-			clipped[clippedCount] = a;
-			clippedCount++;
-		}
-		
-		cpFloat a_level = a.y - level;
-		cpFloat b_level = b.y - level;
-		
-		if(a_level*b_level < 0.0f){
-			cpFloat t = cpfabs(a_level)/(cpfabs(a_level) + cpfabs(b_level));
-			
-			clipped[clippedCount] = cpvlerp(a, b, t);
-			clippedCount++;
-		}
-	}
-	
-	// Calculate buoyancy from the clipped polygon area
-	cpFloat clippedArea = cpAreaForPoly(clippedCount, clipped, 0.0f);
-	cpFloat displacedMass = clippedArea*FLUID_DENSITY;
-	cpVect centroid = cpCentroidForPoly(clippedCount, clipped);
-	
-	ChipmunkDebugDrawPolygon(clippedCount, clipped, 5.0f, RGBAColor(0, 0, 1, 1), RGBAColor(0, 0, 1, 0.1f));
-	ChipmunkDebugDrawDot(5, centroid, RGBAColor(0, 0, 1, 1));
-	
-	cpFloat dt = cpSpaceGetCurrentTimeStep(space);
-	cpVect g = cpSpaceGetGravity(space);
-	
-	// Apply the buoyancy force as an impulse.
-	cpBodyApplyImpulseAtWorldPoint(body, cpvmult(g, -displacedMass*dt), centroid);
-	
-	// Apply linear damping for the fluid drag.
-	cpVect v_centroid = cpBodyGetVelocityAtWorldPoint(body, centroid);
-	cpFloat k = k_scalar_body(body, centroid, cpvnormalize(v_centroid));
-	cpFloat damping = clippedArea*FLUID_DRAG*FLUID_DENSITY;
-	cpFloat v_coef = cpfexp(-damping*dt*k); // linear drag
-	//cpFloat v_coef = 1.0/(1.0 + damping*dt*cpvlength(v_centroid)*k); // quadratic drag
-	cpBodyApplyImpulseAtWorldPoint(body, cpvmult(cpvsub(cpvmult(v_centroid, v_coef), v_centroid), 1.0/k), centroid);
-	
-	// Apply angular damping for the fluid drag.
-	cpVect cog = cpBodyLocalToWorld(body, cpBodyGetCenterOfGravity(body));
-	cpFloat w_damping = cpMomentForPoly(FLUID_DRAG*FLUID_DENSITY*clippedArea, clippedCount, clipped, cpvneg(cog), 0.0f);
-	cpBodySetAngularVelocity(body, cpBodyGetAngularVelocity(body)*cpfexp(-w_damping*dt/cpBodyGetMoment(body)));
-	
-	return cpTrue;
+    for (int i = 0, j = count - 1; i < count; j = i, i++)
+    {
+        cpVect a = cpBodyLocalToWorld(body, cpPolyShapeGetVert(poly, j));
+        cpVect b = cpBodyLocalToWorld(body, cpPolyShapeGetVert(poly, i));
+
+        if (a.y < level)
+        {
+            clipped[clippedCount] = a;
+            clippedCount++;
+        }
+
+        cpFloat a_level = a.y - level;
+        cpFloat b_level = b.y - level;
+
+        if (a_level * b_level < 0.0f)
+        {
+            cpFloat t = cpfabs(a_level) / (cpfabs(a_level) + cpfabs(b_level));
+
+            clipped[clippedCount] = cpvlerp(a, b, t);
+            clippedCount++;
+        }
+    }
+
+    // Calculate buoyancy from the clipped polygon area
+    cpFloat clippedArea   = cpAreaForPoly(clippedCount, clipped, 0.0f);
+    cpFloat displacedMass = clippedArea * FLUID_DENSITY;
+    cpVect centroid       = cpCentroidForPoly(clippedCount, clipped);
+
+    ChipmunkDebugDrawPolygon(clippedCount, clipped, 5.0f, RGBAColor(0, 0, 1, 1), RGBAColor(0, 0, 1, 0.1f));
+    ChipmunkDebugDrawDot(5, centroid, RGBAColor(0, 0, 1, 1));
+
+    cpFloat dt = cpSpaceGetCurrentTimeStep(space);
+    cpVect g   = cpSpaceGetGravity(space);
+
+    // Apply the buoyancy force as an impulse.
+    cpBodyApplyImpulseAtWorldPoint(body, cpvmult(g, -displacedMass * dt), centroid);
+
+    // Apply linear damping for the fluid drag.
+    cpVect v_centroid = cpBodyGetVelocityAtWorldPoint(body, centroid);
+    cpFloat k         = k_scalar_body(body, centroid, cpvnormalize(v_centroid));
+    cpFloat damping   = clippedArea * FLUID_DRAG * FLUID_DENSITY;
+    cpFloat v_coef    = cpfexp(-damping * dt * k);  // linear drag
+    // cpFloat v_coef = 1.0/(1.0 + damping*dt*cpvlength(v_centroid)*k); // quadratic drag
+    cpBodyApplyImpulseAtWorldPoint(body, cpvmult(cpvsub(cpvmult(v_centroid, v_coef), v_centroid), 1.0 / k), centroid);
+
+    // Apply angular damping for the fluid drag.
+    cpVect cog = cpBodyLocalToWorld(body, cpBodyGetCenterOfGravity(body));
+    cpFloat w_damping =
+        cpMomentForPoly(FLUID_DRAG * FLUID_DENSITY * clippedArea, clippedCount, clipped, cpvneg(cog), 0.0f);
+    cpBodySetAngularVelocity(body, cpBodyGetAngularVelocity(body) * cpfexp(-w_damping * dt / cpBodyGetMoment(body)));
+
+    return cpTrue;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = messageBuffer;
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -500));
-//	cpSpaceSetDamping(space, 0.5);
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	{
-		// Add the edges of the bucket
-		cpBB bb = cpBBNew(-300, -200, 100, 0);
-		cpFloat radius = 5.0f;
-		
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.l, bb.b), cpv(bb.l, bb.t), radius));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.r, bb.b), cpv(bb.r, bb.t), radius));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.l, bb.b), cpv(bb.r, bb.b), radius));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-		
-		// Add the sensor for the water.
-		shape = cpSpaceAddShape(space, cpBoxShapeNew2(staticBody, bb, 0.0));
-		cpShapeSetSensor(shape, cpTrue);
-		cpShapeSetCollisionType(shape, 1);
-	}
-
-
-	{
-		cpFloat width = 200.0f;
-		cpFloat height = 50.0f;
-		cpFloat mass = 0.3*FLUID_DENSITY*width*height;
-		cpFloat moment = cpMomentForBox(mass, width, height);
-		
-		body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-		cpBodySetPosition(body, cpv(-50, -100));
-		cpBodySetVelocity(body, cpv(0, -100));
-		cpBodySetAngularVelocity(body, 1);
-		
-		shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-		cpShapeSetFriction(shape, 0.8f);
-	}
-	
-	{
-		cpFloat width = 40.0f;
-		cpFloat height = width*2;
-		cpFloat mass = 0.3*FLUID_DENSITY*width*height;
-		cpFloat moment = cpMomentForBox(mass, width, height);
-		
-		body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-		cpBodySetPosition(body, cpv(-200, -50));
-		cpBodySetVelocity(body, cpv(0, -100));
-		cpBodySetAngularVelocity(body, 1);
-		
-		shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-		cpShapeSetFriction(shape, 0.8f);
-	}
-	
-	cpCollisionHandler *handler = cpSpaceAddCollisionHandler(space, 1, 0);
-	handler->preSolveFunc = (cpCollisionPreSolveFunc)waterPreSolve;
-		
-	return space;
+    ChipmunkDemoMessageString = messageBuffer;
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -500));
+    //	cpSpaceSetDamping(space, 0.5);
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    {
+        // Add the edges of the bucket
+        cpBB bb        = cpBBNew(-300, -200, 100, 0);
+        cpFloat radius = 5.0f;
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.l, bb.b), cpv(bb.l, bb.t), radius));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.r, bb.b), cpv(bb.r, bb.t), radius));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(bb.l, bb.b), cpv(bb.r, bb.b), radius));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+        // Add the sensor for the water.
+        shape = cpSpaceAddShape(space, cpBoxShapeNew2(staticBody, bb, 0.0));
+        cpShapeSetSensor(shape, cpTrue);
+        cpShapeSetCollisionType(shape, 1);
+    }
+
+    {
+        cpFloat width  = 200.0f;
+        cpFloat height = 50.0f;
+        cpFloat mass   = 0.3 * FLUID_DENSITY * width * height;
+        cpFloat moment = cpMomentForBox(mass, width, height);
+
+        body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+        cpBodySetPosition(body, cpv(-50, -100));
+        cpBodySetVelocity(body, cpv(0, -100));
+        cpBodySetAngularVelocity(body, 1);
+
+        shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+        cpShapeSetFriction(shape, 0.8f);
+    }
+
+    {
+        cpFloat width  = 40.0f;
+        cpFloat height = width * 2;
+        cpFloat mass   = 0.3 * FLUID_DENSITY * width * height;
+        cpFloat moment = cpMomentForBox(mass, width, height);
+
+        body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+        cpBodySetPosition(body, cpv(-200, -50));
+        cpBodySetVelocity(body, cpv(0, -100));
+        cpBodySetAngularVelocity(body, 1);
+
+        shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+        cpShapeSetFriction(shape, 0.8f);
+    }
+
+    cpCollisionHandler* handler = cpSpaceAddCollisionHandler(space, 1, 0);
+    handler->preSolveFunc       = (cpCollisionPreSolveFunc)waterPreSolve;
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Buoyancy = {
-	"Simple Sensor based fluids.",
-	1.0/180.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Simple Sensor based fluids.", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Chains.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Chains.c
index e1c727060bf8..41cbf8cd2a11 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Chains.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Chains.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,133 +18,132 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
 #define CHAIN_COUNT 8
 #define LINK_COUNT 10
 
-static void
-BreakablejointPostStepRemove(cpSpace *space, cpConstraint *joint, void *unused)
+static void BreakablejointPostStepRemove(cpSpace* space, cpConstraint* joint, void* unused)
 {
-	cpSpaceRemoveConstraint(space, joint);
-	cpConstraintFree(joint);
+    cpSpaceRemoveConstraint(space, joint);
+    cpConstraintFree(joint);
 }
 
-static void
-BreakableJointPostSolve(cpConstraint *joint, cpSpace *space)
+static void BreakableJointPostSolve(cpConstraint* joint, cpSpace* space)
 {
-	cpFloat dt = cpSpaceGetCurrentTimeStep(space);
-	
-	// Convert the impulse to a force by dividing it by the timestep.
-	cpFloat force = cpConstraintGetImpulse(joint)/dt;
-	cpFloat maxForce = cpConstraintGetMaxForce(joint);
-
-	// If the force is almost as big as the joint's max force, break it.
-	if(force > 0.9*maxForce){
-		cpSpaceAddPostStepCallback(space, (cpPostStepFunc)BreakablejointPostStepRemove, joint, NULL);
-	}
+    cpFloat dt = cpSpaceGetCurrentTimeStep(space);
+
+    // Convert the impulse to a force by dividing it by the timestep.
+    cpFloat force    = cpConstraintGetImpulse(joint) / dt;
+    cpFloat maxForce = cpConstraintGetMaxForce(joint);
+
+    // If the force is almost as big as the joint's max force, break it.
+    if (force > 0.9 * maxForce)
+    {
+        cpSpaceAddPostStepCallback(space, (cpPostStepFunc)BreakablejointPostStepRemove, joint, NULL);
+    }
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	cpFloat mass = 1;
-	cpFloat width = 20;
-	cpFloat height = 30;
-	
-	cpFloat spacing = width*0.3;
-	
-	// Add lots of boxes.
-	for(int i=0; i<CHAIN_COUNT; i++){
-		cpBody *prev = NULL;
-		
-		for(int j=0; j<LINK_COUNT; j++){
-			cpVect pos = cpv(40*(i - (CHAIN_COUNT - 1)/2.0), 240 - (j + 0.5)*height - (j + 1)*spacing);
-			
-			body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
-			cpBodySetPosition(body, pos);
-			
-			shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpv(0, (height - width)/2.0), cpv(0, (width - height)/2.0), width/2.0));
-			cpShapeSetFriction(shape, 0.8f);
-			
-			cpFloat breakingForce = 80000;
-			
-			cpConstraint *constraint = NULL;
-			if(prev == NULL){
-				constraint = cpSpaceAddConstraint(space, cpSlideJointNew(body, staticBody, cpv(0, height/2), cpv(pos.x, 240), 0, spacing));
-			} else {
-				constraint = cpSpaceAddConstraint(space, cpSlideJointNew(body, prev, cpv(0, height/2), cpv(0, -height/2), 0, spacing));
-			}
-			
-			cpConstraintSetMaxForce(constraint, breakingForce);
-			cpConstraintSetPostSolveFunc(constraint, BreakableJointPostSolve);
-			cpConstraintSetCollideBodies(constraint, cpFalse);
-			
-			prev = body;
-		}
-	}
-	
-	cpFloat radius = 15.0f;
-	body = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(body, cpv(0, -240 + radius+5));
-	cpBodySetVelocity(body, cpv(0, 300));
-
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.9f);
-	
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpFloat mass   = 1;
+    cpFloat width  = 20;
+    cpFloat height = 30;
+
+    cpFloat spacing = width * 0.3;
+
+    // Add lots of boxes.
+    for (int i = 0; i < CHAIN_COUNT; i++)
+    {
+        cpBody* prev = NULL;
+
+        for (int j = 0; j < LINK_COUNT; j++)
+        {
+            cpVect pos = cpv(40 * (i - (CHAIN_COUNT - 1) / 2.0), 240 - (j + 0.5) * height - (j + 1) * spacing);
+
+            body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
+            cpBodySetPosition(body, pos);
+
+            shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpv(0, (height - width) / 2.0),
+                                                             cpv(0, (width - height) / 2.0), width / 2.0));
+            cpShapeSetFriction(shape, 0.8f);
+
+            cpFloat breakingForce = 80000;
+
+            cpConstraint* constraint = NULL;
+            if (prev == NULL)
+            {
+                constraint = cpSpaceAddConstraint(
+                    space, cpSlideJointNew(body, staticBody, cpv(0, height / 2), cpv(pos.x, 240), 0, spacing));
+            }
+            else
+            {
+                constraint = cpSpaceAddConstraint(
+                    space, cpSlideJointNew(body, prev, cpv(0, height / 2), cpv(0, -height / 2), 0, spacing));
+            }
+
+            cpConstraintSetMaxForce(constraint, breakingForce);
+            cpConstraintSetPostSolveFunc(constraint, BreakableJointPostSolve);
+            cpConstraintSetCollideBodies(constraint, cpFalse);
+
+            prev = body;
+        }
+    }
+
+    cpFloat radius = 15.0f;
+    body           = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
+    cpBodySetPosition(body, cpv(0, -240 + radius + 5));
+    cpBodySetVelocity(body, cpv(0, 300));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.9f);
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Chains = {
-	"Breakable Chains",
-	1.0/180.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Breakable Chains", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ChipmunkDemo.h b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ChipmunkDemo.h
index 492f35110e68..65c2cbaaac8c 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ChipmunkDemo.h
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ChipmunkDemo.h
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -19,45 +19,46 @@
  * SOFTWARE.
  */
 
+typedef struct ChipmunkDemo ChipmunkDemo;
 
+typedef cpSpace* (*ChipmunkDemoInitFunc)(void);
+typedef void (*ChipmunkDemoUpdateFunc)(cpSpace* space, double dt);
+typedef void (*ChipmunkDemoDrawFunc)(cpSpace* space);
+typedef void (*ChipmunkDemoDestroyFunc)(cpSpace* space);
 
-typedef struct ChipmunkDemo ChipmunkDemo;
+struct ChipmunkDemo
+{
+    const char* name;
+    double timestep;
 
-typedef cpSpace *(*ChipmunkDemoInitFunc)(void);
-typedef void (*ChipmunkDemoUpdateFunc)(cpSpace *space, double dt);
-typedef void (*ChipmunkDemoDrawFunc)(cpSpace *space);
-typedef void (*ChipmunkDemoDestroyFunc)(cpSpace *space);
+    ChipmunkDemoInitFunc initFunc;
+    ChipmunkDemoUpdateFunc updateFunc;
+    ChipmunkDemoDrawFunc drawFunc;
 
-struct ChipmunkDemo {
-	const char *name;
-	double timestep;
- 
-	ChipmunkDemoInitFunc initFunc;
-	ChipmunkDemoUpdateFunc updateFunc;
-	ChipmunkDemoDrawFunc drawFunc;
-	
-	ChipmunkDemoDestroyFunc destroyFunc;
+    ChipmunkDemoDestroyFunc destroyFunc;
 };
 
-static inline cpFloat
-frand(void)
+static inline cpFloat frand(void)
 {
-	return (cpFloat)rand()/(cpFloat)RAND_MAX;
+    return (cpFloat)rand() / (cpFloat)RAND_MAX;
 }
 
-static inline cpVect
-frand_unit_circle(){
-	cpVect v = cpv(frand()*2.0f - 1.0f, frand()*2.0f - 1.0f);
-	return (cpvlengthsq(v) < 1.0f ? v : frand_unit_circle());
+static inline cpVect frand_unit_circle()
+{
+    cpVect v = cpv(frand() * 2.0f - 1.0f, frand() * 2.0f - 1.0f);
+    return (cpvlengthsq(v) < 1.0f ? v : frand_unit_circle());
 }
 
-typedef struct {
+typedef struct
+{
     float x, y;
 } float2;
-typedef struct {
+typedef struct
+{
     uint8_t r, g, b, a;
 } RGBA8;
-typedef struct {
+typedef struct
+{
     float2 pos;
     float2 uv;
     float r;
@@ -65,7 +66,6 @@ typedef struct {
 } Vertex;
 typedef uint16_t Index;
 
-
 extern int ChipmunkDemoTicks;
 extern double ChipmunkDemoTime;
 extern cpVect ChipmunkDemoKeyboard;
@@ -74,7 +74,7 @@ extern cpBool ChipmunkDemoRightClick;
 extern cpBool ChipmunkDemoRightDown;
 extern float ChipmunkDebugDrawPointLineScale;
 
-extern char const *ChipmunkDemoMessageString;
+extern char const* ChipmunkDemoMessageString;
 extern void ChipmunkDemoPrintString(char const* fmt, ...);
 
 extern cpShapeFilter GRAB_FILTER;
@@ -82,13 +82,22 @@ extern cpShapeFilter NOT_GRABBABLE_FILTER;
 
 void ChipmunkDemoDefaultDrawImpl(cpSpace* space);
 void ChipmunkDemoFreeSpaceChildren(cpSpace* space);
-void ChipmunkDebugDrawCircle(
-    cpVect pos, cpFloat angle, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
+void ChipmunkDebugDrawCircle(cpVect pos,
+                             cpFloat angle,
+                             cpFloat radius,
+                             cpSpaceDebugColor outlineColor,
+                             cpSpaceDebugColor fillColor);
 void ChipmunkDebugDrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color);
-void ChipmunkDebugDrawFatSegment(
-    cpVect a, cpVect b, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
-void ChipmunkDebugDrawPolygon(
-    int count, const cpVect* verts, cpFloat radius, cpSpaceDebugColor outlineColor, cpSpaceDebugColor fillColor);
+void ChipmunkDebugDrawFatSegment(cpVect a,
+                                 cpVect b,
+                                 cpFloat radius,
+                                 cpSpaceDebugColor outlineColor,
+                                 cpSpaceDebugColor fillColor);
+void ChipmunkDebugDrawPolygon(int count,
+                              const cpVect* verts,
+                              cpFloat radius,
+                              cpSpaceDebugColor outlineColor,
+                              cpSpaceDebugColor fillColor);
 void ChipmunkDebugDrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor fillColor);
 void ChipmunkDebugDrawBB(cpBB bb, cpSpaceDebugColor outlineColor);
 cpSpaceDebugColor LAColor(float l, float a);
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ContactGraph.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ContactGraph.c
index a35770cdd3d5..ce6d1a29ed96 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ContactGraph.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/ContactGraph.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,203 +18,194 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
 // static body that we will be making into a scale
-static cpBody *scaleStaticBody;
-static cpBody *ballBody;
+static cpBody* scaleStaticBody;
+static cpBody* ballBody;
 
 // If your compiler supports blocks (Clang or some GCC versions),
 // You can use the block based iterators instead of the function ones to make your life easier.
 #if defined(__has_extension)
-#if __has_extension(blocks)
+#    if __has_extension(blocks)
 
-#define USE_BLOCKS 1
+#        define USE_BLOCKS 1
 
-#endif
+#    endif
 #endif
 
-
 #if !USE_BLOCKS
 
-static void
-ScaleIterator(cpBody *body, cpArbiter *arb, cpVect *sum)
+static void ScaleIterator(cpBody* body, cpArbiter* arb, cpVect* sum)
 {
-	(*sum) = cpvadd(*sum, cpArbiterTotalImpulse(arb));
+    (*sum) = cpvadd(*sum, cpArbiterTotalImpulse(arb));
 }
 
-static void
-BallIterator(cpBody *body, cpArbiter *arb, int *count)
+static void BallIterator(cpBody* body, cpArbiter* arb, int* count)
 {
-	// body is the body we are iterating the arbiters for.
-	// CP_ARBITER_GET_*() in an arbiter iterator always returns the body/shape for the iterated body first.
-	CP_ARBITER_GET_SHAPES(arb, ball, other);
-	ChipmunkDebugDrawBB(cpShapeGetBB(other), RGBAColor(1, 0, 0, 1));
-	
-	(*count)++;
+    // body is the body we are iterating the arbiters for.
+    // CP_ARBITER_GET_*() in an arbiter iterator always returns the body/shape for the iterated body first.
+    CP_ARBITER_GET_SHAPES(arb, ball, other);
+    ChipmunkDebugDrawBB(cpShapeGetBB(other), RGBAColor(1, 0, 0, 1));
+
+    (*count)++;
 }
 
-struct CrushingContext {
-	cpFloat magnitudeSum;
-	cpVect vectorSum;
+struct CrushingContext
+{
+    cpFloat magnitudeSum;
+    cpVect vectorSum;
 };
 
-static void
-EstimateCrushing(cpBody *body, cpArbiter *arb, struct CrushingContext *context)
+static void EstimateCrushing(cpBody* body, cpArbiter* arb, struct CrushingContext* context)
 {
-	cpVect j = cpArbiterTotalImpulse(arb);
-	context->magnitudeSum += cpvlength(j);
-	context->vectorSum = cpvadd(context->vectorSum, j);
+    cpVect j = cpArbiterTotalImpulse(arb);
+    context->magnitudeSum += cpvlength(j);
+    context->vectorSum = cpvadd(context->vectorSum, j);
 }
 
 #endif
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
-	
-	ChipmunkDemoPrintString("Place objects on the scale to weigh them. The ball marks the shapes it's sitting on.\n");
-	
-	// Sum the total impulse applied to the scale from all collision pairs in the contact graph.
-	// If your compiler supports blocks, your life is a little easier.
-	// You can use the "Block" versions of the functions without needing the callbacks above.
-	#if USE_BLOCKS
-		__block cpVect impulseSum = cpvzero;
-		cpBodyEachArbiter_b(scaleStaticBody, ^(cpArbiter *arb){
-			impulseSum = cpvadd(impulseSum, cpArbiterTotalImpulse(arb));
-		});
-	#else
-		cpVect impulseSum = cpvzero;
-		cpBodyEachArbiter(scaleStaticBody, (cpBodyArbiterIteratorFunc)ScaleIterator, &impulseSum);
-	#endif
-	
-	// Force is the impulse divided by the timestep.
-	cpFloat force = cpvlength(impulseSum)/dt;
-		
-	// Weight can be found similarly from the gravity vector.
-	cpVect g = cpSpaceGetGravity(space);
-	cpFloat weight = cpvdot(g, impulseSum)/(cpvlengthsq(g)*dt);
-	
-	ChipmunkDemoPrintString("Total force: %5.2f, Total weight: %5.2f. ", force, weight);
-	
-	
-	// Highlight and count the number of shapes the ball is touching.
-	#if USE_BLOCKS
-		__block int count = 0;
-		cpBodyEachArbiter_b(ballBody, ^(cpArbiter *arb){
-			// body is the body we are iterating the arbiters for.
-			// CP_ARBITER_GET_*() in an arbiter iterator always returns the body/shape for the iterated body first.
-			CP_ARBITER_GET_SHAPES(arb, ball, other);
-			ChipmunkDebugDrawBB(cpShapeGetBB(other), RGBAColor(1, 0, 0, 1));
-			
-			count++;
-		});
-	#else
-		int count = 0;
-		cpBodyEachArbiter(ballBody, (cpBodyArbiterIteratorFunc)BallIterator, &count);
-	#endif
-	
-	ChipmunkDemoPrintString("The ball is touching %d shapes.\n", count);
-	
-	#if USE_BLOCKS
-		__block cpFloat magnitudeSum = 0.0f;
-		__block cpVect vectorSum = cpvzero;
-		cpBodyEachArbiter_b(ballBody, ^(cpArbiter *arb){
-			cpVect j = cpArbiterTotalImpulse(arb);
-			magnitudeSum += cpvlength(j);
-			vectorSum = cpvadd(vectorSum, j);
-		});
-		
-		cpFloat crushForce = (magnitudeSum - cpvlength(vectorSum))*dt;
-	#else
-		struct CrushingContext crush = {0.0f, cpvzero};
-		cpBodyEachArbiter(ballBody, (cpBodyArbiterIteratorFunc)EstimateCrushing, &crush);
-		
-		cpFloat crushForce = (crush.magnitudeSum - cpvlength(crush.vectorSum))*dt;
-	#endif
-	
-	
-	if(crushForce > 10.0f){
-		ChipmunkDemoPrintString("The ball is being crushed. (f: %.2f)", crushForce);
-	} else {
-		ChipmunkDemoPrintString("The ball is not being crushed. (f: %.2f)", crushForce);
-	}
+    cpSpaceStep(space, dt);
+
+    ChipmunkDemoPrintString("Place objects on the scale to weigh them. The ball marks the shapes it's sitting on.\n");
+
+// Sum the total impulse applied to the scale from all collision pairs in the contact graph.
+// If your compiler supports blocks, your life is a little easier.
+// You can use the "Block" versions of the functions without needing the callbacks above.
+#if USE_BLOCKS
+    __block cpVect impulseSum = cpvzero;
+    cpBodyEachArbiter_b(scaleStaticBody, ^(cpArbiter* arb) {
+      impulseSum = cpvadd(impulseSum, cpArbiterTotalImpulse(arb));
+    });
+#else
+    cpVect impulseSum = cpvzero;
+    cpBodyEachArbiter(scaleStaticBody, (cpBodyArbiterIteratorFunc)ScaleIterator, &impulseSum);
+#endif
+
+    // Force is the impulse divided by the timestep.
+    cpFloat force = cpvlength(impulseSum) / dt;
+
+    // Weight can be found similarly from the gravity vector.
+    cpVect g       = cpSpaceGetGravity(space);
+    cpFloat weight = cpvdot(g, impulseSum) / (cpvlengthsq(g) * dt);
+
+    ChipmunkDemoPrintString("Total force: %5.2f, Total weight: %5.2f. ", force, weight);
+
+// Highlight and count the number of shapes the ball is touching.
+#if USE_BLOCKS
+    __block int count = 0;
+    cpBodyEachArbiter_b(ballBody, ^(cpArbiter* arb) {
+      // body is the body we are iterating the arbiters for.
+      // CP_ARBITER_GET_*() in an arbiter iterator always returns the body/shape for the iterated body first.
+      CP_ARBITER_GET_SHAPES(arb, ball, other);
+      ChipmunkDebugDrawBB(cpShapeGetBB(other), RGBAColor(1, 0, 0, 1));
+
+      count++;
+    });
+#else
+    int count = 0;
+    cpBodyEachArbiter(ballBody, (cpBodyArbiterIteratorFunc)BallIterator, &count);
+#endif
+
+    ChipmunkDemoPrintString("The ball is touching %d shapes.\n", count);
+
+#if USE_BLOCKS
+    __block cpFloat magnitudeSum = 0.0f;
+    __block cpVect vectorSum     = cpvzero;
+    cpBodyEachArbiter_b(ballBody, ^(cpArbiter* arb) {
+      cpVect j = cpArbiterTotalImpulse(arb);
+      magnitudeSum += cpvlength(j);
+      vectorSum = cpvadd(vectorSum, j);
+    });
+
+    cpFloat crushForce = (magnitudeSum - cpvlength(vectorSum)) * dt;
+#else
+    struct CrushingContext crush = {0.0f, cpvzero};
+    cpBodyEachArbiter(ballBody, (cpBodyArbiterIteratorFunc)EstimateCrushing, &crush);
+
+    cpFloat crushForce = (crush.magnitudeSum - cpvlength(crush.vectorSum)) * dt;
+#endif
+
+    if (crushForce > 10.0f)
+    {
+        ChipmunkDemoPrintString("The ball is being crushed. (f: %.2f)", crushForce);
+    }
+    else
+    {
+        ChipmunkDemoPrintString("The ball is not being crushed. (f: %.2f)", crushForce);
+    }
 }
 
 #define WIDTH 4.0f
 #define HEIGHT 30.0f
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -300));
-	cpSpaceSetCollisionSlop(space, 0.5);
-	cpSpaceSetSleepTimeThreshold(space, 1.0f);
-	
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// Create segments around the edge of the screen.
-        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	scaleStaticBody = cpSpaceAddBody(space, cpBodyNewStatic());
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(scaleStaticBody, cpv(-240,-180), cpv(-140,-180), 4.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	// add some boxes to stack on the scale
-	for(int i=0; i<5; i++){
-		body = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForBox(1.0f, 30.0f, 30.0f)));
-		cpBodySetPosition(body, cpv(0, i*32 - 120));
-		
-		shape = cpSpaceAddShape(space, cpBoxShapeNew(body, 30.0f, 30.0f, 0.0));
-		cpShapeSetElasticity(shape, 0.0f);
-		cpShapeSetFriction(shape, 0.8f);
-	}
-	
-	// Add a ball that we'll track which objects are beneath it.
-	cpFloat radius = 15.0f;
-	ballBody = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(ballBody, cpv(120, -140 + radius+5));
-
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(ballBody, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.9f);
-	
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -300));
+    cpSpaceSetCollisionSlop(space, 0.5);
+    cpSpaceSetSleepTimeThreshold(space, 1.0f);
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    scaleStaticBody = cpSpaceAddBody(space, cpBodyNewStatic());
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(scaleStaticBody, cpv(-240, -180), cpv(-140, -180), 4.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // add some boxes to stack on the scale
+    for (int i = 0; i < 5; i++)
+    {
+        body = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForBox(1.0f, 30.0f, 30.0f)));
+        cpBodySetPosition(body, cpv(0, i * 32 - 120));
+
+        shape = cpSpaceAddShape(space, cpBoxShapeNew(body, 30.0f, 30.0f, 0.0));
+        cpShapeSetElasticity(shape, 0.0f);
+        cpShapeSetFriction(shape, 0.8f);
+    }
+
+    // Add a ball that we'll track which objects are beneath it.
+    cpFloat radius = 15.0f;
+    ballBody       = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
+    cpBodySetPosition(ballBody, cpv(120, -140 + radius + 5));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(ballBody, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.9f);
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo ContactGraph = {
-	"Contact Graph",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Contact Graph", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Convex.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Convex.c
index 72d5506074b9..b4e457f26be3 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Convex.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Convex.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,99 +18,93 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "chipmunk/chipmunk_unsafe.h"
 
 #include "ChipmunkDemo.h"
 
-#define DENSITY (1.0/10000.0)
+#define DENSITY (1.0 / 10000.0)
 
-static cpShape *shape;
+static cpShape* shape;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpFloat tolerance = 2.0;
-	
-	if(ChipmunkDemoRightClick && cpShapePointQuery(shape, ChipmunkDemoMouse, NULL) > tolerance){
-		cpBody *body = cpShapeGetBody(shape);
-		int count = cpPolyShapeGetCount(shape);
-		
-		// Allocate the space for the new vertexes on the stack.
-		cpVect *verts = (cpVect *)alloca((count + 1)*sizeof(cpVect));
-		
-		for(int i=0; i<count; i++){
-			verts[i] = cpPolyShapeGetVert(shape, i);
-		}
-		
-		verts[count] = cpBodyWorldToLocal(body, ChipmunkDemoMouse);
-		
-		// This function builds a convex hull for the vertexes.
-		// Because the result array is the same as verts, it will reduce it in place.
-		int hullCount = cpConvexHull(count + 1, verts, verts, NULL, tolerance);
-		
-		// Figure out how much to shift the body by.
-		cpVect centroid = cpCentroidForPoly(hullCount, verts);
-		
-		// Recalculate the body properties to match the updated shape.
-		cpFloat mass = cpAreaForPoly(hullCount, verts, 0.0f)*DENSITY;
-		cpBodySetMass(body, mass);
-		cpBodySetMoment(body, cpMomentForPoly(mass, hullCount, verts, cpvneg(centroid), 0.0f));
-		cpBodySetPosition(body, cpBodyLocalToWorld(body, centroid));
-		
-		// Use the setter function from chipmunk_unsafe.h.
-		// You could also remove and recreate the shape if you wanted.
-		cpPolyShapeSetVerts(shape, hullCount, verts, cpTransformTranslate(cpvneg(centroid)));
-	}
-	
-	cpSpaceStep(space, dt);
+    cpFloat tolerance = 2.0;
+
+    if (ChipmunkDemoRightClick && cpShapePointQuery(shape, ChipmunkDemoMouse, NULL) > tolerance)
+    {
+        cpBody* body = cpShapeGetBody(shape);
+        int count    = cpPolyShapeGetCount(shape);
+
+        // Allocate the space for the new vertexes on the stack.
+        cpVect* verts = (cpVect*)alloca((count + 1) * sizeof(cpVect));
+
+        for (int i = 0; i < count; i++)
+        {
+            verts[i] = cpPolyShapeGetVert(shape, i);
+        }
+
+        verts[count] = cpBodyWorldToLocal(body, ChipmunkDemoMouse);
+
+        // This function builds a convex hull for the vertexes.
+        // Because the result array is the same as verts, it will reduce it in place.
+        int hullCount = cpConvexHull(count + 1, verts, verts, NULL, tolerance);
+
+        // Figure out how much to shift the body by.
+        cpVect centroid = cpCentroidForPoly(hullCount, verts);
+
+        // Recalculate the body properties to match the updated shape.
+        cpFloat mass = cpAreaForPoly(hullCount, verts, 0.0f) * DENSITY;
+        cpBodySetMass(body, mass);
+        cpBodySetMoment(body, cpMomentForPoly(mass, hullCount, verts, cpvneg(centroid), 0.0f));
+        cpBodySetPosition(body, cpBodyLocalToWorld(body, centroid));
+
+        // Use the setter function from chipmunk_unsafe.h.
+        // You could also remove and recreate the shape if you wanted.
+        cpPolyShapeSetVerts(shape, hullCount, verts, cpTransformTranslate(cpvneg(centroid)));
+    }
+
+    cpSpaceStep(space, dt);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Right click and drag to change the blocks's shape.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -500));
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	cpFloat width = 50.0f;
-	cpFloat height = 70.0f;
-	cpFloat mass = width*height*DENSITY;
-	cpFloat moment = cpMomentForBox(mass, width, height);
-	
-	body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-	
-	shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-	cpShapeSetFriction(shape, 0.6f);
-		
-	return space;
+    ChipmunkDemoMessageString = "Right click and drag to change the blocks's shape.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -500));
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpFloat width  = 50.0f;
+    cpFloat height = 70.0f;
+    cpFloat mass   = width * height * DENSITY;
+    cpFloat moment = cpMomentForBox(mass, width, height);
+
+    body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+
+    shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+    cpShapeSetFriction(shape, 0.6f);
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Convex = {
-	"Convex.",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Convex.", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Crane.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Crane.c
index 9141e85c321d..7d0cfe9e021d 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Crane.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Crane.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,155 +18,143 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpBody *dollyBody = NULL;
+static cpBody* dollyBody = NULL;
 // Constraint used as a servo motor to move the dolly back and forth.
-static cpConstraint *dollyServo = NULL;
+static cpConstraint* dollyServo = NULL;
 
 // Constraint used as a winch motor to lift the load.
-static cpConstraint *winchServo = NULL;
+static cpConstraint* winchServo = NULL;
 
 // Temporary joint used to hold the hook to the load.
-static cpConstraint *hookJoint = NULL;
-
+static cpConstraint* hookJoint = NULL;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	// Set the first anchor point (the one attached to the static body) of the dolly servo to the mouse's x position.
-	cpPivotJointSetAnchorA(dollyServo, cpv(ChipmunkDemoMouse.x, 100));
-	
-	// Set the max length of the winch servo to match the mouse's height.
-	cpSlideJointSetMax(winchServo, cpfmax(100 - ChipmunkDemoMouse.y, 50));
-	
-	if(hookJoint && ChipmunkDemoRightClick){
-		cpSpaceRemoveConstraint(space, hookJoint);
-		cpConstraintFree(hookJoint);
-		hookJoint = NULL;
-	}
-	
-	cpSpaceStep(space, dt);
+    // Set the first anchor point (the one attached to the static body) of the dolly servo to the mouse's x position.
+    cpPivotJointSetAnchorA(dollyServo, cpv(ChipmunkDemoMouse.x, 100));
+
+    // Set the max length of the winch servo to match the mouse's height.
+    cpSlideJointSetMax(winchServo, cpfmax(100 - ChipmunkDemoMouse.y, 50));
+
+    if (hookJoint && ChipmunkDemoRightClick)
+    {
+        cpSpaceRemoveConstraint(space, hookJoint);
+        cpConstraintFree(hookJoint);
+        hookJoint = NULL;
+    }
+
+    cpSpaceStep(space, dt);
 }
 
-enum COLLISION_TYPES {
-	HOOK_SENSOR = 1,
-	CRATE,
+enum COLLISION_TYPES
+{
+    HOOK_SENSOR = 1,
+    CRATE,
 };
 
-static void
-AttachHook(cpSpace *space, cpBody *hook, cpBody *crate)
+static void AttachHook(cpSpace* space, cpBody* hook, cpBody* crate)
 {
-	hookJoint = cpSpaceAddConstraint(space, cpPivotJointNew(hook, crate, cpBodyGetPosition(hook)));
+    hookJoint = cpSpaceAddConstraint(space, cpPivotJointNew(hook, crate, cpBodyGetPosition(hook)));
 }
 
-
-static cpBool
-HookCrate(cpArbiter *arb, cpSpace *space, void *data)
+static cpBool HookCrate(cpArbiter* arb, cpSpace* space, void* data)
 {
-	if(hookJoint == NULL){
-		// Get pointers to the two bodies in the collision pair and define local variables for them.
-		// Their order matches the order of the collision types passed
-		// to the collision handler this function was defined for
-		CP_ARBITER_GET_BODIES(arb, hook, crate);
-		
-		// additions and removals can't be done in a normal callback.
-		// Schedule a post step callback to do it.
-		// Use the hook as the key and pass along the arbiter.
-		cpSpaceAddPostStepCallback(space, (cpPostStepFunc)AttachHook, hook, crate);
-	}
-	
-	return cpTrue; // return value is ignored for sensor callbacks anyway
-}
+    if (hookJoint == NULL)
+    {
+        // Get pointers to the two bodies in the collision pair and define local variables for them.
+        // Their order matches the order of the collision types passed
+        // to the collision handler this function was defined for
+        CP_ARBITER_GET_BODIES(arb, hook, crate);
+
+        // additions and removals can't be done in a normal callback.
+        // Schedule a post step callback to do it.
+        // Use the hook as the key and pass along the arbiter.
+        cpSpaceAddPostStepCallback(space, (cpPostStepFunc)AttachHook, hook, crate);
+    }
 
+    return cpTrue;  // return value is ignored for sensor callbacks anyway
+}
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Control the crane by moving the mouse. Right click to release.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetDamping(space, 0.8);
-	
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	// Add a body for the dolly.
-	dollyBody = cpSpaceAddBody(space, cpBodyNew(10, INFINITY));
-	cpBodySetPosition(dollyBody, cpv(0, 100));
-	
-	// Add a block so you can see it.
-	cpSpaceAddShape(space, cpBoxShapeNew(dollyBody, 30, 30, 0.0));
-	
-	// Add a groove joint for it to move back and forth on.
-	cpSpaceAddConstraint(space, cpGrooveJointNew(staticBody, dollyBody, cpv(-250, 100), cpv(250, 100), cpvzero));
-	
-	// Add a pivot joint to act as a servo motor controlling it's position
-	// By updating the anchor points of the pivot joint, you can move the dolly.
-	dollyServo = cpSpaceAddConstraint(space, cpPivotJointNew(staticBody, dollyBody, cpBodyGetPosition(dollyBody)));
-	// Max force the dolly servo can generate.
-	cpConstraintSetMaxForce(dollyServo, 10000);
-	// Max speed of the dolly servo
-	cpConstraintSetMaxBias(dollyServo, 100);
-	// You can also change the error bias to control how it slows down.
-	//cpConstraintSetErrorBias(dollyServo, 0.2);
-	
-	
-	// Add the crane hook.
-	cpBody *hookBody = cpSpaceAddBody(space, cpBodyNew(1, INFINITY));
-	cpBodySetPosition(hookBody, cpv(0, 50));
-	
-	// Add a sensor shape for it. This will be used to figure out when the hook touches a box.
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(hookBody, 10, cpvzero));
-	cpShapeSetSensor(shape, cpTrue);
-	cpShapeSetCollisionType(shape, HOOK_SENSOR);
-	
-	// Add a slide joint to act as a winch motor
-	// By updating the max length of the joint you can make it pull up the load.
-	winchServo = cpSpaceAddConstraint(space, cpSlideJointNew(dollyBody, hookBody, cpvzero, cpvzero, 0, INFINITY));
-	// Max force the dolly servo can generate.
-	cpConstraintSetMaxForce(winchServo, 30000);
-	// Max speed of the dolly servo
-	cpConstraintSetMaxBias(winchServo, 60);
-	
-	// TODO: cleanup
-	// Finally a box to play with
-	cpBody *boxBody = cpSpaceAddBody(space, cpBodyNew(30, cpMomentForBox(30, 50, 50)));
-	cpBodySetPosition(boxBody, cpv(200, -200));
-	
-	// Add a block so you can see it.
-	shape = cpSpaceAddShape(space, cpBoxShapeNew(boxBody, 50, 50, 0.0));
-	cpShapeSetFriction(shape, 0.7);
-	cpShapeSetCollisionType(shape, CRATE);
-	
-	cpCollisionHandler *handler = cpSpaceAddCollisionHandler(space, HOOK_SENSOR, CRATE);
-	handler->beginFunc = (cpCollisionBeginFunc)HookCrate;
-	
-	
-	return space;
+    ChipmunkDemoMessageString = "Control the crane by moving the mouse. Right click to release.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetDamping(space, 0.8);
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // Add a body for the dolly.
+    dollyBody = cpSpaceAddBody(space, cpBodyNew(10, INFINITY));
+    cpBodySetPosition(dollyBody, cpv(0, 100));
+
+    // Add a block so you can see it.
+    cpSpaceAddShape(space, cpBoxShapeNew(dollyBody, 30, 30, 0.0));
+
+    // Add a groove joint for it to move back and forth on.
+    cpSpaceAddConstraint(space, cpGrooveJointNew(staticBody, dollyBody, cpv(-250, 100), cpv(250, 100), cpvzero));
+
+    // Add a pivot joint to act as a servo motor controlling it's position
+    // By updating the anchor points of the pivot joint, you can move the dolly.
+    dollyServo = cpSpaceAddConstraint(space, cpPivotJointNew(staticBody, dollyBody, cpBodyGetPosition(dollyBody)));
+    // Max force the dolly servo can generate.
+    cpConstraintSetMaxForce(dollyServo, 10000);
+    // Max speed of the dolly servo
+    cpConstraintSetMaxBias(dollyServo, 100);
+    // You can also change the error bias to control how it slows down.
+    // cpConstraintSetErrorBias(dollyServo, 0.2);
+
+    // Add the crane hook.
+    cpBody* hookBody = cpSpaceAddBody(space, cpBodyNew(1, INFINITY));
+    cpBodySetPosition(hookBody, cpv(0, 50));
+
+    // Add a sensor shape for it. This will be used to figure out when the hook touches a box.
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(hookBody, 10, cpvzero));
+    cpShapeSetSensor(shape, cpTrue);
+    cpShapeSetCollisionType(shape, HOOK_SENSOR);
+
+    // Add a slide joint to act as a winch motor
+    // By updating the max length of the joint you can make it pull up the load.
+    winchServo = cpSpaceAddConstraint(space, cpSlideJointNew(dollyBody, hookBody, cpvzero, cpvzero, 0, INFINITY));
+    // Max force the dolly servo can generate.
+    cpConstraintSetMaxForce(winchServo, 30000);
+    // Max speed of the dolly servo
+    cpConstraintSetMaxBias(winchServo, 60);
+
+    // TODO: cleanup
+    // Finally a box to play with
+    cpBody* boxBody = cpSpaceAddBody(space, cpBodyNew(30, cpMomentForBox(30, 50, 50)));
+    cpBodySetPosition(boxBody, cpv(200, -200));
+
+    // Add a block so you can see it.
+    shape = cpSpaceAddShape(space, cpBoxShapeNew(boxBody, 50, 50, 0.0));
+    cpShapeSetFriction(shape, 0.7);
+    cpShapeSetCollisionType(shape, CRATE);
+
+    cpCollisionHandler* handler = cpSpaceAddCollisionHandler(space, HOOK_SENSOR, CRATE);
+    handler->beginFunc          = (cpCollisionBeginFunc)HookCrate;
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Crane = {
-	"Crane",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Crane", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Example.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Example.c
index 75279f57795c..d3436dda5ace 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Example.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Example.c
@@ -29,12 +29,13 @@
 #include "chipmunk/chipmunk_unsafe.h"
 #include "ChipmunkDemo.h"
 
-static void update(cpSpace* space, double dt) {
+static void update(cpSpace* space, double dt)
+{
     cpSpaceStep(space, dt);
 }
 
-
-static cpSpace* init(void) {
+static cpSpace* init(void)
+{
     cpSpace* space = cpSpaceNew();
     cpSpaceSetIterations(space, 5);
     space->damping = 0.1;
@@ -43,7 +44,6 @@ static cpSpace* init(void) {
 
     cpFloat mass = 1.0f;
 
-
     {
         cpFloat size = 100.0;
 
@@ -67,8 +67,9 @@ static cpSpace* init(void) {
         const int NUM_VERTS = 5;
 
         cpVect verts[NUM_VERTS];
-        for (int i = 0; i < NUM_VERTS; i++) {
-            cpFloat angle = -2 * M_PI * i / ((cpFloat) NUM_VERTS);
+        for (int i = 0; i < NUM_VERTS; i++)
+        {
+            cpFloat angle = -2 * M_PI * i / ((cpFloat)NUM_VERTS);
             verts[i]      = cpv(size / 2.0 * cos(angle), size / 2.0 * sin(angle));
         }
 
@@ -82,8 +83,9 @@ static cpSpace* init(void) {
         const int NUM_VERTS = 4;
 
         cpVect verts[NUM_VERTS];
-        for (int i = 0; i < NUM_VERTS; i++) {
-            cpFloat angle = -2 * M_PI * i / ((cpFloat) NUM_VERTS);
+        for (int i = 0; i < NUM_VERTS; i++)
+        {
+            cpFloat angle = -2 * M_PI * i / ((cpFloat)NUM_VERTS);
             verts[i]      = cpv(size / 2.0 * cos(angle), size / 2.0 * sin(angle));
         }
 
@@ -115,16 +117,12 @@ static cpSpace* init(void) {
     return space;
 }
 
-static void destroy(cpSpace* space) {
+static void destroy(cpSpace* space)
+{
     ChipmunkDemoFreeSpaceChildren(space);
     cpSpaceFree(space);
 }
 
 ChipmunkDemo Example = {
-    "Template to start (GJK)",
-    1.0f / 60.0f,
-    init,
-    update,
-    ChipmunkDemoDefaultDrawImpl,
-    destroy,
+    "Template to start (GJK)", 1.0f / 60.0f, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Joints.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Joints.c
index 3a7f23a6e16d..db27fe805351 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Joints.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Joints.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,281 +18,267 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpBody *
-addBall(cpSpace *space, cpVect pos, cpVect boxOffset)
+static cpBody* addBall(cpSpace* space, cpVect pos, cpVect boxOffset)
 {
-	cpFloat radius = 15.0f;
-	cpFloat mass = 1.0f;
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(body, cpvadd(pos, boxOffset));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	
-	return body;
+    cpFloat radius = 15.0f;
+    cpFloat mass   = 1.0f;
+    cpBody* body   = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+    cpBodySetPosition(body, cpvadd(pos, boxOffset));
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+
+    return body;
 }
 
-static cpBody *
-addLever(cpSpace *space, cpVect pos, cpVect boxOffset)
+static cpBody* addLever(cpSpace* space, cpVect pos, cpVect boxOffset)
 {
-	cpFloat mass = 1.0f;
-	cpVect a = cpv(0,  15);
-	cpVect b = cpv(0, -15);
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
-	cpBodySetPosition(body, cpvadd(pos, cpvadd(boxOffset, cpv(0, -15))));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 5.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	
-	return body;
+    cpFloat mass = 1.0f;
+    cpVect a     = cpv(0, 15);
+    cpVect b     = cpv(0, -15);
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
+    cpBodySetPosition(body, cpvadd(pos, cpvadd(boxOffset, cpv(0, -15))));
+
+    cpShape* shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 5.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+
+    return body;
 }
 
-static cpBody *
-addBar(cpSpace *space, cpVect pos, cpVect boxOffset)
+static cpBody* addBar(cpSpace* space, cpVect pos, cpVect boxOffset)
 {
-	cpFloat mass = 2.0f;
-	cpVect a = cpv(0,  30);
-	cpVect b = cpv(0, -30);
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
-	cpBodySetPosition(body, cpvadd(pos, boxOffset));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 5.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	return body;
+    cpFloat mass = 2.0f;
+    cpVect a     = cpv(0, 30);
+    cpVect b     = cpv(0, -30);
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
+    cpBodySetPosition(body, cpvadd(pos, boxOffset));
+
+    cpShape* shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 5.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    return body;
 }
 
-static cpBody *
-addWheel(cpSpace *space, cpVect pos, cpVect boxOffset)
+static cpBody* addWheel(cpSpace* space, cpVect pos, cpVect boxOffset)
 {
-	cpFloat radius = 15.0f;
-	cpFloat mass = 1.0f;
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(body, cpvadd(pos, boxOffset));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	return body;
+    cpFloat radius = 15.0f;
+    cpFloat mass   = 1.0f;
+    cpBody* body   = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+    cpBodySetPosition(body, cpvadd(pos, boxOffset));
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    return body;
 }
 
-static cpBody *
-addChassis(cpSpace *space, cpVect pos, cpVect boxOffset)
+static cpBody* addChassis(cpSpace* space, cpVect pos, cpVect boxOffset)
 {
-	cpFloat mass = 5.0f;
-	cpFloat width = 80;
-	cpFloat height = 30;
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
-	cpBodySetPosition(body, cpvadd(pos, boxOffset));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	return body;
+    cpFloat mass   = 5.0f;
+    cpFloat width  = 80;
+    cpFloat height = 30;
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
+    cpBodySetPosition(body, cpvadd(pos, boxOffset));
+
+    cpShape* shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    return body;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -100));
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,120), cpv(320,120), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,0), cpv(320,0), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-120), cpv(320,-120), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-160,-240), cpv(-160,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(0,-240), cpv(0,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(160,-240), cpv(160,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	cpVect boxOffset;
-	cpBody *body1, *body2;
-	
-	cpVect posA = cpv( 50, 60);
-	cpVect posB = cpv(110, 60);
-	
-	#define POS_A cpvadd(boxOffset, posA)
-	#define POS_B cpvadd(boxOffset, posB)
-	
-	// Pin Joints - Link shapes with a solid bar or pin.
-	// Keeps the anchor points the same distance apart from when the joint was created.
-	boxOffset = cpv(-320, -240);
-	body1 = addBall(space, posA, boxOffset);
-	body2 = addBall(space, posB, boxOffset);
-	cpSpaceAddConstraint(space, cpPinJointNew(body1, body2, cpv(15,0), cpv(-15,0)));
-	
-	// Slide Joints - Like pin joints but with a min/max distance.
-	// Can be used for a cheap approximation of a rope.
-	boxOffset = cpv(-160, -240);
-	body1 = addBall(space, posA, boxOffset);
-	body2 = addBall(space, posB, boxOffset);
-	cpSpaceAddConstraint(space, cpSlideJointNew(body1, body2, cpv(15,0), cpv(-15,0), 20.0f, 40.0f));
-	
-	// Pivot Joints - Holds the two anchor points together. Like a swivel.
-	boxOffset = cpv(0, -240);
-	body1 = addBall(space, posA, boxOffset);
-	body2 = addBall(space, posB, boxOffset);
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, body2, cpvadd(boxOffset, cpv(80,60))));
-	// cpPivotJointNew() takes it's anchor parameter in world coordinates. The anchors are calculated from that
-	// cpPivotJointNew2() lets you specify the two anchor points explicitly
-	
-	// Groove Joints - Like a pivot joint, but one of the anchors is a line segment that the pivot can slide in
-	boxOffset = cpv(160, -240);
-	body1 = addBall(space, posA, boxOffset);
-	body2 = addBall(space, posB, boxOffset);
-	cpSpaceAddConstraint(space, cpGrooveJointNew(body1, body2, cpv(30,30), cpv(30,-30), cpv(-30,0)));
-	
-	// Damped Springs
-	boxOffset = cpv(-320, -120);
-	body1 = addBall(space, posA, boxOffset);
-	body2 = addBall(space, posB, boxOffset);
-	cpSpaceAddConstraint(space, cpDampedSpringNew(body1, body2, cpv(15,0), cpv(-15,0), 20.0f, 5.0f, 0.3f));
-	
-	// Damped Rotary Springs
-	boxOffset = cpv(-160, -120);
-	body1 = addBar(space, posA, boxOffset);
-	body2 = addBar(space, posB, boxOffset);
-	// Add some pin joints to hold the circles in place.
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
-	cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
-	cpSpaceAddConstraint(space, cpDampedRotarySpringNew(body1, body2, 0.0f, 3000.0f, 60.0f));
-	
-	// Rotary Limit Joint
-	boxOffset = cpv(0, -120);
-	body1 = addLever(space, posA, boxOffset);
-	body2 = addLever(space, posB, boxOffset);
-	// Add some pin joints to hold the circles in place.
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
-	cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
-	// Hold their rotation within 90 degrees of each other.
-	cpSpaceAddConstraint(space, cpRotaryLimitJointNew(body1, body2, -CP_PI/2.0f, CP_PI/2.0f));
-	
-	// Ratchet Joint - A rotary ratchet, like a socket wrench
-	boxOffset = cpv(160, -120);
-	body1 = addLever(space, posA, boxOffset);
-	body2 = addLever(space, posB, boxOffset);
-	// Add some pin joints to hold the circles in place.
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
-	cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
-	// Ratchet every 90 degrees
-	cpSpaceAddConstraint(space, cpRatchetJointNew(body1, body2, 0.0f, CP_PI/2.0f));
-	
-	// Gear Joint - Maintain a specific angular velocity ratio
-	boxOffset = cpv(-320, 0);
-	body1 = addBar(space, posA, boxOffset);
-	body2 = addBar(space, posB, boxOffset);
-	// Add some pin joints to hold the circles in place.
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
-	cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
-	// Force one to sping 2x as fast as the other
-	cpSpaceAddConstraint(space, cpGearJointNew(body1, body2, 0.0f, 2.0f));
-	
-	// Simple Motor - Maintain a specific angular relative velocity
-	boxOffset = cpv(-160, 0);
-	body1 = addBar(space, posA, boxOffset);
-	body2 = addBar(space, posB, boxOffset);
-	// Add some pin joints to hold the circles in place.
-	cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
-	cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
-	// Make them spin at 1/2 revolution per second in relation to each other.
-	cpSpaceAddConstraint(space, cpSimpleMotorNew(body1, body2, CP_PI));
-	
-	// Make a car with some nice soft suspension
-	boxOffset = cpv(0, 0);
-	cpBody *wheel1 = addWheel(space, posA, boxOffset);
-	cpBody *wheel2 = addWheel(space, posB, boxOffset);
-	cpBody *chassis = addChassis(space, cpv(80, 100), boxOffset);
-	
-	cpSpaceAddConstraint(space, cpGrooveJointNew(chassis, wheel1, cpv(-30, -10), cpv(-30, -40), cpvzero));
-	cpSpaceAddConstraint(space, cpGrooveJointNew(chassis, wheel2, cpv( 30, -10), cpv( 30, -40), cpvzero));
-	
-	cpSpaceAddConstraint(space, cpDampedSpringNew(chassis, wheel1, cpv(-30, 0), cpvzero, 50.0f, 20.0f, 10.0f));
-	cpSpaceAddConstraint(space, cpDampedSpringNew(chassis, wheel2, cpv( 30, 0), cpvzero, 50.0f, 20.0f, 10.0f));
-	
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -100));
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 120), cpv(320, 120), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 0), cpv(320, 0), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -120), cpv(320, -120), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-160, -240), cpv(-160, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(0, -240), cpv(0, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(160, -240), cpv(160, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpVect boxOffset;
+    cpBody *body1, *body2;
+
+    cpVect posA = cpv(50, 60);
+    cpVect posB = cpv(110, 60);
+
+#define POS_A cpvadd(boxOffset, posA)
+#define POS_B cpvadd(boxOffset, posB)
+
+    // Pin Joints - Link shapes with a solid bar or pin.
+    // Keeps the anchor points the same distance apart from when the joint was created.
+    boxOffset = cpv(-320, -240);
+    body1     = addBall(space, posA, boxOffset);
+    body2     = addBall(space, posB, boxOffset);
+    cpSpaceAddConstraint(space, cpPinJointNew(body1, body2, cpv(15, 0), cpv(-15, 0)));
+
+    // Slide Joints - Like pin joints but with a min/max distance.
+    // Can be used for a cheap approximation of a rope.
+    boxOffset = cpv(-160, -240);
+    body1     = addBall(space, posA, boxOffset);
+    body2     = addBall(space, posB, boxOffset);
+    cpSpaceAddConstraint(space, cpSlideJointNew(body1, body2, cpv(15, 0), cpv(-15, 0), 20.0f, 40.0f));
+
+    // Pivot Joints - Holds the two anchor points together. Like a swivel.
+    boxOffset = cpv(0, -240);
+    body1     = addBall(space, posA, boxOffset);
+    body2     = addBall(space, posB, boxOffset);
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, body2, cpvadd(boxOffset, cpv(80, 60))));
+    // cpPivotJointNew() takes it's anchor parameter in world coordinates. The anchors are calculated from that
+    // cpPivotJointNew2() lets you specify the two anchor points explicitly
+
+    // Groove Joints - Like a pivot joint, but one of the anchors is a line segment that the pivot can slide in
+    boxOffset = cpv(160, -240);
+    body1     = addBall(space, posA, boxOffset);
+    body2     = addBall(space, posB, boxOffset);
+    cpSpaceAddConstraint(space, cpGrooveJointNew(body1, body2, cpv(30, 30), cpv(30, -30), cpv(-30, 0)));
+
+    // Damped Springs
+    boxOffset = cpv(-320, -120);
+    body1     = addBall(space, posA, boxOffset);
+    body2     = addBall(space, posB, boxOffset);
+    cpSpaceAddConstraint(space, cpDampedSpringNew(body1, body2, cpv(15, 0), cpv(-15, 0), 20.0f, 5.0f, 0.3f));
+
+    // Damped Rotary Springs
+    boxOffset = cpv(-160, -120);
+    body1     = addBar(space, posA, boxOffset);
+    body2     = addBar(space, posB, boxOffset);
+    // Add some pin joints to hold the circles in place.
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
+    cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
+    cpSpaceAddConstraint(space, cpDampedRotarySpringNew(body1, body2, 0.0f, 3000.0f, 60.0f));
+
+    // Rotary Limit Joint
+    boxOffset = cpv(0, -120);
+    body1     = addLever(space, posA, boxOffset);
+    body2     = addLever(space, posB, boxOffset);
+    // Add some pin joints to hold the circles in place.
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
+    cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
+    // Hold their rotation within 90 degrees of each other.
+    cpSpaceAddConstraint(space, cpRotaryLimitJointNew(body1, body2, -CP_PI / 2.0f, CP_PI / 2.0f));
+
+    // Ratchet Joint - A rotary ratchet, like a socket wrench
+    boxOffset = cpv(160, -120);
+    body1     = addLever(space, posA, boxOffset);
+    body2     = addLever(space, posB, boxOffset);
+    // Add some pin joints to hold the circles in place.
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
+    cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
+    // Ratchet every 90 degrees
+    cpSpaceAddConstraint(space, cpRatchetJointNew(body1, body2, 0.0f, CP_PI / 2.0f));
+
+    // Gear Joint - Maintain a specific angular velocity ratio
+    boxOffset = cpv(-320, 0);
+    body1     = addBar(space, posA, boxOffset);
+    body2     = addBar(space, posB, boxOffset);
+    // Add some pin joints to hold the circles in place.
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
+    cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
+    // Force one to sping 2x as fast as the other
+    cpSpaceAddConstraint(space, cpGearJointNew(body1, body2, 0.0f, 2.0f));
+
+    // Simple Motor - Maintain a specific angular relative velocity
+    boxOffset = cpv(-160, 0);
+    body1     = addBar(space, posA, boxOffset);
+    body2     = addBar(space, posB, boxOffset);
+    // Add some pin joints to hold the circles in place.
+    cpSpaceAddConstraint(space, cpPivotJointNew(body1, staticBody, POS_A));
+    cpSpaceAddConstraint(space, cpPivotJointNew(body2, staticBody, POS_B));
+    // Make them spin at 1/2 revolution per second in relation to each other.
+    cpSpaceAddConstraint(space, cpSimpleMotorNew(body1, body2, CP_PI));
+
+    // Make a car with some nice soft suspension
+    boxOffset       = cpv(0, 0);
+    cpBody* wheel1  = addWheel(space, posA, boxOffset);
+    cpBody* wheel2  = addWheel(space, posB, boxOffset);
+    cpBody* chassis = addChassis(space, cpv(80, 100), boxOffset);
+
+    cpSpaceAddConstraint(space, cpGrooveJointNew(chassis, wheel1, cpv(-30, -10), cpv(-30, -40), cpvzero));
+    cpSpaceAddConstraint(space, cpGrooveJointNew(chassis, wheel2, cpv(30, -10), cpv(30, -40), cpvzero));
+
+    cpSpaceAddConstraint(space, cpDampedSpringNew(chassis, wheel1, cpv(-30, 0), cpvzero, 50.0f, 20.0f, 10.0f));
+    cpSpaceAddConstraint(space, cpDampedSpringNew(chassis, wheel2, cpv(30, 0), cpvzero, 50.0f, 20.0f, 10.0f));
+
+    return space;
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Joints = {
-	"Joints and Constraints",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Joints and Constraints", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/LogoSmash.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/LogoSmash.c
index 3b1fc4bc670e..4971f05a5e62 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/LogoSmash.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/LogoSmash.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,149 +18,147 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static const int image_width = 188;
-static const int image_height = 35;
-static const int image_row_length = 24;
+static const int image_width          = 188;
+static const int image_height         = 35;
+static const int image_row_length     = 24;
 float ChipmunkDebugDrawPointLineScale = 1.0f;
 
 static const char image_bitmap[] = {
-	15,-16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,-64,15,63,-32,-2,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,31,-64,15,127,-125,-1,-128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,127,-64,15,127,15,-1,-64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,-1,-64,15,-2,
-	31,-1,-64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,-1,-64,0,-4,63,-1,-32,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,1,-1,-64,15,-8,127,-1,-32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	1,-1,-64,0,-8,-15,-1,-32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,-31,-1,-64,15,-8,-32,
-	-1,-32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,-15,-1,-64,9,-15,-32,-1,-32,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,31,-15,-1,-64,0,-15,-32,-1,-32,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,63,-7,-1,-64,9,-29,-32,127,-61,-16,63,15,-61,-1,-8,31,-16,15,-8,126,7,-31,
-	-8,31,-65,-7,-1,-64,9,-29,-32,0,7,-8,127,-97,-25,-1,-2,63,-8,31,-4,-1,15,-13,
-	-4,63,-1,-3,-1,-64,9,-29,-32,0,7,-8,127,-97,-25,-1,-2,63,-8,31,-4,-1,15,-13,
-	-2,63,-1,-3,-1,-64,9,-29,-32,0,7,-8,127,-97,-25,-1,-1,63,-4,63,-4,-1,15,-13,
-	-2,63,-33,-1,-1,-32,9,-25,-32,0,7,-8,127,-97,-25,-1,-1,63,-4,63,-4,-1,15,-13,
-	-1,63,-33,-1,-1,-16,9,-25,-32,0,7,-8,127,-97,-25,-1,-1,63,-4,63,-4,-1,15,-13,
-	-1,63,-49,-1,-1,-8,9,-57,-32,0,7,-8,127,-97,-25,-8,-1,63,-2,127,-4,-1,15,-13,
-	-1,-65,-49,-1,-1,-4,9,-57,-32,0,7,-8,127,-97,-25,-8,-1,63,-2,127,-4,-1,15,-13,
-	-1,-65,-57,-1,-1,-2,9,-57,-32,0,7,-8,127,-97,-25,-8,-1,63,-2,127,-4,-1,15,-13,
-	-1,-1,-57,-1,-1,-1,9,-57,-32,0,7,-1,-1,-97,-25,-8,-1,63,-1,-1,-4,-1,15,-13,-1,
-	-1,-61,-1,-1,-1,-119,-57,-32,0,7,-1,-1,-97,-25,-8,-1,63,-1,-1,-4,-1,15,-13,-1,
-	-1,-61,-1,-1,-1,-55,-49,-32,0,7,-1,-1,-97,-25,-8,-1,63,-1,-1,-4,-1,15,-13,-1,
-	-1,-63,-1,-1,-1,-23,-49,-32,127,-57,-1,-1,-97,-25,-1,-1,63,-1,-1,-4,-1,15,-13,
-	-1,-1,-63,-1,-1,-1,-16,-49,-32,-1,-25,-1,-1,-97,-25,-1,-1,63,-33,-5,-4,-1,15,
-	-13,-1,-1,-64,-1,-9,-1,-7,-49,-32,-1,-25,-8,127,-97,-25,-1,-1,63,-33,-5,-4,-1,
-	15,-13,-1,-1,-64,-1,-13,-1,-32,-49,-32,-1,-25,-8,127,-97,-25,-1,-2,63,-49,-13,
-	-4,-1,15,-13,-1,-1,-64,127,-7,-1,-119,-17,-15,-1,-25,-8,127,-97,-25,-1,-2,63,
-	-49,-13,-4,-1,15,-13,-3,-1,-64,127,-8,-2,15,-17,-1,-1,-25,-8,127,-97,-25,-1,
-	-8,63,-49,-13,-4,-1,15,-13,-3,-1,-64,63,-4,120,0,-17,-1,-1,-25,-8,127,-97,-25,
-	-8,0,63,-57,-29,-4,-1,15,-13,-4,-1,-64,63,-4,0,15,-17,-1,-1,-25,-8,127,-97,
-	-25,-8,0,63,-57,-29,-4,-1,-1,-13,-4,-1,-64,31,-2,0,0,103,-1,-1,-57,-8,127,-97,
-	-25,-8,0,63,-57,-29,-4,-1,-1,-13,-4,127,-64,31,-2,0,15,103,-1,-1,-57,-8,127,
-	-97,-25,-8,0,63,-61,-61,-4,127,-1,-29,-4,127,-64,15,-8,0,0,55,-1,-1,-121,-8,
-	127,-97,-25,-8,0,63,-61,-61,-4,127,-1,-29,-4,63,-64,15,-32,0,0,23,-1,-2,3,-16,
-	63,15,-61,-16,0,31,-127,-127,-8,31,-1,-127,-8,31,-128,7,-128,0,0
-};
+    15,  -16, 0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    7,   -64, 15,  63,  -32, -2,  0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   31,  -64, 15,  127, -125, -1,   -128, 0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   127, -64,  15,   127,  15,  -1,  -64, 0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    1,    -1,   -64, 15,  -2,  31,   -1,  -64, 0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   1,   -1,  -64,  0,   -4,  63,   -1,   -32,  0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    1,   -1,  -64,  15,   -8,   127, -1,
+    -32, 0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    1,    -1,   -64, 0,
+    -8,  -15, -1,  -32, 0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    1,   -31,
+    -1,  -64, 15,  -8,  -32, -1,  -32, 0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   7,   -15, -1,  -64, 9,   -15, -32,  -1,   -32,  0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   31,  -15, -1,  -64,  0,    -15,  -32, -1,  -32, 0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   63,   -7,   -1,   -64, 9,   -29, -32,  127, -61, -16,  63,   15,   -61, -1,
+    -8,  31,  -16, 15,  -8,  126, 7,   -31,  -8,   31,   -65, -7,  -1,  -64,  9,   -29, -32,  0,    7,    -8,  127,
+    -97, -25, -1,  -2,  63,  -8,  31,  -4,   -1,   15,   -13, -4,  63,  -1,   -3,  -1,  -64,  9,    -29,  -32, 0,
+    7,   -8,  127, -97, -25, -1,  -2,  63,   -8,   31,   -4,  -1,  15,  -13,  -2,  63,  -1,   -3,   -1,   -64, 9,
+    -29, -32, 0,   7,   -8,  127, -97, -25,  -1,   -1,   63,  -4,  63,  -4,   -1,  15,  -13,  -2,   63,   -33, -1,
+    -1,  -32, 9,   -25, -32, 0,   7,   -8,   127,  -97,  -25, -1,  -1,  63,   -4,  63,  -4,   -1,   15,   -13, -1,
+    63,  -33, -1,  -1,  -16, 9,   -25, -32,  0,    7,    -8,  127, -97, -25,  -1,  -1,  63,   -4,   63,   -4,  -1,
+    15,  -13, -1,  63,  -49, -1,  -1,  -8,   9,    -57,  -32, 0,   7,   -8,   127, -97, -25,  -8,   -1,   63,  -2,
+    127, -4,  -1,  15,  -13, -1,  -65, -49,  -1,   -1,   -4,  9,   -57, -32,  0,   7,   -8,   127,  -97,  -25, -8,
+    -1,  63,  -2,  127, -4,  -1,  15,  -13,  -1,   -65,  -57, -1,  -1,  -2,   9,   -57, -32,  0,    7,    -8,  127,
+    -97, -25, -8,  -1,  63,  -2,  127, -4,   -1,   15,   -13, -1,  -1,  -57,  -1,  -1,  -1,   9,    -57,  -32, 0,
+    7,   -1,  -1,  -97, -25, -8,  -1,  63,   -1,   -1,   -4,  -1,  15,  -13,  -1,  -1,  -61,  -1,   -1,   -1,  -119,
+    -57, -32, 0,   7,   -1,  -1,  -97, -25,  -8,   -1,   63,  -1,  -1,  -4,   -1,  15,  -13,  -1,   -1,   -61, -1,
+    -1,  -1,  -55, -49, -32, 0,   7,   -1,   -1,   -97,  -25, -8,  -1,  63,   -1,  -1,  -4,   -1,   15,   -13, -1,
+    -1,  -63, -1,  -1,  -1,  -23, -49, -32,  127,  -57,  -1,  -1,  -97, -25,  -1,  -1,  63,   -1,   -1,   -4,  -1,
+    15,  -13, -1,  -1,  -63, -1,  -1,  -1,   -16,  -49,  -32, -1,  -25, -1,   -1,  -97, -25,  -1,   -1,   63,  -33,
+    -5,  -4,  -1,  15,  -13, -1,  -1,  -64,  -1,   -9,   -1,  -7,  -49, -32,  -1,  -25, -8,   127,  -97,  -25, -1,
+    -1,  63,  -33, -5,  -4,  -1,  15,  -13,  -1,   -1,   -64, -1,  -13, -1,   -32, -49, -32,  -1,   -25,  -8,  127,
+    -97, -25, -1,  -2,  63,  -49, -13, -4,   -1,   15,   -13, -1,  -1,  -64,  127, -7,  -1,   -119, -17,  -15, -1,
+    -25, -8,  127, -97, -25, -1,  -2,  63,   -49,  -13,  -4,  -1,  15,  -13,  -3,  -1,  -64,  127,  -8,   -2,  15,
+    -17, -1,  -1,  -25, -8,  127, -97, -25,  -1,   -8,   63,  -49, -13, -4,   -1,  15,  -13,  -3,   -1,   -64, 63,
+    -4,  120, 0,   -17, -1,  -1,  -25, -8,   127,  -97,  -25, -8,  0,   63,   -57, -29, -4,   -1,   15,   -13, -4,
+    -1,  -64, 63,  -4,  0,   15,  -17, -1,   -1,   -25,  -8,  127, -97, -25,  -8,  0,   63,   -57,  -29,  -4,  -1,
+    -1,  -13, -4,  -1,  -64, 31,  -2,  0,    0,    103,  -1,  -1,  -57, -8,   127, -97, -25,  -8,   0,    63,  -57,
+    -29, -4,  -1,  -1,  -13, -4,  127, -64,  31,   -2,   0,   15,  103, -1,   -1,  -57, -8,   127,  -97,  -25, -8,
+    0,   63,  -61, -61, -4,  127, -1,  -29,  -4,   127,  -64, 15,  -8,  0,    0,   55,  -1,   -1,   -121, -8,  127,
+    -97, -25, -8,  0,   63,  -61, -61, -4,   127,  -1,   -29, -4,  63,  -64,  15,  -32, 0,    0,    23,   -1,  -2,
+    3,   -16, 63,  15,  -61, -16, 0,   31,   -127, -127, -8,  31,  -1,  -127, -8,  31,  -128, 7,    -128, 0,   0};
 
-static inline int
-get_pixel(int x, int y)
+static inline int get_pixel(int x, int y)
 {
-	return (image_bitmap[(x>>3) + y*image_row_length]>>(~x&0x7)) & 1;
+    return (image_bitmap[(x >> 3) + y * image_row_length] >> (~x & 0x7)) & 1;
 }
 
 static int bodyCount = 0;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static void
-DrawDot(cpBody *body, void *unused)
+static void DrawDot(cpBody* body, void* unused)
 {
-	ChipmunkDebugDrawDot(3.5/ChipmunkDebugDrawPointLineScale, cpBodyGetPosition(body), RGBAColor(0xee/255.0f, 0xe8/255.0f, 0xd5/255.0f, 1.0f));
+    ChipmunkDebugDrawDot(3.5 / ChipmunkDebugDrawPointLineScale, cpBodyGetPosition(body),
+                         RGBAColor(0xee / 255.0f, 0xe8 / 255.0f, 0xd5 / 255.0f, 1.0f));
 }
 
-static void
-draw(cpSpace *space)
+static void draw(cpSpace* space)
 {
-	cpSpaceEachBody(space, DrawDot, NULL);
-	
-//	ChipmunkDebugDrawCollisionPoints(space);
+    cpSpaceEachBody(space, DrawDot, NULL);
+
+    //	ChipmunkDebugDrawCollisionPoints(space);
 }
 
-static cpShape *
-make_ball(cpFloat x, cpFloat y)
+static cpShape* make_ball(cpFloat x, cpFloat y)
 {
-	cpBody *body = cpBodyNew(1.0, INFINITY);
-	cpBodySetPosition(body, cpv(x, y));
-
-	cpShape *shape = cpCircleShapeNew(body, 0.95, cpvzero);
-	cpShapeSetElasticity(shape, 0.0);
-	cpShapeSetFriction(shape, 0.0);
-	
-	return shape;
+    cpBody* body = cpBodyNew(1.0, INFINITY);
+    cpBodySetPosition(body, cpv(x, y));
+
+    cpShape* shape = cpCircleShapeNew(body, 0.95, cpvzero);
+    cpShapeSetElasticity(shape, 0.0);
+    cpShapeSetFriction(shape, 0.0);
+
+    return shape;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 1);
-	
-	// The space will contain a very large number of similary sized objects.
-	// This is the perfect candidate for using the spatial hash.
-	// Generally you will never need to do this.
-	cpSpaceUseSpatialHash(space, 2.0, 10000);
-	
-	bodyCount = 0;
-	
-	cpBody *body;
-	cpShape *shape;
-	
-	for(int y=0; y<image_height; y++){
-		for(int x=0; x<image_width; x++){
-			if(!get_pixel(x, y)) continue;
-			
-			cpFloat x_jitter = 0.05*frand();
-			cpFloat y_jitter = 0.05*frand();
-			
-			shape = make_ball(2*(x - image_width/2 + x_jitter), 2*(image_height/2 - y + y_jitter));
-			cpSpaceAddBody(space, cpShapeGetBody(shape));
-			cpSpaceAddShape(space, shape);
-			
-			bodyCount++;
-		}
-	}
-	
-	body = cpSpaceAddBody(space, cpBodyNew(1e9, INFINITY));
-	cpBodySetPosition(body, cpv(-1000, -10));
-	cpBodySetVelocity(body, cpv(400, 0));
-
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(body, 8.0f, cpvzero));
-	cpShapeSetElasticity(shape, 0.0);
-	cpShapeSetFriction(shape, 0.0);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	bodyCount++;
-
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 1);
+
+    // The space will contain a very large number of similary sized objects.
+    // This is the perfect candidate for using the spatial hash.
+    // Generally you will never need to do this.
+    cpSpaceUseSpatialHash(space, 2.0, 10000);
+
+    bodyCount = 0;
+
+    cpBody* body;
+    cpShape* shape;
+
+    for (int y = 0; y < image_height; y++)
+    {
+        for (int x = 0; x < image_width; x++)
+        {
+            if (!get_pixel(x, y))
+                continue;
+
+            cpFloat x_jitter = 0.05 * frand();
+            cpFloat y_jitter = 0.05 * frand();
+
+            shape = make_ball(2 * (x - image_width / 2 + x_jitter), 2 * (image_height / 2 - y + y_jitter));
+            cpSpaceAddBody(space, cpShapeGetBody(shape));
+            cpSpaceAddShape(space, shape);
+
+            bodyCount++;
+        }
+    }
+
+    body = cpSpaceAddBody(space, cpBodyNew(1e9, INFINITY));
+    cpBodySetPosition(body, cpv(-1000, -10));
+    cpBodySetVelocity(body, cpv(400, 0));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(body, 8.0f, cpvzero));
+    cpShapeSetElasticity(shape, 0.0);
+    cpShapeSetFriction(shape, 0.0);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    bodyCount++;
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo LogoSmash = {
-	"Logo Smash",
-	1.0/60.0,
-	init,
-	update,
-	draw,
-	destroy,
+    "Logo Smash", 1.0 / 60.0, init, update, draw, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/OneWay.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/OneWay.c
index 64da60e7a204..63d103c92e00 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/OneWay.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/OneWay.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,108 +18,101 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-enum CollisionTypes {
-	COLLISION_TYPE_ONE_WAY = 1,
+enum CollisionTypes
+{
+    COLLISION_TYPE_ONE_WAY = 1,
 };
 
-typedef struct OneWayPlatform {
-	cpVect n; // direction objects may pass through
+typedef struct OneWayPlatform
+{
+    cpVect n;  // direction objects may pass through
 } OneWayPlatform;
 
 static OneWayPlatform platformInstance;
 
-static cpBool
-PreSolve(cpArbiter *arb, cpSpace *space, void *ignore)
+static cpBool PreSolve(cpArbiter* arb, cpSpace* space, void* ignore)
 {
-	CP_ARBITER_GET_SHAPES(arb, a, b);
-	OneWayPlatform *platform = (OneWayPlatform *)cpShapeGetUserData(a);
-		
-	if(cpvdot(cpArbiterGetNormal(arb), platform->n) < 0){
-		return cpArbiterIgnore(arb);
-	}
-	
-	return cpTrue;
+    CP_ARBITER_GET_SHAPES(arb, a, b);
+    OneWayPlatform* platform = (OneWayPlatform*)cpShapeGetUserData(a);
+
+    if (cpvdot(cpArbiterGetNormal(arb), platform->n) < 0)
+    {
+        return cpArbiterIgnore(arb);
+    }
+
+    return cpTrue;
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "One way platforms are trivial in Chipmunk using a very simple collision callback.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -100));
-
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	// Add our one way segment
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-160,-100), cpv(160,-100), 10.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetCollisionType(shape, COLLISION_TYPE_ONE_WAY);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	// We'll use the data pointer for the OneWayPlatform struct
-	platformInstance.n = cpv(0, 1); // let objects pass upwards
-	cpShapeSetUserData(shape, &platformInstance);
-	
-	
-	// Add a ball to test it out
-	cpFloat radius = 15.0f;
-	body = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
-	cpBodySetPosition(body, cpv(0, -200));
-	cpBodySetVelocity(body, cpv(0, 170));
-
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.9f);
-	cpShapeSetCollisionType(shape, 2);
-	
-	cpCollisionHandler *handler = cpSpaceAddWildcardHandler(space, COLLISION_TYPE_ONE_WAY);
-	handler->preSolveFunc = PreSolve;
-	
-	return space;
+    ChipmunkDemoMessageString = "One way platforms are trivial in Chipmunk using a very simple collision callback.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -100));
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // Add our one way segment
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-160, -100), cpv(160, -100), 10.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetCollisionType(shape, COLLISION_TYPE_ONE_WAY);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // We'll use the data pointer for the OneWayPlatform struct
+    platformInstance.n = cpv(0, 1);  // let objects pass upwards
+    cpShapeSetUserData(shape, &platformInstance);
+
+    // Add a ball to test it out
+    cpFloat radius = 15.0f;
+    body           = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 0.0f, radius, cpvzero)));
+    cpBodySetPosition(body, cpv(0, -200));
+    cpBodySetVelocity(body, cpv(0, 170));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.9f);
+    cpShapeSetCollisionType(shape, 2);
+
+    cpCollisionHandler* handler = cpSpaceAddWildcardHandler(space, COLLISION_TYPE_ONE_WAY);
+    handler->preSolveFunc       = PreSolve;
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo OneWay = {
-	"One Way Platforms",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "One Way Platforms", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Planet.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Planet.c
index e169e184175f..cc7d4f8c6985 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Planet.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Planet.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,114 +18,105 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpBody *planetBody;
+static cpBody* planetBody;
 
 static cpFloat gravityStrength = 5.0e6f;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static void
-planetGravityVelocityFunc(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt)
+static void planetGravityVelocityFunc(cpBody* body, cpVect gravity, cpFloat damping, cpFloat dt)
 {
-	// Gravitational acceleration is proportional to the inverse square of
-	// distance, and directed toward the origin. The central planet is assumed
-	// to be massive enough that it affects the satellites but not vice versa.
-	cpVect p = cpBodyGetPosition(body);
-	cpFloat sqdist = cpvlengthsq(p);
-	cpVect g = cpvmult(p, -gravityStrength / (sqdist * cpfsqrt(sqdist)));
-	
-	cpBodyUpdateVelocity(body, g, damping, dt);
+    // Gravitational acceleration is proportional to the inverse square of
+    // distance, and directed toward the origin. The central planet is assumed
+    // to be massive enough that it affects the satellites but not vice versa.
+    cpVect p       = cpBodyGetPosition(body);
+    cpFloat sqdist = cpvlengthsq(p);
+    cpVect g       = cpvmult(p, -gravityStrength / (sqdist * cpfsqrt(sqdist)));
+
+    cpBodyUpdateVelocity(body, g, damping, dt);
 }
 
-static cpVect
-rand_pos(cpFloat radius)
+static cpVect rand_pos(cpFloat radius)
 {
-	cpVect v;
-	do {
-		v = cpv(frand()*(640 - 2*radius) - (320 - radius), frand()*(480 - 2*radius) - (240 - radius));
-	} while(cpvlength(v) < 85.0f);
-	
-	return v;
+    cpVect v;
+    do
+    {
+        v = cpv(frand() * (640 - 2 * radius) - (320 - radius), frand() * (480 - 2 * radius) - (240 - radius));
+    } while (cpvlength(v) < 85.0f);
+
+    return v;
 }
 
-static void
-add_box(cpSpace *space)
+static void add_box(cpSpace* space)
 {
-	const cpFloat size = 10.0f;
-	const cpFloat mass = 1.0f;
-	
-	cpVect verts[] = {
-		cpv(-size,-size),
-		cpv(-size, size),
-		cpv( size, size),
-		cpv( size,-size),
-	};
-	
-	cpFloat radius = cpvlength(cpv(size, size));
-	cpVect pos = rand_pos(radius);
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 4, verts, cpvzero, 0.0f)));
-	cpBodySetVelocityUpdateFunc(body, planetGravityVelocityFunc);
-	cpBodySetPosition(body, pos);
-
-	// Set the box's velocity to put it into a circular orbit from its
-	// starting position.
-	cpFloat r = cpvlength(pos);
-	cpFloat v = cpfsqrt(gravityStrength / r) / r;
-	cpBodySetVelocity(body, cpvmult(cpvperp(pos), v));
-
-	// Set the box's angular velocity to match its orbital period and
-	// align its initial angle with its position.
-	cpBodySetAngularVelocity(body, v);
-	cpBodySetAngle(body, cpfatan2(pos.y, pos.x));
-
-	cpShape *shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 4, verts, cpTransformIdentity, 0.0));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
+    const cpFloat size = 10.0f;
+    const cpFloat mass = 1.0f;
+
+    cpVect verts[] = {
+        cpv(-size, -size),
+        cpv(-size, size),
+        cpv(size, size),
+        cpv(size, -size),
+    };
+
+    cpFloat radius = cpvlength(cpv(size, size));
+    cpVect pos     = rand_pos(radius);
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 4, verts, cpvzero, 0.0f)));
+    cpBodySetVelocityUpdateFunc(body, planetGravityVelocityFunc);
+    cpBodySetPosition(body, pos);
+
+    // Set the box's velocity to put it into a circular orbit from its
+    // starting position.
+    cpFloat r = cpvlength(pos);
+    cpFloat v = cpfsqrt(gravityStrength / r) / r;
+    cpBodySetVelocity(body, cpvmult(cpvperp(pos), v));
+
+    // Set the box's angular velocity to match its orbital period and
+    // align its initial angle with its position.
+    cpBodySetAngularVelocity(body, v);
+    cpBodySetAngle(body, cpfatan2(pos.y, pos.x));
+
+    cpShape* shape = cpSpaceAddShape(space, cpPolyShapeNew(body, 4, verts, cpTransformIdentity, 0.0));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	// Create a rouge body to control the planet manually.
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 20);
-	
-	planetBody = cpSpaceAddBody(space, cpBodyNewKinematic());
-	cpBodySetAngularVelocity(planetBody, 0.2f);
-	
-	for(int i=0; i<30; i++){
-		add_box(space);
-	}
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(planetBody, 70.0f, cpvzero));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	return space;
+    // Create a rouge body to control the planet manually.
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 20);
+
+    planetBody = cpSpaceAddBody(space, cpBodyNewKinematic());
+    cpBodySetAngularVelocity(planetBody, 0.2f);
+
+    for (int i = 0; i < 30; i++)
+    {
+        add_box(space);
+    }
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(planetBody, 70.0f, cpvzero));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Planet = {
-	"Planet",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Planet", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Player.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Player.c
index a1d9ddcbb764..0ed950dc8077 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Player.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Player.c
@@ -25,153 +25,156 @@
 #define PLAYER_VELOCITY 500.0
 
 #define PLAYER_GROUND_ACCEL_TIME 0.1
-#define PLAYER_GROUND_ACCEL      (PLAYER_VELOCITY / PLAYER_GROUND_ACCEL_TIME)
+#define PLAYER_GROUND_ACCEL (PLAYER_VELOCITY / PLAYER_GROUND_ACCEL_TIME)
 
 #define PLAYER_AIR_ACCEL_TIME 0.25
-#define PLAYER_AIR_ACCEL      (PLAYER_VELOCITY / PLAYER_AIR_ACCEL_TIME)
+#define PLAYER_AIR_ACCEL (PLAYER_VELOCITY / PLAYER_AIR_ACCEL_TIME)
 
-#define JUMP_HEIGHT       50.0
+#define JUMP_HEIGHT 50.0
 #define JUMP_BOOST_HEIGHT 55.0
-#define FALL_VELOCITY     900.0
-#define GRAVITY           2000.0
+#define FALL_VELOCITY 900.0
+#define GRAVITY 2000.0
 
-
-static cpBody* playerBody = NULL;
+static cpBody* playerBody   = NULL;
 static cpShape* playerShape = NULL;
 
 static cpFloat remainingBoost = 0;
-static cpBool grounded = cpFalse;
-static cpBool lastJumpState = cpFalse;
+static cpBool grounded        = cpFalse;
+static cpBool lastJumpState   = cpFalse;
 
-static void SelectPlayerGroundNormal(cpBody* body, cpArbiter* arb, cpVect* groundNormal) {
-	cpVect n = cpvneg(cpArbiterGetNormal(arb));
+static void SelectPlayerGroundNormal(cpBody* body, cpArbiter* arb, cpVect* groundNormal)
+{
+    cpVect n = cpvneg(cpArbiterGetNormal(arb));
 
-	if (n.y > groundNormal->y) {
-		(*groundNormal) = n;
-	}
+    if (n.y > groundNormal->y)
+    {
+        (*groundNormal) = n;
+    }
 }
 
-static void playerUpdateVelocity(cpBody* body, cpVect gravity, cpFloat damping, cpFloat dt) {
-	int jumpState = (ChipmunkDemoKeyboard.y > 0.0f);
-
-	// Grab the grounding normal from last frame
-	cpVect groundNormal = cpvzero;
-	cpBodyEachArbiter(playerBody, (cpBodyArbiterIteratorFunc)SelectPlayerGroundNormal, &groundNormal);
+static void playerUpdateVelocity(cpBody* body, cpVect gravity, cpFloat damping, cpFloat dt)
+{
+    int jumpState = (ChipmunkDemoKeyboard.y > 0.0f);
 
-	grounded = (groundNormal.y > 0.0);
-	if (groundNormal.y < 0.0f)
-		remainingBoost = 0.0f;
+    // Grab the grounding normal from last frame
+    cpVect groundNormal = cpvzero;
+    cpBodyEachArbiter(playerBody, (cpBodyArbiterIteratorFunc)SelectPlayerGroundNormal, &groundNormal);
 
-	// Do a normal-ish update
-	cpBool boost = (jumpState && remainingBoost > 0.0f);
-	cpVect g = (boost ? cpvzero : gravity);
-	cpBodyUpdateVelocity(body, g, damping, dt);
+    grounded = (groundNormal.y > 0.0);
+    if (groundNormal.y < 0.0f)
+        remainingBoost = 0.0f;
 
-	// Target horizontal speed for air/ground control
-	cpFloat target_vx = PLAYER_VELOCITY * ChipmunkDemoKeyboard.x;
+    // Do a normal-ish update
+    cpBool boost = (jumpState && remainingBoost > 0.0f);
+    cpVect g     = (boost ? cpvzero : gravity);
+    cpBodyUpdateVelocity(body, g, damping, dt);
 
+    // Target horizontal speed for air/ground control
+    cpFloat target_vx = PLAYER_VELOCITY * ChipmunkDemoKeyboard.x;
 
-	// Update the surface velocity and friction
-	// Note that the "feet" move in the opposite direction of the player.
-	cpVect surface_v = cpv(-target_vx, 0.0);
-	playerShape->surfaceV = surface_v;
-	playerShape->u = (grounded ? PLAYER_GROUND_ACCEL / GRAVITY : 0.0);
+    // Update the surface velocity and friction
+    // Note that the "feet" move in the opposite direction of the player.
+    cpVect surface_v      = cpv(-target_vx, 0.0);
+    playerShape->surfaceV = surface_v;
+    playerShape->u        = (grounded ? PLAYER_GROUND_ACCEL / GRAVITY : 0.0);
 
-	// Apply air control if not grounded
-	if (!grounded) {
-		// Smoothly accelerate the velocity
-		playerBody->v.x = cpflerpconst(playerBody->v.x, target_vx, PLAYER_AIR_ACCEL * dt);
-	}
+    // Apply air control if not grounded
+    if (!grounded)
+    {
+        // Smoothly accelerate the velocity
+        playerBody->v.x = cpflerpconst(playerBody->v.x, target_vx, PLAYER_AIR_ACCEL * dt);
+    }
 
-	body->v.y = cpfclamp(body->v.y, -FALL_VELOCITY, INFINITY);
+    body->v.y = cpfclamp(body->v.y, -FALL_VELOCITY, INFINITY);
 }
 
-static void update(cpSpace* space, double dt) {
-	int jumpState = (ChipmunkDemoKeyboard.y > 0.0f);
+static void update(cpSpace* space, double dt)
+{
+    int jumpState = (ChipmunkDemoKeyboard.y > 0.0f);
 
-	// If the jump key was just pressed this frame, jump!
-	if (jumpState && !lastJumpState && grounded) {
-		cpFloat jump_v = cpfsqrt(2.0 * JUMP_HEIGHT * GRAVITY);
-		playerBody->v = cpvadd(playerBody->v, cpv(0.0, jump_v));
+    // If the jump key was just pressed this frame, jump!
+    if (jumpState && !lastJumpState && grounded)
+    {
+        cpFloat jump_v = cpfsqrt(2.0 * JUMP_HEIGHT * GRAVITY);
+        playerBody->v  = cpvadd(playerBody->v, cpv(0.0, jump_v));
 
-		remainingBoost = JUMP_BOOST_HEIGHT / jump_v;
-	}
+        remainingBoost = JUMP_BOOST_HEIGHT / jump_v;
+    }
 
-	// Step the space
-	cpSpaceStep(space, dt);
+    // Step the space
+    cpSpaceStep(space, dt);
 
-	remainingBoost -= dt;
-	lastJumpState = jumpState;
+    remainingBoost -= dt;
+    lastJumpState = jumpState;
 }
 
-static cpSpace* init(void) {
-	cpSpace* space = cpSpaceNew();
-	space->iterations = 10;
-	space->gravity = cpv(0, -GRAVITY);
-	//	space->sleepTimeThreshold = 1000;
-
-	cpBody* body, * staticBody = cpSpaceGetStaticBody(space);
-	cpShape* shape;
-
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
-	shape->e = 1.0f;
-	shape->u = 1.0f;
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
-	shape->e = 1.0f;
-	shape->u = 1.0f;
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
-	shape->e = 1.0f;
-	shape->u = 1.0f;
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
-	shape->e = 1.0f;
-	shape->u = 1.0f;
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	// Set up the player
-	body = cpSpaceAddBody(space, cpBodyNew(1.0f, INFINITY));
-	body->p = cpv(0, -200);
-	body->velocity_func = playerUpdateVelocity;
-	playerBody = body;
-
-	shape = cpSpaceAddShape(space, cpBoxShapeNew2(body, cpBBNew(-15.0, -27.5, 15.0, 27.5), 1.0));
-	//	shape = cpSpaceAddShape(space, cpSegmentShapeNew(playerBody, cpvzero, cpv(0, radius), radius));
-	shape->e = 0.0f;
-	shape->u = 0.0f;
-	shape->type = 1;
-	playerShape = shape;
-
-	// Add some boxes to jump on
-	for (int i = 0; i < 6; i++) {
-		for (int j = 0; j < 3; j++) {
-			body = cpSpaceAddBody(space, cpBodyNew(4.0f, INFINITY));
-			body->p = cpv(100 + j * 60, -200 + i * 60);
-
-			shape = cpSpaceAddShape(space, cpBoxShapeNew(body, 50, 50, 0.0));
-			shape->e = 0.0f;
-			shape->u = 0.7f;
-		}
-	}
-
-	return space;
+static cpSpace* init(void)
+{
+    cpSpace* space    = cpSpaceNew();
+    space->iterations = 10;
+    space->gravity    = cpv(0, -GRAVITY);
+    //	space->sleepTimeThreshold = 1000;
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape    = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    shape->e = 1.0f;
+    shape->u = 1.0f;
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape    = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    shape->e = 1.0f;
+    shape->u = 1.0f;
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape    = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    shape->e = 1.0f;
+    shape->u = 1.0f;
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape    = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
+    shape->e = 1.0f;
+    shape->u = 1.0f;
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // Set up the player
+    body                = cpSpaceAddBody(space, cpBodyNew(1.0f, INFINITY));
+    body->p             = cpv(0, -200);
+    body->velocity_func = playerUpdateVelocity;
+    playerBody          = body;
+
+    shape = cpSpaceAddShape(space, cpBoxShapeNew2(body, cpBBNew(-15.0, -27.5, 15.0, 27.5), 1.0));
+    //	shape = cpSpaceAddShape(space, cpSegmentShapeNew(playerBody, cpvzero, cpv(0, radius), radius));
+    shape->e    = 0.0f;
+    shape->u    = 0.0f;
+    shape->type = 1;
+    playerShape = shape;
+
+    // Add some boxes to jump on
+    for (int i = 0; i < 6; i++)
+    {
+        for (int j = 0; j < 3; j++)
+        {
+            body    = cpSpaceAddBody(space, cpBodyNew(4.0f, INFINITY));
+            body->p = cpv(100 + j * 60, -200 + i * 60);
+
+            shape    = cpSpaceAddShape(space, cpBoxShapeNew(body, 50, 50, 0.0));
+            shape->e = 0.0f;
+            shape->u = 0.7f;
+        }
+    }
+
+    return space;
 }
 
-static void destroy(cpSpace* space) {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+static void destroy(cpSpace* space)
+{
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo PlatformerPlayer = {
-	"Platformer Player Controls",
-	1.0 / 180.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Platformer Player Controls", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Plink.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Plink.c
index ecf7ca2129a5..dec53e8bc4e4 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Plink.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Plink.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,115 +18,116 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpFloat pentagon_mass = 0.0f;
+static cpFloat pentagon_mass   = 0.0f;
 static cpFloat pentagon_moment = 0.0f;
 
 // Iterate over all of the bodies and reset the ones that have fallen offscreen.
-static void
-eachBody(cpBody *body, void *unused)
+static void eachBody(cpBody* body, void* unused)
 {
-	cpVect pos = cpBodyGetPosition(body);
-	if(pos.y < -260){
-		cpFloat x = rand()/(cpFloat)RAND_MAX*640 - 320;
-		cpBodySetPosition(body, cpv(x, 260));
-	}
+    cpVect pos = cpBodyGetPosition(body);
+    if (pos.y < -260)
+    {
+        cpFloat x = rand() / (cpFloat)RAND_MAX * 640 - 320;
+        cpBodySetPosition(body, cpv(x, 260));
+    }
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	if(ChipmunkDemoRightDown){
+    if (ChipmunkDemoRightDown)
+    {
         ChipmunkDemoRightDown = cpFalse;
-		cpShape *nearest = cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 0.0, GRAB_FILTER, NULL);
-		if(nearest){
-			cpBody *body = cpShapeGetBody(nearest);
-			if(cpBodyGetType(body) == CP_BODY_TYPE_STATIC){
-				cpBodySetType(body, CP_BODY_TYPE_DYNAMIC);
-				cpBodySetMass(body, pentagon_mass);
-				cpBodySetMoment(body, pentagon_moment);
-			} else if(cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC) {
-				cpBodySetType(body, CP_BODY_TYPE_STATIC);
-			}
-		}
-	}
-	
-	cpSpaceEachBody(space, &eachBody, NULL);
-	cpSpaceStep(space, dt);
+        cpShape* nearest      = cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 0.0, GRAB_FILTER, NULL);
+        if (nearest)
+        {
+            cpBody* body = cpShapeGetBody(nearest);
+            if (cpBodyGetType(body) == CP_BODY_TYPE_STATIC)
+            {
+                cpBodySetType(body, CP_BODY_TYPE_DYNAMIC);
+                cpBodySetMass(body, pentagon_mass);
+                cpBodySetMoment(body, pentagon_moment);
+            }
+            else if (cpBodyGetType(body) == CP_BODY_TYPE_DYNAMIC)
+            {
+                cpBodySetType(body, CP_BODY_TYPE_STATIC);
+            }
+        }
+    }
+
+    cpSpaceEachBody(space, &eachBody, NULL);
+    cpSpaceStep(space, dt);
 }
 
 #define NUM_VERTS 5
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Right click to make pentagons static/dynamic.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 5);
-	cpSpaceSetGravity(space, cpv(0, -100));
-		
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// Vertexes for a triangle shape.
-	cpVect tris[] = {
-		cpv(-15,-15),
-		cpv(  0, 10),
-		cpv( 15,-15),
-	};
-
-	// Create the static triangles.
-	for(int i=0; i<10; i++){
-		for(int j=0; j<6; j++){
-			cpFloat stagger = (j%2)*40;
-			cpVect offset = cpv(i*80 - 360 + stagger, j*70 - 200);
-			shape = cpSpaceAddShape(space, cpPolyShapeNew(staticBody, 3, tris, cpTransformTranslate(offset), 0.0));
-			cpShapeSetElasticity(shape, 1.0f);
-			cpShapeSetFriction(shape, 1.0f);
-			cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-		}
-	}
-	
-	// Create vertexes for a pentagon shape.
-	cpVect verts[NUM_VERTS];
-	for(int i=0; i<NUM_VERTS; i++){
-		cpFloat angle = -2.0f*CP_PI*i/((cpFloat) NUM_VERTS);
-		verts[i] = cpv(10*cos(angle), 10*sin(angle));
-	}
-	
-	pentagon_mass = 1.0;
-	pentagon_moment = cpMomentForPoly(1.0f, NUM_VERTS, verts, cpvzero, 0.0f);
-	
-	// Add lots of pentagons.
-	for(int i=0; i<300; i++){
-		body = cpSpaceAddBody(space, cpBodyNew(pentagon_mass, pentagon_moment));
-		cpFloat x = rand()/(cpFloat)RAND_MAX*640 - 320;
-		cpBodySetPosition(body, cpv(x, 350));
-		
-		shape = cpSpaceAddShape(space, cpPolyShapeNew(body, NUM_VERTS, verts, cpTransformIdentity, 0.0));
-		cpShapeSetElasticity(shape, 0.0f);
-		cpShapeSetFriction(shape, 0.4f);
-	}
-	
-	return space;
+    ChipmunkDemoMessageString = "Right click to make pentagons static/dynamic.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 5);
+    cpSpaceSetGravity(space, cpv(0, -100));
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Vertexes for a triangle shape.
+    cpVect tris[] = {
+        cpv(-15, -15),
+        cpv(0, 10),
+        cpv(15, -15),
+    };
+
+    // Create the static triangles.
+    for (int i = 0; i < 10; i++)
+    {
+        for (int j = 0; j < 6; j++)
+        {
+            cpFloat stagger = (j % 2) * 40;
+            cpVect offset   = cpv(i * 80 - 360 + stagger, j * 70 - 200);
+            shape = cpSpaceAddShape(space, cpPolyShapeNew(staticBody, 3, tris, cpTransformTranslate(offset), 0.0));
+            cpShapeSetElasticity(shape, 1.0f);
+            cpShapeSetFriction(shape, 1.0f);
+            cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+        }
+    }
+
+    // Create vertexes for a pentagon shape.
+    cpVect verts[NUM_VERTS];
+    for (int i = 0; i < NUM_VERTS; i++)
+    {
+        cpFloat angle = -2.0f * CP_PI * i / ((cpFloat)NUM_VERTS);
+        verts[i]      = cpv(10 * cos(angle), 10 * sin(angle));
+    }
+
+    pentagon_mass   = 1.0;
+    pentagon_moment = cpMomentForPoly(1.0f, NUM_VERTS, verts, cpvzero, 0.0f);
+
+    // Add lots of pentagons.
+    for (int i = 0; i < 300; i++)
+    {
+        body      = cpSpaceAddBody(space, cpBodyNew(pentagon_mass, pentagon_moment));
+        cpFloat x = rand() / (cpFloat)RAND_MAX * 640 - 320;
+        cpBodySetPosition(body, cpv(x, 350));
+
+        shape = cpSpaceAddShape(space, cpPolyShapeNew(body, NUM_VERTS, verts, cpTransformIdentity, 0.0));
+        cpShapeSetElasticity(shape, 0.0f);
+        cpShapeSetFriction(shape, 0.4f);
+    }
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Plink = {
-	"Plink",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Plink", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Pump.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Pump.c
index ae017224f9e2..b059b52df0a7 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Pump.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Pump.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,174 +18,167 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpConstraint *motor;
+static cpConstraint* motor;
 
 #define numBalls 5
-static cpBody *balls[numBalls];
+static cpBody* balls[numBalls];
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpFloat coef = (2.0f + ChipmunkDemoKeyboard.y)/3.0f;
-	cpFloat rate = ChipmunkDemoKeyboard.x*30.0f*coef;
-	
-	cpSimpleMotorSetRate(motor, rate);
-	cpConstraintSetMaxForce(motor, rate ? 1000000.0f : 0.0f);
-
-	cpSpaceStep(space, dt);
-	
-	for(int i=0; i<numBalls; i++){
-		cpBody *ball = balls[i];
-		cpVect pos = cpBodyGetPosition(ball);
-		
-		if(pos.x > 320.0f){
-			cpBodySetVelocity(ball, cpvzero);
-			cpBodySetPosition(ball, cpv(-224.0f, 200.0f));
-		}
-	}
+    cpFloat coef = (2.0f + ChipmunkDemoKeyboard.y) / 3.0f;
+    cpFloat rate = ChipmunkDemoKeyboard.x * 30.0f * coef;
+
+    cpSimpleMotorSetRate(motor, rate);
+    cpConstraintSetMaxForce(motor, rate ? 1000000.0f : 0.0f);
+
+    cpSpaceStep(space, dt);
+
+    for (int i = 0; i < numBalls; i++)
+    {
+        cpBody* ball = balls[i];
+        cpVect pos   = cpBodyGetPosition(ball);
+
+        if (pos.x > 320.0f)
+        {
+            cpBodySetVelocity(ball, cpvzero);
+            cpBodySetPosition(ball, cpv(-224.0f, 200.0f));
+        }
+    }
 }
 
-static cpBody *
-add_ball(cpSpace *space, cpVect pos)
+static cpBody* add_ball(cpSpace* space, cpVect pos)
 {
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForCircle(1.0f, 30, 0, cpvzero)));
-	cpBodySetPosition(body, pos);
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, 30, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	
-	return body;
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForCircle(1.0f, 30, 0, cpvzero)));
+    cpBodySetPosition(body, pos);
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, 30, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+
+    return body;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Use the arrow keys to control the machine.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetGravity(space, cpv(0, -600));
-	
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// beveling all of the line segments slightly helps prevent things from getting stuck on cracks
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-256,16), cpv(-256,300), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-256,16), cpv(-192,0), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192,0), cpv(-192, -64), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-128,-64), cpv(-128,144), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192,80), cpv(-192,176), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192,176), cpv(-128,240), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-128,144), cpv(192,64), 2.0f));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	cpVect verts[] = {
-		cpv(-30,-80),
-		cpv(-30, 80),
-		cpv( 30, 64),
-		cpv( 30,-80),
-	};
-
-	cpBody *plunger = cpSpaceAddBody(space, cpBodyNew(1.0f, INFINITY));
-	cpBodySetPosition(plunger, cpv(-160,-80));
-	
-	shape = cpSpaceAddShape(space, cpPolyShapeNew(plunger, 4, verts, cpTransformIdentity, 0.0));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 0.5f);
-	cpShapeSetFilter(shape, cpShapeFilterNew(CP_NO_GROUP, 1, 1));
-	
-	// add balls to hopper
-	for(int i=0; i<numBalls; i++)
-		balls[i] = add_ball(space, cpv(-224 + i,80 + 64*i));
-	
-	// add small gear
-	cpBody *smallGear = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 80, 0, cpvzero)));
-	cpBodySetPosition(smallGear, cpv(-160,-160));
-	cpBodySetAngle(smallGear, -CP_PI/2.0f);
-
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(smallGear, 80.0f, cpvzero));
-	cpShapeSetFilter(shape, CP_SHAPE_FILTER_NONE);
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, smallGear, cpv(-160,-160), cpvzero));
-
-	// add big gear
-	cpBody *bigGear = cpSpaceAddBody(space, cpBodyNew(40.0f, cpMomentForCircle(40.0f, 160, 0, cpvzero)));
-	cpBodySetPosition(bigGear, cpv(80,-160));
-	cpBodySetAngle(bigGear, CP_PI/2.0f);
-	
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(bigGear, 160.0f, cpvzero));
-	cpShapeSetFilter(shape, CP_SHAPE_FILTER_NONE);
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, bigGear, cpv(80,-160), cpvzero));
-
-	// connect the plunger to the small gear.
-	cpSpaceAddConstraint(space, cpPinJointNew(smallGear, plunger, cpv(80,0), cpv(0,0)));
-	// connect the gears.
-	cpSpaceAddConstraint(space, cpGearJointNew(smallGear, bigGear, -CP_PI/2.0f, -2.0f));
-	
-	
-	// feeder mechanism
-	cpFloat bottom = -300.0f;
-	cpFloat top = 32.0f;
-	cpBody *feeder = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForSegment(1.0f, cpv(-224.0f, bottom), cpv(-224.0f, top), 0.0f)));
-	cpBodySetPosition(feeder, cpv(-224, (bottom + top)/2.0f));
-	
-	cpFloat len = top - bottom;
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(feeder, cpv(0.0f, len/2.0f), cpv(0.0f, -len/2.0f), 20.0f));
-	cpShapeSetFilter(shape, GRAB_FILTER);
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, feeder, cpv(-224.0f, bottom), cpv(0.0f, -len/2.0f)));
-	cpVect anchr = cpBodyWorldToLocal(feeder, cpv(-224.0f, -160.0f));
-	cpSpaceAddConstraint(space, cpPinJointNew(feeder, smallGear, anchr, cpv(0.0f, 80.0f)));
-
-	// motorize the second gear
-	motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(staticBody, bigGear, 3.0f));
-
-	return space;
+    ChipmunkDemoMessageString = "Use the arrow keys to control the machine.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetGravity(space, cpv(0, -600));
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // beveling all of the line segments slightly helps prevent things from getting stuck on cracks
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-256, 16), cpv(-256, 300), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-256, 16), cpv(-192, 0), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192, 0), cpv(-192, -64), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-128, -64), cpv(-128, 144), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192, 80), cpv(-192, 176), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-192, 176), cpv(-128, 240), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-128, 144), cpv(192, 64), 2.0f));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpVect verts[] = {
+        cpv(-30, -80),
+        cpv(-30, 80),
+        cpv(30, 64),
+        cpv(30, -80),
+    };
+
+    cpBody* plunger = cpSpaceAddBody(space, cpBodyNew(1.0f, INFINITY));
+    cpBodySetPosition(plunger, cpv(-160, -80));
+
+    shape = cpSpaceAddShape(space, cpPolyShapeNew(plunger, 4, verts, cpTransformIdentity, 0.0));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 0.5f);
+    cpShapeSetFilter(shape, cpShapeFilterNew(CP_NO_GROUP, 1, 1));
+
+    // add balls to hopper
+    for (int i = 0; i < numBalls; i++)
+        balls[i] = add_ball(space, cpv(-224 + i, 80 + 64 * i));
+
+    // add small gear
+    cpBody* smallGear = cpSpaceAddBody(space, cpBodyNew(10.0f, cpMomentForCircle(10.0f, 80, 0, cpvzero)));
+    cpBodySetPosition(smallGear, cpv(-160, -160));
+    cpBodySetAngle(smallGear, -CP_PI / 2.0f);
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(smallGear, 80.0f, cpvzero));
+    cpShapeSetFilter(shape, CP_SHAPE_FILTER_NONE);
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, smallGear, cpv(-160, -160), cpvzero));
+
+    // add big gear
+    cpBody* bigGear = cpSpaceAddBody(space, cpBodyNew(40.0f, cpMomentForCircle(40.0f, 160, 0, cpvzero)));
+    cpBodySetPosition(bigGear, cpv(80, -160));
+    cpBodySetAngle(bigGear, CP_PI / 2.0f);
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(bigGear, 160.0f, cpvzero));
+    cpShapeSetFilter(shape, CP_SHAPE_FILTER_NONE);
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, bigGear, cpv(80, -160), cpvzero));
+
+    // connect the plunger to the small gear.
+    cpSpaceAddConstraint(space, cpPinJointNew(smallGear, plunger, cpv(80, 0), cpv(0, 0)));
+    // connect the gears.
+    cpSpaceAddConstraint(space, cpGearJointNew(smallGear, bigGear, -CP_PI / 2.0f, -2.0f));
+
+    // feeder mechanism
+    cpFloat bottom = -300.0f;
+    cpFloat top    = 32.0f;
+    cpBody* feeder =
+        cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForSegment(1.0f, cpv(-224.0f, bottom), cpv(-224.0f, top), 0.0f)));
+    cpBodySetPosition(feeder, cpv(-224, (bottom + top) / 2.0f));
+
+    cpFloat len = top - bottom;
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(feeder, cpv(0.0f, len / 2.0f), cpv(0.0f, -len / 2.0f), 20.0f));
+    cpShapeSetFilter(shape, GRAB_FILTER);
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, feeder, cpv(-224.0f, bottom), cpv(0.0f, -len / 2.0f)));
+    cpVect anchr = cpBodyWorldToLocal(feeder, cpv(-224.0f, -160.0f));
+    cpSpaceAddConstraint(space, cpPinJointNew(feeder, smallGear, anchr, cpv(0.0f, 80.0f)));
+
+    // motorize the second gear
+    motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(staticBody, bigGear, 3.0f));
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Pump = {
-	"Pump",
-	1.0/120.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Pump", 1.0 / 120.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidStack.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidStack.c
index c5b612a65051..520affdab40e 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidStack.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidStack.c
@@ -23,11 +23,13 @@
 #include "chipmunk/chipmunk_unsafe.h"
 #include "ChipmunkDemo.h"
 
-static void update(cpSpace* space, double dt) {
+static void update(cpSpace* space, double dt)
+{
     cpSpaceStep(space, dt);
 }
 
-static cpSpace* init(void) {
+static cpSpace* init(void)
+{
     cpSpace* space = cpSpaceNew();
     cpSpaceSetIterations(space, 30);
     cpSpaceSetGravity(space, cpv(0, -100));
@@ -54,8 +56,10 @@ static cpSpace* init(void) {
     cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
 
     // Add lots of boxes.
-    for (int i = 0; i < 14; i++) {
-        for (int j = 0; j <= i; j++) {
+    for (int i = 0; i < 14; i++)
+    {
+        for (int j = 0; j <= i; j++)
+        {
             body = cpSpaceAddBody(space, cpBodyNew(1.0f, cpMomentForBox(1.0f, 30.0f, 30.0f)));
             cpBodySetPosition(body, cpv(j * 32 - i * 16, 300 - i * 32));
 
@@ -77,16 +81,12 @@ static cpSpace* init(void) {
     return space;
 }
 
-static void destroy(cpSpace* space) {
+static void destroy(cpSpace* space)
+{
     ChipmunkDemoFreeSpaceChildren(space);
     cpSpaceFree(space);
 }
 
 ChipmunkDemo PyramidStack = {
-    "Pyramid Stack",
-    1.0 / 180.0,
-    init,
-    update,
-    ChipmunkDemoDefaultDrawImpl,
-    destroy,
+    "Pyramid Stack", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidTopple.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidTopple.c
index 8a77d6739e61..a45649901644 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidTopple.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/PyramidTopple.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,86 +18,85 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
 #define WIDTH 4.0f
 #define HEIGHT 30.0f
 
-static void
-add_domino(cpSpace *space, cpVect pos, cpBool flipped)
+static void add_domino(cpSpace* space, cpVect pos, cpBool flipped)
 {
-	cpFloat mass = 1.0f;
-	cpFloat radius = 0.5f;
-	cpFloat moment = cpMomentForBox(mass, WIDTH, HEIGHT);
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-	cpBodySetPosition(body, pos);
+    cpFloat mass   = 1.0f;
+    cpFloat radius = 0.5f;
+    cpFloat moment = cpMomentForBox(mass, WIDTH, HEIGHT);
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+    cpBodySetPosition(body, pos);
 
-	cpShape *shape = (flipped ? cpBoxShapeNew(body, HEIGHT, WIDTH, 0.0) : cpBoxShapeNew(body, WIDTH - radius*2.0f, HEIGHT, radius));
-	cpSpaceAddShape(space, shape);
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.6f);
+    cpShape* shape = (flipped ? cpBoxShapeNew(body, HEIGHT, WIDTH, 0.0)
+                              : cpBoxShapeNew(body, WIDTH - radius * 2.0f, HEIGHT, radius));
+    cpSpaceAddShape(space, shape);
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.6f);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -300));
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	// Add a floor.
-	cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-600,-240), cpv(600,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	
-	// Add the dominoes.
-	int n = 12;
-	for(int i=0; i<n; i++){
-		for(int j=0; j<(n - i); j++){
-			cpVect offset = cpv((j - (n - 1 - i)*0.5f)*1.5f*HEIGHT, (i + 0.5f)*(HEIGHT + 2*WIDTH) - WIDTH - 240);
-			add_domino(space, offset, cpFalse);
-			add_domino(space, cpvadd(offset, cpv(0, (HEIGHT + WIDTH)/2.0f)), cpTrue);
-			
-			if(j == 0){
-				add_domino(space, cpvadd(offset, cpv(0.5f*(WIDTH - HEIGHT), HEIGHT + WIDTH)), cpFalse);
-			}
-			
-			if(j != n - i - 1){
-				add_domino(space, cpvadd(offset, cpv(HEIGHT*0.75f, (HEIGHT + 3*WIDTH)/2.0f)), cpTrue);
-			} else {
-				add_domino(space, cpvadd(offset, cpv(0.5f*(HEIGHT - WIDTH), HEIGHT + WIDTH)), cpFalse);
-			}
-		}
-	}
-	
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -300));
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    // Add a floor.
+    cpShape* shape =
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(-600, -240), cpv(600, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    // Add the dominoes.
+    int n = 12;
+    for (int i = 0; i < n; i++)
+    {
+        for (int j = 0; j < (n - i); j++)
+        {
+            cpVect offset =
+                cpv((j - (n - 1 - i) * 0.5f) * 1.5f * HEIGHT, (i + 0.5f) * (HEIGHT + 2 * WIDTH) - WIDTH - 240);
+            add_domino(space, offset, cpFalse);
+            add_domino(space, cpvadd(offset, cpv(0, (HEIGHT + WIDTH) / 2.0f)), cpTrue);
+
+            if (j == 0)
+            {
+                add_domino(space, cpvadd(offset, cpv(0.5f * (WIDTH - HEIGHT), HEIGHT + WIDTH)), cpFalse);
+            }
+
+            if (j != n - i - 1)
+            {
+                add_domino(space, cpvadd(offset, cpv(HEIGHT * 0.75f, (HEIGHT + 3 * WIDTH) / 2.0f)), cpTrue);
+            }
+            else
+            {
+                add_domino(space, cpvadd(offset, cpv(0.5f * (HEIGHT - WIDTH), HEIGHT + WIDTH)), cpFalse);
+            }
+        }
+    }
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo PyramidTopple = {
-	"Pyramid Topple",
-	1.0/180.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Pyramid Topple", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Query.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Query.c
index 9b49a4746a08..c030b1308d5f 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Query.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Query.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,126 +18,126 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpVect QUERY_START = {0,0};
+static cpVect QUERY_START = {0, 0};
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
-	
-	if(ChipmunkDemoRightClick){
-		QUERY_START = ChipmunkDemoMouse;
-	}
-	
-	cpVect start = QUERY_START;
-	cpVect end = ChipmunkDemoMouse;
-	cpFloat radius = 10.0;
-	ChipmunkDebugDrawSegment(start, end, RGBAColor(0,1,0,1));
-	
-	ChipmunkDemoPrintString("Query: Dist(%f)   Point(%5.2f, %5.2f),\n", cpvdist(start, end), end.x, end.y);
-	
-	cpSegmentQueryInfo segInfo = {0};
-	if(cpSpaceSegmentQueryFirst(space, start, end, radius, CP_SHAPE_FILTER_ALL, &segInfo)){
-		cpVect point = segInfo.point;
-		cpVect n = segInfo.normal;
-		
-		// Draw blue over the occluded part of the query
-		ChipmunkDebugDrawSegment(cpvlerp(start, end, segInfo.alpha), end, RGBAColor(0,0,1,1));
-		
-		// Draw a little red surface normal
-		ChipmunkDebugDrawSegment(point, cpvadd(point, cpvmult(n, 16)), RGBAColor(1,0,0,1));
-		
-		// Draw a little red dot on the hit point.
-		ChipmunkDebugDrawDot(3, point, RGBAColor(1,0,0,1));
-
-		
-		ChipmunkDemoPrintString("Segment Query: Dist(%f)   Normal(%5.2f, %5.2f)\n", segInfo.alpha*cpvdist(start, end), n.x, n.y);
-	} else {
-		ChipmunkDemoPrintString("Segment Query (None)\n");
-	}
-	
-	// Draw a fat green line over the unoccluded part of the query
-	ChipmunkDebugDrawFatSegment(start, cpvlerp(start, end, segInfo.alpha), radius, RGBAColor(0,1,0,1), LAColor(0,0));
-	
-	cpPointQueryInfo nearestInfo = {0};
-	cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 100.0, CP_SHAPE_FILTER_ALL, &nearestInfo);
-	if(nearestInfo.shape){
-		// Draw a grey line to the closest shape.
-		ChipmunkDebugDrawDot(3, ChipmunkDemoMouse, RGBAColor(0.5, 0.5, 0.5, 1.0));
-		ChipmunkDebugDrawSegment(ChipmunkDemoMouse, nearestInfo.point, 	RGBAColor(0.5, 0.5, 0.5, 1.0));
-		
-		// Draw a red bounding box around the shape under the mouse.
-		if(nearestInfo.distance < 0) ChipmunkDebugDrawBB(cpShapeGetBB(nearestInfo.shape), RGBAColor(1,0,0,1));
-	}
+    cpSpaceStep(space, dt);
+
+    if (ChipmunkDemoRightClick)
+    {
+        QUERY_START = ChipmunkDemoMouse;
+    }
+
+    cpVect start   = QUERY_START;
+    cpVect end     = ChipmunkDemoMouse;
+    cpFloat radius = 10.0;
+    ChipmunkDebugDrawSegment(start, end, RGBAColor(0, 1, 0, 1));
+
+    ChipmunkDemoPrintString("Query: Dist(%f)   Point(%5.2f, %5.2f),\n", cpvdist(start, end), end.x, end.y);
+
+    cpSegmentQueryInfo segInfo = {0};
+    if (cpSpaceSegmentQueryFirst(space, start, end, radius, CP_SHAPE_FILTER_ALL, &segInfo))
+    {
+        cpVect point = segInfo.point;
+        cpVect n     = segInfo.normal;
+
+        // Draw blue over the occluded part of the query
+        ChipmunkDebugDrawSegment(cpvlerp(start, end, segInfo.alpha), end, RGBAColor(0, 0, 1, 1));
+
+        // Draw a little red surface normal
+        ChipmunkDebugDrawSegment(point, cpvadd(point, cpvmult(n, 16)), RGBAColor(1, 0, 0, 1));
+
+        // Draw a little red dot on the hit point.
+        ChipmunkDebugDrawDot(3, point, RGBAColor(1, 0, 0, 1));
+
+        ChipmunkDemoPrintString("Segment Query: Dist(%f)   Normal(%5.2f, %5.2f)\n", segInfo.alpha * cpvdist(start, end),
+                                n.x, n.y);
+    }
+    else
+    {
+        ChipmunkDemoPrintString("Segment Query (None)\n");
+    }
+
+    // Draw a fat green line over the unoccluded part of the query
+    ChipmunkDebugDrawFatSegment(start, cpvlerp(start, end, segInfo.alpha), radius, RGBAColor(0, 1, 0, 1),
+                                LAColor(0, 0));
+
+    cpPointQueryInfo nearestInfo = {0};
+    cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 100.0, CP_SHAPE_FILTER_ALL, &nearestInfo);
+    if (nearestInfo.shape)
+    {
+        // Draw a grey line to the closest shape.
+        ChipmunkDebugDrawDot(3, ChipmunkDemoMouse, RGBAColor(0.5, 0.5, 0.5, 1.0));
+        ChipmunkDebugDrawSegment(ChipmunkDemoMouse, nearestInfo.point, RGBAColor(0.5, 0.5, 0.5, 1.0));
+
+        // Draw a red bounding box around the shape under the mouse.
+        if (nearestInfo.distance < 0)
+            ChipmunkDebugDrawBB(cpShapeGetBB(nearestInfo.shape), RGBAColor(1, 0, 0, 1));
+    }
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	QUERY_START = cpvzero;
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 5);
-	
-	{ // add a fat segment
-		cpFloat mass = 1.0f;
-		cpFloat length = 100.0f;
-		cpVect a = cpv(-length/2.0f, 0.0f), b = cpv(length/2.0f, 0.0f);
-		
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
-		cpBodySetPosition(body, cpv(0.0f, 100.0f));
-		
-		cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 20.0f));
-	}
-	
-	{ // add a static segment
-		cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(0, 300), cpv(300, 0), 0.0f));
-	}
-	
-	{ // add a pentagon
-		cpFloat mass = 1.0f;
-		
-		cpVect verts[5];
-		for(int i=0; i<5; i++){
-			cpFloat angle = -2.0f*CP_PI*i/((cpFloat) 5);
-			verts[i] = cpv(30*cos(angle), 30*sin(angle));
-		}
-		
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 5, verts, cpvzero, 0.0f)));
-		cpBodySetPosition(body, cpv(50.0f, 30.0f));
-		
-		cpSpaceAddShape(space, cpPolyShapeNew(body, 5, verts, cpTransformIdentity, 10.0f));
-	}
-	
-	{ // add a circle
-		cpFloat mass = 1.0f;
-		cpFloat r = 20.0f;
-		
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, r, cpvzero)));
-		cpBodySetPosition(body, cpv(100.0f, 100.0f));
-		
-		cpSpaceAddShape(space, cpCircleShapeNew(body, r, cpvzero));
-	}
-	
-	return space;
+    QUERY_START = cpvzero;
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 5);
+
+    {  // add a fat segment
+        cpFloat mass   = 1.0f;
+        cpFloat length = 100.0f;
+        cpVect a = cpv(-length / 2.0f, 0.0f), b = cpv(length / 2.0f, 0.0f);
+
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForSegment(mass, a, b, 0.0f)));
+        cpBodySetPosition(body, cpv(0.0f, 100.0f));
+
+        cpSpaceAddShape(space, cpSegmentShapeNew(body, a, b, 20.0f));
+    }
+
+    {  // add a static segment
+        cpSpaceAddShape(space, cpSegmentShapeNew(cpSpaceGetStaticBody(space), cpv(0, 300), cpv(300, 0), 0.0f));
+    }
+
+    {  // add a pentagon
+        cpFloat mass = 1.0f;
+
+        cpVect verts[5];
+        for (int i = 0; i < 5; i++)
+        {
+            cpFloat angle = -2.0f * CP_PI * i / ((cpFloat)5);
+            verts[i]      = cpv(30 * cos(angle), 30 * sin(angle));
+        }
+
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForPoly(mass, 5, verts, cpvzero, 0.0f)));
+        cpBodySetPosition(body, cpv(50.0f, 30.0f));
+
+        cpSpaceAddShape(space, cpPolyShapeNew(body, 5, verts, cpTransformIdentity, 10.0f));
+    }
+
+    {  // add a circle
+        cpFloat mass = 1.0f;
+        cpFloat r    = 20.0f;
+
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, r, cpvzero)));
+        cpBodySetPosition(body, cpv(100.0f, 100.0f));
+
+        cpSpaceAddShape(space, cpCircleShapeNew(body, r, cpvzero));
+    }
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Query = {
-	"Segment Query",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Segment Query", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Shatter.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Shatter.c
index c52ac7bdb656..d013e7e6335d 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Shatter.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Shatter.c
@@ -29,7 +29,8 @@
 
 #define MAX_VERTEXES_PER_VORONOI 16
 
-struct WorleyContex {
+struct WorleyContex
+{
     uint32_t seed;
     cpFloat cellSize;
     int width, height;
@@ -37,16 +38,18 @@ struct WorleyContex {
     cpVect focus;
 };
 
-static inline cpVect HashVect(uint32_t x, uint32_t y, uint32_t seed) {
+static inline cpVect HashVect(uint32_t x, uint32_t y, uint32_t seed)
+{
     //	cpFloat border = 0.21f;
     cpFloat border = 0.05f;
     uint32_t h     = (x * 1640531513 ^ y * 2654435789) + seed;
 
-    return cpv(cpflerp(border, 1.0f - border, (cpFloat)(h & 0xFFFF) / (cpFloat) 0xFFFF),
-        cpflerp(border, 1.0f - border, (cpFloat)((h >> 16) & 0xFFFF) / (cpFloat) 0xFFFF));
+    return cpv(cpflerp(border, 1.0f - border, (cpFloat)(h & 0xFFFF) / (cpFloat)0xFFFF),
+               cpflerp(border, 1.0f - border, (cpFloat)((h >> 16) & 0xFFFF) / (cpFloat)0xFFFF));
 }
 
-static cpVect WorleyPoint(int i, int j, struct WorleyContex* context) {
+static cpVect WorleyPoint(int i, int j, struct WorleyContex* context)
+{
     cpFloat size = context->cellSize;
     int width    = context->width;
     int height   = context->height;
@@ -56,18 +59,28 @@ static cpVect WorleyPoint(int i, int j, struct WorleyContex* context) {
     cpVect fv = HashVect(i, j, context->seed);
 
     return cpv(cpflerp(bb.l, bb.r, 0.5f) + size * (i + fv.x - width * 0.5f),
-        cpflerp(bb.b, bb.t, 0.5f) + size * (j + fv.y - height * 0.5f));
+               cpflerp(bb.b, bb.t, 0.5f) + size * (j + fv.y - height * 0.5f));
 }
 
-static int ClipCell(cpShape* shape, cpVect center, int i, int j, struct WorleyContex* context, cpVect* verts,
-    cpVect* clipped, int count) {
+static int ClipCell(cpShape* shape,
+                    cpVect center,
+                    int i,
+                    int j,
+                    struct WorleyContex* context,
+                    cpVect* verts,
+                    cpVect* clipped,
+                    int count)
+{
     cpVect other = WorleyPoint(i, j, context);
     //	printf("  other %dx%d: (% 5.2f, % 5.2f) ", i, j, other.x, other.y);
-    if (cpShapePointQuery(shape, other, NULL) > 0.0f) {
+    if (cpShapePointQuery(shape, other, NULL) > 0.0f)
+    {
         //		printf("excluded\n");
         memcpy(clipped, verts, count * sizeof(cpVect));
         return count;
-    } else {
+    }
+    else
+    {
         //		printf("clipped\n");
     }
 
@@ -75,11 +88,13 @@ static int ClipCell(cpShape* shape, cpVect center, int i, int j, struct WorleyCo
     cpFloat dist = cpvdot(n, cpvlerp(center, other, 0.5f));
 
     int clipped_count = 0;
-    for (int j = 0, i = count - 1; j < count; i = j, j++) {
+    for (int j = 0, i = count - 1; j < count; i = j, j++)
+    {
         cpVect a       = verts[i];
         cpFloat a_dist = cpvdot(a, n) - dist;
 
-        if (a_dist <= 0.0) {
+        if (a_dist <= 0.0)
+        {
             clipped[clipped_count] = a;
             clipped_count++;
         }
@@ -87,7 +102,8 @@ static int ClipCell(cpShape* shape, cpVect center, int i, int j, struct WorleyCo
         cpVect b       = verts[j];
         cpFloat b_dist = cpvdot(b, n) - dist;
 
-        if (a_dist * b_dist < 0.0f) {
+        if (a_dist * b_dist < 0.0f)
+        {
             cpFloat t = cpfabs(a_dist) / (cpfabs(a_dist) + cpfabs(b_dist));
 
             clipped[clipped_count] = cpvlerp(a, b, t);
@@ -98,25 +114,34 @@ static int ClipCell(cpShape* shape, cpVect center, int i, int j, struct WorleyCo
     return clipped_count;
 }
 
-static void ShatterCell(
-    cpSpace* space, cpShape* shape, cpVect cell, int cell_i, int cell_j, struct WorleyContex* context) {
+static void ShatterCell(cpSpace* space,
+                        cpShape* shape,
+                        cpVect cell,
+                        int cell_i,
+                        int cell_j,
+                        struct WorleyContex* context)
+{
     //	printf("cell %dx%d: (% 5.2f, % 5.2f)\n", cell_i, cell_j, cell.x, cell.y);
 
     cpBody* body = cpShapeGetBody(shape);
 
-    cpVect* ping = (cpVect*) alloca(MAX_VERTEXES_PER_VORONOI * sizeof(cpVect));
-    cpVect* pong = (cpVect*) alloca(MAX_VERTEXES_PER_VORONOI * sizeof(cpVect));
+    cpVect* ping = (cpVect*)alloca(MAX_VERTEXES_PER_VORONOI * sizeof(cpVect));
+    cpVect* pong = (cpVect*)alloca(MAX_VERTEXES_PER_VORONOI * sizeof(cpVect));
 
     int count = cpPolyShapeGetCount(shape);
     count     = (count > MAX_VERTEXES_PER_VORONOI ? MAX_VERTEXES_PER_VORONOI : count);
 
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < count; i++)
+    {
         ping[i] = cpBodyLocalToWorld(body, cpPolyShapeGetVert(shape, i));
     }
 
-    for (int i = 0; i < context->width; i++) {
-        for (int j = 0; j < context->height; j++) {
-            if (!(i == cell_i && j == cell_j) && cpShapePointQuery(shape, cell, NULL) < 0.0f) {
+    for (int i = 0; i < context->width; i++)
+    {
+        for (int j = 0; j < context->height; j++)
+        {
+            if (!(i == cell_i && j == cell_j) && cpShapePointQuery(shape, cell, NULL) < 0.0f)
+            {
                 count = ClipCell(shape, cell, i, j, context, ping, pong, count);
                 memcpy(ping, pong, count * sizeof(cpVect));
             }
@@ -138,20 +163,24 @@ static void ShatterCell(
     cpShapeSetFriction(new_shape, cpShapeGetFriction(shape));
 }
 
-static void ShatterShape(cpSpace* space, cpShape* shape, cpFloat cellSize, cpVect focus) {
+static void ShatterShape(cpSpace* space, cpShape* shape, cpFloat cellSize, cpVect focus)
+{
     cpSpaceRemoveShape(space, shape);
     cpSpaceRemoveBody(space, cpShapeGetBody(shape));
 
     cpBB bb    = cpShapeGetBB(shape);
-    int width  = (int) ((bb.r - bb.l) / cellSize) + 1;
-    int height = (int) ((bb.t - bb.b) / cellSize) + 1;
+    int width  = (int)((bb.r - bb.l) / cellSize) + 1;
+    int height = (int)((bb.t - bb.b) / cellSize) + 1;
     //	printf("Splitting as %dx%d\n", width, height);
     struct WorleyContex context = {(uint32_t)rand(), cellSize, width, height, bb, focus};
 
-    for (int i = 0; i < context.width; i++) {
-        for (int j = 0; j < context.height; j++) {
+    for (int i = 0; i < context.width; i++)
+    {
+        for (int j = 0; j < context.height; j++)
+        {
             cpVect cell = WorleyPoint(i, j, &context);
-            if (cpShapePointQuery(shape, cell, NULL) < 0.0f) {
+            if (cpShapePointQuery(shape, cell, NULL) < 0.0f)
+            {
                 ShatterCell(space, shape, cell, i, j, &context);
             }
         }
@@ -161,17 +190,23 @@ static void ShatterShape(cpSpace* space, cpShape* shape, cpFloat cellSize, cpVec
     cpShapeFree(shape);
 }
 
-static void update(cpSpace* space, double dt) {
+static void update(cpSpace* space, double dt)
+{
     cpSpaceStep(space, dt);
 
-    if (ChipmunkDemoRightDown) {
+    if (ChipmunkDemoRightDown)
+    {
         cpPointQueryInfo info;
-        if (cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 0, GRAB_FILTER, &info)) {
+        if (cpSpacePointQueryNearest(space, ChipmunkDemoMouse, 0, GRAB_FILTER, &info))
+        {
             cpBB bb           = cpShapeGetBB(info.shape);
             cpFloat cell_size = cpfmax(bb.r - bb.l, bb.t - bb.b) / 5.0f;
-            if (cell_size > 5.0f) {
-                ShatterShape(space, (cpShape*) info.shape, cell_size, ChipmunkDemoMouse);
-            } else {
+            if (cell_size > 5.0f)
+            {
+                ShatterShape(space, (cpShape*)info.shape, cell_size, ChipmunkDemoMouse);
+            }
+            else
+            {
                 //				printf("Too small to splinter %f\n", cell_size);
             }
         }
@@ -179,7 +214,8 @@ static void update(cpSpace* space, double dt) {
     }
 }
 
-static cpSpace* init(void) {
+static cpSpace* init(void)
+{
     ChipmunkDemoMessageString = "Right click something to shatter it.";
 
     cpSpace* space = cpSpaceNew();
@@ -210,16 +246,12 @@ static cpSpace* init(void) {
     return space;
 }
 
-static void destroy(cpSpace* space) {
+static void destroy(cpSpace* space)
+{
     ChipmunkDemoFreeSpaceChildren(space);
     cpSpaceFree(space);
 }
 
 ChipmunkDemo Shatter = {
-    "Shatter.",
-    1.0f / 60.0f,
-    init,
-    update,
-    ChipmunkDemoDefaultDrawImpl,
-    destroy,
+    "Shatter.", 1.0f / 60.0f, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Slice.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Slice.c
index 069de159dc70..445452e17a6a 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Slice.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Slice.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,171 +18,171 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 
 #include "ChipmunkDemo.h"
 
-#define DENSITY (1.0/10000.0)
+#define DENSITY (1.0 / 10000.0)
 
-static void
-ClipPoly(cpSpace *space, cpShape *shape, cpVect n, cpFloat dist)
+static void ClipPoly(cpSpace* space, cpShape* shape, cpVect n, cpFloat dist)
 {
-	cpBody *body = cpShapeGetBody(shape);
-	
-	int count = cpPolyShapeGetCount(shape);
-	int clippedCount = 0;
-	
-	cpVect *clipped = (cpVect *)alloca((count + 1)*sizeof(cpVect));
-	
-	for(int i=0, j=count-1; i<count; j=i, i++){
-		cpVect a = cpBodyLocalToWorld(body, cpPolyShapeGetVert(shape, j));
-		cpFloat a_dist = cpvdot(a, n) - dist;
-		
-		if(a_dist < 0.0){
-			clipped[clippedCount] = a;
-			clippedCount++;
-		}
-		
-		cpVect b = cpBodyLocalToWorld(body, cpPolyShapeGetVert(shape, i));
-		cpFloat b_dist = cpvdot(b, n) - dist;
-		
-		if(a_dist*b_dist < 0.0f){
-			cpFloat t = cpfabs(a_dist)/(cpfabs(a_dist) + cpfabs(b_dist));
-			
-			clipped[clippedCount] = cpvlerp(a, b, t);
-			clippedCount++;
-		}
-	}
-	
-	cpVect centroid = cpCentroidForPoly(clippedCount, clipped);
-	cpFloat mass = cpAreaForPoly(clippedCount, clipped, 0.0f)*DENSITY;
-	cpFloat moment = cpMomentForPoly(mass, clippedCount, clipped, cpvneg(centroid), 0.0f);
-	
-	cpBody *new_body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-	cpBodySetPosition(new_body, centroid);
-	cpBodySetVelocity(new_body, cpBodyGetVelocityAtWorldPoint(body, centroid));
-	cpBodySetAngularVelocity(new_body, cpBodyGetAngularVelocity(body));
-	
-	cpTransform transform = cpTransformTranslate(cpvneg(centroid));
-	cpShape *new_shape = cpSpaceAddShape(space, cpPolyShapeNew(new_body, clippedCount, clipped, transform, 0.0));
-	// Copy whatever properties you have set on the original shape that are important
-	cpShapeSetFriction(new_shape, cpShapeGetFriction(shape));
+    cpBody* body = cpShapeGetBody(shape);
+
+    int count        = cpPolyShapeGetCount(shape);
+    int clippedCount = 0;
+
+    cpVect* clipped = (cpVect*)alloca((count + 1) * sizeof(cpVect));
+
+    for (int i = 0, j = count - 1; i < count; j = i, i++)
+    {
+        cpVect a       = cpBodyLocalToWorld(body, cpPolyShapeGetVert(shape, j));
+        cpFloat a_dist = cpvdot(a, n) - dist;
+
+        if (a_dist < 0.0)
+        {
+            clipped[clippedCount] = a;
+            clippedCount++;
+        }
+
+        cpVect b       = cpBodyLocalToWorld(body, cpPolyShapeGetVert(shape, i));
+        cpFloat b_dist = cpvdot(b, n) - dist;
+
+        if (a_dist * b_dist < 0.0f)
+        {
+            cpFloat t = cpfabs(a_dist) / (cpfabs(a_dist) + cpfabs(b_dist));
+
+            clipped[clippedCount] = cpvlerp(a, b, t);
+            clippedCount++;
+        }
+    }
+
+    cpVect centroid = cpCentroidForPoly(clippedCount, clipped);
+    cpFloat mass    = cpAreaForPoly(clippedCount, clipped, 0.0f) * DENSITY;
+    cpFloat moment  = cpMomentForPoly(mass, clippedCount, clipped, cpvneg(centroid), 0.0f);
+
+    cpBody* new_body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+    cpBodySetPosition(new_body, centroid);
+    cpBodySetVelocity(new_body, cpBodyGetVelocityAtWorldPoint(body, centroid));
+    cpBodySetAngularVelocity(new_body, cpBodyGetAngularVelocity(body));
+
+    cpTransform transform = cpTransformTranslate(cpvneg(centroid));
+    cpShape* new_shape    = cpSpaceAddShape(space, cpPolyShapeNew(new_body, clippedCount, clipped, transform, 0.0));
+    // Copy whatever properties you have set on the original shape that are important
+    cpShapeSetFriction(new_shape, cpShapeGetFriction(shape));
 }
 
 // Context structs are annoying, use blocks or closures instead if your compiler supports them.
-struct SliceContext {
-	cpVect a, b;
-	cpSpace *space;
+struct SliceContext
+{
+    cpVect a, b;
+    cpSpace* space;
 };
 
-static void
-SliceShapePostStep(cpSpace *space, cpShape *shape, struct SliceContext *context)
+static void SliceShapePostStep(cpSpace* space, cpShape* shape, struct SliceContext* context)
 {
-	cpVect a = context->a;
-	cpVect b = context->b;
-	
-	// Clipping plane normal and distance.
-	cpVect n = cpvnormalize(cpvperp(cpvsub(b, a)));
-	cpFloat dist = cpvdot(a, n);
-	
-	ClipPoly(space, shape, n, dist);
-	ClipPoly(space, shape, cpvneg(n), -dist);
-	
-	cpBody *body = cpShapeGetBody(shape);
-	cpSpaceRemoveShape(space, shape);
-	cpSpaceRemoveBody(space, body);
-	cpShapeFree(shape);
-	cpBodyFree(body);
+    cpVect a = context->a;
+    cpVect b = context->b;
+
+    // Clipping plane normal and distance.
+    cpVect n     = cpvnormalize(cpvperp(cpvsub(b, a)));
+    cpFloat dist = cpvdot(a, n);
+
+    ClipPoly(space, shape, n, dist);
+    ClipPoly(space, shape, cpvneg(n), -dist);
+
+    cpBody* body = cpShapeGetBody(shape);
+    cpSpaceRemoveShape(space, shape);
+    cpSpaceRemoveBody(space, body);
+    cpShapeFree(shape);
+    cpBodyFree(body);
 }
 
-static void
-SliceQuery(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, struct SliceContext *context)
+static void SliceQuery(cpShape* shape, cpVect point, cpVect normal, cpFloat alpha, struct SliceContext* context)
 {
-	cpVect a = context->a;
-	cpVect b = context->b;
-	
-	// Check that the slice was complete by checking that the endpoints aren't in the sliced shape.
-	if(cpShapePointQuery(shape, a, NULL) > 0.0f && cpShapePointQuery(shape, b, NULL) > 0.0f){
-		// Can't modify the space during a query.
-		// Must make a post-step callback to do the actual slicing.
-		cpSpaceAddPostStepCallback(context->space, (cpPostStepFunc)SliceShapePostStep, shape, context);
-	}
+    cpVect a = context->a;
+    cpVect b = context->b;
+
+    // Check that the slice was complete by checking that the endpoints aren't in the sliced shape.
+    if (cpShapePointQuery(shape, a, NULL) > 0.0f && cpShapePointQuery(shape, b, NULL) > 0.0f)
+    {
+        // Can't modify the space during a query.
+        // Must make a post-step callback to do the actual slicing.
+        cpSpaceAddPostStepCallback(context->space, (cpPostStepFunc)SliceShapePostStep, shape, context);
+    }
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
-	
-	static cpBool lastClickState = cpFalse;
-	static cpVect sliceStart = {0.0, 0.0};
-	
-	// Annoying state tracking code that you wouldn't need
-	// in a real event driven system.
-	if(ChipmunkDemoRightClick != lastClickState){
-		if(ChipmunkDemoRightClick){
-			// MouseDown
-			sliceStart = ChipmunkDemoMouse;
-		} else {
-			// MouseUp
-			struct SliceContext context = {sliceStart, ChipmunkDemoMouse, space};
-			cpSpaceSegmentQuery(space, sliceStart, ChipmunkDemoMouse, 0.0, GRAB_FILTER, (cpSpaceSegmentQueryFunc)SliceQuery, &context);
-		}
-		
-		lastClickState = ChipmunkDemoRightClick;
-	}
-	
-	if(ChipmunkDemoRightClick){
-		ChipmunkDebugDrawSegment(sliceStart, ChipmunkDemoMouse, RGBAColor(1, 0, 0, 1));
-	}
+    cpSpaceStep(space, dt);
+
+    static cpBool lastClickState = cpFalse;
+    static cpVect sliceStart     = {0.0, 0.0};
+
+    // Annoying state tracking code that you wouldn't need
+    // in a real event driven system.
+    if (ChipmunkDemoRightClick != lastClickState)
+    {
+        if (ChipmunkDemoRightClick)
+        {
+            // MouseDown
+            sliceStart = ChipmunkDemoMouse;
+        }
+        else
+        {
+            // MouseUp
+            struct SliceContext context = {sliceStart, ChipmunkDemoMouse, space};
+            cpSpaceSegmentQuery(space, sliceStart, ChipmunkDemoMouse, 0.0, GRAB_FILTER,
+                                (cpSpaceSegmentQueryFunc)SliceQuery, &context);
+        }
+
+        lastClickState = ChipmunkDemoRightClick;
+    }
+
+    if (ChipmunkDemoRightClick)
+    {
+        ChipmunkDebugDrawSegment(sliceStart, ChipmunkDemoMouse, RGBAColor(1, 0, 0, 1));
+    }
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Right click and drag to slice up the block.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -500));
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	cpSpaceSetCollisionSlop(space, 0.5f);
-	
-	cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-1000,-240), cpv(1000,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	cpFloat width = 200.0f;
-	cpFloat height = 300.0f;
-	cpFloat mass = width*height*DENSITY;
-	cpFloat moment = cpMomentForBox(mass, width, height);
-	
-	body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-	
-	shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-	cpShapeSetFriction(shape, 0.6f);
-		
-	return space;
+    ChipmunkDemoMessageString = "Right click and drag to slice up the block.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -500));
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+    cpSpaceSetCollisionSlop(space, 0.5f);
+
+    cpBody *body, *staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-1000, -240), cpv(1000, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpFloat width  = 200.0f;
+    cpFloat height = 300.0f;
+    cpFloat mass   = width * height * DENSITY;
+    cpFloat moment = cpMomentForBox(mass, width, height);
+
+    body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+
+    shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+    cpShapeSetFriction(shape, 0.6f);
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Slice = {
-	"Slice.",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Slice.", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Springies.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Springies.c
index 8673e08fbee6..89fdfab17025 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Springies.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Springies.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,145 +18,135 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include <string.h>
 
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpFloat
-springForce(cpConstraint *spring, cpFloat dist)
+static cpFloat springForce(cpConstraint* spring, cpFloat dist)
 {
-	cpFloat clamp = 20.0f;
-	return cpfclamp(cpDampedSpringGetRestLength(spring) - dist, -clamp, clamp)*cpDampedSpringGetStiffness(spring);
+    cpFloat clamp = 20.0f;
+    return cpfclamp(cpDampedSpringGetRestLength(spring) - dist, -clamp, clamp) * cpDampedSpringGetStiffness(spring);
 }
 
-static cpConstraint *
-new_spring(cpBody *a, cpBody *b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiff, cpFloat damp)
+static cpConstraint*
+new_spring(cpBody* a, cpBody* b, cpVect anchorA, cpVect anchorB, cpFloat restLength, cpFloat stiff, cpFloat damp)
 {
-	cpConstraint *spring = cpDampedSpringNew(a, b, anchorA, anchorB, restLength, stiff, damp);
-	cpDampedSpringSetSpringForceFunc(spring, springForce);
-	
-	return spring;
+    cpConstraint* spring = cpDampedSpringNew(a, b, anchorA, anchorB, restLength, stiff, damp);
+    cpDampedSpringSetSpringForceFunc(spring, springForce);
+
+    return spring;
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static cpBody *
-add_bar(cpSpace *space, cpVect a, cpVect b, int group)
+static cpBody* add_bar(cpSpace* space, cpVect a, cpVect b, int group)
 {
-	cpVect center = cpvmult(cpvadd(a, b), 1.0f/2.0f);
-	cpFloat length = cpvlength(cpvsub(b, a));
-	cpFloat mass = length/160.0f;
-	
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, mass*length*length/12.0f));
-	cpBodySetPosition(body, center);
-	
-	cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpvsub(a, center), cpvsub(b, center), 10.0f));
-	cpShapeSetFilter(shape, cpShapeFilterNew(group, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	return body;
+    cpVect center  = cpvmult(cpvadd(a, b), 1.0f / 2.0f);
+    cpFloat length = cpvlength(cpvsub(b, a));
+    cpFloat mass   = length / 160.0f;
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, mass * length * length / 12.0f));
+    cpBodySetPosition(body, center);
+
+    cpShape* shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpvsub(a, center), cpvsub(b, center), 10.0f));
+    cpShapeSetFilter(shape, cpShapeFilterNew(group, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    return body;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	
-	cpBody *body1  = add_bar(space, cpv(-240,  160), cpv(-160,   80), 1);
-	cpBody *body2  = add_bar(space, cpv(-160,   80), cpv( -80,  160), 1);
-	cpBody *body3  = add_bar(space, cpv(   0,  160), cpv(  80,    0), 0);
-	cpBody *body4  = add_bar(space, cpv( 160,  160), cpv( 240,  160), 0);
-	cpBody *body5  = add_bar(space, cpv(-240,    0), cpv(-160,  -80), 2);
-	cpBody *body6  = add_bar(space, cpv(-160,  -80), cpv( -80,    0), 2);
-	cpBody *body7  = add_bar(space, cpv( -80,    0), cpv(   0,    0), 2);
-	cpBody *body8  = add_bar(space, cpv(   0,  -80), cpv(  80,  -80), 0);
-	cpBody *body9  = add_bar(space, cpv( 240,   80), cpv( 160,    0), 3);
-	cpBody *body10 = add_bar(space, cpv( 160,    0), cpv( 240,  -80), 3);
-	cpBody *body11 = add_bar(space, cpv(-240,  -80), cpv(-160, -160), 4);
-	cpBody *body12 = add_bar(space, cpv(-160, -160), cpv( -80, -160), 4);
-	cpBody *body13 = add_bar(space, cpv(   0, -160), cpv(  80, -160), 0);
-	cpBody *body14 = add_bar(space, cpv( 160, -160), cpv( 240, -160), 0);
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2( body1,  body2, cpv( 40,-40), cpv(-40,-40)));
-	cpSpaceAddConstraint(space, cpPivotJointNew2( body5,  body6, cpv( 40,-40), cpv(-40,-40)));
-	cpSpaceAddConstraint(space, cpPivotJointNew2( body6,  body7, cpv( 40, 40), cpv(-40,  0)));
-	cpSpaceAddConstraint(space, cpPivotJointNew2( body9, body10, cpv(-40,-40), cpv(-40, 40)));
-	cpSpaceAddConstraint(space, cpPivotJointNew2(body11, body12, cpv( 40,-40), cpv(-40,  0)));
-	
-	cpFloat stiff = 100.0f;
-	cpFloat damp = 0.5f;
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body1, cpv(-320,  240), cpv(-40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body1, cpv(-320,   80), cpv(-40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body1, cpv(-160,  240), cpv(-40, 40), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body2, cpv(-160,  240), cpv( 40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body2, cpv(   0,  240), cpv( 40, 40), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body3, cpv(  80,  240), cpv(-40, 80), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body4, cpv(  80,  240), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body4, cpv( 320,  240), cpv( 40,  0), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body5, cpv(-320,   80), cpv(-40, 40), 0.0f, stiff, damp));
-	
-	cpSpaceAddConstraint(space, new_spring(staticBody,  body9, cpv( 320,  80), cpv( 40, 40), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody, body10, cpv( 320,   0), cpv( 40,-40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody, body10, cpv( 320,-160), cpv( 40,-40), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody, body11, cpv(-320,-160), cpv(-40, 40), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody, body12, cpv(-240,-240), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody, body12, cpv(   0,-240), cpv( 40,  0), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody, body13, cpv(   0,-240), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody, body13, cpv(  80,-240), cpv( 40,  0), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv(  80,-240), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv( 240,-240), cpv( 40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv( 320,-160), cpv( 40,  0), 0.0f, stiff, damp));
-
-	cpSpaceAddConstraint(space, new_spring( body1,  body5, cpv( 40,-40), cpv(-40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body1,  body6, cpv( 40,-40), cpv( 40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body2,  body3, cpv( 40, 40), cpv(-40, 80), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body4, cpv(-40, 80), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body4, cpv( 40,-80), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body7, cpv( 40,-80), cpv( 40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body7, cpv(-40, 80), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body8, cpv( 40,-80), cpv( 40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body3,  body9, cpv( 40,-80), cpv(-40,-40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body4,  body9, cpv( 40,  0), cpv( 40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body5, body11, cpv(-40, 40), cpv(-40, 40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body5, body11, cpv( 40,-40), cpv( 40,-40), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body7,  body8, cpv( 40,  0), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body8, body12, cpv(-40,  0), cpv( 40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body8, body13, cpv(-40,  0), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body8, body13, cpv( 40,  0), cpv( 40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring( body8, body14, cpv( 40,  0), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(body10, body14, cpv( 40,-40), cpv(-40,  0), 0.0f, stiff, damp));
-	cpSpaceAddConstraint(space, new_spring(body10, body14, cpv( 40,-40), cpv(-40,  0), 0.0f, stiff, damp));
-	
-	return space;
+    cpSpace* space     = cpSpaceNew();
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+
+    cpBody* body1  = add_bar(space, cpv(-240, 160), cpv(-160, 80), 1);
+    cpBody* body2  = add_bar(space, cpv(-160, 80), cpv(-80, 160), 1);
+    cpBody* body3  = add_bar(space, cpv(0, 160), cpv(80, 0), 0);
+    cpBody* body4  = add_bar(space, cpv(160, 160), cpv(240, 160), 0);
+    cpBody* body5  = add_bar(space, cpv(-240, 0), cpv(-160, -80), 2);
+    cpBody* body6  = add_bar(space, cpv(-160, -80), cpv(-80, 0), 2);
+    cpBody* body7  = add_bar(space, cpv(-80, 0), cpv(0, 0), 2);
+    cpBody* body8  = add_bar(space, cpv(0, -80), cpv(80, -80), 0);
+    cpBody* body9  = add_bar(space, cpv(240, 80), cpv(160, 0), 3);
+    cpBody* body10 = add_bar(space, cpv(160, 0), cpv(240, -80), 3);
+    cpBody* body11 = add_bar(space, cpv(-240, -80), cpv(-160, -160), 4);
+    cpBody* body12 = add_bar(space, cpv(-160, -160), cpv(-80, -160), 4);
+    cpBody* body13 = add_bar(space, cpv(0, -160), cpv(80, -160), 0);
+    cpBody* body14 = add_bar(space, cpv(160, -160), cpv(240, -160), 0);
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(body1, body2, cpv(40, -40), cpv(-40, -40)));
+    cpSpaceAddConstraint(space, cpPivotJointNew2(body5, body6, cpv(40, -40), cpv(-40, -40)));
+    cpSpaceAddConstraint(space, cpPivotJointNew2(body6, body7, cpv(40, 40), cpv(-40, 0)));
+    cpSpaceAddConstraint(space, cpPivotJointNew2(body9, body10, cpv(-40, -40), cpv(-40, 40)));
+    cpSpaceAddConstraint(space, cpPivotJointNew2(body11, body12, cpv(40, -40), cpv(-40, 0)));
+
+    cpFloat stiff = 100.0f;
+    cpFloat damp  = 0.5f;
+    cpSpaceAddConstraint(space, new_spring(staticBody, body1, cpv(-320, 240), cpv(-40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body1, cpv(-320, 80), cpv(-40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body1, cpv(-160, 240), cpv(-40, 40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body2, cpv(-160, 240), cpv(40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body2, cpv(0, 240), cpv(40, 40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body3, cpv(80, 240), cpv(-40, 80), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body4, cpv(80, 240), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body4, cpv(320, 240), cpv(40, 0), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body5, cpv(-320, 80), cpv(-40, 40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body9, cpv(320, 80), cpv(40, 40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body10, cpv(320, 0), cpv(40, -40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body10, cpv(320, -160), cpv(40, -40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body11, cpv(-320, -160), cpv(-40, 40), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body12, cpv(-240, -240), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body12, cpv(0, -240), cpv(40, 0), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body13, cpv(0, -240), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body13, cpv(80, -240), cpv(40, 0), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv(80, -240), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv(240, -240), cpv(40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(staticBody, body14, cpv(320, -160), cpv(40, 0), 0.0f, stiff, damp));
+
+    cpSpaceAddConstraint(space, new_spring(body1, body5, cpv(40, -40), cpv(-40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body1, body6, cpv(40, -40), cpv(40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body2, body3, cpv(40, 40), cpv(-40, 80), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body4, cpv(-40, 80), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body4, cpv(40, -80), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body7, cpv(40, -80), cpv(40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body7, cpv(-40, 80), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body8, cpv(40, -80), cpv(40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body3, body9, cpv(40, -80), cpv(-40, -40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body4, body9, cpv(40, 0), cpv(40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body5, body11, cpv(-40, 40), cpv(-40, 40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body5, body11, cpv(40, -40), cpv(40, -40), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body7, body8, cpv(40, 0), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body8, body12, cpv(-40, 0), cpv(40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body8, body13, cpv(-40, 0), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body8, body13, cpv(40, 0), cpv(40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body8, body14, cpv(40, 0), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body10, body14, cpv(40, -40), cpv(-40, 0), 0.0f, stiff, damp));
+    cpSpaceAddConstraint(space, new_spring(body10, body14, cpv(40, -40), cpv(-40, 0), 0.0f, stiff, damp));
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Springies = {
-	"Springies",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Springies", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Sticky.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Sticky.c
index 29924d19156e..f7545afdbf17 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Sticky.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Sticky.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,180 +18,173 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-enum {
-	COLLISION_TYPE_STICKY = 1,
+enum
+{
+    COLLISION_TYPE_STICKY = 1,
 };
 
 #define STICK_SENSOR_THICKNESS 2.5f
 
-static void
-PostStepAddJoint(cpSpace *space, void *key, void *data)
+static void PostStepAddJoint(cpSpace* space, void* key, void* data)
 {
-//	printf("Adding joint for %p\n", data);
-	
-	cpConstraint *joint = (cpConstraint *)key;
-	cpSpaceAddConstraint(space, joint);
+    //	printf("Adding joint for %p\n", data);
+
+    cpConstraint* joint = (cpConstraint*)key;
+    cpSpaceAddConstraint(space, joint);
 }
 
-static cpBool
-StickyPreSolve(cpArbiter *arb, cpSpace *space, void *data)
+static cpBool StickyPreSolve(cpArbiter* arb, cpSpace* space, void* data)
 {
-	// We want to fudge the collisions a bit to allow shapes to overlap more.
-	// This simulates their squishy sticky surface, and more importantly
-	// keeps them from separating and destroying the joint.
-	
-	// Track the deepest collision point and use that to determine if a rigid collision should occur.
-	cpFloat deepest = INFINITY;
-	
-	// Grab the contact set and iterate over them.
-	cpContactPointSet contacts = cpArbiterGetContactPointSet(arb);
-	for(int i=0; i<contacts.count; i++){
-		// Sink the contact points into the surface of each shape.
-		contacts.points[i].pointA = cpvsub(contacts.points[i].pointA, cpvmult(contacts.normal, STICK_SENSOR_THICKNESS));
-		contacts.points[i].pointB = cpvadd(contacts.points[i].pointB, cpvmult(contacts.normal, STICK_SENSOR_THICKNESS));
-		deepest = cpfmin(deepest, contacts.points[i].distance);// + 2.0f*STICK_SENSOR_THICKNESS);
-	}
-	
-	// Set the new contact point data.
-	cpArbiterSetContactPointSet(arb, &contacts);
-	
-	// If the shapes are overlapping enough, then create a
-	// joint that sticks them together at the first contact point.
-	if(!cpArbiterGetUserData(arb) && deepest <= 0.0f){
-		CP_ARBITER_GET_BODIES(arb, bodyA, bodyB);
-		
-		// Create a joint at the contact point to hold the body in place.
-		cpVect anchorA = cpBodyWorldToLocal(bodyA, contacts.points[0].pointA);
-		cpVect anchorB = cpBodyWorldToLocal(bodyB, contacts.points[0].pointB);
-		cpConstraint *joint = cpPivotJointNew2(bodyA, bodyB, anchorA, anchorB);
-		
-		// Give it a finite force for the stickyness.
-		cpConstraintSetMaxForce(joint, 3e3);
-		
-		// Schedule a post-step() callback to add the joint.
-		cpSpaceAddPostStepCallback(space, PostStepAddJoint, joint, NULL);
-		
-		// Store the joint on the arbiter so we can remove it later.
-		cpArbiterSetUserData(arb, joint);
-	}
-	
-	// Position correction and velocity are handled separately so changing
-	// the overlap distance alone won't prevent the collision from occuring.
-	// Explicitly the collision for this frame if the shapes don't overlap using the new distance.
-	return (deepest <= 0.0f);
-	
-	// Lots more that you could improve upon here as well:
-	// * Modify the joint over time to make it plastic.
-	// * Modify the joint in the post-step to make it conditionally plastic (like clay).
-	// * Track a joint for the deepest contact point instead of the first.
-	// * Track a joint for each contact point. (more complicated since you only get one data pointer).
+    // We want to fudge the collisions a bit to allow shapes to overlap more.
+    // This simulates their squishy sticky surface, and more importantly
+    // keeps them from separating and destroying the joint.
+
+    // Track the deepest collision point and use that to determine if a rigid collision should occur.
+    cpFloat deepest = INFINITY;
+
+    // Grab the contact set and iterate over them.
+    cpContactPointSet contacts = cpArbiterGetContactPointSet(arb);
+    for (int i = 0; i < contacts.count; i++)
+    {
+        // Sink the contact points into the surface of each shape.
+        contacts.points[i].pointA = cpvsub(contacts.points[i].pointA, cpvmult(contacts.normal, STICK_SENSOR_THICKNESS));
+        contacts.points[i].pointB = cpvadd(contacts.points[i].pointB, cpvmult(contacts.normal, STICK_SENSOR_THICKNESS));
+        deepest                   = cpfmin(deepest, contacts.points[i].distance);  // + 2.0f*STICK_SENSOR_THICKNESS);
+    }
+
+    // Set the new contact point data.
+    cpArbiterSetContactPointSet(arb, &contacts);
+
+    // If the shapes are overlapping enough, then create a
+    // joint that sticks them together at the first contact point.
+    if (!cpArbiterGetUserData(arb) && deepest <= 0.0f)
+    {
+        CP_ARBITER_GET_BODIES(arb, bodyA, bodyB);
+
+        // Create a joint at the contact point to hold the body in place.
+        cpVect anchorA      = cpBodyWorldToLocal(bodyA, contacts.points[0].pointA);
+        cpVect anchorB      = cpBodyWorldToLocal(bodyB, contacts.points[0].pointB);
+        cpConstraint* joint = cpPivotJointNew2(bodyA, bodyB, anchorA, anchorB);
+
+        // Give it a finite force for the stickyness.
+        cpConstraintSetMaxForce(joint, 3e3);
+
+        // Schedule a post-step() callback to add the joint.
+        cpSpaceAddPostStepCallback(space, PostStepAddJoint, joint, NULL);
+
+        // Store the joint on the arbiter so we can remove it later.
+        cpArbiterSetUserData(arb, joint);
+    }
+
+    // Position correction and velocity are handled separately so changing
+    // the overlap distance alone won't prevent the collision from occuring.
+    // Explicitly the collision for this frame if the shapes don't overlap using the new distance.
+    return (deepest <= 0.0f);
+
+    // Lots more that you could improve upon here as well:
+    // * Modify the joint over time to make it plastic.
+    // * Modify the joint in the post-step to make it conditionally plastic (like clay).
+    // * Track a joint for the deepest contact point instead of the first.
+    // * Track a joint for each contact point. (more complicated since you only get one data pointer).
 }
 
-static void
-PostStepRemoveJoint(cpSpace *space, void *key, void *data)
+static void PostStepRemoveJoint(cpSpace* space, void* key, void* data)
 {
-//	printf("Removing joint for %p\n", data);
-	
-	cpConstraint *joint = (cpConstraint *)key;
-	cpSpaceRemoveConstraint(space, joint);
-	cpConstraintFree(joint);
+    //	printf("Removing joint for %p\n", data);
+
+    cpConstraint* joint = (cpConstraint*)key;
+    cpSpaceRemoveConstraint(space, joint);
+    cpConstraintFree(joint);
 }
 
-static void
-StickySeparate(cpArbiter *arb, cpSpace *space, void *data)
+static void StickySeparate(cpArbiter* arb, cpSpace* space, void* data)
 {
-	cpConstraint *joint = (cpConstraint *)cpArbiterGetUserData(arb);
-	
-	if(joint){
-		// The joint won't be removed until the step is done.
-		// Need to disable it so that it won't apply itself.
-		// Setting the force to 0 will do just that
-		cpConstraintSetMaxForce(joint, 0.0f);
-		
-		// Perform the removal in a post-step() callback.
-		cpSpaceAddPostStepCallback(space, PostStepRemoveJoint, joint, NULL);
-		
-		// NULL out the reference to the joint.
-		// Not required, but it's a good practice.
-		cpArbiterSetUserData(arb, NULL);
-	}
+    cpConstraint* joint = (cpConstraint*)cpArbiterGetUserData(arb);
+
+    if (joint)
+    {
+        // The joint won't be removed until the step is done.
+        // Need to disable it so that it won't apply itself.
+        // Setting the force to 0 will do just that
+        cpConstraintSetMaxForce(joint, 0.0f);
+
+        // Perform the removal in a post-step() callback.
+        cpSpaceAddPostStepCallback(space, PostStepRemoveJoint, joint, NULL);
+
+        // NULL out the reference to the joint.
+        // Not required, but it's a good practice.
+        cpArbiterSetUserData(arb, NULL);
+    }
 }
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Sticky collisions using the cpArbiter data pointer.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetGravity(space, cpv(0, -1000));
-	cpSpaceSetCollisionSlop(space, 2.0);
-
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340,-260), cpv(-340, 260), 20.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv( 340,-260), cpv( 340, 260), 20.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340,-260), cpv( 340,-260), 20.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340, 260), cpv( 340, 260), 20.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	for(int i=0; i<200; i++){
-		cpFloat mass = 0.15f;
-		cpFloat radius = 10.0f;
-		
-		cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
-		cpBodySetPosition(body, cpv(cpflerp(-150.0f, 150.0f, frand()), cpflerp(-150.0f, 150.0f, frand())));
-
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius + STICK_SENSOR_THICKNESS, cpvzero));
-		cpShapeSetFriction(shape, 0.9f);
-		cpShapeSetCollisionType(shape, COLLISION_TYPE_STICKY);
-	}
-	
-	cpCollisionHandler *handler = cpSpaceAddWildcardHandler(space, COLLISION_TYPE_STICKY);
-	handler->preSolveFunc = StickyPreSolve;
-	handler->separateFunc = StickySeparate;
-	
-	return space;
+    ChipmunkDemoMessageString = "Sticky collisions using the cpArbiter data pointer.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetGravity(space, cpv(0, -1000));
+    cpSpaceSetCollisionSlop(space, 2.0);
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340, -260), cpv(-340, 260), 20.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(340, -260), cpv(340, 260), 20.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340, -260), cpv(340, -260), 20.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-340, 260), cpv(340, 260), 20.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    for (int i = 0; i < 200; i++)
+    {
+        cpFloat mass   = 0.15f;
+        cpFloat radius = 10.0f;
+
+        cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0f, radius, cpvzero)));
+        cpBodySetPosition(body, cpv(cpflerp(-150.0f, 150.0f, frand()), cpflerp(-150.0f, 150.0f, frand())));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius + STICK_SENSOR_THICKNESS, cpvzero));
+        cpShapeSetFriction(shape, 0.9f);
+        cpShapeSetCollisionType(shape, COLLISION_TYPE_STICKY);
+    }
+
+    cpCollisionHandler* handler = cpSpaceAddWildcardHandler(space, COLLISION_TYPE_STICKY);
+    handler->preSolveFunc       = StickyPreSolve;
+    handler->separateFunc       = StickySeparate;
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Sticky = {
-	"Sticky Surfaces",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Sticky Surfaces", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tank.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tank.c
index 249828966a29..3b5d1d41b417 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tank.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tank.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,119 +18,115 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
 static cpBody *tankBody, *tankControlBody;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	// turn the control body based on the angle relative to the actual body
-	cpVect mouseDelta = cpvsub(ChipmunkDemoMouse, cpBodyGetPosition(tankBody));
-	cpFloat turn = cpvtoangle(cpvunrotate(cpBodyGetRotation(tankBody), mouseDelta));
-	cpBodySetAngle(tankControlBody, cpBodyGetAngle(tankBody) - turn);
-	
-	// drive the tank towards the mouse
-	if(cpvnear(ChipmunkDemoMouse, cpBodyGetPosition(tankBody), 30.0)){
-		cpBodySetVelocity(tankControlBody, cpvzero); // stop
-	} else {
-		cpFloat direction = (cpvdot(mouseDelta, cpBodyGetRotation(tankBody)) > 0.0 ? 1.0 : -1.0);
-		cpBodySetVelocity(tankControlBody, cpvrotate(cpBodyGetRotation(tankBody), cpv(30.0f*direction, 0.0f)));
-	}
-	
-	cpSpaceStep(space, dt);
+    // turn the control body based on the angle relative to the actual body
+    cpVect mouseDelta = cpvsub(ChipmunkDemoMouse, cpBodyGetPosition(tankBody));
+    cpFloat turn      = cpvtoangle(cpvunrotate(cpBodyGetRotation(tankBody), mouseDelta));
+    cpBodySetAngle(tankControlBody, cpBodyGetAngle(tankBody) - turn);
+
+    // drive the tank towards the mouse
+    if (cpvnear(ChipmunkDemoMouse, cpBodyGetPosition(tankBody), 30.0))
+    {
+        cpBodySetVelocity(tankControlBody, cpvzero);  // stop
+    }
+    else
+    {
+        cpFloat direction = (cpvdot(mouseDelta, cpBodyGetRotation(tankBody)) > 0.0 ? 1.0 : -1.0);
+        cpBodySetVelocity(tankControlBody, cpvrotate(cpBodyGetRotation(tankBody), cpv(30.0f * direction, 0.0f)));
+    }
+
+    cpSpaceStep(space, dt);
 }
 
-static cpBody *
-add_box(cpSpace *space, cpFloat size, cpFloat mass)
+static cpBody* add_box(cpSpace* space, cpFloat size, cpFloat mass)
 {
-	cpFloat radius = cpvlength(cpv(size, size));
-
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, size, size)));
-	cpBodySetPosition(body, cpv(frand()*(640 - 2*radius) - (320 - radius), frand()*(480 - 2*radius) - (240 - radius)));
-	
-	cpShape *shape = cpSpaceAddShape(space, cpBoxShapeNew(body, size, size, 0.0));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
-	
-	return body;
+    cpFloat radius = cpvlength(cpv(size, size));
+
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, size, size)));
+    cpBodySetPosition(
+        body, cpv(frand() * (640 - 2 * radius) - (320 - radius), frand() * (480 - 2 * radius) - (240 - radius)));
+
+    cpShape* shape = cpSpaceAddShape(space, cpBoxShapeNew(body, size, size, 0.0));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
+
+    return body;
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Use the mouse to drive the tank, it will follow the cursor.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 10);
-	cpSpaceSetSleepTimeThreshold(space, 0.5f);
-	
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-		
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	for(int i=0; i<50; i++){
-		cpBody *body = add_box(space, 20, 1);
-		
-		cpConstraint *pivot = cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, body, cpvzero, cpvzero));
-		cpConstraintSetMaxBias(pivot, 0); // disable joint correction
-		cpConstraintSetMaxForce(pivot, 1000.0f); // emulate linear friction
-		
-		cpConstraint *gear = cpSpaceAddConstraint(space, cpGearJointNew(staticBody, body, 0.0f, 1.0f));
-		cpConstraintSetMaxBias(gear, 0); // disable joint correction
-		cpConstraintSetMaxForce(gear, 5000.0f); // emulate angular friction
-	}
-	
-	// We joint the tank to the control body and control the tank indirectly by modifying the control body.
-	tankControlBody = cpSpaceAddBody(space, cpBodyNewKinematic());
-	tankBody = add_box(space, 30, 10);
-	
-	cpConstraint *pivot = cpSpaceAddConstraint(space, cpPivotJointNew2(tankControlBody, tankBody, cpvzero, cpvzero));
-	cpConstraintSetMaxBias(pivot, 0); // disable joint correction
-	cpConstraintSetMaxForce(pivot, 10000.0f); // emulate linear friction
-	
-	cpConstraint *gear = cpSpaceAddConstraint(space, cpGearJointNew(tankControlBody, tankBody, 0.0f, 1.0f));
-	cpConstraintSetErrorBias(gear, 0); // attempt to fully correct the joint each step
-	cpConstraintSetMaxBias(gear, 1.2f);  // but limit it's angular correction rate
-	cpConstraintSetMaxForce(gear, 50000.0f); // emulate angular friction
-		
-	return space;
+    ChipmunkDemoMessageString = "Use the mouse to drive the tank, it will follow the cursor.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 10);
+    cpSpaceSetSleepTimeThreshold(space, 0.5f);
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, 240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    for (int i = 0; i < 50; i++)
+    {
+        cpBody* body = add_box(space, 20, 1);
+
+        cpConstraint* pivot = cpSpaceAddConstraint(space, cpPivotJointNew2(staticBody, body, cpvzero, cpvzero));
+        cpConstraintSetMaxBias(pivot, 0);         // disable joint correction
+        cpConstraintSetMaxForce(pivot, 1000.0f);  // emulate linear friction
+
+        cpConstraint* gear = cpSpaceAddConstraint(space, cpGearJointNew(staticBody, body, 0.0f, 1.0f));
+        cpConstraintSetMaxBias(gear, 0);         // disable joint correction
+        cpConstraintSetMaxForce(gear, 5000.0f);  // emulate angular friction
+    }
+
+    // We joint the tank to the control body and control the tank indirectly by modifying the control body.
+    tankControlBody = cpSpaceAddBody(space, cpBodyNewKinematic());
+    tankBody        = add_box(space, 30, 10);
+
+    cpConstraint* pivot = cpSpaceAddConstraint(space, cpPivotJointNew2(tankControlBody, tankBody, cpvzero, cpvzero));
+    cpConstraintSetMaxBias(pivot, 0);          // disable joint correction
+    cpConstraintSetMaxForce(pivot, 10000.0f);  // emulate linear friction
+
+    cpConstraint* gear = cpSpaceAddConstraint(space, cpGearJointNew(tankControlBody, tankBody, 0.0f, 1.0f));
+    cpConstraintSetErrorBias(gear, 0);        // attempt to fully correct the joint each step
+    cpConstraintSetMaxBias(gear, 1.2f);       // but limit it's angular correction rate
+    cpConstraintSetMaxForce(gear, 50000.0f);  // emulate angular friction
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Tank = {
-	"Tank",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Tank", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/TheoJansen.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/TheoJansen.c
index 262dedbcd1f1..7888cf861cab 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/TheoJansen.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/TheoJansen.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,145 +24,140 @@
  * the mechanism that Theo Jansen uses in his kinetic sculptures. Brilliant.
  * Read more here: http://en.wikipedia.org/wiki/Theo_Jansen
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpConstraint *motor;
+static cpConstraint* motor;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
     cpFloat coef = (2.0f + ChipmunkDemoKeyboard.y) / 3.0f;
     cpFloat rate = ChipmunkDemoKeyboard.x * 10.0f * coef;
 
-	cpSimpleMotorSetRate(motor, rate);
-	cpConstraintSetMaxForce(motor, (rate) ? 100000.0f : 0.0f);
-	
-	cpSpaceStep(space, dt);
+    cpSimpleMotorSetRate(motor, rate);
+    cpConstraintSetMaxForce(motor, (rate) ? 100000.0f : 0.0f);
+
+    cpSpaceStep(space, dt);
 }
 
 static cpFloat seg_radius = 3.0f;
 
-static void
-make_leg(cpSpace *space, cpFloat side, cpFloat offset, cpBody *chassis, cpBody *crank, cpVect anchor)
+static void make_leg(cpSpace* space, cpFloat side, cpFloat offset, cpBody* chassis, cpBody* crank, cpVect anchor)
 {
-	cpVect a, b;
-	cpShape *shape;
-	
-	cpFloat leg_mass = 1.0f;
-
-	// make leg
-	a = cpvzero, b = cpv(0.0f, side);
-	cpBody *upper_leg = cpSpaceAddBody(space, cpBodyNew(leg_mass, cpMomentForSegment(leg_mass, a, b, 0.0f)));
-	cpBodySetPosition(upper_leg, cpv(offset, 0.0f));
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(upper_leg, a, b, seg_radius));
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2(chassis, upper_leg, cpv(offset, 0.0f), cpvzero));
-	
-	// lower leg
-	a = cpvzero, b = cpv(0.0f, -1.0f*side);
-	cpBody *lower_leg = cpSpaceAddBody(space, cpBodyNew(leg_mass, cpMomentForSegment(leg_mass, a, b, 0.0f)));
-	cpBodySetPosition(lower_leg, cpv(offset, -side));
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(lower_leg, a, b, seg_radius));
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(lower_leg, seg_radius*2.0f, b));
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	
-	cpSpaceAddConstraint(space, cpPinJointNew(chassis, lower_leg, cpv(offset, 0.0f), cpvzero));
-	
-	cpSpaceAddConstraint(space, cpGearJointNew(upper_leg, lower_leg, 0.0f, 1.0f));
-	
-	cpConstraint *constraint;
-	cpFloat diag = cpfsqrt(side*side + offset*offset);
-	
-	constraint = cpSpaceAddConstraint(space, cpPinJointNew(crank, upper_leg, anchor, cpv(0.0f, side)));
-	cpPinJointSetDist(constraint, diag);
-	
-	constraint = cpSpaceAddConstraint(space, cpPinJointNew(crank, lower_leg, anchor, cpvzero));
-	cpPinJointSetDist(constraint, diag);
+    cpVect a, b;
+    cpShape* shape;
+
+    cpFloat leg_mass = 1.0f;
+
+    // make leg
+    a = cpvzero, b = cpv(0.0f, side);
+    cpBody* upper_leg = cpSpaceAddBody(space, cpBodyNew(leg_mass, cpMomentForSegment(leg_mass, a, b, 0.0f)));
+    cpBodySetPosition(upper_leg, cpv(offset, 0.0f));
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(upper_leg, a, b, seg_radius));
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(chassis, upper_leg, cpv(offset, 0.0f), cpvzero));
+
+    // lower leg
+    a = cpvzero, b = cpv(0.0f, -1.0f * side);
+    cpBody* lower_leg = cpSpaceAddBody(space, cpBodyNew(leg_mass, cpMomentForSegment(leg_mass, a, b, 0.0f)));
+    cpBodySetPosition(lower_leg, cpv(offset, -side));
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(lower_leg, a, b, seg_radius));
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(lower_leg, seg_radius * 2.0f, b));
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 1.0f);
+
+    cpSpaceAddConstraint(space, cpPinJointNew(chassis, lower_leg, cpv(offset, 0.0f), cpvzero));
+
+    cpSpaceAddConstraint(space, cpGearJointNew(upper_leg, lower_leg, 0.0f, 1.0f));
+
+    cpConstraint* constraint;
+    cpFloat diag = cpfsqrt(side * side + offset * offset);
+
+    constraint = cpSpaceAddConstraint(space, cpPinJointNew(crank, upper_leg, anchor, cpv(0.0f, side)));
+    cpPinJointSetDist(constraint, diag);
+
+    constraint = cpSpaceAddConstraint(space, cpPinJointNew(crank, lower_leg, anchor, cpvzero));
+    cpPinJointSetDist(constraint, diag);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "Use the arrow keys to control the machine.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 20);
-	cpSpaceSetGravity(space, cpv(0,-500));
-	
-	cpBody *staticBody = cpSpaceGetStaticBody(space);
-	cpShape *shape;
-	cpVect a, b;
-	
-	// Create segments around the edge of the screen.
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(-320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320,-240), cpv(320,240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320,-240), cpv(320,-240), 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	cpFloat offset = 30.0f;
-
-	// make chassis
-	cpFloat chassis_mass = 2.0f;
-	a = cpv(-offset, 0.0f), b = cpv(offset, 0.0f);
-	cpBody *chassis = cpSpaceAddBody(space, cpBodyNew(chassis_mass, cpMomentForSegment(chassis_mass, a, b, 0.0f)));
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(chassis, a, b, seg_radius));
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	// make crank
-	cpFloat crank_mass = 1.0f;
-	cpFloat crank_radius = 13.0f;
-	cpBody *crank = cpSpaceAddBody(space, cpBodyNew(crank_mass, cpMomentForCircle(crank_mass, crank_radius, 0.0f, cpvzero)));
-	
-	shape = cpSpaceAddShape(space, cpCircleShapeNew(crank, crank_radius, cpvzero));
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	
-	cpSpaceAddConstraint(space, cpPivotJointNew2(chassis, crank, cpvzero, cpvzero));
-	
-	cpFloat side = 30.0f;
-	
-	int num_legs = 2;
-	for(int i=0; i<num_legs; i++){
-		make_leg(space, side,  offset, chassis, crank, cpvmult(cpvforangle((cpFloat)(2*i+0)/(cpFloat)num_legs*CP_PI), crank_radius));
-		make_leg(space, side, -offset, chassis, crank, cpvmult(cpvforangle((cpFloat)(2*i+1)/(cpFloat)num_legs*CP_PI), crank_radius));
-	}
-	
-	motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(chassis, crank, 6.0f));
-
-	return space;
+    ChipmunkDemoMessageString = "Use the arrow keys to control the machine.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 20);
+    cpSpaceSetGravity(space, cpv(0, -500));
+
+    cpBody* staticBody = cpSpaceGetStaticBody(space);
+    cpShape* shape;
+    cpVect a, b;
+
+    // Create segments around the edge of the screen.
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(-320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(320, -240), cpv(320, 240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-320, -240), cpv(320, -240), 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpFloat offset = 30.0f;
+
+    // make chassis
+    cpFloat chassis_mass = 2.0f;
+    a = cpv(-offset, 0.0f), b = cpv(offset, 0.0f);
+    cpBody* chassis = cpSpaceAddBody(space, cpBodyNew(chassis_mass, cpMomentForSegment(chassis_mass, a, b, 0.0f)));
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(chassis, a, b, seg_radius));
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    // make crank
+    cpFloat crank_mass   = 1.0f;
+    cpFloat crank_radius = 13.0f;
+    cpBody* crank =
+        cpSpaceAddBody(space, cpBodyNew(crank_mass, cpMomentForCircle(crank_mass, crank_radius, 0.0f, cpvzero)));
+
+    shape = cpSpaceAddShape(space, cpCircleShapeNew(crank, crank_radius, cpvzero));
+    cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+    cpSpaceAddConstraint(space, cpPivotJointNew2(chassis, crank, cpvzero, cpvzero));
+
+    cpFloat side = 30.0f;
+
+    int num_legs = 2;
+    for (int i = 0; i < num_legs; i++)
+    {
+        make_leg(space, side, offset, chassis, crank,
+                 cpvmult(cpvforangle((cpFloat)(2 * i + 0) / (cpFloat)num_legs * CP_PI), crank_radius));
+        make_leg(space, side, -offset, chassis, crank,
+                 cpvmult(cpvforangle((cpFloat)(2 * i + 1) / (cpFloat)num_legs * CP_PI), crank_radius));
+    }
+
+    motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(chassis, crank, 6.0f));
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo TheoJansen = {
-	"Theo Jansen Machine",
-	1.0/180.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Theo Jansen Machine", 1.0 / 180.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tumble.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tumble.c
index f9161612a2b9..21f89814cd47 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tumble.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Tumble.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,126 +18,125 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpBody *KinematicBoxBody;
+static cpBody* KinematicBoxBody;
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static void
-AddBox(cpSpace *space, cpVect pos, cpFloat mass, cpFloat width, cpFloat height)
+static void AddBox(cpSpace* space, cpVect pos, cpFloat mass, cpFloat width, cpFloat height)
 {
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
-	cpBodySetPosition(body, pos);
-	
-	cpShape *shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
+    cpBodySetPosition(body, pos);
+
+    cpShape* shape = cpSpaceAddShape(space, cpBoxShapeNew(body, width, height, 0.0));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
 }
 
-static void
-AddSegment(cpSpace *space, cpVect pos, cpFloat mass, cpFloat width, cpFloat height)
+static void AddSegment(cpSpace* space, cpVect pos, cpFloat mass, cpFloat width, cpFloat height)
 {
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
-	cpBodySetPosition(body, pos);
-	
-	cpShape *shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpv(0.0, (height - width)/2.0), cpv(0.0, (width - height)/2.0), width/2.0));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
+    cpBodySetPosition(body, pos);
+
+    cpShape* shape = cpSpaceAddShape(space, cpSegmentShapeNew(body, cpv(0.0, (height - width) / 2.0),
+                                                              cpv(0.0, (width - height) / 2.0), width / 2.0));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
 }
 
-static void
-AddCircle(cpSpace *space, cpVect pos, cpFloat mass, cpFloat radius)
+static void AddCircle(cpSpace* space, cpVect pos, cpFloat mass, cpFloat radius)
 {
-	cpBody *body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0, radius, cpvzero)));
-	cpBodySetPosition(body, pos);
-	
-	cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
-	cpShapeSetElasticity(shape, 0.0f);
-	cpShapeSetFriction(shape, 0.7f);
+    cpBody* body = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForCircle(mass, 0.0, radius, cpvzero)));
+    cpBodySetPosition(body, pos);
+
+    cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(body, radius, cpvzero));
+    cpShapeSetElasticity(shape, 0.0f);
+    cpShapeSetFriction(shape, 0.7f);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetGravity(space, cpv(0, -600));
-	
-	cpShape *shape;
-	
-	// We create an infinite mass rogue body to attach the line segments too
-	// This way we can control the rotation however we want.
-	KinematicBoxBody = cpSpaceAddBody(space, cpBodyNewKinematic());
-	cpBodySetAngularVelocity(KinematicBoxBody, 0.4f);
-	
-	// Set up the static box.
-	cpVect a = cpv(-200, -200);
-	cpVect b = cpv(-200,  200);
-	cpVect c = cpv( 200,  200);
-	cpVect d = cpv( 200, -200);
-	
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, a, b, 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, b, c, 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, c, d, 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-	shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, d, a, 0.0f));
-	cpShapeSetElasticity(shape, 1.0f);
-	cpShapeSetFriction(shape, 1.0f);
-	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	
-	cpFloat mass = 1;
-	cpFloat width = 30;
-	cpFloat height = width*2;
-	
-	// Add the bricks.
-	for(int i=0; i<7; i++){
-		for(int j=0; j<3; j++){
-			cpVect pos = cpv(i*width - 150, j*height - 150);
-			
-			int type = (rand()%3000)/1000;
-			if(type ==0){
-				AddBox(space, pos, mass, width, height);
-			} else if(type == 1){
-				AddSegment(space, pos, mass, width, height);
-			} else {
-				AddCircle(space, cpvadd(pos, cpv(0.0, (height - width)/2.0)), mass, width/2.0);
-				AddCircle(space, cpvadd(pos, cpv(0.0, (width - height)/2.0)), mass, width/2.0);
-			}
-		}
-	}
-	
-	return space;
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetGravity(space, cpv(0, -600));
+
+    cpShape* shape;
+
+    // We create an infinite mass rogue body to attach the line segments too
+    // This way we can control the rotation however we want.
+    KinematicBoxBody = cpSpaceAddBody(space, cpBodyNewKinematic());
+    cpBodySetAngularVelocity(KinematicBoxBody, 0.4f);
+
+    // Set up the static box.
+    cpVect a = cpv(-200, -200);
+    cpVect b = cpv(-200, 200);
+    cpVect c = cpv(200, 200);
+    cpVect d = cpv(200, -200);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, a, b, 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, b, c, 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, c, d, 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    shape = cpSpaceAddShape(space, cpSegmentShapeNew(KinematicBoxBody, d, a, 0.0f));
+    cpShapeSetElasticity(shape, 1.0f);
+    cpShapeSetFriction(shape, 1.0f);
+    cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+    cpFloat mass   = 1;
+    cpFloat width  = 30;
+    cpFloat height = width * 2;
+
+    // Add the bricks.
+    for (int i = 0; i < 7; i++)
+    {
+        for (int j = 0; j < 3; j++)
+        {
+            cpVect pos = cpv(i * width - 150, j * height - 150);
+
+            int type = (rand() % 3000) / 1000;
+            if (type == 0)
+            {
+                AddBox(space, pos, mass, width, height);
+            }
+            else if (type == 1)
+            {
+                AddSegment(space, pos, mass, width, height);
+            }
+            else
+            {
+                AddCircle(space, cpvadd(pos, cpv(0.0, (height - width) / 2.0)), mass, width / 2.0);
+                AddCircle(space, cpvadd(pos, cpv(0.0, (width - height) / 2.0)), mass, width / 2.0);
+            }
+        }
+    }
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Tumble = {
-	"Tumble",
-	1.0/60.0,  // faster as the original (more action)
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Tumble",
+    1.0 / 60.0,  // faster as the original (more action)
+    init,       update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Unicycle.c b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Unicycle.c
index ec6f0c4f24e9..f40481c13a56 100644
--- a/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Unicycle.c
+++ b/tests/cpp-tests/Classes/ChipmunkTestBed/demo/Unicycle.c
@@ -1,15 +1,15 @@
 /* Copyright (c) 2007 Scott Lembcke
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,162 +18,154 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include "chipmunk/chipmunk.h"
 #include "ChipmunkDemo.h"
 
-static cpBody *balance_body;
+static cpBody* balance_body;
 static cpFloat balance_sin = 0.0;
-//static cpFloat last_v = 0.0;
+// static cpFloat last_v = 0.0;
 
-static cpBody *wheel_body;
-static cpConstraint *motor;
+static cpBody* wheel_body;
+static cpConstraint* motor;
 
 /*
-	TODO:
-	- Clamp max angle dynamically based on output torque.
+        TODO:
+        - Clamp max angle dynamically based on output torque.
 */
 
-
-static inline cpFloat
-bias_coef(cpFloat errorBias, cpFloat dt)
+static inline cpFloat bias_coef(cpFloat errorBias, cpFloat dt)
 {
-	return 1.0f - cpfpow(errorBias, dt);
+    return 1.0f - cpfpow(errorBias, dt);
 }
 
-static void motor_preSolve(cpConstraint *motor, cpSpace *space)
+static void motor_preSolve(cpConstraint* motor, cpSpace* space)
 {
-	cpFloat dt = cpSpaceGetCurrentTimeStep(space);
-	
-	cpFloat target_x = ChipmunkDemoMouse.x;
-	ChipmunkDebugDrawSegment(cpv(target_x, -1000.0), cpv(target_x, 1000.0), RGBAColor(1.0, 0.0, 0.0, 1.0));
-	
-	cpFloat max_v = 500.0;
-	cpFloat target_v = cpfclamp(bias_coef(0.5, dt/1.2)*(target_x - cpBodyGetPosition(balance_body).x)/dt, -max_v, max_v);
-	cpFloat error_v = (target_v - cpBodyGetVelocity(balance_body).x);
-	cpFloat target_sin = 3.0e-3*bias_coef(0.1, dt)*error_v/dt;
-	
-	cpFloat max_sin = cpfsin(0.6);
-	balance_sin = cpfclamp(balance_sin - 6.0e-5*bias_coef(0.2, dt)*error_v/dt, -max_sin, max_sin);
-	cpFloat target_a = asin(cpfclamp(-target_sin + balance_sin, -max_sin, max_sin));
-	cpFloat angular_diff = asin(cpvcross(cpBodyGetRotation(balance_body), cpvforangle(target_a)));
-	cpFloat target_w = bias_coef(0.1, dt/0.4)*(angular_diff)/dt;
-	
-	cpFloat max_rate = 50.0;
-	cpFloat rate = cpfclamp(cpBodyGetAngularVelocity(wheel_body) + cpBodyGetAngularVelocity(balance_body) - target_w, -max_rate, max_rate);
-	cpSimpleMotorSetRate(motor, cpfclamp(rate, -max_rate, max_rate));
-	cpConstraintSetMaxForce(motor, 8.0e4);
-}
+    cpFloat dt = cpSpaceGetCurrentTimeStep(space);
+
+    cpFloat target_x = ChipmunkDemoMouse.x;
+    ChipmunkDebugDrawSegment(cpv(target_x, -1000.0), cpv(target_x, 1000.0), RGBAColor(1.0, 0.0, 0.0, 1.0));
 
+    cpFloat max_v = 500.0;
+    cpFloat target_v =
+        cpfclamp(bias_coef(0.5, dt / 1.2) * (target_x - cpBodyGetPosition(balance_body).x) / dt, -max_v, max_v);
+    cpFloat error_v    = (target_v - cpBodyGetVelocity(balance_body).x);
+    cpFloat target_sin = 3.0e-3 * bias_coef(0.1, dt) * error_v / dt;
+
+    cpFloat max_sin      = cpfsin(0.6);
+    balance_sin          = cpfclamp(balance_sin - 6.0e-5 * bias_coef(0.2, dt) * error_v / dt, -max_sin, max_sin);
+    cpFloat target_a     = asin(cpfclamp(-target_sin + balance_sin, -max_sin, max_sin));
+    cpFloat angular_diff = asin(cpvcross(cpBodyGetRotation(balance_body), cpvforangle(target_a)));
+    cpFloat target_w     = bias_coef(0.1, dt / 0.4) * (angular_diff) / dt;
+
+    cpFloat max_rate = 50.0;
+    cpFloat rate = cpfclamp(cpBodyGetAngularVelocity(wheel_body) + cpBodyGetAngularVelocity(balance_body) - target_w,
+                            -max_rate, max_rate);
+    cpSimpleMotorSetRate(motor, cpfclamp(rate, -max_rate, max_rate));
+    cpConstraintSetMaxForce(motor, 8.0e4);
+}
 
-static void
-update(cpSpace *space, double dt)
+static void update(cpSpace* space, double dt)
 {
-	cpSpaceStep(space, dt);
+    cpSpaceStep(space, dt);
 }
 
-static cpSpace *
-init(void)
+static cpSpace* init(void)
 {
-	ChipmunkDemoMessageString = "This unicycle is completely driven and balanced by a single cpSimpleMotor.\nMove the mouse to make the unicycle follow it.";
-	
-	cpSpace *space = cpSpaceNew();
-	cpSpaceSetIterations(space, 30);
-	cpSpaceSetGravity(space, cpv(0, -500));
-	
-	{
-		cpShape *shape = NULL;
-		cpBody *staticBody = cpSpaceGetStaticBody(space);
-		
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-3200,-240), cpv(3200,-240), 0.0f));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(0,-200), cpv(240,-240), 0.0f));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-
-		shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-240,-240), cpv(0,-200), 0.0f));
-		cpShapeSetElasticity(shape, 1.0f);
-		cpShapeSetFriction(shape, 1.0f);
-		cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
-	}
-	
-	
-	{
-		cpFloat radius = 20.0;
-		cpFloat mass = 1.0;
-		
-		cpFloat moment = cpMomentForCircle(mass, 0.0, radius, cpvzero);
-		wheel_body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-		cpBodySetPosition(wheel_body, cpv(0.0, -160.0 + radius));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpCircleShapeNew(wheel_body, radius, cpvzero));
-		cpShapeSetFriction(shape, 0.7);
-	cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	}
-	
-	{
-		cpFloat cog_offset = 30.0;
-		
-		cpBB bb1 = cpBBNew(-5.0, 0.0 - cog_offset, 5.0, cog_offset*1.2 - cog_offset);
-		cpBB bb2 = cpBBNew(-25.0, bb1.t, 25.0, bb1.t + 10.0);
-		
-		cpFloat mass = 3.0;
-		cpFloat moment = cpMomentForBox2(mass, bb1) + cpMomentForBox2(mass, bb2);
-		
-		balance_body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
-		cpBodySetPosition(balance_body, cpv(0.0, cpBodyGetPosition(wheel_body).y + cog_offset));
-		
-		cpShape *shape = NULL;
-		
-		shape = cpSpaceAddShape(space, cpBoxShapeNew2(balance_body, bb1, 0.0));
-		cpShapeSetFriction(shape, 1.0);
-		cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-		
-		shape = cpSpaceAddShape(space, cpBoxShapeNew2(balance_body, bb2, 0.0));
-		cpShapeSetFriction(shape, 1.0);
-		cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
-	}
-	
-	cpVect anchorA = cpBodyWorldToLocal(balance_body, cpBodyGetPosition(wheel_body));
-	cpVect groove_a = cpvadd(anchorA, cpv(0.0,  30.0));
-	cpVect groove_b = cpvadd(anchorA, cpv(0.0, -10.0));
-	cpSpaceAddConstraint(space, cpGrooveJointNew(balance_body, wheel_body, groove_a, groove_b, cpvzero));
-	cpSpaceAddConstraint(space, cpDampedSpringNew(balance_body, wheel_body, anchorA, cpvzero, 0.0, 6.0e2, 30.0));
-	
-	motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(wheel_body, balance_body, 0.0));
-	cpConstraintSetPreSolveFunc(motor, motor_preSolve);
-	
-	{
-		cpFloat width = 100.0;
-		cpFloat height = 20.0;
-		cpFloat mass = 3.0;
-		
-		cpBody *boxBody = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
-		cpBodySetPosition(boxBody, cpv(200, -100));
-		
-		cpShape *shape = cpSpaceAddShape(space, cpBoxShapeNew(boxBody, width, height, 0.0));
-		cpShapeSetFriction(shape, 0.7);
-	}
-	
-	return space;
+    ChipmunkDemoMessageString =
+        "This unicycle is completely driven and balanced by a single cpSimpleMotor.\nMove the mouse to make the "
+        "unicycle follow it.";
+
+    cpSpace* space = cpSpaceNew();
+    cpSpaceSetIterations(space, 30);
+    cpSpaceSetGravity(space, cpv(0, -500));
+
+    {
+        cpShape* shape     = NULL;
+        cpBody* staticBody = cpSpaceGetStaticBody(space);
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-3200, -240), cpv(3200, -240), 0.0f));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(0, -200), cpv(240, -240), 0.0f));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+
+        shape = cpSpaceAddShape(space, cpSegmentShapeNew(staticBody, cpv(-240, -240), cpv(0, -200), 0.0f));
+        cpShapeSetElasticity(shape, 1.0f);
+        cpShapeSetFriction(shape, 1.0f);
+        cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
+    }
+
+    {
+        cpFloat radius = 20.0;
+        cpFloat mass   = 1.0;
+
+        cpFloat moment = cpMomentForCircle(mass, 0.0, radius, cpvzero);
+        wheel_body     = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+        cpBodySetPosition(wheel_body, cpv(0.0, -160.0 + radius));
+
+        cpShape* shape = cpSpaceAddShape(space, cpCircleShapeNew(wheel_body, radius, cpvzero));
+        cpShapeSetFriction(shape, 0.7);
+        cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+    }
+
+    {
+        cpFloat cog_offset = 30.0;
+
+        cpBB bb1 = cpBBNew(-5.0, 0.0 - cog_offset, 5.0, cog_offset * 1.2 - cog_offset);
+        cpBB bb2 = cpBBNew(-25.0, bb1.t, 25.0, bb1.t + 10.0);
+
+        cpFloat mass   = 3.0;
+        cpFloat moment = cpMomentForBox2(mass, bb1) + cpMomentForBox2(mass, bb2);
+
+        balance_body = cpSpaceAddBody(space, cpBodyNew(mass, moment));
+        cpBodySetPosition(balance_body, cpv(0.0, cpBodyGetPosition(wheel_body).y + cog_offset));
+
+        cpShape* shape = NULL;
+
+        shape = cpSpaceAddShape(space, cpBoxShapeNew2(balance_body, bb1, 0.0));
+        cpShapeSetFriction(shape, 1.0);
+        cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+
+        shape = cpSpaceAddShape(space, cpBoxShapeNew2(balance_body, bb2, 0.0));
+        cpShapeSetFriction(shape, 1.0);
+        cpShapeSetFilter(shape, cpShapeFilterNew(1, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
+    }
+
+    cpVect anchorA  = cpBodyWorldToLocal(balance_body, cpBodyGetPosition(wheel_body));
+    cpVect groove_a = cpvadd(anchorA, cpv(0.0, 30.0));
+    cpVect groove_b = cpvadd(anchorA, cpv(0.0, -10.0));
+    cpSpaceAddConstraint(space, cpGrooveJointNew(balance_body, wheel_body, groove_a, groove_b, cpvzero));
+    cpSpaceAddConstraint(space, cpDampedSpringNew(balance_body, wheel_body, anchorA, cpvzero, 0.0, 6.0e2, 30.0));
+
+    motor = cpSpaceAddConstraint(space, cpSimpleMotorNew(wheel_body, balance_body, 0.0));
+    cpConstraintSetPreSolveFunc(motor, motor_preSolve);
+
+    {
+        cpFloat width  = 100.0;
+        cpFloat height = 20.0;
+        cpFloat mass   = 3.0;
+
+        cpBody* boxBody = cpSpaceAddBody(space, cpBodyNew(mass, cpMomentForBox(mass, width, height)));
+        cpBodySetPosition(boxBody, cpv(200, -100));
+
+        cpShape* shape = cpSpaceAddShape(space, cpBoxShapeNew(boxBody, width, height, 0.0));
+        cpShapeSetFriction(shape, 0.7);
+    }
+
+    return space;
 }
 
-static void
-destroy(cpSpace *space)
+static void destroy(cpSpace* space)
 {
-	ChipmunkDemoFreeSpaceChildren(space);
-	cpSpaceFree(space);
+    ChipmunkDemoFreeSpaceChildren(space);
+    cpSpaceFree(space);
 }
 
 ChipmunkDemo Unicycle = {
-	"Unicycle",
-	1.0/60.0,
-	init,
-	update,
-	ChipmunkDemoDefaultDrawImpl,
-	destroy,
+    "Unicycle", 1.0 / 60.0, init, update, ChipmunkDemoDefaultDrawImpl, destroy,
 };
diff --git a/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
index 92f8ba1390f9..12bd90b39031 100644
--- a/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
+++ b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,52 +39,47 @@ ClickAndMoveTest::ClickAndMoveTest()
 
 ClickAndMoveTestCase::ClickAndMoveTestCase()
 {
-    auto listener = EventListenerTouchOneByOne::create();
+    auto listener          = EventListenerTouchOneByOne::create();
     listener->onTouchBegan = CC_CALLBACK_2(ClickAndMoveTestCase::onTouchBegan, this);
     listener->onTouchEnded = CC_CALLBACK_2(ClickAndMoveTestCase::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto sprite = Sprite::create(s_pathGrossini);
-    
-    auto layer = LayerColor::create(Color4B(255,255,0,255));
+
+    auto layer = LayerColor::create(Color4B(255, 255, 0, 255));
     addChild(layer, -1);
-        
+
     addChild(sprite, 0, kTagSprite);
-    sprite->setPosition(20,150);
-    
-    sprite->runAction( JumpTo::create(4, Vec2(300,48), 100, 4) );
-    
-    layer->runAction( RepeatForever::create(
-                                Sequence::create(
-                                        FadeIn::create(1),
-                                        FadeOut::create(1),
-                                        nullptr)
-                      )); 
+    sprite->setPosition(20, 150);
+
+    sprite->runAction(JumpTo::create(4, Vec2(300, 48), 100, 4));
+
+    layer->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1), FadeOut::create(1), nullptr)));
 }
 
-bool ClickAndMoveTestCase::onTouchBegan(Touch* touch, Event  *event)
+bool ClickAndMoveTestCase::onTouchBegan(Touch* touch, Event* event)
 {
     return true;
 }
 
-void ClickAndMoveTestCase::onTouchEnded(Touch* touch, Event  *event)
+void ClickAndMoveTestCase::onTouchEnded(Touch* touch, Event* event)
 {
     auto location = touch->getLocation();
 
     auto s = getChildByTag(kTagSprite);
     s->stopAllActions();
-    s->runAction( MoveTo::create(1, Vec2(location.x, location.y) ) );
-    float o = location.x - s->getPosition().x;
-    float a = location.y - s->getPosition().y;
-    float at = (float) CC_RADIANS_TO_DEGREES( atanf( o/a) );
-    
-    if( a < 0 ) 
+    s->runAction(MoveTo::create(1, Vec2(location.x, location.y)));
+    float o  = location.x - s->getPosition().x;
+    float a  = location.y - s->getPosition().y;
+    float at = (float)CC_RADIANS_TO_DEGREES(atanf(o / a));
+
+    if (a < 0)
     {
-        if(  o < 0 )
+        if (o < 0)
             at = 180 + fabs(at);
         else
-            at = 180 - fabs(at);    
+            at = 180 - fabs(at);
     }
-    
-    s->runAction( RotateTo::create(1, at) );
+
+    s->runAction(RotateTo::create(1, at));
 }
diff --git a/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h
index e69bdd723cd5..f11276c7876b 100644
--- a/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h
+++ b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
index 1621f3927add..3aaa08dae4bb 100644
--- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
+++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,7 +24,7 @@
 
 //
 // ClippingNodeTest
-// 
+//
 //
 // by Pierre-David Bélanger
 //
@@ -37,12 +37,13 @@
 
 USING_NS_CC;
 
-enum {
-	kTagTitleLabel = 1,
-	kTagSubtitleLabel = 2,
-	kTagStencilNode = 100,
-	kTagClipperNode = 101,
-	kTagContentNode = 102,
+enum
+{
+    kTagTitleLabel    = 1,
+    kTagSubtitleLabel = 2,
+    kTagStencilNode   = 100,
+    kTagClipperNode   = 101,
+    kTagContentNode   = 102,
 };
 
 ClippingNodeTests::ClippingNodeTests()
@@ -71,62 +72,59 @@ ClippingNodeTests::ClippingNodeTests()
 
 bool BaseClippingNodeTest::init()
 {
-	if (TestCase::init()) {
-        
+    if (TestCase::init())
+    {
+
         auto background = Sprite::create(s_back3);
-        background->setAnchorPoint( Vec2::ZERO );
-        background->setPosition( Vec2::ZERO );
+        background->setAnchorPoint(Vec2::ZERO);
+        background->setPosition(Vec2::ZERO);
         this->addChild(background, -1);
 
         this->setup();
         return true;
-	}
-	return false;
+    }
+    return false;
 }
 
 BaseClippingNodeTest::~BaseClippingNodeTest()
 {
-	Director::getInstance()->getTextureCache()->removeUnusedTextures();
+    Director::getInstance()->getTextureCache()->removeUnusedTextures();
 }
 
 std::string BaseClippingNodeTest::title() const
 {
-	return "Clipping Demo";
-}
-
-void BaseClippingNodeTest::setup()
-{
-
+    return "Clipping Demo";
 }
 
+void BaseClippingNodeTest::setup() {}
 
 // BasicTest
 
 std::string BasicTest::title() const
 {
-	return "Basic Test";
+    return "Basic Test";
 }
 
 std::string BasicTest::subtitle() const
 {
-	return "";
+    return "";
 }
 
 void BasicTest::setup()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto stencil = this->stencil();
-    stencil->setTag( kTagStencilNode );
+    stencil->setTag(kTagStencilNode);
     stencil->setPosition(50, 50);
-    
+
     auto clipper = this->clipper();
-    clipper->setTag( kTagClipperNode );
+    clipper->setTag(kTagClipperNode);
     clipper->setAnchorPoint(Vec2(0.5f, 0.5f));
     clipper->setPosition(s.width / 2 - 50, s.height / 2 - 50);
     clipper->setStencil(stencil);
     this->addChild(clipper);
-    
+
     auto content = this->content();
     content->setPosition(50, 50);
     clipper->addChild(content);
@@ -159,7 +157,7 @@ DrawNode* BasicTest::shape()
 Sprite* BasicTest::grossini()
 {
     auto grossini = Sprite::create(s_pathGrossini);
-    grossini->setScale( 1.5 );
+    grossini->setScale(1.5);
     return grossini;
 }
 
@@ -178,17 +176,16 @@ Node* BasicTest::content()
     return nullptr;
 }
 
-
 // ShapeTest
 
 std::string ShapeTest::title() const
 {
-	return "Shape Basic Test";
+    return "Shape Basic Test";
 }
 
 std::string ShapeTest::subtitle() const
 {
-	return "A DrawNode as stencil and Sprite as content";
+    return "A DrawNode as stencil and Sprite as content";
 }
 
 Node* ShapeTest::stencil()
@@ -205,17 +202,16 @@ Node* ShapeTest::content()
     return node;
 }
 
-
 // ShapeInvertedTest
 
 std::string ShapeInvertedTest::title() const
 {
-	return "Shape Inverted Basic Test";
+    return "Shape Inverted Basic Test";
 }
 
 std::string ShapeInvertedTest::subtitle() const
 {
-	return "A DrawNode as stencil and Sprite as content, inverted";
+    return "A DrawNode as stencil and Sprite as content, inverted";
 }
 
 ClippingNode* ShapeInvertedTest::clipper()
@@ -229,12 +225,12 @@ ClippingNode* ShapeInvertedTest::clipper()
 
 std::string SpriteTest::title() const
 {
-	return "Sprite Basic Test";
+    return "Sprite Basic Test";
 }
 
 std::string SpriteTest::subtitle() const
 {
-	return "A Sprite as stencil and DrawNode as content";
+    return "A Sprite as stencil and DrawNode as content";
 }
 
 Node* SpriteTest::stencil()
@@ -262,12 +258,12 @@ Node* SpriteTest::content()
 
 std::string SpriteNoAlphaTest::title() const
 {
-	return "Sprite No Alpha Basic Test";
+    return "Sprite No Alpha Basic Test";
 }
 
 std::string SpriteNoAlphaTest::subtitle() const
 {
-	return "A Sprite as stencil and DrawNode as content, no alpha";
+    return "A Sprite as stencil and DrawNode as content, no alpha";
 }
 
 ClippingNode* SpriteNoAlphaTest::clipper()
@@ -281,12 +277,12 @@ ClippingNode* SpriteNoAlphaTest::clipper()
 
 std::string SpriteInvertedTest::title() const
 {
-	return "Sprite Inverted Basic Test";
+    return "Sprite Inverted Basic Test";
 }
 
 std::string SpriteInvertedTest::subtitle() const
 {
-	return "A Sprite as stencil and DrawNode as content, inverted";
+    return "A Sprite as stencil and DrawNode as content, inverted";
 }
 
 ClippingNode* SpriteInvertedTest::clipper()
@@ -301,22 +297,23 @@ ClippingNode* SpriteInvertedTest::clipper()
 
 std::string NestedTest::title() const
 {
-	return "Nested Test";
+    return "Nested Test";
 }
 
 std::string NestedTest::subtitle() const
 {
-	return "Nest 9 Clipping Nodes, max is usually 8";
+    return "Nest 9 Clipping Nodes, max is usually 8";
 }
 
 void NestedTest::setup()
 {
     static int depth = 9;
-    
+
     Node* parent = this;
-    
-    for (int i = 0; i < depth; i++) {
-                
+
+    for (int i = 0; i < depth; i++)
+    {
+
         int size = 225 - i * (225 / (depth * 2));
 
         auto clipper = ClippingNode::create();
@@ -326,20 +323,19 @@ void NestedTest::setup()
         clipper->setAlphaThreshold(0.05f);
         clipper->runAction(RepeatForever::create(RotateBy::create(i % 3 ? 1.33f : 1.66f, i % 2 ? 90.0f : -90.0f)));
         parent->addChild(clipper);
-        
+
         auto stencil = Sprite::create(s_pathGrossini);
-        stencil->setScale( 2.5f - (i * (2.5f / depth)) );
-        stencil->setAnchorPoint( Vec2(0.5f, 0.5f) );
+        stencil->setScale(2.5f - (i * (2.5f / depth)));
+        stencil->setAnchorPoint(Vec2(0.5f, 0.5f));
         stencil->setPosition(clipper->getContentSize().width / 2, clipper->getContentSize().height / 2);
         stencil->setVisible(false);
         stencil->runAction(Sequence::createWithTwoActions(DelayTime::create(i), Show::create()));
         clipper->setStencil(stencil);
 
         clipper->addChild(stencil);
-        
+
         parent = clipper;
     }
-
 }
 
 // HoleDemo
@@ -353,12 +349,12 @@ HoleDemo::~HoleDemo()
 
 std::string HoleDemo::title() const
 {
-	return "Hole Demo";
+    return "Hole Demo";
 }
 
 std::string HoleDemo::subtitle() const
 {
-	return "Touch/click to poke holes";
+    return "Touch/click to poke holes";
 }
 
 void HoleDemo::setup()
@@ -366,74 +362,73 @@ void HoleDemo::setup()
     auto target = Sprite::create(s_pathBlock);
     target->setAnchorPoint(Vec2::ZERO);
     target->setScale(3);
-    
+
     _outerClipper = ClippingNode::create();
     _outerClipper->retain();
     AffineTransform transform = AffineTransform::IDENTITY;
-    transform = AffineTransformScale(transform, target->getScale(), target->getScale());
+    transform                 = AffineTransformScale(transform, target->getScale(), target->getScale());
 
     _outerClipper->setContentSize(SizeApplyAffineTransform(target->getContentSize(), transform));
-    _outerClipper->setAnchorPoint( Vec2(0.5f, 0.5f) );
+    _outerClipper->setAnchorPoint(Vec2(0.5f, 0.5f));
     _outerClipper->setPosition(Vec2(this->getContentSize()) * 0.5f);
     _outerClipper->runAction(RepeatForever::create(RotateBy::create(1, 45)));
-    
-    _outerClipper->setStencil( target );
-    
+
+    _outerClipper->setStencil(target);
+
     auto holesClipper = ClippingNode::create();
     holesClipper->setInverted(true);
-    holesClipper->setAlphaThreshold( 0.05f );
-    
+    holesClipper->setAlphaThreshold(0.05f);
+
     holesClipper->addChild(target);
-    
+
     _holes = Node::create();
     _holes->retain();
-    
+
     holesClipper->addChild(_holes);
-    
+
     _holesStencil = Node::create();
     _holesStencil->retain();
-    
-    holesClipper->setStencil( _holesStencil);
-    
+
+    holesClipper->setStencil(_holesStencil);
+
     _outerClipper->addChild(holesClipper);
 
     this->addChild(_outerClipper);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(HoleDemo::onTouchesBegan, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
 void HoleDemo::pokeHoleAtPoint(Vec2 point)
 {
-    float scale = CCRANDOM_0_1() * 0.2 + 0.9;
+    float scale    = CCRANDOM_0_1() * 0.2 + 0.9;
     float rotation = CCRANDOM_0_1() * 360;
-    
+
     auto hole = Sprite::create("Images/hole_effect.png");
-    hole->setPosition( point );
-    hole->setRotation( rotation );
-    hole->setScale( scale );
-    
+    hole->setPosition(point);
+    hole->setRotation(rotation);
+    hole->setScale(scale);
+
     _holes->addChild(hole);
-    
+
     auto holeStencil = Sprite::create("Images/hole_stencil.png");
-    holeStencil->setPosition( point );
-    holeStencil->setRotation( rotation );
-    holeStencil->setScale( scale );
-    
+    holeStencil->setPosition(point);
+    holeStencil->setRotation(rotation);
+    holeStencil->setScale(scale);
+
     _holesStencil->addChild(holeStencil);
 
-    _outerClipper->runAction(Sequence::createWithTwoActions(ScaleBy::create(0.05f, 0.95f),
-                                               ScaleTo::create(0.125f, 1)));
+    _outerClipper->runAction(Sequence::createWithTwoActions(ScaleBy::create(0.05f, 0.95f), ScaleTo::create(0.125f, 1)));
 }
 
-
 void HoleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
-	Touch *touch = (Touch *)touches[0];
-	Vec2 point = _outerClipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
-    auto rect = Rect(0, 0, _outerClipper->getContentSize().width, _outerClipper->getContentSize().height);
-    if (!rect.containsPoint(point)) return;
+    Touch* touch = (Touch*)touches[0];
+    Vec2 point   = _outerClipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
+    auto rect    = Rect(0, 0, _outerClipper->getContentSize().width, _outerClipper->getContentSize().height);
+    if (!rect.containsPoint(point))
+        return;
     this->pokeHoleAtPoint(point);
 }
 
@@ -441,20 +436,20 @@ void HoleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 
 std::string ScrollViewDemo::title() const
 {
-	return "Scroll View Demo";
+    return "Scroll View Demo";
 }
 
 std::string ScrollViewDemo::subtitle() const
 {
-	return "Move/drag to scroll the content";
+    return "Move/drag to scroll the content";
 }
 
 void ScrollViewDemo::setup()
 {
     auto clipper = ClippingNode::create();
-    clipper->setTag( kTagClipperNode );
-    clipper->setContentSize(  Size(200.0f, 200.0f) );
-    clipper->setAnchorPoint(  Vec2(0.5f, 0.5f) );
+    clipper->setTag(kTagClipperNode);
+    clipper->setContentSize(Size(200.0f, 200.0f));
+    clipper->setAnchorPoint(Vec2(0.5f, 0.5f));
     clipper->setPosition(this->getContentSize().width / 2, this->getContentSize().height / 2);
     clipper->runAction(RepeatForever::create(RotateBy::create(1, 45)));
     this->addChild(clipper);
@@ -465,51 +460,53 @@ void ScrollViewDemo::setup()
     rectangle[1] = Vec2(clipper->getContentSize().width, 0.0f);
     rectangle[2] = Vec2(clipper->getContentSize().width, clipper->getContentSize().height);
     rectangle[3] = Vec2(0.0f, clipper->getContentSize().height);
-    
+
     Color4F white(1, 1, 1, 1);
     stencil->drawPolygon(rectangle, 4, white, 1, white);
     clipper->setStencil(stencil);
 
     auto content = Sprite::create(s_back2);
-    content->setTag( kTagContentNode );
-    content->setAnchorPoint(  Vec2(0.5f, 0.5f) );
+    content->setTag(kTagContentNode);
+    content->setAnchorPoint(Vec2(0.5f, 0.5f));
     content->setPosition(clipper->getContentSize().width / 2, clipper->getContentSize().height / 2);
     clipper->addChild(content);
-    
+
     _scrolling = false;
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(ScrollViewDemo::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(ScrollViewDemo::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(ScrollViewDemo::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
-void ScrollViewDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event  *event)
+void ScrollViewDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
-	Touch *touch = touches[0];
+    Touch* touch = touches[0];
     auto clipper = this->getChildByTag(kTagClipperNode);
-	Vec2 point = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
-    auto rect = Rect(0, 0, clipper->getContentSize().width, clipper->getContentSize().height);
-    _scrolling = rect.containsPoint(point);
-    _lastPoint = point;
+    Vec2 point   = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
+    auto rect    = Rect(0, 0, clipper->getContentSize().width, clipper->getContentSize().height);
+    _scrolling   = rect.containsPoint(point);
+    _lastPoint   = point;
 }
 
-void ScrollViewDemo::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void ScrollViewDemo::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-    if (!_scrolling) return;
-	Touch *touch = touches[0];
+    if (!_scrolling)
+        return;
+    Touch* touch = touches[0];
     auto clipper = this->getChildByTag(kTagClipperNode);
-    auto point = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
-	Vec2 diff = point - _lastPoint;
+    auto point   = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
+    Vec2 diff    = point - _lastPoint;
     auto content = clipper->getChildByTag(kTagContentNode);
     content->setPosition(content->getPosition() + diff);
     _lastPoint = point;
 }
 
-void ScrollViewDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void ScrollViewDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    if (!_scrolling) return;
+    if (!_scrolling)
+        return;
     _scrolling = false;
 }
 
@@ -519,44 +516,36 @@ void ScrollViewDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event  *
 
 static const float _alphaThreshold = 0.05f;
 
-static const int _planeCount = 8;
+static const int _planeCount        = 8;
 static const float _planeColor[][4] = {
-    {0, 0, 0, 0.65f},
-    {0.7f, 0, 0, 0.6f},
-    {0, 0.7f, 0, 0.55f},
-    {0, 0, 0.7f, 0.5f},
-    {0.7f, 0.7f, 0, 0.45f},
-    {0, 0.7f, 0.7f, 0.4f},
-    {0.7f, 0, 0.7f, 0.35f},
-    {0.7f, 0.7f, 0.7f, 0.3f},
+    {0, 0, 0, 0.65f},       {0.7f, 0, 0, 0.6f},    {0, 0.7f, 0, 0.55f},    {0, 0, 0.7f, 0.5f},
+    {0.7f, 0.7f, 0, 0.45f}, {0, 0.7f, 0.7f, 0.4f}, {0.7f, 0, 0.7f, 0.35f}, {0.7f, 0.7f, 0.7f, 0.3f},
 };
 
-RawStencilBufferTest::~RawStencilBufferTest()
-{
-}
+RawStencilBufferTest::~RawStencilBufferTest() {}
 
 std::string RawStencilBufferTest::title() const
 {
-	return "Raw Stencil Tests";
+    return "Raw Stencil Tests";
 }
 
 std::string RawStencilBufferTest::subtitle() const
 {
-	return "1:Default";
+    return "1:Default";
 }
 
 void RawStencilBufferTest::setup()
 {
-    for(int i = 0; i < _planeCount; ++i)
+    for (int i = 0; i < _planeCount; ++i)
     {
         Sprite* sprite = Sprite::create(s_pathGrossini);
-        sprite->setAnchorPoint(  Vec2(0.5, 0) );
-        sprite->setScale( 2.5f );
+        sprite->setAnchorPoint(Vec2(0.5, 0));
+        sprite->setScale(2.5f);
         _sprites.pushBack(sprite);
 
         Sprite* sprite2 = Sprite::create(s_pathGrossini);
-        sprite2->setAnchorPoint(  Vec2(0.5, 0) );
-        sprite2->setScale( 2.5f );
+        sprite2->setAnchorPoint(Vec2(0.5, 0));
+        sprite2->setScale(2.5f);
         _spritesStencil.pushBack(sprite2);
     }
 
@@ -565,27 +554,23 @@ void RawStencilBufferTest::setup()
 
 void RawStencilBufferTest::initCommands()
 {
-    auto renderer = Director::getInstance()->getRenderer();
-    _enableStencilCallback.func = [=](){
-        renderer->setStencilTest(true);
-    };
+    auto renderer               = Director::getInstance()->getRenderer();
+    _enableStencilCallback.func = [=]() { renderer->setStencilTest(true); };
     _enableStencilCallback.init(_globalZOrder);
 
-    _disableStencilCallback.func = [=](){
-        renderer->setStencilTest(false);
-    };
+    _disableStencilCallback.func = [=]() { renderer->setStencilTest(false); };
     _disableStencilCallback.init(_globalZOrder);
 
-    auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_UCOLOR);
-    _programState = new backend::ProgramState(program);
-    _locColor = _programState->getProgram()->getUniformLocation("u_color");
-    _locMVPMatrix = _programState->getProgram()->getUniformLocation("u_MVPMatrix");
+    auto program              = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_UCOLOR);
+    _programState             = new backend::ProgramState(program);
+    _locColor                 = _programState->getProgram()->getUniformLocation("u_color");
+    _locMVPMatrix             = _programState->getProgram()->getUniformLocation("u_MVPMatrix");
     const auto& projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
     _programState->setUniform(_locMVPMatrix, projectionMat.m, sizeof(projectionMat.m));
 
     size_t neededCmdSize = _planeCount * 2;
     _renderCmds.resize(neededCmdSize);
-    auto winPoint = Vec2(Director::getInstance()->getWinSize());
+    auto winPoint  = Vec2(Director::getInstance()->getWinSize());
     auto planeSize = winPoint * (1.0 / _planeCount);
     BlendFunc blend;
     blend.src = backend::BlendFactor::ONE;
@@ -593,42 +578,31 @@ void RawStencilBufferTest::initCommands()
     for (int i = 0, cmdIndex = 0; i < _planeCount; i++)
     {
         auto stencilPoint = planeSize * (_planeCount - i);
-        stencilPoint.x = winPoint.x;
+        stencilPoint.x    = winPoint.x;
 
         auto& cmd = _renderCmds[cmdIndex];
         cmdIndex++;
         cmd.init(_globalZOrder, blend);
-        cmd.setBeforeCallback( CC_CALLBACK_0(RawStencilBufferTest::onBeforeDrawClip, this, i) );
-        Vec2 vertices[] = {
-            Vec2::ZERO,
-            Vec2(stencilPoint.x, 0.0f),
-            stencilPoint,
-            Vec2(0.0f, stencilPoint.y)
-        };
+        cmd.setBeforeCallback(CC_CALLBACK_0(RawStencilBufferTest::onBeforeDrawClip, this, i));
+        Vec2 vertices[]          = {Vec2::ZERO, Vec2(stencilPoint.x, 0.0f), stencilPoint, Vec2(0.0f, stencilPoint.y)};
         unsigned short indices[] = {0, 2, 1, 0, 3, 2};
         cmd.createVertexBuffer(sizeof(Vec2), 4, backend::BufferUsage::STATIC);
         cmd.updateVertexBuffer(vertices, sizeof(vertices));
         cmd.createIndexBuffer(backend::IndexFormat::U_SHORT, 6, backend::BufferUsage::STATIC);
         cmd.updateIndexBuffer(indices, sizeof(indices));
         cmd.getPipelineDescriptor().programState = _programState;
-        auto vertexLayout = _programState->getVertexLayout();
-        auto& attributes = _programState->getProgram()->getActiveAttributes();
-        auto iter = attributes.find("a_position");
+        auto vertexLayout                        = _programState->getVertexLayout();
+        auto& attributes                         = _programState->getProgram()->getActiveAttributes();
+        auto iter                                = attributes.find("a_position");
         if (iter != attributes.end())
             vertexLayout->setAttribute("a_position", iter->second.location, backend::VertexFormat::FLOAT2, 0, false);
         vertexLayout->setLayout(sizeof(Vec2));
 
-
         auto& cmd2 = _renderCmds[cmdIndex];
         cmdIndex++;
         cmd2.init(_globalZOrder, blend);
         cmd2.setBeforeCallback(CC_CALLBACK_0(RawStencilBufferTest::onBeforeDrawSprite, this, i));
-        Vec2 vertices2[] = {
-            Vec2::ZERO,
-            Vec2(winPoint.x, 0.0f),
-            winPoint,
-            Vec2(0.0f, winPoint.y)
-        };
+        Vec2 vertices2[] = {Vec2::ZERO, Vec2(winPoint.x, 0.0f), winPoint, Vec2(0.0f, winPoint.y)};
         cmd2.createVertexBuffer(sizeof(Vec2), 4, backend::BufferUsage::STATIC);
         cmd2.updateVertexBuffer(vertices2, sizeof(vertices2));
         cmd2.createIndexBuffer(backend::IndexFormat::U_SHORT, 6, backend::BufferUsage::STATIC);
@@ -637,9 +611,9 @@ void RawStencilBufferTest::initCommands()
     }
 }
 
-void RawStencilBufferTest::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
-{    
-    auto winPoint = Vec2(Director::getInstance()->getWinSize());
+void RawStencilBufferTest::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
+{
+    auto winPoint  = Vec2(Director::getInstance()->getWinSize());
     auto planeSize = winPoint * (1.0 / _planeCount);
 
     renderer->addCommand(&_enableStencilCallback);
@@ -649,25 +623,25 @@ void RawStencilBufferTest::draw(Renderer *renderer, const Mat4 &transform, uint3
         auto spritePoint = planeSize * i;
         spritePoint.x += planeSize.x / 2;
         spritePoint.y = 0;
-        _sprites.at(i)->setPosition( spritePoint );
-        _spritesStencil.at(i)->setPosition( spritePoint );
+        _sprites.at(i)->setPosition(spritePoint);
+        _spritesStencil.at(i)->setPosition(spritePoint);
 
         renderer->clear(ClearFlag::STENCIL, Color4F::BLACK, 0.f, 0x0, _globalZOrder);
 
         renderer->addCommand(&_renderCmds[cmdIndex]);
         cmdIndex++;
-        
+
         Director* director = Director::getInstance();
         CCASSERT(nullptr != director, "Director is null when setting matrix stack");
         director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
-        
+
         _modelViewTransform = this->transform(transform);
         _spritesStencil.at(i)->visit(renderer, _modelViewTransform, flags);
         director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
-                
+
         renderer->addCommand(&_renderCmds[cmdIndex]);
         cmdIndex++;
-        
+
         director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
         _modelViewTransform = this->transform(transform);
         _sprites.at(i)->visit(renderer, _modelViewTransform, flags);
@@ -693,26 +667,28 @@ void RawStencilBufferTest::onBeforeDrawSprite(int planeIndex)
 
 void RawStencilBufferTest::setupStencilForClippingOnPlane(int plane)
 {
-    auto renderer = Director::getInstance()->getRenderer();
+    auto renderer          = Director::getInstance()->getRenderer();
     unsigned int planeMask = 0x1 << plane;
     renderer->setStencilWriteMask(planeMask);
     renderer->setStencilCompareFunction(backend::CompareFunction::NEVER, planeMask, planeMask);
-    renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::KEEP, backend::StencilOperation::KEEP);
+    renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::KEEP,
+                                  backend::StencilOperation::KEEP);
 }
 
 void RawStencilBufferTest::setupStencilForDrawingOnPlane(int plane)
 {
-    auto renderer = Director::getInstance()->getRenderer();
+    auto renderer          = Director::getInstance()->getRenderer();
     unsigned int planeMask = 0x1 << plane;
     renderer->setStencilCompareFunction(backend::CompareFunction::EQUAL, planeMask, planeMask);
-    renderer->setStencilOperation(backend::StencilOperation::KEEP, backend::StencilOperation::KEEP, backend::StencilOperation::KEEP);
+    renderer->setStencilOperation(backend::StencilOperation::KEEP, backend::StencilOperation::KEEP,
+                                  backend::StencilOperation::KEEP);
 }
 
 //@implementation RawStencilBufferTest2
 
 std::string RawStencilBufferTest2::subtitle() const
 {
-	return "2:DepthMask:FALSE";
+    return "2:DepthMask:FALSE";
 }
 
 void RawStencilBufferTest2::setupStencilForClippingOnPlane(int plane)
@@ -731,7 +707,7 @@ void RawStencilBufferTest2::setupStencilForDrawingOnPlane(int plane)
 
 std::string RawStencilBufferTest3::subtitle() const
 {
-	return "3:DepthTest:DISABLE,DepthMask:FALSE";
+    return "3:DepthTest:DISABLE,DepthMask:FALSE";
 }
 
 void RawStencilBufferTest3::setupStencilForClippingOnPlane(int plane)
@@ -751,11 +727,12 @@ void RawStencilBufferTest3::setupStencilForDrawingOnPlane(int plane)
 void RawStencilBufferTestAlphaTest::setup()
 {
     RawStencilBufferTest::setup();
-    for(int i = 0; i < _planeCount; ++i)
+    for (int i = 0; i < _planeCount; ++i)
     {
         auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_COLOR_ALPHA_TEST);
         auto programState = new backend::ProgramState(program);
-        programState->setUniform(programState->getUniformLocation("u_alpha_value"), &_alphaThreshold, sizeof(_alphaThreshold));
+        programState->setUniform(programState->getUniformLocation("u_alpha_value"), &_alphaThreshold,
+                                 sizeof(_alphaThreshold));
         _spritesStencil.at(i)->setProgramState(programState);
     }
 }
@@ -763,7 +740,7 @@ void RawStencilBufferTestAlphaTest::setup()
 
 std::string RawStencilBufferTest4::subtitle() const
 {
-	return "4:DepthMask:FALSE,AlphaTest:ENABLE";
+    return "4:DepthMask:FALSE,AlphaTest:ENABLE";
 }
 
 void RawStencilBufferTest4::setupStencilForClippingOnPlane(int plane)
@@ -783,7 +760,7 @@ void RawStencilBufferTest4::setupStencilForDrawingOnPlane(int plane)
 
 std::string RawStencilBufferTest5::subtitle() const
 {
-	return "5:DepthTest:DISABLE,DepthMask:FALSE,AlphaTest:ENABLE";
+    return "5:DepthTest:DISABLE,DepthMask:FALSE,AlphaTest:ENABLE";
 }
 
 void RawStencilBufferTest5::setupStencilForClippingOnPlane(int plane)
@@ -805,7 +782,7 @@ void RawStencilBufferTest5::setupStencilForDrawingOnPlane(int plane)
 
 std::string RawStencilBufferTest6::subtitle() const
 {
-	return "6:ManualClear,AlphaTest:ENABLE";
+    return "6:ManualClear,AlphaTest:ENABLE";
 }
 
 void RawStencilBufferTest6::setup()
@@ -819,7 +796,8 @@ void RawStencilBufferTest6::setupStencilForClippingOnPlane(int plane)
     int planeMask = 0x1 << plane;
     auto renderer = Director::getInstance()->getRenderer();
     renderer->setStencilCompareFunction(backend::CompareFunction::NEVER, planeMask, planeMask);
-    renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::KEEP, backend::StencilOperation::KEEP);
+    renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::KEEP,
+                                  backend::StencilOperation::KEEP);
     renderer->setDepthTest(false);
     renderer->setDepthWrite(false);
 }
@@ -833,7 +811,7 @@ void RawStencilBufferTest6::setupStencilForDrawingOnPlane(int plane)
 
 //#endif // COCOS2D_DEBUG > 1
 
-//ClippingToRenderTextureTest
+// ClippingToRenderTextureTest
 
 std::string ClippingToRenderTextureTest::title() const
 {
@@ -847,9 +825,9 @@ std::string ClippingToRenderTextureTest::subtitle() const
 
 void ClippingToRenderTextureTest::setup()
 {
-    auto button = MenuItemFont::create("Reproduce bug", [&](Ref *sender) {
+    auto button = MenuItemFont::create("Reproduce bug", [&](Ref* sender) {
         std::vector<Node*> nodes;
-        enumerateChildren("remove me [0-9]", [&](Node *node) {
+        enumerateChildren("remove me [0-9]", [&](Node* node) {
             nodes.push_back(node);
             return false;
         });
@@ -863,7 +841,7 @@ void ClippingToRenderTextureTest::setup()
     auto s = Director::getInstance()->getWinSize();
     // create menu, it's an autorelease object
     auto menu = Menu::create(button, nullptr);
-    menu->setPosition(Point(s.width/2, s.height/2));
+    menu->setPosition(Point(s.width / 2, s.height / 2));
     this->addChild(menu, 1);
 
     expectedBehaviour();
@@ -871,16 +849,15 @@ void ClippingToRenderTextureTest::setup()
 
 void ClippingToRenderTextureTest::expectedBehaviour()
 {
-    auto director = Director::getInstance();
+    auto director    = Director::getInstance();
     Size visibleSize = director->getVisibleSize();
-    Point origin = director->getVisibleOrigin();
-
+    Point origin     = director->getVisibleOrigin();
 
     // add "HelloWorld" splash screen"
     auto sprite = Sprite::create("Images/grossini.png");
 
     // position the sprite on the center of the screen
-    sprite->setPosition(Point(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y));
+    sprite->setPosition(Point(visibleSize.width / 2 + origin.x, visibleSize.height / 2 + origin.y));
 
     // add the sprite as a child to this layer
     this->addChild(sprite, 0);
@@ -901,13 +878,12 @@ void ClippingToRenderTextureTest::expectedBehaviour()
 
     auto clipper = ClippingNode::create();
     clipper->setAnchorPoint(Point(0.5f, 0.5f));
-    clipper->setPosition( Point(visibleSize.width/2, visibleSize.height/2) );
+    clipper->setPosition(Point(visibleSize.width / 2, visibleSize.height / 2));
     clipper->setStencil(stencil);
     clipper->setInverted(true);
     container->addChild(clipper, 1);
 
-
-    auto img = DrawNode::create();
+    auto img    = DrawNode::create();
     triangle[0] = Point(-200, -200);
     triangle[1] = Point(200, -200);
     triangle[2] = Point(0, 200);
@@ -918,21 +894,19 @@ void ClippingToRenderTextureTest::expectedBehaviour()
 
 void ClippingToRenderTextureTest::reproduceBug()
 {
-    auto director = Director::getInstance();
+    auto director    = Director::getInstance();
     Size visibleSize = director->getVisibleSize();
-    Point origin = director->getVisibleOrigin();
-
+    Point origin     = director->getVisibleOrigin();
 
     // add "HelloWorld" splash screen"
     auto sprite = Sprite::create("Images/grossini.png");
 
     // position the sprite on the center of the screen
-    sprite->setPosition(Point(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y));
+    sprite->setPosition(Point(visibleSize.width / 2 + origin.x, visibleSize.height / 2 + origin.y));
 
     // add the sprite as a child to this layer
     this->addChild(sprite, 0);
 
-
     // container node that will contain the clippingNode
     auto container = Node::create();
     container->retain();
@@ -947,13 +921,12 @@ void ClippingToRenderTextureTest::reproduceBug()
 
     auto clipper = ClippingNode::create();
     clipper->setAnchorPoint(Point(0.5f, 0.5f));
-    clipper->setPosition( Point(visibleSize.width/2, visibleSize.height/2) );
+    clipper->setPosition(Point(visibleSize.width / 2, visibleSize.height / 2));
     clipper->setStencil(stencil);
     clipper->setInverted(true);
     container->addChild(clipper, 1);
 
-
-    auto img = DrawNode::create();
+    auto img    = DrawNode::create();
     triangle[0] = Point(-200, -200);
     triangle[1] = Point(200, -200);
     triangle[2] = Point(0, 200);
@@ -963,8 +936,9 @@ void ClippingToRenderTextureTest::reproduceBug()
 
     // container rendered on Texture the size of the screen and because Clipping node use stencil buffer so we need to
     // create RenderTexture with depthStencil format parameter
-    RenderTexture* rt = RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8, PixelFormat::D24S8);
-    rt->setPosition(visibleSize.width/2, visibleSize.height/2);
+    RenderTexture* rt =
+        RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8, PixelFormat::D24S8);
+    rt->setPosition(visibleSize.width / 2, visibleSize.height / 2);
     this->addChild(rt);
 
     rt->begin();
@@ -976,24 +950,25 @@ void ClippingToRenderTextureTest::reproduceBug()
 
 std::string ClippingRectangleNodeTest::title() const
 {
-	return "ClippingRectangleNode Test";
+    return "ClippingRectangleNode Test";
 }
 
 std::string ClippingRectangleNodeTest::subtitle() const
 {
-	return "more effectively";
+    return "more effectively";
 }
 
 void ClippingRectangleNodeTest::setup()
 {
     auto clipper = ClippingRectangleNode::create();
-    clipper->setClippingRegion(Rect(this->getContentSize().width / 2 - 100, this->getContentSize().height / 2 - 100, 200.0f, 200.0f));
-    clipper->setTag( kTagClipperNode );
+    clipper->setClippingRegion(
+        Rect(this->getContentSize().width / 2 - 100, this->getContentSize().height / 2 - 100, 200.0f, 200.0f));
+    clipper->setTag(kTagClipperNode);
     this->addChild(clipper);
-    
+
     auto content = Sprite::create(s_back2);
-    content->setTag( kTagContentNode );
-    content->setAnchorPoint(  Vec2(0.5f, 0.5f) );
+    content->setTag(kTagContentNode);
+    content->setAnchorPoint(Vec2(0.5f, 0.5f));
     content->setPosition(this->getContentSize().width / 2, this->getContentSize().height / 2);
     clipper->addChild(content);
 }
diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h
index 29f89a650c68..a631ad659d2a 100644
--- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h
+++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,9 +27,13 @@
 #include "renderer/CCCustomCommand.h"
 #include <list>
 
-namespace cocos2d { namespace backend {
+namespace cocos2d
+{
+namespace backend
+{
 class ProgramState;
-}}
+}
+}  // namespace cocos2d
 
 DEFINE_TEST_SUITE(ClippingNodeTests);
 
@@ -41,7 +45,7 @@ class BaseClippingNodeTest : public TestCase
     ~BaseClippingNodeTest();
     virtual bool init() override;
 
-	virtual std::string title() const override;
+    virtual std::string title() const override;
     virtual void setup();
 };
 
@@ -54,15 +58,15 @@ class BasicTest : public BaseClippingNodeTest
     virtual std::string subtitle() const override;
     virtual void setup() override;
 
-	virtual cocos2d::Action* actionRotate();
-	virtual cocos2d::Action* actionScale();
+    virtual cocos2d::Action* actionRotate();
+    virtual cocos2d::Action* actionScale();
 
-	virtual cocos2d::DrawNode* shape();
-	virtual cocos2d::Sprite* grossini();
+    virtual cocos2d::DrawNode* shape();
+    virtual cocos2d::Sprite* grossini();
 
-	virtual cocos2d::Node* stencil();
-	virtual cocos2d::ClippingNode* clipper();
-	virtual cocos2d::Node* content();
+    virtual cocos2d::Node* stencil();
+    virtual cocos2d::ClippingNode* clipper();
+    virtual cocos2d::Node* content();
 };
 
 class ShapeTest : public BasicTest
@@ -140,9 +144,10 @@ class HoleDemo : public BaseClippingNodeTest
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void pokeHoleAtPoint(cocos2d::Vec2 point);
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 private:
-	cocos2d::ClippingNode* _outerClipper;
+    cocos2d::ClippingNode* _outerClipper;
     cocos2d::Node* _holes;
     cocos2d::Node* _holesStencil;
 };
@@ -155,11 +160,12 @@ class ScrollViewDemo : public BaseClippingNodeTest
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void setup() override;
-	void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 private:
-	bool _scrolling;
+    bool _scrolling;
     cocos2d::Vec2 _lastPoint;
 };
 
@@ -175,10 +181,10 @@ class RawStencilBufferTest : public BaseClippingNodeTest
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void setup() override;
-    virtual void draw(cocos2d::Renderer *renderer, const cocos2d::Mat4 &transform, uint32_t flags) override;
+    virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
 
-	virtual void setupStencilForClippingOnPlane(int plane);
-	virtual void setupStencilForDrawingOnPlane(int plane);
+    virtual void setupStencilForClippingOnPlane(int plane);
+    virtual void setupStencilForDrawingOnPlane(int plane);
 
 protected:
     void onBeforeDrawClip(int planeIndex);
@@ -276,7 +282,7 @@ class ClippingRectangleNodeTest : public BaseClippingNodeTest
 {
 public:
     CREATE_FUNC(ClippingRectangleNodeTest);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void setup() override;
diff --git a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp
index 5381f8772a89..d947af82639c 100644
--- a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp
+++ b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,7 +22,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
 #include "ConfigurationTest.h"
 #include "../testResource.h"
 #include "cocos2d.h"
@@ -52,7 +51,7 @@ void ConfigurationLoadConfig::onEnter()
 {
     ConfigurationBase::onEnter();
 
-	Configuration::getInstance()->loadConfigFile("configs/config-test-ok.plist");
+    Configuration::getInstance()->loadConfigFile("configs/config-test-ok.plist");
     std::string config = Configuration::getInstance()->getInfo();
     log("%s\n", config.c_str());
 }
@@ -71,8 +70,8 @@ void ConfigurationQuery::onEnter()
 {
     ConfigurationBase::onEnter();
 
-	log("cocos2d version: %s", Configuration::getInstance()->getValue("adxe.version").asString().c_str() );
-	log("OpenGL version: %s", Configuration::getInstance()->getValue("gl.version").asString().c_str() );
+    log("cocos2d version: %s", Configuration::getInstance()->getValue("adxe.version").asString().c_str());
+    log("OpenGL version: %s", Configuration::getInstance()->getValue("gl.version").asString().c_str());
 }
 
 std::string ConfigurationQuery::subtitle() const
@@ -89,7 +88,7 @@ void ConfigurationInvalid::onEnter()
 {
     ConfigurationBase::onEnter();
 
-	Configuration::getInstance()->loadConfigFile("configs/config-test-invalid.plist");
+    Configuration::getInstance()->loadConfigFile("configs/config-test-invalid.plist");
 }
 
 std::string ConfigurationInvalid::subtitle() const
@@ -107,23 +106,22 @@ void ConfigurationDefault::onEnter()
     ConfigurationBase::onEnter();
 
     std::string c_value = Configuration::getInstance()->getValue("invalid.key", Value("no key")).asString();
-	if( c_value != "no key" )
-		log("1. Test failed!");
-	else
-		log("1. Test OK!");
-
-	bool b_value = Configuration::getInstance()->getValue("invalid.key", Value(true)).asBool();
-	if( ! b_value )
-		log("2. Test failed!");
-	else
-		log("2. Test OK!");
-
-	double d_value = Configuration::getInstance()->getValue("invalid.key", Value(42.42)).asDouble();
-	if( d_value != 42.42 )
-		log("3. Test failed!");
-	else
-		log("3. Test OK!");
-
+    if (c_value != "no key")
+        log("1. Test failed!");
+    else
+        log("1. Test OK!");
+
+    bool b_value = Configuration::getInstance()->getValue("invalid.key", Value(true)).asBool();
+    if (!b_value)
+        log("2. Test failed!");
+    else
+        log("2. Test OK!");
+
+    double d_value = Configuration::getInstance()->getValue("invalid.key", Value(42.42)).asDouble();
+    if (d_value != 42.42)
+        log("3. Test failed!");
+    else
+        log("3. Test OK!");
 }
 
 std::string ConfigurationDefault::subtitle() const
@@ -140,13 +138,13 @@ void ConfigurationSet::onEnter()
 {
     ConfigurationBase::onEnter();
 
-	Configuration *conf = Configuration::getInstance();
+    Configuration* conf = Configuration::getInstance();
 
-	conf->setValue("this.is.an.int.value", Value(10) );
-	conf->setValue("this.is.a.bool.value", Value(true) );
-	conf->setValue("this.is.a.string.value", Value("hello world") );
+    conf->setValue("this.is.an.int.value", Value(10));
+    conf->setValue("this.is.a.bool.value", Value(true));
+    conf->setValue("this.is.a.string.value", Value("hello world"));
 
-	auto str = conf->getInfo();
+    auto str = conf->getInfo();
     log("%s\n", str.c_str());
 }
 
@@ -154,4 +152,3 @@ std::string ConfigurationSet::subtitle() const
 {
     return "Tests setting values manually";
 }
-
diff --git a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h
index 802c1512642a..04f97b559822 100644
--- a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h
+++ b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,6 @@ DEFINE_TEST_SUITE(ConfigurationTests);
 class ConfigurationBase : public TestCase
 {
 protected:
-
 public:
     virtual std::string title() const override;
 };
@@ -82,5 +81,4 @@ class ConfigurationSet : public ConfigurationBase
     virtual std::string subtitle() const override;
 };
 
-
-#endif // __CONFIGURATIONTEST_H__
+#endif  // __CONFIGURATIONTEST_H__
diff --git a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp
index d7a40b21fc8d..ae09e42ee1a0 100644
--- a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp
+++ b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp
@@ -28,13 +28,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32)
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#    include <unistd.h>
+#    include <sys/types.h>
+#    include <sys/socket.h>
+#    include <netdb.h>
 #else
-#include <io.h>
-#include <WS2tcpip.h>
+#    include <io.h>
+#    include <WS2tcpip.h>
 #endif
 
 USING_NS_CC;
@@ -51,13 +51,9 @@ ConsoleTests::ConsoleTests()
     ADD_TEST_CASE(ConsoleUploadFile);
 }
 
-BaseTestConsole::BaseTestConsole()
-{
-}
+BaseTestConsole::BaseTestConsole() {}
 
-BaseTestConsole::~BaseTestConsole()
-{
-}
+BaseTestConsole::~BaseTestConsole() {}
 
 std::string BaseTestConsole::title() const
 {
@@ -72,21 +68,20 @@ std::string BaseTestConsole::title() const
 
 ConsoleCustomCommand::ConsoleCustomCommand()
 {
-    _console = Director::getInstance()->getConsole();
+    _console                           = Director::getInstance()->getConsole();
     static Console::Command commands[] = {
-        {"hello", "This is just a user generated command", [](int fd, const std::string& args) {
-            const char msg[] = "how are you?\nArguments passed: ";
-            send(fd, msg, sizeof(msg),0);
-            send(fd, args.c_str(), args.length(),0);
-            send(fd, "\n",1,0);
-        }},
+        {"hello", "This is just a user generated command",
+         [](int fd, std::string_view args) {
+             const char msg[] = "how are you?\nArguments passed: ";
+             send(fd, msg, sizeof(msg), 0);
+             send(fd, args.data(), args.length(), 0);
+             send(fd, "\n", 1, 0);
+         }},
     };
     _console->addCommand(commands[0]);
 }
 
-ConsoleCustomCommand::~ConsoleCustomCommand()
-{
-}
+ConsoleCustomCommand::~ConsoleCustomCommand() {}
 
 void ConsoleCustomCommand::onEnter()
 {
@@ -103,7 +98,6 @@ std::string ConsoleCustomCommand::subtitle() const
     return "telnet localhost 5678";
 }
 
-
 //------------------------------------------------------------------
 //
 // ConsoleUploadFile
@@ -112,26 +106,22 @@ std::string ConsoleCustomCommand::subtitle() const
 
 ConsoleUploadFile::ConsoleUploadFile()
 {
-    std::srand ((unsigned)time(nullptr));
-    int id = rand()%100000;
+    std::srand((unsigned)time(nullptr));
+    int id = rand() % 100000;
     char buf[32];
     sprintf(buf, "%d", id);
     _targetFileName = std::string("grossini") + buf + ".png";
 
-    std::thread t = std::thread( &ConsoleUploadFile::uploadFile, this);
+    std::thread t = std::thread(&ConsoleUploadFile::uploadFile, this);
     t.detach();
 }
 
 void ConsoleUploadFile::onEnter()
 {
     BaseTestConsole::onEnter();
-    
 }
 
-ConsoleUploadFile::~ConsoleUploadFile()
-{
-    
-}
+ConsoleUploadFile::~ConsoleUploadFile() {}
 
 void ConsoleUploadFile::uploadFile()
 {
@@ -150,14 +140,14 @@ void ConsoleUploadFile::uploadFile()
     /* Obtain address(es) matching host/port */
 
     memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+    hints.ai_family   = AF_UNSPEC;   /* Allow IPv4 or IPv6 */
     hints.ai_socktype = SOCK_STREAM; /* stream socket */
-    hints.ai_flags = 0;
-    hints.ai_protocol = 0;          /* Any protocol */
+    hints.ai_flags    = 0;
+    hints.ai_protocol = 0; /* Any protocol */
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
     WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2),&wsaData);
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
 #endif
 
     std::string nodeName;
@@ -167,7 +157,7 @@ void ConsoleUploadFile::uploadFile()
         nodeName = "localhost";
 
     s = getaddrinfo(nodeName.c_str(), "5678", &hints, &result);
-    if (s != 0) 
+    if (s != 0)
     {
         CCLOG("ConsoleUploadFile: getaddrinfo error");
         return;
@@ -178,14 +168,14 @@ void ConsoleUploadFile::uploadFile()
       If socket(2) (or connect(2)) fails, we (close the socket
       and) try the next address. */
 
-    for (rp = result; rp != nullptr; rp = rp->ai_next) {
-        sfd = socket(rp->ai_family, rp->ai_socktype,
-                    rp->ai_protocol);
+    for (rp = result; rp != nullptr; rp = rp->ai_next)
+    {
+        sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
         if (sfd == -1)
             continue;
 
         if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1)
-            break;                  /* Success */
+            break; /* Success */
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
         closesocket(sfd);
@@ -194,12 +184,13 @@ void ConsoleUploadFile::uploadFile()
 #endif
     }
 
-    if (rp == nullptr) {               /* No address succeeded */
+    if (rp == nullptr)
+    { /* No address succeeded */
         CCLOG("ConsoleUploadFile: could not connect!");
         return;
     }
 
-    freeaddrinfo(result);           /* No longer needed */
+    freeaddrinfo(result); /* No longer needed */
 
     std::string tmp = "upload";
 
@@ -209,9 +200,9 @@ void ConsoleUploadFile::uploadFile()
     char cmd[512] = {0};
 
     strcpy(cmd, tmp.c_str());
-    send(sfd,cmd,strlen(cmd),0);
+    send(sfd, cmd, strlen(cmd), 0);
 
-    size_t offset = 0;
+    size_t offset   = 0;
     auto readBuffer = [&offset](char* buf, size_t bytes, const Data& data) -> ssize_t {
         if (offset >= data.getSize())
             return 0;
@@ -224,11 +215,11 @@ void ConsoleUploadFile::uploadFile()
         return actualReadBytes;
     };
 
-    while(true)
+    while (true)
     {
         char buffer[3], *out;
-        unsigned char *in;
-        in = (unsigned char *)buffer;
+        unsigned char* in;
+        in = (unsigned char*)buffer;
         // copy the file into the buffer:
         ssize_t ret = readBuffer(buffer, 3, srcFileData);
         if (ret > 0)
@@ -236,16 +227,16 @@ void ConsoleUploadFile::uploadFile()
             int len = base64Encode(in, (unsigned int)ret, &out);
             send(sfd, out, len, 0);
             free(out);
-            if(ret < 3)
+            if (ret < 3)
             {
-                //eof
+                // eof
                 log("Reach the end, total send: %d bytes", (int)offset);
                 break;
             }
         }
         else
         {
-            //read error
+            // read error
             break;
         }
     }
@@ -271,9 +262,8 @@ std::string ConsoleUploadFile::title() const
 std::string ConsoleUploadFile::subtitle() const
 {
     auto sharedFileUtils = FileUtils::getInstance();
-    
+
     std::string writablePath = sharedFileUtils->getWritablePath();
 
     return "file uploaded to:" + writablePath + _targetFileName;
 }
-
diff --git a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h
index 4f06e3618e82..d8ee9ae90be1 100644
--- a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h
+++ b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h
@@ -39,7 +39,6 @@ class BaseTestConsole : public TestCase
     virtual std::string title() const override;
 };
 
-
 class ConsoleCustomCommand : public BaseTestConsole
 {
 public:
@@ -53,7 +52,7 @@ class ConsoleCustomCommand : public BaseTestConsole
     ConsoleCustomCommand();
     virtual ~ConsoleCustomCommand();
 
-    cocos2d::Console *_console;
+    cocos2d::Console* _console;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(ConsoleCustomCommand);
@@ -73,10 +72,11 @@ class ConsoleUploadFile : public BaseTestConsole
     virtual ~ConsoleUploadFile();
 
     void uploadFile();
+
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(ConsoleUploadFile);
 
     std::string _targetFileName;
 };
 
-#endif // _CONSOLE_TEST_H_
+#endif  // _CONSOLE_TEST_H_
diff --git a/tests/cpp-tests/Classes/CurlTest/CurlTest.cpp b/tests/cpp-tests/Classes/CurlTest/CurlTest.cpp
index 595383452f67..1f7a17004737 100644
--- a/tests/cpp-tests/Classes/CurlTest/CurlTest.cpp
+++ b/tests/cpp-tests/Classes/CurlTest/CurlTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,9 +39,9 @@ CurlTest::CurlTest()
 {
     auto label = Label::createWithTTF("Curl Test", "fonts/arial.ttf", 28);
     addChild(label, 0);
-    label->setPosition(VisibleRect::center().x, VisibleRect::top().y-50);
+    label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 50);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(CurlTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -49,57 +49,57 @@ CurlTest::CurlTest()
     _label = Label::createWithTTF("Touch the screen to connect", "fonts/arial.ttf", 22);
     _label->setPosition(VisibleRect::center());
     addChild(_label, 0);
-    
+
     _label->retain();
 }
 
-struct MemoryStruct {
-  char *memory;
-  size_t size;
+struct MemoryStruct
+{
+    char* memory;
+    size_t size;
 };
 
-static size_t
-WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
+static size_t WriteMemoryCallback(void* contents, size_t size, size_t nmemb, void* userp)
 {
-  size_t realsize = size * nmemb;
-  struct MemoryStruct *mem = (struct MemoryStruct *)userp;
- 
-  mem->memory = (char*)realloc(mem->memory, mem->size + realsize + 1);
-  if(mem->memory == NULL) {
-    /* out of memory! */ 
-    printf("not enough memory (realloc returned NULL)\n");
-    return 0;
-  }
- 
-  memcpy(&(mem->memory[mem->size]), contents, realsize);
-  mem->size += realsize;
-  mem->memory[mem->size] = 0;
- 
-  return realsize;
+    size_t realsize          = size * nmemb;
+    struct MemoryStruct* mem = (struct MemoryStruct*)userp;
+
+    mem->memory = (char*)realloc(mem->memory, mem->size + realsize + 1);
+    if (mem->memory == NULL)
+    {
+        /* out of memory! */
+        printf("not enough memory (realloc returned NULL)\n");
+        return 0;
+    }
+
+    memcpy(&(mem->memory[mem->size]), contents, realsize);
+    mem->size += realsize;
+    mem->memory[mem->size] = 0;
+
+    return realsize;
 }
- 
 
 // the test code is
 // http://curl.haxx.se/mail/lib-2009-12/0071.html
-void CurlTest::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void CurlTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    CURL *curl;
+    CURL* curl;
     CURLcode res;
     char buffer[10];
 
     struct MemoryStruct chunk;
-    
-    chunk.memory = (char*)malloc(1);  /* will be grown as needed by the realloc above */
-    chunk.size = 0;    /* no data at this point */
+
+    chunk.memory = (char*)malloc(1); /* will be grown as needed by the realloc above */
+    chunk.size   = 0;                /* no data at this point */
 
     curl = curl_easy_init();
-    if (curl) 
+    if (curl)
     {
         curl_easy_setopt(curl, CURLOPT_URL, "http://webtest.cocos2d-x.org/curltest");
-		//code from http://curl.haxx.se/libcurl/c/getinmemory.html
+        // code from http://curl.haxx.se/libcurl/c/getinmemory.html
         /* we pass our 'chunk' struct to the callback function */
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
-		//If we don't provide a write function for curl, it will receive error code 23 on windows.
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&chunk);
+        // If we don't provide a write function for curl, it will receive error code 23 on windows.
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
 
         res = curl_easy_perform(curl);
@@ -111,14 +111,14 @@ void CurlTest::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
         }
         else
         {
-            sprintf(buffer,"code: %i",res);
+            sprintf(buffer, "code: %i", res);
             _label->setString(buffer);
         }
-    } 
-    else 
+    }
+    else
     {
         _label->setString("no curl");
-    } 
+    }
 }
 
 CurlTest::~CurlTest()
diff --git a/tests/cpp-tests/Classes/CurlTest/CurlTest.h b/tests/cpp-tests/Classes/CurlTest/CurlTest.h
index e36ba2f7a43b..15e23a9ffaf7 100644
--- a/tests/cpp-tests/Classes/CurlTest/CurlTest.h
+++ b/tests/cpp-tests/Classes/CurlTest/CurlTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,10 +38,10 @@ class CurlTest : public TestCase
     CurlTest();
     ~CurlTest();
 
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
 private:
     cocos2d::Label* _label;
 };
 
-#endif // _CURL_TEST_H_
+#endif  // _CURL_TEST_H_
diff --git a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
index b2b58c8e2fbe..33230b057079 100644
--- a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
+++ b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,16 +35,16 @@ CurrentLanguageTest::CurrentLanguageTest()
 {
     auto label = Label::createWithTTF("Current language Test", "fonts/arial.ttf", 28);
     addChild(label, 0);
-    label->setPosition(VisibleRect::center().x, VisibleRect::top().y-50);
+    label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 50);
 
     auto labelLanguage = Label::createWithTTF("", "fonts/arial.ttf", 20);
     labelLanguage->setPosition(VisibleRect::center());
-    
+
     auto labelLanguageCode = Label::createWithTTF("", "fonts/arial.ttf", 20);
-    labelLanguageCode->setPosition(VisibleRect::center().x, VisibleRect::center().y-50);
-    
+    labelLanguageCode->setPosition(VisibleRect::center().x, VisibleRect::center().y - 50);
+
     const char* currentLanguageCode = Application::getInstance()->getCurrentLanguageCode();
-    
+
     labelLanguageCode->setString(currentLanguageCode);
 
     LanguageType currentLanguageType = Application::getInstance()->getCurrentLanguage();
@@ -103,4 +103,3 @@ CurrentLanguageTest::CurrentLanguageTest()
     addChild(labelLanguage);
     addChild(labelLanguageCode);
 }
-
diff --git a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h
index 6c5bfb83afd3..19fb74937264 100644
--- a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h
+++ b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,4 +38,4 @@ class CurrentLanguageTest : public TestCase
     CurrentLanguageTest();
 };
 
-#endif // _CURRENT_LANGUAGE_TEST_H_
+#endif  // _CURRENT_LANGUAGE_TEST_H_
diff --git a/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp
index 58b09ff4f3f8..2e1dbf6c6cb2 100644
--- a/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp
+++ b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,19 +44,19 @@ std::string PrettyPrinterDemo::subtitle() const
 void PrettyPrinterDemo::addSprite()
 {
     // create sprites
-    
+
     auto s1 = Sprite::create("Images/grossini.png");
     auto s2 = Sprite::create("Images/grossini_dance_01.png");
     auto s3 = Sprite::create("Images/grossini_dance_02.png");
     auto s4 = Sprite::create("Images/grossini_dance_03.png");
     auto s5 = Sprite::create("Images/grossini_dance_04.png");
-    
+
     s1->setPosition(50, 50);
     s2->setPosition(60, 50);
     s3->setPosition(70, 50);
     s4->setPosition(80, 50);
     s5->setPosition(90, 50);
-    
+
     this->addChild(s1);
     this->addChild(s2);
     this->addChild(s3);
@@ -68,41 +68,41 @@ void PrettyPrinterDemo::onEnter()
 {
     TestCase::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto label = Label::createWithTTF(title().c_str(), "fonts/arial.ttf", 28);
-    label->setPosition(s.width/2, s.height * 4/5);
+    label->setPosition(s.width / 2, s.height * 4 / 5);
     this->addChild(label, 1);
-    
+
     std::string strSubtitle = subtitle();
-    if(strSubtitle.empty() == false)
+    if (strSubtitle.empty() == false)
     {
         auto subLabel = Label::createWithTTF(strSubtitle.c_str(), "fonts/Thonburi.ttf", 16);
-        subLabel->setPosition(s.width/2, s.height * 3/5);
+        subLabel->setPosition(s.width / 2, s.height * 3 / 5);
         this->addChild(subLabel, 1);
     }
-    
+
     // Test code
-    //TODO: minggo
-//    PrettyPrinter visitor;
-//
-//    // print dictionary
-//    auto dict = __Dictionary::createWithContentsOfFile("animations/animations.plist");
-//    dict->acceptVisitor(visitor);
-//    log("%s", visitor.getResult().c_str());
-//    log("-------------------------------");
-//
-//    __Set myset;
-//    for (int i = 0; i < 30; ++i) {
-//        myset.addObject(__String::createWithFormat("str: %d", i));
-//    }
-//    visitor.clear();
-//    myset.acceptVisitor(visitor);
-//    log("%s", visitor.getResult().c_str());
-//    log("-------------------------------");
-//
-//    visitor.clear();
+    // TODO: minggo
+    //    PrettyPrinter visitor;
+    //
+    //    // print dictionary
+    //    auto dict = __Dictionary::createWithContentsOfFile("animations/animations.plist");
+    //    dict->acceptVisitor(visitor);
+    //    log("%s", visitor.getResult().c_str());
+    //    log("-------------------------------");
+    //
+    //    __Set myset;
+    //    for (int i = 0; i < 30; ++i) {
+    //        myset.addObject(__String::createWithFormat("str: %d", i));
+    //    }
+    //    visitor.clear();
+    //    myset.acceptVisitor(visitor);
+    //    log("%s", visitor.getResult().c_str());
+    //    log("-------------------------------");
+    //
+    //    visitor.clear();
     addSprite();
-//    dict = Director::getInstance()->getTextureCache()->snapshotTextures();
-//    dict->acceptVisitor(visitor);
-//    log("%s", visitor.getResult().c_str());
+    //    dict = Director::getInstance()->getTextureCache()->snapshotTextures();
+    //    dict->acceptVisitor(visitor);
+    //    log("%s", visitor.getResult().c_str());
 }
diff --git a/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h
index 6742f6c1620c..d576ea3ecc29 100644
--- a/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h
+++ b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,9 +39,9 @@ class PrettyPrinterDemo : public TestCase
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     void addSprite();
+
 protected:
-    std::string    _title;
+    std::string _title;
 };
 
-
-#endif // __DATAVISITOR_TEST_H__
+#endif  // __DATAVISITOR_TEST_H__
diff --git a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
index 1c94ff53ab22..3efcd947ea2c 100644
--- a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
+++ b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,126 +45,151 @@ string DrawPrimitivesBaseTest::title() const
 DrawNodeTest::DrawNodeTest()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto draw = DrawNode::create();
     addChild(draw, 10);
-    
-    draw->drawPoint(Vec2(s.width/2-120, s.height/2-120), 10, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
-    
-    draw->drawPoint(Vec2(s.width/2+120, s.height/2+120), 10, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
-    
+
+    draw->drawPoint(Vec2(s.width / 2 - 120, s.height / 2 - 120), 10,
+                    Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+
+    draw->drawPoint(Vec2(s.width / 2 + 120, s.height / 2 + 120), 10,
+                    Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+
     // draw 4 small points
-    Vec2 position[] = { Vec2(60,60), Vec2(70,70), Vec2(60,70), Vec2(70,60) };
-    draw->drawPoints( position, 4, 5, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
- 
+    Vec2 position[] = {Vec2(60, 60), Vec2(70, 70), Vec2(60, 70), Vec2(70, 60)};
+    draw->drawPoints(position, 4, 5, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+
     // draw a line
-    draw->drawLine(Vec2(0,0), Vec2(s.width, s.height), Color4F(1.0, 0.0, 0.0, 0.5));
-    
+    draw->drawLine(Vec2(0, 0), Vec2(s.width, s.height), Color4F(1.0, 0.0, 0.0, 0.5));
+
     // draw a rectangle
-    draw->drawRect(Vec2(23,23), Vec2(7,7), Color4F(1,1,0,1));
-    
-    draw->drawRect(Vec2(15,30), Vec2(30,15), Vec2(15,0), Vec2(0,15), Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
-    
+    draw->drawRect(Vec2(23, 23), Vec2(7, 7), Color4F(1, 1, 0, 1));
+
+    draw->drawRect(Vec2(15, 30), Vec2(30, 15), Vec2(15, 0), Vec2(0, 15),
+                   Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+
     // draw a circle
-    draw->drawCircle(VisibleRect::center() + Vec2(140,0), 100, CC_DEGREES_TO_RADIANS(90), 50, true, 1.0f, 2.0f, Color4F(1.0f, 0.0f, 0.0f, 0.5f));
-    
-    draw->drawCircle(VisibleRect::center() - Vec2(140,0), 50, CC_DEGREES_TO_RADIANS(90), 30, false, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+    draw->drawCircle(VisibleRect::center() + Vec2(140, 0), 100, CC_DEGREES_TO_RADIANS(90), 50, true, 1.0f, 2.0f,
+                     Color4F(1.0f, 0.0f, 0.0f, 0.5f));
+
+    draw->drawCircle(VisibleRect::center() - Vec2(140, 0), 50, CC_DEGREES_TO_RADIANS(90), 30, false,
+                     Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
 
     // Draw some beziers
-    draw->drawQuadBezier(Vec2(s.width - 150, s.height - 150), Vec2(s.width - 70, s.height - 10), Vec2(s.width - 10, s.height - 10), 10, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
-    draw->drawQuadBezier(Vec2(0.0f, s.height), Vec2(s.width/2, s.height/2), Vec2(s.width, s.height), 50, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
-    draw->drawCubicBezier(VisibleRect::center(), Vec2(VisibleRect::center().x+30,VisibleRect::center().y+50), Vec2(VisibleRect::center().x+60,VisibleRect::center().y-50),VisibleRect::right(),100, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
-    draw->drawCubicBezier(Vec2(s.width - 250, 40.0f), Vec2(s.width - 70, 100.0f), Vec2(s.width - 30, 250.0f), Vec2(s.width - 10, s.height - 50), 10, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
+    draw->drawQuadBezier(Vec2(s.width - 150, s.height - 150), Vec2(s.width - 70, s.height - 10),
+                         Vec2(s.width - 10, s.height - 10), 10,
+                         Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
+
+    draw->drawQuadBezier(Vec2(0.0f, s.height), Vec2(s.width / 2, s.height / 2), Vec2(s.width, s.height), 50,
+                         Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
+
+    draw->drawCubicBezier(VisibleRect::center(), Vec2(VisibleRect::center().x + 30, VisibleRect::center().y + 50),
+                          Vec2(VisibleRect::center().x + 60, VisibleRect::center().y - 50), VisibleRect::right(), 100,
+                          Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
+
+    draw->drawCubicBezier(Vec2(s.width - 250, 40.0f), Vec2(s.width - 70, 100.0f), Vec2(s.width - 30, 250.0f),
+                          Vec2(s.width - 10, s.height - 50), 10,
+                          Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
+
     auto array = PointArray::create(20);
-    array->addControlPoint(Vec2(0.0f,0.0f));
-    array->addControlPoint(Vec2(80.0f,80.0f));
-    array->addControlPoint(Vec2(s.width-80,80.0f));
-    array->addControlPoint(Vec2(s.width-80,s.height-80));
-    array->addControlPoint(Vec2(80.0f,s.height-80));
-    array->addControlPoint(Vec2(80.0f,80.0f));
-    array->addControlPoint(Vec2(s.width/2, s.height/2));
+    array->addControlPoint(Vec2(0.0f, 0.0f));
+    array->addControlPoint(Vec2(80.0f, 80.0f));
+    array->addControlPoint(Vec2(s.width - 80, 80.0f));
+    array->addControlPoint(Vec2(s.width - 80, s.height - 80));
+    array->addControlPoint(Vec2(80.0f, s.height - 80));
+    array->addControlPoint(Vec2(80.0f, 80.0f));
+    array->addControlPoint(Vec2(s.width / 2, s.height / 2));
     draw->drawCardinalSpline(array, 0.5f, 50, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
+
     auto array2 = PointArray::create(20);
     array2->addControlPoint(Vec2(s.width / 2, 30.0f));
-    array2->addControlPoint(Vec2(s.width  -80, 30.0f));
+    array2->addControlPoint(Vec2(s.width - 80, 30.0f));
     array2->addControlPoint(Vec2(s.width - 80, s.height - 80));
     array2->addControlPoint(Vec2(s.width / 2, s.height - 80));
     array2->addControlPoint(Vec2(s.width / 2, 30.0f));
     draw->drawCatmullRom(array2, 50, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
+
     // open random color poly
-    Vec2 vertices[] = { Vec2(0.0f,0.0f), Vec2(50.0f,50.0f), Vec2(100.0f,50.0f), Vec2(100.0f,100.0f), Vec2(50.0f,100.0f) };
-    draw->drawPoly( vertices, 5, false, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
-    
+    Vec2 vertices[] = {Vec2(0.0f, 0.0f), Vec2(50.0f, 50.0f), Vec2(100.0f, 50.0f), Vec2(100.0f, 100.0f),
+                       Vec2(50.0f, 100.0f)};
+    draw->drawPoly(vertices, 5, false, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+
     // closed random color poly
-    Vec2 vertices2[] = { Vec2(30.0f,130.0f), Vec2(30.0f,230.0f), Vec2(50.0f,200.0f) };
-    draw->drawPoly( vertices2, 3, true, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
-    
+    Vec2 vertices2[] = {Vec2(30.0f, 130.0f), Vec2(30.0f, 230.0f), Vec2(50.0f, 200.0f)};
+    draw->drawPoly(vertices2, 3, true, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+
     // Draw 10 circles
-    for( int i=0; i < 10; i++)
+    for (int i = 0; i < 10; i++)
     {
-        draw->drawDot(Vec2(s.width/2, s.height/2), 10*(10-i), Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+        draw->drawDot(Vec2(s.width / 2, s.height / 2), 10 * (10 - i),
+                      Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
     }
-    
+
     // Draw polygons
-    Vec2 points[] = { Vec2(s.height/4,0.0f), Vec2(s.width,s.height/5), Vec2(s.width/3*2,s.height) };
-    draw->drawPolygon(points, sizeof(points)/sizeof(points[0]), Color4F(1.0f,0.0f,0.0f,0.5f), 4, Color4F(0.0f,0.0f,1.0f,0.5f));
-    
+    Vec2 points[] = {Vec2(s.height / 4, 0.0f), Vec2(s.width, s.height / 5), Vec2(s.width / 3 * 2, s.height)};
+    draw->drawPolygon(points, sizeof(points) / sizeof(points[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 4,
+                      Color4F(0.0f, 0.0f, 1.0f, 0.5f));
+
     // star poly (triggers buggs)
     {
-        const float o=80;
-        const float w=20;
-        const float h=50;
-        Vec2 star[] = {
-            Vec2(o+w,o-h), Vec2(o+w*2, o),                        // lower spike
-            Vec2(o + w*2 + h, o+w ), Vec2(o + w*2, o+w*2),        // right spike
+        const float o = 80;
+        const float w = 20;
+        const float h = 50;
+        Vec2 star[]   = {
+            Vec2(o + w, o - h), Vec2(o + w * 2, o),                  // lower spike
+            Vec2(o + w * 2 + h, o + w), Vec2(o + w * 2, o + w * 2),  // right spike
             //              {o +w, o+w*2+h}, {o,o+w*2},                 // top spike
             //              {o -h, o+w}, {o,o},                         // left spike
         };
-        
-        draw->drawPolygon(star, sizeof(star)/sizeof(star[0]), Color4F(1.0f,0.0f,0.0f,0.5f), 1, Color4F(0.0f,0.0f,1.0f,1.0f));
+
+        draw->drawPolygon(star, sizeof(star) / sizeof(star[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 1,
+                          Color4F(0.0f, 0.0f, 1.0f, 1.0f));
     }
-    
+
     // star poly (doesn't trigger bug... order is important un tesselation is supported.
     {
-        const float o=180;
-        const float w=20;
-        const float h=50;
-        Vec2 star[] = {
-            Vec2(o,o), Vec2(o+w,o-h), Vec2(o+w*2, o),        // lower spike
-            Vec2(o + w*2 + h, o+w ), Vec2(o + w*2, o+w*2),    // right spike
-            Vec2(o +w, o+w*2+h), Vec2(o,o+w*2),               // top spike
-            Vec2(o -h, o+w),                                     // left spike
+        const float o = 180;
+        const float w = 20;
+        const float h = 50;
+        Vec2 star[]   = {
+            Vec2(o, o),
+            Vec2(o + w, o - h),
+            Vec2(o + w * 2, o),  // lower spike
+            Vec2(o + w * 2 + h, o + w),
+            Vec2(o + w * 2, o + w * 2),  // right spike
+            Vec2(o + w, o + w * 2 + h),
+            Vec2(o, o + w * 2),  // top spike
+            Vec2(o - h, o + w),  // left spike
         };
-        
-        draw->drawPolygon(star, sizeof(star)/sizeof(star[0]), Color4F(1.0f,0.0f,0.0f,0.5f), 1, Color4F(0.0f,0.0f,1.0f,1.0f));
+
+        draw->drawPolygon(star, sizeof(star) / sizeof(star[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 1,
+                          Color4F(0.0f, 0.0f, 1.0f, 1.0f));
     }
-    
-    //draw a solid polygon
-    Vec2 vertices3[] = {Vec2(60.0f,160.0f), Vec2(70.0f,190.0f), Vec2(100.0f,190.0f), Vec2(90.0f,160.0f)};
-    draw->drawSolidPoly( vertices3, 4, Color4F(1.0f,1.0f,0.0f,1.0f) );
-    
-    //draw a solid rectangle
-    draw->drawSolidRect(Vec2(10.0f,10.0f), Vec2(20.0f,20.0f), Color4F(1.0f,1.0f,0.0f,1.0f));
-    
-    //draw a solid circle
-    draw->drawSolidCircle( VisibleRect::center() + Vec2(140.0f,0.0f), 40, CC_DEGREES_TO_RADIANS(90), 50, 2.0f, 2.0f, Color4F(0.0f, 1.0f, 0.0f, 1.0f));
-    
+
+    // draw a solid polygon
+    Vec2 vertices3[] = {Vec2(60.0f, 160.0f), Vec2(70.0f, 190.0f), Vec2(100.0f, 190.0f), Vec2(90.0f, 160.0f)};
+    draw->drawSolidPoly(vertices3, 4, Color4F(1.0f, 1.0f, 0.0f, 1.0f));
+
+    // draw a solid rectangle
+    draw->drawSolidRect(Vec2(10.0f, 10.0f), Vec2(20.0f, 20.0f), Color4F(1.0f, 1.0f, 0.0f, 1.0f));
+
+    // draw a solid circle
+    draw->drawSolidCircle(VisibleRect::center() + Vec2(140.0f, 0.0f), 40, CC_DEGREES_TO_RADIANS(90), 50, 2.0f, 2.0f,
+                          Color4F(0.0f, 1.0f, 0.0f, 1.0f));
+
     // Draw segment
-    draw->drawSegment(Vec2(20.0f,s.height), Vec2(20.0f,s.height/2), 10, Color4F(0.0f, 1.0f, 0.0f, 1.0f));
-    
-    draw->drawSegment(Vec2(10.0f,s.height/2), Vec2(s.width/2, s.height/2), 40, Color4F(1.0f, 0.0f, 1.0f, 0.5f));
+    draw->drawSegment(Vec2(20.0f, s.height), Vec2(20.0f, s.height / 2), 10, Color4F(0.0f, 1.0f, 0.0f, 1.0f));
+
+    draw->drawSegment(Vec2(10.0f, s.height / 2), Vec2(s.width / 2, s.height / 2), 40, Color4F(1.0f, 0.0f, 1.0f, 0.5f));
 
     // Draw triangle
-    draw->drawTriangle(Vec2(10.0f, 10.0f), Vec2(70.0f, 30.0f), Vec2(100.0f, 140.0f), Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
-    
-    for (int i = 0; i < 100; i++) {
-        draw->drawPoint(Vec2(i*7.0f, 5.0f), (float)i/5+1, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
+    draw->drawTriangle(Vec2(10.0f, 10.0f), Vec2(70.0f, 30.0f), Vec2(100.0f, 140.0f),
+                       Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 0.5f));
+
+    for (int i = 0; i < 100; i++)
+    {
+        draw->drawPoint(Vec2(i * 7.0f, 5.0f), (float)i / 5 + 1,
+                        Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1.0f));
     }
 
     auto draw1 = DrawNode::create();
@@ -173,8 +198,8 @@ DrawNodeTest::DrawNodeTest()
     draw1->drawLine(Vec2(0.0f, s.height), Vec2(s.width, s.height - 20), Color4F::YELLOW);
     draw1->drawLine(Vec2(0.0f, 0.0f), Vec2(s.width, s.height - 20), Color4F::YELLOW);
 
-    draw->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2),FadeOut::create(1.2), NULL)));
-    draw1->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2),FadeOut::create(1.2), NULL)));
+    draw->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2), FadeOut::create(1.2), NULL)));
+    draw1->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2), FadeOut::create(1.2), NULL)));
 }
 
 string DrawNodeTest::title() const
@@ -197,9 +222,11 @@ Issue11942Test::Issue11942Test()
 
     // draw a circle
     draw->setLineWidth(1);
-    draw->drawCircle(VisibleRect::center() - Vec2(140.0f,0.0f), 50, CC_DEGREES_TO_RADIANS(90), 30, false, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+    draw->drawCircle(VisibleRect::center() - Vec2(140.0f, 0.0f), 50, CC_DEGREES_TO_RADIANS(90), 30, false,
+                     Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
     draw->setLineWidth(10);
-    draw->drawCircle(VisibleRect::center() + Vec2(140.0f,0.0f), 50, CC_DEGREES_TO_RADIANS(90), 30, false, Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+    draw->drawCircle(VisibleRect::center() + Vec2(140.0f, 0.0f), 50, CC_DEGREES_TO_RADIANS(90), 30, false,
+                     Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
 }
 
 string Issue11942Test::title() const
diff --git a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
index e5aae33dcbaf..37c10faf4683 100644
--- a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
+++ b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,7 +42,7 @@ class DrawNodeTest : public DrawPrimitivesBaseTest
     CREATE_FUNC(DrawNodeTest);
 
     DrawNodeTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -56,5 +56,4 @@ class Issue11942Test : public DrawPrimitivesBaseTest
 
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-
 };
diff --git a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
index 1ccd5aadba18..ed7b7075221a 100644
--- a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
+++ b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,7 +26,7 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
     kTagTextLayer = 1,
 
@@ -34,7 +34,7 @@ enum
     kTagSprite2 = 2,
 
     kTagBackground = 1,
-    kTagLabel = 2,
+    kTagLabel      = 2,
 };
 
 EffectAdvanceTests::EffectAdvanceTests()
@@ -56,25 +56,25 @@ void Effect1::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
 
-    //auto target = getChildByTag(kTagBackground);
-    
+    // auto target = getChildByTag(kTagBackground);
+
     // To reuse a grid the grid size and the grid type must be the same.
     // in this case:
     //     Lens3D is Grid3D and it's size is (15,10)
     //     Waves3D is Grid3D and it's size is (15,10)
-    
-    auto size = Director::getInstance()->getWinSize();
-    auto lens = Lens3D::create(0.0f, Size(15,10), Vec2(size.width/2,size.height/2), 240);
-    auto waves = Waves3D::create(10, Size(15,10), 18, 15);
+
+    auto size  = Director::getInstance()->getWinSize();
+    auto lens  = Lens3D::create(0.0f, Size(15, 10), Vec2(size.width / 2, size.height / 2), 240);
+    auto waves = Waves3D::create(10, Size(15, 10), 18, 15);
 
     auto reuse = ReuseGrid::create(1);
     auto delay = DelayTime::create(8);
 
-//    auto orbit = OrbitCamera::create(5, 1, 2, 0, 180, 0, -90);
-//    auto orbit_back = orbit->reverse();
+    //    auto orbit = OrbitCamera::create(5, 1, 2, 0, 180, 0, -90);
+    //    auto orbit_back = orbit->reverse();
 
     //_bgNode->runAction( RepeatForever::create( Sequence::create( orbit, orbit_back, nullptr)  ) );
-    _bgNode->runAction( Sequence::create(lens, delay, reuse, waves, nullptr) );
+    _bgNode->runAction(Sequence::create(lens, delay, reuse, waves, nullptr));
 }
 
 std::string Effect1::title() const
@@ -91,18 +91,18 @@ void Effect2::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
 
-    //auto target = getChildByTag(kTagBackground);
-    
+    // auto target = getChildByTag(kTagBackground);
+
     // To reuse a grid the grid size and the grid type must be the same.
     // in this case:
     //     ShakyTiles is TiledGrid3D and it's size is (15,10)
     //     Shuffletiles is TiledGrid3D and it's size is (15,10)
     //       TurnOfftiles is TiledGrid3D and it's size is (15,10)
-    auto shaky = ShakyTiles3D::create(5, Size(15,10), 4, false);
-    auto shuffle = ShuffleTiles::create(0, Size(15,10), 3);
-    auto turnoff = TurnOffTiles::create(0, Size(15,10), 3);
-    auto turnon = turnoff->reverse();
-    
+    auto shaky   = ShakyTiles3D::create(5, Size(15, 10), 4, false);
+    auto shuffle = ShuffleTiles::create(0, Size(15, 10), 3);
+    auto turnoff = TurnOffTiles::create(0, Size(15, 10), 3);
+    auto turnon  = turnoff->reverse();
+
     // reuse 2 times:
     //   1 for shuffle
     //   2 for turn off
@@ -110,12 +110,12 @@ void Effect2::onEnter()
     auto reuse = ReuseGrid::create(2);
 
     auto delay = DelayTime::create(1);
-    
-//    id orbit = [OrbitCamera::create:5 radius:1 deltaRadius:2 angleZ:0 deltaAngleZ:180 angleX:0 deltaAngleX:-90];
-//    id orbit_back = [orbit reverse];
-//
-//    [target runAction: [RepeatForever::create: [Sequence actions: orbit, orbit_back, nil]]];    
-    _bgNode->runAction(Sequence::create( shaky, delay, reuse, shuffle, delay->clone(), turnoff, turnon, nullptr) );
+
+    //    id orbit = [OrbitCamera::create:5 radius:1 deltaRadius:2 angleZ:0 deltaAngleZ:180 angleX:0 deltaAngleX:-90];
+    //    id orbit_back = [orbit reverse];
+    //
+    //    [target runAction: [RepeatForever::create: [Sequence actions: orbit, orbit_back, nil]]];
+    _bgNode->runAction(Sequence::create(shaky, delay, reuse, shuffle, delay->clone(), turnoff, turnon, nullptr));
 }
 
 std::string Effect2::title() const
@@ -123,7 +123,6 @@ std::string Effect2::title() const
     return "ShakyTiles + ShuffleTiles + TurnOffTiles";
 }
 
-
 //------------------------------------------------------------------
 //
 // Effect3
@@ -132,18 +131,18 @@ std::string Effect2::title() const
 void Effect3::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
-    //auto bg = getChildByTag(kTagBackground);
-    //auto target1 = bg->getChildByTag(kTagSprite1);
-    //auto target2 = bg->getChildByTag(kTagSprite2);    
-    auto waves = Waves::create(5, Size(15,10), 5, 20, true, false);
-    auto shaky = Shaky3D::create(5, Size(15,10), 4, false);
-    
-    _target1->runAction( RepeatForever::create( waves ) );
-    _target2->runAction( RepeatForever::create( shaky ) );
-    
+    // auto bg = getChildByTag(kTagBackground);
+    // auto target1 = bg->getChildByTag(kTagSprite1);
+    // auto target2 = bg->getChildByTag(kTagSprite2);
+    auto waves = Waves::create(5, Size(15, 10), 5, 20, true, false);
+    auto shaky = Shaky3D::create(5, Size(15, 10), 4, false);
+
+    _target1->runAction(RepeatForever::create(waves));
+    _target2->runAction(RepeatForever::create(shaky));
+
     // moving background. Testing issue #244
-    auto move = MoveBy::create(3, Vec2(200,0) );
-    _bgNode->runAction(RepeatForever::create( Sequence::create(move, move->reverse(), nullptr) ));    
+    auto move = MoveBy::create(3, Vec2(200, 0));
+    _bgNode->runAction(RepeatForever::create(Sequence::create(move, move->reverse(), nullptr)));
 }
 
 std::string Effect3::title() const
@@ -151,7 +150,6 @@ std::string Effect3::title() const
     return "Effects on 2 sprites";
 }
 
-
 //------------------------------------------------------------------
 //
 // Effect4
@@ -161,28 +159,20 @@ std::string Effect3::title() const
 class Lens3DTarget : public Node
 {
 public:
-    virtual void setPosition(const Vec2& var)
-    {
-        _lens3D->setPosition(var);
-    }
-    
-    virtual const Vec2& getPosition() const
-    {
-        return _lens3D->getPosition();
-    }
-    
+    virtual void setPosition(const Vec2& var) { _lens3D->setPosition(var); }
+
+    virtual const Vec2& getPosition() const { return _lens3D->getPosition(); }
+
     static Lens3DTarget* create(Lens3D* pAction)
     {
         Lens3DTarget* pRet = new Lens3DTarget();
-        pRet->_lens3D = pAction;
+        pRet->_lens3D      = pAction;
         pRet->autorelease();
         return pRet;
     }
-private:
 
-    Lens3DTarget()
-        : _lens3D(nullptr)
-    {}
+private:
+    Lens3DTarget() : _lens3D(nullptr) {}
 
     Lens3D* _lens3D;
 };
@@ -190,27 +180,27 @@ class Lens3DTarget : public Node
 void Effect4::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
-    //Node* gridNode = NodeGrid::create();
-    
-    auto lens = Lens3D::create(10, Size(32,24), Vec2(100,180), 150);
-    auto move = JumpBy::create(5, Vec2(380,0), 100, 4);
+    // Node* gridNode = NodeGrid::create();
+
+    auto lens      = Lens3D::create(10, Size(32, 24), Vec2(100, 180), 150);
+    auto move      = JumpBy::create(5, Vec2(380, 0), 100, 4);
     auto move_back = move->reverse();
-    auto seq = Sequence::create( move, move_back, nullptr);
+    auto seq       = Sequence::create(move, move_back, nullptr);
 
-    /* In cocos2d-iphone, the type of action's target is 'id', so it supports using the instance of 'Lens3D' as its target.
-        While in cocos2d-x, the target of action only supports Node or its subclass,
-        so we make an encapsulation for Lens3D to achieve that.
+    /* In cocos2d-iphone, the type of action's target is 'id', so it supports using the instance of 'Lens3D' as its
+       target. While in cocos2d-x, the target of action only supports Node or its subclass, so we make an encapsulation
+       for Lens3D to achieve that.
     */
 
     auto director = Director::getInstance();
-    auto pTarget = Lens3DTarget::create(lens);
+    auto pTarget  = Lens3DTarget::create(lens);
     // Please make sure the target been added to its parent.
     this->addChild(pTarget);
-    //gridNode->addChild(pTarget);
+    // gridNode->addChild(pTarget);
 
     director->getActionManager()->addAction(seq, pTarget, false);
-    
-    _bgNode->runAction( lens );
+
+    _bgNode->runAction(lens);
 }
 
 std::string Effect4::title() const
@@ -227,19 +217,16 @@ void Effect5::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
 
-    //CCDirector::getInstance()->setProjection(DirectorProjection2D);
-    
-    auto effect = Liquid::create(2, Size(32,24), 1, 20);    
-
-    auto stopEffect = Sequence::create(
-                                         effect,
-                                         DelayTime::create(2),
-                                         StopGrid::create(),
-                    //                     [DelayTime::create:2],
-                    //                     [[effect copy] autorelease],
-                                         nullptr);
-    
-    //auto bg = getChildByTag(kTagBackground);
+    // CCDirector::getInstance()->setProjection(DirectorProjection2D);
+
+    auto effect = Liquid::create(2, Size(32, 24), 1, 20);
+
+    auto stopEffect = Sequence::create(effect, DelayTime::create(2), StopGrid::create(),
+                                       //                     [DelayTime::create:2],
+                                       //                     [[effect copy] autorelease],
+                                       nullptr);
+
+    // auto bg = getChildByTag(kTagBackground);
     _bgNode->runAction(stopEffect);
 }
 
@@ -263,32 +250,32 @@ void Effect5::onExit()
 void Issue631::onEnter()
 {
     EffectAdvanceBaseTest::onEnter();
-        
-    auto effect = Sequence::create( DelayTime::create(2.0f), Shaky3D::create(5.0f, Size(5, 5), 16, false), nullptr);
+
+    auto effect = Sequence::create(DelayTime::create(2.0f), Shaky3D::create(5.0f, Size(5, 5), 16, false), nullptr);
 
     // cleanup
-    //auto bg = getChildByTag(kTagBackground);
+    // auto bg = getChildByTag(kTagBackground);
     removeChild(_bgNode, true);
 
     // background
-    auto layer = LayerColor::create( Color4B(255,0,0,255) );
+    auto layer = LayerColor::create(Color4B(255, 0, 0, 255));
     addChild(layer, -10);
     auto sprite = Sprite::create("Images/grossini.png");
-    sprite->setPosition(50,80);
+    sprite->setPosition(50, 80);
     layer->addChild(sprite, 10);
-    
+
     // foreground
     auto layer2BaseGrid = NodeGrid::create();
-    auto layer2 = LayerColor::create(Color4B( 0, 255,0,255 ) );
-    auto fog = Sprite::create("Images/Fog.png");
+    auto layer2         = LayerColor::create(Color4B(0, 255, 0, 255));
+    auto fog            = Sprite::create("Images/Fog.png");
 
     BlendFunc bf = {backend::BlendFactor::SRC_ALPHA, backend::BlendFactor::ONE_MINUS_SRC_ALPHA};
     fog->setBlendFunc(bf);
     layer2->addChild(fog, 1);
     addChild(layer2BaseGrid, 1);
     layer2BaseGrid->addChild(layer2);
-    
-    layer2BaseGrid->runAction( RepeatForever::create(effect) );
+
+    layer2BaseGrid->runAction(RepeatForever::create(effect));
 }
 
 std::string Issue631::title() const
@@ -310,43 +297,41 @@ std::string Issue631::subtitle() const
 void EffectAdvanceBaseTest::onEnter()
 {
     TestCase::onEnter();
-    
+
     _bgNode = NodeGrid::create();
-    _bgNode->setAnchorPoint(Vec2(0.5f,0.5f));
+    _bgNode->setAnchorPoint(Vec2(0.5f, 0.5f));
     addChild(_bgNode);
     //_bgNode->setPosition( VisibleRect::center() );
     auto bg = Sprite::create("Images/background3.png");
-    bg->setPosition( VisibleRect::center() );
-    //addChild(bg, 0, kTagBackground);
-    //bg->setPosition( VisibleRect::center() );
+    bg->setPosition(VisibleRect::center());
+    // addChild(bg, 0, kTagBackground);
+    // bg->setPosition( VisibleRect::center() );
     _bgNode->addChild(bg);
 
     _target1 = NodeGrid::create();
-    _target1->setAnchorPoint(Vec2(0.5f,0.5f));
+    _target1->setAnchorPoint(Vec2(0.5f, 0.5f));
     auto grossini = Sprite::create("Images/grossinis_sister2.png");
     _target1->addChild(grossini);
     _bgNode->addChild(_target1);
-    _target1->setPosition(VisibleRect::left().x+VisibleRect::getVisibleRect().size.width/3.0f, VisibleRect::bottom().y+ 200);
-    auto sc = ScaleBy::create(2, 5);
+    _target1->setPosition(VisibleRect::left().x + VisibleRect::getVisibleRect().size.width / 3.0f,
+                          VisibleRect::bottom().y + 200);
+    auto sc      = ScaleBy::create(2, 5);
     auto sc_back = sc->reverse();
-    _target1->runAction( RepeatForever::create(Sequence::create(sc, sc_back, nullptr) ) );
-
+    _target1->runAction(RepeatForever::create(Sequence::create(sc, sc_back, nullptr)));
 
     _target2 = NodeGrid::create();
-    _target2->setAnchorPoint(Vec2(0.5f,0.5f));
+    _target2->setAnchorPoint(Vec2(0.5f, 0.5f));
     auto tamara = Sprite::create("Images/grossinis_sister1.png");
     _target2->addChild(tamara);
     _bgNode->addChild(_target2);
-    _target2->setPosition(VisibleRect::left().x+2*VisibleRect::getVisibleRect().size.width/3.0f,VisibleRect::bottom().y+200);
-    auto sc2 = ScaleBy::create(2, 5);
+    _target2->setPosition(VisibleRect::left().x + 2 * VisibleRect::getVisibleRect().size.width / 3.0f,
+                          VisibleRect::bottom().y + 200);
+    auto sc2      = ScaleBy::create(2, 5);
     auto sc2_back = sc2->reverse();
-    _target2->runAction( RepeatForever::create(Sequence::create(sc2, sc2_back, nullptr) ) );    
-
+    _target2->runAction(RepeatForever::create(Sequence::create(sc2, sc2_back, nullptr)));
 }
 
-EffectAdvanceBaseTest::~EffectAdvanceBaseTest()
-{
-}
+EffectAdvanceBaseTest::~EffectAdvanceBaseTest() {}
 
 std::string EffectAdvanceBaseTest::title() const
 {
diff --git a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
index da9bcee86570..3613e224783d 100644
--- a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
+++ b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,12 +30,12 @@
 
 DEFINE_TEST_SUITE(EffectAdvanceTests);
 
-class EffectAdvanceBaseTest: public TestCase
+class EffectAdvanceBaseTest : public TestCase
 {
 protected:
     cocos2d::TextureAtlas* _atlas;
 
-    std::string    _title;
+    std::string _title;
 
     cocos2d::Node* _bgNode;
     cocos2d::Node* _target1;
diff --git a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp
index 6963dde53187..de2b32641c5b 100644
--- a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp
+++ b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -50,250 +50,250 @@ EffectTests::EffectTests()
     ADD_TEST_CASE(JumpTiles3DDemo);
     ADD_TEST_CASE(SplitRowsDemo);
     ADD_TEST_CASE(SplitColsDemo);
-//    ADD_TEST_CASE(PageTurn3DDemo); // TODO crash on iPhone X
-//    ADD_TEST_CASE(PageTurn3DRectDemo);
+    //    ADD_TEST_CASE(PageTurn3DDemo); // TODO crash on iPhone X
+    //    ADD_TEST_CASE(PageTurn3DRectDemo);
 }
 
 Shaky3DDemo::Shaky3DDemo()
 {
-    _title = "Shaky3D";
+    _title    = "Shaky3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* Shaky3DDemo::createEffect(float t)
 {
-    return Shaky3D::create(t, Size(15,10), 5, false);
+    return Shaky3D::create(t, Size(15, 10), 5, false);
 }
 
 Waves3DDemo::Waves3DDemo()
 {
-    _title = "Waves3D";
+    _title    = "Waves3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* Waves3DDemo::createEffect(float t)
 {
-    return Waves3D::create(t, Size(15,10), 5, 40);
+    return Waves3D::create(t, Size(15, 10), 5, 40);
 }
 
 cocos2d::ActionInterval* FlipX3DDemo::createEffect(float t)
 {
-    auto flipx  = FlipX3D::create(t);
+    auto flipx      = FlipX3D::create(t);
     auto flipx_back = flipx->reverse();
-    auto delay = DelayTime::create(2);
+    auto delay      = DelayTime::create(2);
     return Sequence::create(flipx, delay, flipx_back, nullptr);
 }
 
 FlipX3DDemo::FlipX3DDemo()
 {
-    _title = "FlipX3D";
+    _title    = "FlipX3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* FlipY3DDemo::createEffect(float t)
 {
-    auto flipy  = FlipY3D::create(t);
+    auto flipy      = FlipY3D::create(t);
     auto flipy_back = flipy->reverse();
-    auto delay = DelayTime::create(2);
-    
+    auto delay      = DelayTime::create(2);
+
     return Sequence::create(flipy, delay, flipy_back, nullptr);
 }
 
 FlipY3DDemo::FlipY3DDemo()
 {
-    _title = "FlipY3D";
+    _title    = "FlipY3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* Lens3DDemo::createEffect(float t)
 {
     auto size = Director::getInstance()->getWinSize();
-    return Lens3D::create(t, Size(15,10), Vec2(size.width/2,size.height/2), 240);
+    return Lens3D::create(t, Size(15, 10), Vec2(size.width / 2, size.height / 2), 240);
 }
 
 Lens3DDemo::Lens3DDemo()
 {
-    _title = "Lens3D";
+    _title    = "Lens3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* Ripple3DDemo::createEffect(float t)
 {
     auto size = Director::getInstance()->getWinSize();
-    return Ripple3D::create(t, Size(32,24), Vec2(size.width/2,size.height/2), 240, 4, 160);
+    return Ripple3D::create(t, Size(32, 24), Vec2(size.width / 2, size.height / 2), 240, 4, 160);
 }
 
 Ripple3DDemo::Ripple3DDemo()
 {
-    _title = "Ripple3D";
+    _title    = "Ripple3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* LiquidDemo::createEffect(float t)
 {
-    return Liquid::create(t, Size(16,12), 4, 20);
+    return Liquid::create(t, Size(16, 12), 4, 20);
 }
 
 LiquidDemo::LiquidDemo()
 {
-    _title = "Liquid";
+    _title    = "Liquid";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* WavesDemo::createEffect(float t)
 {
-    return Waves::create(t, Size(16,12), 4, 20, true, true);
+    return Waves::create(t, Size(16, 12), 4, 20, true, true);
 }
 
 WavesDemo::WavesDemo()
 {
-    _title = "Waves";
+    _title    = "Waves";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* TwirlDemo::createEffect(float t)
 {
     auto size = Director::getInstance()->getWinSize();
-    return Twirl::create(t, Size(12,8), Vec2(size.width/2, size.height/2), 1, 2.5f);
+    return Twirl::create(t, Size(12, 8), Vec2(size.width / 2, size.height / 2), 1, 2.5f);
 }
 
 TwirlDemo::TwirlDemo()
 {
-    _title = "Twirl";
+    _title    = "Twirl";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* ShakyTiles3DDemo::createEffect(float t)
 {
-    return ShakyTiles3D::create(t, Size(16,12), 5, false) ;
+    return ShakyTiles3D::create(t, Size(16, 12), 5, false);
 }
 
 ShakyTiles3DDemo::ShakyTiles3DDemo()
 {
-    _title = "ShakyTiles3D";
+    _title    = "ShakyTiles3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* ShatteredTiles3DDemo::createEffect(float t)
 {
-    return ShatteredTiles3D::create(t, Size(16,12), 5, false);
+    return ShatteredTiles3D::create(t, Size(16, 12), 5, false);
 }
 
 ShatteredTiles3DDemo::ShatteredTiles3DDemo()
 {
-    _title = "ShatteredTiles3D";
+    _title    = "ShatteredTiles3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* ShuffleTilesDemo::createEffect(float t)
 {
-    auto shuffle = ShuffleTiles::create(t, Size(16,12), 25);
+    auto shuffle      = ShuffleTiles::create(t, Size(16, 12), 25);
     auto shuffle_back = shuffle->reverse();
-    auto delay = DelayTime::create(2);
-    
+    auto delay        = DelayTime::create(2);
+
     return Sequence::create(shuffle, delay, shuffle_back, nullptr);
 }
 
 ShuffleTilesDemo::ShuffleTilesDemo()
 {
-    _title = "ShuffleTiles";
+    _title    = "ShuffleTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* FadeOutTRTilesDemo::createEffect(float t)
 {
-    auto fadeout = FadeOutTRTiles::create(t, Size(16,12));
-    auto back = fadeout->reverse();
-    auto delay = DelayTime::create(0.5f);
-    
+    auto fadeout = FadeOutTRTiles::create(t, Size(16, 12));
+    auto back    = fadeout->reverse();
+    auto delay   = DelayTime::create(0.5f);
+
     return Sequence::create(fadeout, delay, back, nullptr);
 }
 
 FadeOutTRTilesDemo::FadeOutTRTilesDemo()
 {
-    _title = "FadeOutTRTiles";
+    _title    = "FadeOutTRTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* FadeOutBLTilesDemo::createEffect(float t)
 {
-    auto fadeout = FadeOutBLTiles::create(t, Size(16,12));
-    auto back = fadeout->reverse();
-    auto delay = DelayTime::create(0.5f);
-    
+    auto fadeout = FadeOutBLTiles::create(t, Size(16, 12));
+    auto back    = fadeout->reverse();
+    auto delay   = DelayTime::create(0.5f);
+
     return Sequence::create(fadeout, delay, back, nullptr);
 }
 
 FadeOutBLTilesDemo::FadeOutBLTilesDemo()
 {
-    _title = "FadeOutBLTiles";
+    _title    = "FadeOutBLTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* FadeOutUpTilesDemo::createEffect(float t)
 {
-    auto fadeout = FadeOutUpTiles::create(t, Size(16,12));
-    auto back = fadeout->reverse();
-    auto delay = DelayTime::create(0.5f);
-    
+    auto fadeout = FadeOutUpTiles::create(t, Size(16, 12));
+    auto back    = fadeout->reverse();
+    auto delay   = DelayTime::create(0.5f);
+
     return Sequence::create(fadeout, delay, back, nullptr);
 }
 
 FadeOutUpTilesDemo::FadeOutUpTilesDemo()
 {
-    _title = "FadeOutUpTiles";
+    _title    = "FadeOutUpTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* FadeOutDownTilesDemo::createEffect(float t)
 {
-    auto fadeout = FadeOutDownTiles::create(t, Size(16,12));
-    auto back = fadeout->reverse();
-    auto delay = DelayTime::create(0.5f);
-    
+    auto fadeout = FadeOutDownTiles::create(t, Size(16, 12));
+    auto back    = fadeout->reverse();
+    auto delay   = DelayTime::create(0.5f);
+
     return Sequence::create(fadeout, delay, back, nullptr);
 }
 
 FadeOutDownTilesDemo::FadeOutDownTilesDemo()
 {
-    _title = "FadeOutDownTiles";
+    _title    = "FadeOutDownTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* TurnOffTilesDemo::createEffect(float t)
 {
-    auto fadeout = TurnOffTiles::create(t, Size(48,32), 25);
-    auto back = fadeout->reverse();
-    auto delay = DelayTime::create(0.5f);
-    
+    auto fadeout = TurnOffTiles::create(t, Size(48, 32), 25);
+    auto back    = fadeout->reverse();
+    auto delay   = DelayTime::create(0.5f);
+
     return Sequence::create(fadeout, delay, back, nullptr);
 }
 
 TurnOffTilesDemo::TurnOffTilesDemo()
 {
-    _title = "TurnOffTiles";
+    _title    = "TurnOffTiles";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* WavesTiles3DDemo::createEffect(float t)
 {
-    return WavesTiles3D::create(t, Size(15,10), 4, 120);
+    return WavesTiles3D::create(t, Size(15, 10), 4, 120);
 }
 
 WavesTiles3DDemo::WavesTiles3DDemo()
 {
-    _title = "WavesTiles3D";
+    _title    = "WavesTiles3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* JumpTiles3DDemo::createEffect(float t)
 {
-    return JumpTiles3D::create(t, Size(15,10), 2, 30);
+    return JumpTiles3D::create(t, Size(15, 10), 2, 30);
 }
 
 JumpTiles3DDemo::JumpTiles3DDemo()
 {
-    _title = "JumpTiles3D";
+    _title    = "JumpTiles3D";
     _subtitle = "";
 }
 
@@ -304,7 +304,7 @@ cocos2d::ActionInterval* SplitRowsDemo::createEffect(float t)
 
 SplitRowsDemo::SplitRowsDemo()
 {
-    _title = "SplitRows";
+    _title    = "SplitRows";
     _subtitle = "";
 }
 
@@ -315,54 +315,48 @@ cocos2d::ActionInterval* SplitColsDemo::createEffect(float t)
 
 SplitColsDemo::SplitColsDemo()
 {
-    _title = "SplitCols";
+    _title    = "SplitCols";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* PageTurn3DDemo::createEffect(float t)
 {
-    return PageTurn3D::create(t, Size(15,10));
+    return PageTurn3D::create(t, Size(15, 10));
 }
 
 PageTurn3DDemo::PageTurn3DDemo()
 {
-    _title = "PageTurn3D";
+    _title    = "PageTurn3D";
     _subtitle = "";
 }
 
 cocos2d::ActionInterval* PageTurn3DRectDemo::createEffect(float t)
 {
-    return PageTurn3D::create(t, Size(15,10));
+    return PageTurn3D::create(t, Size(15, 10));
 }
 
 PageTurn3DRectDemo::PageTurn3DRectDemo()
 {
-    _title = "PageTurn3D-Rect";
+    _title    = "PageTurn3D-Rect";
     _subtitle = "";
 }
 
-#define SID_RESTART        1
+#define SID_RESTART 1
 
-EffectBaseTest::EffectBaseTest()
-: _gridNodeTarget(nullptr)
-{
-    
-}
+EffectBaseTest::EffectBaseTest() : _gridNodeTarget(nullptr) {}
 
 bool EffectBaseTest::init()
 {
-    if(TestCase::init())
+    if (TestCase::init())
     {
-        LayerColor *background = LayerColor::create( Color4B(32,128,32,255) );
-        this->addChild(background,-20);
-        if(isRectEffect())
+        LayerColor* background = LayerColor::create(Color4B(32, 128, 32, 255));
+        this->addChild(background, -20);
+        if (isRectEffect())
         {
             Size visibleSize = Director::getInstance()->getVisibleSize();
-            Rect gridRect = Rect(visibleSize.width * 0.2,
-                                 visibleSize.height * 0.2,
-                                 visibleSize.width * 0.6,
-                                 visibleSize.height * 0.6);
-            _gridNodeTarget = NodeGrid::create(gridRect);
+            Rect gridRect    = Rect(visibleSize.width * 0.2, visibleSize.height * 0.2, visibleSize.width * 0.6,
+                                    visibleSize.height * 0.6);
+            _gridNodeTarget  = NodeGrid::create(gridRect);
         }
         else
         {
@@ -370,27 +364,29 @@ bool EffectBaseTest::init()
         }
         addChild(_gridNodeTarget, 0);
         _gridNodeTarget->runAction(createEffect(3));
-        
+
         auto bg = Sprite::create(s_back3);
         _gridNodeTarget->addChild(bg, 0);
         bg->setPosition(VisibleRect::center());
-        
+
         auto grossini = Sprite::create(s_pathSister2);
         _gridNodeTarget->addChild(grossini, 1);
-        grossini->setPosition(VisibleRect::left().x+VisibleRect::getVisibleRect().size.width/3,VisibleRect::center().y);
-        auto sc = ScaleBy::create(2, 5);
+        grossini->setPosition(VisibleRect::left().x + VisibleRect::getVisibleRect().size.width / 3,
+                              VisibleRect::center().y);
+        auto sc      = ScaleBy::create(2, 5);
         auto sc_back = sc->reverse();
-        grossini->runAction( RepeatForever::create(Sequence::create(sc, sc_back, nullptr) ) );
-        
+        grossini->runAction(RepeatForever::create(Sequence::create(sc, sc_back, nullptr)));
+
         auto tamara = Sprite::create(s_pathSister1);
         _gridNodeTarget->addChild(tamara, 1);
-        tamara->setPosition(VisibleRect::left().x+2*VisibleRect::getVisibleRect().size.width/3,VisibleRect::center().y);
-        auto sc2 = ScaleBy::create(2, 5);
+        tamara->setPosition(VisibleRect::left().x + 2 * VisibleRect::getVisibleRect().size.width / 3,
+                            VisibleRect::center().y);
+        auto sc2      = ScaleBy::create(2, 5);
         auto sc2_back = sc2->reverse();
-        tamara->runAction( RepeatForever::create(Sequence::create(sc2, sc2_back, nullptr)) );
-        
-        schedule( CC_SCHEDULE_SELECTOR(EffectBaseTest::checkAnim) );
-        
+        tamara->runAction(RepeatForever::create(Sequence::create(sc2, sc2_back, nullptr)));
+
+        schedule(CC_SCHEDULE_SELECTOR(EffectBaseTest::checkAnim));
+
         return true;
     }
     return false;
@@ -398,10 +394,8 @@ bool EffectBaseTest::init()
 
 void EffectBaseTest::checkAnim(float dt)
 {
-    if ( _gridNodeTarget->getNumberOfRunningActions() == 0 && _gridNodeTarget->getGrid() != nullptr)
+    if (_gridNodeTarget->getNumberOfRunningActions() == 0 && _gridNodeTarget->getGrid() != nullptr)
         _gridNodeTarget->setGrid(nullptr);
 }
 
-EffectBaseTest::~EffectBaseTest()
-{
-}
+EffectBaseTest::~EffectBaseTest() {}
diff --git a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h
index 3d9e7670642b..7a6bf22a68be 100644
--- a/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h
+++ b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,13 +34,14 @@ class EffectBaseTest : public TestCase
 public:
     EffectBaseTest();
     virtual ~EffectBaseTest();
+
 protected:
     virtual bool init() override;
-    virtual cocos2d::ActionInterval* createEffect(float t) {return nullptr;}
+    virtual cocos2d::ActionInterval* createEffect(float t) { return nullptr; }
     void checkAnim(float dt);
-    virtual bool isRectEffect(){return false;}
-    virtual std::string title() const override {return _title;};
-    virtual std::string subtitle() const override {return _subtitle;};
+    virtual bool isRectEffect() { return false; }
+    virtual std::string title() const override { return _title; };
+    virtual std::string subtitle() const override { return _subtitle; };
     std::string _title;
     std::string _subtitle;
     cocos2d::NodeGrid* _gridNodeTarget;
@@ -51,6 +52,7 @@ class Shaky3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(Shaky3DDemo);
     Shaky3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -60,6 +62,7 @@ class Waves3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(Waves3DDemo);
     Waves3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -69,6 +72,7 @@ class FlipX3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FlipX3DDemo);
     FlipX3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -78,6 +82,7 @@ class FlipY3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FlipY3DDemo);
     FlipY3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -87,6 +92,7 @@ class Lens3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(Lens3DDemo);
     Lens3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -96,6 +102,7 @@ class Ripple3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(Ripple3DDemo);
     Ripple3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -105,6 +112,7 @@ class LiquidDemo : public EffectBaseTest
 public:
     CREATE_FUNC(LiquidDemo);
     LiquidDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -114,6 +122,7 @@ class WavesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(WavesDemo);
     WavesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -123,6 +132,7 @@ class TwirlDemo : public EffectBaseTest
 public:
     CREATE_FUNC(TwirlDemo);
     TwirlDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -132,6 +142,7 @@ class ShakyTiles3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(ShakyTiles3DDemo);
     ShakyTiles3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -141,6 +152,7 @@ class ShatteredTiles3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(ShatteredTiles3DDemo);
     ShatteredTiles3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -150,6 +162,7 @@ class ShuffleTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(ShuffleTilesDemo);
     ShuffleTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -159,6 +172,7 @@ class FadeOutTRTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FadeOutTRTilesDemo);
     FadeOutTRTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -168,6 +182,7 @@ class FadeOutBLTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FadeOutBLTilesDemo);
     FadeOutBLTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -177,6 +192,7 @@ class FadeOutUpTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FadeOutUpTilesDemo);
     FadeOutUpTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -186,6 +202,7 @@ class FadeOutDownTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(FadeOutDownTilesDemo);
     FadeOutDownTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -195,6 +212,7 @@ class TurnOffTilesDemo : public EffectBaseTest
 public:
     CREATE_FUNC(TurnOffTilesDemo);
     TurnOffTilesDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -204,6 +222,7 @@ class WavesTiles3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(WavesTiles3DDemo);
     WavesTiles3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -213,6 +232,7 @@ class JumpTiles3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(JumpTiles3DDemo);
     JumpTiles3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -222,6 +242,7 @@ class SplitRowsDemo : public EffectBaseTest
 public:
     CREATE_FUNC(SplitRowsDemo);
     SplitRowsDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -231,6 +252,7 @@ class SplitColsDemo : public EffectBaseTest
 public:
     CREATE_FUNC(SplitColsDemo);
     SplitColsDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -240,6 +262,7 @@ class PageTurn3DDemo : public EffectBaseTest
 public:
     CREATE_FUNC(PageTurn3DDemo);
     PageTurn3DDemo();
+
 protected:
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
@@ -249,8 +272,9 @@ class PageTurn3DRectDemo : public EffectBaseTest
 public:
     CREATE_FUNC(PageTurn3DRectDemo);
     PageTurn3DRectDemo();
+
 protected:
-    virtual bool isRectEffect() override {return true;}
+    virtual bool isRectEffect() override { return true; }
     virtual cocos2d::ActionInterval* createEffect(float t) override;
 };
 
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp
index dc0ddcf96798..fd9115ce5e42 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp
+++ b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,15 +29,18 @@
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-const char* sceneManifests[] = {"Manifests/AMTestScene1/project.manifest", "Manifests/AMTestScene2/project.manifest", "Manifests/AMTestScene3/project.manifest"};
-const char* storagePaths[] = {"CppTests/AssetsManagerExTest/scene1/", "CppTests/AssetsManagerExTest/scene2/", "CppTests/AssetsManagerExTest/scene3"};
-const char* backgroundPaths[] = {"Images/assetMgrBackground1.jpg", "Images/assetMgrBackground2.png", "Images/assetMgrBackground3.png"};
+const char* sceneManifests[]  = {"Manifests/AMTestScene1/project.manifest", "Manifests/AMTestScene2/project.manifest",
+                                "Manifests/AMTestScene3/project.manifest"};
+const char* storagePaths[]    = {"CppTests/AssetsManagerExTest/scene1/", "CppTests/AssetsManagerExTest/scene2/",
+                              "CppTests/AssetsManagerExTest/scene3"};
+const char* backgroundPaths[] = {"Images/assetMgrBackground1.jpg", "Images/assetMgrBackground2.png",
+                                 "Images/assetMgrBackground3.png"};
 
 AssetsManagerExTests::AssetsManagerExTests()
 {
-    addTestCase("AssetsManager Test1", [](){ return AssetsManagerExLoaderScene::create(0); });
-    addTestCase("AssetsManager Test2", [](){ return AssetsManagerExLoaderScene::create(1); });
-    addTestCase("AssetsManager Test3", [](){ return AssetsManagerExLoaderScene::create(2); });
+    addTestCase("AssetsManager Test1", []() { return AssetsManagerExLoaderScene::create(0); });
+    addTestCase("AssetsManager Test2", []() { return AssetsManagerExLoaderScene::create(1); });
+    addTestCase("AssetsManager Test3", []() { return AssetsManagerExLoaderScene::create(2); });
 }
 
 AssetsManagerExLoaderScene* AssetsManagerExLoaderScene::create(int testIndex)
@@ -57,15 +60,13 @@ AssetsManagerExLoaderScene* AssetsManagerExLoaderScene::create(int testIndex)
 }
 
 AssetsManagerExLoaderScene::AssetsManagerExLoaderScene(int testIndex)
-: _testIndex(testIndex)
-, _loadLayer(nullptr)
-, _downloadMenu(nullptr)
-, _am(nullptr)
-, _progress(nullptr)
-, _amListener(nullptr)
-{
-
-}
+    : _testIndex(testIndex)
+    , _loadLayer(nullptr)
+    , _downloadMenu(nullptr)
+    , _am(nullptr)
+    , _progress(nullptr)
+    , _amListener(nullptr)
+{}
 
 bool AssetsManagerExLoaderScene::init()
 {
@@ -75,7 +76,8 @@ bool AssetsManagerExLoaderScene::init()
     }
 
     auto downloadLabel = Label::createWithTTF("Start Download", "fonts/arial.ttf", 16);
-    auto downloadItem = MenuItemLabel::create(downloadLabel, CC_CALLBACK_1(AssetsManagerExLoaderScene::startDownloadCallback, this));
+    auto downloadItem =
+        MenuItemLabel::create(downloadLabel, CC_CALLBACK_1(AssetsManagerExLoaderScene::startDownloadCallback, this));
     downloadItem->setPosition(Vec2(VisibleRect::center().x, VisibleRect::bottom().y + 100));
     _downloadMenu = Menu::create(downloadItem, nullptr);
     _downloadMenu->setPosition(Vec2::ZERO);
@@ -86,14 +88,15 @@ bool AssetsManagerExLoaderScene::init()
 
     auto sprite = Sprite::create("Images/Icon.png");
     _loadLayer->addChild(sprite);
-    sprite->setPosition( VisibleRect::center() );
-    
+    sprite->setPosition(VisibleRect::center());
+
     TTFConfig config("fonts/tahoma.ttf", 30);
     _progress = Label::createWithTTF(config, "0%", TextHAlignment::CENTER);
-    _progress->setPosition( Vec2(VisibleRect::center().x, VisibleRect::center().y + 50) );
+    _progress->setPosition(Vec2(VisibleRect::center().x, VisibleRect::center().y + 50));
     _loadLayer->addChild(_progress);
-    
-    std::string manifestPath = sceneManifests[_testIndex], storagePath = FileUtils::getInstance()->getWritablePath() + storagePaths[_testIndex];
+
+    std::string manifestPath = sceneManifests[_testIndex],
+                storagePath  = FileUtils::getInstance()->getWritablePath() + storagePaths[_testIndex];
     CCLOG("Storage path for this test : %s", storagePath.c_str());
     _am = AssetsManagerEx::create(manifestPath, storagePath);
     _am->retain();
@@ -123,83 +126,84 @@ void AssetsManagerExLoaderScene::startDownloadCallback(Ref* sender)
     }
     else
     {
-        _amListener = cocos2d::extension::EventListenerAssetsManagerEx::create(_am, [this](EventAssetsManagerEx* event){
-            static int failCount = 0;
-            switch (event->getEventCode())
-            {
-            case EventAssetsManagerEx::EventCode::ERROR_NO_LOCAL_MANIFEST:
-            {
-                CCLOG("No local manifest file found, skip assets update.");
-                this->onLoadEnd();
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::UPDATE_PROGRESSION:
-            {
-                std::string assetId = event->getAssetId();
-                float percent = event->getPercent();
-                std::string str;
-                if (assetId == AssetsManagerEx::VERSION_ID)
+        _amListener =
+            cocos2d::extension::EventListenerAssetsManagerEx::create(_am, [this](EventAssetsManagerEx* event) {
+                static int failCount = 0;
+                switch (event->getEventCode())
                 {
-                    str = StringUtils::format("Version file: %.2f", percent) + "%";
-                }
-                else if (assetId == AssetsManagerEx::MANIFEST_ID)
+                case EventAssetsManagerEx::EventCode::ERROR_NO_LOCAL_MANIFEST:
                 {
-                    str = StringUtils::format("Manifest file: %.2f", percent) + "%";
+                    CCLOG("No local manifest file found, skip assets update.");
+                    this->onLoadEnd();
                 }
-                else
+                break;
+                case EventAssetsManagerEx::EventCode::UPDATE_PROGRESSION:
                 {
-                    str = StringUtils::format("%.2f", percent) + "%";
-                    CCLOG("%.2f Percent", percent);
+                    std::string assetId = event->getAssetId();
+                    float percent       = event->getPercent();
+                    std::string str;
+                    if (assetId == AssetsManagerEx::VERSION_ID)
+                    {
+                        str = StringUtils::format("Version file: %.2f", percent) + "%";
+                    }
+                    else if (assetId == AssetsManagerEx::MANIFEST_ID)
+                    {
+                        str = StringUtils::format("Manifest file: %.2f", percent) + "%";
+                    }
+                    else
+                    {
+                        str = StringUtils::format("%.2f", percent) + "%";
+                        CCLOG("%.2f Percent", percent);
+                    }
+                    if (this->_progress != nullptr)
+                        this->_progress->setString(str);
                 }
-                if (this->_progress != nullptr)
-                    this->_progress->setString(str);
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::ERROR_DOWNLOAD_MANIFEST:
-            case EventAssetsManagerEx::EventCode::ERROR_PARSE_MANIFEST:
-            {
-                CCLOG("Fail to download manifest file, update skipped.");
-                this->onLoadEnd();
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::ALREADY_UP_TO_DATE:
-            case EventAssetsManagerEx::EventCode::UPDATE_FINISHED:
-            {
-                CCLOG("Update finished. %s", event->getMessage().c_str());
-                this->onLoadEnd();
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::UPDATE_FAILED:
-            {
-                CCLOG("Update failed. %s", event->getMessage().c_str());
-
-                failCount++;
-                if (failCount < 5)
+                break;
+                case EventAssetsManagerEx::EventCode::ERROR_DOWNLOAD_MANIFEST:
+                case EventAssetsManagerEx::EventCode::ERROR_PARSE_MANIFEST:
                 {
-                    _am->downloadFailedAssets();
+                    CCLOG("Fail to download manifest file, update skipped.");
+                    this->onLoadEnd();
                 }
-                else
+                break;
+                case EventAssetsManagerEx::EventCode::ALREADY_UP_TO_DATE:
+                case EventAssetsManagerEx::EventCode::UPDATE_FINISHED:
                 {
-                    CCLOG("Reach maximum fail count, exit update process");
-                    failCount = 0;
+                    CCLOG("Update finished. %s", event->getMessage().c_str());
                     this->onLoadEnd();
                 }
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::ERROR_UPDATING:
-            {
-                CCLOG("Asset %s : %s", event->getAssetId().c_str(), event->getMessage().c_str());
-            }
-            break;
-            case EventAssetsManagerEx::EventCode::ERROR_DECOMPRESS:
-            {
-                CCLOG("%s", event->getMessage().c_str());
-            }
-            break;
-            default:
                 break;
-            }
-        });
+                case EventAssetsManagerEx::EventCode::UPDATE_FAILED:
+                {
+                    CCLOG("Update failed. %s", event->getMessage().c_str());
+
+                    failCount++;
+                    if (failCount < 5)
+                    {
+                        _am->downloadFailedAssets();
+                    }
+                    else
+                    {
+                        CCLOG("Reach maximum fail count, exit update process");
+                        failCount = 0;
+                        this->onLoadEnd();
+                    }
+                }
+                break;
+                case EventAssetsManagerEx::EventCode::ERROR_UPDATING:
+                {
+                    CCLOG("Asset %s : %s", event->getAssetId().c_str(), event->getMessage().c_str());
+                }
+                break;
+                case EventAssetsManagerEx::EventCode::ERROR_DECOMPRESS:
+                {
+                    CCLOG("%s", event->getMessage().c_str());
+                }
+                break;
+                default:
+                    break;
+                }
+            });
         Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_amListener, 1);
 
         _am->update();
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h
index b817ff9bf819..a3ba81dc8935 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h
+++ b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,14 +36,14 @@ class AssetsManagerExLoaderScene : public TestCase
     static AssetsManagerExLoaderScene* create(int testIndex);
 
     AssetsManagerExLoaderScene(int testIndex);
-    
+
     void startDownloadCallback(cocos2d::Ref* sender);
 
     virtual std::string title() const override;
 
     virtual bool init() override;
     virtual void onExit() override;
-    
+
 private:
     int _testIndex;
     cocos2d::Layer* _loadLayer;
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp
index 4e8460233be1..d30100ae5f11 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp
+++ b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,6 +29,6 @@
 
 ExtensionsTests::ExtensionsTests()
 {
-    addTest("AssetsManagerExTest", [](){ return new AssetsManagerExTests; });
-    addTest("TableViewTest", [](){ return new TableViewTests; });
+    addTest("AssetsManagerExTest", []() { return new AssetsManagerExTests; });
+    addTest("TableViewTest", []() { return new TableViewTests; });
 }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h
index 2a02f0627fe4..665686ae9092 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h
+++ b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
index badafef57f76..2cdde3fb2317 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
+++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,18 +26,18 @@
 
 USING_NS_CC;
 
-void CustomTableViewCell::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void CustomTableViewCell::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
-	TableViewCell::draw(renderer, transform, flags);
-	// draw bounding box
-// 	auto pos = getPosition();
-// 	auto size = Size(178, 200);
-// 	Vec2 vertices[4]={
-// 		Vec2(pos.x+1, pos.y+1),
-// 		Vec2(pos.x+size.width-1, pos.y+1),
-// 		Vec2(pos.x+size.width-1, pos.y+size.height-1),
-// 		Vec2(pos.x+1, pos.y+size.height-1),
-// 	};
-// 	DrawPrimitives::drawColor4B(0, 0, 255, 255);
-// 	DrawPrimitives::drawPoly(vertices, 4, true);
+    TableViewCell::draw(renderer, transform, flags);
+    // draw bounding box
+    // 	auto pos = getPosition();
+    // 	auto size = Size(178, 200);
+    // 	Vec2 vertices[4]={
+    // 		Vec2(pos.x+1, pos.y+1),
+    // 		Vec2(pos.x+size.width-1, pos.y+1),
+    // 		Vec2(pos.x+size.width-1, pos.y+size.height-1),
+    // 		Vec2(pos.x+1, pos.y+size.height-1),
+    // 	};
+    // 	DrawPrimitives::drawColor4B(0, 0, 255, 255);
+    // 	DrawPrimitives::drawPoly(vertices, 4, true);
 }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
index 4fd2f0fe41c6..60ab09bad99c 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
+++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,8 +34,7 @@
 class CustomTableViewCell : public cocos2d::extension::TableViewCell
 {
 public:
-	virtual void draw(cocos2d::Renderer *renderer, const cocos2d::Mat4 &transform, uint32_t flags) override;
+    virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
 };
 
 #endif /* __CUSTOMTABELVIEWCELL_H__ */
-
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
index e496b7735915..249c4fa07f93 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
+++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,16 +37,16 @@ TableViewTests::TableViewTests()
 // on "init" you need to initialize your instance
 bool TableViewTest::init()
 {
-    if ( !TestCase::init() )
+    if (!TestCase::init())
     {
         return false;
     }
 
-	Size winSize = Director::getInstance()->getWinSize();
+    Size winSize = Director::getInstance()->getWinSize();
 
     TableView* tableView = TableView::create(this, Size(250.0f, 60.0f));
     tableView->setDirection(ScrollView::Direction::HORIZONTAL);
-    tableView->setPosition(Vec2(20.0f,winSize.height/2-30));
+    tableView->setPosition(Vec2(20.0f, winSize.height / 2 - 30));
     tableView->setDelegate(this);
     this->addChild(tableView);
     tableView->reloadData();
@@ -57,14 +57,13 @@ bool TableViewTest::init()
     tableView->removeChild(testNode, true);
     CCAssert(nullptr == tableView->getChildByName("testNode"), "The added child has been removed!");
 
-
-	tableView = TableView::create(this, Size(60.0f, 250.0f));
-	tableView->setDirection(ScrollView::Direction::VERTICAL);
-	tableView->setPosition(Vec2(winSize.width-150,winSize.height/2-120));
-	tableView->setDelegate(this);
-	tableView->setVerticalFillOrder(TableView::VerticalFillOrder::TOP_DOWN);
-	this->addChild(tableView);
-	tableView->reloadData();
+    tableView = TableView::create(this, Size(60.0f, 250.0f));
+    tableView->setDirection(ScrollView::Direction::VERTICAL);
+    tableView->setPosition(Vec2(winSize.width - 150, winSize.height / 2 - 120));
+    tableView->setDelegate(this);
+    tableView->setVerticalFillOrder(TableView::VerticalFillOrder::TOP_DOWN);
+    this->addChild(tableView);
+    tableView->reloadData();
 
     return true;
 }
@@ -74,19 +73,21 @@ void TableViewTest::tableCellTouched(TableView* table, TableViewCell* cell)
     CCLOG("cell touched at index: %d", static_cast<int32_t>(cell->getIdx()));
 }
 
-Size TableViewTest::tableCellSizeForIndex(TableView *table, ssize_t idx)
+Size TableViewTest::tableCellSizeForIndex(TableView* table, ssize_t idx)
 {
-    if (idx == 2) {
+    if (idx == 2)
+    {
         return Size(100, 100);
     }
     return Size(60, 60);
 }
 
-TableViewCell* TableViewTest::tableCellAtIndex(TableView *table, ssize_t idx)
+TableViewCell* TableViewTest::tableCellAtIndex(TableView* table, ssize_t idx)
 {
-    auto string = StringUtils::format("%d", static_cast<int32_t>(idx));
-    TableViewCell *cell = table->dequeueCell();
-    if (!cell) {
+    auto string         = StringUtils::format("%d", static_cast<int32_t>(idx));
+    TableViewCell* cell = table->dequeueCell();
+    if (!cell)
+    {
         cell = new CustomTableViewCell();
         cell->autorelease();
         auto sprite = Sprite::create("Images/Icon.png");
@@ -96,7 +97,7 @@ TableViewCell* TableViewTest::tableCellAtIndex(TableView *table, ssize_t idx)
 
         auto label = Label::createWithSystemFont(string, "Helvetica", 20.0);
         label->setPosition(Vec2::ZERO);
-		label->setAnchorPoint(Vec2::ZERO);
+        label->setAnchorPoint(Vec2::ZERO);
         label->setTag(123);
         cell->addChild(label);
     }
@@ -106,11 +107,10 @@ TableViewCell* TableViewTest::tableCellAtIndex(TableView *table, ssize_t idx)
         label->setString(string);
     }
 
-
     return cell;
 }
 
-ssize_t TableViewTest::numberOfCellsInTableView(TableView *table)
+ssize_t TableViewTest::numberOfCellsInTableView(TableView* table)
 {
     return 20;
 }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
index f01df050ccc8..a439f924dbd5 100644
--- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
+++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,19 +31,23 @@
 
 DEFINE_TEST_SUITE(TableViewTests);
 
-class TableViewTest : public TestCase, public cocos2d::extension::TableViewDataSource, public cocos2d::extension::TableViewDelegate
+class TableViewTest : public TestCase,
+                      public cocos2d::extension::TableViewDataSource,
+                      public cocos2d::extension::TableViewDelegate
 {
 public:
     CREATE_FUNC(TableViewTest);
 
-    virtual bool init() override;  
-    
-    virtual void scrollViewDidScroll(cocos2d::extension::ScrollView* view)override {};
-    virtual void scrollViewDidZoom(cocos2d::extension::ScrollView* view)override {}
-    virtual void tableCellTouched(cocos2d::extension::TableView* table, cocos2d::extension::TableViewCell* cell)override;
-    virtual cocos2d::Size tableCellSizeForIndex(cocos2d::extension::TableView *table, ssize_t idx)override;
-    virtual cocos2d::extension::TableViewCell* tableCellAtIndex(cocos2d::extension::TableView *table, ssize_t idx)override;
-    virtual ssize_t numberOfCellsInTableView(cocos2d::extension::TableView *table)override;
+    virtual bool init() override;
+
+    virtual void scrollViewDidScroll(cocos2d::extension::ScrollView* view) override{};
+    virtual void scrollViewDidZoom(cocos2d::extension::ScrollView* view) override {}
+    virtual void tableCellTouched(cocos2d::extension::TableView* table,
+                                  cocos2d::extension::TableViewCell* cell) override;
+    virtual cocos2d::Size tableCellSizeForIndex(cocos2d::extension::TableView* table, ssize_t idx) override;
+    virtual cocos2d::extension::TableViewCell* tableCellAtIndex(cocos2d::extension::TableView* table,
+                                                                ssize_t idx) override;
+    virtual ssize_t numberOfCellsInTableView(cocos2d::extension::TableView* table) override;
 };
 
-#endif // __TABLEVIEWTESTSCENE_H__
+#endif  // __TABLEVIEWTESTSCENE_H__
diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
index 831a1e2cdcad..4a8d50b81913 100644
--- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
+++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -60,26 +60,27 @@ void TestResolutionDirectories::onEnter()
     std::string ret;
 
     sharedFileUtils->purgeCachedEntries();
-    _defaultSearchPathArray = sharedFileUtils->getOriginalSearchPaths();
+    _defaultSearchPathArray              = sharedFileUtils->getOriginalSearchPaths();
     std::vector<std::string> searchPaths = _defaultSearchPathArray;
-    searchPaths.insert(searchPaths.begin(),   "Misc");
+    searchPaths.insert(searchPaths.begin(), "Misc");
     sharedFileUtils->setSearchPaths(searchPaths);
 
-    _defaultResolutionsOrderArray = sharedFileUtils->getSearchResolutionsOrder();
+    _defaultResolutionsOrderArray             = sharedFileUtils->getSearchResolutionsOrder();
     std::vector<std::string> resolutionsOrder = _defaultResolutionsOrderArray;
 
     resolutionsOrder.insert(resolutionsOrder.begin(), "resources-ipadhd");
-    resolutionsOrder.insert(resolutionsOrder.begin()+1, "resources-ipad");
-    resolutionsOrder.insert(resolutionsOrder.begin()+2, "resources-widehd");
-    resolutionsOrder.insert(resolutionsOrder.begin()+3, "resources-wide");
-    resolutionsOrder.insert(resolutionsOrder.begin()+4, "resources-hd");
-    resolutionsOrder.insert(resolutionsOrder.begin()+5, "resources-iphone");
+    resolutionsOrder.insert(resolutionsOrder.begin() + 1, "resources-ipad");
+    resolutionsOrder.insert(resolutionsOrder.begin() + 2, "resources-widehd");
+    resolutionsOrder.insert(resolutionsOrder.begin() + 3, "resources-wide");
+    resolutionsOrder.insert(resolutionsOrder.begin() + 4, "resources-hd");
+    resolutionsOrder.insert(resolutionsOrder.begin() + 5, "resources-iphone");
 
     sharedFileUtils->setSearchResolutionsOrder(resolutionsOrder);
 
-    for( int i=1; i<7; i++) {
+    for (int i = 1; i < 7; i++)
+    {
         auto filename = StringUtils::format("test%d.txt", i);
-        ret = sharedFileUtils->fullPathForFilename(filename);
+        ret           = sharedFileUtils->fullPathForFilename(filename);
         log("%s -> %s", filename.c_str(), ret.c_str());
     }
 }
@@ -114,12 +115,12 @@ void TestSearchPath::onEnter()
     std::string ret;
 
     sharedFileUtils->purgeCachedEntries();
-    _defaultSearchPathArray = sharedFileUtils->getOriginalSearchPaths();
+    _defaultSearchPathArray              = sharedFileUtils->getOriginalSearchPaths();
     std::vector<std::string> searchPaths = _defaultSearchPathArray;
-    std::string writablePath = sharedFileUtils->getWritablePath();
-    std::string fileName = writablePath+"external.txt";
-    char szBuf[100] = "Hello Cocos2d-x!";
-    FILE* fp = fopen(fileName.c_str(), "wb");
+    std::string writablePath             = sharedFileUtils->getWritablePath();
+    std::string fileName                 = writablePath + "external.txt";
+    char szBuf[100]                      = "Hello Cocos2d-x!";
+    FILE* fp                             = fopen(fileName.c_str(), "wb");
     if (fp)
     {
         size_t ret = fwrite(szBuf, 1, strlen(szBuf), fp);
@@ -130,19 +131,20 @@ void TestSearchPath::onEnter()
     }
 
     searchPaths.insert(searchPaths.begin(), writablePath);
-    searchPaths.insert(searchPaths.begin()+1,   "Misc/searchpath1");
-    searchPaths.insert(searchPaths.begin()+2, "Misc/searchpath2");
+    searchPaths.insert(searchPaths.begin() + 1, "Misc/searchpath1");
+    searchPaths.insert(searchPaths.begin() + 2, "Misc/searchpath2");
     sharedFileUtils->setSearchPaths(searchPaths);
 
-    _defaultResolutionsOrderArray = sharedFileUtils->getSearchResolutionsOrder();
+    _defaultResolutionsOrderArray             = sharedFileUtils->getSearchResolutionsOrder();
     std::vector<std::string> resolutionsOrder = _defaultResolutionsOrderArray;
 
     resolutionsOrder.insert(resolutionsOrder.begin(), "resources-ipad");
     sharedFileUtils->setSearchResolutionsOrder(resolutionsOrder);
 
-    for( int i=1; i<3; i++) {
+    for (int i = 1; i < 3; i++)
+    {
         auto filename = StringUtils::format("file%d.txt", i);
-        ret = sharedFileUtils->fullPathForFilename(filename);
+        ret           = sharedFileUtils->fullPathForFilename(filename);
         log("%s -> %s", filename.c_str(), ret.c_str());
     }
 
@@ -155,7 +157,7 @@ void TestSearchPath::onEnter()
         if (fp)
         {
             char szReadBuf[100] = {0};
-            size_t read = fread(szReadBuf, 1, strlen(szReadBuf), fp);
+            size_t read         = fread(szReadBuf, 1, strlen(szReadBuf), fp);
             if (read > 0)
                 log("The content of file from writable path: %s", szReadBuf);
             fclose(fp);
@@ -188,7 +190,7 @@ void TestSearchPath::onEnter()
 
 void TestSearchPath::onExit()
 {
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
 
     // reset search path
     sharedFileUtils->setSearchPaths(_defaultSearchPathArray);
@@ -225,13 +227,13 @@ void TestFilenameLookup::onEnter()
     this->addChild(sprite);
 
     auto s = Director::getInstance()->getWinSize();
-    sprite->setPosition(s.width/2, s.height/2);
+    sprite->setPosition(s.width / 2, s.height / 2);
 }
 
 void TestFilenameLookup::onExit()
 {
 
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
 
     // reset filename lookup
     sharedFileUtils->setFilenameLookupDictionary(ValueMap());
@@ -249,7 +251,7 @@ std::string TestFilenameLookup::title() const
 void TestIsFileExist::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s               = Director::getInstance()->getWinSize();
     auto sharedFileUtils = FileUtils::getInstance();
 
     Label* label = nullptr;
@@ -257,20 +259,22 @@ void TestIsFileExist::onEnter()
 
     isExist = sharedFileUtils->isFileExist("Images/grossini.png");
 
-    label = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20);
-    label->setPosition(s.width/2, s.height/3);
+    label = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist",
+                                        "", 20);
+    label->setPosition(s.width / 2, s.height / 3);
     this->addChild(label);
 
     isExist = sharedFileUtils->isFileExist("Images/grossini.xcf");
-    label = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20);
-    label->setPosition(s.width/2, s.height/3*2);
+    label   = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist",
+                                        "", 20);
+    label->setPosition(s.width / 2, s.height / 3 * 2);
     this->addChild(label);
 }
 
 void TestIsFileExist::onExit()
 {
 
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
 
     // reset filename lookup
     sharedFileUtils->setFilenameLookupDictionary(ValueMap());
@@ -293,30 +297,29 @@ std::string TestIsFileExist::subtitle() const
 void TestIsDirectoryExist::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s    = Director::getInstance()->getWinSize();
     auto util = FileUtils::getInstance();
-    int x = s.width/2, y = s.height/3;
+    int x = s.width / 2, y = s.height / 3;
 
     Label* label = nullptr;
     std::string dir;
-    auto getMsg = [&dir](bool b)-> std::string
-    {
+    auto getMsg = [&dir](bool b) -> std::string {
         char msg[512];
-        snprintf((char *)msg, 512, "%s for dir: \"%s\"", b ? "success" : "failed", dir.c_str());
+        snprintf((char*)msg, 512, "%s for dir: \"%s\"", b ? "success" : "failed", dir.c_str());
         return std::string(msg);
     };
 
-    dir = "Images";
+    dir   = "Images";
     label = Label::createWithSystemFont(getMsg(util->isDirectoryExist(dir)), "", 20);
     label->setPosition(x, y * 2);
     this->addChild(label);
 
-    dir = util->getWritablePath();
+    dir   = util->getWritablePath();
     label = Label::createWithSystemFont(getMsg(util->isDirectoryExist(dir)), "", 20);
     label->setPosition(x, y * 1);
     this->addChild(label);
 
-    dir = util->getWritablePath();
+    dir   = util->getWritablePath();
     label = Label::createWithSystemFont(getMsg(util->isDirectoryExist(dir)), "", 20);
     label->setPosition(x, y * 1);
     this->addChild(label);
@@ -325,7 +328,7 @@ void TestIsDirectoryExist::onEnter()
 void TestIsDirectoryExist::onExit()
 {
 
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
 
     // reset filename lookup
     sharedFileUtils->purgeCachedEntries();
@@ -348,20 +351,19 @@ std::string TestIsDirectoryExist::subtitle() const
 void TestFileFuncs::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s               = Director::getInstance()->getWinSize();
     auto sharedFileUtils = FileUtils::getInstance();
 
-    int x = s.width/2,
-        y = s.height/5;
+    int x = s.width / 2, y = s.height / 5;
     Label* label = nullptr;
 
-    std::string filename = "__test.test";
+    std::string filename  = "__test.test";
     std::string filename2 = "__newtest.test";
-    std::string filepath = sharedFileUtils->getWritablePath() + filename;
-    std::string content = "Test string content to put into created file";
+    std::string filepath  = sharedFileUtils->getWritablePath() + filename;
+    std::string content   = "Test string content to put into created file";
     std::string msg;
 
-    FILE *out = fopen(filepath.c_str(), "w");
+    FILE* out = fopen(filepath.c_str(), "w");
     fputs(content.c_str(), out);
     fclose(out);
 
@@ -374,8 +376,8 @@ void TestFileFuncs::onEnter()
 
         // getFileSize Test
         int32_t size = sharedFileUtils->getFileSize(filepath);
-        msg = StringUtils::format("getFileSize: Test file size equals %d", size);
-        label = Label::createWithSystemFont(msg, "", 20);
+        msg          = StringUtils::format("getFileSize: Test file size equals %d", size);
+        label        = Label::createWithSystemFont(msg, "", 20);
         label->setPosition(x, y * 3);
         this->addChild(label);
 
@@ -403,7 +405,8 @@ void TestFileFuncs::onEnter()
         }
         else
         {
-            label = Label::createWithSystemFont("renameFile: Failed to rename test file to  '__newtest.test', further test skipped", "", 20);
+            label = Label::createWithSystemFont(
+                "renameFile: Failed to rename test file to  '__newtest.test', further test skipped", "", 20);
             label->setPosition(x, y * 2);
             this->addChild(label);
         }
@@ -431,15 +434,14 @@ std::string TestFileFuncs::subtitle() const
 void TestDirectoryFuncs::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s               = Director::getInstance()->getWinSize();
     auto sharedFileUtils = FileUtils::getInstance();
 
-    int x = s.width/2,
-    y = s.height/4;
+    int x = s.width / 2, y = s.height / 4;
     Label* label = nullptr;
 
-    std::string dir = sharedFileUtils->getWritablePath() + "__test";
-    std::string subDir = "dir1/dir2";
+    std::string dir        = sharedFileUtils->getWritablePath() + "__test";
+    std::string subDir     = "dir1/dir2";
     std::string fullSubDir = dir + "/" + subDir;
     std::string msg;
     bool ok;
@@ -448,7 +450,7 @@ void TestDirectoryFuncs::onEnter()
     ok = sharedFileUtils->createDirectory(dir);
     if (ok && sharedFileUtils->isDirectoryExist(dir))
     {
-        msg = StringUtils::format("createDirectory: Directory '__test' created");
+        msg   = StringUtils::format("createDirectory: Directory '__test' created");
         label = Label::createWithSystemFont(msg, "", 20);
         label->setPosition(x, y * 3);
         this->addChild(label);
@@ -457,14 +459,14 @@ void TestDirectoryFuncs::onEnter()
         ok = sharedFileUtils->createDirectory(fullSubDir);
         if (ok && sharedFileUtils->isDirectoryExist(fullSubDir))
         {
-            msg = StringUtils::format("createDirectory: Sub directories '%s' created", subDir.c_str());
+            msg   = StringUtils::format("createDirectory: Sub directories '%s' created", subDir.c_str());
             label = Label::createWithSystemFont(msg, "", 20);
             label->setPosition(x, y * 2);
             this->addChild(label);
         }
         else
         {
-            msg = StringUtils::format("createDirectory: Failed to create sub directories '%s'", subDir.c_str());
+            msg   = StringUtils::format("createDirectory: Failed to create sub directories '%s'", subDir.c_str());
             label = Label::createWithSystemFont(msg, "", 20);
             label->setPosition(x, y * 2);
             this->addChild(label);
@@ -474,14 +476,14 @@ void TestDirectoryFuncs::onEnter()
         ok = sharedFileUtils->removeDirectory(dir);
         if (ok && !sharedFileUtils->isDirectoryExist(dir))
         {
-            msg = StringUtils::format("removeDirectory: Directory '__test' removed");
+            msg   = StringUtils::format("removeDirectory: Directory '__test' removed");
             label = Label::createWithSystemFont(msg, "", 20);
             label->setPosition(x, y);
             this->addChild(label);
         }
         else
         {
-            msg = StringUtils::format("removeDirectory: Failed to remove directory '__test'");
+            msg   = StringUtils::format("removeDirectory: Failed to remove directory '__test'");
             label = Label::createWithSystemFont(msg, "", 20);
             label->setPosition(x, y);
             this->addChild(label);
@@ -489,7 +491,7 @@ void TestDirectoryFuncs::onEnter()
     }
     else
     {
-        msg = StringUtils::format("createDirectory: Directory '__test' can not be created");
+        msg   = StringUtils::format("createDirectory: Directory '__test' can not be created");
         label = Label::createWithSystemFont(msg, "", 20);
         label->setPosition(x, y * 2);
         this->addChild(label);
@@ -521,11 +523,11 @@ void TestWriteString::onEnter()
     readResult->setPosition(winSize.width / 2, winSize.height / 3);
 
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fileName = "writeStringTest.txt";
+    std::string fileName     = "writeStringTest.txt";
 
     // writeTest
     std::string writeDataStr = "the string data will be write into a file";
-    std::string fullPath = writablePath + fileName;
+    std::string fullPath     = writablePath + fileName;
     if (FileUtils::getInstance()->writeStringToFile(writeDataStr, fullPath.c_str()))
     {
         log("see the plist file at %s", fullPath.c_str());
@@ -557,42 +559,34 @@ std::string TestWriteString::subtitle() const
     return "";
 }
 
-class CustomBuffer : public ResizableBuffer {};
+class CustomBuffer : public ResizableBuffer
+{};
 
-struct AlreadyExistsBuffer {};
+struct AlreadyExistsBuffer
+{};
 
 NS_CC_BEGIN
-template<>
-class ResizableBufferAdapter<AlreadyExistsBuffer> : public ResizableBuffer {
+template <>
+class ResizableBufferAdapter<AlreadyExistsBuffer> : public ResizableBuffer
+{
 public:
-    explicit ResizableBufferAdapter(AlreadyExistsBuffer* buffer) {
-    }
-    virtual void resize(size_t size) override {
-
-    }
-    virtual void* buffer() const override {
-        return nullptr;
-    }
+    explicit ResizableBufferAdapter(AlreadyExistsBuffer* buffer) {}
+    virtual void resize(size_t size) override {}
+    virtual void* buffer() const override { return nullptr; }
 };
 NS_CC_END
 
-static void saveAsBinaryText(const std::string& filename, const std::vector<char>& binary){
+static void saveAsBinaryText(std::string_view filename, const std::vector<char>& binary)
+{
     auto fs = FileUtils::getInstance();
     std::string text(binary.begin(), binary.end());
     fs->writeStringToFile(text, filename);
 }
 
 static const std::string FileErrors[] = {
-    "OK",
-    "NotExists",
-    "OpenFailed",
-    "ReadFailed",
-    "NotInitialized",
-    "TooLarge",
-    "ObtainSizeFailed",
+    "OK", "NotExists", "OpenFailed", "ReadFailed", "NotInitialized", "TooLarge", "ObtainSizeFailed",
 };
 
-
 void TestGetContents::onEnter()
 {
     FileUtilsDemo::onEnter();
@@ -612,26 +606,25 @@ void TestGetContents::onEnter()
     this->addChild(readResult);
     readResult->setPosition(winSize.width / 2, winSize.height / 2);
 
-    std::vector<char> binary = {'\r','\n','\r','\n','\0','\0','\r','\n'};
-    _generatedFile = fs->getWritablePath() + "file-with-zeros-and-crlf";
+    std::vector<char> binary = {'\r', '\n', '\r', '\n', '\0', '\0', '\r', '\n'};
+    _generatedFile           = fs->getWritablePath() + "file-with-zeros-and-crlf";
     saveAsBinaryText(_generatedFile, binary);
 
-
     auto runTests = [&]() {
         // Test read string in binary mode
         std::string bs;
         fs->getContents(_generatedFile, &bs);
-        if ( bs.size() != binary.size() || !std::equal( bs.begin(), bs.end(), binary.begin() ) )
+        if (bs.size() != binary.size() || !std::equal(bs.begin(), bs.end(), binary.begin()))
             return std::string("failed: read as binary string");
 
         // Text read string in text mode
         std::string ts = fs->getStringFromFile(_generatedFile);
-        if (strcmp(ts.c_str(), "\r\n\r\n")!=0)
+        if (strcmp(ts.c_str(), "\r\n\r\n") != 0)
             return std::string("failed: read as zero terminated string");
 
-
         std::string files[] = {_generatedFile, "background.wav", "fileLookup.plist"};
-        for (auto& file : files) {
+        for (auto& file : files)
+        {
             std::string sbuf;
 
             auto serr = fs->getContents(file, &sbuf);
@@ -695,12 +688,12 @@ void TestWriteData::onEnter()
     readResult->setPosition(winSize.width / 2, winSize.height / 3);
 
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fileName = "writeDataTest.txt";
+    std::string fileName     = "writeDataTest.txt";
 
     // writeTest
     std::string writeDataStr = "the binary data will be write into a file";
     Data writeData;
-    writeData.copy((unsigned char *)writeDataStr.c_str(), writeDataStr.size());
+    writeData.copy((unsigned char*)writeDataStr.c_str(), writeDataStr.size());
     std::string fullPath = writablePath + fileName;
     if (FileUtils::getInstance()->writeDataToFile(writeData, fullPath.c_str()))
     {
@@ -715,8 +708,8 @@ void TestWriteData::onEnter()
 
     // readTest
     unsigned char* buffer = nullptr;
-    Data readData = FileUtils::getInstance()->getDataFromFile(fullPath);
-    buffer = (unsigned char*)malloc(sizeof(unsigned char) * (readData.getSize() + 1));
+    Data readData         = FileUtils::getInstance()->getDataFromFile(fullPath);
+    buffer                = (unsigned char*)malloc(sizeof(unsigned char) * (readData.getSize() + 1));
     memcpy(buffer, readData.getBytes(), readData.getSize());
     buffer[readData.getSize()] = '\0';
     std::string readDataStr((const char*)buffer);
@@ -760,7 +753,7 @@ void TestWriteValueMap::onEnter()
     mapInValueMap["string1"] = "string in dictInMap key 0";
     mapInValueMap["string2"] = "string in dictInMap key 1";
     mapInValueMap["none"].getType();
-    
+
     valueMap["data0"] = Value(mapInValueMap);
 
     valueMap["data1"] = Value("string in array");
@@ -770,26 +763,25 @@ void TestWriteValueMap::onEnter()
     arrayInMap.push_back(Value("string 1 in arrayInMap"));
     valueMap["data2"] = arrayInMap;
 
-    //add boolean to the plist
+    // add boolean to the plist
     auto booleanObject = Value(true);
-    valueMap["data3"] = booleanObject;
+    valueMap["data3"]  = booleanObject;
 
-    //add integer to the plist
-    auto intObject = Value(1024);
+    // add integer to the plist
+    auto intObject    = Value(1024);
     valueMap["data4"] = intObject;
 
-    //add float to the plist
-    auto floatObject = Value(1024.1024f);
+    // add float to the plist
+    auto floatObject  = Value(1024.1024f);
     valueMap["data5"] = floatObject;
 
-    //add double to the plist
+    // add double to the plist
     auto doubleObject = Value(1024.123);
     valueMap["data6"] = doubleObject;
 
-
     // end with /
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fullPath = writablePath + "testWriteValueMap.plist";
+    std::string fullPath     = writablePath + "testWriteValueMap.plist";
     if (FileUtils::getInstance()->writeValueMapToFile(valueMap, fullPath.c_str()))
     {
         log("see the plist file at %s", fullPath.c_str());
@@ -801,7 +793,7 @@ void TestWriteValueMap::onEnter()
         writeResult->setString("write failed");
     }
 
-    ValueMap readValueMap = FileUtils::getInstance()->getValueMapFromFile(fullPath.c_str());
+    ValueMap readValueMap   = FileUtils::getInstance()->getValueMapFromFile(fullPath.c_str());
     std::string readDataStr = "read data:\n";
     // read value map data
     ValueMap readMapInMap = readValueMap["data0"].asValueMap();
@@ -873,26 +865,25 @@ void TestWriteValueVector::onEnter()
     arrayInArray.push_back(Value("string 1 in arrayInArray"));
     array.push_back(Value(arrayInArray));
 
-    //add boolean to the plist
+    // add boolean to the plist
     auto booleanObject = Value(true);
     array.push_back(booleanObject);
 
-    //add integer to the plist
+    // add integer to the plist
     auto intObject = Value(1024);
     array.push_back(intObject);
 
-    //add float to the plist
+    // add float to the plist
     auto floatObject = Value(1024.1024f);
     array.push_back(floatObject);
 
-    //add double to the plist
+    // add double to the plist
     auto doubleObject = Value(1024.123);
     array.push_back(doubleObject);
 
-
     // end with /
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fullPath = writablePath + "testWriteValueVector.plist";
+    std::string fullPath     = writablePath + "testWriteValueVector.plist";
     if (FileUtils::getInstance()->writeValueVectorToFile(array, fullPath.c_str()))
     {
         log("see the plist file at %s", fullPath.c_str());
@@ -904,7 +895,7 @@ void TestWriteValueVector::onEnter()
         writeResult->setString("write failed");
     }
 
-    ValueVector readArray = FileUtils::getInstance()->getValueVectorFromFile(fullPath.c_str());
+    ValueVector readArray   = FileUtils::getInstance()->getValueVectorFromFile(fullPath.c_str());
     std::string readDataStr = "read data:\n";
     // read value map data
     ValueMap readMapInArray = readArray.at(0).asValueMap();
@@ -954,21 +945,19 @@ std::string TestWriteValueVector::subtitle() const
 void TestUnicodePath::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s    = Director::getInstance()->getWinSize();
     auto util = FileUtils::getInstance();
 
-    int x = s.width/2,
-    y = s.height/5;
+    int x = s.width / 2, y = s.height / 5;
     Label* label = nullptr;
 
-    std::string dir = "中文路径/";
+    std::string dir      = "中文路径/";
     std::string filename = "测试文件.test";
 
     std::string act;
-    auto getMsg = [&act](bool b, const std::string& path)-> std::string
-    {
+    auto getMsg = [&act](bool b, std::string_view path) -> std::string {
         char msg[512];
-        snprintf((char *)msg, 512, "%s for %s path: \"%s\"", b ? "success" : "failed", act.c_str(), path.c_str());
+        snprintf((char*)msg, 512, "%s for %s path: \"%s\"", b ? "success" : "failed", act.c_str(), path.data());
         return std::string(msg);
     };
 
@@ -979,9 +968,9 @@ void TestUnicodePath::onEnter()
         util->createDirectory(dirPath);
     }
 
-    act = "create";
+    act          = "create";
     bool isExist = util->isDirectoryExist(dirPath);
-    label = Label::createWithSystemFont(getMsg(isExist, dirPath), "", 12, Size(s.width, 0));
+    label        = Label::createWithSystemFont(getMsg(isExist, dirPath), "", 12, Size(s.width, 0));
     label->setPosition(x, y * 4);
     this->addChild(label);
 
@@ -989,16 +978,16 @@ void TestUnicodePath::onEnter()
     {
         // Check whether unicode file should be create or not
         std::string filePath = dirPath + filename;
-        if (! util->isFileExist(filePath))
+        if (!util->isFileExist(filePath))
         {
             std::string writeDataStr = " 测试字符串.";
             Data writeData;
-            writeData.copy((unsigned char *)writeDataStr.c_str(), writeDataStr.size());
+            writeData.copy((unsigned char*)writeDataStr.c_str(), writeDataStr.size());
             util->writeDataToFile(writeData, filePath);
         }
 
         isExist = util->isFileExist(filePath);
-        label = Label::createWithSystemFont(getMsg(isExist, filePath), "", 12, Size(s.width, 0));
+        label   = Label::createWithSystemFont(getMsg(isExist, filePath), "", 12, Size(s.width, 0));
         label->setPosition(x, y * 3);
         this->addChild(label);
 
@@ -1007,8 +996,8 @@ void TestUnicodePath::onEnter()
         {
             // read file content and log it
             unsigned char* buffer = nullptr;
-            Data readData = util->getDataFromFile(filePath);
-            buffer = (unsigned char*)malloc(sizeof(unsigned char) * (readData.getSize() + 1));
+            Data readData         = util->getDataFromFile(filePath);
+            buffer                = (unsigned char*)malloc(sizeof(unsigned char) * (readData.getSize() + 1));
             memcpy(buffer, readData.getBytes(), readData.getSize());
             buffer[readData.getSize()] = '\0';
             // vc can't treat unicode string correctly, don't use unicode string in code
@@ -1031,7 +1020,7 @@ void TestUnicodePath::onEnter()
 void TestUnicodePath::onExit()
 {
 
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
     sharedFileUtils->purgeCachedEntries();
     sharedFileUtils->setFilenameLookupDictionary(ValueMap());
     FileUtilsDemo::onExit();
@@ -1052,30 +1041,33 @@ std::string TestUnicodePath::subtitle() const
 void TestIsFileExistAsync::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s               = Director::getInstance()->getWinSize();
     auto sharedFileUtils = FileUtils::getInstance();
-    
+
     sharedFileUtils->isFileExist("Images/grossini.png", [=](bool isExist) {
-        CCASSERT(std::this_thread::get_id() == Director::getInstance()->getCocos2dThreadId(), "Callback should be on cocos thread");
-        auto label = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20);
-        label->setPosition(s.width/2, s.height/3);
+        CCASSERT(std::this_thread::get_id() == Director::getInstance()->getCocos2dThreadId(),
+                 "Callback should be on cocos thread");
+        auto label = Label::createWithSystemFont(
+            isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20);
+        label->setPosition(s.width / 2, s.height / 3);
         this->addChild(label);
-        
+
         isExist = sharedFileUtils->isFileExist("Images/grossini.xcf");
-        label = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20);
-        label->setPosition(s.width/2, s.height/3*2);
+        label   = Label::createWithSystemFont(
+              isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20);
+        label->setPosition(s.width / 2, s.height / 3 * 2);
         this->addChild(label);
     });
 }
 
 void TestIsFileExistAsync::onExit()
 {
-    
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
-    
+
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
+
     // reset filename lookup
     sharedFileUtils->setFilenameLookupDictionary(ValueMap());
-    
+
     FileUtilsDemo::onExit();
 }
 
@@ -1092,18 +1084,17 @@ std::string TestIsFileExistAsync::subtitle() const
 void TestIsDirectoryExistAsync::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s    = Director::getInstance()->getWinSize();
     auto util = FileUtils::getInstance();
-    int x = s.width/2, y = s.height/3;
-    
+    int x = s.width / 2, y = s.height / 3;
+
     std::string dir;
-    auto getMsg = [](bool b, const std::string& dir)-> std::string
-    {
+    auto getMsg = [](bool b, std::string_view dir) -> std::string {
         char msg[512];
-        snprintf((char *)msg, 512, "%s for dir: \"%s\"", b ? "success" : "failed", dir.c_str());
+        snprintf((char*)msg, 512, "%s for dir: \"%s\"", b ? "success" : "failed", dir.data());
         return std::string(msg);
     };
-    
+
     dir = util->getWritablePath();
     util->isDirectoryExist(dir, [=](bool exists) {
         CCAssert(exists, "Writable path should exist");
@@ -1115,12 +1106,12 @@ void TestIsDirectoryExistAsync::onEnter()
 
 void TestIsDirectoryExistAsync::onExit()
 {
-    
-    FileUtils *sharedFileUtils = FileUtils::getInstance();
-    
+
+    FileUtils* sharedFileUtils = FileUtils::getInstance();
+
     // reset filename lookup
     sharedFileUtils->purgeCachedEntries();
-    
+
     FileUtilsDemo::onExit();
 }
 
@@ -1137,41 +1128,39 @@ std::string TestIsDirectoryExistAsync::subtitle() const
 void TestFileFuncsAsync::onEnter()
 {
     FileUtilsDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s               = Director::getInstance()->getWinSize();
     auto sharedFileUtils = FileUtils::getInstance();
-    
-    int x = s.width/2,
-    y = s.height/5;
-    
-    std::string filename = "__test.test";
+
+    int x = s.width / 2, y = s.height / 5;
+
+    std::string filename  = "__test.test";
     std::string filename2 = "__newtest.test";
-    std::string filepath = sharedFileUtils->getWritablePath() + filename;
-    std::string content = "Test string content to put into created file";
+    std::string filepath  = sharedFileUtils->getWritablePath() + filename;
+    std::string content   = "Test string content to put into created file";
     std::string msg;
-    
-    FILE *out = fopen(filepath.c_str(), "w");
+
+    FILE* out = fopen(filepath.c_str(), "w");
     fputs(content.c_str(), out);
     fclose(out);
-    
-    
+
     sharedFileUtils->isFileExist(filepath, [=](bool exists) {
         CCASSERT(exists, "File could not be found");
         auto label = Label::createWithSystemFont("Test file '__test.test' created", "", 20);
         label->setPosition(x, y * 4);
         this->addChild(label);
-        
+
         sharedFileUtils->getFileSize(filepath, [=](int32_t size) {
-            auto msg = StringUtils::format("getFileSize: Test file size equals %d", size);
+            auto msg   = StringUtils::format("getFileSize: Test file size equals %d", size);
             auto label = Label::createWithSystemFont(msg, "", 20);
             label->setPosition(x, y * 3);
             this->addChild(label);
-            
-            sharedFileUtils->renameFile(sharedFileUtils->getWritablePath(), filename, filename2, [=] (bool success) {
+
+            sharedFileUtils->renameFile(sharedFileUtils->getWritablePath(), filename, filename2, [=](bool success) {
                 CCASSERT(success, "Was not able to properly rename file");
                 auto label = Label::createWithSystemFont("renameFile: Test file renamed to  '__newtest.test'", "", 20);
                 label->setPosition(x, y * 2);
                 this->addChild(label);
-                
+
                 sharedFileUtils->removeFile(sharedFileUtils->getWritablePath() + filename2, [=](bool success) {
                     CCASSERT(success, "Was not able to remove file");
                     auto label = Label::createWithSystemFont("removeFile: Test file removed", "", 20);
@@ -1180,7 +1169,6 @@ void TestFileFuncsAsync::onEnter()
                 });
             });
         });
-
     });
 }
 
@@ -1197,32 +1185,33 @@ std::string TestFileFuncsAsync::subtitle() const
 void TestWriteStringAsync::onEnter()
 {
     FileUtilsDemo::onEnter();
-    
+
     auto winSize = Director::getInstance()->getWinSize();
-    
+
     auto writeResult = Label::createWithTTF("show writeResult", "fonts/Thonburi.ttf", 18);
     this->addChild(writeResult);
     writeResult->setPosition(winSize.width / 2, winSize.height * 3 / 4);
-    
+
     auto readResult = Label::createWithTTF("show readResult", "fonts/Thonburi.ttf", 18);
     this->addChild(readResult);
     readResult->setPosition(winSize.width / 2, winSize.height / 3);
-    
+
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fileName = "writeStringTest.txt";
-    
+    std::string fileName     = "writeStringTest.txt";
+
     // writeTest
     std::string writeDataStr = "the string data will be write into a file";
-    std::string fullPath = writablePath + fileName;
-    
-    FileUtils::getInstance()->writeStringToFile(writeDataStr, fullPath, [=](bool success)
-    {
+    std::string fullPath     = writablePath + fileName;
+
+    FileUtils::getInstance()->writeStringToFile(writeDataStr, fullPath, [=](bool success) {
         CCASSERT(success, "Write String to data failed");
         writeResult->setString("write success:" + writeDataStr);
 
-        FileUtils::getInstance()->getStringFromFile(fullPath, [=](const std::string& value) {
+        FileUtils::getInstance()->getStringFromFile(fullPath, [=](std::string_view value) {
             CCASSERT(!value.empty(), "String should be readable");
-            readResult->setString("read success: " + value);
+
+            std::string strVal = "read success: ";
+            readResult->setString(strVal.append(value));
         });
     });
 }
@@ -1257,25 +1246,24 @@ void TestWriteDataAsync::onEnter()
     readResult->setPosition(winSize.width / 2, winSize.height / 3);
 
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
-    std::string fileName = "writeDataTest.txt";
+    std::string fileName     = "writeDataTest.txt";
 
     // writeTest
     std::string writeDataStr = "the binary data will be write into a file";
     Data writeData;
-    writeData.copy((unsigned char *)writeDataStr.c_str(), writeDataStr.size());
+    writeData.copy((unsigned char*)writeDataStr.c_str(), writeDataStr.size());
     std::string fullPath = writablePath + fileName;
 
-
     FileUtils::getInstance()->writeDataToFile(writeData, fullPath, [=](bool success) {
         if (success)
         {
             writeResult->setString("Write result success");
-        } 
+        }
         else
         {
             writeResult->setString("Write result failure");
         }
-        
+
         FileUtils::getInstance()->getDataFromFile(fullPath, [=](const Data& readData) {
             auto buffer = (unsigned char*)malloc(sizeof(unsigned char) * (readData.getSize() + 1));
             memcpy(buffer, readData.getBytes(), readData.getSize());
@@ -1318,24 +1306,23 @@ void TestListFiles::onEnter()
     cntLabel->setPosition(winSize.width / 2, winSize.height / 3);
     // writeTest
     std::vector<std::string> listFonts = FileUtils::getInstance()->listFiles("fonts");
-    auto defaultPath = FileUtils::getInstance()->getDefaultResourceRootPath();
-    std::vector<std::string> list = FileUtils::getInstance()->listFiles (defaultPath);
+    auto defaultPath                   = FileUtils::getInstance()->getDefaultResourceRootPath();
+    std::vector<std::string> list      = FileUtils::getInstance()->listFiles(defaultPath);
 
-    char cntBuffer[200] = { 0 };
-    snprintf(cntBuffer, 200, "'fonts/' %zu, $defaultResourceRootPath %zu",listFonts.size(), list.size());
+    char cntBuffer[200] = {0};
+    snprintf(cntBuffer, 200, "'fonts/' %zu, $defaultResourceRootPath %zu", listFonts.size(), list.size());
 
-    for(int i=0;i<listFonts.size();i++)
+    for (int i = 0; i < listFonts.size(); i++)
     {
         CCLOG("fonts/ %d: \t %s", i, listFonts[i].c_str());
     }
 
-    for(int i=0;i<list.size();i++)
+    for (int i = 0; i < list.size(); i++)
     {
         CCLOG("defResRootPath %d: \t %s", i, list[i].c_str());
     }
 
     cntLabel->setString(cntBuffer);
-
 }
 
 void TestListFiles::onExit()
@@ -1353,8 +1340,6 @@ std::string TestListFiles::subtitle() const
     return "";
 }
 
-
-
 void TestIsFileExistRejectFolder::onEnter()
 {
     FileUtilsDemo::onEnter();
@@ -1368,14 +1353,13 @@ void TestIsFileExistRejectFolder::onEnter()
     auto cntLabel = Label::createWithTTF("waiting...", "fonts/Thonburi.ttf", 18);
     this->addChild(cntLabel);
     cntLabel->setPosition(winSize.width / 2, winSize.height / 3);
-    
-    auto exists = FileUtils::getInstance()->isFileExist("NavMesh/maps");
+
+    auto exists      = FileUtils::getInstance()->isFileExist("NavMesh/maps");
     auto isDirectory = FileUtils::getInstance()->isDirectoryExist("NavMesh/maps");
 
-    char cntBuffer[200] = { 0 };
-    snprintf(cntBuffer, 200, "isDir: %s, isFile: %s", isDirectory ? "true": "false" , exists ? "true" : "false");
+    char cntBuffer[200] = {0};
+    snprintf(cntBuffer, 200, "isDir: %s, isFile: %s", isDirectory ? "true" : "false", exists ? "true" : "false");
     cntLabel->setString(cntBuffer);
-
 }
 
 void TestIsFileExistRejectFolder::onExit()
diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h
index ead129feaca9..4187f38aedbd 100644
--- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h
+++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,6 @@
 
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(FileUtilsTests);
 
 class FileUtilsDemo : public TestCase
@@ -44,6 +43,7 @@ class TestResolutionDirectories : public FileUtilsDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     std::vector<std::string> _defaultSearchPathArray;
     std::vector<std::string> _defaultResolutionsOrderArray;
@@ -58,6 +58,7 @@ class TestSearchPath : public FileUtilsDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     std::vector<std::string> _defaultSearchPathArray;
     std::vector<std::string> _defaultResolutionsOrderArray;
@@ -135,6 +136,7 @@ class TestGetContents : public FileUtilsDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     std::string _generatedFile;
 };
@@ -187,7 +189,7 @@ class TestIsFileExistAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestIsFileExistAsync);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
     virtual std::string title() const override;
@@ -198,7 +200,7 @@ class TestIsDirectoryExistAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestIsDirectoryExistAsync);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
     virtual std::string title() const override;
@@ -209,7 +211,7 @@ class TestFileFuncsAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestFileFuncsAsync);
-    
+
     virtual void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -219,7 +221,7 @@ class TestDirectoryFuncsAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestDirectoryFuncsAsync);
-    
+
     virtual void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -229,7 +231,7 @@ class TestWriteStringAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestWriteStringAsync);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
     virtual std::string title() const override;
@@ -240,7 +242,7 @@ class TestWriteDataAsync : public FileUtilsDemo
 {
 public:
     CREATE_FUNC(TestWriteDataAsync);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
     virtual std::string title() const override;
diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.cpp b/tests/cpp-tests/Classes/FontTest/FontTest.cpp
index 6e131ce06f21..f47dd7a77568 100644
--- a/tests/cpp-tests/Classes/FontTest/FontTest.cpp
+++ b/tests/cpp-tests/Classes/FontTest/FontTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,62 +29,65 @@
 
 USING_NS_CC;
 
-enum {
+enum
+{
     kTagLabel1,
     kTagLabel2,
     kTagLabel3,
     kTagLabel4,
-    
+
     kTagColor1,
     kTagColor2,
     kTagColor3,
 };
 
-//you don't need any ifdef anymore
-static std::string fontList[] =
-{
-    "fonts/A Damn Mess.ttf",
-    "fonts/Abberancy.ttf",
-    "fonts/Abduction.ttf",
-    "fonts/Paint Boy.ttf",
-    "fonts/Schwarzwald.ttf",
-    "fonts/Scissor Cuts.ttf",
+// you don't need any ifdef anymore
+static std::string fontList[] = {
+    "fonts/A Damn Mess.ttf", "fonts/Abberancy.ttf",   "fonts/Abduction.ttf",
+    "fonts/Paint Boy.ttf",   "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf",
 };
 
-static int vAlignIdx = 0;
-static TextVAlignment verticalAlignment[] =
-{
+static int vAlignIdx                      = 0;
+static TextVAlignment verticalAlignment[] = {
     TextVAlignment::TOP,
     TextVAlignment::CENTER,
     TextVAlignment::BOTTOM,
 };
 
-
 FontTests::FontTests()
 {
     for (auto& fontFile : fontList)
     {
-        addTestCase("FontTests", [&](){vAlignIdx = 0; return FontTest::create(fontFile); });
+        addTestCase("FontTests", [&]() {
+            vAlignIdx = 0;
+            return FontTest::create(fontFile);
+        });
     }
-    
+
     for (auto& fontFile : fontList)
     {
-        addTestCase("FontTests", [&](){ vAlignIdx = 1;  return FontTest::create(fontFile); });
+        addTestCase("FontTests", [&]() {
+            vAlignIdx = 1;
+            return FontTest::create(fontFile);
+        });
     }
-    
+
     for (auto& fontFile : fontList)
     {
-        addTestCase("FontTests", [&](){vAlignIdx = 2; return FontTest::create(fontFile); });
+        addTestCase("FontTests", [&]() {
+            vAlignIdx = 2;
+            return FontTest::create(fontFile);
+        });
     }
-	ADD_TEST_CASE(FontNoReplacementTest);
-	ADD_TEST_CASE(FontReplacementTest);
+    ADD_TEST_CASE(FontNoReplacementTest);
+    ADD_TEST_CASE(FontReplacementTest);
 }
 
-void FontTest::showFont(const std::string& fontFile)
+void FontTest::showFont(std::string_view fontFile)
 {
     auto s = Director::getInstance()->getWinSize();
 
-    auto blockSize = Size(s.width/3, 200);
+    auto blockSize = Size(s.width / 3, 200);
     float fontSize = 26;
 
     removeChildByTag(kTagLabel1, true);
@@ -95,37 +98,36 @@ void FontTest::showFont(const std::string& fontFile)
     removeChildByTag(kTagColor2, true);
     removeChildByTag(kTagColor3, true);
 
-    auto top = Label::createWithSystemFont(fontFile, fontFile, 24);
-    auto left = Label::createWithSystemFont("alignment left", fontFile, fontSize,
-                                          blockSize, TextHAlignment::LEFT, verticalAlignment[vAlignIdx]);
-    auto center = Label::createWithSystemFont("alignment center", fontFile, fontSize,
-                                            blockSize, TextHAlignment::CENTER, verticalAlignment[vAlignIdx]);
-    auto right = Label::createWithSystemFont("alignment right", fontFile, fontSize,
-                                           blockSize, TextHAlignment::RIGHT, verticalAlignment[vAlignIdx]);
+    auto top    = Label::createWithSystemFont(fontFile, fontFile, 24);
+    auto left   = Label::createWithSystemFont("alignment left", fontFile, fontSize, blockSize, TextHAlignment::LEFT,
+                                              verticalAlignment[vAlignIdx]);
+    auto center = Label::createWithSystemFont("alignment center", fontFile, fontSize, blockSize, TextHAlignment::CENTER,
+                                              verticalAlignment[vAlignIdx]);
+    auto right  = Label::createWithSystemFont("alignment right", fontFile, fontSize, blockSize, TextHAlignment::RIGHT,
+                                              verticalAlignment[vAlignIdx]);
 
-    auto leftColor = LayerColor::create(Color4B(100, 100, 100, 255), blockSize.width, blockSize.height);
+    auto leftColor   = LayerColor::create(Color4B(100, 100, 100, 255), blockSize.width, blockSize.height);
     auto centerColor = LayerColor::create(Color4B(200, 100, 100, 255), blockSize.width, blockSize.height);
-    auto rightColor = LayerColor::create(Color4B(100, 100, 200, 255), blockSize.width, blockSize.height);
+    auto rightColor  = LayerColor::create(Color4B(100, 100, 200, 255), blockSize.width, blockSize.height);
 
     leftColor->setIgnoreAnchorPointForPosition(false);
     centerColor->setIgnoreAnchorPointForPosition(false);
     rightColor->setIgnoreAnchorPointForPosition(false);
 
-
     top->setAnchorPoint(Vec2(0.5, 1));
-    left->setAnchorPoint(Vec2(0,0.5));
-    leftColor->setAnchorPoint(Vec2(0,0.5));
-    center->setAnchorPoint(Vec2(0,0.5));
-    centerColor->setAnchorPoint(Vec2(0,0.5));
-    right->setAnchorPoint(Vec2(0,0.5));
-    rightColor->setAnchorPoint(Vec2(0,0.5));
-
-    top->setPosition(s.width/2,s.height-20);
-    left->setPosition(0,s.height/2);
+    left->setAnchorPoint(Vec2(0, 0.5));
+    leftColor->setAnchorPoint(Vec2(0, 0.5));
+    center->setAnchorPoint(Vec2(0, 0.5));
+    centerColor->setAnchorPoint(Vec2(0, 0.5));
+    right->setAnchorPoint(Vec2(0, 0.5));
+    rightColor->setAnchorPoint(Vec2(0, 0.5));
+
+    top->setPosition(s.width / 2, s.height - 20);
+    left->setPosition(0, s.height / 2);
     leftColor->setPosition(left->getPosition());
-    center->setPosition(blockSize.width, s.height/2);
+    center->setPosition(blockSize.width, s.height / 2);
     centerColor->setPosition(center->getPosition());
-    right->setPosition(blockSize.width*2, s.height/2);
+    right->setPosition(blockSize.width * 2, s.height / 2);
     rightColor->setPosition(right->getPosition());
 
     this->addChild(leftColor, -1, kTagColor1);
@@ -144,138 +146,136 @@ std::string FontTest::title() const
 
 FontNoReplacementTest* FontNoReplacementTest::create()
 {
-	auto ret = new FontNoReplacementTest;
-	if (ret->init())
-	{
-		ret->autorelease();
-	}
-	else
-	{
-		delete ret;
-		ret = nullptr;
-	}
-
-	return ret;
+    auto ret = new FontNoReplacementTest;
+    if (ret->init())
+    {
+        ret->autorelease();
+    }
+    else
+    {
+        delete ret;
+        ret = nullptr;
+    }
+
+    return ret;
 }
 
 FontNoReplacementTest::FontNoReplacementTest()
 {
-	_replace = false;
+    _replace = false;
 }
 
 FontNoReplacementTest::~FontNoReplacementTest()
 {
-	// need to clear the caches since we change the lookup dictionary after the application init.
-	FontAtlasCache::unloadFontAtlasTTF("fonts/A Damn Mess.ttf");
-	FontFreeType::releaseFont("fonts/A Damn Mess.ttf");
-	FontAtlasCache::unloadFontAtlasTTF("fonts/Abberancy.ttf");
-	FontFreeType::releaseFont("fonts/Abberancy.ttf");
-	FontAtlasCache::unloadFontAtlasTTF("fonts/Abduction.ttf");
-	FontFreeType::releaseFont("fonts/Abduction.ttf");
-	FontAtlasCache::unloadFontAtlasTTF("fonts/Schwarzwald.ttf");
-	FontFreeType::releaseFont("fonts/Schwarzwald.ttf");
-	FileUtils::getInstance()->setFilenameLookupDictionary(ValueMap());
+    // need to clear the caches since we change the lookup dictionary after the application init.
+    FontAtlasCache::unloadFontAtlasTTF("fonts/A Damn Mess.ttf");
+    FontFreeType::releaseFont("fonts/A Damn Mess.ttf");
+    FontAtlasCache::unloadFontAtlasTTF("fonts/Abberancy.ttf");
+    FontFreeType::releaseFont("fonts/Abberancy.ttf");
+    FontAtlasCache::unloadFontAtlasTTF("fonts/Abduction.ttf");
+    FontFreeType::releaseFont("fonts/Abduction.ttf");
+    FontAtlasCache::unloadFontAtlasTTF("fonts/Schwarzwald.ttf");
+    FontFreeType::releaseFont("fonts/Schwarzwald.ttf");
+    FileUtils::getInstance()->setFilenameLookupDictionary(ValueMap());
 }
 
 void FontNoReplacementTest::onEnter()
 {
-	TestCase::onEnter();
-
-	std::string suffix;
-	if (_replace)
-	{
-		ValueMap dict{
-			{ "fonts/A Damn Mess.ttf", Value("fonts/arial.ttf") },
-			{ "fonts/Abberancy.ttf", Value("fonts/arial.ttf") },
-			{ "fonts/Abduction.ttf", Value("fonts/arial.ttf") },
-			{ "fonts/Schwarzwald.ttf", Value("fonts/arial.ttf") }
-		};
-
-		FileUtils::getInstance()->setFilenameLookupDictionary(dict);
-		suffix = " replaced by arial.ttf";
-	}
-
-	auto s = Director::getInstance()->getWinSize();
-
-	auto blockSize = Size(s.width / 3, 200);
-	float fontSize = 26;
-
-	removeChildByTag(kTagLabel1, true);
-	removeChildByTag(kTagLabel2, true);
-	removeChildByTag(kTagLabel3, true);
-	removeChildByTag(kTagLabel4, true);
-	removeChildByTag(kTagColor1, true);
-	removeChildByTag(kTagColor2, true);
-	removeChildByTag(kTagColor3, true);
-
-	auto top = Label::createWithTTF("fonts/A Damn Mess.ttf" + suffix, "fonts/A Damn Mess.ttf", 24);
-	auto left = Label::createWithTTF("fonts/Abberancy.ttf" + suffix, "fonts/Abberancy.ttf", fontSize,
-		blockSize, TextHAlignment::LEFT, verticalAlignment[0]);
-	auto center = Label::createWithTTF("fonts/Abduction.ttf" + suffix, "fonts/Abduction.ttf", fontSize,
-		blockSize, TextHAlignment::CENTER, verticalAlignment[0]);
-	auto right = Label::createWithTTF("fonts/Schwarzwald.ttf" + suffix, "fonts/Schwarzwald.ttf", fontSize,
-		blockSize, TextHAlignment::RIGHT, verticalAlignment[0]);
-
-	auto leftColor = LayerColor::create(Color4B(100, 100, 100, 255), blockSize.width, blockSize.height);
-	auto centerColor = LayerColor::create(Color4B(200, 100, 100, 255), blockSize.width, blockSize.height);
-	auto rightColor = LayerColor::create(Color4B(100, 100, 200, 255), blockSize.width, blockSize.height);
-
-	leftColor->setIgnoreAnchorPointForPosition(false);
-	centerColor->setIgnoreAnchorPointForPosition(false);
-	rightColor->setIgnoreAnchorPointForPosition(false);
-
-	top->setAnchorPoint(Vec2(0.5, 1));
-	left->setAnchorPoint(Vec2(0, 0.5));
-	leftColor->setAnchorPoint(Vec2(0, 0.5));
-	center->setAnchorPoint(Vec2(0, 0.5));
-	centerColor->setAnchorPoint(Vec2(0, 0.5));
-	right->setAnchorPoint(Vec2(0, 0.5));
-	rightColor->setAnchorPoint(Vec2(0, 0.5));
-
-	top->setPosition(s.width / 2, s.height - 20);
-	left->setPosition(0, s.height / 2);
-	leftColor->setPosition(left->getPosition());
-	center->setPosition(blockSize.width, s.height / 2);
-	centerColor->setPosition(center->getPosition());
-	right->setPosition(blockSize.width * 2, s.height / 2);
-	rightColor->setPosition(right->getPosition());
-
-	this->addChild(leftColor, -1, kTagColor1);
-	this->addChild(left, 0, kTagLabel1);
-	this->addChild(rightColor, -1, kTagColor2);
-	this->addChild(right, 0, kTagLabel2);
-	this->addChild(centerColor, -1, kTagColor3);
-	this->addChild(center, 0, kTagLabel3);
-	this->addChild(top, 0, kTagLabel4);
+    TestCase::onEnter();
+
+    std::string suffix;
+    if (_replace)
+    {
+        ValueMap dict{{"fonts/A Damn Mess.ttf", Value("fonts/arial.ttf")},
+                      {"fonts/Abberancy.ttf", Value("fonts/arial.ttf")},
+                      {"fonts/Abduction.ttf", Value("fonts/arial.ttf")},
+                      {"fonts/Schwarzwald.ttf", Value("fonts/arial.ttf")}};
+
+        FileUtils::getInstance()->setFilenameLookupDictionary(dict);
+        suffix = " replaced by arial.ttf";
+    }
+
+    auto s = Director::getInstance()->getWinSize();
+
+    auto blockSize = Size(s.width / 3, 200);
+    float fontSize = 26;
+
+    removeChildByTag(kTagLabel1, true);
+    removeChildByTag(kTagLabel2, true);
+    removeChildByTag(kTagLabel3, true);
+    removeChildByTag(kTagLabel4, true);
+    removeChildByTag(kTagColor1, true);
+    removeChildByTag(kTagColor2, true);
+    removeChildByTag(kTagColor3, true);
+
+    auto top    = Label::createWithTTF("fonts/A Damn Mess.ttf" + suffix, "fonts/A Damn Mess.ttf", 24);
+    auto left   = Label::createWithTTF("fonts/Abberancy.ttf" + suffix, "fonts/Abberancy.ttf", fontSize, blockSize,
+                                       TextHAlignment::LEFT, verticalAlignment[0]);
+    auto center = Label::createWithTTF("fonts/Abduction.ttf" + suffix, "fonts/Abduction.ttf", fontSize, blockSize,
+                                       TextHAlignment::CENTER, verticalAlignment[0]);
+    auto right  = Label::createWithTTF("fonts/Schwarzwald.ttf" + suffix, "fonts/Schwarzwald.ttf", fontSize, blockSize,
+                                       TextHAlignment::RIGHT, verticalAlignment[0]);
+
+    auto leftColor   = LayerColor::create(Color4B(100, 100, 100, 255), blockSize.width, blockSize.height);
+    auto centerColor = LayerColor::create(Color4B(200, 100, 100, 255), blockSize.width, blockSize.height);
+    auto rightColor  = LayerColor::create(Color4B(100, 100, 200, 255), blockSize.width, blockSize.height);
+
+    leftColor->setIgnoreAnchorPointForPosition(false);
+    centerColor->setIgnoreAnchorPointForPosition(false);
+    rightColor->setIgnoreAnchorPointForPosition(false);
+
+    top->setAnchorPoint(Vec2(0.5, 1));
+    left->setAnchorPoint(Vec2(0, 0.5));
+    leftColor->setAnchorPoint(Vec2(0, 0.5));
+    center->setAnchorPoint(Vec2(0, 0.5));
+    centerColor->setAnchorPoint(Vec2(0, 0.5));
+    right->setAnchorPoint(Vec2(0, 0.5));
+    rightColor->setAnchorPoint(Vec2(0, 0.5));
+
+    top->setPosition(s.width / 2, s.height - 20);
+    left->setPosition(0, s.height / 2);
+    leftColor->setPosition(left->getPosition());
+    center->setPosition(blockSize.width, s.height / 2);
+    centerColor->setPosition(center->getPosition());
+    right->setPosition(blockSize.width * 2, s.height / 2);
+    rightColor->setPosition(right->getPosition());
+
+    this->addChild(leftColor, -1, kTagColor1);
+    this->addChild(left, 0, kTagLabel1);
+    this->addChild(rightColor, -1, kTagColor2);
+    this->addChild(right, 0, kTagLabel2);
+    this->addChild(centerColor, -1, kTagColor3);
+    this->addChild(center, 0, kTagLabel3);
+    this->addChild(top, 0, kTagLabel4);
 }
 
 std::string FontNoReplacementTest::title() const
 {
-	return "Font no replacement test";
+    return "Font no replacement test";
 }
 
 FontReplacementTest* FontReplacementTest::create()
 {
-	auto ret = new FontReplacementTest;
-	if (ret->init())
-	{
-		ret->autorelease();
-	}
-	else
-	{
-		delete ret;
-		ret = nullptr;
-	}
-
-	return ret;
+    auto ret = new FontReplacementTest;
+    if (ret->init())
+    {
+        ret->autorelease();
+    }
+    else
+    {
+        delete ret;
+        ret = nullptr;
+    }
+
+    return ret;
 }
 
 FontReplacementTest::FontReplacementTest()
 {
-	_replace = true;
+    _replace = true;
 }
 
 std::string FontReplacementTest::title() const
 {
-	return "Font replacement test";
+    return "Font replacement test";
 }
diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.h b/tests/cpp-tests/Classes/FontTest/FontTest.h
index 2659dd5a15ee..d7dc5a5b3367 100644
--- a/tests/cpp-tests/Classes/FontTest/FontTest.h
+++ b/tests/cpp-tests/Classes/FontTest/FontTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,7 @@ DEFINE_TEST_SUITE(FontTests);
 class FontTest : public TestCase
 {
 public:
-    static FontTest* create(const std::string& fontFile)
+    static FontTest* create(std::string_view fontFile)
     {
         auto ret = new FontTest;
         if (ret->init())
@@ -50,7 +50,7 @@ class FontTest : public TestCase
         return ret;
     }
 
-    void showFont(const std::string& fontFile);
+    void showFont(std::string_view fontFile);
 
     virtual std::string title() const override;
 };
@@ -58,23 +58,25 @@ class FontTest : public TestCase
 class FontNoReplacementTest : public TestCase
 {
 public:
-	static FontNoReplacementTest* create();
-	~FontNoReplacementTest();
-	virtual void onEnter() override;
-	virtual std::string title() const override;
+    static FontNoReplacementTest* create();
+    ~FontNoReplacementTest();
+    virtual void onEnter() override;
+    virtual std::string title() const override;
+
 protected:
-	FontNoReplacementTest();
+    FontNoReplacementTest();
 
-	bool _replace;
+    bool _replace;
 };
 
 class FontReplacementTest : public FontNoReplacementTest
 {
 public:
-	static FontReplacementTest* create();
-	virtual std::string title() const override;
+    static FontReplacementTest* create();
+    virtual std::string title() const override;
+
 protected:
-	FontReplacementTest();
+    FontReplacementTest();
 };
 
-#endif // _FONT_TEST_H_
+#endif  // _FONT_TEST_H_
diff --git a/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.cpp b/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.cpp
index cbf141f585dc..575a3d35525c 100644
--- a/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.cpp
+++ b/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.cpp
@@ -8,15 +8,15 @@ USING_NS_CC_EXT;
 
 #if defined(CC_PLATFORM_PC)
 
-static bool show_test_window = true;
+static bool show_test_window    = true;
 static bool show_another_window = true;
-static ImVec4 clear_color = ImColor(114, 144, 154);
+static ImVec4 clear_color       = ImColor(114, 144, 154);
 
 ImGuiEXTTests::ImGuiEXTTests()
 {
-    // Resize (expand) window 
+    // Resize (expand) window
     static Size resourceSize(1280, 720);
-    auto director = Director::getInstance();
+    auto director    = Director::getInstance();
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setWindowed(resourceSize.width, resourceSize.height);
 
@@ -50,9 +50,12 @@ void ImGuiEXTTest::onDrawImGui()
         ImGui::Text("Hello, world!");
         ImGui::SliderFloat("float", &f, 0.0f, 1.0f);
         ImGui::ColorEdit3("clear color", (float*)&clear_color);
-        if (ImGui::Button("Test Window")) show_test_window ^= 1;
-        if (ImGui::Button("Another Window")) show_another_window ^= 1;
-        ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
+        if (ImGui::Button("Test Window"))
+            show_test_window ^= 1;
+        if (ImGui::Button("Another Window"))
+            show_another_window ^= 1;
+        ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate,
+                    ImGui::GetIO().Framerate);
     }
 
     // 2. Show another simple window, this time using an explicit Begin/End pair
diff --git a/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.h b/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.h
index c3c60ca57f3f..e55ff3821b11 100644
--- a/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.h
+++ b/tests/cpp-tests/Classes/ImGuiEXTTest/ImGuiEXTTest.h
@@ -47,4 +47,4 @@ class ImGuiEXTTest : public TestCase
 
 #endif
 
-#endif // _CURL_TEST_H_
+#endif  // _CURL_TEST_H_
diff --git a/tests/cpp-tests/Classes/InputTest/MouseTest.cpp b/tests/cpp-tests/Classes/InputTest/MouseTest.cpp
index c810030515bd..c39e1da6fdeb 100644
--- a/tests/cpp-tests/Classes/InputTest/MouseTest.cpp
+++ b/tests/cpp-tests/Classes/InputTest/MouseTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,7 +26,13 @@
 
 USING_NS_CC;
 
-template <typename T> std::string tostr(const T& t) { std::ostringstream os; os<<t; return os.str(); }
+template <typename T>
+std::string tostr(const T& t)
+{
+    std::ostringstream os;
+    os << t;
+    return os.str();
+}
 
 MouseTests::MouseTests()
 {
@@ -43,21 +49,20 @@ MouseEventTest::MouseEventTest()
 {
     auto s = Director::getInstance()->getWinSize();
 
-    //Create a label to display the mouse action
+    // Create a label to display the mouse action
     _labelAction = Label::createWithTTF("Click mouse button and see this change", "fonts/arial.ttf", 22);
-    _labelAction->setPosition(Vec2(s.width/2, s.height*2/3));
+    _labelAction->setPosition(Vec2(s.width / 2, s.height * 2 / 3));
     addChild(_labelAction, 0);
 
-    //Create a label to display the mouse position
+    // Create a label to display the mouse position
     _labelPosition = Label::createWithTTF("Mouse not supported on this device", "fonts/arial.ttf", 22);
-    _labelPosition->setPosition(Vec2(s.width/2, s.height/3));
+    _labelPosition->setPosition(Vec2(s.width / 2, s.height / 3));
     addChild(_labelPosition);
 
-
-    _mouseListener = EventListenerMouse::create();
-    _mouseListener->onMouseMove = CC_CALLBACK_1(MouseEventTest::onMouseMove, this);
-    _mouseListener->onMouseUp = CC_CALLBACK_1(MouseEventTest::onMouseUp, this);
-    _mouseListener->onMouseDown = CC_CALLBACK_1(MouseEventTest::onMouseDown, this);
+    _mouseListener                = EventListenerMouse::create();
+    _mouseListener->onMouseMove   = CC_CALLBACK_1(MouseEventTest::onMouseMove, this);
+    _mouseListener->onMouseUp     = CC_CALLBACK_1(MouseEventTest::onMouseUp, this);
+    _mouseListener->onMouseDown   = CC_CALLBACK_1(MouseEventTest::onMouseDown, this);
     _mouseListener->onMouseScroll = CC_CALLBACK_1(MouseEventTest::onMouseScroll, this);
 
     _eventDispatcher->addEventListenerWithSceneGraphPriority(_mouseListener, this);
@@ -68,35 +73,35 @@ MouseEventTest::~MouseEventTest()
     _eventDispatcher->removeEventListener(_mouseListener);
 }
 
-void MouseEventTest::onMouseDown(Event *event)
+void MouseEventTest::onMouseDown(Event* event)
 {
-    EventMouse* e = (EventMouse*)event;
+    EventMouse* e   = (EventMouse*)event;
     std::string str = "Mouse Down detected, Key: ";
     str += tostr(static_cast<int>(e->getMouseButton()));
     _labelAction->setString(str.c_str());
 }
 
-void MouseEventTest::onMouseUp(Event *event)
+void MouseEventTest::onMouseUp(Event* event)
 {
-    EventMouse* e = (EventMouse*)event;
+    EventMouse* e   = (EventMouse*)event;
     std::string str = "Mouse Up detected, Key: ";
     str += tostr(static_cast<int>(e->getMouseButton()));
     _labelAction->setString(str.c_str());
 }
 
-void MouseEventTest::onMouseMove(Event *event)
+void MouseEventTest::onMouseMove(Event* event)
 {
-    EventMouse* e = (EventMouse*)event;
+    EventMouse* e   = (EventMouse*)event;
     std::string str = "MousePosition X:";
-    str = str + tostr(e->getCursorX()) + " Y:" + tostr(e->getCursorY());
+    str             = str + tostr(e->getCursorX()) + " Y:" + tostr(e->getCursorY());
     _labelPosition->setString(str.c_str());
 }
 
-void MouseEventTest::onMouseScroll(Event *event)
+void MouseEventTest::onMouseScroll(Event* event)
 {
-    EventMouse* e = (EventMouse*)event;
+    EventMouse* e   = (EventMouse*)event;
     std::string str = "Mouse Scroll detected, X: ";
-    str = str + tostr(e->getScrollX()) + " Y: " + tostr(e->getScrollY());
+    str             = str + tostr(e->getScrollX()) + " Y: " + tostr(e->getScrollY());
     _labelAction->setString(str.c_str());
 }
 
@@ -118,16 +123,12 @@ std::string MouseEventTest::subtitle() const
 
 HideMouseTest::HideMouseTest()
 {
-    
-    _lis = EventListenerMouse::create();
-    _lis->onMouseDown = [](Event* e){
-        Director::getInstance()->getOpenGLView()->setCursorVisible(false);
-    };
-    
-    _lis->onMouseUp = [](Event* e){
-        Director::getInstance()->getOpenGLView()->setCursorVisible(true);
-    };
-    
+
+    _lis              = EventListenerMouse::create();
+    _lis->onMouseDown = [](Event* e) { Director::getInstance()->getOpenGLView()->setCursorVisible(false); };
+
+    _lis->onMouseUp = [](Event* e) { Director::getInstance()->getOpenGLView()->setCursorVisible(true); };
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(_lis, this);
 }
 
@@ -145,4 +146,3 @@ std::string HideMouseTest::subtitle() const
 {
     return "Click to hide mouse";
 }
-
diff --git a/tests/cpp-tests/Classes/InputTest/MouseTest.h b/tests/cpp-tests/Classes/InputTest/MouseTest.h
index cc2162dad881..dd8be001f8f6 100644
--- a/tests/cpp-tests/Classes/InputTest/MouseTest.h
+++ b/tests/cpp-tests/Classes/InputTest/MouseTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,7 +33,6 @@ DEFINE_TEST_SUITE(MouseTests);
 class BaseMouseTest : public TestCase
 {
 public:
-    
 };
 
 class MouseEventTest : public BaseMouseTest
@@ -47,13 +46,13 @@ class MouseEventTest : public BaseMouseTest
     void onMouseUp(cocos2d::Event* event);
     void onMouseMove(cocos2d::Event* event);
     void onMouseScroll(cocos2d::Event* event);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 
 private:
-    cocos2d::Label*   _labelAction;
-    cocos2d::Label*   _labelPosition;
+    cocos2d::Label* _labelAction;
+    cocos2d::Label* _labelPosition;
     cocos2d::EventListenerMouse* _mouseListener;
 };
 
@@ -63,10 +62,10 @@ class HideMouseTest : public BaseMouseTest
     CREATE_FUNC(HideMouseTest);
     HideMouseTest();
     ~HideMouseTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::EventListenerMouse* _lis;
 };
diff --git a/tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp
index a998e7edeb60..16398102fe2d 100644
--- a/tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp
+++ b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,11 +27,11 @@
 
 USING_NS_CC;
 
-#define SID_STEP1    100
-#define SID_STEP2    101
-#define SID_STEP3    102
+#define SID_STEP1 100
+#define SID_STEP2 101
+#define SID_STEP3 102
 
-#define IDC_PAUSE    200
+#define IDC_PAUSE 200
 
 IntervalTests::IntervalTests()
 {
@@ -46,7 +46,7 @@ IntervalTest::IntervalTest()
     // sun
     auto sun = ParticleSun::create();
     sun->setTexture(Director::getInstance()->getTextureCache()->addImage("Images/fire.png"));
-    sun->setPosition(VisibleRect::rightTop().x-32,VisibleRect::rightTop().y-32);
+    sun->setPosition(VisibleRect::rightTop().x - 32, VisibleRect::rightTop().y - 32);
 
     sun->setTotalParticles(130);
     sun->setLife(0.6f);
@@ -60,43 +60,51 @@ IntervalTest::IntervalTest()
     _label4 = Label::createWithBMFont("fonts/bitmapFontTest4.fnt", "0");
 
     scheduleUpdate();
-    schedule([&](float dt){
-        _time1 +=dt;
-
-        char str[10] = {0};
-        sprintf(str, "%2.1f", _time1);
-        _label1->setString( str );
-    }, "step_1");
-
-    schedule([&](float dt){
-        _time2 +=dt;
-
-        char str[10] = {0};
-        sprintf(str, "%2.1f", _time2);
-        _label2->setString( str );
-    }, 0.5, "step_2");
-
-    schedule([&](float dt){
-        _time3 +=dt;
-
-        char str[10] = {0};
-        sprintf(str, "%2.1f", _time3);
-        _label3->setString( str );
-    }, 1, "step_3");
-
-    schedule([&](float dt){
-        _time4 +=dt;
-
-        char str[10] = {0};
-        sprintf(str, "%2.1f", _time4);
-        _label4->setString( str );
-    }, 2, "step_4");
-
-    _label0->setPosition(s.width*1/6, s.height/2);
-    _label1->setPosition(s.width*2/6, s.height/2);
-    _label2->setPosition(s.width*3/6, s.height/2);
-    _label3->setPosition(s.width*4/6, s.height/2);
-    _label4->setPosition(s.width*5/6, s.height/2);
+    schedule(
+        [&](float dt) {
+            _time1 += dt;
+
+            char str[10] = {0};
+            sprintf(str, "%2.1f", _time1);
+            _label1->setString(str);
+        },
+        "step_1");
+
+    schedule(
+        [&](float dt) {
+            _time2 += dt;
+
+            char str[10] = {0};
+            sprintf(str, "%2.1f", _time2);
+            _label2->setString(str);
+        },
+        0.5, "step_2");
+
+    schedule(
+        [&](float dt) {
+            _time3 += dt;
+
+            char str[10] = {0};
+            sprintf(str, "%2.1f", _time3);
+            _label3->setString(str);
+        },
+        1, "step_3");
+
+    schedule(
+        [&](float dt) {
+            _time4 += dt;
+
+            char str[10] = {0};
+            sprintf(str, "%2.1f", _time4);
+            _label4->setString(str);
+        },
+        2, "step_4");
+
+    _label0->setPosition(s.width * 1 / 6, s.height / 2);
+    _label1->setPosition(s.width * 2 / 6, s.height / 2);
+    _label2->setPosition(s.width * 3 / 6, s.height / 2);
+    _label3->setPosition(s.width * 4 / 6, s.height / 2);
+    _label4->setPosition(s.width * 5 / 6, s.height / 2);
 
     addChild(_label0);
     addChild(_label1);
@@ -107,27 +115,27 @@ IntervalTest::IntervalTest()
     // Sprite
     auto sprite = Sprite::create(s_pathGrossini);
     sprite->setPosition(VisibleRect::left().x + 40, VisibleRect::bottom().y + 50);
-    
-    auto jump = JumpBy::create(3, Vec2(s.width-80,0.0f), 50, 4);
-    
+
+    auto jump = JumpBy::create(3, Vec2(s.width - 80, 0.0f), 50, 4);
+
     addChild(sprite);
-    sprite->runAction( RepeatForever::create(Sequence::create(jump, jump->reverse(), nullptr) ));
+    sprite->runAction(RepeatForever::create(Sequence::create(jump, jump->reverse(), nullptr)));
     // pause button
     auto item1 = MenuItemFont::create("Pause", [&](Ref* sender) {
-		if(Director::getInstance()->isPaused())
-			Director::getInstance()->resume();
-		else
-			Director::getInstance()->pause();
-	});
-    auto menu = Menu::create(item1, nullptr);
-    menu->setPosition(s.width/2, s.height-50);
-
-    addChild( menu );
+        if (Director::getInstance()->isPaused())
+            Director::getInstance()->resume();
+        else
+            Director::getInstance()->pause();
+    });
+    auto menu  = Menu::create(item1, nullptr);
+    menu->setPosition(s.width / 2, s.height - 50);
+
+    addChild(menu);
 }
 
 IntervalTest::~IntervalTest()
 {
-    if(Director::getInstance()->isPaused())
+    if (Director::getInstance()->isPaused())
     {
         Director::getInstance()->resume();
     }
@@ -135,7 +143,7 @@ IntervalTest::~IntervalTest()
 
 void IntervalTest::update(float dt)
 {
-    _time0 +=dt;
+    _time0 += dt;
     char time[10] = {0};
     sprintf(time, "%2.1f", _time0);
     _label0->setString(time);
diff --git a/tests/cpp-tests/Classes/IntervalTest/IntervalTest.h b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.h
index 68bd6ca6ae9e..f885358abc02 100644
--- a/tests/cpp-tests/Classes/IntervalTest/IntervalTest.h
+++ b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,16 +38,16 @@ class IntervalTest : public TestCase
 
     virtual void update(float dt) override;
 
-    //CREATE_NODE(IntervalLayer);
+    // CREATE_NODE(IntervalLayer);
 
 protected:
-    cocos2d::Label*    _label0;
-    cocos2d::Label*    _label1;
-    cocos2d::Label*    _label2;
-    cocos2d::Label*    _label3;
-    cocos2d::Label*    _label4;
+    cocos2d::Label* _label0;
+    cocos2d::Label* _label1;
+    cocos2d::Label* _label2;
+    cocos2d::Label* _label3;
+    cocos2d::Label* _label4;
 
-    float        _time0, _time1, _time2, _time3, _time4;
+    float _time0, _time1, _time2, _time3, _time4;
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/JNITest/JNITest.cpp b/tests/cpp-tests/Classes/JNITest/JNITest.cpp
index d873f93cee8b..feba30d292cf 100644
--- a/tests/cpp-tests/Classes/JNITest/JNITest.cpp
+++ b/tests/cpp-tests/Classes/JNITest/JNITest.cpp
@@ -1,18 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
- http://www.cocos2d-x.org
- 
+ Copyright (c) 2021 Bytedance inc.
+
+ https://adxeproject.github.io/
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,12 +25,11 @@
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 
-#include "JNITest.h"
-
+#    include "JNITest.h"
 
-#include "platform/android/jni/JniHelper.h"
+#    include "platform/android/jni/JniHelper.h"
 
-#include <string>
+#    include <string>
 
 USING_NS_CC;
 
@@ -48,7 +48,7 @@ JNITest::JNITest()
     checkLabel->setPosition(VisibleRect::center());
     addChild(checkLabel);
 
-    const std::string classPath = "org.cocos2dx.cpp_tests.JNITest";
+    const char* classPath = "org.cocos2dx.cpp_tests.JNITest";
 
     JniHelper::callStaticVoidMethod(classPath, "voidMethod1");
 
@@ -65,23 +65,24 @@ JNITest::JNITest()
     CC_ASSERT(i == 20);
 
     float f = JniHelper::callStaticFloatMethod(classPath, "floatMethod", float(2.35), float(7.65));
-    CC_ASSERT(f == 10.0);  
-      
+    CC_ASSERT(f == 10.0);
+
     double d = JniHelper::callStaticDoubleMethod(classPath, "doubleMethod", double(2.5), int(4));
-    CC_ASSERT(d == 10.0); 
+    CC_ASSERT(d == 10.0);
 
     std::string str = "ABCDEF";
-    std::string s1 = JniHelper::callStaticStringMethod(classPath, "stringMethod", str, true);
+    std::string s1  = JniHelper::callStaticStringMethod(classPath, "stringMethod", str, true);
     CC_ASSERT(s1 == "FEDCBA");
     std::string s2 = JniHelper::callStaticStringMethod(classPath, "stringMethod", str, false);
     CC_ASSERT(s2 == "ABCDEF");
 
     const char* cstr = "XYZ";
-    std::string s3 = JniHelper::callStaticStringMethod(classPath, "stringMethod", cstr, true);
+    std::string s3   = JniHelper::callStaticStringMethod(classPath, "stringMethod", cstr, true);
     CC_ASSERT(s3 == "ZYX");
 
     // should not crash
-    for (int i = 0; i < 10000; i++) {
+    for (int i = 0; i < 10000; i++)
+    {
         JniHelper::callStaticVoidMethod(classPath, "voidMethod4", "ABCDEF");
     }
 
diff --git a/tests/cpp-tests/Classes/JNITest/JNITest.h b/tests/cpp-tests/Classes/JNITest/JNITest.h
index 1cc3a59ddf8b..2d00e229372f 100644
--- a/tests/cpp-tests/Classes/JNITest/JNITest.h
+++ b/tests/cpp-tests/Classes/JNITest/JNITest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,8 +27,8 @@
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 
-#include "cocos2d.h"
-#include "../BaseTest.h"
+#    include "cocos2d.h"
+#    include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(JNITests);
 
@@ -40,4 +40,4 @@ class JNITest : public TestCase
     JNITest();
 };
 #endif
-#endif // _JNI_TEST_H_
+#endif  // _JNI_TEST_H_
diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
index 0918b0f48a0c..b490f025c7ba 100644
--- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
+++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,16 +31,18 @@ USING_NS_CC;
 using namespace ui;
 using namespace extension;
 
-enum {
-    kTagTileMap = 1,
+enum
+{
+    kTagTileMap       = 1,
     kTagSpriteManager = 1,
-    kTagAnimation1 = 1,
-    kTagBitmapAtlas1 = 1,
-    kTagBitmapAtlas2 = 2,
-    kTagBitmapAtlas3 = 3,
+    kTagAnimation1    = 1,
+    kTagBitmapAtlas1  = 1,
+    kTagBitmapAtlas2  = 2,
+    kTagBitmapAtlas3  = 3,
 };
 
-enum {
+enum
+{
     kTagSprite1,
     kTagSprite2,
     kTagSprite3,
@@ -150,36 +152,34 @@ LabelFNTColorAndOpacity::LabelFNTColorAndOpacity()
 {
     _time = 0;
 
-    auto col = LayerColor::create( Color4B(128,128,128,255) );
+    auto col = LayerColor::create(Color4B(128, 128, 128, 255));
     addChild(col, -10);
-    
+
     auto label1 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "Test");
-    
-    label1->setAnchorPoint( Vec2(0,0) );
+
+    label1->setAnchorPoint(Vec2(0, 0));
     addChild(label1, 0, kTagBitmapAtlas1);
-    auto fade = FadeOut::create(1.0f);
+    auto fade    = FadeOut::create(1.0f);
     auto fade_in = fade->reverse();
-    auto seq = Sequence::create(fade, fade_in, nullptr);
-    auto repeat = RepeatForever::create(seq);
+    auto seq     = Sequence::create(fade, fade_in, nullptr);
+    auto repeat  = RepeatForever::create(seq);
     label1->runAction(repeat);
-    
+
     auto label2 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "Test");
-    label2->setColor( Color3B::RED );
+    label2->setColor(Color3B::RED);
     addChild(label2, 0, kTagBitmapAtlas2);
-    auto tint = Sequence::create(TintTo::create(1, 255, 0, 0),
-        TintTo::create(1, 0, 255, 0),
-        TintTo::create(1, 0, 0, 255),
-        nullptr);
-    label2->runAction( RepeatForever::create(tint) );
-    
+    auto tint = Sequence::create(TintTo::create(1, 255, 0, 0), TintTo::create(1, 0, 255, 0),
+                                 TintTo::create(1, 0, 0, 255), nullptr);
+    label2->runAction(RepeatForever::create(tint));
+
     auto label3 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "Test");
-    label3->setAnchorPoint( Vec2(1,1) );
+    label3->setAnchorPoint(Vec2(1, 1));
     addChild(label3, 0, kTagBitmapAtlas3);
-    
-    label1->setPosition( VisibleRect::leftBottom() );
-    label2->setPosition( VisibleRect::center() );
-    label3->setPosition( VisibleRect::rightTop() );
-    
+
+    label1->setPosition(VisibleRect::leftBottom());
+    label2->setPosition(VisibleRect::center());
+    label3->setPosition(VisibleRect::rightTop());
+
     schedule(CC_CALLBACK_1(LabelFNTColorAndOpacity::step, this), "step_key");
 }
 
@@ -188,14 +188,14 @@ void LabelFNTColorAndOpacity::step(float dt)
     _time += dt;
     char string[15] = {0};
     sprintf(string, "%2.2f Test j", _time);
-    
-    auto label1 = (Label*) getChildByTag(kTagBitmapAtlas1);
+
+    auto label1 = (Label*)getChildByTag(kTagBitmapAtlas1);
     label1->setString(string);
-    
-    auto label2 = (Label*) getChildByTag(kTagBitmapAtlas2);
+
+    auto label2 = (Label*)getChildByTag(kTagBitmapAtlas2);
     label2->setString(string);
-    
-    auto label3 = (Label*) getChildByTag(kTagBitmapAtlas3);
+
+    auto label3 = (Label*)getChildByTag(kTagBitmapAtlas3);
     label3->setString(string);
 }
 
@@ -212,56 +212,53 @@ std::string LabelFNTColorAndOpacity::subtitle() const
 LabelFNTSpriteActions::LabelFNTSpriteActions()
 {
     _time = 0;
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto drawNode = DrawNode::create();
-    drawNode->drawLine( Vec2(0.0f, s.height/2), Vec2(s.width, s.height/2), Color4F(1.0f, 1.0f, 1.0f, 1.0f) );
-    drawNode->drawLine( Vec2(s.width/2, 0.0f), Vec2(s.width/2, s.height), Color4F(1.0f, 1.0f, 1.0f, 1.0f) );
+    drawNode->drawLine(Vec2(0.0f, s.height / 2), Vec2(s.width, s.height / 2), Color4F(1.0f, 1.0f, 1.0f, 1.0f));
+    drawNode->drawLine(Vec2(s.width / 2, 0.0f), Vec2(s.width / 2, s.height), Color4F(1.0f, 1.0f, 1.0f, 1.0f));
     addChild(drawNode, -1);
 
     // Upper Label
     auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Bitmap Font Atlas");
     addChild(label);
-    
-    
-    label->setPosition( Vec2(s.width/2, s.height/2) ); 
-    
-    auto BChar = (Sprite*) label->getLetter(0);
-    auto FChar = (Sprite*) label->getLetter(7);
-    auto AChar = (Sprite*) label->getLetter(12);
-    
-    
-    auto rotate = RotateBy::create(2, 360);
+
+    label->setPosition(Vec2(s.width / 2, s.height / 2));
+
+    auto BChar = (Sprite*)label->getLetter(0);
+    auto FChar = (Sprite*)label->getLetter(7);
+    auto AChar = (Sprite*)label->getLetter(12);
+
+    auto rotate    = RotateBy::create(2, 360);
     auto rot_4ever = RepeatForever::create(rotate);
-    
-    auto scale = ScaleBy::create(2, 1.5f);
-    auto scale_back = scale->reverse();
-    auto scale_seq = Sequence::create(scale, scale_back,nullptr);
+
+    auto scale       = ScaleBy::create(2, 1.5f);
+    auto scale_back  = scale->reverse();
+    auto scale_seq   = Sequence::create(scale, scale_back, nullptr);
     auto scale_4ever = RepeatForever::create(scale_seq);
-    
-    auto jump = JumpBy::create(0.5f, Vec2::ZERO, 60, 1);
+
+    auto jump       = JumpBy::create(0.5f, Vec2::ZERO, 60, 1);
     auto jump_4ever = RepeatForever::create(jump);
-    
-    auto fade_out = FadeOut::create(1);
-    auto fade_in = FadeIn::create(1);
-    auto seq = Sequence::create(fade_out, fade_in, nullptr);
+
+    auto fade_out   = FadeOut::create(1);
+    auto fade_in    = FadeIn::create(1);
+    auto seq        = Sequence::create(fade_out, fade_in, nullptr);
     auto fade_4ever = RepeatForever::create(seq);
-    
+
     BChar->runAction(rot_4ever);
     BChar->runAction(scale_4ever);
     FChar->runAction(jump_4ever);
     AChar->runAction(fade_4ever);
-    
-    
+
     // Bottom Label
     auto label2 = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "00.0");
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition( Vec2(s.width/2.0f, 80.0f) );
-    
-    auto lastChar = (Sprite*) label2->getLetter(3);
-    lastChar->runAction( rot_4ever->clone() );
-    
+    label2->setPosition(Vec2(s.width / 2.0f, 80.0f));
+
+    auto lastChar = (Sprite*)label2->getLetter(3);
+    lastChar->runAction(rot_4ever->clone());
+
     schedule(CC_CALLBACK_1(LabelFNTSpriteActions::step, this), 0.1f, "step_key");
 }
 
@@ -270,7 +267,7 @@ void LabelFNTSpriteActions::step(float dt)
     _time += dt;
     char string[10] = {0};
     sprintf(string, "%04.1f", _time);
-    auto label1 = (Label*) getChildByTag(kTagBitmapAtlas2);
+    auto label1 = (Label*)getChildByTag(kTagBitmapAtlas2);
     label1->setString(string);
 }
 
@@ -288,10 +285,10 @@ LabelFNTPadding::LabelFNTPadding()
 {
     auto label = Label::createWithBMFont("fonts/bitmapFontTest4.fnt", "abcdefg");
     addChild(label);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    label->setPosition( Vec2(s.width/2, s.height/2) );
+
+    label->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 std::string LabelFNTPadding::title() const
@@ -309,17 +306,17 @@ LabelFNTOffset::LabelFNTOffset()
     auto s = Director::getInstance()->getWinSize();
 
     Label* label = nullptr;
-    label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "FaFeFiFoFu");
+    label        = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "FaFeFiFoFu");
     addChild(label);
-    label->setPosition( Vec2(s.width/2, s.height/2+50) );
-    
+    label->setPosition(Vec2(s.width / 2, s.height / 2 + 50));
+
     label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "fafefifofu");
     addChild(label);
-    label->setPosition( Vec2(s.width/2, s.height/2) );
+    label->setPosition(Vec2(s.width / 2, s.height / 2));
 
     label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "aeiou");
     addChild(label);
-    label->setPosition( Vec2(s.width/2, s.height/2-50) );
+    label->setPosition(Vec2(s.width / 2, s.height / 2 - 50));
 }
 
 std::string LabelFNTOffset::title() const
@@ -335,21 +332,21 @@ std::string LabelFNTOffset::subtitle() const
 LabelFNTColor::LabelFNTColor()
 {
     auto winSize = Director::getInstance()->getWinSize();
-    
+
     auto label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "Blue");
-    label->setColor( Color3B::BLUE );
+    label->setColor(Color3B::BLUE);
     addChild(label);
     label->setPosition(winSize.width / 2, winSize.height * 0.7f);
 
     label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "Red");
     addChild(label);
     label->setPosition(winSize.width / 2, winSize.height * 0.5f);
-    label->setColor( Color3B::RED );
+    label->setColor(Color3B::RED);
 
     label = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "Green");
     addChild(label);
-    label->setPosition(winSize.width / 2, winSize.height  * 0.3f);
-    label->setColor( Color3B::GREEN );
+    label->setPosition(winSize.width / 2, winSize.height * 0.3f);
+    label->setColor(Color3B::GREEN);
     label->setString("Green");
 }
 
@@ -391,17 +388,17 @@ std::string LabelFNTOpacity::subtitle() const
 LabelFNTHundredLabels::LabelFNTHundredLabels()
 {
     // Upper Label
-    for ( int i=0 ; i < 100;i ++ ) 
+    for (int i = 0; i < 100; i++)
     {
         char str[6] = {0};
         sprintf(str, "-%d-", i);
         auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", str);
         addChild(label);
-        
+
         auto s = Director::getInstance()->getWinSize();
 
-        auto p = Vec2( CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
-        label->setPosition( p );
+        auto p = Vec2(CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
+        label->setPosition(p);
     }
 }
 
@@ -421,18 +418,17 @@ LabelFNTMultiLine::LabelFNTMultiLine()
 
     // Left
     auto label1 = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", " Multi line\nLeft");
-    label1->setAnchorPoint(Vec2(0,0));
+    label1->setAnchorPoint(Vec2(0, 0));
     addChild(label1, 0, kTagBitmapAtlas1);
 
     s = label1->getContentSize();
     CCLOG("content size: %.2fx%.2f", s.width, s.height);
 
-
     // Center
-    auto label2 = Label::createWithBMFont( "fonts/bitmapFontTest3.fnt", "Multi line\nCenter");
+    auto label2 = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "Multi line\nCenter");
     addChild(label2, 0, kTagBitmapAtlas2);
 
-    s= label2->getContentSize();
+    s = label2->getContentSize();
     CCLOG("content size: %.2fx%.2f", s.width, s.height);
 
     // right
@@ -465,17 +461,17 @@ LabelFNTandTTFEmpty::LabelFNTandTTFEmpty()
     // LabelBMFont
     auto label1 = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "", TextHAlignment::CENTER, s.width);
     addChild(label1, 0, kTagBitmapAtlas1);
-    label1->setPosition(Vec2(s.width/2, s.height - 100));
+    label1->setPosition(Vec2(s.width / 2, s.height - 100));
 
     // LabelTTF
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
-    auto label2 = Label::createWithTTF(ttfConfig,"", TextHAlignment::CENTER,s.width);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
+    auto label2 = Label::createWithTTF(ttfConfig, "", TextHAlignment::CENTER, s.width);
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition(Vec2(s.width/2, s.height / 2));
-    
+    label2->setPosition(Vec2(s.width / 2, s.height / 2));
+
     auto label3 = Label::createWithCharMap("fonts/tuffy_bold_italic-charmap.plist");
     addChild(label3, 0, kTagBitmapAtlas3);
-    label3->setPosition(Vec2(s.width/2, 100.0f));
+    label3->setPosition(Vec2(s.width / 2, 100.0f));
 
     schedule(CC_CALLBACK_1(LabelFNTandTTFEmpty::updateStrings, this), 1.0f, "update_strings_key");
 
@@ -484,16 +480,16 @@ LabelFNTandTTFEmpty::LabelFNTandTTFEmpty()
 
 void LabelFNTandTTFEmpty::updateStrings(float dt)
 {
-    auto label1 = static_cast<Label*>( getChildByTag(kTagBitmapAtlas1) );
-    auto label2 = static_cast<Label*>( getChildByTag(kTagBitmapAtlas2) );
-    auto label3 = static_cast<Label*>( getChildByTag(kTagBitmapAtlas3) );
+    auto label1 = static_cast<Label*>(getChildByTag(kTagBitmapAtlas1));
+    auto label2 = static_cast<Label*>(getChildByTag(kTagBitmapAtlas2));
+    auto label3 = static_cast<Label*>(getChildByTag(kTagBitmapAtlas3));
 
-    if( ! setEmpty )
+    if (!setEmpty)
     {
         label1->setString("not empty");
         label2->setString("not empty");
         label3->setString("hi");
-    
+
         setEmpty = true;
     }
     else
@@ -501,7 +497,7 @@ void LabelFNTandTTFEmpty::updateStrings(float dt)
         label1->setString("");
         label2->setString("");
         label3->setString("");
-    
+
         setEmpty = false;
     }
 }
@@ -523,7 +519,7 @@ LabelFNTRetina::LabelFNTRetina()
     // LabelBMFont
     auto label1 = Label::createWithBMFont("fonts/konqa32.fnt", "TESTING RETINA DISPLAY");
     addChild(label1);
-    label1->setPosition(Vec2(s.width/2, s.height/2));
+    label1->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 std::string LabelFNTRetina::title() const
@@ -540,7 +536,7 @@ LabelFNTGlyphDesigner::LabelFNTGlyphDesigner()
 {
     auto winSize = Director::getInstance()->getWinSize();
 
-    auto layer = LayerColor::create(Color4B(128,128,128,255));
+    auto layer = LayerColor::create(Color4B(128, 128, 128, 255));
     addChild(layer, -10);
 
     auto label1 = Label::createWithBMFont("fonts/futura-48.fnt", "Testing Glyph Designer");
@@ -568,9 +564,12 @@ std::string LabelFNTGlyphDesigner::subtitle() const
 
 /// BitmapFontMultiLineAlignmentNew
 
-#define LongSentencesExample "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-#define LineBreaksExample    "Lorem ipsum dolor\nsit amet\nconsectetur adipisicing elit\nblah\nblah"
-#define MixedExample         "ABC\nLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt\nDEF"
+#define LongSentencesExample                                                                                          \
+    "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore " \
+    "magna aliqua."
+#define LineBreaksExample "Lorem ipsum dolor\nsit amet\nconsectetur adipisicing elit\nblah\nblah"
+#define MixedExample \
+    "ABC\nLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt\nDEF"
 
 #define ArrowsMax 0.95
 #define ArrowsMin 0.7
@@ -593,26 +592,29 @@ bool LabelFNTMultiLineAlignment::init()
         return false;
     }
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(LabelFNTMultiLineAlignment::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(LabelFNTMultiLineAlignment::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(LabelFNTMultiLineAlignment::onTouchesEnded, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
     // ask director the the window size
     auto size = Director::getInstance()->getWinSize();
 
     // create and initialize a Label
-    this->_label = Label::createWithBMFont("fonts/markerFelt.fnt", "", TextHAlignment::CENTER, size.width/1.5);
+    this->_label = Label::createWithBMFont("fonts/markerFelt.fnt", "", TextHAlignment::CENTER, size.width / 1.5);
 
     this->_arrowsBar = Sprite::create("Images/arrowsBar.png");
-    this->_arrows = Sprite::create("Images/arrows.png");
+    this->_arrows    = Sprite::create("Images/arrows.png");
 
     MenuItemFont::setFontSize(20);
-    auto longSentences = MenuItemFont::create("Long Flowing Sentences", CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
-    auto lineBreaks    = MenuItemFont::create("Short Sentences With Intentional Line Breaks", CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
-    auto mixed         = MenuItemFont::create("Long Sentences Mixed With Intentional Line Breaks", CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
-    auto stringMenu    = Menu::create(longSentences, lineBreaks, mixed, nullptr);
+    auto longSentences =
+        MenuItemFont::create("Long Flowing Sentences", CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
+    auto lineBreaks = MenuItemFont::create("Short Sentences With Intentional Line Breaks",
+                                           CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
+    auto mixed      = MenuItemFont::create("Long Sentences Mixed With Intentional Line Breaks",
+                                           CC_CALLBACK_1(LabelFNTMultiLineAlignment::stringChanged, this));
+    auto stringMenu = Menu::create(longSentences, lineBreaks, mixed, nullptr);
     stringMenu->alignItemsVertically();
 
     longSentences->setTag(LongSentences);
@@ -625,9 +627,9 @@ bool LabelFNTMultiLineAlignment::init()
 
     MenuItemFont::setFontSize(30);
 
-    auto left = MenuItemFont::create("Left", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
+    auto left   = MenuItemFont::create("Left", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
     auto center = MenuItemFont::create("Center", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
-    auto right = MenuItemFont::create("Right", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
+    auto right  = MenuItemFont::create("Right", CC_CALLBACK_1(LabelFNTMultiLineAlignment::alignmentChanged, this));
 
     auto alignmentMenu = Menu::create(left, center, right, nullptr);
     alignmentMenu->alignItemsHorizontallyWithPadding(alignmentItemPadding);
@@ -637,7 +639,7 @@ bool LabelFNTMultiLineAlignment::init()
     right->setTag(RightAlign);
 
     // position the label on the center of the screen
-    this->_label->setPosition(Vec2(size.width/2, size.height/2));
+    this->_label->setPosition(Vec2(size.width / 2, size.height / 2));
 
     this->_arrowsBar->setVisible(false);
 
@@ -645,8 +647,8 @@ bool LabelFNTMultiLineAlignment::init()
     this->_arrowsBar->setScaleX(arrowsWidth / this->_arrowsBar->getContentSize().width);
     this->_arrowsBar->setPosition(Vec2(((ArrowsMax + ArrowsMin) / 2) * size.width, this->_label->getPosition().y));
 
-    stringMenu->setPosition(Vec2(size.width/2, size.height - menuItemPaddingCenter));
-    alignmentMenu->setPosition(Vec2(size.width/2, menuItemPaddingCenter+15));
+    stringMenu->setPosition(Vec2(size.width / 2, size.height - menuItemPaddingCenter));
+    alignmentMenu->setPosition(Vec2(size.width / 2, menuItemPaddingCenter + 15));
 
     this->selectSentenceItem(longSentences);
     this->selectAlignmentItem(center);
@@ -671,7 +673,7 @@ std::string LabelFNTMultiLineAlignment::subtitle() const
     return "";
 }
 
-void LabelFNTMultiLineAlignment::selectAlignmentItem(cocos2d::MenuItemFont * item)
+void LabelFNTMultiLineAlignment::selectAlignmentItem(cocos2d::MenuItemFont* item)
 {
     if (this->_lastAlignmentItem && this->_lastAlignmentItem != item)
     {
@@ -735,7 +737,7 @@ std::string LabelFNTMultiLineAlignment::getItemString(cocos2d::MenuItemFont* ite
     return str;
 }
 
-void LabelFNTMultiLineAlignment::stringChanged(cocos2d::Ref *sender)
+void LabelFNTMultiLineAlignment::stringChanged(cocos2d::Ref* sender)
 {
     auto item = (MenuItemFont*)sender;
 
@@ -744,7 +746,7 @@ void LabelFNTMultiLineAlignment::stringChanged(cocos2d::Ref *sender)
     this->snapArrowsToEdge();
 }
 
-void LabelFNTMultiLineAlignment::alignmentChanged(cocos2d::Ref *sender)
+void LabelFNTMultiLineAlignment::alignmentChanged(cocos2d::Ref* sender)
 {
     auto item = static_cast<MenuItemFont*>(sender);
 
@@ -753,9 +755,9 @@ void LabelFNTMultiLineAlignment::alignmentChanged(cocos2d::Ref *sender)
     this->snapArrowsToEdge();
 }
 
-void LabelFNTMultiLineAlignment::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void LabelFNTMultiLineAlignment::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    auto touch = touches[0];
+    auto touch    = touches[0];
     auto location = touch->getLocationInView();
 
     if (this->_arrows->getBoundingBox().containsPoint(location))
@@ -765,7 +767,7 @@ void LabelFNTMultiLineAlignment::onTouchesBegan(const std::vector<Touch*>& touch
     }
 }
 
-void LabelFNTMultiLineAlignment::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void LabelFNTMultiLineAlignment::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
     _drag = false;
     this->snapArrowsToEdge();
@@ -773,20 +775,20 @@ void LabelFNTMultiLineAlignment::onTouchesEnded(const std::vector<Touch*>& touch
     this->_arrowsBar->setVisible(false);
 }
 
-void LabelFNTMultiLineAlignment::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void LabelFNTMultiLineAlignment::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    if (! _drag)
+    if (!_drag)
     {
         return;
     }
 
-    auto touch = touches[0];
+    auto touch    = touches[0];
     auto location = touch->getLocationInView();
 
     auto winSize = Director::getInstance()->getWinSize();
 
-    this->_arrows->setPosition(Vec2(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width), 
-        this->_arrows->getPosition().y));
+    this->_arrows->setPosition(Vec2(MAX(MIN(location.x, ArrowsMax * winSize.width), ArrowsMin * winSize.width),
+                                    this->_arrows->getPosition().y));
 
     float labelWidth = fabs(this->_arrows->getPosition().x - this->_label->getPosition().x) * 2;
 
@@ -795,8 +797,8 @@ void LabelFNTMultiLineAlignment::onTouchesMoved(const std::vector<Touch*>& touch
 
 void LabelFNTMultiLineAlignment::snapArrowsToEdge()
 {
-    this->_arrows->setPosition(Vec2(this->_label->getPosition().x + this->_label->getContentSize().width/2,
-        this->_label->getPosition().y));
+    this->_arrows->setPosition(
+        Vec2(this->_label->getPosition().x + this->_label->getContentSize().width / 2, this->_label->getPosition().y));
 }
 
 /// LabelFNTMultiLineAlignmentUNICODE
@@ -812,8 +814,8 @@ bool LabelFNTMultiLineAlignmentUNICODE::init()
     this->_menuItems[1]->setString("Spanish");
     this->_menuItems[2]->setString("Ukrainian");
 
-    auto ttfConfig = this->_label->getTTFConfig();
-    ttfConfig.fontSize = 20;
+    auto ttfConfig         = this->_label->getTTFConfig();
+    ttfConfig.fontSize     = 20;
     ttfConfig.fontFilePath = "fonts/tahoma.ttf";
     this->_label->setTTFConfig(ttfConfig);
 
@@ -861,7 +863,7 @@ std::string LabelFNTMultiLineAlignmentUNICODE::getItemString(cocos2d::MenuItemFo
 /// BMFontUnicodeNew
 LabelFNTUNICODELanguages::LabelFNTUNICODELanguages()
 {
-    auto strings = FileUtils::getInstance()->getValueMapFromFile("strings/LabelFNTUNICODELanguages.xml");
+    auto strings         = FileUtils::getInstance()->getValueMapFromFile("strings/LabelFNTUNICODELanguages.xml");
     std::string chinese  = strings["chinese1"].asString();
     std::string russian  = strings["russian"].asString();
     std::string spanish  = strings["spanish"].asString();
@@ -871,19 +873,19 @@ LabelFNTUNICODELanguages::LabelFNTUNICODELanguages()
 
     auto label1 = Label::createWithBMFont("fonts/arial-unicode-26.fnt", spanish, TextHAlignment::CENTER, 200);
     addChild(label1);
-    label1->setPosition(Vec2(s.width/2, s.height/5*3));
-    
+    label1->setPosition(Vec2(s.width / 2, s.height / 5 * 3));
+
     auto label2 = Label::createWithBMFont("fonts/arial-unicode-26.fnt", chinese);
     addChild(label2);
-    label2->setPosition(Vec2(s.width/2, s.height/5*2.5));
+    label2->setPosition(Vec2(s.width / 2, s.height / 5 * 2.5));
 
     auto label3 = Label::createWithBMFont("fonts/arial-26-en-ru.fnt", russian);
     addChild(label3);
-    label3->setPosition(Vec2(s.width/2, s.height/5*2));
+    label3->setPosition(Vec2(s.width / 2, s.height / 5 * 2));
 
     auto label4 = Label::createWithBMFont("fonts/arial-unicode-26.fnt", japanese);
     addChild(label4);
-    label4->setPosition(Vec2(s.width/2, s.height/5*1.5));
+    label4->setPosition(Vec2(s.width / 2, s.height / 5 * 1.5));
 }
 
 std::string LabelFNTUNICODELanguages::title() const
@@ -899,29 +901,26 @@ std::string LabelFNTUNICODELanguages::subtitle() const
 LabelFNTBounds::LabelFNTBounds()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    auto layer = LayerColor::create(Color4B(128,128,128,255));
+
+    auto layer = LayerColor::create(Color4B(128, 128, 128, 255));
     addChild(layer, -10);
-    
+
     // LabelBMFont
-    auto label1 = Label::createWithBMFont("fonts/boundsTestFont.fnt", "Testing Glyph Designer", TextHAlignment::CENTER,s.width);
+    auto label1 =
+        Label::createWithBMFont("fonts/boundsTestFont.fnt", "Testing Glyph Designer", TextHAlignment::CENTER, s.width);
     addChild(label1);
-    label1->setPosition(Vec2(s.width/2, s.height/2));
+    label1->setPosition(Vec2(s.width / 2, s.height / 2));
 
-    auto drawNode = DrawNode::create();
+    auto drawNode  = DrawNode::create();
     auto labelSize = label1->getContentSize();
     auto origin    = Director::getInstance()->getWinSize();
-    
-    origin.width = origin.width   / 2 - (labelSize.width / 2);
+
+    origin.width  = origin.width / 2 - (labelSize.width / 2);
     origin.height = origin.height / 2 - (labelSize.height / 2);
-    
-    Vec2 vertices[4]=
-    {
-        Vec2(origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
-        Vec2(origin.width, labelSize.height + origin.height)
-    };
+
+    Vec2 vertices[4] = {Vec2(origin.width, origin.height), Vec2(labelSize.width + origin.width, origin.height),
+                        Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
+                        Vec2(origin.width, labelSize.height + origin.height)};
     drawNode->drawPoly(vertices, 4, true, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
     addChild(drawNode);
 }
@@ -944,7 +943,8 @@ LabelFNTMultiFontAtlasNoRotation::LabelFNTMultiFontAtlasNoRotation()
     addChild(label1);
     label1->setPosition(Vec2(s.width / 2, s.height / 3 * 2));
 
-    auto label2 = Label::createWithBMFont("fonts/geneva-32.fnt", "And this is Geneva", TextHAlignment::LEFT, 0, Rect(0, 128, 0, 0), false);
+    auto label2 = Label::createWithBMFont("fonts/geneva-32.fnt", "And this is Geneva", TextHAlignment::LEFT, 0,
+                                          Rect(0, 128, 0, 0), false);
     addChild(label2);
     label2->setPosition(Vec2(s.width / 2, s.height / 3 * 1));
 }
@@ -967,12 +967,14 @@ LabelFNTMultiFontAtlasWithRotation::LabelFNTMultiFontAtlasWithRotation()
     spriteCache->addSpriteFramesWithFile("fonts/bmfont-rotated-test.plist");
 
     // Label BMFont
-    auto label1 = Label::createWithBMFont("fonts/helvetica-regular-32.fnt", "Helvetica with SubTextureKey", TextHAlignment::CENTER, 0, "helvetica-regular-32.png");
+    auto label1 = Label::createWithBMFont("fonts/helvetica-regular-32.fnt", "Helvetica with SubTextureKey",
+                                          TextHAlignment::CENTER, 0, "helvetica-regular-32.png");
     label1->setPosition(Vec2(s.width / 2, s.height / 3 * 2));
     this->addChild(label1);
 
     const auto frame = spriteCache->getSpriteFrameByName("geneva-regular-32.png");
-    auto label2 = Label::createWithBMFont("fonts/geneva-regular-32.fnt", "Geneva with Rect and Rotated", TextHAlignment::CENTER, 0, frame->getRectInPixels(), frame->isRotated());
+    auto label2      = Label::createWithBMFont("fonts/geneva-regular-32.fnt", "Geneva with Rect and Rotated",
+                                               TextHAlignment::CENTER, 0, frame->getRectInPixels(), frame->isRotated());
     label2->setPosition(Vec2(s.width / 2, s.height / 3 * 1));
     this->addChild(label2);
 }
@@ -993,8 +995,8 @@ LabelTTFLongLineWrapping::LabelTTFLongLineWrapping()
 
     // Long sentence
     TTFConfig ttfConfig("fonts/arial.ttf", 14);
-    auto label1 = Label::createWithTTF(ttfConfig, LongSentencesExample, TextHAlignment::CENTER,size.width);
-    label1->setPosition( Vec2(size.width/2, size.height/2) );
+    auto label1 = Label::createWithTTF(ttfConfig, LongSentencesExample, TextHAlignment::CENTER, size.width);
+    label1->setPosition(Vec2(size.width / 2, size.height / 2));
     label1->setAnchorPoint(Vec2(0.5f, 1.0f));
     addChild(label1);
 }
@@ -1015,21 +1017,21 @@ LabelTTFColor::LabelTTFColor()
 
     TTFConfig ttfConfig("fonts/arial.ttf", 18);
     // Green
-    auto label1 = Label::createWithTTF(ttfConfig,"Green", TextHAlignment::CENTER, size.width);
-    label1->setPosition(size.width/2, size.height * 0.5f);
-    label1->setTextColor( Color4B::GREEN );
+    auto label1 = Label::createWithTTF(ttfConfig, "Green", TextHAlignment::CENTER, size.width);
+    label1->setPosition(size.width / 2, size.height * 0.5f);
+    label1->setTextColor(Color4B::GREEN);
     addChild(label1);
 
     // Red
-    auto label2 = Label::createWithTTF(ttfConfig,"Red", TextHAlignment::CENTER, size.width);
-    label2->setPosition(size.width/2, size.height * 0.65f);
-    label2->setTextColor( Color4B::RED );
+    auto label2 = Label::createWithTTF(ttfConfig, "Red", TextHAlignment::CENTER, size.width);
+    label2->setPosition(size.width / 2, size.height * 0.65f);
+    label2->setTextColor(Color4B::RED);
     addChild(label2);
 
     // Blue
-    auto label3 = Label::createWithTTF(ttfConfig,"Blue", TextHAlignment::CENTER, size.width);
-    label3->setPosition(size.width/2, size.height * 0.35f);
-    label3->setTextColor( Color4B::BLUE );
+    auto label3 = Label::createWithTTF(ttfConfig, "Blue", TextHAlignment::CENTER, size.width);
+    label3->setPosition(size.width / 2, size.height * 0.35f);
+    label3->setTextColor(Color4B::BLUE);
     addChild(label3);
 }
 
@@ -1053,17 +1055,16 @@ LabelTTFDynamicAlignment::LabelTTFDynamicAlignment()
     addChild(_label);
 
     auto menu = Menu::create(
-                              MenuItemFont::create("Left", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentLeft, this)),
-                              MenuItemFont::create("Center", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentCenter, this)),
-                              MenuItemFont::create("Right", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentRight, this)),
-                              nullptr);
-    
+        MenuItemFont::create("Left", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentLeft, this)),
+        MenuItemFont::create("Center", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentCenter, this)),
+        MenuItemFont::create("Right", CC_CALLBACK_1(LabelTTFDynamicAlignment::setAlignmentRight, this)), nullptr);
+
     menu->alignItemsHorizontallyWithPadding(20);
     menu->setPosition(winSize.width / 2, winSize.height * 0.25f);
     addChild(menu);
 }
 
-void  LabelTTFDynamicAlignment::updateAlignment()
+void LabelTTFDynamicAlignment::updateAlignment()
 {
     if (_label)
     {
@@ -1105,21 +1106,20 @@ std::string LabelTTFDynamicAlignment::subtitle() const
 LabelTTFCJKWrappingTest::LabelTTFCJKWrappingTest()
 {
     auto size = Director::getInstance()->getWinSize();
-    
+
     auto drawNode = DrawNode::create();
     drawNode->setAnchorPoint(Vec2(0, 0));
     this->addChild(drawNode);
-    drawNode->drawSegment(
-        Vec2(size.width * 0.1f, size.height * 0.8f),
-        Vec2(size.width * 0.1, 0.0f), 1, Color4F(1.0f, 0.0f, 0.0f, 1.0f));
-    drawNode->drawSegment(
-        Vec2(size.width * 0.85f, size.height * 0.8f),
-        Vec2(size.width * 0.85f, 0.0f), 1, Color4F(1.0f, 0.0f, 0.0f, 1.0f));
-    
+    drawNode->drawSegment(Vec2(size.width * 0.1f, size.height * 0.8f), Vec2(size.width * 0.1, 0.0f), 1,
+                          Color4F(1.0f, 0.0f, 0.0f, 1.0f));
+    drawNode->drawSegment(Vec2(size.width * 0.85f, size.height * 0.8f), Vec2(size.width * 0.85f, 0.0f), 1,
+                          Color4F(1.0f, 0.0f, 0.0f, 1.0f));
+
     TTFConfig ttfConfig("fonts/HKYuanMini.ttf", 25, GlyphCollection::DYNAMIC);
-    auto label1 = Label::createWithTTF(ttfConfig,
-        "你好，Cocos2d-x v3的New Label.", TextHAlignment::LEFT, size.width * 0.75f);
-    if(label1) {
+    auto label1 =
+        Label::createWithTTF(ttfConfig, "你好，Cocos2d-x v3的New Label.", TextHAlignment::LEFT, size.width * 0.75f);
+    if (label1)
+    {
         label1->setTextColor(Color4B(128, 255, 255, 255));
         label1->setPosition(Vec2(size.width * 0.1f, size.height * 0.6f));
         label1->setAnchorPoint(Vec2(0.0f, 0.5f));
@@ -1130,18 +1130,20 @@ LabelTTFCJKWrappingTest::LabelTTFCJKWrappingTest()
         label1->setTTFConfig(ttfConfig);
     }
 
-    auto label2 = Label::createWithTTF(ttfConfig,
-        "早上好，Cocos2d-x v3的New Label.", TextHAlignment::LEFT, size.width * 0.75f);
-    if(label2) {
+    auto label2 =
+        Label::createWithTTF(ttfConfig, "早上好，Cocos2d-x v3的New Label.", TextHAlignment::LEFT, size.width * 0.75f);
+    if (label2)
+    {
         label2->setTextColor(Color4B(255, 128, 255, 255));
         label2->setPosition(Vec2(size.width * 0.1f, size.height * 0.4f));
         label2->setAnchorPoint(Vec2(0.0f, 0.5f));
         this->addChild(label2);
     }
 
-    auto label3 = Label::createWithTTF(ttfConfig,
-        "美好的一天啊美好的一天啊美好的一天啊", TextHAlignment::LEFT, size.width * 0.75f);
-    if(label3) {
+    auto label3 = Label::createWithTTF(ttfConfig, "美好的一天啊美好的一天啊美好的一天啊", TextHAlignment::LEFT,
+                                       size.width * 0.75f);
+    if (label3)
+    {
         label3->setTextColor(Color4B(255, 255, 128, 255));
         label3->setPosition(Vec2(size.width * 0.1f, size.height * 0.2f));
         label3->setAnchorPoint(Vec2(0.0f, 0.5f));
@@ -1157,7 +1159,7 @@ std::string LabelTTFCJKWrappingTest::title() const
 std::string LabelTTFCJKWrappingTest::subtitle() const
 {
     return "New Label with CJK + ASCII characters\n"
-        "Characters should stay in the correct position";
+           "Characters should stay in the correct position";
 }
 
 //
@@ -1165,20 +1167,20 @@ std::string LabelTTFCJKWrappingTest::subtitle() const
 //
 LabelTTFUnicodeNew::LabelTTFUnicodeNew()
 {
-    auto strings = FileUtils::getInstance()->getValueMapFromFile("strings/LabelFNTUNICODELanguages.xml");
-    std::string chinese  = strings["chinese1"].asString();
-    auto winSize = Director::getInstance()->getWinSize();
+    auto strings        = FileUtils::getInstance()->getValueMapFromFile("strings/LabelFNTUNICODELanguages.xml");
+    std::string chinese = strings["chinese1"].asString();
+    auto winSize        = Director::getInstance()->getWinSize();
 
     // Spanish
     auto label1 = Label::createWithTTF("Buen día, ¿cómo te llamas?", "fonts/arial.ttf", 23);
     label1->setPosition(winSize.width / 2, winSize.height * 0.65f);
     addChild(label1);
-    
+
     // German
     auto label2 = Label::createWithTTF("In welcher Straße haben Sie gelebt?", "fonts/arial.ttf", 23);
     label2->setPosition(winSize.width / 2, winSize.height * 0.5f);
     addChild(label2);
-    
+
     // Chinese
     auto label3 = Label::createWithTTF(chinese, "fonts/HKYuanMini.ttf", 24);
     label3->setPosition(winSize.width / 2, winSize.height * 0.35f);
@@ -1201,8 +1203,8 @@ std::string LabelTTFUnicodeNew::subtitle() const
 LabelTTFEmoji::LabelTTFEmoji()
 {
     std::string emojiString = FileUtils::getInstance()->getStringFromFile("fonts/emoji.txt");
-    auto winSize = Director::getInstance()->getWinSize();
-    
+    auto winSize            = Director::getInstance()->getWinSize();
+
     auto label = Label::createWithTTF(emojiString, "fonts/NotoEmoji-Regular.ttf", 23);
     label->setPosition(winSize.width / 2, winSize.height / 2);
     label->setDimensions(winSize.width, winSize.height);
@@ -1221,30 +1223,28 @@ std::string LabelTTFEmoji::subtitle() const
     return "Uses the new Label with TTF. Testing Emoji";
 }
 
-
 LabelTTFFontsTestNew::LabelTTFFontsTestNew()
 {
-    const char *ttfpaths[] = {
-        "fonts/A Damn Mess.ttf",
-        "fonts/Abberancy.ttf",
-        "fonts/Abduction.ttf",
-        "fonts/American Typewriter.ttf",
-        "fonts/Paint Boy.ttf",
-        "fonts/Schwarzwald.ttf",
-        "fonts/Scissor Cuts.ttf",
+    const char* ttfpaths[] = {
+        "fonts/A Damn Mess.ttf", "fonts/Abberancy.ttf",   "fonts/Abduction.ttf",    "fonts/American Typewriter.ttf",
+        "fonts/Paint Boy.ttf",   "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf",
     };
 
     int fontCount = sizeof(ttfpaths) / sizeof(ttfpaths[0]);
-    auto size = Director::getInstance()->getWinSize();
-    TTFConfig ttfConfig(ttfpaths[0],20, GlyphCollection::NEHE);
+    auto size     = Director::getInstance()->getWinSize();
+    TTFConfig ttfConfig(ttfpaths[0], 20, GlyphCollection::NEHE);
 
-    for (int i = 0; i < fontCount; ++i) {
+    for (int i = 0; i < fontCount; ++i)
+    {
         ttfConfig.fontFilePath = ttfpaths[i];
-        auto label = Label::createWithTTF(ttfConfig, ttfpaths[i], TextHAlignment::CENTER,0);
-        if( label ) {            
+        auto label             = Label::createWithTTF(ttfConfig, ttfpaths[i], TextHAlignment::CENTER, 0);
+        if (label)
+        {
             label->setPosition(size.width / 2, ((size.height * 0.6) / fontCount * i) + (size.height / 4));
             addChild(label);
-        } else {
+        }
+        else
+        {
             log("ERROR: Cannot load: %s", ttfpaths[i]);
         }
     }
@@ -1263,53 +1263,40 @@ std::string LabelTTFFontsTestNew::subtitle() const
 LabelTTFDistanceField::LabelTTFDistanceField()
 {
     auto size = Director::getInstance()->getWinSize();
-    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC,nullptr,true);
+    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC, nullptr, true);
 
-    auto label1 = Label::createWithTTF(ttfConfig,"Distance Field",TextHAlignment::CENTER,size.width);
-    label1->setPosition( Vec2(size.width/2, size.height * 0.6f) );
-    label1->setTextColor( Color4B::GREEN );
+    auto label1 = Label::createWithTTF(ttfConfig, "Distance Field", TextHAlignment::CENTER, size.width);
+    label1->setPosition(Vec2(size.width / 2, size.height * 0.6f));
+    label1->setTextColor(Color4B::GREEN);
     addChild(label1);
 
-    auto action = Sequence::create(
-        DelayTime::create(1.0f),
-        ScaleTo::create(6.0f,5.0f,5.0f),
-        ScaleTo::create(6.0f,1.0f,1.0f),
-        nullptr);
+    auto action = Sequence::create(DelayTime::create(1.0f), ScaleTo::create(6.0f, 5.0f, 5.0f),
+                                   ScaleTo::create(6.0f, 1.0f, 1.0f), nullptr);
     label1->runAction(RepeatForever::create(action));
 
     // Draw the label border
     auto& labelContentSize = label1->getContentSize();
-    auto borderDraw = DrawNode::create();
+    auto borderDraw        = DrawNode::create();
     label1->addChild(borderDraw);
     borderDraw->clear();
     borderDraw->setLineWidth(1);
-    Vec2 vertices[4] =
-    {
-        Vec2::ZERO,
-        Vec2(labelContentSize.width, 0.0f),
-        Vec2(labelContentSize.width, labelContentSize.height),
-        Vec2(0.0f, labelContentSize.height)
-    };
+    Vec2 vertices[4] = {Vec2::ZERO, Vec2(labelContentSize.width, 0.0f),
+                        Vec2(labelContentSize.width, labelContentSize.height), Vec2(0.0f, labelContentSize.height)};
     borderDraw->drawPoly(vertices, 4, true, Color4F::RED);
 
-    auto label2 = Label::createWithTTF(ttfConfig,"Distance Field",TextHAlignment::CENTER,size.width);
-    label2->setPosition( Vec2(size.width/2, size.height * 0.3f) );
-    label2->setTextColor( Color4B::RED );
+    auto label2 = Label::createWithTTF(ttfConfig, "Distance Field", TextHAlignment::CENTER, size.width);
+    label2->setPosition(Vec2(size.width / 2, size.height * 0.3f));
+    label2->setTextColor(Color4B::RED);
     addChild(label2);
-    
+
     // Draw the label border
     auto& labelContentSize2 = label2->getContentSize();
-    auto borderDraw2 = DrawNode::create();
+    auto borderDraw2        = DrawNode::create();
     label2->addChild(borderDraw2);
     borderDraw2->clear();
     borderDraw2->setLineWidth(1);
-    Vec2 vertices2[4] =
-    {
-        Vec2::ZERO,
-        Vec2(labelContentSize2.width, 0.0f),
-        Vec2(labelContentSize2.width, labelContentSize2.height),
-        Vec2(0.0f, labelContentSize2.height)
-    };
+    Vec2 vertices2[4] = {Vec2::ZERO, Vec2(labelContentSize2.width, 0.0f),
+                         Vec2(labelContentSize2.width, labelContentSize2.height), Vec2(0.0f, labelContentSize2.height)};
     borderDraw2->drawPoly(vertices2, 4, true, Color4F::GREEN);
 }
 
@@ -1327,35 +1314,35 @@ LabelOutlineAndGlowTest::LabelOutlineAndGlowTest()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    auto bg = LayerColor::create(Color4B(200,191,231,255));
+    auto bg = LayerColor::create(Color4B(200, 191, 231, 255));
     this->addChild(bg);
 
-    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC,nullptr,true);
+    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC, nullptr, true);
 
-    auto label1 = Label::createWithTTF(ttfConfig,"Glow", TextHAlignment::CENTER, size.width);
-    label1->setPosition( Vec2(size.width/2, size.height*0.7) );
-    label1->setTextColor( Color4B::GREEN );
+    auto label1 = Label::createWithTTF(ttfConfig, "Glow", TextHAlignment::CENTER, size.width);
+    label1->setPosition(Vec2(size.width / 2, size.height * 0.7));
+    label1->setTextColor(Color4B::GREEN);
     label1->enableGlow(Color4B::YELLOW);
     addChild(label1);
 
     ttfConfig.outlineSize = 1;
-    auto label2 = Label::createWithTTF(ttfConfig,"Outline", TextHAlignment::CENTER, size.width);
-    label2->setPosition( Vec2(size.width/2, size.height*0.6) );
-    label2->setTextColor( Color4B::RED );
+    auto label2           = Label::createWithTTF(ttfConfig, "Outline", TextHAlignment::CENTER, size.width);
+    label2->setPosition(Vec2(size.width / 2, size.height * 0.6));
+    label2->setTextColor(Color4B::RED);
     label2->enableOutline(Color4B::BLUE);
     addChild(label2);
 
     ttfConfig.outlineSize = 2;
-    auto label3 = Label::createWithTTF(ttfConfig,"Outline", TextHAlignment::CENTER, size.width);
-    label3->setPosition( Vec2(size.width/2, size.height*0.48) );
-    label3->setTextColor( Color4B::RED );
+    auto label3           = Label::createWithTTF(ttfConfig, "Outline", TextHAlignment::CENTER, size.width);
+    label3->setPosition(Vec2(size.width / 2, size.height * 0.48));
+    label3->setTextColor(Color4B::RED);
     label3->enableOutline(Color4B::BLUE);
     addChild(label3);
 
     ttfConfig.outlineSize = 3;
-    auto label4 = Label::createWithTTF(ttfConfig,"Outline", TextHAlignment::CENTER, size.width);
-    label4->setPosition( Vec2(size.width/2, size.height*0.36) );
-    label4->setTextColor( Color4B::RED );
+    auto label4           = Label::createWithTTF(ttfConfig, "Outline", TextHAlignment::CENTER, size.width);
+    label4->setPosition(Vec2(size.width / 2, size.height * 0.36));
+    label4->setTextColor(Color4B::RED);
     label4->enableOutline(Color4B::BLUE);
     addChild(label4);
 }
@@ -1370,10 +1357,7 @@ std::string LabelOutlineAndGlowTest::subtitle() const
     return "Testing outline and glow of label";
 }
 
-LabelShadowTest::LabelShadowTest()
-{
-
-}
+LabelShadowTest::LabelShadowTest() {}
 
 void LabelShadowTest::onEnter()
 {
@@ -1381,7 +1365,7 @@ void LabelShadowTest::onEnter()
 
     auto size = Director::getInstance()->getWinSize();
 
-    auto bg = LayerColor::create(Color4B(200,191,231,255));
+    auto bg = LayerColor::create(Color4B(200, 191, 231, 255));
     this->addChild(bg);
 
     auto slider = ui::Slider::create();
@@ -1407,51 +1391,51 @@ void LabelShadowTest::onEnter()
     slider2->addEventListener(CC_CALLBACK_2(LabelShadowTest::sliderEvent, this));
     addChild(slider2, 999);
 
-    float subtitleY = _subtitleLabel->getPosition().y;
+    float subtitleY         = _subtitleLabel->getPosition().y;
     float horizontalSliderY = slider->getPosition().y;
-    float step = (subtitleY - horizontalSliderY) / 4;
+    float step              = (subtitleY - horizontalSliderY) / 4;
 
-    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC,nullptr,true);
+    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC, nullptr, true);
 
-    shadowLabelTTF = Label::createWithTTF(ttfConfig,"TTF:Shadow");
-    shadowLabelTTF->setPosition( Vec2(size.width/2, horizontalSliderY + step * (0.5f + 3)) );
-    shadowLabelTTF->setTextColor( Color4B::RED );
+    shadowLabelTTF = Label::createWithTTF(ttfConfig, "TTF:Shadow");
+    shadowLabelTTF->setPosition(Vec2(size.width / 2, horizontalSliderY + step * (0.5f + 3)));
+    shadowLabelTTF->setTextColor(Color4B::RED);
     shadowLabelTTF->enableShadow(Color4B::BLACK);
     addChild(shadowLabelTTF);
 
-    shadowLabelOutline = Label::createWithTTF(ttfConfig,"TTF:Shadow");
-    shadowLabelOutline->setPosition( Vec2(size.width/2, horizontalSliderY + step * (0.5f + 2)) );
-    shadowLabelOutline->setTextColor( Color4B::RED );
-    shadowLabelOutline->enableOutline(Color4B::YELLOW,1);
+    shadowLabelOutline = Label::createWithTTF(ttfConfig, "TTF:Shadow");
+    shadowLabelOutline->setPosition(Vec2(size.width / 2, horizontalSliderY + step * (0.5f + 2)));
+    shadowLabelOutline->setTextColor(Color4B::RED);
+    shadowLabelOutline->enableOutline(Color4B::YELLOW, 1);
     shadowLabelOutline->enableShadow(Color4B::GREEN);
     addChild(shadowLabelOutline);
 
-    shadowLabelGrow = Label::createWithTTF(ttfConfig,"TTF:Shadow");
-    shadowLabelGrow->setPosition( Vec2(size.width/2, horizontalSliderY + step * (0.5f + 1)) );
-    shadowLabelGrow->setTextColor( Color4B::RED );
+    shadowLabelGrow = Label::createWithTTF(ttfConfig, "TTF:Shadow");
+    shadowLabelGrow->setPosition(Vec2(size.width / 2, horizontalSliderY + step * (0.5f + 1)));
+    shadowLabelGrow->setTextColor(Color4B::RED);
     shadowLabelGrow->enableGlow(Color4B::YELLOW);
     shadowLabelGrow->enableShadow(Color4B::BLUE);
     addChild(shadowLabelGrow);
 
     shadowLabelBMFont = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "BMFont:Shadow");
-    shadowLabelBMFont->setPosition( Vec2(size.width/2, horizontalSliderY + step * 0.5f));
-    shadowLabelBMFont->setColor( Color3B::RED );
+    shadowLabelBMFont->setPosition(Vec2(size.width / 2, horizontalSliderY + step * 0.5f));
+    shadowLabelBMFont->setColor(Color3B::RED);
     shadowLabelBMFont->enableShadow(Color4B::GREEN);
     addChild(shadowLabelBMFont);
 }
 
-void LabelShadowTest::sliderEvent(Ref *pSender, ui::Slider::EventType type)
+void LabelShadowTest::sliderEvent(Ref* pSender, ui::Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
-        Slider*  slider = (Slider*)this->getChildByTag(1);
-        Slider*  slider2 = (Slider*)this->getChildByTag(2);
-
-        auto offset = Size(slider->getPercent()-50,50 - slider2->getPercent());
-        shadowLabelTTF->enableShadow(Color4B::BLACK,offset);
-        shadowLabelBMFont->enableShadow(Color4B::GREEN,offset);
-        shadowLabelOutline->enableShadow(Color4B::GREEN,offset);
-        shadowLabelGrow->enableShadow(Color4B::BLUE,offset);
+        Slider* slider  = (Slider*)this->getChildByTag(1);
+        Slider* slider2 = (Slider*)this->getChildByTag(2);
+
+        auto offset = Size(slider->getPercent() - 50, 50 - slider2->getPercent());
+        shadowLabelTTF->enableShadow(Color4B::BLACK, offset);
+        shadowLabelBMFont->enableShadow(Color4B::GREEN, offset);
+        shadowLabelOutline->enableShadow(Color4B::GREEN, offset);
+        shadowLabelGrow->enableShadow(Color4B::BLUE, offset);
     }
 }
 
@@ -1472,14 +1456,14 @@ LabelCharMapTest::LabelCharMapTest()
     auto label1 = Label::createWithCharMap("fonts/tuffy_bold_italic-charmap.plist");
     addChild(label1, 0, kTagSprite1);
     label1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    label1->setPosition( Vec2(10,100) );
-    label1->setOpacity( 200 );
+    label1->setPosition(Vec2(10, 100));
+    label1->setOpacity(200);
 
     auto label2 = Label::createWithCharMap("fonts/tuffy_bold_italic-charmap.plist");
     addChild(label2, 0, kTagSprite2);
     label2->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    label2->setPosition( Vec2(10,200) );
-    label2->setOpacity( 32 );
+    label2->setPosition(Vec2(10, 200));
+    label2->setOpacity(32);
 
     schedule(CC_CALLBACK_1(LabelCharMapTest::step, this), "step_key");
 }
@@ -1515,24 +1499,24 @@ std::string LabelCharMapTest::subtitle() const
 //------------------------------------------------------------------
 LabelCharMapColorTest::LabelCharMapColorTest()
 {
-    auto label1 = Label::createWithCharMap( "fonts/tuffy_bold_italic-charmap.plist");
+    auto label1 = Label::createWithCharMap("fonts/tuffy_bold_italic-charmap.plist");
     addChild(label1, 0, kTagSprite1);
     label1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    label1->setPosition( Vec2(10,100) );
-    label1->setOpacity( 200 );
+    label1->setPosition(Vec2(10, 100));
+    label1->setOpacity(200);
 
     auto label2 = Label::createWithCharMap("fonts/tuffy_bold_italic-charmap.plist");
     addChild(label2, 0, kTagSprite2);
     label2->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    label2->setPosition( Vec2(10,200) );
-    label2->setColor( Color3B::RED );
+    label2->setPosition(Vec2(10, 200));
+    label2->setColor(Color3B::RED);
 
-    auto fade = FadeOut::create(1.0f);
+    auto fade    = FadeOut::create(1.0f);
     auto fade_in = fade->reverse();
-    auto cb = CallFunc::create(CC_CALLBACK_0(LabelCharMapColorTest::actionFinishCallback, this));
-    auto seq = Sequence::create(fade, fade_in, cb, nullptr);
-    auto repeat = RepeatForever::create( seq );
-    label2->runAction( repeat );    
+    auto cb      = CallFunc::create(CC_CALLBACK_0(LabelCharMapColorTest::actionFinishCallback, this));
+    auto seq     = Sequence::create(fade, fade_in, cb, nullptr);
+    auto repeat  = RepeatForever::create(seq);
+    label2->runAction(repeat);
 
     _time = 0;
 
@@ -1554,7 +1538,7 @@ void LabelCharMapColorTest::step(float dt)
 
     auto label2 = (Label*)getChildByTag(kTagSprite2);
     sprintf(string, "%d", (int)_time);
-    label2->setString( string );    
+    label2->setString(string);
 }
 
 std::string LabelCharMapColorTest::title() const
@@ -1571,10 +1555,10 @@ LabelCrashTest::LabelCrashTest()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC,nullptr,true);
+    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC, nullptr, true);
 
-    auto label1 = Label::createWithTTF(ttfConfig,"Test崩溃123", TextHAlignment::CENTER, size.width);
-    label1->setPosition( Vec2(size.width/2, size.height/2) );
+    auto label1 = Label::createWithTTF(ttfConfig, "Test崩溃123", TextHAlignment::CENTER, size.width);
+    label1->setPosition(Vec2(size.width / 2, size.height / 2));
     addChild(label1);
 }
 
@@ -1590,50 +1574,42 @@ std::string LabelCrashTest::subtitle() const
 
 LabelTTFOldNew::LabelTTFOldNew()
 {
-    auto s = Director::getInstance()->getWinSize();
-    float delta = s.height/4;
+    auto s      = Director::getInstance()->getWinSize();
+    float delta = s.height / 4;
 
     auto label1 = Label::createWithSystemFont("Cocos2d-x Label Test", "arial", 24);
     addChild(label1, 0, kTagBitmapAtlas1);
-    label1->setPosition(Vec2(s.width/2, delta * 2));
+    label1->setPosition(Vec2(s.width / 2, delta * 2));
     label1->setColor(Color3B::RED);
 
     TTFConfig ttfConfig("fonts/arial.ttf", 24);
     auto label2 = Label::createWithTTF(ttfConfig, "Cocos2d-x Label Test");
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition(Vec2(s.width/2, delta * 2));
+    label2->setPosition(Vec2(s.width / 2, delta * 2));
 
-    auto drawNode = DrawNode::create();
+    auto drawNode  = DrawNode::create();
     auto labelSize = label1->getContentSize();
     auto origin    = Director::getInstance()->getWinSize();
-    
-    origin.width = origin.width   / 2 - (labelSize.width / 2);
+
+    origin.width  = origin.width / 2 - (labelSize.width / 2);
     origin.height = origin.height / 2 - (labelSize.height / 2);
-    
-    Vec2 vertices[4]=
-    {
-        Vec2(origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
-        Vec2(origin.width, labelSize.height + origin.height)
-    };
+
+    Vec2 vertices[4] = {Vec2(origin.width, origin.height), Vec2(labelSize.width + origin.width, origin.height),
+                        Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
+                        Vec2(origin.width, labelSize.height + origin.height)};
     drawNode->drawPoly(vertices, 4, true, Color4F(1.0f, 0.0f, 0.0f, 1.0f));
-    
+
     labelSize = label2->getContentSize();
     origin    = Director::getInstance()->getWinSize();
-    
-    origin.width = origin.width   / 2 - (labelSize.width / 2);
+
+    origin.width  = origin.width / 2 - (labelSize.width / 2);
     origin.height = origin.height / 2 - (labelSize.height / 2);
-    
-    Vec2 vertices2[4]=
-    {
-        Vec2(origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, origin.height),
-        Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
-        Vec2(origin.width, labelSize.height + origin.height)
-    };
+
+    Vec2 vertices2[4] = {Vec2(origin.width, origin.height), Vec2(labelSize.width + origin.width, origin.height),
+                         Vec2(labelSize.width + origin.width, labelSize.height + origin.height),
+                         Vec2(origin.width, labelSize.height + origin.height)};
     drawNode->drawPoly(vertices2, 4, true, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
-    
+
     addChild(drawNode);
 }
 
@@ -1653,11 +1629,11 @@ LabelFontNameTest::LabelFontNameTest()
 
     auto label1 = Label::create();
     label1->setString("Default Font");
-    label1->setPosition( Vec2(size.width/2, size.height * 0.7) );
+    label1->setPosition(Vec2(size.width / 2, size.height * 0.7));
     addChild(label1);
 
-    auto label3 = Label::createWithSystemFont("Marker Felt","Marker Felt",32);
-    label3->setPosition( Vec2(size.width/2, size.height * 0.5) );
+    auto label3 = Label::createWithSystemFont("Marker Felt", "Marker Felt", 32);
+    label3->setPosition(Vec2(size.width / 2, size.height * 0.5));
     addChild(label3);
 }
 
@@ -1674,9 +1650,9 @@ std::string LabelFontNameTest::subtitle() const
 LabelAlignmentTest::LabelAlignmentTest()
 {
     auto blockSize = Size(200, 160);
-    auto s = Director::getInstance()->getWinSize();
+    auto s         = Director::getInstance()->getWinSize();
 
-    auto pos = Vec2((s.width - blockSize.width) / 2, (s.height - blockSize.height) / 2);
+    auto pos        = Vec2((s.width - blockSize.width) / 2, (s.height - blockSize.height) / 2);
     auto colorLayer = LayerColor::create(Color4B(100, 100, 100, 255), blockSize.width, blockSize.height);
     colorLayer->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
     colorLayer->setPosition(pos);
@@ -1687,17 +1663,15 @@ LabelAlignmentTest::LabelAlignmentTest()
     auto menu = Menu::create(
         MenuItemFont::create("Left", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentLeft, this)),
         MenuItemFont::create("Center", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentCenter, this)),
-        MenuItemFont::create("Right", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentRight, this)),
-        nullptr);
+        MenuItemFont::create("Right", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentRight, this)), nullptr);
     menu->alignItemsVerticallyWithPadding(4);
     menu->setPosition(Vec2(50.0f, s.height / 2 - 20));
     this->addChild(menu);
 
-    menu = Menu::create(
-        MenuItemFont::create("Top", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentTop, this)),
-        MenuItemFont::create("Middle", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentMiddle, this)),
-        MenuItemFont::create("Bottom", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentBottom, this)),
-        nullptr);
+    menu = Menu::create(MenuItemFont::create("Top", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentTop, this)),
+                        MenuItemFont::create("Middle", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentMiddle, this)),
+                        MenuItemFont::create("Bottom", CC_CALLBACK_1(LabelAlignmentTest::setAlignmentBottom, this)),
+                        nullptr);
     menu->alignItemsVerticallyWithPadding(4);
     menu->setPosition(Vec2(s.width - 50, s.height / 2 - 20));
     this->addChild(menu);
@@ -1754,8 +1728,8 @@ LabelIssue4428Test::LabelIssue4428Test()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    auto label = Label::createWithBMFont( "fonts/bitmapFontTest3.fnt", "123\n456");
-    label->setPosition(Vec2(size.width /2.0f, size.height / 2.0f));
+    auto label = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "123\n456");
+    label->setPosition(Vec2(size.width / 2.0f, size.height / 2.0f));
     label->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
     addChild(label);
 
@@ -1782,7 +1756,7 @@ std::string LabelIssue4428Test::subtitle() const
 
 LabelIssue4999Test::LabelIssue4999Test()
 {
-    auto label = Label::createWithTTF("Smaller font test", "fonts/arial.ttf",5);
+    auto label = Label::createWithTTF("Smaller font test", "fonts/arial.ttf", 5);
     label->setPosition(VisibleRect::center());
     label->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     addChild(label);
@@ -1802,14 +1776,14 @@ LabelLineHeightTest::LabelLineHeightTest()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    auto bg = LayerColor::create(Color4B(200,191,231,255));
+    auto bg = LayerColor::create(Color4B(200, 191, 231, 255));
     this->addChild(bg);
 
-    TTFConfig ttfConfig("fonts/arial.ttf", 25, GlyphCollection::DYNAMIC,nullptr,false);
+    TTFConfig ttfConfig("fonts/arial.ttf", 25, GlyphCollection::DYNAMIC, nullptr, false);
 
-    label = Label::createWithTTF(ttfConfig,"Test\nLine\nHeight");
-    label->setPosition( Vec2(size.width/2, size.height*0.5f) );
-    label->setTextColor( Color4B::RED );
+    label = Label::createWithTTF(ttfConfig, "Test\nLine\nHeight");
+    label->setPosition(Vec2(size.width / 2, size.height * 0.5f));
+    label->setTextColor(Color4B::RED);
     addChild(label);
 
     auto slider = ui::Slider::create();
@@ -1823,11 +1797,11 @@ LabelLineHeightTest::LabelLineHeightTest()
     addChild(slider);
 }
 
-void LabelLineHeightTest::sliderEvent(Ref *sender, ui::Slider::EventType type)
+void LabelLineHeightTest::sliderEvent(Ref* sender, ui::Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
-        Slider*  slider = (Slider*)sender;
+        Slider* slider = (Slider*)sender;
         label->setLineHeight(slider->getPercent());
     }
 }
@@ -1846,14 +1820,14 @@ LabelAdditionalKerningTest::LabelAdditionalKerningTest()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    auto bg = LayerColor::create(Color4B(200,191,231,255));
+    auto bg = LayerColor::create(Color4B(200, 191, 231, 255));
     this->addChild(bg);
 
-    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC,nullptr,false);
+    TTFConfig ttfConfig("fonts/arial.ttf", 40, GlyphCollection::DYNAMIC, nullptr, false);
 
-    label = Label::createWithTTF(ttfConfig,"Test additional kerning");
-    label->setPosition(size.width/2, size.height * 0.5f);
-    label->setTextColor( Color4B::RED );
+    label = Label::createWithTTF(ttfConfig, "Test additional kerning");
+    label->setPosition(size.width / 2, size.height * 0.5f);
+    label->setTextColor(Color4B::RED);
     addChild(label);
 
     auto slider = ui::Slider::create();
@@ -1867,11 +1841,11 @@ LabelAdditionalKerningTest::LabelAdditionalKerningTest()
     addChild(slider);
 }
 
-void LabelAdditionalKerningTest::sliderEvent(Ref *sender, ui::Slider::EventType type)
+void LabelAdditionalKerningTest::sliderEvent(Ref* sender, ui::Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
-        Slider*  slider = (Slider*)sender;
+        Slider* slider = (Slider*)sender;
         label->setAdditionalKerning(slider->getPercent());
     }
 }
@@ -1889,7 +1863,7 @@ std::string LabelAdditionalKerningTest::subtitle() const
 LabelIssue8492Test::LabelIssue8492Test()
 {
     auto label = Label::createWithBMFont("fonts/bitmapFontChinese.fnt", "中国中国中国中国中国");
-    label->setDimensions(5,100);
+    label->setDimensions(5, 100);
     label->setPosition(VisibleRect::center());
     addChild(label);
 }
@@ -1906,8 +1880,8 @@ std::string LabelIssue8492Test::subtitle() const
 
 LabelMultilineWithOutline::LabelMultilineWithOutline()
 {
-    auto label =  Label::createWithTTF("Multi-line text\nwith\noutline feature", "fonts/arial.ttf", 24);
-    label->enableOutline(Color4B::ORANGE,1);
+    auto label = Label::createWithTTF("Multi-line text\nwith\noutline feature", "fonts/arial.ttf", 24);
+    label->enableOutline(Color4B::ORANGE, 1);
     label->setPosition(VisibleRect::center());
     addChild(label);
 }
@@ -1922,16 +1896,15 @@ std::string LabelMultilineWithOutline::subtitle() const
     return "end in string 'outline feature'";
 }
 
-
 LabelIssue9255Test::LabelIssue9255Test()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s      = Director::getInstance()->getWinSize();
     auto parent = Node::create();
-    parent->setPosition(s.width/2, s.height/2);
+    parent->setPosition(s.width / 2, s.height / 2);
     parent->setVisible(false);
     this->addChild(parent);
 
-    auto label =  Label::createWithTTF("Crashed!!!", "fonts/HKYuanMini.ttf", 24);
+    auto label = Label::createWithTTF("Crashed!!!", "fonts/HKYuanMini.ttf", 24);
     label->setPosition(VisibleRect::center());
     parent->addChild(label);
 }
@@ -1948,7 +1921,7 @@ std::string LabelIssue9255Test::subtitle() const
 
 LabelSmallDimensionsTest::LabelSmallDimensionsTest()
 {
-    auto label = Label::createWithSystemFont("Hello World!", "fonts/arial.ttf", 24, Size(30.0f,100.0f));
+    auto label = Label::createWithSystemFont("Hello World!", "fonts/arial.ttf", 24, Size(30.0f, 100.0f));
     label->setPosition(VisibleRect::center());
     addChild(label);
 }
@@ -1968,13 +1941,13 @@ LabelIssue10089Test::LabelIssue10089Test()
     auto center = VisibleRect::center();
 
     auto labelA = Label::createWithSystemFont("create label with system font", "fonts/arial.ttf", 24);
-    auto size = labelA->getContentSize();
+    auto size   = labelA->getContentSize();
     labelA->setDimensions(size.width, size.height);
     labelA->setPosition(center.x, center.y + 50);
     addChild(labelA);
 
     auto labelB = Label::createWithTTF("create label with TTF", "fonts/arial.ttf", 24);
-    size = labelB->getContentSize();
+    size        = labelB->getContentSize();
     labelB->setDimensions(size.width, size.height);
     labelB->setPosition(center.x, center.y - 50);
     addChild(labelB);
@@ -2056,9 +2029,8 @@ LabelIssue11576Test::LabelIssue11576Test()
         label->getLetter(index);
     }
 
-    this->runAction(Sequence::create(DelayTime::create(2.0f), CallFunc::create([label](){
-        label->setString("Hello World!");
-    }), nullptr));
+    this->runAction(Sequence::create(DelayTime::create(2.0f),
+                                     CallFunc::create([label]() { label->setString("Hello World!"); }), nullptr));
 
     label->setPosition(center.x, center.y);
     addChild(label);
@@ -2105,17 +2077,13 @@ LabelIssue12409Test::LabelIssue12409Test()
     addChild(label);
 
     auto labelSize = label->getContentSize();
-    auto winSize = Director::getInstance()->getWinSize();
+    auto winSize   = Director::getInstance()->getWinSize();
     Vec2 labelOrigin;
-    labelOrigin.x = winSize.width / 2 - (labelSize.width / 2);
-    labelOrigin.y = winSize.height / 2 - (labelSize.height / 2);
-    Vec2 vertices[4] =
-    {
-        Vec2(labelOrigin.x, labelOrigin.y),
-        Vec2(labelOrigin.x + labelSize.width, labelOrigin.y),
-        Vec2(labelOrigin.x + labelSize.width, labelOrigin.y + labelSize.height),
-        Vec2(labelOrigin.x, labelOrigin.y + labelSize.height)
-    };
+    labelOrigin.x    = winSize.width / 2 - (labelSize.width / 2);
+    labelOrigin.y    = winSize.height / 2 - (labelSize.height / 2);
+    Vec2 vertices[4] = {Vec2(labelOrigin.x, labelOrigin.y), Vec2(labelOrigin.x + labelSize.width, labelOrigin.y),
+                        Vec2(labelOrigin.x + labelSize.width, labelOrigin.y + labelSize.height),
+                        Vec2(labelOrigin.x, labelOrigin.y + labelSize.height)};
 
     auto drawNode = DrawNode::create();
     drawNode->drawPoly(vertices, 4, true, Color4F::WHITE);
@@ -2140,13 +2108,13 @@ LabelAddChildTest::LabelAddChildTest()
     label->setPosition(center.x, center.y);
     addChild(label);
 
-    auto jump = JumpBy::create(1.0f, Vec2::ZERO, 60, 1);
+    auto jump       = JumpBy::create(1.0f, Vec2::ZERO, 60, 1);
     auto jump_4ever = RepeatForever::create(jump);
     label->runAction(jump_4ever);
 
     auto spite = Sprite::create("Images/SpookyPeas.png");
     spite->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
-    spite->setPosition(label->getContentSize().width, label->getContentSize().height/2);
+    spite->setPosition(label->getContentSize().width, label->getContentSize().height / 2);
     label->addChild(spite);
 }
 
@@ -2185,8 +2153,7 @@ LabelIssue11585Test::LabelIssue11585Test()
     label->getLetter(0)->setColor(Color3B::RED);
     label->getLetter(1)->setColor(Color3B::GREEN);
     label->getLetter(2)->setColor(Color3B::BLUE);
-    auto action = RepeatForever::create(Sequence::create( 
-        FadeOut::create(2), FadeIn::create(2),nullptr));
+    auto action = RepeatForever::create(Sequence::create(FadeOut::create(2), FadeIn::create(2), nullptr));
     label->runAction(action);
 }
 
@@ -2207,9 +2174,9 @@ LabelIssue10688Test::LabelIssue10688Test()
     auto label = Label::createWithTTF("Glow MenuItemLabel", "fonts/arial.ttf", 30);
     label->setTextColor(Color4B::RED);
     label->enableGlow(Color4B::YELLOW);
-    auto menuItem1 = MenuItemLabel::create(label, [](Ref*){});
+    auto menuItem1 = MenuItemLabel::create(label, [](Ref*) {});
     menuItem1->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
-    menuItem1->setPosition(center.x - label->getContentSize().width/2, center.y);
+    menuItem1->setPosition(center.x - label->getContentSize().width / 2, center.y);
 
     auto menu = Menu::create(menuItem1, NULL);
     menu->setPosition(Vec2::ZERO);
@@ -2236,9 +2203,7 @@ LabelIssue13202Test::LabelIssue13202Test()
 
     label->getContentSize();
     label->setString("A");
-    this->scheduleOnce([](float dt){
-        FontAtlasCache::purgeCachedData();
-    }, 0.15f, "FontAtlasCache::purgeCachedData");
+    this->scheduleOnce([](float dt) { FontAtlasCache::purgeCachedData(); }, 0.15f, "FontAtlasCache::purgeCachedData");
 }
 
 std::string LabelIssue13202Test::title() const
@@ -2270,18 +2235,18 @@ std::string LabelIssue9500Test::subtitle() const
     return "Spaces should not be lost if label created with Fingerpop.ttf";
 }
 
-ControlStepper *LabelLayoutBaseTest::makeControlStepper()
+ControlStepper* LabelLayoutBaseTest::makeControlStepper()
 {
-    auto minusSprite       = Sprite::create("extensions/stepper-minus.png");
-    auto plusSprite        = Sprite::create("extensions/stepper-plus.png");
-    
+    auto minusSprite = Sprite::create("extensions/stepper-minus.png");
+    auto plusSprite  = Sprite::create("extensions/stepper-plus.png");
+
     return ControlStepper::create(minusSprite, plusSprite);
 }
 
 LabelLayoutBaseTest::LabelLayoutBaseTest()
 {
     auto size = Director::getInstance()->getVisibleSize();
-    
+
     this->initTestLabel(size);
 
     this->initFontSizeChange(size);
@@ -2301,19 +2266,18 @@ void LabelLayoutBaseTest::initFontSizeChange(const cocos2d::Size& size)
     auto fontSizeLabel = Label::createWithSystemFont("font size:20", "Arial", 10);
     fontSizeLabel->setName("fontSize");
 
-    ControlStepper *stepper   = this->makeControlStepper();
-    stepper->setPosition(size.width * 0.5 - stepper->getContentSize().width / 2,
-                         size.height * 0.8);
+    ControlStepper* stepper = this->makeControlStepper();
+    stepper->setPosition(size.width * 0.5 - stepper->getContentSize().width / 2, size.height * 0.8);
     stepper->setValue(20);
-    stepper->addTargetWithActionForControlEvents(this,
-                                                 cccontrol_selector(LabelLayoutBaseTest::valueChanged),
+    stepper->addTargetWithActionForControlEvents(this, cccontrol_selector(LabelLayoutBaseTest::valueChanged),
                                                  Control::EventType::VALUE_CHANGED);
     this->addChild(stepper);
     stepper->setName("stepper");
     stepper->setScale(0.5);
 
-    fontSizeLabel->setPosition(stepper->getPosition() -
-                               Vec2(stepper->getContentSize().width/2  + fontSizeLabel->getContentSize().width/2,0.0f));
+    fontSizeLabel->setPosition(
+        stepper->getPosition() -
+        Vec2(stepper->getContentSize().width / 2 + fontSizeLabel->getContentSize().width / 2, 0.0f));
     this->addChild(fontSizeLabel);
 }
 
@@ -2324,20 +2288,21 @@ void LabelLayoutBaseTest::initWrapOption(const cocos2d::Size& size)
     label->setPosition(Vec2(size.width * 0.8f - 100, size.height * 0.8f));
     this->addChild(label);
 
-    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                          "cocosui/check_box_normal_press.png",
-                                          "cocosui/check_box_active.png",
-                                          "cocosui/check_box_normal_disable.png",
+    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                          "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                           "cocosui/check_box_active_disable.png");
     checkBox->setPosition(Vec2(size.width * 0.8f - 55, size.height * 0.8f));
     checkBox->setScale(0.5);
     checkBox->setSelected(true);
     checkBox->setName("toggleWrap");
 
-    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
-        if (event == CheckBox::EventType::SELECTED) {
+    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event) {
+        if (event == CheckBox::EventType::SELECTED)
+        {
             _label->enableWrap(true);
-        }else{
+        }
+        else
+        {
             _label->enableWrap(false);
         }
         this->updateDrawNodeSize(_label->getContentSize());
@@ -2351,55 +2316,53 @@ void LabelLayoutBaseTest::initToggleLabelTypeOption(const cocos2d::Size& size)
     label->setColor(Color3B::WHITE);
     label->setPosition(Vec2(size.width * 0.8f + 15, size.height * 0.8f));
     this->addChild(label);
-    
-    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                          "cocosui/check_box_normal_press.png",
-                                          "cocosui/check_box_active.png",
-                                          "cocosui/check_box_normal_disable.png",
+
+    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                          "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                           "cocosui/check_box_active_disable.png");
     checkBox->setPosition(Vec2(size.width * 0.8f + 70, size.height * 0.8f));
     checkBox->setScale(0.5);
     checkBox->setName("toggleType");
     checkBox->setSelected(true);
 
-   auto stepper = (ControlStepper*)this->getChildByName("stepper");
+    auto stepper = (ControlStepper*)this->getChildByName("stepper");
 
-    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
-       float fontSize = stepper->getValue();
+    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event) {
+        float fontSize = stepper->getValue();
 
-        if (event == CheckBox::EventType::SELECTED) {
-            _labelType = 0;
-            auto ttfConfig = _label->getTTFConfig();
+        if (event == CheckBox::EventType::SELECTED)
+        {
+            _labelType         = 0;
+            auto ttfConfig     = _label->getTTFConfig();
             ttfConfig.fontSize = fontSize;
             _label->setTTFConfig(ttfConfig);
-        }else{
+        }
+        else
+        {
             _labelType = 1;
             _label->setBMFontFilePath("fonts/enligsh-chinese.fnt");
             _label->setBMFontSize(fontSize);
         }
     });
     this->addChild(checkBox);
-
 }
 
 void LabelLayoutBaseTest::initAlignmentOption(const cocos2d::Size& size)
 {
-    //add text alignment settings
+    // add text alignment settings
     MenuItemFont::setFontSize(30);
     auto menu = Menu::create(
         MenuItemFont::create("Left", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentLeft, this)),
         MenuItemFont::create("Center", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentCenter, this)),
-        MenuItemFont::create("Right", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentRight, this)),
-        nullptr);
+        MenuItemFont::create("Right", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentRight, this)), nullptr);
     menu->alignItemsVerticallyWithPadding(4);
     menu->setPosition(Vec2(50.0f, size.height / 2 - 20));
     this->addChild(menu);
 
-    menu = Menu::create(
-        MenuItemFont::create("Top", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentTop, this)),
-        MenuItemFont::create("Middle", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentMiddle, this)),
-        MenuItemFont::create("Bottom", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentBottom, this)),
-        nullptr);
+    menu = Menu::create(MenuItemFont::create("Top", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentTop, this)),
+                        MenuItemFont::create("Middle", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentMiddle, this)),
+                        MenuItemFont::create("Bottom", CC_CALLBACK_1(LabelLayoutBaseTest::setAlignmentBottom, this)),
+                        nullptr);
     menu->alignItemsVerticallyWithPadding(4);
     menu->setPosition(Vec2(size.width - 50, size.height / 2 - 20));
     this->addChild(menu);
@@ -2429,22 +2392,24 @@ void LabelLayoutBaseTest::initSliders(const cocos2d::Size& size)
     addChild(slider2);
     auto winSize = Director::getInstance()->getVisibleSize();
 
-    slider->addEventListener([=](Ref* ref, Slider::EventType event){
-        float percent = slider->getPercent();
-        auto labelSize = _label->getContentSize();
+    slider->addEventListener([=](Ref* ref, Slider::EventType event) {
+        float percent     = slider->getPercent();
+        auto labelSize    = _label->getContentSize();
         auto drawNodeSize = Size(percent / 100.0 * winSize.width, labelSize.height);
-        if(drawNodeSize.width <=0){
+        if (drawNodeSize.width <= 0)
+        {
             drawNodeSize.width = 0.1f;
         }
         _label->setDimensions(drawNodeSize.width, drawNodeSize.height);
         this->updateDrawNodeSize(drawNodeSize);
     });
 
-    slider2->addEventListener([=](Ref* ref, Slider::EventType event){
-        float percent = slider2->getPercent();
-        auto labelSize = _label->getContentSize();
-        auto drawNodeSize = Size( labelSize.width, percent / 100.0 * winSize.height);
-        if(drawNodeSize.height <= 0){
+    slider2->addEventListener([=](Ref* ref, Slider::EventType event) {
+        float percent     = slider2->getPercent();
+        auto labelSize    = _label->getContentSize();
+        auto drawNodeSize = Size(labelSize.width, percent / 100.0 * winSize.height);
+        if (drawNodeSize.height <= 0)
+        {
             drawNodeSize.height = 0.1f;
         }
         _label->setDimensions(drawNodeSize.width, drawNodeSize.height);
@@ -2456,7 +2421,7 @@ void LabelLayoutBaseTest::initTestLabel(const cocos2d::Size& size)
 {
     auto center = VisibleRect::center();
     _label = Label::createWithTTF("五六七八This is a very long sentence一二三四.", "fonts/HKYuanMini.ttf", 20);
-    _label->setDimensions(size.width/2, size.height/2);
+    _label->setDimensions(size.width / 2, size.height / 2);
     _label->setPosition(center);
     _label->setName("Label");
     _label->setString("五六七八This is a very long sentence一二三.");
@@ -2473,7 +2438,6 @@ void LabelLayoutBaseTest::initDrawNode(const cocos2d::Size& size)
     this->updateDrawNodeSize(_label->getContentSize());
 }
 
-
 void LabelLayoutBaseTest::setAlignmentLeft(Ref* sender)
 {
     _label->setHorizontalAlignment(TextHAlignment::LEFT);
@@ -2504,56 +2468,55 @@ void LabelLayoutBaseTest::setAlignmentBottom(Ref* sender)
     _label->setVerticalAlignment(TextVAlignment::BOTTOM);
 }
 
-
-void LabelLayoutBaseTest::valueChanged(cocos2d::Ref *sender, cocos2d::extension::Control::EventType controlEvent)
+void LabelLayoutBaseTest::valueChanged(cocos2d::Ref* sender, cocos2d::extension::Control::EventType controlEvent)
 {
     ControlStepper* pControl = (ControlStepper*)sender;
     // Change value of label.
     auto fontSizeLabel = (Label*)this->getChildByName("fontSize");
-    float fontSize = (float)pControl->getValue();
+    float fontSize     = (float)pControl->getValue();
     fontSizeLabel->setString(StringUtils::format("font size:%d", (int)fontSize));
-    
-    if (_labelType == 0) {
-        auto ttfConfig = _label->getTTFConfig();
+
+    if (_labelType == 0)
+    {
+        auto ttfConfig     = _label->getTTFConfig();
         ttfConfig.fontSize = fontSize;
         _label->setTTFConfig(ttfConfig);
-    }else if(_labelType == 1){
+    }
+    else if (_labelType == 1)
+    {
         _label->setBMFontSize(fontSize);
-    }else if (_labelType == 2) {
+    }
+    else if (_labelType == 2)
+    {
         _label->setSystemFontSize(fontSize);
     }
     this->updateDrawNodeSize(_label->getContentSize());
-    
-    //FIXME::When calling getLetter, the label Overflow feature will be invalid.
-//    auto letterSprite = _label->getLetter(1);
-//    auto moveBy = ScaleBy::create(1.0,2.0);
-//    letterSprite->stopAllActions();
-//    letterSprite->runAction(Sequence::create(moveBy, moveBy->clone()->reverse(), nullptr ));
-//    
-//    CCLOG("label line height = %f", _label->getLineHeight());
+
+    // FIXME::When calling getLetter, the label Overflow feature will be invalid.
+    //    auto letterSprite = _label->getLetter(1);
+    //    auto moveBy = ScaleBy::create(1.0,2.0);
+    //    letterSprite->stopAllActions();
+    //    letterSprite->runAction(Sequence::create(moveBy, moveBy->clone()->reverse(), nullptr ));
+    //
+    //    CCLOG("label line height = %f", _label->getLineHeight());
 }
 
-void LabelLayoutBaseTest::updateDrawNodeSize(const cocos2d::Size &drawNodeSize)
+void LabelLayoutBaseTest::updateDrawNodeSize(const cocos2d::Size& drawNodeSize)
 {
     auto origin    = Director::getInstance()->getWinSize();
     auto labelSize = _label->getContentSize();
 
-    origin.width = origin.width   / 2 - (labelSize.width / 2);
+    origin.width  = origin.width / 2 - (labelSize.width / 2);
     origin.height = origin.height / 2 - (labelSize.height / 2);
 
-    Vec2 vertices[4]=
-    {
-        Vec2(origin.width, origin.height),
-        Vec2(drawNodeSize.width + origin.width, origin.height),
-        Vec2(drawNodeSize.width + origin.width, drawNodeSize.height + origin.height),
-        Vec2(origin.width, drawNodeSize.height + origin.height)
-    };
+    Vec2 vertices[4] = {Vec2(origin.width, origin.height), Vec2(drawNodeSize.width + origin.width, origin.height),
+                        Vec2(drawNodeSize.width + origin.width, drawNodeSize.height + origin.height),
+                        Vec2(origin.width, drawNodeSize.height + origin.height)};
     _drawNode->clear();
     _drawNode->drawLine(vertices[0], vertices[1], Color4F(1.0f, 1.0f, 1.0f, 1.0f));
     _drawNode->drawLine(vertices[0], vertices[3], Color4F(1.0f, 1.0f, 1.0f, 1.0f));
     _drawNode->drawLine(vertices[2], vertices[3], Color4F(1.0f, 1.0f, 1.0f, 1.0f));
     _drawNode->drawLine(vertices[1], vertices[2], Color4F(1.0f, 1.0f, 1.0f, 1.0f));
-
 }
 
 LabelWrapByWordTest::LabelWrapByWordTest()
@@ -2562,7 +2525,6 @@ LabelWrapByWordTest::LabelWrapByWordTest()
     _label->setAdditionalKerning(2);
     _label->setVerticalAlignment(TextVAlignment::CENTER);
     _label->setOverflow(Label::Overflow::CLAMP);
-
 }
 
 std::string LabelWrapByWordTest::title() const
@@ -2577,13 +2539,12 @@ std::string LabelWrapByWordTest::subtitle() const
 
 LabelWrapByCharTest::LabelWrapByCharTest()
 {
-   _label->setLineBreakWithoutSpace(true);
+    _label->setLineBreakWithoutSpace(true);
     _label->setString("五六七八This \nis a very long sentence一二三四.");
     _label->setLineSpacing(5);
     _label->setAdditionalKerning(2);
     _label->setVerticalAlignment(TextVAlignment::TOP);
     _label->setOverflow(Label::Overflow::CLAMP);
-
 }
 
 std::string LabelWrapByCharTest::title() const
@@ -2601,8 +2562,9 @@ std::string LabelWrapByCharTest::subtitle() const
 LabelWrapNoBreakSpaceTest::LabelWrapNoBreakSpaceTest()
 {
     _label->setLineBreakWithoutSpace(false);
-    const char* no_break_space_utf8 = "\xC2\xA0"; // 0xA0 - no-break space
-    auto str = StringUtils::format("The price is $%s1.25. \n\nthe space between \"$\" and \"1.25\" is a no break space.", no_break_space_utf8);
+    const char* no_break_space_utf8 = "\xC2\xA0";  // 0xA0 - no-break space
+    auto str                        = StringUtils::format(
+                               "The price is $%s1.25. \n\nthe space between \"$\" and \"1.25\" is a no break space.", no_break_space_utf8);
     _label->setString(str);
     _label->setVerticalAlignment(TextVAlignment::TOP);
     _label->setOverflow(Label::Overflow::CLAMP);
@@ -2666,19 +2628,19 @@ LabelResizeTest::LabelResizeTest()
     _label->setVerticalAlignment(TextVAlignment::TOP);
     _label->setOverflow(Label::Overflow::RESIZE_HEIGHT);
 
-
     this->updateDrawNodeSize(_label->getContentSize());
 
     auto slider1 = (ui::Slider*)this->getChildByTag(1);
 
-     auto slider2 = (ui::Slider*)this->getChildByTag(2);
-     slider2->setVisible(false);
-    
+    auto slider2 = (ui::Slider*)this->getChildByTag(2);
+    slider2->setVisible(false);
+
     auto winSize = Director::getInstance()->getVisibleSize();
-    slider1->addEventListener([=](Ref* ref, Slider::EventType event){
-        float percent = slider1->getPercent();
-        auto drawNodeSize = Size(percent / 100.0 * winSize.width,_label->getContentSize().height);
-        if(drawNodeSize.height <= 0){
+    slider1->addEventListener([=](Ref* ref, Slider::EventType event) {
+        float percent     = slider1->getPercent();
+        auto drawNodeSize = Size(percent / 100.0 * winSize.width, _label->getContentSize().height);
+        if (drawNodeSize.height <= 0)
+        {
             drawNodeSize.height = 0.1f;
         }
         _label->setDimensions(drawNodeSize.width, drawNodeSize.height);
@@ -2687,32 +2649,32 @@ LabelResizeTest::LabelResizeTest()
 
     auto stepper = (ControlStepper*)this->getChildByName("stepper");
     stepper->setValue(12);
-    
+
     auto label = Label::createWithSystemFont("Char Line break:", "Arial", 10);
     label->setColor(Color3B::WHITE);
     label->setPosition(Vec2(winSize.width * 0.1f, winSize.height * 0.8f));
     this->addChild(label);
-    
-    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                          "cocosui/check_box_normal_press.png",
-                                          "cocosui/check_box_active.png",
-                                          "cocosui/check_box_normal_disable.png",
+
+    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                          "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                           "cocosui/check_box_active_disable.png");
-    checkBox->setPosition(Vec2(winSize.width * 0.2f , winSize.height * 0.8f));
+    checkBox->setPosition(Vec2(winSize.width * 0.2f, winSize.height * 0.8f));
     checkBox->setScale(0.5);
     checkBox->setSelected(false);
     checkBox->setName("LineBreak");
-    
-    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
-        if (event == CheckBox::EventType::SELECTED) {
+
+    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event) {
+        if (event == CheckBox::EventType::SELECTED)
+        {
             _label->setLineBreakWithoutSpace(true);
-        }else{
+        }
+        else
+        {
             _label->setLineBreakWithoutSpace(false);
         }
         this->updateDrawNodeSize(_label->getContentSize());
     });
     this->addChild(checkBox);
-
 }
 
 std::string LabelResizeTest::title() const
@@ -2732,19 +2694,19 @@ LabelToggleTypeTest::LabelToggleTypeTest()
     _label->setVerticalAlignment(TextVAlignment::CENTER);
     _label->setOverflow(Label::Overflow::NONE);
 
-
     this->updateDrawNodeSize(_label->getContentSize());
 
     auto slider1 = (ui::Slider*)this->getChildByTag(1);
 
-     auto slider2 = (ui::Slider*)this->getChildByTag(2);
-     slider2->setVisible(false);
+    auto slider2 = (ui::Slider*)this->getChildByTag(2);
+    slider2->setVisible(false);
 
     auto winSize = Director::getInstance()->getVisibleSize();
-    slider1->addEventListener([=](Ref* ref, Slider::EventType event){
-        float percent = slider1->getPercent();
-        auto drawNodeSize = Size(percent / 100.0 * winSize.width,_label->getContentSize().height);
-        if(drawNodeSize.height <= 0){
+    slider1->addEventListener([=](Ref* ref, Slider::EventType event) {
+        float percent     = slider1->getPercent();
+        auto drawNodeSize = Size(percent / 100.0 * winSize.width, _label->getContentSize().height);
+        if (drawNodeSize.height <= 0)
+        {
             drawNodeSize.height = 0.1f;
         }
         _label->setDimensions(drawNodeSize.width, drawNodeSize.height);
@@ -2759,20 +2721,21 @@ LabelToggleTypeTest::LabelToggleTypeTest()
     label->setPosition(Vec2(winSize.width * 0.1f, winSize.height * 0.8f));
     this->addChild(label);
 
-    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                          "cocosui/check_box_normal_press.png",
-                                          "cocosui/check_box_active.png",
-                                          "cocosui/check_box_normal_disable.png",
+    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                          "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                           "cocosui/check_box_active_disable.png");
-    checkBox->setPosition(Vec2(winSize.width * 0.2f , winSize.height * 0.8f));
+    checkBox->setPosition(Vec2(winSize.width * 0.2f, winSize.height * 0.8f));
     checkBox->setScale(0.5);
     checkBox->setSelected(false);
     checkBox->setName("LineBreak");
 
-    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
-        if (event == CheckBox::EventType::SELECTED) {
+    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event) {
+        if (event == CheckBox::EventType::SELECTED)
+        {
             _label->setLineBreakWithoutSpace(true);
-        }else{
+        }
+        else
+        {
             _label->setLineBreakWithoutSpace(false);
         }
         this->updateDrawNodeSize(_label->getContentSize());
@@ -2785,32 +2748,32 @@ LabelToggleTypeTest::LabelToggleTypeTest()
 void LabelToggleTypeTest::initToggleCheckboxes()
 {
     const float BUTTON_WIDTH = 100;
-    float startPosX = 0;
-    Size winSize = Director::getInstance()->getVisibleSize();
+    float startPosX          = 0;
+    Size winSize             = Director::getInstance()->getVisibleSize();
 
     // Create a radio button group
     auto radioButtonGroup = RadioButtonGroup::create();
     this->addChild(radioButtonGroup);
 
     // Create the radio buttons
-    static const int NUMBER_OF_BUTTONS = 4;
-    startPosX = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1 ) * 0.5 * BUTTON_WIDTH - 30;
+    static const int NUMBER_OF_BUTTONS  = 4;
+    startPosX                           = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1) * 0.5 * BUTTON_WIDTH - 30;
     std::vector<std::string> labelTypes = {"Normal", "Clamp", "Shrink", "RESIZE"};
-    
-    for(int i = 0; i < NUMBER_OF_BUTTONS; ++i)
+
+    for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
     {
 
         RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
-        float posX = startPosX + BUTTON_WIDTH * i;
+        float posX               = startPosX + BUTTON_WIDTH * i;
         radioButton->setPosition(Vec2(posX, winSize.height / 2.0f + 70));
         radioButton->setScale(1.2f);
         radioButton->addEventListener(CC_CALLBACK_2(LabelToggleTypeTest::onChangedRadioButtonSelect, this));
         radioButton->setTag(i);
         radioButtonGroup->addRadioButton(radioButton);
         this->addChild(radioButton);
-        
+
         auto label = Label::createWithSystemFont(labelTypes.at(i), "Arial", 20);
-        label->setPosition(radioButton->getPosition() + Vec2(50.0f,0.0f));
+        label->setPosition(radioButton->getPosition() + Vec2(50.0f, 0.0f));
         this->addChild(label);
     }
 }
@@ -2825,33 +2788,33 @@ std::string LabelToggleTypeTest::subtitle() const
     return "";
 }
 
-
 void LabelToggleTypeTest::onChangedRadioButtonSelect(RadioButton* radioButton, RadioButton::EventType type)
 {
-    if(radioButton == nullptr)
+    if (radioButton == nullptr)
     {
         return;
     }
-    
+
     switch (type)
     {
     case RadioButton::EventType::SELECTED:
     {
-        switch (radioButton->getTag()) {
-            case 0:
-                _label->setOverflow(Label::Overflow::NONE);
-                break;
-            case 1:
-                _label->setOverflow(Label::Overflow::CLAMP);
-                break;
-            case 2:
-                _label->setOverflow(Label::Overflow::SHRINK);
-                break;
-            case 3:
-                _label->setOverflow(Label::Overflow::RESIZE_HEIGHT);
-                break;
-            default:
-                break;
+        switch (radioButton->getTag())
+        {
+        case 0:
+            _label->setOverflow(Label::Overflow::NONE);
+            break;
+        case 1:
+            _label->setOverflow(Label::Overflow::CLAMP);
+            break;
+        case 2:
+            _label->setOverflow(Label::Overflow::SHRINK);
+            break;
+        case 3:
+            _label->setOverflow(Label::Overflow::RESIZE_HEIGHT);
+            break;
+        default:
+            break;
         }
         break;
     }
@@ -2873,10 +2836,10 @@ LabelSystemFontTest::LabelSystemFontTest()
     _label->enableOutline(Color4B::RED, 1.0);
     _label->setString("This is a very\n 我爱你中国\n long sentence");
     _labelType = 2;
-    
+
     auto stepper = (ControlStepper*)this->getChildByName("stepper");
     stepper->setEnabled(true);
-    
+
     auto checkbox = (CheckBox*)(this->getChildByName("toggleType"));
     checkbox->setEnabled(false);
 
@@ -2885,36 +2848,37 @@ LabelSystemFontTest::LabelSystemFontTest()
     auto slider1 = (ui::Slider*)this->getChildByTag(1);
 
     auto winSize = Director::getInstance()->getVisibleSize();
-    slider1->addEventListener([=](Ref* ref, Slider::EventType event){
-        float percent = slider1->getPercent();
-        auto drawNodeSize = Size(percent / 100.0 * winSize.width,_label->getContentSize().height);
-        if(drawNodeSize.height <= 0){
+    slider1->addEventListener([=](Ref* ref, Slider::EventType event) {
+        float percent     = slider1->getPercent();
+        auto drawNodeSize = Size(percent / 100.0 * winSize.width, _label->getContentSize().height);
+        if (drawNodeSize.height <= 0)
+        {
             drawNodeSize.height = 0.1f;
         }
         _label->setDimensions(drawNodeSize.width, drawNodeSize.height);
         this->updateDrawNodeSize(drawNodeSize);
     });
 
-
     auto label = Label::createWithSystemFont("char Line break:", "Arial", 10);
     label->setColor(Color3B::WHITE);
     label->setPosition(Vec2(winSize.width * 0.1f, winSize.height * 0.8f));
     this->addChild(label);
 
-    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                          "cocosui/check_box_normal_press.png",
-                                          "cocosui/check_box_active.png",
-                                          "cocosui/check_box_normal_disable.png",
+    CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                          "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                           "cocosui/check_box_active_disable.png");
-    checkBox->setPosition(Vec2(winSize.width * 0.2f , winSize.height * 0.8f));
+    checkBox->setPosition(Vec2(winSize.width * 0.2f, winSize.height * 0.8f));
     checkBox->setScale(0.5);
     checkBox->setSelected(false);
     checkBox->setName("LineBreak");
 
-    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event){
-        if (event == CheckBox::EventType::SELECTED) {
+    checkBox->addEventListener([=](Ref* ref, CheckBox::EventType event) {
+        if (event == CheckBox::EventType::SELECTED)
+        {
             _label->setLineBreakWithoutSpace(true);
-        }else{
+        }
+        else
+        {
             _label->setLineBreakWithoutSpace(false);
         }
         this->updateDrawNodeSize(_label->getContentSize());
@@ -2930,23 +2894,23 @@ LabelSystemFontTest::LabelSystemFontTest()
 void LabelSystemFontTest::initToggleCheckboxes()
 {
     const float BUTTON_WIDTH = 100;
-    float startPosX = 0;
-    Size winSize = Director::getInstance()->getVisibleSize();
+    float startPosX          = 0;
+    Size winSize             = Director::getInstance()->getVisibleSize();
 
     // Create a radio button group
     auto radioButtonGroup = RadioButtonGroup::create();
     this->addChild(radioButtonGroup);
 
     // Create the radio buttons
-    static const int NUMBER_OF_BUTTONS = 4;
-    startPosX = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1 ) * 0.5 * BUTTON_WIDTH - 30;
+    static const int NUMBER_OF_BUTTONS  = 4;
+    startPosX                           = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1) * 0.5 * BUTTON_WIDTH - 30;
     std::vector<std::string> labelTypes = {"Normal", "Clamp", "Shrink", "RESIZE"};
 
-    for(int i = 0; i < NUMBER_OF_BUTTONS; ++i)
+    for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
     {
 
         RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
-        float posX = startPosX + BUTTON_WIDTH * i;
+        float posX               = startPosX + BUTTON_WIDTH * i;
         radioButton->setPosition(Vec2(posX, winSize.height / 2.0f + 70));
         radioButton->setScale(1.2f);
         radioButton->addEventListener(CC_CALLBACK_2(LabelSystemFontTest::onChangedRadioButtonSelect, this));
@@ -2955,7 +2919,7 @@ void LabelSystemFontTest::initToggleCheckboxes()
         this->addChild(radioButton);
 
         auto label = Label::createWithSystemFont(labelTypes.at(i), "Arial", 20);
-        label->setPosition(radioButton->getPosition() + Vec2(50.0f,0.0f));
+        label->setPosition(radioButton->getPosition() + Vec2(50.0f, 0.0f));
         this->addChild(label);
     }
 }
@@ -2970,10 +2934,9 @@ std::string LabelSystemFontTest::subtitle() const
     return "";
 }
 
-
 void LabelSystemFontTest::onChangedRadioButtonSelect(RadioButton* radioButton, RadioButton::EventType type)
 {
-    if(radioButton == nullptr)
+    if (radioButton == nullptr)
     {
         return;
     }
@@ -2982,21 +2945,22 @@ void LabelSystemFontTest::onChangedRadioButtonSelect(RadioButton* radioButton, R
     {
     case RadioButton::EventType::SELECTED:
     {
-        switch (radioButton->getTag()) {
-            case 0:
-                _label->setOverflow(Label::Overflow::NONE);
-                break;
-            case 1:
-                _label->setOverflow(Label::Overflow::CLAMP);
-                break;
-            case 2:
-                _label->setOverflow(Label::Overflow::SHRINK);
-                break;
-            case 3:
-                _label->setOverflow(Label::Overflow::RESIZE_HEIGHT);
-                break;
-            default:
-                break;
+        switch (radioButton->getTag())
+        {
+        case 0:
+            _label->setOverflow(Label::Overflow::NONE);
+            break;
+        case 1:
+            _label->setOverflow(Label::Overflow::CLAMP);
+            break;
+        case 2:
+            _label->setOverflow(Label::Overflow::SHRINK);
+            break;
+        case 3:
+            _label->setOverflow(Label::Overflow::RESIZE_HEIGHT);
+            break;
+        default:
+            break;
         }
         break;
     }
@@ -3022,10 +2986,8 @@ LabelCharMapFontTest::LabelCharMapFontTest()
     checkbox->setEnabled(false);
 
     this->updateDrawNodeSize(_label->getContentSize());
-
 }
 
-
 std::string LabelCharMapFontTest::title() const
 {
     return "CharMap Font Test";
@@ -3039,11 +3001,11 @@ std::string LabelCharMapFontTest::subtitle() const
 LabelIssue13846Test::LabelIssue13846Test()
 {
     auto center = VisibleRect::center();
-    
+
     auto label = Label::createWithTTF("12345", "fonts/arial.ttf", 26);
     label->setPosition(center);
     addChild(label);
-    
+
     label->getLetter(2)->setVisible(false);
 }
 
@@ -3064,7 +3026,8 @@ LabelRichText::LabelRichText()
 {
     auto center = VisibleRect::center();
 
-    auto richText2 = RichText::createWithXML("Mixing <b>UIRichText</b> with non <i>UIWidget</i> code. For more samples, see the UIRichTextTest.cpp file");
+    auto richText2 = RichText::createWithXML(
+        "Mixing <b>UIRichText</b> with non <i>UIWidget</i> code. For more samples, see the UIRichTextTest.cpp file");
     if (richText2)
     {
         richText2->ignoreContentAdaptWithSize(false);
@@ -3090,29 +3053,29 @@ LabelItalics::LabelItalics()
     auto s = Director::getInstance()->getWinSize();
 
     // LabelBMFont
-    auto label1 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-italics", TextHAlignment::CENTER, s.width);
+    auto label1 =
+        Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-italics", TextHAlignment::CENTER, s.width);
     addChild(label1, 0, kTagBitmapAtlas1);
-    label1->setPosition(Vec2(s.width/2, s.height*4/6));
+    label1->setPosition(Vec2(s.width / 2, s.height * 4 / 6));
     // you can enable italics by calling this method
 
     _label1a = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello italics", TextHAlignment::CENTER, s.width);
     addChild(_label1a, 0, kTagBitmapAtlas1);
-    _label1a->setPosition(Vec2(s.width/2, s.height*3/6));
+    _label1a->setPosition(Vec2(s.width / 2, s.height * 3 / 6));
     // you can enable italics by calling this method
     _label1a->enableItalics();
 
-
     // LabelTTF
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
-    auto label2 = Label::createWithTTF(ttfConfig, "hello non-italics", TextHAlignment::CENTER,s.width);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
+    auto label2 = Label::createWithTTF(ttfConfig, "hello non-italics", TextHAlignment::CENTER, s.width);
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition(Vec2(s.width/2, s.height*2/6));
+    label2->setPosition(Vec2(s.width / 2, s.height * 2 / 6));
 
     // or by setting the italics parameter on TTFConfig
     ttfConfig.italics = true;
-    _label2a = Label::createWithTTF(ttfConfig, "hello italics", TextHAlignment::CENTER,s.width);
+    _label2a          = Label::createWithTTF(ttfConfig, "hello italics", TextHAlignment::CENTER, s.width);
     addChild(_label2a, 0, kTagBitmapAtlas2);
-    _label2a->setPosition(Vec2(s.width/2, s.height*1/6));
+    _label2a->setPosition(Vec2(s.width / 2, s.height * 1 / 6));
 
     auto menuItem = MenuItemFont::create("disable italics", [&](cocos2d::Ref* sender) {
         _label2a->disableEffect(LabelEffect::ITALICS);
@@ -3142,29 +3105,29 @@ LabelBold::LabelBold()
     auto s = Director::getInstance()->getWinSize();
 
     // LabelBMFont
-    auto label1 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-bold", TextHAlignment::CENTER, s.width);
+    auto label1 =
+        Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-bold", TextHAlignment::CENTER, s.width);
     addChild(label1, 0, kTagBitmapAtlas1);
-    label1->setPosition(Vec2(s.width/2, s.height*4/6));
+    label1->setPosition(Vec2(s.width / 2, s.height * 4 / 6));
     // you can enable italics by calling this method
 
     _label1a = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello bold", TextHAlignment::CENTER, s.width);
     addChild(_label1a, 0, kTagBitmapAtlas1);
-    _label1a->setPosition(Vec2(s.width/2, s.height*3/6));
+    _label1a->setPosition(Vec2(s.width / 2, s.height * 3 / 6));
     // you can enable italics by calling this method
     _label1a->enableBold();
 
-
     // LabelTTF
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
-    auto label2 = Label::createWithTTF(ttfConfig, "hello non-bold", TextHAlignment::CENTER,s.width);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
+    auto label2 = Label::createWithTTF(ttfConfig, "hello non-bold", TextHAlignment::CENTER, s.width);
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition(Vec2(s.width/2, s.height*2/6));
+    label2->setPosition(Vec2(s.width / 2, s.height * 2 / 6));
 
     // or by setting the italics parameter on TTFConfig
     ttfConfig.bold = true;
-    _label2a = Label::createWithTTF(ttfConfig, "hello bold", TextHAlignment::CENTER,s.width);
+    _label2a       = Label::createWithTTF(ttfConfig, "hello bold", TextHAlignment::CENTER, s.width);
     addChild(_label2a, 0, kTagBitmapAtlas2);
-    _label2a->setPosition(Vec2(s.width/2, s.height*1/6));
+    _label2a->setPosition(Vec2(s.width / 2, s.height * 1 / 6));
 
     auto menuItem = MenuItemFont::create("disable bold", [&](cocos2d::Ref* sender) {
         _label2a->disableEffect(LabelEffect::BOLD);
@@ -3194,29 +3157,29 @@ LabelUnderline::LabelUnderline()
     auto s = Director::getInstance()->getWinSize();
 
     // LabelBMFont
-    auto label1 = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-underline", TextHAlignment::CENTER, s.width);
+    auto label1 =
+        Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello non-underline", TextHAlignment::CENTER, s.width);
     addChild(label1, 0, kTagBitmapAtlas1);
-    label1->setPosition(Vec2(s.width/2, s.height*4/6));
+    label1->setPosition(Vec2(s.width / 2, s.height * 4 / 6));
     // you can enable italics by calling this method
 
     _label1a = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "hello underline", TextHAlignment::CENTER, s.width);
     addChild(_label1a, 0, kTagBitmapAtlas1);
-    _label1a->setPosition(Vec2(s.width/2, s.height*3/6));
+    _label1a->setPosition(Vec2(s.width / 2, s.height * 3 / 6));
     // you can enable underline by calling this method
     _label1a->enableUnderline();
 
-
     // LabelTTF
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
-    auto label2 = Label::createWithTTF(ttfConfig, "hello non-underline", TextHAlignment::CENTER,s.width);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
+    auto label2 = Label::createWithTTF(ttfConfig, "hello non-underline", TextHAlignment::CENTER, s.width);
     addChild(label2, 0, kTagBitmapAtlas2);
-    label2->setPosition(Vec2(s.width/2, s.height*2/6));
+    label2->setPosition(Vec2(s.width / 2, s.height * 2 / 6));
 
     // or by setting the italics parameter on TTFConfig
     ttfConfig.underline = true;
-    _label2a = Label::createWithTTF(ttfConfig, "hello underline", TextHAlignment::CENTER,s.width);
+    _label2a            = Label::createWithTTF(ttfConfig, "hello underline", TextHAlignment::CENTER, s.width);
     addChild(_label2a, 0, kTagBitmapAtlas2);
-    _label2a->setPosition(Vec2(s.width/2, s.height*1/6));
+    _label2a->setPosition(Vec2(s.width / 2, s.height * 1 / 6));
 
     auto menuItem = MenuItemFont::create("disable underline", [&](cocos2d::Ref* sender) {
         _label2a->disableEffect(LabelEffect::UNDERLINE);
@@ -3246,18 +3209,19 @@ LabelUnderlineMultiline::LabelUnderlineMultiline()
     auto s = Director::getInstance()->getWinSize();
 
     // bmfont
-    _label1a = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "hello underline\nand multiline", TextHAlignment::CENTER, s.width);
+    _label1a = Label::createWithBMFont("fonts/bitmapFontTest5.fnt", "hello underline\nand multiline",
+                                       TextHAlignment::CENTER, s.width);
     addChild(_label1a, 0, kTagBitmapAtlas1);
-    _label1a->setPosition(Vec2(s.width/2, s.height*2/3));
+    _label1a->setPosition(Vec2(s.width / 2, s.height * 2 / 3));
     // you can enable underline by calling this method
     _label1a->enableUnderline();
 
     // ttf
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
     ttfConfig.underline = true;
     _label2a = Label::createWithTTF(ttfConfig, "hello\nunderline\nwith multiline", TextHAlignment::LEFT, s.width);
     addChild(_label2a, 0, kTagBitmapAtlas2);
-    _label2a->setPosition(Vec2(s.width/2, s.height*1/3));
+    _label2a->setPosition(Vec2(s.width / 2, s.height * 1 / 3));
 
     auto menuItem = MenuItemFont::create("disable underline", [&](cocos2d::Ref* sender) {
         _label2a->disableEffect(LabelEffect::UNDERLINE);
@@ -3287,18 +3251,19 @@ LabelStrikethrough::LabelStrikethrough()
     auto s = Director::getInstance()->getWinSize();
 
     // bmfont
-    _label1a = Label::createWithBMFont("fonts/bitmapFontTest4.fnt", "hello strikethrough\nand multiline", TextHAlignment::LEFT, s.width);
+    _label1a = Label::createWithBMFont("fonts/bitmapFontTest4.fnt", "hello strikethrough\nand multiline",
+                                       TextHAlignment::LEFT, s.width);
     addChild(_label1a, 0, kTagBitmapAtlas1);
-    _label1a->setPosition(Vec2(s.width/2, s.height*2/3));
+    _label1a->setPosition(Vec2(s.width / 2, s.height * 2 / 3));
     // you can enable underline by calling this method
     _label1a->enableStrikethrough();
 
     // ttf
-    TTFConfig ttfConfig("fonts/arial.ttf",24);
+    TTFConfig ttfConfig("fonts/arial.ttf", 24);
     ttfConfig.strikethrough = true;
     _label2a = Label::createWithTTF(ttfConfig, "hello\nstrikethrough\nwith multiline", TextHAlignment::RIGHT, s.width);
     addChild(_label2a, 0, kTagBitmapAtlas2);
-    _label2a->setPosition(Vec2(s.width/2, s.height*1/3));
+    _label2a->setPosition(Vec2(s.width / 2, s.height * 1 / 3));
 
     auto menuItem = MenuItemFont::create("disable underline", [&](cocos2d::Ref* sender) {
         _label2a->disableEffect(LabelEffect::STRIKETHROUGH);
@@ -3330,22 +3295,22 @@ LabelLocalizationTest::LabelLocalizationTest()
     _localizationBin->initLanguageData("configs/ENGLISH.lang.csb");
 
     const float BUTTON_WIDTH = 100;
-    float startPosX = 0;
-    Size winSize = Director::getInstance()->getVisibleSize();
+    float startPosX          = 0;
+    Size winSize             = Director::getInstance()->getVisibleSize();
 
     // Create a radio button group
     auto radioButtonGroup = RadioButtonGroup::create();
     this->addChild(radioButtonGroup);
 
     // Create the radio buttons
-    const int NUMBER_OF_BUTTONS = 3;
-    startPosX = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1) * 0.5 * BUTTON_WIDTH - 30;
-    std::vector<std::string> labelTypes = { "English", "Chinese", "Japanese" };
+    const int NUMBER_OF_BUTTONS         = 3;
+    startPosX                           = winSize.width / 2.0f - (NUMBER_OF_BUTTONS - 1) * 0.5 * BUTTON_WIDTH - 30;
+    std::vector<std::string> labelTypes = {"English", "Chinese", "Japanese"};
 
     for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
     {
         RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
-        float posX = startPosX + BUTTON_WIDTH * i;
+        float posX               = startPosX + BUTTON_WIDTH * i;
         radioButton->setPosition(Vec2(posX, winSize.height / 2.0f + 70));
         radioButton->setScale(1.2f);
         radioButton->addEventListener(CC_CALLBACK_2(LabelLocalizationTest::onChangedRadioButtonSelect, this));
@@ -3362,7 +3327,7 @@ LabelLocalizationTest::LabelLocalizationTest()
     addChild(_label1, 0);
     _label1->setPosition(Vec2(winSize.width / 2, winSize.height * 1 / 3));
 
-    Label * label = Label::createWithSystemFont("From json data :", "Arial", 24);
+    Label* label = Label::createWithSystemFont("From json data :", "Arial", 24);
     label->setAnchorPoint(Vec2(0.0f, 0.5f));
     addChild(label, 0);
     label->setPosition(Vec2(20.0f, winSize.height * 1 / 3 + 24));
@@ -3387,7 +3352,6 @@ std::string LabelLocalizationTest::subtitle() const
     return "Change language selected and see label change";
 }
 
-
 void LabelLocalizationTest::onChangedRadioButtonSelect(RadioButton* radioButton, RadioButton::EventType type)
 {
     if (radioButton == nullptr)
@@ -3399,7 +3363,8 @@ void LabelLocalizationTest::onChangedRadioButtonSelect(RadioButton* radioButton,
     {
     case RadioButton::EventType::SELECTED:
     {
-        switch (radioButton->getTag()) {
+        switch (radioButton->getTag())
+        {
         case 0:
             _localizationJson->initLanguageData("configs/en-US.lang.json");
             _label1->setString(_localizationJson->getLocalizationString("Text Label"));
@@ -3439,28 +3404,28 @@ LabelIssue15214::LabelIssue15214()
     Label* label = Label::createWithTTF("TTF with setColor()", "fonts/arial.ttf", 24.0f);
     label->enableUnderline();
     label->setColor(cocos2d::Color3B::BLUE);
-    label->setPosition(size.width/2, size.height/5*4);
+    label->setPosition(size.width / 2, size.height / 5 * 4);
     this->addChild(label);
 
     // 2
     Label* label2 = Label::createWithSystemFont("System with setColor()", "Verdana", 24.0f);
     label2->enableUnderline();
     label2->setColor(cocos2d::Color3B::BLUE);
-    label2->setPosition(size.width/2, size.height/5*3);
+    label2->setPosition(size.width / 2, size.height / 5 * 3);
     this->addChild(label2);
 
     // 3
     Label* label3 = Label::createWithTTF("TTF with setTextColor()", "fonts/arial.ttf", 24.0f);
     label3->enableUnderline();
     label3->setTextColor(Color4B::BLUE);
-    label3->setPosition(size.width/2, size.height/5*2);
+    label3->setPosition(size.width / 2, size.height / 5 * 2);
     this->addChild(label3);
 
     // 4
     Label* label4 = Label::createWithSystemFont("System with setTextColor()", "Verdana", 24.0f);
     label4->enableUnderline();
     label4->setTextColor(Color4B::BLUE);
-    label4->setPosition(size.width/2, size.height/5*1);
+    label4->setPosition(size.width / 2, size.height / 5 * 1);
     this->addChild(label4);
 }
 
@@ -3479,9 +3444,11 @@ std::string LabelIssue15214::subtitle() const
 //
 LabelIssue16293::LabelIssue16293()
 {
-    auto size = Director::getInstance()->getVisibleSize();
-    Label* label = Label::createWithTTF("012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", "fonts/arial.ttf", 12);
-    label->setPosition(size.width/2, size.height/2);
+    auto size    = Director::getInstance()->getVisibleSize();
+    Label* label = Label::createWithTTF(
+        "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789", "fonts/arial.ttf",
+        12);
+    label->setPosition(size.width / 2, size.height / 2);
     this->addChild(label);
 }
 
@@ -3504,7 +3471,7 @@ LabelIssue16471::LabelIssue16471()
 
     auto node = Node::create();
     addChild(node, 100);
-    node->setPosition(size.width/2, size.height/2);
+    node->setPosition(size.width / 2, size.height / 2);
 
     // Used Google Translate to translate from Chinese:
     //    Here is set to false then textLabel: TextColor valid
@@ -3541,16 +3508,16 @@ LabelIssue16717::LabelIssue16717()
     {
         auto label = Label::createWithTTF("Hello World", "fonts/arial.ttf", 70);
         label->setPosition(VisibleRect::center() + Vec2(0.0f, 40.0f));
-        label->enableOutline(Color4B(0, 255, 0, 100), 10); // Set 100 alpha for outline
-        label->setTextColor(Color4B(0, 0, 255, 100)); // Also set 100 alpha for text
+        label->enableOutline(Color4B(0, 255, 0, 100), 10);  // Set 100 alpha for outline
+        label->setTextColor(Color4B(0, 0, 255, 100));       // Also set 100 alpha for text
         addChild(label);
     }
 
     {
         auto label = Label::createWithTTF("Hello World", "fonts/arial.ttf", 70);
         label->setPosition(VisibleRect::center() + Vec2(0.0f, -40.0f));
-        label->enableOutline(Color4B(0, 255, 0, 100), 10); // Set 100 alpha for outline
-        label->setTextColor(Color4B(0, 255, 0, 100)); // Also set 100 alpha for text
+        label->enableOutline(Color4B(0, 255, 0, 100), 10);  // Set 100 alpha for outline
+        label->setTextColor(Color4B(0, 255, 0, 100));       // Also set 100 alpha for text
         addChild(label);
     }
 }
@@ -3570,15 +3537,15 @@ std::string LabelIssue16717::subtitle() const
 //
 LabelIssueLineGap::LabelIssueLineGap()
 {
-    
+
     auto size = Director::getInstance()->getWinSize();
-    
+
     auto label1 = Label::createWithTTF("test \ntest", "fonts/FingerpopGap.ttf", 30);
     label1->setPosition(Vec2(size.width / 3, size.height / 2));
     addChild(label1);
-    
+
     auto label2 = Label::createWithSystemFont("test \ntest", "fonts/FingerpopGap.ttf", 30);
-    label2->setPosition(Vec2(size.width / 3 * 1.8 , size.height / 2));
+    label2->setPosition(Vec2(size.width / 3 * 1.8, size.height / 2));
     addChild(label2);
 }
 
@@ -3598,13 +3565,13 @@ std::string LabelIssueLineGap::subtitle() const
 LabelIssue17902::LabelIssue17902()
 {
     auto center = VisibleRect::center();
-    
+
     auto label = Label::createWithTTF("abcdefg\nhijklmn", "fonts/arial.ttf", 26);
     label->setLineHeight(40);
     label->setPosition(center);
     addChild(label);
 
-	scheduleOnce(CC_CALLBACK_0(LabelIssue17902::purgeCachedData, this), 1.0f, "purge_cached_data");
+    scheduleOnce(CC_CALLBACK_0(LabelIssue17902::purgeCachedData, this), 1.0f, "purge_cached_data");
 }
 
 void LabelIssue17902::purgeCachedData()
@@ -3627,19 +3594,19 @@ std::string LabelIssue17902::subtitle() const
 //
 LabelIssue20523::LabelIssue20523()
 {
-    auto size = Director::getInstance()->getWinSize();
+    auto size           = Director::getInstance()->getWinSize();
     auto _crashingLabel = Label::createWithTTF("0", "fonts/Marker Felt.ttf", 120);
     _crashingLabel->setPosition(Vec2(size.width / 2, size.height / 2));
     _crashingLabel->setColor(cocos2d::Color3B(200, 200, 200));
     addChild(_crashingLabel, 1);
     //_crashingLabel->setWidth(size.width);
 
-    this->schedule([this, _crashingLabel](float)
-        {
+    this->schedule(
+        [this, _crashingLabel](float) {
             ++_i;
             _crashingLabel->setString(std::to_string(_i));
-        }, 1, CC_REPEAT_FOREVER, 0, "repeat");
-
+        },
+        1, CC_REPEAT_FOREVER, 0, "repeat");
 }
 
 std::string LabelIssue20523::title() const
@@ -3655,7 +3622,8 @@ std::string LabelIssue20523::subtitle() const
 //
 // LabelLetterColorsTest
 //
-LabelLetterColorsTest::LabelLetterColorsTest() {
+LabelLetterColorsTest::LabelLetterColorsTest()
+{
     auto center = VisibleRect::center();
 
     auto label = Label::createWithTTF("", "fonts/arial.ttf", 24);
@@ -3668,17 +3636,21 @@ LabelLetterColorsTest::LabelLetterColorsTest() {
     label->setString("abcd\ne");  // Must not crash at here.
 }
 
-std::string LabelLetterColorsTest::title() const {
+std::string LabelLetterColorsTest::title() const
+{
     return "Test for letter colors";
 }
 
-std::string LabelLetterColorsTest::subtitle() const {
+std::string LabelLetterColorsTest::subtitle() const
+{
     return "Should not crash!";
 }
 
-void LabelLetterColorsTest::setLetterColors(cocos2d::Label* label, const cocos2d::Color3B& color) {
+void LabelLetterColorsTest::setLetterColors(cocos2d::Label* label, const cocos2d::Color3B& color)
+{
     int n = label->getStringLength();
-    for (int i = 0; i < n; ++i) {
+    for (int i = 0; i < n; ++i)
+    {
         Sprite* letter = label->getLetter(i);
         if (letter != nullptr)
             letter->setColor(color);
diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
index 84055634411f..3e38903f785b 100644
--- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
+++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,12 +34,12 @@
 DEFINE_TEST_SUITE(NewLabelTests);
 
 class AtlasDemoNew : public TestCase
-{
-};
+{};
 
 class LabelFNTColorAndOpacity : public AtlasDemoNew
 {
-    float        _time;
+    float _time;
+
 public:
     CREATE_FUNC(LabelFNTColorAndOpacity);
 
@@ -53,7 +53,8 @@ class LabelFNTColorAndOpacity : public AtlasDemoNew
 
 class LabelFNTSpriteActions : public AtlasDemoNew
 {
-    float        _time;
+    float _time;
+
 public:
     CREATE_FUNC(LabelFNTSpriteActions);
 
@@ -74,7 +75,6 @@ class LabelFNTPadding : public AtlasDemoNew
     virtual std::string subtitle() const override;
 };
 
-
 class LabelFNTOffset : public AtlasDemoNew
 {
 public:
@@ -180,13 +180,13 @@ class LabelFNTMultiLineAlignment : public AtlasDemoNew
     virtual std::string getItemString(cocos2d::MenuItemFont* item);
 
 protected:
-    cocos2d::Label* _label = nullptr;
+    cocos2d::Label* _label      = nullptr;
     cocos2d::Sprite* _arrowsBar = nullptr;
-    cocos2d::Sprite* _arrows = nullptr;
+    cocos2d::Sprite* _arrows    = nullptr;
     std::vector<cocos2d::MenuItemFont*> _menuItems;
-    cocos2d::MenuItemFont *_lastSentenceItem = nullptr;
-    cocos2d::MenuItemFont *_lastAlignmentItem = nullptr;
-    bool _drag = false;
+    cocos2d::MenuItemFont* _lastSentenceItem  = nullptr;
+    cocos2d::MenuItemFont* _lastAlignmentItem = nullptr;
+    bool _drag                                = false;
 };
 
 class LabelFNTMultiLineAlignmentUNICODE : public LabelFNTMultiLineAlignment
@@ -218,7 +218,7 @@ class LabelFNTBounds : public AtlasDemoNew
     CREATE_FUNC(LabelFNTBounds);
 
     LabelFNTBounds();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -233,7 +233,6 @@ class LabelFNTMultiFontAtlasNoRotation : public AtlasDemoNew
     virtual std::string subtitle() const override;
 };
 
-
 class LabelFNTMultiFontAtlasWithRotation : public AtlasDemoNew
 {
 public:
@@ -272,7 +271,7 @@ class LabelTTFUnicodeNew : public AtlasDemoNew
     CREATE_FUNC(LabelTTFUnicodeNew);
 
     LabelTTFUnicodeNew();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -285,24 +284,22 @@ class LabelTTFDynamicAlignment : public AtlasDemoNew
     LabelTTFDynamicAlignment();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
-    
     void setAlignmentLeft(cocos2d::Ref* sender);
     void setAlignmentCenter(cocos2d::Ref* sender);
     void setAlignmentRight(cocos2d::Ref* sender);
     void updateAlignment();
-    
+
     cocos2d::Label* _label;
-    cocos2d::TextHAlignment   _horizAlign;
-    
+    cocos2d::TextHAlignment _horizAlign;
 };
 
 class LabelTTFEmoji : public AtlasDemoNew
 {
 public:
     CREATE_FUNC(LabelTTFEmoji);
-    
+
     LabelTTFEmoji();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -378,6 +375,7 @@ class LabelShadowTest : public AtlasDemoNew
     virtual std::string subtitle() const override;
 
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
+
 private:
     cocos2d::Label* shadowLabelOutline;
     cocos2d::Label* shadowLabelTTF;
@@ -398,7 +396,7 @@ class LabelCharMapTest : public AtlasDemoNew
     void step(float dt);
 
 private:
-    float _time; 
+    float _time;
 };
 
 class LabelCharMapColorTest : public AtlasDemoNew
@@ -415,7 +413,7 @@ class LabelCharMapColorTest : public AtlasDemoNew
     void actionFinishCallback();
 
 private:
-    float _time; 
+    float _time;
 };
 
 class LabelCrashTest : public AtlasDemoNew
@@ -459,13 +457,14 @@ class LabelAlignmentTest : public AtlasDemoNew
     LabelAlignmentTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
-    void  setAlignmentLeft(cocos2d::Ref* sender);
-    void  setAlignmentCenter(cocos2d::Ref* sender);
-    void  setAlignmentRight(cocos2d::Ref* sender);
-    void  setAlignmentTop(cocos2d::Ref* sender);
-    void  setAlignmentMiddle(cocos2d::Ref* sender);
-    void  setAlignmentBottom(cocos2d::Ref* sender);
+    void setAlignmentLeft(cocos2d::Ref* sender);
+    void setAlignmentCenter(cocos2d::Ref* sender);
+    void setAlignmentRight(cocos2d::Ref* sender);
+    void setAlignmentTop(cocos2d::Ref* sender);
+    void setAlignmentMiddle(cocos2d::Ref* sender);
+    void setAlignmentBottom(cocos2d::Ref* sender);
 
     cocos2d::Label* _label;
 };
@@ -503,6 +502,7 @@ class LabelLineHeightTest : public AtlasDemoNew
     virtual std::string subtitle() const override;
 
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
+
 private:
     cocos2d::Label* label;
 };
@@ -518,6 +518,7 @@ class LabelAdditionalKerningTest : public AtlasDemoNew
     virtual std::string subtitle() const override;
 
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
+
 private:
     cocos2d::Label* label;
 };
@@ -703,18 +704,18 @@ class LabelLayoutBaseTest : public AtlasDemoNew
 {
 public:
     LabelLayoutBaseTest();
-    void updateDrawNodeSize(const cocos2d::Size &drawNodeSize);
+    void updateDrawNodeSize(const cocos2d::Size& drawNodeSize);
     cocos2d::extension::ControlStepper* makeControlStepper();
     void valueChanged(cocos2d::Ref* sender, cocos2d::extension::Control::EventType controlEvent);
 
 protected:
-    void  setAlignmentLeft(cocos2d::Ref* sender);
-    void  setAlignmentCenter(cocos2d::Ref* sender);
-    void  setAlignmentRight(cocos2d::Ref* sender);
-    void  setAlignmentTop(cocos2d::Ref* sender);
-    void  setAlignmentMiddle(cocos2d::Ref* sender);
-    void  setAlignmentBottom(cocos2d::Ref* sender);
-    
+    void setAlignmentLeft(cocos2d::Ref* sender);
+    void setAlignmentCenter(cocos2d::Ref* sender);
+    void setAlignmentRight(cocos2d::Ref* sender);
+    void setAlignmentTop(cocos2d::Ref* sender);
+    void setAlignmentMiddle(cocos2d::Ref* sender);
+    void setAlignmentBottom(cocos2d::Ref* sender);
+
     void initWrapOption(const cocos2d::Size& size);
     void initToggleLabelTypeOption(const cocos2d::Size& size);
     void initAlignmentOption(const cocos2d::Size& size);
@@ -800,7 +801,7 @@ class LabelToggleTypeTest : public LabelLayoutBaseTest
 
     LabelToggleTypeTest();
     void initToggleCheckboxes();
-    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton,cocos2d::ui::RadioButton::EventType type);
+    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton, cocos2d::ui::RadioButton::EventType type);
 
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -813,7 +814,7 @@ class LabelSystemFontTest : public LabelLayoutBaseTest
 
     LabelSystemFontTest();
     void initToggleCheckboxes();
-    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton,cocos2d::ui::RadioButton::EventType type);
+    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton, cocos2d::ui::RadioButton::EventType type);
 
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -834,9 +835,9 @@ class LabelIssue13846Test : public AtlasDemoNew
 {
 public:
     CREATE_FUNC(LabelIssue13846Test);
-    
+
     LabelIssue13846Test();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -981,9 +982,9 @@ class LabelIssueLineGap : public AtlasDemoNew
 {
 public:
     CREATE_FUNC(LabelIssueLineGap);
-    
+
     LabelIssueLineGap();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -992,11 +993,11 @@ class LabelIssue17902 : public AtlasDemoNew
 {
 public:
     CREATE_FUNC(LabelIssue17902);
-    
+
     LabelIssue17902();
 
     virtual void purgeCachedData();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -1015,7 +1016,8 @@ class LabelIssue20523 : public AtlasDemoNew
     int _i = 0;
 };
 
-class LabelLetterColorsTest : public AtlasDemoNew {
+class LabelLetterColorsTest : public AtlasDemoNew
+{
 public:
     CREATE_FUNC(LabelLetterColorsTest);
 
diff --git a/tests/cpp-tests/Classes/LayerTest/LayerTest.cpp b/tests/cpp-tests/Classes/LayerTest/LayerTest.cpp
index 1bc88b56b681..26d26a6e4c4b 100644
--- a/tests/cpp-tests/Classes/LayerTest/LayerTest.cpp
+++ b/tests/cpp-tests/Classes/LayerTest/LayerTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,7 +28,7 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
     kTagLayer = 1,
 };
@@ -62,9 +62,10 @@ static void setEnableRecursiveCascading(Node* node, bool enable)
 {
     node->setCascadeColorEnabled(enable);
     node->setCascadeOpacityEnabled(enable);
-    
+
     auto& children = node->getChildren();
-    for(const auto &child : children) {
+    for (const auto& child : children)
+    {
         setEnableRecursiveCascading(child, enable);
     }
 }
@@ -78,41 +79,30 @@ std::string LayerTest::title() const
 void LayerTestCascadingOpacityA::onEnter()
 {
     LayerTest::onEnter();
-    
-    auto s = Director::getInstance()->getWinSize();
+
+    auto s      = Director::getInstance()->getWinSize();
     auto layer1 = Layer::create();
-    
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, s.height/2));
-    sister2->setPosition( Vec2( s.width*2/3, s.height/2));
-    label->setPosition( Vec2( s.width/2, s.height/2));
-    
-    layer1->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                FadeTo::create(4, 0),
-                FadeTo::create(4, 255),
-                DelayTime::create(1),
-                nullptr)));
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, s.height / 2));
+    sister2->setPosition(Vec2(s.width * 2 / 3, s.height / 2));
+    label->setPosition(Vec2(s.width / 2, s.height / 2));
+
+    layer1->runAction(RepeatForever::create(
+        Sequence::create(FadeTo::create(4, 0), FadeTo::create(4, 255), DelayTime::create(1), nullptr)));
 
     sister1->runAction(
-        RepeatForever::create(
-            Sequence::create(
-                FadeTo::create(2, 0),
-                FadeTo::create(2, 255),
-                FadeTo::create(2, 0),
-                FadeTo::create(2, 255),
-                DelayTime::create(1),
-                nullptr)));
-    
+        RepeatForever::create(Sequence::create(FadeTo::create(2, 0), FadeTo::create(2, 255), FadeTo::create(2, 0),
+                                               FadeTo::create(2, 255), DelayTime::create(1), nullptr)));
+
     // Enable cascading in scene
     setEnableRecursiveCascading(this, true);
 }
@@ -122,49 +112,37 @@ std::string LayerTestCascadingOpacityA::subtitle() const
     return "Layer: cascading opacity";
 }
 
-
 //  LayerTestCascadingOpacityB
 void LayerTestCascadingOpacityB::onEnter()
 {
     LayerTest::onEnter();
-        
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create(Color4B(192, 0, 0, 255), s.width, s.height/2);
+
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(192, 0, 0, 255), s.width, s.height / 2);
     layer1->setCascadeColorEnabled(false);
-    
-    layer1->setPosition( Vec2(0.0f, s.height/2));
-    
+
+    layer1->setPosition(Vec2(0.0f, s.height / 2));
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, 0.0f));
-    sister2->setPosition( Vec2( s.width*2/3, 0.0f));
-    label->setPosition( Vec2( s.width/2, 0.0f));
-    
-    layer1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       FadeTo::create(4, 0),
-       FadeTo::create(4, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, 0.0f));
+    sister2->setPosition(Vec2(s.width * 2 / 3, 0.0f));
+    label->setPosition(Vec2(s.width / 2, 0.0f));
+
+    layer1->runAction(RepeatForever::create(
+        Sequence::create(FadeTo::create(4, 0), FadeTo::create(4, 255), DelayTime::create(1), nullptr)));
+
     sister1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       FadeTo::create(2, 0),
-       FadeTo::create(2, 255),
-       FadeTo::create(2, 0),
-       FadeTo::create(2, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
+        RepeatForever::create(Sequence::create(FadeTo::create(2, 0), FadeTo::create(2, 255), FadeTo::create(2, 0),
+                                               FadeTo::create(2, 255), DelayTime::create(1), nullptr)));
+
     // Enable cascading in scene
     setEnableRecursiveCascading(this, true);
 }
@@ -174,49 +152,37 @@ std::string LayerTestCascadingOpacityB::subtitle() const
     return "CCLayerColor: cascading opacity";
 }
 
-
 // LayerTestCascadingOpacityC
 void LayerTestCascadingOpacityC::onEnter()
 {
     LayerTest::onEnter();
-    
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create(Color4B(192, 0, 0, 255), s.width, s.height/2);
+
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(192, 0, 0, 255), s.width, s.height / 2);
     layer1->setCascadeColorEnabled(false);
     layer1->setCascadeOpacityEnabled(false);
-    
-    layer1->setPosition( Vec2(0.0f, s.height/2));
-    
+
+    layer1->setPosition(Vec2(0.0f, s.height / 2));
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, 0.0f));
-    sister2->setPosition( Vec2( s.width*2/3, 0.0f));
-    label->setPosition( Vec2( s.width/2, 0.0f));
-    
-    layer1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       FadeTo::create(4, 0),
-       FadeTo::create(4, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, 0.0f));
+    sister2->setPosition(Vec2(s.width * 2 / 3, 0.0f));
+    label->setPosition(Vec2(s.width / 2, 0.0f));
+
+    layer1->runAction(RepeatForever::create(
+        Sequence::create(FadeTo::create(4, 0), FadeTo::create(4, 255), DelayTime::create(1), nullptr)));
+
     sister1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       FadeTo::create(2, 0),
-       FadeTo::create(2, 255),
-       FadeTo::create(2, 0),
-       FadeTo::create(2, 255),
-       DelayTime::create(1),
-       nullptr)));
+        RepeatForever::create(Sequence::create(FadeTo::create(2, 0), FadeTo::create(2, 255), FadeTo::create(2, 0),
+                                               FadeTo::create(2, 255), DelayTime::create(1), nullptr)));
 }
 
 std::string LayerTestCascadingOpacityC::subtitle() const
@@ -224,53 +190,39 @@ std::string LayerTestCascadingOpacityC::subtitle() const
     return "CCLayerColor: non-cascading opacity";
 }
 
-
 //// Example LayerTestCascadingColor
 
 // LayerTestCascadingColorA
 void LayerTestCascadingColorA::onEnter()
 {
     LayerTest::onEnter();
-    
-    auto s = Director::getInstance()->getWinSize();
+
+    auto s      = Director::getInstance()->getWinSize();
     auto layer1 = Layer::create();
-    
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, s.height/2));
-    sister2->setPosition( Vec2( s.width*2/3, s.height/2));
-    label->setPosition( Vec2( s.width/2, s.height/2));
-    
-    layer1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(6, 255, 0, 255),
-       TintTo::create(6, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
-    sister1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(2, 255, 255, 0),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 0, 255, 255),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 255, 0, 255),
-       TintTo::create(2, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, s.height / 2));
+    sister2->setPosition(Vec2(s.width * 2 / 3, s.height / 2));
+    label->setPosition(Vec2(s.width / 2, s.height / 2));
+
+    layer1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(6, 255, 0, 255), TintTo::create(6, 255, 255, 255), DelayTime::create(1), nullptr)));
+
+    sister1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(2, 255, 255, 0), TintTo::create(2, 255, 255, 255), TintTo::create(2, 0, 255, 255),
+        TintTo::create(2, 255, 255, 255), TintTo::create(2, 255, 0, 255), TintTo::create(2, 255, 255, 255),
+        DelayTime::create(1), nullptr)));
+
     // Enable cascading in scene
     setEnableRecursiveCascading(this, true);
-     
 }
 
 std::string LayerTestCascadingColorA::subtitle() const
@@ -278,49 +230,36 @@ std::string LayerTestCascadingColorA::subtitle() const
     return "Layer: cascading color";
 }
 
-
 // LayerTestCascadingColorB
 void LayerTestCascadingColorB::onEnter()
 {
     LayerTest::onEnter();
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create(Color4B(255, 255, 255, 255), s.width, s.height/2);
-    
-    layer1->setPosition( Vec2(0.0f, s.height/2));
-    
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(255, 255, 255, 255), s.width, s.height / 2);
+
+    layer1->setPosition(Vec2(0.0f, s.height / 2));
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, 0.0f));
-    sister2->setPosition( Vec2( s.width*2/3, 0.0f));
-    label->setPosition( Vec2( s.width/2, 0.0f));
-    
-    layer1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(6, 255, 0, 255),
-       TintTo::create(6, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
-    sister1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(2, 255, 255, 0),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 0, 255, 255),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 255, 0, 255),
-       TintTo::create(2, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, 0.0f));
+    sister2->setPosition(Vec2(s.width * 2 / 3, 0.0f));
+    label->setPosition(Vec2(s.width / 2, 0.0f));
+
+    layer1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(6, 255, 0, 255), TintTo::create(6, 255, 255, 255), DelayTime::create(1), nullptr)));
+
+    sister1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(2, 255, 255, 0), TintTo::create(2, 255, 255, 255), TintTo::create(2, 0, 255, 255),
+        TintTo::create(2, 255, 255, 255), TintTo::create(2, 255, 0, 255), TintTo::create(2, 255, 255, 255),
+        DelayTime::create(1), nullptr)));
+
     // Enable cascading in scene
     setEnableRecursiveCascading(this, true);
 }
@@ -330,48 +269,35 @@ std::string LayerTestCascadingColorB::subtitle() const
     return "CCLayerColor: cascading color";
 }
 
-
 // LayerTestCascadingColorC
 void LayerTestCascadingColorC::onEnter()
 {
     LayerTest::onEnter();
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create(Color4B(255, 255, 255, 255), s.width, s.height/2);
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(255, 255, 255, 255), s.width, s.height / 2);
     layer1->setCascadeColorEnabled(false);
-    layer1->setPosition( Vec2(0.0f, s.height/2));
-    
+    layer1->setPosition(Vec2(0.0f, s.height / 2));
+
     auto sister1 = Sprite::create("Images/grossinis_sister1.png");
     auto sister2 = Sprite::create("Images/grossinis_sister2.png");
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
-    
+    auto label   = Label::createWithBMFont("fonts/bitmapFontTest.fnt", "Test");
+
     layer1->addChild(sister1);
     layer1->addChild(sister2);
     layer1->addChild(label);
-    this->addChild( layer1, 0, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, 0.0f));
-    sister2->setPosition( Vec2( s.width*2/3, 0.0f));
-    label->setPosition( Vec2( s.width/2, 0.0f));
-    
-    layer1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(6, 255, 0, 255),
-       TintTo::create(6, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
-    
-    sister1->runAction(
-     RepeatForever::create(
-      Sequence::create(
-       TintTo::create(2, 255, 255, 0),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 0, 255, 255),
-       TintTo::create(2, 255, 255, 255),
-       TintTo::create(2, 255, 0, 255),
-       TintTo::create(2, 255, 255, 255),
-       DelayTime::create(1),
-       nullptr)));
+    this->addChild(layer1, 0, kTagLayer);
+
+    sister1->setPosition(Vec2(s.width * 1 / 3, 0.0f));
+    sister2->setPosition(Vec2(s.width * 2 / 3, 0.0f));
+    label->setPosition(Vec2(s.width / 2, 0.0f));
+
+    layer1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(6, 255, 0, 255), TintTo::create(6, 255, 255, 255), DelayTime::create(1), nullptr)));
+
+    sister1->runAction(RepeatForever::create(Sequence::create(
+        TintTo::create(2, 255, 255, 0), TintTo::create(2, 255, 255, 255), TintTo::create(2, 0, 255, 255),
+        TintTo::create(2, 255, 255, 255), TintTo::create(2, 255, 0, 255), TintTo::create(2, 255, 255, 255),
+        DelayTime::create(1), nullptr)));
 }
 
 std::string LayerTestCascadingColorC::subtitle() const
@@ -388,45 +314,45 @@ void LayerTest1::onEnter()
 {
     LayerTest::onEnter();
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(LayerTest1::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(LayerTest1::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(LayerTest1::onTouchesEnded, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
-    auto s = Director::getInstance()->getWinSize();
-    auto layer = LayerColor::create( Color4B(0xFF, 0x00, 0x00, 0x80), 200, 200); 
-    
+
+    auto s     = Director::getInstance()->getWinSize();
+    auto layer = LayerColor::create(Color4B(0xFF, 0x00, 0x00, 0x80), 200, 200);
+
     layer->setIgnoreAnchorPointForPosition(false);
-    layer->setPosition( Vec2(s.width/2, s.height/2) );
+    layer->setPosition(Vec2(s.width / 2, s.height / 2));
     addChild(layer, 1, kTagLayer);
 }
 
-void LayerTest1::updateSize(Vec2 &touchLocation)
-{    
+void LayerTest1::updateSize(Vec2& touchLocation)
+{
     auto s = Director::getInstance()->getWinSize();
-    
-    auto newSize = Size( fabs(touchLocation.x - s.width/2)*2, fabs(touchLocation.y - s.height/2)*2);
-    
-    auto l = (LayerColor*) getChildByTag(kTagLayer);
 
-    l->setContentSize( newSize );
+    auto newSize = Size(fabs(touchLocation.x - s.width / 2) * 2, fabs(touchLocation.y - s.height / 2) * 2);
+
+    auto l = (LayerColor*)getChildByTag(kTagLayer);
+
+    l->setContentSize(newSize);
 }
 
-void LayerTest1::onTouchesBegan(const std::vector<Touch*>& touches, Event  *event)
+void LayerTest1::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
     onTouchesMoved(touches, event);
 }
 
-void LayerTest1::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void LayerTest1::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     auto touchLocation = touches[0]->getLocation();
 
     updateSize(touchLocation);
 }
 
-void LayerTest1::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void LayerTest1::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
     onTouchesMoved(touches, event);
 }
@@ -445,25 +371,25 @@ void LayerTest2::onEnter()
 {
     LayerTest::onEnter();
 
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create( Color4B(255, 255, 0, 80), 100, 300);
-    layer1->setPosition(Vec2(s.width/3, s.height/2));
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(255, 255, 0, 80), 100, 300);
+    layer1->setPosition(Vec2(s.width / 3, s.height / 2));
     layer1->setIgnoreAnchorPointForPosition(false);
     addChild(layer1, 1);
-    
-    auto layer2 = LayerColor::create( Color4B(0, 0, 255, 255), 100, 300);
-    layer2->setPosition(Vec2((s.width/3)*2, s.height/2));
+
+    auto layer2 = LayerColor::create(Color4B(0, 0, 255, 255), 100, 300);
+    layer2->setPosition(Vec2((s.width / 3) * 2, s.height / 2));
     layer2->setIgnoreAnchorPointForPosition(false);
     addChild(layer2, 1);
-    
-    auto actionTint = TintBy::create(2, -255, -127, 0);
+
+    auto actionTint     = TintBy::create(2, -255, -127, 0);
     auto actionTintBack = actionTint->reverse();
-    auto seq1 = Sequence::create( actionTint, actionTintBack, nullptr);
+    auto seq1           = Sequence::create(actionTint, actionTintBack, nullptr);
     layer1->runAction(seq1);
 
-    auto actionFade = FadeOut::create(2.0f);
+    auto actionFade     = FadeOut::create(2.0f);
     auto actionFadeBack = actionFade->reverse();
-    auto seq2 = Sequence::create(actionFade, actionFadeBack, nullptr);        
+    auto seq2           = Sequence::create(actionFade, actionFadeBack, nullptr);
     layer2->runAction(seq2);
 }
 
@@ -480,30 +406,30 @@ std::string LayerTest2::subtitle() const
 
 LayerTestBlend::LayerTestBlend()
 {
-    auto s = Director::getInstance()->getWinSize();
-    auto layer1 = LayerColor::create( Color4B(255, 255, 255, 80) );
-    
+    auto s      = Director::getInstance()->getWinSize();
+    auto layer1 = LayerColor::create(Color4B(255, 255, 255, 80));
+
     auto sister1 = Sprite::create(s_pathSister1);
     auto sister2 = Sprite::create(s_pathSister2);
-    
+
     addChild(sister1);
     addChild(sister2);
     addChild(layer1, 100, kTagLayer);
-    
-    sister1->setPosition( Vec2( s.width*1/3, s.height/2) );
-    sister2->setPosition( Vec2( s.width*2/3, s.height/2) );
 
-    schedule( CC_SCHEDULE_SELECTOR(LayerTestBlend::newBlend), 1.0f);
+    sister1->setPosition(Vec2(s.width * 1 / 3, s.height / 2));
+    sister2->setPosition(Vec2(s.width * 2 / 3, s.height / 2));
+
+    schedule(CC_SCHEDULE_SELECTOR(LayerTestBlend::newBlend), 1.0f);
 }
 
 void LayerTestBlend::newBlend(float dt)
 {
-     auto layer = (LayerColor*)getChildByTag(kTagLayer);
+    auto layer = (LayerColor*)getChildByTag(kTagLayer);
 
-     backend::BlendFactor src;
-     backend::BlendFactor dst;
+    backend::BlendFactor src;
+    backend::BlendFactor dst;
 
-    if( layer->getBlendFunc().dst == backend::BlendFactor::ZERO )
+    if (layer->getBlendFunc().dst == backend::BlendFactor::ZERO)
     {
         src = backend::BlendFactor::SRC_ALPHA;
         dst = backend::BlendFactor::ONE_MINUS_SRC_ALPHA;
@@ -515,10 +441,9 @@ void LayerTestBlend::newBlend(float dt)
     }
 
     BlendFunc bf = {src, dst};
-    layer->setBlendFunc( bf );
+    layer->setBlendFunc(bf);
 }
 
-
 std::string LayerTestBlend::subtitle() const
 {
     return "ColorLayer: blend";
@@ -531,18 +456,19 @@ std::string LayerTestBlend::subtitle() const
 //------------------------------------------------------------------
 LayerGradientTest::LayerGradientTest()
 {
-    auto layer1 = LayerGradient::create(Color4B(255,0,0,255), Color4B(0,255,0,255), Vec2(0.9f, 0.9f));
+    auto layer1 = LayerGradient::create(Color4B(255, 0, 0, 255), Color4B(0, 255, 0, 255), Vec2(0.9f, 0.9f));
     addChild(layer1, 0, kTagLayer);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(LayerGradientTest::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     auto label1 = Label::createWithTTF("Compressed Interpolation: Enabled", "fonts/Marker Felt.ttf", 26);
     auto label2 = Label::createWithTTF("Compressed Interpolation: Disabled", "fonts/Marker Felt.ttf", 26);
-    auto item1 = MenuItemLabel::create(label1);
-    auto item2 = MenuItemLabel::create(label2);
-    auto item = MenuItemToggle::createWithCallback( CC_CALLBACK_1(LayerGradientTest::toggleItem, this), item1, item2, nullptr);
+    auto item1  = MenuItemLabel::create(label1);
+    auto item2  = MenuItemLabel::create(label2);
+    auto item =
+        MenuItemToggle::createWithCallback(CC_CALLBACK_1(LayerGradientTest::toggleItem, this), item1, item2, nullptr);
 
     auto menu = Menu::create(item, nullptr);
     addChild(menu);
@@ -550,23 +476,23 @@ LayerGradientTest::LayerGradientTest()
     menu->setPosition(Vec2(s.width / 2, 100.0f));
 }
 
-void LayerGradientTest::toggleItem(Ref *sender)
+void LayerGradientTest::toggleItem(Ref* sender)
 {
-    auto gradient = static_cast<LayerGradient*>( getChildByTag(kTagLayer) );
-    gradient->setCompressedInterpolation(! gradient->isCompressedInterpolation());
+    auto gradient = static_cast<LayerGradient*>(getChildByTag(kTagLayer));
+    gradient->setCompressedInterpolation(!gradient->isCompressedInterpolation());
 }
 
-void LayerGradientTest::onTouchesMoved(const std::vector<Touch*>& touches, Event *event)
+void LayerGradientTest::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     auto s = Director::getInstance()->getWinSize();
 
     auto touch = touches[0];
-    auto start = touch->getLocation();    
+    auto start = touch->getLocation();
 
-    auto diff =  Vec2(s.width/2,s.height/2) - start;
-    diff = diff.getNormalized();
+    auto diff = Vec2(s.width / 2, s.height / 2) - start;
+    diff      = diff.getNormalized();
 
-    auto gradient = static_cast<LayerGradient*>( getChildByTag(1) );
+    auto gradient = static_cast<LayerGradient*>(getChildByTag(1));
     gradient->setVector(diff);
 }
 
@@ -587,7 +513,7 @@ std::string LayerGradientTest::subtitle() const
 //------------------------------------------------------------------
 LayerGradientTest2::LayerGradientTest2()
 {
-    auto layer = LayerGradient::create(Color4B(255,0,0,255), Color4B(255,255,0,255));
+    auto layer = LayerGradient::create(Color4B(255, 0, 0, 255), Color4B(255, 255, 0, 255));
     addChild(layer);
 }
 
@@ -603,7 +529,7 @@ std::string LayerGradientTest2::subtitle() const
 
 // LayerIgnoreAnchorPointPos
 
-#define kLayerIgnoreAnchorPoint  1000
+#define kLayerIgnoreAnchorPoint 1000
 
 void LayerIgnoreAnchorPointPos::onEnter()
 {
@@ -614,32 +540,33 @@ void LayerIgnoreAnchorPointPos::onEnter()
     auto l = LayerColor::create(Color4B(255, 0, 0, 255), 150, 150);
 
     l->setAnchorPoint(Vec2(0.5f, 0.5f));
-    l->setPosition(Vec2( s.width/2, s.height/2));
+    l->setPosition(Vec2(s.width / 2, s.height / 2));
 
-    auto move = MoveBy::create(2, Vec2(100,2));
-    auto back = (MoveBy *)move->reverse();
-    auto seq = Sequence::create(move, back, nullptr);
+    auto move = MoveBy::create(2, Vec2(100, 2));
+    auto back = (MoveBy*)move->reverse();
+    auto seq  = Sequence::create(move, back, nullptr);
     l->runAction(RepeatForever::create(seq));
     this->addChild(l, 0, kLayerIgnoreAnchorPoint);
 
     auto child = Sprite::create("Images/grossini.png");
     l->addChild(child);
     auto lsize = l->getContentSize();
-    child->setPosition(Vec2(lsize.width/2, lsize.height/2));
+    child->setPosition(Vec2(lsize.width / 2, lsize.height / 2));
 
-    auto item = MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointPos::onToggle, this));
+    auto item =
+        MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointPos::onToggle, this));
 
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
 
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 void LayerIgnoreAnchorPointPos::onToggle(Ref* pObject)
 {
-    auto layer = this->getChildByTag(kLayerIgnoreAnchorPoint);
+    auto layer  = this->getChildByTag(kLayerIgnoreAnchorPoint);
     bool ignore = layer->isIgnoreAnchorPointForPosition();
-    layer->setIgnoreAnchorPointForPosition(! ignore);
+    layer->setIgnoreAnchorPointForPosition(!ignore);
 }
 
 std::string LayerIgnoreAnchorPointPos::title() const
@@ -662,32 +589,32 @@ void LayerIgnoreAnchorPointRot::onEnter()
     auto l = LayerColor::create(Color4B(255, 0, 0, 255), 200, 200);
 
     l->setAnchorPoint(Vec2(0.5f, 0.5f));
-    l->setPosition(Vec2( s.width/2, s.height/2));
+    l->setPosition(Vec2(s.width / 2, s.height / 2));
 
     this->addChild(l, 0, kLayerIgnoreAnchorPoint);
 
     auto rot = RotateBy::create(2, 360);
     l->runAction(RepeatForever::create(rot));
 
-
     auto child = Sprite::create("Images/grossini.png");
     l->addChild(child);
     auto lsize = l->getContentSize();
-    child->setPosition(Vec2(lsize.width/2, lsize.height/2));
+    child->setPosition(Vec2(lsize.width / 2, lsize.height / 2));
 
-    auto item = MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointRot::onToggle, this));
+    auto item =
+        MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointRot::onToggle, this));
 
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
 
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 void LayerIgnoreAnchorPointRot::onToggle(Ref* pObject)
 {
-    auto layer = this->getChildByTag(kLayerIgnoreAnchorPoint);
+    auto layer  = this->getChildByTag(kLayerIgnoreAnchorPoint);
     bool ignore = layer->isIgnoreAnchorPointForPosition();
-    layer->setIgnoreAnchorPointForPosition(! ignore);
+    layer->setIgnoreAnchorPointForPosition(!ignore);
 }
 
 std::string LayerIgnoreAnchorPointRot::title() const
@@ -704,18 +631,17 @@ std::string LayerIgnoreAnchorPointRot::subtitle() const
 void LayerIgnoreAnchorPointScale::onEnter()
 {
     LayerTest::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
 
     auto l = LayerColor::create(Color4B(255, 0, 0, 255), 200, 200);
 
     l->setAnchorPoint(Vec2(0.5f, 1.0f));
-    l->setPosition(Vec2( s.width/2, s.height/2));
-
+    l->setPosition(Vec2(s.width / 2, s.height / 2));
 
     auto scale = ScaleBy::create(2, 2);
-    auto back = (ScaleBy*)scale->reverse();
-    auto seq = Sequence::create(scale, back, nullptr);
+    auto back  = (ScaleBy*)scale->reverse();
+    auto seq   = Sequence::create(scale, back, nullptr);
 
     l->runAction(RepeatForever::create(seq));
 
@@ -724,21 +650,22 @@ void LayerIgnoreAnchorPointScale::onEnter()
     auto child = Sprite::create("Images/grossini.png");
     l->addChild(child);
     auto lsize = l->getContentSize();
-    child->setPosition(Vec2(lsize.width/2, lsize.height/2));
+    child->setPosition(Vec2(lsize.width / 2, lsize.height / 2));
 
-    auto item = MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointScale::onToggle, this));
+    auto item =
+        MenuItemFont::create("Toggle ignore anchor point", CC_CALLBACK_1(LayerIgnoreAnchorPointScale::onToggle, this));
 
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
 
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 void LayerIgnoreAnchorPointScale::onToggle(Ref* pObject)
 {
-    auto layer = this->getChildByTag(kLayerIgnoreAnchorPoint);
+    auto layer  = this->getChildByTag(kLayerIgnoreAnchorPoint);
     bool ignore = layer->isIgnoreAnchorPointForPosition();
-    layer->setIgnoreAnchorPointForPosition(! ignore);
+    layer->setIgnoreAnchorPointForPosition(!ignore);
 }
 
 std::string LayerIgnoreAnchorPointScale::title() const
@@ -755,22 +682,22 @@ LayerExtendedBlendOpacityTest::LayerExtendedBlendOpacityTest()
 {
     auto layer1 = LayerGradient::create(Color4B(255, 0, 0, 255), Color4B(255, 0, 255, 255));
     layer1->setContentSize(Size(80.0f, 80.0f));
-    layer1->setPosition(Vec2(50.0f,50.0f));
+    layer1->setPosition(Vec2(50.0f, 50.0f));
     addChild(layer1);
-    
+
     auto layer2 = LayerGradient::create(Color4B(0, 0, 0, 127), Color4B(255, 255, 255, 127));
     layer2->setContentSize(Size(80.0f, 80.0f));
-    layer2->setPosition(Vec2(100.0f,90.0f));
+    layer2->setPosition(Vec2(100.0f, 90.0f));
     addChild(layer2);
-    
+
     auto layer3 = LayerGradient::create();
     layer3->setContentSize(Size(80.0f, 80.0f));
-    layer3->setPosition(Vec2(150.0f,140.0f));
+    layer3->setPosition(Vec2(150.0f, 140.0f));
     layer3->setStartColor(Color3B(255, 0, 0));
     layer3->setEndColor(Color3B(255, 0, 255));
     layer3->setStartOpacity(255);
     layer3->setEndOpacity(255);
-    layer3->setBlendFunc( BlendFunc::ALPHA_NON_PREMULTIPLIED );
+    layer3->setBlendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED);
     addChild(layer3);
 }
 
@@ -788,27 +715,27 @@ std::string LayerExtendedBlendOpacityTest::subtitle() const
 void LayerBug3162A::onEnter()
 {
     LayerTest::onEnter();
-    
-    Size size = VisibleRect::getVisibleRect().size;
-    size.width = size.width / 2;
-    size.height = size.height / 3;
+
+    Size size        = VisibleRect::getVisibleRect().size;
+    size.width       = size.width / 2;
+    size.height      = size.height / 3;
     Color4B color[3] = {Color4B(255, 0, 0, 255), Color4B(0, 255, 0, 255), Color4B(0, 0, 255, 255)};
-    
+
     for (int i = 0; i < 3; ++i)
     {
         _layer[i] = LayerColor::create(color[i]);
         _layer[i]->setContentSize(size);
-        _layer[i]->setPosition(Vec2(size.width/2, size.height/2) - Vec2(20.0f, 20.0f));
+        _layer[i]->setPosition(Vec2(size.width / 2, size.height / 2) - Vec2(20.0f, 20.0f));
         _layer[i]->setOpacity(150);
         _layer[i]->setCascadeOpacityEnabled(true);
         if (i > 0)
         {
-            _layer[i-1]->addChild(_layer[i]);
+            _layer[i - 1]->addChild(_layer[i]);
         }
     }
-    
+
     this->addChild(_layer[0]);
-    
+
     schedule(CC_SCHEDULE_SELECTOR(LayerBug3162A::step), 0.5, CC_REPEAT_FOREVER, 0);
 }
 
@@ -831,30 +758,30 @@ std::string LayerBug3162A::subtitle() const
 void LayerBug3162B::onEnter()
 {
     LayerTest::onEnter();
-    
-    Size size = VisibleRect::getVisibleRect().size;
-    size.width = size.width / 2;
-    size.height = size.height / 3;
+
+    Size size        = VisibleRect::getVisibleRect().size;
+    size.width       = size.width / 2;
+    size.height      = size.height / 3;
     Color4B color[3] = {Color4B(200, 0, 0, 255), Color4B(150, 0, 0, 255), Color4B(100, 0, 0, 255)};
-    
+
     for (int i = 0; i < 3; ++i)
     {
         _layer[i] = LayerColor::create(color[i]);
         _layer[i]->setContentSize(size);
-        _layer[i]->setPosition(Vec2(size.width/2, size.height/2) - Vec2(20.0f, 20.0f));
+        _layer[i]->setPosition(Vec2(size.width / 2, size.height / 2) - Vec2(20.0f, 20.0f));
         //_layer[i]->setOpacity(150);
         if (i > 0)
         {
-            _layer[i-1]->addChild(_layer[i]);
+            _layer[i - 1]->addChild(_layer[i]);
         }
     }
-    
+
     this->addChild(_layer[0]);
-    
+
     _layer[0]->setCascadeColorEnabled(true);
     _layer[1]->setCascadeColorEnabled(true);
     _layer[2]->setCascadeColorEnabled(true);
-    
+
     schedule(CC_SCHEDULE_SELECTOR(LayerBug3162B::step), 0.5, CC_REPEAT_FOREVER, 0);
 }
 
@@ -880,7 +807,7 @@ std::string LayerColorOccludeBug::title() const
 
 std::string LayerColorOccludeBug::subtitle() const
 {
-    return  "Layer Color Should not occlude titles and any sprites";
+    return "Layer Color Should not occlude titles and any sprites";
 }
 
 void LayerColorOccludeBug::onEnter()
@@ -907,22 +834,22 @@ std::string LayerRadialGradientTest::title() const
 void LayerRadialGradientTest::onEnter()
 {
     LayerTest::onEnter();
-    
+
     _currentSeletedItemIndex = 0;
-    
+
     auto director = Director::getInstance();
     director->setClearColor(Color4F(0, 0, 0, 0));
     auto origin = director->getVisibleOrigin();
-    auto size = director->getVisibleSize();
-    Vec2 center(origin.x + size.width/2 + 50, origin.y + size.height/2);
+    auto size   = director->getVisibleSize();
+    Vec2 center(origin.x + size.width / 2 + 50, origin.y + size.height / 2);
     float radius = (size.height - 50) / 2;
-    _layer = LayerRadialGradient::create(Color4B(145, 106, 209, 140), Color4B(0, 0, 0, 0), radius, center, 1.0f);
+    _layer       = LayerRadialGradient::create(Color4B(145, 106, 209, 140), Color4B(0, 0, 0, 0), radius, center, 1.0f);
     addChild(_layer);
-    
+
     auto scaleSlider = LayerRadialGradientTest::createSlider();
     scaleSlider->setPosition(Vec2(50.0f, 130.0f));
     addChild(scaleSlider);
-    
+
     auto listview = createListView();
     listview->setPosition(Vec2(100.0f, 150.0f));
     addChild(listview);
@@ -939,7 +866,7 @@ cocos2d::ui::Slider* LayerRadialGradientTest::createSlider()
     slider->setRotation(90);
     slider->setTag(101);
     slider->setPercent(50);
-    
+
     return slider;
 }
 
@@ -947,113 +874,114 @@ void LayerRadialGradientTest::listviewCallback(cocos2d::Ref* sender, cocos2d::ui
 {
     // clear all text to white
     auto listview = static_cast<cocos2d::ui::ListView*>(sender);
-    for (auto &item : listview->getItems())
+    for (auto& item : listview->getItems())
         static_cast<cocos2d::ui::Text*>(item)->setColor(cocos2d::Color3B::WHITE);
-    
+
     _currentSeletedItemIndex = (int)listview->getCurSelectedIndex();
     listview->getItem(_currentSeletedItemIndex)->setColor(cocos2d::Color3B::RED);
-    
+
     int percent = 100;
     auto slider = static_cast<cocos2d::ui::Slider*>(getChildByTag(101));
     switch (_currentSeletedItemIndex)
     {
-        case 0:
-            // scale
-             slider->setPercent(_layer->getScaleX() / 2 * percent);
-            break;
-        case 1:
-            // skewx
-            slider->setPercent(_layer->getSkewX() / 90 * percent);
-            break;
-        case 2:
-            // skewy
-            slider->setPercent(_layer->getSkewY() / 90 * percent);
-            break;
-        case 3:
-            // expand
-            slider->setPercent(_layer->getExpand() * percent);
-            break;
-        case 4:
-            // radius
-            slider->setPercent(_layer->getRadius() / 300 * percent);
-            break;
-            
-        default:
-            break;
+    case 0:
+        // scale
+        slider->setPercent(_layer->getScaleX() / 2 * percent);
+        break;
+    case 1:
+        // skewx
+        slider->setPercent(_layer->getSkewX() / 90 * percent);
+        break;
+    case 2:
+        // skewy
+        slider->setPercent(_layer->getSkewY() / 90 * percent);
+        break;
+    case 3:
+        // expand
+        slider->setPercent(_layer->getExpand() * percent);
+        break;
+    case 4:
+        // radius
+        slider->setPercent(_layer->getRadius() / 300 * percent);
+        break;
+
+    default:
+        break;
     }
 }
 
 void LayerRadialGradientTest::sliderCallback(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type)
 {
-    auto slider = static_cast<cocos2d::ui::Slider*>(sender);
+    auto slider   = static_cast<cocos2d::ui::Slider*>(sender);
     float percent = slider->getPercent() / 100.f;
     switch (_currentSeletedItemIndex)
     {
-        case 0:
-            // scale
-            _layer->setScale(percent * 2);
-            CCLOG("scale is %f", percent * 2);
-            break;
-        case 1:
-            // skewx
-            _layer->setSkewX(90 * percent);
-            CCLOG("SkewX is %f", 90 * percent);
-            break;
-        case 2:
-            // skewy
-            _layer->setSkewY(90 * percent);
-            CCLOG("SkewY is %f", 90 * percent);
-            break;
-        case 3:
-            // expand
-            _layer->setExpand(percent);
-            CCLOG("expand is %f", percent);
-            break;
-        case 4:
-            // radius
-            _layer->setRadius(300 * percent);
-            CCLOG("radius is %f", 300 * percent);
-            break;
-        default:
-            break;
+    case 0:
+        // scale
+        _layer->setScale(percent * 2);
+        CCLOG("scale is %f", percent * 2);
+        break;
+    case 1:
+        // skewx
+        _layer->setSkewX(90 * percent);
+        CCLOG("SkewX is %f", 90 * percent);
+        break;
+    case 2:
+        // skewy
+        _layer->setSkewY(90 * percent);
+        CCLOG("SkewY is %f", 90 * percent);
+        break;
+    case 3:
+        // expand
+        _layer->setExpand(percent);
+        CCLOG("expand is %f", percent);
+        break;
+    case 4:
+        // radius
+        _layer->setRadius(300 * percent);
+        CCLOG("radius is %f", 300 * percent);
+        break;
+    default:
+        break;
     }
 }
 
 cocos2d::ui::ListView* LayerRadialGradientTest::createListView()
 {
     auto listview = cocos2d::ui::ListView::create();
-    
+
     auto scale = cocos2d::ui::Text::create();
     scale->setString("scale[0-2]");
-    scale->setColor(cocos2d::Color3B::RED); // default seleted item
+    scale->setColor(cocos2d::Color3B::RED);  // default seleted item
     scale->setTouchEnabled(true);
     listview->pushBackCustomItem(scale);
-    
+
     auto skewx = cocos2d::ui::Text::create();
     skewx->setString("skewx[0-90]");
     skewx->setTouchEnabled(true);
     listview->pushBackCustomItem(skewx);
-    
+
     auto skewy = cocos2d::ui::Text::create();
     skewy->setString("skewy[0-90]");
     skewy->setTouchEnabled(true);
     listview->pushBackCustomItem(skewy);
-    
+
     auto expand = cocos2d::ui::Text::create();
     expand->setString("expand[0-1]");
     expand->setTouchEnabled(true);
     listview->pushBackCustomItem(expand);
-    
+
     auto radius = cocos2d::ui::Text::create();
     radius->setString("radius[0-300]");
     radius->setTouchEnabled(true);
     listview->pushBackCustomItem(radius);
-    
+
     listview->setContentSize(scale->getContentSize() * 5);
     listview->setCurSelectedIndex(0);
     listview->setTouchEnabled(true);
-    listview->addEventListener((ui::ListView::ccListViewCallback)CC_CALLBACK_2(LayerRadialGradientTest::listviewCallback, this));
+    listview->addEventListener(
+        (ui::ListView::ccListViewCallback)CC_CALLBACK_2(LayerRadialGradientTest::listviewCallback, this));
     listview->setTag(100);
-    
+
     return listview;
 }
diff --git a/tests/cpp-tests/Classes/LayerTest/LayerTest.h b/tests/cpp-tests/Classes/LayerTest/LayerTest.h
index 9ef5155f0987..96817d751b83 100644
--- a/tests/cpp-tests/Classes/LayerTest/LayerTest.h
+++ b/tests/cpp-tests/Classes/LayerTest/LayerTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,8 +35,9 @@ class LayerTest : public TestCase
 {
 public:
     virtual std::string title() const override;
+
 protected:
-    std::string    _title;
+    std::string _title;
 };
 
 class LayerTestCascadingOpacityA : public LayerTest
@@ -87,7 +88,6 @@ class LayerTestCascadingColorC : public LayerTest
     virtual std::string subtitle() const override;
 };
 
-
 class LayerTest1 : public LayerTest
 {
 public:
@@ -96,7 +96,7 @@ class LayerTest1 : public LayerTest
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
 
-    void updateSize(cocos2d::Vec2 &touchLocation);
+    void updateSize(cocos2d::Vec2& touchLocation);
 
     void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
@@ -111,7 +111,6 @@ class LayerTest2 : public LayerTest
     virtual std::string subtitle() const override;
 };
 
-
 class LayerTestBlend : public LayerTest
 {
 public:
@@ -130,7 +129,7 @@ class LayerGradientTest : public LayerTest
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    void toggleItem(cocos2d::Ref *sender);
+    void toggleItem(cocos2d::Ref* sender);
 };
 
 class LayerGradientTest2 : public LayerTest
@@ -188,9 +187,9 @@ class LayerBug3162A : public LayerTest
     virtual void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void step(float dt);
-    
+
 private:
     cocos2d::LayerColor* _layer[3];
 };
@@ -202,9 +201,9 @@ class LayerBug3162B : public LayerTest
     virtual void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void step(float dt);
-    
+
 private:
     cocos2d::LayerColor* _layer[3];
 };
@@ -217,7 +216,7 @@ class LayerColorOccludeBug : public LayerTest
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::LayerColor* _layer;
 };
@@ -228,16 +227,16 @@ class LayerRadialGradientTest : public LayerTest
     CREATE_FUNC(LayerRadialGradientTest);
     virtual void onEnter() override;
     virtual std::string title() const override;
-    
+
     void sliderCallback(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
     void listviewCallback(cocos2d::Ref* sender, cocos2d::ui::ListView::EventType type);
+
 private:
     cocos2d::ui::Slider* createSlider();
     cocos2d::ui::ListView* createListView();
-    
+
     cocos2d::LayerRadialGradient* _layer;
     int _currentSeletedItemIndex;
 };
 
-
 #endif
diff --git a/tests/cpp-tests/Classes/LightTest/LightTest.cpp b/tests/cpp-tests/Classes/LightTest/LightTest.cpp
index 26c449459df4..77d67012eadb 100644
--- a/tests/cpp-tests/Classes/LightTest/LightTest.cpp
+++ b/tests/cpp-tests/Classes/LightTest/LightTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,49 +31,49 @@ LightTests::LightTests()
     ADD_TEST_CASE(LightTest);
 }
 
-LightTest::LightTest()
-    : _directionalLight(nullptr)
-    , _pointLight(nullptr)
-    , _spotLight(nullptr)
+LightTest::LightTest() : _directionalLight(nullptr), _pointLight(nullptr), _spotLight(nullptr)
 {
     addSprite();
     addLights();
     scheduleUpdate();
 
-    auto s = Director::getInstance()->getWinSize();
-    auto camera = Camera::createPerspective(60, (float)s.width/s.height, 1.0f, 1000.0f);
+    auto s      = Director::getInstance()->getWinSize();
+    auto camera = Camera::createPerspective(60, (float)s.width / s.height, 1.0f, 1000.0f);
     camera->setCameraFlag(CameraFlag::USER1);
     camera->setPosition3D(Vec3(0.0f, 100.0f, 100.0f));
     camera->lookAt(Vec3(0.0f, 0.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
     addChild(camera);
 
     TTFConfig ttfConfig("fonts/arial.ttf", 15);
-    _ambientLightLabel = Label::createWithTTF(ttfConfig,"Ambient Light ON");
+    _ambientLightLabel = Label::createWithTTF(ttfConfig, "Ambient Light ON");
     _ambientLightLabel->retain();
-    auto menuItem0 = MenuItemLabel::create(_ambientLightLabel, CC_CALLBACK_1(LightTest::SwitchLight,this,LightType::AMBIENT));
-    _directionalLightLabel = Label::createWithTTF(ttfConfig,"Directional Light OFF");
+    auto menuItem0 =
+        MenuItemLabel::create(_ambientLightLabel, CC_CALLBACK_1(LightTest::SwitchLight, this, LightType::AMBIENT));
+    _directionalLightLabel = Label::createWithTTF(ttfConfig, "Directional Light OFF");
     _directionalLightLabel->retain();
-    auto menuItem1 = MenuItemLabel::create(_directionalLightLabel, CC_CALLBACK_1(LightTest::SwitchLight,this,LightType::DIRECTIONAL));
-    _pointLightLabel = Label::createWithTTF(ttfConfig,"Point Light OFF");
+    auto menuItem1   = MenuItemLabel::create(_directionalLightLabel,
+                                             CC_CALLBACK_1(LightTest::SwitchLight, this, LightType::DIRECTIONAL));
+    _pointLightLabel = Label::createWithTTF(ttfConfig, "Point Light OFF");
     _pointLightLabel->retain();
-    auto menuItem2 = MenuItemLabel::create(_pointLightLabel, CC_CALLBACK_1(LightTest::SwitchLight,this,LightType::POINT));
-    _spotLightLabel = Label::createWithTTF(ttfConfig,"Spot Light OFF");
+    auto menuItem2 =
+        MenuItemLabel::create(_pointLightLabel, CC_CALLBACK_1(LightTest::SwitchLight, this, LightType::POINT));
+    _spotLightLabel = Label::createWithTTF(ttfConfig, "Spot Light OFF");
     _spotLightLabel->retain();
-    auto menuItem3 = MenuItemLabel::create(_spotLightLabel, CC_CALLBACK_1(LightTest::SwitchLight,this,LightType::SPOT));
+    auto menuItem3 =
+        MenuItemLabel::create(_spotLightLabel, CC_CALLBACK_1(LightTest::SwitchLight, this, LightType::SPOT));
     auto menu = Menu::create(menuItem0, menuItem1, menuItem2, menuItem3, nullptr);
     menu->setPosition(Vec2::ZERO);
     menuItem0->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    menuItem0->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y-50) );
+    menuItem0->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 50));
     menuItem1->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    menuItem1->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y-100) );
+    menuItem1->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 100));
     menuItem2->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    menuItem2->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y -150));
+    menuItem2->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 150));
     menuItem3->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    menuItem3->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y -200));
+    menuItem3->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 200));
     addChild(menu);
 }
 
-
 LightTest::~LightTest()
 {
     if (_spotLightLabel)
@@ -119,7 +119,7 @@ void LightTest::addSprite()
 
     {
         std::string fileName = "Sprite3DTest/orc.c3b";
-        auto sprite = Sprite3D::create(fileName);
+        auto sprite          = Sprite3D::create(fileName);
         sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
         sprite->setPosition(Vec2(0.0f, 0.0f));
         sprite->setScale(2.0);
@@ -138,7 +138,7 @@ void LightTest::addSprite()
 
     {
         std::string fileName = "Sprite3DTest/sphere.c3b";
-        auto sprite = Sprite3D::create(fileName);
+        auto sprite          = Sprite3D::create(fileName);
         sprite->setPosition(Vec2(30.0f, 0.0f));
         addChild(sprite);
         sprite->setCameraMask(2);
@@ -146,7 +146,7 @@ void LightTest::addSprite()
 
     {
         std::string fileName = "Sprite3DTest/sphere.c3b";
-        auto sprite = Sprite3D::create(fileName);
+        auto sprite          = Sprite3D::create(fileName);
         sprite->setScale(0.5f);
         sprite->setPosition(Vec2(-50.0f, 0.0f));
         addChild(sprite);
@@ -155,7 +155,7 @@ void LightTest::addSprite()
 
     {
         std::string fileName = "Sprite3DTest/sphere.c3b";
-        auto sprite = Sprite3D::create(fileName);
+        auto sprite          = Sprite3D::create(fileName);
         sprite->setScale(0.5f);
         sprite->setPosition(Vec2(-30.0f, 10.0f));
         addChild(sprite);
@@ -165,7 +165,7 @@ void LightTest::addSprite()
 
 void LightTest::addLights()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s        = Director::getInstance()->getWinSize();
     _ambientLight = AmbientLight::create(Color3B(200, 200, 200));
     _ambientLight->retain();
     _ambientLight->setEnabled(true);
@@ -184,7 +184,8 @@ void LightTest::addLights()
     addChild(_pointLight);
     _pointLight->setCameraMask(2);
 
-    _spotLight = SpotLight::create(Vec3(-1.0f, -1.0f, 0.0f), Vec3(0.0f, 0.0f, 0.0f), Color3B(200, 200, 200), 0.0, 0.5, 10000.0f);
+    _spotLight =
+        SpotLight::create(Vec3(-1.0f, -1.0f, 0.0f), Vec3(0.0f, 0.0f, 0.0f), Color3B(200, 200, 200), 0.0, 0.5, 10000.0f);
     _spotLight->retain();
     _spotLight->setEnabled(false);
     addChild(_spotLight);
@@ -195,7 +196,7 @@ void LightTest::addLights()
         auto tintto2 = TintTo::create(4, 0, 255, 0);
         auto tintto3 = TintTo::create(4, 255, 0, 0);
         auto tintto4 = TintTo::create(4, 255, 255, 255);
-        auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, nullptr);
+        auto seq     = Sequence::create(tintto1, tintto2, tintto3, tintto4, nullptr);
         _ambientLight->runAction(RepeatForever::create(seq));
     }
 
@@ -204,7 +205,7 @@ void LightTest::addLights()
         auto tintto2 = TintTo::create(4, 0, 255, 0);
         auto tintto3 = TintTo::create(4, 0, 0, 255);
         auto tintto4 = TintTo::create(4, 255, 255, 255);
-        auto seq = Sequence::create(tintto1,tintto2, tintto3, tintto4, nullptr);
+        auto seq     = Sequence::create(tintto1, tintto2, tintto3, tintto4, nullptr);
         _directionalLight->runAction(RepeatForever::create(seq));
     }
 
@@ -213,7 +214,7 @@ void LightTest::addLights()
         auto tintto2 = TintTo::create(4, 0, 255, 0);
         auto tintto3 = TintTo::create(4, 0, 0, 255);
         auto tintto4 = TintTo::create(4, 255, 255, 255);
-        auto seq = Sequence::create(tintto2, tintto1, tintto3, tintto4, nullptr);
+        auto seq     = Sequence::create(tintto2, tintto1, tintto3, tintto4, nullptr);
         _pointLight->runAction(RepeatForever::create(seq));
     }
 
@@ -222,12 +223,12 @@ void LightTest::addLights()
         auto tintto2 = TintTo::create(4, 0, 255, 0);
         auto tintto3 = TintTo::create(4, 0, 0, 255);
         auto tintto4 = TintTo::create(4, 255, 255, 255);
-        auto seq = Sequence::create(tintto3, tintto2, tintto1, tintto4, nullptr);
+        auto seq     = Sequence::create(tintto3, tintto2, tintto1, tintto4, nullptr);
         _spotLight->runAction(RepeatForever::create(seq));
     }
 }
 
-void LightTest::update( float delta )
+void LightTest::update(float delta)
 {
     static float angleDelta = 0.0;
 
@@ -256,49 +257,49 @@ void LightTest::update( float delta )
     TestCase::update(delta);
 }
 
-void LightTest::SwitchLight( Ref* sender, LightType lightType )
+void LightTest::SwitchLight(Ref* sender, LightType lightType)
 {
     switch (lightType)
     {
     case LightType::AMBIENT:
-        {
-            char str[32];
-            bool isON = !_ambientLight->isEnabled();
-            sprintf(str, "Ambient Light %s", isON == true? "ON":"OFF");
-            _ambientLight->setEnabled(isON);
-            _ambientLightLabel->setString(str);
-        }
-        break;
+    {
+        char str[32];
+        bool isON = !_ambientLight->isEnabled();
+        sprintf(str, "Ambient Light %s", isON == true ? "ON" : "OFF");
+        _ambientLight->setEnabled(isON);
+        _ambientLightLabel->setString(str);
+    }
+    break;
 
     case LightType::DIRECTIONAL:
-        {
-            char str[32];
-            bool isON = !_directionalLight->isEnabled();
-            sprintf(str, "Directional Light %s", isON == true? "ON":"OFF");
-            _directionalLight->setEnabled(isON);
-            _directionalLightLabel->setString(str);
-        }
-        break;
+    {
+        char str[32];
+        bool isON = !_directionalLight->isEnabled();
+        sprintf(str, "Directional Light %s", isON == true ? "ON" : "OFF");
+        _directionalLight->setEnabled(isON);
+        _directionalLightLabel->setString(str);
+    }
+    break;
 
     case LightType::POINT:
-        {
-            char str[32];
-            bool isON = !_pointLight->isEnabled();
-            sprintf(str, "Point Light %s", isON == true? "ON":"OFF");
-            _pointLight->setEnabled(isON);
-            _pointLightLabel->setString(str);
-        }
-        break;
+    {
+        char str[32];
+        bool isON = !_pointLight->isEnabled();
+        sprintf(str, "Point Light %s", isON == true ? "ON" : "OFF");
+        _pointLight->setEnabled(isON);
+        _pointLightLabel->setString(str);
+    }
+    break;
 
     case LightType::SPOT:
-        {
-            char str[32];
-            bool isON = !_spotLight->isEnabled();
-            sprintf(str, "Spot Light %s", isON == true? "ON":"OFF");
-            _spotLight->setEnabled(isON);
-            _spotLightLabel->setString(str);
-        }
-        break;
+    {
+        char str[32];
+        bool isON = !_spotLight->isEnabled();
+        sprintf(str, "Spot Light %s", isON == true ? "ON" : "OFF");
+        _spotLight->setEnabled(isON);
+        _spotLightLabel->setString(str);
+    }
+    break;
 
     default:
         break;
diff --git a/tests/cpp-tests/Classes/LightTest/LightTest.h b/tests/cpp-tests/Classes/LightTest/LightTest.h
index 2112f1ce2010..e7b32fb9a790 100644
--- a/tests/cpp-tests/Classes/LightTest/LightTest.h
+++ b/tests/cpp-tests/Classes/LightTest/LightTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,12 +44,10 @@ class LightTest : public TestCase
     void SwitchLight(cocos2d::Ref* sender, cocos2d::LightType lightType);
 
 private:
-
     void addSprite();
     void addLights();
 
 private:
-
     cocos2d::AmbientLight* _ambientLight;
     cocos2d::DirectionLight* _directionalLight;
     cocos2d::PointLight* _pointLight;
@@ -62,4 +60,3 @@ class LightTest : public TestCase
 };
 
 #endif
-
diff --git a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp
index de0539305eed..54ecfbb0296c 100644
--- a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp
+++ b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp
@@ -37,7 +37,6 @@ USING_NS_CC;
 
 static void printProperties(Properties* properties, int indent);
 
-
 // MARK: Tests
 
 MaterialSystemTest::MaterialSystemTest()
@@ -66,7 +65,7 @@ void Material_Sprite3DTest::onEnter()
     sprite->setScale(8.f);
     sprite->setTexture("Sprite3DTest/boss.png");
     this->addChild(sprite);
-    sprite->setPositionNormalized(Vec2(0.5f,0.5f));
+    sprite->setPositionNormalized(Vec2(0.5f, 0.5f));
 }
 
 std::string Material_Sprite3DTest::subtitle() const
@@ -79,25 +78,20 @@ void Material_MultipleSprite3D::onEnter()
     MaterialSystemBaseTest::onEnter();
 
     const char* names[] = {
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
-        "Sprite3DTest/ReskinGirl.c3b",
+        "Sprite3DTest/ReskinGirl.c3b", "Sprite3DTest/ReskinGirl.c3b", "Sprite3DTest/ReskinGirl.c3b",
+        "Sprite3DTest/ReskinGirl.c3b", "Sprite3DTest/ReskinGirl.c3b", "Sprite3DTest/ReskinGirl.c3b",
+        "Sprite3DTest/ReskinGirl.c3b", "Sprite3DTest/ReskinGirl.c3b",
     };
 
     const int totalNames = sizeof(names) / sizeof(names[0]);
 
     auto size = Director::getInstance()->getWinSize();
 
-    for(int i=0;i<totalNames;i++)
+    for (int i = 0; i < totalNames; i++)
     {
         auto sprite = Sprite3D::create(names[i]);
         this->addChild(sprite);
-        sprite->setPosition(Vec2((size.width/(totalNames+1))*(i+1), size.height/4));
+        sprite->setPosition(Vec2((size.width / (totalNames + 1)) * (i + 1), size.height / 4));
         sprite->setScale(3);
     }
 }
@@ -119,7 +113,7 @@ void Material_2DEffects::onEnter()
     // Print the properties of every namespace within this one.
     printProperties(properties, 0);
 
-    Material *mat1 = Material::createWithProperties(properties);
+    Material* mat1 = Material::createWithProperties(properties);
 
     auto spriteBlur = Sprite::create("Images/grossini.png");
     spriteBlur->setPositionNormalized(Vec2(0.2f, 0.5f));
@@ -143,11 +137,13 @@ void Material_2DEffects::onEnter()
 
     timeUniforms.clear();
 
-#define FETCH_CCTIME_LOCATION(sprite) do {                                  \
-        auto programState = sprite->getProgramState();                      \
-        auto location     = programState->getUniformLocation("u_Time");    \
-        timeUniforms.emplace_back(programState, location);                  \
-    }while(0)
+#define FETCH_CCTIME_LOCATION(sprite)                                   \
+    do                                                                  \
+    {                                                                   \
+        auto programState = sprite->getProgramState();                  \
+        auto location     = programState->getUniformLocation("u_Time"); \
+        timeUniforms.emplace_back(programState, location);              \
+    } while (0)
 
     FETCH_CCTIME_LOCATION(spriteBlur);
     FETCH_CCTIME_LOCATION(spriteOutline);
@@ -169,7 +165,7 @@ void Material_2DEffects::updateCCTimeUniforms(float)
 {
     float time = Director::getInstance()->getTotalFrames() * Director::getInstance()->getAnimationInterval();
     Vec4 random(time / 10.0f, time, time * 2.0f, time * 4.0f);
-    for (auto &loc : timeUniforms)
+    for (auto& loc : timeUniforms)
     {
         loc.programState->setUniform(loc.location, &random, sizeof(random));
     }
@@ -184,21 +180,25 @@ void Material_2DEffects::updateCCTimeUniforms(float)
  */
 class EffectAutoBindingResolver : public backend::ProgramState::AutoBindingResolver
 {
-    virtual bool resolveAutoBinding(backend::ProgramState* programState,/* Node* node,*/ const std::string& uniform, const std::string& autoBinding) override;
+    virtual bool resolveAutoBinding(backend::ProgramState* programState,
+                                    /* Node* node,*/ std::string_view uniform,
+                                    std::string_view autoBinding) override;
 
     void callbackRadius(backend::ProgramState* programState, backend::UniformLocation uniform);
     void callbackColor(backend::ProgramState* programState, backend::UniformLocation uniform);
 };
 
-bool EffectAutoBindingResolver::resolveAutoBinding(backend::ProgramState* programState, /*Node* node,*/ const std::string& uniform, const std::string& autoBinding)
+bool EffectAutoBindingResolver::resolveAutoBinding(backend::ProgramState* programState,
+                                                   /*Node* node,*/ std::string_view uniform,
+                                                   std::string_view autoBinding)
 {
-    if (autoBinding.compare("DYNAMIC_RADIUS")==0)
+    if (autoBinding.compare("DYNAMIC_RADIUS") == 0)
     {
         auto loc = programState->getUniformLocation(uniform);
         programState->setCallbackUniform(loc, CC_CALLBACK_2(EffectAutoBindingResolver::callbackRadius, this));
         return true;
     }
-    else if (autoBinding.compare("OUTLINE_COLOR")==0)
+    else if (autoBinding.compare("OUTLINE_COLOR") == 0)
     {
         auto loc = programState->getUniformLocation(uniform);
         programState->setCallbackUniform(loc, CC_CALLBACK_2(EffectAutoBindingResolver::callbackColor, this));
@@ -207,13 +207,13 @@ bool EffectAutoBindingResolver::resolveAutoBinding(backend::ProgramState* progra
     return false;
 }
 
-void EffectAutoBindingResolver::callbackRadius(backend::ProgramState *programState, backend::UniformLocation uniform)
+void EffectAutoBindingResolver::callbackRadius(backend::ProgramState* programState, backend::UniformLocation uniform)
 {
     float f = CCRANDOM_0_1() * 10;
     programState->setUniform(uniform, &f, sizeof(f));
 }
 
-void EffectAutoBindingResolver::callbackColor(backend::ProgramState *programState, backend::UniformLocation uniform)
+void EffectAutoBindingResolver::callbackColor(backend::ProgramState* programState, backend::UniformLocation uniform)
 {
     float r = CCRANDOM_0_1();
     float g = CCRANDOM_0_1();
@@ -233,18 +233,17 @@ Material_AutoBindings::~Material_AutoBindings()
     delete _resolver;
 }
 
-
 void Material_AutoBindings::onEnter()
 {
     MaterialSystemBaseTest::onEnter();
 
-//    auto properties = Properties::createNonRefCounted("Materials/2d_effects.material#sample");
+    //    auto properties = Properties::createNonRefCounted("Materials/2d_effects.material#sample");
     auto properties = Properties::createNonRefCounted("Materials/auto_binding_test.material#sample");
 
     // Print the properties of every namespace within this one.
     printProperties(properties, 0);
 
-    Material *mat1 = Material::createWithProperties(properties);
+    Material* mat1 = Material::createWithProperties(properties);
 
     auto spriteBlur = Sprite::create("Images/grossini.png");
     spriteBlur->setPositionNormalized(Vec2(0.2f, 0.5f));
@@ -267,8 +266,8 @@ void Material_AutoBindings::onEnter()
     spriteEdgeDetect->setProgramState(mat1->getTechniqueByName("edge_detect")->getPassByIndex(0)->getProgramState());
 
     _noiseProgramState = spriteNoise->getProgramState();
-    _locationTime = _noiseProgramState->getUniformLocation("u_Time");
-    
+    _locationTime      = _noiseProgramState->getUniformLocation("u_Time");
+
     schedule(CC_SCHEDULE_SELECTOR(Material_AutoBindings::updateUniformTime));
     // properties is not a "Ref" object
     CC_SAFE_DELETE(properties);
@@ -296,24 +295,23 @@ void Material_setTechnique::onEnter()
     auto sprite = Sprite3D::create("Sprite3DTest/boss1.obj");
     sprite->setScale(6);
     this->addChild(sprite);
-    sprite->setPositionNormalized(Vec2(0.5f,0.5f));
+    sprite->setPositionNormalized(Vec2(0.5f, 0.5f));
     _sprite = sprite;
 
-
-    Material *mat = Material::createWithFilename("Materials/3d_effects.material");
+    Material* mat = Material::createWithFilename("Materials/3d_effects.material");
     sprite->setMaterial(mat);
 
     // lights
     auto light1 = AmbientLight::create(Color3B::RED);
     addChild(light1);
 
-    auto light2 = DirectionLight::create(Vec3(-1,1,0), Color3B::GREEN);
+    auto light2 = DirectionLight::create(Vec3(-1, 1, 0), Color3B::GREEN);
     addChild(light2);
 
-    this->schedule(CC_CALLBACK_1(Material_setTechnique::changeMaterial, this),  1, "cookie");
+    this->schedule(CC_CALLBACK_1(Material_setTechnique::changeMaterial, this), 1, "cookie");
     _techniqueState = 0;
 
-    auto rot = RotateBy::create(5, Vec3(30.0f,60.0f,270.0f));
+    auto rot    = RotateBy::create(5, Vec3(30.0f, 60.0f, 270.0f));
     auto repeat = RepeatForever::create(rot);
     sprite->runAction(repeat);
 }
@@ -328,17 +326,17 @@ void Material_setTechnique::changeMaterial(float dt)
     // get it from Mesh 0
     switch (_techniqueState)
     {
-        case 0:
-            _sprite->getMaterial(0)->setTechnique("lit");
-            break;
-        case 1:
-            _sprite->getMaterial(0)->setTechnique("normal");
-            break;
-        case 2:
-            _sprite->getMaterial(0)->setTechnique("outline");
-            break;
-        default:
-            break;
+    case 0:
+        _sprite->getMaterial(0)->setTechnique("lit");
+        break;
+    case 1:
+        _sprite->getMaterial(0)->setTechnique("normal");
+        break;
+    case 2:
+        _sprite->getMaterial(0)->setTechnique("outline");
+        break;
+    default:
+        break;
     }
 
     _techniqueState = (_techniqueState + 1) % 3;
@@ -356,10 +354,10 @@ void Material_clone::onEnter()
     this->addChild(sprite);
     sprite->setPositionNormalized(Vec2(0.25f, 0.5f));
 
-    Material *mat = Material::createWithFilename("Materials/3d_effects.material");
+    Material* mat = Material::createWithFilename("Materials/3d_effects.material");
     sprite->setMaterial(mat);
 
-    auto rot = RotateBy::create(5, Vec3(360.0f,240.0f,120.0f));
+    auto rot    = RotateBy::create(5, Vec3(360.0f, 240.0f, 120.0f));
     auto repeat = RepeatForever::create(rot);
     sprite->runAction(repeat);
 
@@ -385,8 +383,7 @@ void Material_clone::onEnter()
     mat->setTechnique("outline");
 
     // should affect only sprite 3
-//    mat2->setTechnique("normal");
-
+    //    mat2->setTechnique("normal");
 }
 
 std::string Material_clone::subtitle() const
@@ -402,76 +399,74 @@ const int SHOW_LEBAL_TAG = 114;
 void Material_parsePerformance::onEnter()
 {
     MaterialSystemBaseTest::onEnter();
-    
+
     _maxParsingCoumt = 5e3;
-    
+
     auto screenSize = Director::getInstance()->getWinSize();
-    
+
     ui::Slider* slider = ui::Slider::create();
     slider->loadBarTexture("cocosui/sliderTrack.png");
     slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
     slider->loadProgressBarTexture("cocosui/sliderProgress.png");
     slider->setPercent(50);
-    
+
     slider->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 3.0f));
     slider->addEventListener([&](Ref* sender, ui::Slider::EventType type) {
-        
         if (type == ui::Slider::EventType::ON_SLIDEBALL_UP)
         {
             ui::Slider* slider = dynamic_cast<ui::Slider*>(sender);
-            float p = slider->getPercent() / 100.0f;
+            float p            = slider->getPercent() / 100.0f;
             slider->setTouchEnabled(false);
             CCLOG("Will parsing material %d times", (int)(p * _maxParsingCoumt));
             Label* label = dynamic_cast<Label*>(this->getChildByTag(SHOW_LEBAL_TAG));
-            if(label)
+            if (label)
             {
                 label->setString("Testing start!");
             }
             this->scheduleOnce(
-                               [this, p, slider](float)
-                               {
-                                   this->parsingTesting(p * _maxParsingCoumt);
-                                   slider->setTouchEnabled(true);
-                               },
-                               1.0, "schedule test parsing");
-            
+                [this, p, slider](float) {
+                    this->parsingTesting(p * _maxParsingCoumt);
+                    slider->setTouchEnabled(true);
+                },
+                1.0, "schedule test parsing");
         }
     });
-    
+
     addChild(slider);
-    
-    auto label = Label::createWithSystemFont("Max parsing count is 10000, which may crash because of high memory consumption.", "Helvetica", 10);
+
+    auto label = Label::createWithSystemFont(
+        "Max parsing count is 10000, which may crash because of high memory consumption.", "Helvetica", 10);
     label->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f - 20));
     addChild(label);
     label = Label::createWithSystemFont("Slide to test parsing performance", "Helvetica", 10);
     label->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f));
     addChild(label);
-    
+
     label = Label::createWithSystemFont("", "Helvetica", 10);
     label->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + 20));
     label->setTag(SHOW_LEBAL_TAG);
     addChild(label);
-
 }
 
 void Material_parsePerformance::parsingTesting(unsigned int count)
 {
     std::clock_t begin = std::clock();
-    
+
     for (unsigned int i = 0; i < count; i++)
     {
         Material::createWithFilename("Materials/2d_effects.material");
         Material::createWithFilename("Materials/3d_effects.material");
     }
-    
-    std::clock_t end = std::clock();
+
+    std::clock_t end    = std::clock();
     double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
-    Label* label = dynamic_cast<Label*>(this->getChildByTag(SHOW_LEBAL_TAG));
-    if(label)
+    Label* label        = dynamic_cast<Label*>(this->getChildByTag(SHOW_LEBAL_TAG));
+    if (label)
     {
-        std::string str = StringUtils::format("Testing completed! Took: %.3f seconds for parsing material %d times.", elapsed_secs, count);
+        std::string str = StringUtils::format("Testing completed! Took: %.3f seconds for parsing material %d times.",
+                                              elapsed_secs, count);
         label->setString(str);
-        
+
         CCLOG("Took: %.3f seconds for parsing material %d times.", elapsed_secs, count);
     }
 }
@@ -487,17 +482,17 @@ static void printProperties(Properties* properties, int indent)
 {
     // Print the name and ID of the current namespace.
     const char* spacename = properties->getNamespace();
-    const char* id = properties->getId();
+    const char* id        = properties->getId();
     char chindent[64];
-    int i=0;
-    for(i=0; i<indent*2;i++)
+    int i = 0;
+    for (i = 0; i < indent * 2; i++)
         chindent[i] = ' ';
     chindent[i] = '\0';
 
     log("%sNamespace: %s  ID: %s\n%s{", chindent, spacename, id, chindent);
 
     // Print all properties in this namespace.
-    const char* name = properties->getNextProperty();
+    const char* name  = properties->getNextProperty();
     const char* value = NULL;
     while (name != NULL)
     {
@@ -509,9 +504,9 @@ static void printProperties(Properties* properties, int indent)
     Properties* space = properties->getNextNamespace();
     while (space != NULL)
     {
-        printProperties(space, indent+1);
+        printProperties(space, indent + 1);
         space = properties->getNextNamespace();
     }
 
-    log("%s}\n",chindent);
+    log("%s}\n", chindent);
 }
diff --git a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.h b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.h
index 5262858f9e33..518cfef70813 100644
--- a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.h
+++ b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.h
@@ -46,7 +46,6 @@ class Material_Sprite3DTest : public MaterialSystemBaseTest
 
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
-
 };
 
 class Material_MultipleSprite3D : public MaterialSystemBaseTest
@@ -66,13 +65,15 @@ class Material_2DEffects : public MaterialSystemBaseTest
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     void updateCCTimeUniforms(float);
-    
+
 private:
-    struct Locations {
-        Locations(cocos2d::backend::ProgramState *ps, cocos2d::backend::UniformLocation loc)
-            : programState(ps), location(loc) {}
-           
-        cocos2d::backend::ProgramState *programState = nullptr;
+    struct Locations
+    {
+        Locations(cocos2d::backend::ProgramState* ps, cocos2d::backend::UniformLocation loc)
+            : programState(ps), location(loc)
+        {}
+
+        cocos2d::backend::ProgramState* programState = nullptr;
         cocos2d::backend::UniformLocation location;
     };
     std::vector<Locations> timeUniforms;
@@ -94,8 +95,8 @@ class Material_AutoBindings : public MaterialSystemBaseTest
 
 private:
     cocos2d::backend::UniformLocation _locationTime;
-    EffectAutoBindingResolver       *_resolver          = nullptr;
-    cocos2d::backend::ProgramState  *_noiseProgramState = nullptr;
+    EffectAutoBindingResolver* _resolver               = nullptr;
+    cocos2d::backend::ProgramState* _noiseProgramState = nullptr;
 };
 
 class Material_setTechnique : public MaterialSystemBaseTest
@@ -130,9 +131,7 @@ class Material_parsePerformance : public MaterialSystemBaseTest
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
     void parsingTesting(unsigned int count);
+
 protected:
     unsigned int _maxParsingCoumt;
 };
-
-
-
diff --git a/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp b/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp
index 9c2e36b0ba51..9a71dc99bcb1 100644
--- a/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp
+++ b/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp
@@ -29,21 +29,22 @@
 
 USING_NS_CC;
 
-enum {
-    kTagMenu = 1,
-    kTagMenu0 = 0,                       
+enum
+{
+    kTagMenu  = 1,
+    kTagMenu0 = 0,
     kTagMenu1 = 1,
 };
 
-#define MID_CALLBACK    1000
-#define MID_CALLBACK2    1001
-#define MID_DISABLED    1002
-#define MID_ENABLE        1003
-#define MID_CONFIG        1004
-#define MID_QUIT        1005
-#define MID_OPACITY        1006
-#define MID_ALIGN        1007
-#define MID_CALLBACK3    1008
+#define MID_CALLBACK 1000
+#define MID_CALLBACK2 1001
+#define MID_DISABLED 1002
+#define MID_ENABLE 1003
+#define MID_CONFIG 1004
+#define MID_QUIT 1005
+#define MID_OPACITY 1006
+#define MID_ALIGN 1007
+#define MID_CALLBACK3 1008
 #define MID_BACKCALLBACK 1009
 
 MenuTests::MenuTests()
@@ -59,42 +60,43 @@ MenuLayerMainMenu::MenuLayerMainMenu()
 {
     _touchListener = EventListenerTouchOneByOne::create();
     _touchListener->setSwallowTouches(true);
-    _touchListener->onTouchBegan = CC_CALLBACK_2(MenuLayerMainMenu::touchBegan, this);
-    _touchListener->onTouchMoved = CC_CALLBACK_2(MenuLayerMainMenu::touchMoved, this);
-    _touchListener->onTouchEnded = CC_CALLBACK_2(MenuLayerMainMenu::touchEnded, this);
+    _touchListener->onTouchBegan     = CC_CALLBACK_2(MenuLayerMainMenu::touchBegan, this);
+    _touchListener->onTouchMoved     = CC_CALLBACK_2(MenuLayerMainMenu::touchMoved, this);
+    _touchListener->onTouchEnded     = CC_CALLBACK_2(MenuLayerMainMenu::touchEnded, this);
     _touchListener->onTouchCancelled = CC_CALLBACK_2(MenuLayerMainMenu::touchCancelled, this);
     _eventDispatcher->addEventListenerWithFixedPriority(_touchListener, 1);
-    
-    // Font Item    
-    auto spriteNormal = Sprite::create(s_MenuItem, Rect(0,23*2,115,23));
-    auto spriteSelected = Sprite::create(s_MenuItem, Rect(0,23*1,115,23));
-    auto spriteDisabled = Sprite::create(s_MenuItem, Rect(0,23*0,115,23));
-
-    auto item1 = MenuItemSprite::create(spriteNormal, spriteSelected, spriteDisabled, CC_CALLBACK_1(MenuLayerMainMenu::menuCallback, this) );
-    
+
+    // Font Item
+    auto spriteNormal   = Sprite::create(s_MenuItem, Rect(0, 23 * 2, 115, 23));
+    auto spriteSelected = Sprite::create(s_MenuItem, Rect(0, 23 * 1, 115, 23));
+    auto spriteDisabled = Sprite::create(s_MenuItem, Rect(0, 23 * 0, 115, 23));
+
+    auto item1 = MenuItemSprite::create(spriteNormal, spriteSelected, spriteDisabled,
+                                        CC_CALLBACK_1(MenuLayerMainMenu::menuCallback, this));
+
     // Image Item
-    auto item2 = MenuItemImage::create(s_SendScore, s_PressSendScore, CC_CALLBACK_1(MenuLayerMainMenu::menuCallback2, this) );
+    auto item2 =
+        MenuItemImage::create(s_SendScore, s_PressSendScore, CC_CALLBACK_1(MenuLayerMainMenu::menuCallback2, this));
 
     // Label Item (LabelAtlas)
     auto labelAtlas = LabelAtlas::create("0123456789", "fonts/labelatlas.png", 16, 24, '.');
-    auto item3 = MenuItemLabel::create(labelAtlas, CC_CALLBACK_1(MenuLayerMainMenu::menuCallbackDisabled, this) );
-    item3->setDisabledColor( Color3B(32,32,64) );
-    item3->setColor( Color3B(200,200,255) );
-    CCLOG("test MenuItem Label getString: %s", item3->getString().c_str());
+    auto item3      = MenuItemLabel::create(labelAtlas, CC_CALLBACK_1(MenuLayerMainMenu::menuCallbackDisabled, this));
+    item3->setDisabledColor(Color3B(32, 32, 64));
+    item3->setColor(Color3B(200, 200, 255));
+    CCLOG("test MenuItem Label getString: %s", item3->getString().data());
     // Font Item
-    auto item4 = MenuItemFont::create("I toggle enable items", [&](Ref *sender) {
-		_disabledItem->setEnabled(! _disabledItem->isEnabled() );
-	});
+    auto item4 = MenuItemFont::create("I toggle enable items",
+                                      [&](Ref* sender) { _disabledItem->setEnabled(!_disabledItem->isEnabled()); });
 
     item4->setFontSizeObj(20);
     item4->setFontName("fonts/Marker Felt.ttf");
-    
+
     // Label Item (LabelBMFont)
     auto label = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "configuration");
     auto item5 = MenuItemLabel::create(label, CC_CALLBACK_1(MenuLayerMainMenu::menuCallbackConfig, this));
 
     // Testing issue #500
-    item5->setScale( 0.8f );
+    item5->setScale(0.8f);
 
     // Events
     MenuItemFont::setFontName("fonts/Marker Felt.ttf");
@@ -102,62 +104,56 @@ MenuLayerMainMenu::MenuLayerMainMenu()
     auto item6 = MenuItemFont::create("Bugs", CC_CALLBACK_1(MenuLayerMainMenu::menuCallbackBugsTest, this));
 
     // Font Item
-    auto item7= MenuItemFont::create("Quit", CC_CALLBACK_1(MenuLayerMainMenu::onQuit, this));
-    
-    auto item8 = MenuItemFont::create("Remove menu item when moving", CC_CALLBACK_1(MenuLayerMainMenu::menuMovingCallback, this));
-    
+    auto item7 = MenuItemFont::create("Quit", CC_CALLBACK_1(MenuLayerMainMenu::onQuit, this));
+
+    auto item8 = MenuItemFont::create("Remove menu item when moving",
+                                      CC_CALLBACK_1(MenuLayerMainMenu::menuMovingCallback, this));
+
     auto color_action = TintBy::create(0.5f, 0, -255, -255);
-    auto color_back = color_action->reverse();
-    auto seq = Sequence::create(color_action, color_back, nullptr);
+    auto color_back   = color_action->reverse();
+    auto seq          = Sequence::create(color_action, color_back, nullptr);
     item7->runAction(RepeatForever::create(seq));
 
-    auto menu = Menu::create( item1, item2, item3, item4, item5, item6, item7, item8,  nullptr);
+    auto menu = Menu::create(item1, item2, item3, item4, item5, item6, item7, item8, nullptr);
     menu->alignItemsVertically();
-    
-    
+
     // elastic effect
     auto s = Director::getInstance()->getWinSize();
-    
-    int i=0;
-    for(const auto &child : menu->getChildren()) {
+
+    int i = 0;
+    for (const auto& child : menu->getChildren())
+    {
         auto dstPoint = child->getPosition();
-        int offset = (int) (s.width/2 + 50);
-        if( i % 2 == 0)
+        int offset    = (int)(s.width / 2 + 50);
+        if (i % 2 == 0)
             offset = -offset;
-        
-        child->setPosition( Vec2( dstPoint.x + offset, dstPoint.y) );
-        child->runAction(
-                         EaseElasticOut::create(MoveBy::create(2, Vec2(dstPoint.x - offset,0.0f)), 0.35f)
-                         );
+
+        child->setPosition(Vec2(dstPoint.x + offset, dstPoint.y));
+        child->runAction(EaseElasticOut::create(MoveBy::create(2, Vec2(dstPoint.x - offset, 0.0f)), 0.35f));
         i++;
     }
 
-    _disabledItem = item3; item3->retain();
-    _disabledItem->setEnabled( false );
+    _disabledItem = item3;
+    item3->retain();
+    _disabledItem->setEnabled(false);
 
     addChild(menu);
     menu->setTag(100);
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
     menu->setScale(0);
-    menu->runAction(ScaleTo::create(1,1));
+    menu->runAction(ScaleTo::create(1, 1));
 }
 
-bool MenuLayerMainMenu::touchBegan(Touch *touch, Event * event)
+bool MenuLayerMainMenu::touchBegan(Touch* touch, Event* event)
 {
     return true;
 }
 
-void MenuLayerMainMenu::touchEnded(Touch *touch, Event * event)
-{
-}
+void MenuLayerMainMenu::touchEnded(Touch* touch, Event* event) {}
 
-void MenuLayerMainMenu::touchCancelled(Touch *touch, Event * event)
-{
-}
+void MenuLayerMainMenu::touchCancelled(Touch* touch, Event* event) {}
 
-void MenuLayerMainMenu::touchMoved(Touch *touch, Event * event)
-{
-}
+void MenuLayerMainMenu::touchMoved(Touch* touch, Event* event) {}
 
 MenuLayerMainMenu::~MenuLayerMainMenu()
 {
@@ -182,7 +178,7 @@ void MenuLayerMainMenu::allowTouches(float dt)
     log("TOUCHES ALLOWED AGAIN");
 }
 
-void MenuLayerMainMenu::menuCallbackDisabled(Ref* sender) 
+void MenuLayerMainMenu::menuCallbackDisabled(Ref* sender)
 {
     // hijack all touch events for 5 seconds
     _eventDispatcher->setPriority(_touchListener, -1);
@@ -195,7 +191,7 @@ void MenuLayerMainMenu::menuCallback2(Ref* sender)
     static_cast<LayerMultiplex*>(_parent)->switchTo(2, false);
 }
 
-void MenuLayerMainMenu::menuCallbackBugsTest(Ref *pSender)
+void MenuLayerMainMenu::menuCallbackBugsTest(Ref* pSender)
 {
     static_cast<LayerMultiplex*>(_parent)->switchTo(4, false);
 }
@@ -203,10 +199,10 @@ void MenuLayerMainMenu::menuCallbackBugsTest(Ref *pSender)
 void MenuLayerMainMenu::onQuit(Ref* sender)
 {
     //[[Director sharedDirector] end];
-    //getCocosApp()->exit();
+    // getCocosApp()->exit();
 }
 
-void MenuLayerMainMenu::menuMovingCallback(Ref *pSender)
+void MenuLayerMainMenu::menuMovingCallback(Ref* pSender)
 {
     static_cast<LayerMultiplex*>(_parent)->switchTo(5, false);
 }
@@ -218,24 +214,26 @@ void MenuLayerMainMenu::menuMovingCallback(Ref *pSender)
 //------------------------------------------------------------------
 MenuLayer2::MenuLayer2()
 {
-    for( int i=0;i < 2;i++ ) 
+    for (int i = 0; i < 2; i++)
     {
         auto item1 = MenuItemImage::create(s_PlayNormal, s_PlaySelect, CC_CALLBACK_1(MenuLayer2::menuCallback, this));
-        auto item2 = MenuItemImage::create(s_HighNormal, s_HighSelect, CC_CALLBACK_1(MenuLayer2::menuCallbackOpacity, this));
-        auto item3 = MenuItemImage::create(s_AboutNormal, s_AboutSelect, CC_CALLBACK_1(MenuLayer2::menuCallbackAlign, this));
-        
-        item1->setScaleX( 1.5f );
-        item2->setScaleX( 0.5f );
-        item3->setScaleX( 0.5f );
-        
+        auto item2 =
+            MenuItemImage::create(s_HighNormal, s_HighSelect, CC_CALLBACK_1(MenuLayer2::menuCallbackOpacity, this));
+        auto item3 =
+            MenuItemImage::create(s_AboutNormal, s_AboutSelect, CC_CALLBACK_1(MenuLayer2::menuCallbackAlign, this));
+
+        item1->setScaleX(1.5f);
+        item2->setScaleX(0.5f);
+        item3->setScaleX(0.5f);
+
         auto menu = Menu::create(item1, item2, item3, nullptr);
-        
+
         auto s = Director::getInstance()->getWinSize();
-        menu->setPosition(Vec2(s.width/2, s.height/2));
+        menu->setPosition(Vec2(s.width / 2, s.height / 2));
+
+        menu->setTag(kTagMenu);
 
-        menu->setTag( kTagMenu );
-        
-        addChild(menu, 0, 100+i);
+        addChild(menu, 0, 100 + i);
 
         _centeredMenu = menu->getPosition();
     }
@@ -244,54 +242,51 @@ MenuLayer2::MenuLayer2()
     alignMenusH();
 }
 
-MenuLayer2::~MenuLayer2()
-{
-}
+MenuLayer2::~MenuLayer2() {}
 
 void MenuLayer2::alignMenusH()
 {
-    for(int i=0;i<2;i++) 
+    for (int i = 0; i < 2; i++)
     {
-        auto menu = static_cast<Menu*>( getChildByTag(100+i) );
-        menu->setPosition( _centeredMenu );
-        if(i==0) 
+        auto menu = static_cast<Menu*>(getChildByTag(100 + i));
+        menu->setPosition(_centeredMenu);
+        if (i == 0)
         {
             // TIP: if no padding, padding = 5
-            menu->alignItemsHorizontally();            
+            menu->alignItemsHorizontally();
             auto p = menu->getPosition();
-            menu->setPosition(p + Vec2(0.0f,30.0f));
-            
-        } 
-        else 
+            menu->setPosition(p + Vec2(0.0f, 30.0f));
+        }
+        else
         {
             // TIP: but padding is configurable
             menu->alignItemsHorizontallyWithPadding(40);
             auto p = menu->getPosition();
-            menu->setPosition(p - Vec2(0.0f,30.0f));
-        }        
+            menu->setPosition(p - Vec2(0.0f, 30.0f));
+        }
     }
 }
 
 void MenuLayer2::alignMenusV()
 {
-    for(int i=0;i<2;i++) 
+    for (int i = 0; i < 2; i++)
     {
-        auto menu = static_cast<Menu*>( getChildByTag(100+i) );
-        menu->setPosition( _centeredMenu );
-        if(i==0) 
+        auto menu = static_cast<Menu*>(getChildByTag(100 + i));
+        menu->setPosition(_centeredMenu);
+        if (i == 0)
         {
             // TIP: if no padding, padding = 5
-            menu->alignItemsVertically();            
+            menu->alignItemsVertically();
             auto p = menu->getPosition();
-            menu->setPosition(p + Vec2(100.0f,0.0f));
-        } 
-        else 
+            menu->setPosition(p + Vec2(100.0f, 0.0f));
+        }
+        else
         {
             // TIP: but padding is configurable
-            menu->alignItemsVerticallyWithPadding(40);    
+            menu->alignItemsVerticallyWithPadding(40);
             auto p = menu->getPosition();
-            menu->setPosition(p - Vec2(100.0f,0.0f));
-        }        
+            menu->setPosition(p - Vec2(100.0f, 0.0f));
+        }
     }
 }
 
@@ -302,22 +297,22 @@ void MenuLayer2::menuCallback(Ref* sender)
 
 void MenuLayer2::menuCallbackOpacity(Ref* sender)
 {
-    auto menu = static_cast<Menu*>( static_cast<Node*>(sender)->getParent() );
+    auto menu       = static_cast<Menu*>(static_cast<Node*>(sender)->getParent());
     uint8_t opacity = menu->getOpacity();
-    if( opacity == 128 )
+    if (opacity == 128)
         menu->setOpacity(255);
     else
-        menu->setOpacity(128);     
+        menu->setOpacity(128);
 }
 
 void MenuLayer2::menuCallbackAlign(Ref* sender)
 {
-    _alignedH = ! _alignedH;
-    
-    if( _alignedH )
+    _alignedH = !_alignedH;
+
+    if (_alignedH)
         alignMenusH();
     else
-        alignMenusV(); 
+        alignMenusV();
 }
 
 //------------------------------------------------------------------
@@ -331,49 +326,47 @@ MenuLayer3::MenuLayer3()
     MenuItemFont::setFontSize(28);
 
     auto label = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "Enable AtlasItem");
-    auto item1 = MenuItemLabel::create(label, [&](Ref *sender) {
-		//CCLOG("Label clicked. Toggling AtlasSprite");
-		_disabledItem->setEnabled( ! _disabledItem->isEnabled() );
-		_disabledItem->stopAllActions();
-	});
-    auto item2 = MenuItemFont::create("--- Go Back ---", [&](Ref *sender) {
-		    static_cast<LayerMultiplex*>(_parent)->switchTo(0, false);
-	});
-
-    auto spriteNormal   = Sprite::create(s_MenuItem,  Rect(0,23*2,115,23));
-    auto spriteSelected = Sprite::create(s_MenuItem,  Rect(0,23*1,115,23));
-    auto spriteDisabled = Sprite::create(s_MenuItem,  Rect(0,23*0,115,23));
-    
-    
-    auto item3 = MenuItemSprite::create(spriteNormal, spriteSelected, spriteDisabled, [](Ref *sender) {
-		log("sprite clicked!");
-	});
-    _disabledItem = item3;  item3->retain();
-    _disabledItem->setEnabled( false );
-    
-    auto menu = Menu::create( item1, item2, item3, nullptr);    
-    menu->setPosition( Vec2(0,0) );
+    auto item1 = MenuItemLabel::create(label, [&](Ref* sender) {
+        // CCLOG("Label clicked. Toggling AtlasSprite");
+        _disabledItem->setEnabled(!_disabledItem->isEnabled());
+        _disabledItem->stopAllActions();
+    });
+    auto item2 = MenuItemFont::create("--- Go Back ---",
+                                      [&](Ref* sender) { static_cast<LayerMultiplex*>(_parent)->switchTo(0, false); });
+
+    auto spriteNormal   = Sprite::create(s_MenuItem, Rect(0, 23 * 2, 115, 23));
+    auto spriteSelected = Sprite::create(s_MenuItem, Rect(0, 23 * 1, 115, 23));
+    auto spriteDisabled = Sprite::create(s_MenuItem, Rect(0, 23 * 0, 115, 23));
+
+    auto item3    = MenuItemSprite::create(spriteNormal, spriteSelected, spriteDisabled,
+                                           [](Ref* sender) { log("sprite clicked!"); });
+    _disabledItem = item3;
+    item3->retain();
+    _disabledItem->setEnabled(false);
+
+    auto menu = Menu::create(item1, item2, item3, nullptr);
+    menu->setPosition(Vec2(0, 0));
 
     auto s = Director::getInstance()->getWinSize();
-    
-    item1->setPosition( Vec2(s.width/2 - 150, s.height/2) );
-    item2->setPosition( Vec2(s.width/2 - 200, s.height/2) );
-    item3->setPosition( Vec2(s.width/2, s.height/2 - 100) );
-    
-    auto jump = JumpBy::create(3, Vec2(400,0), 50, 4);
-    item2->runAction( RepeatForever::create(Sequence::create( jump, jump->reverse(), nullptr)));
+
+    item1->setPosition(Vec2(s.width / 2 - 150, s.height / 2));
+    item2->setPosition(Vec2(s.width / 2 - 200, s.height / 2));
+    item3->setPosition(Vec2(s.width / 2, s.height / 2 - 100));
+
+    auto jump = JumpBy::create(3, Vec2(400, 0), 50, 4);
+    item2->runAction(RepeatForever::create(Sequence::create(jump, jump->reverse(), nullptr)));
 
     auto spin1 = RotateBy::create(3, 360);
     auto spin2 = spin1->clone();
     auto spin3 = spin1->clone();
-    
-    item1->runAction( RepeatForever::create(spin1) );
-    item2->runAction( RepeatForever::create(spin2) );
-    item3->runAction( RepeatForever::create(spin3) );
-    
-    addChild( menu ); 
 
-    menu->setPosition(Vec2(0,0));
+    item1->runAction(RepeatForever::create(spin1));
+    item2->runAction(RepeatForever::create(spin2));
+    item3->runAction(RepeatForever::create(spin3));
+
+    addChild(menu);
+
+    menu->setPosition(Vec2(0, 0));
 }
 
 MenuLayer3::~MenuLayer3()
@@ -392,81 +385,68 @@ MenuLayer4::MenuLayer4()
     MenuItemFont::setFontSize(18);
     auto title1 = MenuItemFont::create("Sound");
     title1->setEnabled(false);
-    MenuItemFont::setFontName( "fonts/Marker Felt.ttf" );
+    MenuItemFont::setFontName("fonts/Marker Felt.ttf");
     MenuItemFont::setFontSize(34);
-    auto item1 = MenuItemToggle::createWithCallback( CC_CALLBACK_1(MenuLayer4::menuCallback, this),
-                                                                MenuItemFont::create( "On" ),
-                                                                MenuItemFont::create( "Off"),
-                                                                nullptr );
-    
-    MenuItemFont::setFontName( "American Typewriter" );
+    auto item1 = MenuItemToggle::createWithCallback(CC_CALLBACK_1(MenuLayer4::menuCallback, this),
+                                                    MenuItemFont::create("On"), MenuItemFont::create("Off"), nullptr);
+
+    MenuItemFont::setFontName("American Typewriter");
     MenuItemFont::setFontSize(18);
-    auto title2 = MenuItemFont::create( "Music" );
+    auto title2 = MenuItemFont::create("Music");
     title2->setEnabled(false);
-    MenuItemFont::setFontName( "fonts/Marker Felt.ttf" );
+    MenuItemFont::setFontName("fonts/Marker Felt.ttf");
     MenuItemFont::setFontSize(34);
     auto item2 = MenuItemToggle::createWithCallback(CC_CALLBACK_1(MenuLayer4::menuCallback, this),
-                                                                MenuItemFont::create( "On" ),
-                                                                MenuItemFont::create( "Off"),
-                                                                nullptr );
-    
-    MenuItemFont::setFontName( "American Typewriter" );
+                                                    MenuItemFont::create("On"), MenuItemFont::create("Off"), nullptr);
+
+    MenuItemFont::setFontName("American Typewriter");
     MenuItemFont::setFontSize(18);
-    auto title3 = MenuItemFont::create( "Quality" );
-    title3->setEnabled( false );
-    MenuItemFont::setFontName( "fonts/Marker Felt.ttf" );
+    auto title3 = MenuItemFont::create("Quality");
+    title3->setEnabled(false);
+    MenuItemFont::setFontName("fonts/Marker Felt.ttf");
     MenuItemFont::setFontSize(34);
     auto item3 = MenuItemToggle::createWithCallback(CC_CALLBACK_1(MenuLayer4::menuCallback, this),
-                                                                MenuItemFont::create( "High" ),
-                                                                MenuItemFont::create( "Low" ),
-                                                                nullptr );
-    
-    MenuItemFont::setFontName( "American Typewriter" );
+                                                    MenuItemFont::create("High"), MenuItemFont::create("Low"), nullptr);
+
+    MenuItemFont::setFontName("American Typewriter");
     MenuItemFont::setFontSize(18);
-    auto title4 = MenuItemFont::create( "Orientation" );
+    auto title4 = MenuItemFont::create("Orientation");
     title4->setEnabled(false);
-    MenuItemFont::setFontName( "fonts/Marker Felt.ttf" );
+    MenuItemFont::setFontName("fonts/Marker Felt.ttf");
     MenuItemFont::setFontSize(34);
     auto item4 = MenuItemToggle::createWithCallback(CC_CALLBACK_1(MenuLayer4::menuCallback, this),
-                                                                MenuItemFont::create( "Off" ), 
-                                                                nullptr );
-    
+                                                    MenuItemFont::create("Off"), nullptr);
+
     // TIP: you can manipulate the items like any other MutableArray
-    item4->getSubItems().pushBack( MenuItemFont::create( "33%" ) );
-    item4->getSubItems().pushBack( MenuItemFont::create( "66%" ) );
-    item4->getSubItems().pushBack( MenuItemFont::create( "100%" ) );
-    
+    item4->getSubItems().pushBack(MenuItemFont::create("33%"));
+    item4->getSubItems().pushBack(MenuItemFont::create("66%"));
+    item4->getSubItems().pushBack(MenuItemFont::create("100%"));
+
     // you can change the one of the items by doing this
-    item4->setSelectedIndex( 2 );
-    
-    MenuItemFont::setFontName( "fonts/Marker Felt.ttf" );
-    MenuItemFont::setFontSize( 34 );
-    
-    auto label = Label::createWithBMFont("fonts/bitmapFontTest3.fnt",  "go back");
-    auto back = MenuItemLabel::create(label, CC_CALLBACK_1(MenuLayer4::backCallback, this) );
-    
-    auto menu = Menu::create(
-                  title1, title2,
-                  item1, item2,
-                  title3, title4,
-                  item3, item4,
-                  back, nullptr ); // 9 items.
-    
+    item4->setSelectedIndex(2);
+
+    MenuItemFont::setFontName("fonts/Marker Felt.ttf");
+    MenuItemFont::setFontSize(34);
+
+    auto label = Label::createWithBMFont("fonts/bitmapFontTest3.fnt", "go back");
+    auto back  = MenuItemLabel::create(label, CC_CALLBACK_1(MenuLayer4::backCallback, this));
+
+    auto menu = Menu::create(title1, title2, item1, item2, title3, title4, item3, item4, back, nullptr);  // 9 items.
+
     menu->alignItemsInColumns(2, 2, 2, 2, 1, NULL);
-    
-    addChild( menu );
+
+    addChild(menu);
 
     auto s = Director::getInstance()->getWinSize();
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
-MenuLayer4::~MenuLayer4()
-{
-}
+MenuLayer4::~MenuLayer4() {}
 
 void MenuLayer4::menuCallback(Ref* sender)
 {
-    //CCLOG("selected item: %x index:%d", dynamic_cast<MenuItemToggle*>(sender)->selectedItem(), dynamic_cast<MenuItemToggle*>(sender)->selectedIndex() ); 
+    // CCLOG("selected item: %x index:%d", dynamic_cast<MenuItemToggle*>(sender)->selectedItem(),
+    // dynamic_cast<MenuItemToggle*>(sender)->selectedIndex() );
 }
 
 void MenuLayer4::backCallback(Ref* sender)
@@ -477,37 +457,37 @@ void MenuLayer4::backCallback(Ref* sender)
 // BugsTest
 BugsTest::BugsTest()
 {
-    auto issue1410 = MenuItemFont::create("Issue 1410", CC_CALLBACK_1(BugsTest::issue1410MenuCallback, this));
+    auto issue1410   = MenuItemFont::create("Issue 1410", CC_CALLBACK_1(BugsTest::issue1410MenuCallback, this));
     auto issue1410_2 = MenuItemFont::create("Issue 1410 #2", CC_CALLBACK_1(BugsTest::issue1410v2MenuCallback, this));
-    auto back = MenuItemFont::create("Back", CC_CALLBACK_1(BugsTest::backMenuCallback, this));
-    
+    auto back        = MenuItemFont::create("Back", CC_CALLBACK_1(BugsTest::backMenuCallback, this));
+
     auto menu = Menu::create(issue1410, issue1410_2, back, nullptr);
     addChild(menu);
     menu->alignItemsVertically();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
-void BugsTest::issue1410MenuCallback(Ref *sender)
+void BugsTest::issue1410MenuCallback(Ref* sender)
 {
-    auto menu = static_cast<Menu*>( static_cast<Node*>(sender)->getParent() );
+    auto menu = static_cast<Menu*>(static_cast<Node*>(sender)->getParent());
     menu->setEnabled(false);
     menu->setEnabled(true);
-    
+
     log("NO CRASHES");
 }
 
-void BugsTest::issue1410v2MenuCallback(cocos2d::Ref *pSender)
+void BugsTest::issue1410v2MenuCallback(cocos2d::Ref* pSender)
 {
-    auto menu = static_cast<Menu*>( static_cast<MenuItem*>(pSender)->getParent() );
+    auto menu = static_cast<Menu*>(static_cast<MenuItem*>(pSender)->getParent());
     menu->setEnabled(true);
     menu->setEnabled(false);
-    
+
     log("NO CRASHES. AND MENU SHOULD STOP WORKING");
 }
 
-void BugsTest::backMenuCallback(cocos2d::Ref *pSender)
+void BugsTest::backMenuCallback(cocos2d::Ref* pSender)
 {
     static_cast<LayerMultiplex*>(_parent)->switchTo(0, false);
 }
@@ -515,34 +495,33 @@ void BugsTest::backMenuCallback(cocos2d::Ref *pSender)
 RemoveMenuItemWhenMove::RemoveMenuItemWhenMove()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto label = Label::createWithTTF("click item and move, should not crash", "fonts/arial.ttf", 20);
-    label->setPosition(Vec2(s.width/2, s.height - 30));
+    label->setPosition(Vec2(s.width / 2, s.height - 30));
     addChild(label);
-    
+
     item = MenuItemFont::create("item 1");
     item->retain();
-    
+
     auto back = MenuItemFont::create("go back", CC_CALLBACK_1(RemoveMenuItemWhenMove::goBack, this));
-    
+
     auto menu = Menu::create(item, back, nullptr);
     addChild(menu);
     menu->alignItemsVertically();
-    
-    menu->setPosition(Vec2(s.width/2, s.height/2));
-    
+
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
+
     // Register Touch Event
     _touchListener = EventListenerTouchOneByOne::create();
     _touchListener->setSwallowTouches(false);
-    
+
     _touchListener->onTouchBegan = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchBegan, this);
     _touchListener->onTouchMoved = CC_CALLBACK_2(RemoveMenuItemWhenMove::onTouchMoved, this);
-    
+
     _eventDispatcher->addEventListenerWithFixedPriority(_touchListener, -129);
-    
 }
 
-void RemoveMenuItemWhenMove::goBack(Ref *pSender)
+void RemoveMenuItemWhenMove::goBack(Ref* pSender)
 {
     static_cast<LayerMultiplex*>(_parent)->switchTo(0, false);
 }
@@ -553,12 +532,12 @@ RemoveMenuItemWhenMove::~RemoveMenuItemWhenMove()
     CC_SAFE_RELEASE(item);
 }
 
-bool RemoveMenuItemWhenMove::onTouchBegan(Touch  *touch, Event  *event)
+bool RemoveMenuItemWhenMove::onTouchBegan(Touch* touch, Event* event)
 {
     return true;
 }
 
-void RemoveMenuItemWhenMove::onTouchMoved(Touch  *touch, Event  *event)
+void RemoveMenuItemWhenMove::onTouchMoved(Touch* touch, Event* event)
 {
     if (item)
     {
diff --git a/tests/cpp-tests/Classes/MenuTest/MenuTest.h b/tests/cpp-tests/Classes/MenuTest/MenuTest.h
index 7c6f82c517da..cd505ef4be99 100644
--- a/tests/cpp-tests/Classes/MenuTest/MenuTest.h
+++ b/tests/cpp-tests/Classes/MenuTest/MenuTest.h
@@ -43,7 +43,7 @@ class MenuTest : public TestCase
 class MenuLayerMainMenu : public cocos2d::Layer
 {
 protected:
-    cocos2d::MenuItem*    _disabledItem;
+    cocos2d::MenuItem* _disabledItem;
     cocos2d::EventListenerTouchOneByOne* _touchListener;
 
 public:
@@ -66,14 +66,14 @@ class MenuLayerMainMenu : public cocos2d::Layer
     void onQuit(cocos2d::Ref* sender);
     void menuMovingCallback(cocos2d::Ref* pSender);
 
-    //CREATE_NODE(MenuLayer1);
+    // CREATE_NODE(MenuLayer1);
 };
 
 class MenuLayer2 : public cocos2d::Layer
 {
 protected:
-    cocos2d::Vec2        _centeredMenu;
-    bool                _alignedH; 
+    cocos2d::Vec2 _centeredMenu;
+    bool _alignedH;
 
     void alignMenusH();
     void alignMenusV();
@@ -86,13 +86,13 @@ class MenuLayer2 : public cocos2d::Layer
     void menuCallbackOpacity(cocos2d::Ref* sender);
     void menuCallbackAlign(cocos2d::Ref* sender);
 
-    //CREATE_NODE(MenuLayer2);
+    // CREATE_NODE(MenuLayer2);
 };
 
 class MenuLayer3 : public cocos2d::Layer
 {
 protected:
-    cocos2d::MenuItem*    _disabledItem;
+    cocos2d::MenuItem* _disabledItem;
 
 public:
     MenuLayer3();
@@ -113,7 +113,7 @@ class BugsTest : public cocos2d::Layer
 {
 public:
     BugsTest();
-    
+
     void issue1410MenuCallback(cocos2d::Ref* pSender);
     void issue1410v2MenuCallback(cocos2d::Ref* pSender);
     void backMenuCallback(cocos2d::Ref* pSender);
@@ -126,11 +126,11 @@ class RemoveMenuItemWhenMove : public cocos2d::Layer
     ~RemoveMenuItemWhenMove();
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
     void goBack(cocos2d::Ref* pSender);
-    
+
 private:
-    cocos2d::MenuItemFont *item;
+    cocos2d::MenuItemFont* item;
     cocos2d::EventListenerTouchOneByOne* _touchListener;
 };
 
diff --git a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp
index b016c17898ac..24e21b1f66bf 100644
--- a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp
+++ b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,10 +27,11 @@
 
 USING_NS_CC;
 
-enum {
-	kTagLabel = 1,
-	kTagSprite1 = 2,
-	kTagSprite2 = 3,
+enum
+{
+    kTagLabel   = 1,
+    kTagSprite1 = 2,
+    kTagSprite2 = 3,
 };
 
 MotionStreakTests::MotionStreakTests()
@@ -52,46 +53,41 @@ void MotionStreakTest1::onEnter()
     MotionStreakTest::onEnter();
 
     auto s = Director::getInstance()->getWinSize();
-  
+
     // the root object just rotates around
     _root = Sprite::create(s_pathR1);
     addChild(_root, 1);
-    _root->setPosition(Vec2(s.width/2, s.height/2));
-  
+    _root->setPosition(Vec2(s.width / 2, s.height / 2));
+
     // the target object is offset from root, and the streak is moved to follow it
     _target = Sprite::create(s_pathR1);
     _root->addChild(_target);
-    _target->setPosition(Vec2(s.width/4, 0.0f));
+    _target->setPosition(Vec2(s.width / 4, 0.0f));
 
     // create the streak object and add it to the scene
     _streak = MotionStreak::create(2, 3, 32, Color3B::GREEN, s_streak);
     addChild(_streak);
     // schedule an update on each frame so we can synchronize the streak with the target
     schedule(CC_SCHEDULE_SELECTOR(MotionStreakTest1::onUpdate));
-  
+
     auto a1 = RotateBy::create(2, 360);
 
     auto action1 = RepeatForever::create(a1);
-    auto motion = MoveBy::create(2, Vec2(100,0) );
-    _root->runAction( RepeatForever::create(Sequence::create(motion, motion->reverse(), nullptr) ) );
-    _root->runAction( action1 );
+    auto motion  = MoveBy::create(2, Vec2(100, 0));
+    _root->runAction(RepeatForever::create(Sequence::create(motion, motion->reverse(), nullptr)));
+    _root->runAction(action1);
 
     auto colorAction = RepeatForever::create(Sequence::create(
-        TintTo::create(0.2f, 255, 0, 0),
-        TintTo::create(0.2f, 0, 255, 0),
-        TintTo::create(0.2f, 0, 0, 255),
-        TintTo::create(0.2f, 0, 255, 255),
-        TintTo::create(0.2f, 255, 255, 0),
-        TintTo::create(0.2f, 255, 0, 255),
-        TintTo::create(0.2f, 255, 255, 255),
-        nullptr));
+        TintTo::create(0.2f, 255, 0, 0), TintTo::create(0.2f, 0, 255, 0), TintTo::create(0.2f, 0, 0, 255),
+        TintTo::create(0.2f, 0, 255, 255), TintTo::create(0.2f, 255, 255, 0), TintTo::create(0.2f, 255, 0, 255),
+        TintTo::create(0.2f, 255, 255, 255), nullptr));
 
     _streak->runAction(colorAction);
 }
 
 void MotionStreakTest1::onUpdate(float delta)
 {
-    _streak->setPosition( _target->convertToWorldSpace(Vec2::ZERO) );
+    _streak->setPosition(_target->convertToWorldSpace(Vec2::ZERO));
 }
 
 std::string MotionStreakTest1::title() const
@@ -109,24 +105,24 @@ void MotionStreakTest2::onEnter()
 {
     MotionStreakTest::onEnter();
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(MotionStreakTest2::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto s = Director::getInstance()->getWinSize();
-        
+
     // create the streak object and add it to the scene
-    _streak = MotionStreak::create(3, 3, 64, Color3B::WHITE, s_streak );
+    _streak = MotionStreak::create(3, 3, 64, Color3B::WHITE, s_streak);
     addChild(_streak);
-    
-    _streak->setPosition( Vec2(s.width/2, s.height/2) );
+
+    _streak->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 void MotionStreakTest2::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     auto touchLocation = touches[0]->getLocation();
-    
-    _streak->setPosition( touchLocation );
+
+    _streak->setPosition(touchLocation);
 }
 
 std::string MotionStreakTest2::title() const
@@ -148,26 +144,25 @@ std::string MotionStreakTest2::subtitle() const
 void Issue1358::onEnter()
 {
     MotionStreakTest::onEnter();
-    
+
     // ask director the the window size
     auto size = Director::getInstance()->getWinSize();
-    
+
     _streak = MotionStreak::create(2.0f, 1.0f, 50.0f, Color3B(255, 255, 0), "Images/Icon.png");
     addChild(_streak);
-    
-    
-    _center  = Vec2(size.width/2, size.height/2);
-    _radius = size.width/3;
-    _angle = 0.0f;
-    
+
+    _center = Vec2(size.width / 2, size.height / 2);
+    _radius = size.width / 3;
+    _angle  = 0.0f;
+
     schedule(CC_SCHEDULE_SELECTOR(Issue1358::update), 0);
 }
 
 void Issue1358::update(float dt)
 {
     _angle += 1.0f;
-    _streak->setPosition(Vec2(_center.x + cosf(_angle/180 * M_PI)*_radius,
-                            _center.y + sinf(_angle/ 180 * M_PI)*_radius));
+    _streak->setPosition(
+        Vec2(_center.x + cosf(_angle / 180 * M_PI) * _radius, _center.y + sinf(_angle / 180 * M_PI) * _radius));
 }
 
 std::string Issue1358::title() const
@@ -193,15 +188,14 @@ void Issue12226::onEnter()
     // ask director the the window size
     auto size = Director::getInstance()->getWinSize();
 
-    auto radius = size.width/3;
+    auto radius = size.width / 3;
 
     auto outer = Sprite::create("Images/grossini.png");
-    outer->setPosition(size/2);
+    outer->setPosition(size / 2);
     addChild(outer);
 
-
     _streak = MotionStreak::create(1.0f, 3, radius * 1.5f, Color3B(0xA0, 0xA0, 0xA0), "ccb/particle-smoke.png");
-//    motionStreak->setOpacity(0x70);
+    //    motionStreak->setOpacity(0x70);
     _streak->setPosition(outer->getPosition());
 
     this->addChild(_streak, outer->getLocalZOrder() - 1);
@@ -211,19 +205,18 @@ void Issue12226::onEnter()
     const uint32_t length = (radius * 0.95);
 
     std::function<void(float)> updateMotionStreak = [=](float dt) {
-
-        Vec2 position = Vec2(outer->getPositionX() + length * cosf(-1 * CC_DEGREES_TO_RADIANS(outer->getRotation() + 90.0f)),
-                             outer->getPositionY() + length * sinf(-1 * CC_DEGREES_TO_RADIANS(outer->getRotation() + 90.0f)));
+        Vec2 position =
+            Vec2(outer->getPositionX() + length * cosf(-1 * CC_DEGREES_TO_RADIANS(outer->getRotation() + 90.0f)),
+                 outer->getPositionY() + length * sinf(-1 * CC_DEGREES_TO_RADIANS(outer->getRotation() + 90.0f)));
 
         _streak->setPosition(position);
     };
 
     outer->schedule(updateMotionStreak, 1 / 240.0f, CC_REPEAT_FOREVER, 0, "motion1scheduler");
 
-    auto rot = RotateBy::create(2, 360);
+    auto rot     = RotateBy::create(2, 360);
     auto forever = RepeatForever::create(rot);
     outer->runAction(forever);
-
 }
 
 std::string Issue12226::title() const
@@ -242,13 +235,9 @@ std::string Issue12226::subtitle() const
 //
 //------------------------------------------------------------------
 
-MotionStreakTest::MotionStreakTest()
-{
-}
+MotionStreakTest::MotionStreakTest() {}
 
-MotionStreakTest::~MotionStreakTest()
-{
-}
+MotionStreakTest::~MotionStreakTest() {}
 
 std::string MotionStreakTest::title() const
 {
@@ -266,19 +255,18 @@ void MotionStreakTest::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-    auto itemMode = MenuItemToggle::createWithCallback( CC_CALLBACK_1(MotionStreakTest::modeCallback, this),
-        MenuItemFont::create("Use High Quality Mode"),
-        MenuItemFont::create("Use Fast Mode"),
-        nullptr);
+    auto itemMode = MenuItemToggle::createWithCallback(CC_CALLBACK_1(MotionStreakTest::modeCallback, this),
+                                                       MenuItemFont::create("Use High Quality Mode"),
+                                                       MenuItemFont::create("Use Fast Mode"), nullptr);
 
     auto menuMode = Menu::create(itemMode, nullptr);
     addChild(menuMode);
 
-    menuMode->setPosition(Vec2(s.width/2, s.height/4));
+    menuMode->setPosition(Vec2(s.width / 2, s.height / 4));
 }
 
-void MotionStreakTest::modeCallback(Ref *pSender)
+void MotionStreakTest::modeCallback(Ref* pSender)
 {
     bool fastMode = _streak->isFastMode();
-    _streak->setFastMode(! fastMode);
+    _streak->setFastMode(!fastMode);
 }
diff --git a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h
index aa6210bfd6fe..ae0683a68256 100644
--- a/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h
+++ b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,6 @@
 
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(MotionStreakTests);
 
 class MotionStreakTest : public TestCase
@@ -41,6 +40,7 @@ class MotionStreakTest : public TestCase
     virtual void onEnter() override;
 
     void modeCallback(cocos2d::Ref* sender);
+
 protected:
     cocos2d::MotionStreak* _streak;
 };
@@ -48,8 +48,8 @@ class MotionStreakTest : public TestCase
 class MotionStreakTest1 : public MotionStreakTest
 {
 protected:
-    cocos2d::Node*        _root;
-    cocos2d::Node*        _target;
+    cocos2d::Node* _root;
+    cocos2d::Node* _target;
 
 public:
     CREATE_FUNC(MotionStreakTest1);
@@ -61,8 +61,8 @@ class MotionStreakTest1 : public MotionStreakTest
 class MotionStreakTest2 : public MotionStreakTest
 {
 protected:
-    cocos2d::Node*        _root;
-    cocos2d::Node*        _target;
+    cocos2d::Node* _root;
+    cocos2d::Node* _target;
 
 public:
     CREATE_FUNC(MotionStreakTest2);
@@ -81,6 +81,7 @@ class Issue1358 : public MotionStreakTest
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void update(float dt) override;
+
 private:
     cocos2d::Vec2 _center;
     float _radius;
@@ -97,5 +98,4 @@ class Issue12226 : public MotionStreakTest
     virtual void onEnter() override;
 };
 
-
 #endif
diff --git a/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.cpp b/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.cpp
index 087ffe8f07a8..d3c6c4273bc3 100644
--- a/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.cpp
+++ b/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,29 +31,24 @@ MultiTouchTests::MultiTouchTests()
     ADD_TEST_CASE(MultiTouchTest);
 }
 
-static const Color3B* s_TouchColors[5] = {
-    &Color3B::YELLOW,
-    &Color3B::BLUE,
-    &Color3B::GREEN,
-    &Color3B::RED,
-    &Color3B::MAGENTA
-};
+static const Color3B* s_TouchColors[5] = {&Color3B::YELLOW, &Color3B::BLUE, &Color3B::GREEN, &Color3B::RED,
+                                          &Color3B::MAGENTA};
 
 class TouchPoint : public Node
 {
 public:
-    TouchPoint(const Vec2 &touchPoint, const Color3B &touchColor)
+    TouchPoint(const Vec2& touchPoint, const Color3B& touchColor)
     {
         DrawNode* drawNode = DrawNode::create();
-        auto s = Director::getInstance()->getWinSize();
-        Color4F color(touchColor.r/255.0f, touchColor.g/255.0f, touchColor.b/255.0f, 1.0f);
+        auto s             = Director::getInstance()->getWinSize();
+        Color4F color(touchColor.r / 255.0f, touchColor.g / 255.0f, touchColor.b / 255.0f, 1.0f);
         drawNode->drawLine(Vec2(0.0f, touchPoint.y), Vec2(s.width, touchPoint.y), color);
         drawNode->drawLine(Vec2(touchPoint.x, 0.0f), Vec2(touchPoint.x, s.height), color);
         drawNode->drawDot(touchPoint, 3, color);
         addChild(drawNode);
     }
 
-    static TouchPoint* touchPointWithParent(Node* pParent, const Vec2 &touchPoint, const Color3B &touchColor)
+    static TouchPoint* touchPointWithParent(Node* pParent, const Vec2& touchPoint, const Color3B& touchColor)
     {
         auto pRet = new TouchPoint(touchPoint, touchColor);
         pRet->setContentSize(pParent->getContentSize());
@@ -67,16 +62,16 @@ bool MultiTouchTest::init()
 {
     if (TestCase::init())
     {
-        auto listener = EventListenerTouchAllAtOnce::create();
+        auto listener            = EventListenerTouchAllAtOnce::create();
         listener->onTouchesBegan = CC_CALLBACK_2(MultiTouchTest::onTouchesBegan, this);
         listener->onTouchesMoved = CC_CALLBACK_2(MultiTouchTest::onTouchesMoved, this);
         listener->onTouchesEnded = CC_CALLBACK_2(MultiTouchTest::onTouchesEnded, this);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-        
+
         auto title = Label::createWithSystemFont("Please touch the screen!", "", 24);
-        title->setPosition(VisibleRect::top()+Vec2(0.0f, -40.0f));
+        title->setPosition(VisibleRect::top() + Vec2(0.0f, -40.0f));
         addChild(title);
-        
+
         return true;
     }
     return false;
@@ -84,48 +79,48 @@ bool MultiTouchTest::init()
 
 static Map<int, TouchPoint*> s_map;
 
-void MultiTouchTest::onTouchesBegan(const std::vector<Touch*>& touches, Event  *event)
+void MultiTouchTest::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
-        auto touch = item;
-        auto location = touch->getLocation();
-        auto touchPoint = TouchPoint::touchPointWithParent(this, location, *s_TouchColors[touch->getID()%5]);
+        auto touch      = item;
+        auto location   = touch->getLocation();
+        auto touchPoint = TouchPoint::touchPointWithParent(this, location, *s_TouchColors[touch->getID() % 5]);
 
         addChild(touchPoint);
         s_map.insert(touch->getID(), touchPoint);
     }
 }
 
-void MultiTouchTest::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void MultiTouchTest::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-    for( auto &item: touches)
+    for (auto& item : touches)
     {
-        auto touch = item;
-        auto pTP = s_map.at(touch->getID());
+        auto touch    = item;
+        auto pTP      = s_map.at(touch->getID());
         auto location = touch->getLocation();
-        
+
         removeChild(pTP, true);
         s_map.erase(touch->getID());
-        
-        auto touchPointNew = TouchPoint::touchPointWithParent(this, location, *s_TouchColors[touch->getID()%5]);
+
+        auto touchPointNew = TouchPoint::touchPointWithParent(this, location, *s_TouchColors[touch->getID() % 5]);
         addChild(touchPointNew);
         s_map.insert(touch->getID(), touchPointNew);
     }
 }
 
-void MultiTouchTest::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void MultiTouchTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
         auto touch = item;
-        auto pTP = s_map.at(touch->getID());
+        auto pTP   = s_map.at(touch->getID());
         removeChild(pTP, true);
         s_map.erase(touch->getID());
     }
 }
 
-void MultiTouchTest::onTouchesCancelled(const std::vector<Touch*>& touches, Event  *event)
+void MultiTouchTest::onTouchesCancelled(const std::vector<Touch*>& touches, Event* event)
 {
     onTouchesEnded(touches, event);
 }
diff --git a/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.h b/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.h
index 94f6c65bd50a..f16ec67e5a7f 100644
--- a/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.h
+++ b/tests/cpp-tests/Classes/MultiTouchTest/MultiTouchTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,10 +36,10 @@ class MultiTouchTest : public TestCase
 
     virtual bool init() override;
 
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesCancelled(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesCancelled(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 };
 
 #endif /* __MULTITOUCHTEST_H__ */
diff --git a/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp b/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp
index 6e9fa8c7f39b..7bce80fd971d 100644
--- a/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp
+++ b/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp
@@ -2,19 +2,19 @@
  Copyright (c) 2012 cocos2d-x.org
  Copyright (c) 2015-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,7 +40,7 @@ struct AgentUserData
 
 NavMeshTests::NavMeshTests()
 {
-#if ( CC_USE_NAVMESH == 0 ) || ( CC_USE_PHYSICS == 0 )
+#if (CC_USE_NAVMESH == 0) || (CC_USE_PHYSICS == 0)
     ADD_TEST_CASE(NavMeshDisabled);
 #else
     ADD_TEST_CASE(NavMeshBasicTestDemo);
@@ -48,12 +48,13 @@ NavMeshTests::NavMeshTests()
 #endif
 };
 
-#if ( CC_USE_NAVMESH == 0 ) || ( CC_USE_PHYSICS == 0 )
+#if (CC_USE_NAVMESH == 0) || (CC_USE_PHYSICS == 0)
 void NavMeshDisabled::onEnter()
 {
     TTFConfig ttfConfig("fonts/arial.ttf", 16);
-    auto label = Label::createWithTTF(ttfConfig, "Should define CC_USE_NAVMESH & CC_USE_PHYSICS\n to run this test case");
-    
+    auto label =
+        Label::createWithTTF(ttfConfig, "Should define CC_USE_NAVMESH & CC_USE_PHYSICS\n to run this test case");
+
     auto size = Director::getInstance()->getWinSize();
     label->setPosition(Vec2(size.width / 2, size.height / 2));
 
@@ -63,26 +64,24 @@ void NavMeshDisabled::onEnter()
 }
 #else
 
-NavMeshBaseTestDemo::NavMeshBaseTestDemo()
-    : _camera(nullptr)
-    , _needMoveAgents(false)
-{
-
-}
+NavMeshBaseTestDemo::NavMeshBaseTestDemo() : _camera(nullptr), _needMoveAgents(false) {}
 
 NavMeshBaseTestDemo::~NavMeshBaseTestDemo()
 {
-    for (auto iter : _agents){
-        AgentUserData *data = static_cast<AgentUserData *>(iter.first->getUserData());
+    for (auto iter : _agents)
+    {
+        AgentUserData* data = static_cast<AgentUserData*>(iter.first->getUserData());
         delete data;
     }
 }
 
-bool NavMeshBaseTestDemo::init() 
+bool NavMeshBaseTestDemo::init()
 {
-    if (!TestCase::init()) return false;
+    if (!TestCase::init())
+        return false;
 
-    if (initPhysicsWorld()) {
+    if (initPhysicsWorld())
+    {
 
         _angle = 0.0f;
 
@@ -103,17 +102,16 @@ bool NavMeshBaseTestDemo::init()
         scheduleUpdate();
     }
 
-
     return true;
 }
 
-void NavMeshBaseTestDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event)
+void NavMeshBaseTestDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
     _needMoveAgents = true;
     touchesBegan(touches, event);
 }
 
-void NavMeshBaseTestDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event)
+void NavMeshBaseTestDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
     if (touches.size() && _camera)
     {
@@ -132,7 +130,7 @@ void NavMeshBaseTestDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>& tou
     touchesMoved(touches, event);
 }
 
-void NavMeshBaseTestDemo::onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event)
+void NavMeshBaseTestDemo::onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
     touchesEnded(touches, event);
 }
@@ -140,7 +138,7 @@ void NavMeshBaseTestDemo::onTouchesEnded(const std::vector<cocos2d::Touch*>& tou
 void NavMeshBaseTestDemo::initScene()
 {
     getPhysics3DWorld()->setDebugDrawEnable(false);
-    //create mesh
+    // create mesh
     std::vector<Vec3> trianglesList = Bundle3D::getTrianglesList("NavMesh/scene.obj");
 
     Physics3DRigidBodyDes rbDes;
@@ -159,7 +157,6 @@ void NavMeshBaseTestDemo::initScene()
     setNavMesh(navMesh);
     setNavMeshDebugCamera(_camera);
 
-
     auto ambientLight = AmbientLight::create(Color3B(64, 64, 64));
     ambientLight->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(ambientLight);
@@ -169,7 +166,7 @@ void NavMeshBaseTestDemo::initScene()
     this->addChild(dirLight);
 }
 
-void NavMeshBaseTestDemo::createAgent(const Vec3 &pos)
+void NavMeshBaseTestDemo::createAgent(const Vec3& pos)
 {
     std::string filePath = "Sprite3DTest/girl.c3b";
     NavMeshAgentParam param;
@@ -179,7 +176,7 @@ void NavMeshBaseTestDemo::createAgent(const Vec3 &pos)
     auto agent = NavMeshAgent::create(param);
     auto agentNode = Sprite3D::create(filePath);
     agent->setOrientationRefAxes(Vec3(-1.0f, 0.0f, 1.0f));
-    AgentUserData *data = new AgentUserData{ 0.0f };
+    AgentUserData* data = new AgentUserData{0.0f};
     agent->setUserData(data);
     agentNode->setScale(0.05f);
     agentNode->addComponent(agent);
@@ -190,10 +187,10 @@ void NavMeshBaseTestDemo::createAgent(const Vec3 &pos)
     node->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(node);
 
-
     auto animation = Animation3D::create(filePath);
     auto animate = Animate3D::create(animation);
-    if (animate){
+    if (animate)
+    {
         agentNode->runAction(RepeatForever::create(animate));
         animate->setSpeed(0);
     }
@@ -201,7 +198,7 @@ void NavMeshBaseTestDemo::createAgent(const Vec3 &pos)
     _agents.push_back(std::make_pair(agent, animate));
 }
 
-void NavMeshBaseTestDemo::createObstacle(const Vec3 &pos)
+void NavMeshBaseTestDemo::createObstacle(const Vec3& pos)
 {
     auto obstacle = NavMeshObstacle::create(2.0f, 8.0f);
     auto obstacleNode = Sprite3D::create("Sprite3DTest/cylinder.c3b");
@@ -223,17 +220,20 @@ Vec3 jump(const Vec3* pV1, const Vec3* pV2, float height, float t)
     return pOut;
 }
 
-void NavMeshBaseTestDemo::moveAgents(const cocos2d::Vec3 &des)
+void NavMeshBaseTestDemo::moveAgents(const cocos2d::Vec3& des)
 {
-    for (auto iter : _agents){
-        NavMeshAgent::MoveCallback callback = [](NavMeshAgent *agent, float totalTimeAfterMove){
-            AgentUserData *data = static_cast<AgentUserData *>(agent->getUserData());
-            if (agent->isOnOffMeshLink()){
+    for (auto iter : _agents)
+    {
+        NavMeshAgent::MoveCallback callback = [](NavMeshAgent* agent, float totalTimeAfterMove) {
+            AgentUserData* data = static_cast<AgentUserData*>(agent->getUserData());
+            if (agent->isOnOffMeshLink())
+            {
                 agent->setAutoTraverseOffMeshLink(false);
                 agent->setAutoOrientation(false);
                 OffMeshLinkData linkdata = agent->getCurrentOffMeshLinkData();
 
-                agent->getOwner()->setPosition3D(jump(&linkdata.startPosition, &linkdata.endPosition, 10.0f, data->time));
+                agent->getOwner()->setPosition3D(
+                    jump(&linkdata.startPosition, &linkdata.endPosition, 10.0f, data->time));
                 Vec3 dir = linkdata.endPosition - linkdata.startPosition;
                 dir.y = 0.0f;
                 dir.normalize();
@@ -244,7 +244,8 @@ void NavMeshBaseTestDemo::moveAgents(const cocos2d::Vec3 &des)
                 float angle = Vec3::dot(refAxes, dir);
                 agent->getOwner()->setRotationQuat(Quaternion(axes, acosf(angle)));
                 data->time += 0.01f;
-                if (1.0f < data->time){
+                if (1.0f < data->time)
+                {
                     agent->completeOffMeshLink();
                     agent->setAutoOrientation(true);
                     data->time = 0.0f;
@@ -257,20 +258,16 @@ void NavMeshBaseTestDemo::moveAgents(const cocos2d::Vec3 &des)
 
 void NavMeshBaseTestDemo::update(float delta)
 {
-    for (auto iter : _agents){
+    for (auto iter : _agents)
+    {
         float speed = iter.first->getCurrentVelocity().length() * 0.2f;
         iter.second->setSpeed(0.0f < speed ? speed : 0.0f);
     }
 }
 
-NavMeshBasicTestDemo::NavMeshBasicTestDemo()
-{
-
-}
+NavMeshBasicTestDemo::NavMeshBasicTestDemo() {}
 
-NavMeshBasicTestDemo::~NavMeshBasicTestDemo()
-{
-}
+NavMeshBasicTestDemo::~NavMeshBasicTestDemo() {}
 
 std::string NavMeshBasicTestDemo::title() const
 {
@@ -282,10 +279,12 @@ std::string NavMeshBasicTestDemo::subtitle() const
     return "Basic Test";
 }
 
-void NavMeshBasicTestDemo::touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event)
+void NavMeshBasicTestDemo::touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    if (!_needMoveAgents) return;
-    if (!touches.empty()){
+    if (!_needMoveAgents)
+        return;
+    if (!touches.empty())
+    {
         auto touch = touches[0];
         auto location = touch->getLocationInView();
         Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
@@ -302,18 +301,21 @@ void NavMeshBasicTestDemo::touchesEnded(const std::vector<cocos2d::Touch*>& touc
 
 bool NavMeshBasicTestDemo::init()
 {
-    if (!NavMeshBaseTestDemo::init()) return false;
+    if (!NavMeshBaseTestDemo::init())
+        return false;
 
     TTFConfig ttfConfig("fonts/arial.ttf", 15);
     _debugLabel = Label::createWithTTF(ttfConfig, "Debug Draw ON");
     _debugLabel->retain();
-    auto menuItem1 = MenuItemLabel::create(_debugLabel, [=](Ref*){
+    auto menuItem1 = MenuItemLabel::create(_debugLabel, [=](Ref*) {
         bool enabledDebug = !getNavMesh()->isDebugDrawEnabled();
         getNavMesh()->setDebugDrawEnable(enabledDebug);
-        if (enabledDebug){
+        if (enabledDebug)
+        {
             _debugLabel->setString("Debug Draw ON");
         }
-        else{
+        else
+        {
             _debugLabel->setString("Debug Draw OFF");
         }
     });
@@ -329,25 +331,20 @@ bool NavMeshBasicTestDemo::init()
 void NavMeshBasicTestDemo::onEnter()
 {
     NavMeshBaseTestDemo::onEnter();
-    
+
     Physics3DWorld::HitResult result;
     getPhysics3DWorld()->rayCast(Vec3(0.0f, 50.0f, 0.0f), Vec3(0.0f, -50.0f, 0.0f), &result);
     createAgent(result.hitPosition);
 }
 
-NavMeshAdvanceTestDemo::NavMeshAdvanceTestDemo()
-{
-
-}
-
-NavMeshAdvanceTestDemo::~NavMeshAdvanceTestDemo()
-{
+NavMeshAdvanceTestDemo::NavMeshAdvanceTestDemo() {}
 
-}
+NavMeshAdvanceTestDemo::~NavMeshAdvanceTestDemo() {}
 
 bool NavMeshAdvanceTestDemo::init()
 {
-    if (!NavMeshBaseTestDemo::init()) return false;
+    if (!NavMeshBaseTestDemo::init())
+        return false;
 
     TTFConfig ttfConfig("fonts/arial.ttf", 15);
     _obstacleLabel = Label::createWithTTF(ttfConfig, "Create Obstacle");
@@ -357,7 +354,7 @@ bool NavMeshAdvanceTestDemo::init()
     _debugLabel = Label::createWithTTF(ttfConfig, "Debug Draw ON");
     _debugLabel->retain();
 
-    auto menuItem0 = MenuItemLabel::create(_obstacleLabel, [=](Ref*){
+    auto menuItem0 = MenuItemLabel::create(_obstacleLabel, [=](Ref*) {
         float x = cocos2d::random(-50.0f, 50.0f);
         float z = cocos2d::random(-50.0f, 50.0f);
         Physics3DWorld::HitResult result;
@@ -367,7 +364,7 @@ bool NavMeshAdvanceTestDemo::init()
     menuItem0->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
     menuItem0->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 50));
 
-    auto menuItem1 = MenuItemLabel::create(_agentLabel, [=](Ref*){
+    auto menuItem1 = MenuItemLabel::create(_agentLabel, [=](Ref*) {
         float x = cocos2d::random(-50.0f, 50.0f);
         float z = cocos2d::random(-50.0f, 50.0f);
         Physics3DWorld::HitResult result;
@@ -377,13 +374,15 @@ bool NavMeshAdvanceTestDemo::init()
     menuItem1->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
     menuItem1->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 100));
 
-    auto menuItem2 = MenuItemLabel::create(_debugLabel, [=](Ref*){
+    auto menuItem2 = MenuItemLabel::create(_debugLabel, [=](Ref*) {
         bool enabledDebug = !getNavMesh()->isDebugDrawEnabled();
         getNavMesh()->setDebugDrawEnable(enabledDebug);
-        if (enabledDebug){
+        if (enabledDebug)
+        {
             _debugLabel->setString("Debug Draw ON");
         }
-        else{
+        else
+        {
             _debugLabel->setString("Debug Draw OFF");
         }
     });
@@ -393,14 +392,14 @@ bool NavMeshAdvanceTestDemo::init()
     auto menu = Menu::create(menuItem0, menuItem1, menuItem2, nullptr);
     menu->setPosition(Vec2::ZERO);
     addChild(menu);
-    
+
     return true;
 }
 
 void NavMeshAdvanceTestDemo::onEnter()
 {
     NavMeshBaseTestDemo::onEnter();
-    
+
     Physics3DWorld::HitResult result;
     getPhysics3DWorld()->rayCast(Vec3(0.0f, 50.0f, 0.0f), Vec3(0.0f, -50.0f, 0.0f), &result);
     createAgent(result.hitPosition);
@@ -416,10 +415,12 @@ std::string NavMeshAdvanceTestDemo::subtitle() const
     return "Advance Test";
 }
 
-void NavMeshAdvanceTestDemo::touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event *event)
+void NavMeshAdvanceTestDemo::touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    if (!_needMoveAgents) return;
-    if (!touches.empty()){
+    if (!_needMoveAgents)
+        return;
+    if (!touches.empty())
+    {
         auto touch = touches[0];
         auto location = touch->getLocationInView();
         Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
diff --git a/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.h b/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.h
index fc2d1a58ebe6..63e07ee041a7 100644
--- a/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.h
+++ b/tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 DEFINE_TEST_SUITE(NavMeshTests);
 
-#if ( CC_USE_NAVMESH == 0 ) || ( CC_USE_PHYSICS == 0 )
+#if (CC_USE_NAVMESH == 0) || (CC_USE_PHYSICS == 0)
 class NavMeshDisabled : public TestCase
 {
 public:
@@ -52,24 +52,23 @@ class NavMeshBaseTestDemo : public TestCase
     // overrides
     virtual bool init() override;
     virtual void update(float delta) override;
-    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
 protected:
-
     void initScene();
-    void createAgent(const cocos2d::Vec3 &pos);
-    void createObstacle(const cocos2d::Vec3 &pos);
-    void moveAgents(const cocos2d::Vec3 &des);
-    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event){};
-    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event){};
-    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event){};
+    void createAgent(const cocos2d::Vec3& pos);
+    void createObstacle(const cocos2d::Vec3& pos);
+    void moveAgents(const cocos2d::Vec3& des);
+    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event){};
+    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event){};
+    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event){};
 
 protected:
-    cocos2d::Camera *_camera;
+    cocos2d::Camera* _camera;
     float _angle;
-    std::vector<std::pair<cocos2d::NavMeshAgent *, cocos2d::Animate3D *> > _agents;
+    std::vector<std::pair<cocos2d::NavMeshAgent*, cocos2d::Animate3D*>> _agents;
     bool _needMoveAgents;
 };
 
@@ -79,22 +78,21 @@ class NavMeshBasicTestDemo : public NavMeshBaseTestDemo
     CREATE_FUNC(NavMeshBasicTestDemo);
     NavMeshBasicTestDemo();
     virtual ~NavMeshBasicTestDemo();
-    
+
     // overrides
     virtual bool init() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void onEnter() override;
-    
-protected:
 
-    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override{};
-    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override{};
-    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override;
+protected:
+    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override{};
+    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override{};
+    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override;
 
 protected:
-    cocos2d::Label *_debugLabel;
+    cocos2d::Label* _debugLabel;
 };
 
 class NavMeshAdvanceTestDemo : public NavMeshBaseTestDemo
@@ -108,19 +106,18 @@ class NavMeshAdvanceTestDemo : public NavMeshBaseTestDemo
     virtual bool init() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void onEnter() override;
 
 protected:
-
-    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override{};
-    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override{};
-    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)override;
+    virtual void touchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override{};
+    virtual void touchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override{};
+    virtual void touchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override;
 
 protected:
-    cocos2d::Label *_obstacleLabel;
-    cocos2d::Label *_agentLabel;
-    cocos2d::Label *_debugLabel;
+    cocos2d::Label* _obstacleLabel;
+    cocos2d::Label* _agentLabel;
+    cocos2d::Label* _debugLabel;
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/NetworkTest/DownloaderTest/DownloaderTest.cpp b/tests/cpp-tests/Classes/NetworkTest/DownloaderTest/DownloaderTest.cpp
index 46376391538b..8b63a52711ea 100644
--- a/tests/cpp-tests/Classes/NetworkTest/DownloaderTest/DownloaderTest.cpp
+++ b/tests/cpp-tests/Classes/NetworkTest/DownloaderTest/DownloaderTest.cpp
@@ -34,16 +34,13 @@
 
 USING_NS_CC;
 
-static const char* sURLList[] =
-{
-    "https://www.cocos2d-x.org/attachments/802/cocos2dx_landscape.png",
-    "https://cocos2d-x.org/images/logo.png",
+static const char* sURLList[] = {
+    "https://www.cocos2d-x.org/attachments/802/cocos2dx_landscape.png", "https://cocos2d-x.org/images/logo.png",
     "https://www.cocos2d-x.org/attachments/1503/no_exist.txt",  // try to download no exist file
-    "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-27.0.1-Full-Installer-x64.exe" // "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1a.zip",
+    "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-27.0.1-Full-Installer-x64.exe"  // "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1a.zip",
 };
-const static int sListSize = (sizeof(sURLList)/sizeof(sURLList[0]));
-static const char* sNameList[sListSize] =
-{
+const static int sListSize              = (sizeof(sURLList) / sizeof(sURLList[0]));
+static const char* sNameList[sListSize] = {
     "cocos2dx_landscape.png",
     "logo.png",
     "inexist file",
@@ -53,50 +50,47 @@ static const char* sNameList[sListSize] =
 struct DownloaderTest : public TestCase
 {
     CREATE_FUNC(DownloaderTest);
-    
+
     virtual std::string title() const override { return "Downloader Test"; }
-    
+
     std::unique_ptr<network::Downloader> downloader;
-    
-    DownloaderTest()
+
+    DownloaderTest() { downloader.reset(new network::Downloader()); }
+
+    enum
     {
-        downloader.reset(new network::Downloader());
-    }
-    
-    enum {
         TAG_TITLE = 1,
         TAG_BUTTON,
         TAG_PROGRESS_BAR,
         TAG_STATUS,
         TAG_SPRITE,
     };
-    
-    Node* createDownloadView(const char *name, const cocos2d::ui::Button::ccWidgetClickCallback &callback)
+
+    Node* createDownloadView(const char* name, const cocos2d::ui::Button::ccWidgetClickCallback& callback)
     {
         Size viewSize(220, 120);
         float margin = 5;
-        
+
         // create background
         auto bg = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png");
         bg->setContentSize(viewSize);
-        
+
         // add a title on the top
-        auto title = Label::createWithTTF(name,"fonts/arial.ttf",16);
+        auto title = Label::createWithTTF(name, "fonts/arial.ttf", 16);
         title->setTag(TAG_TITLE);
         title->setAnchorPoint(Vec2(0.5f, 1.0f));
         title->setPosition(viewSize.width / 2, viewSize.height - margin);
         bg->addChild(title, 10);
-        
+
         // add a button on the bottom
-        auto btn = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                      "cocosui/animationbuttonpressed.png");
+        auto btn = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         btn->setTag(TAG_BUTTON);
         btn->setTitleText("Download");
         btn->setAnchorPoint(Vec2(0.5f, 0.0f));
         btn->setPosition(Vec2(viewSize.width / 2, margin));
         btn->addClickEventListener(callback);
         bg->addChild(btn, 10);
-        
+
         // add a progress bar
         auto bar = ui::LoadingBar::create("ccs-res/cocosui/sliderProgress.png");
         bar->setTag(TAG_PROGRESS_BAR);
@@ -108,7 +102,7 @@ struct DownloaderTest : public TestCase
         bg->addChild(bar, 10);
 
         // add a status label
-        auto label = Label::createWithTTF("","fonts/arial.ttf",14);
+        auto label = Label::createWithTTF("", "fonts/arial.ttf", 14);
         label->setTag(TAG_STATUS);
         label->setAnchorPoint(Vec2(0.5f, 0.5f));
         label->setPosition(Vec2(viewSize.width / 2, viewSize.height / 2));
@@ -116,21 +110,20 @@ struct DownloaderTest : public TestCase
         label->setAlignment(TextHAlignment::CENTER, TextVAlignment::CENTER);
         label->setDimensions(viewSize.width, viewSize.height);
         bg->addChild(label, 20);
-        
+
         return bg;
     }
-    
+
     virtual void onEnter() override
     {
         TestCase::onEnter();
         _restartTestItem->setVisible(true);
-        
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist);
 
         // add four download view in test case
-        Node* topRightView = createDownloadView(sNameList[0], [this](Ref*)
-        {
-            auto view = this->getChildByName(sNameList[0]);
+        Node* topRightView = createDownloadView(sNameList[0], [this](Ref*) {
+            auto view   = this->getChildByName(sNameList[0]);
             auto sprite = view->getChildByTag(TAG_SPRITE);
             if (sprite)
             {
@@ -149,9 +142,8 @@ struct DownloaderTest : public TestCase
         topRightView->setPosition(VisibleRect::center());
         this->addChild(topRightView);
 
-        Node* topLeftView = createDownloadView(sNameList[1], [this](Ref*)
-        {
-            auto view = this->getChildByName(sNameList[1]);
+        Node* topLeftView = createDownloadView(sNameList[1], [this](Ref*) {
+            auto view   = this->getChildByName(sNameList[1]);
             auto sprite = view->getChildByTag(TAG_SPRITE);
             if (sprite)
             {
@@ -171,9 +163,8 @@ struct DownloaderTest : public TestCase
         topLeftView->setPosition(VisibleRect::center());
         this->addChild(topLeftView);
 
-        Node* bottomLeftView = createDownloadView(sNameList[2], [this](Ref*)
-        {
-            auto view = this->getChildByName(sNameList[2]);
+        Node* bottomLeftView = createDownloadView(sNameList[2], [this](Ref*) {
+            auto view   = this->getChildByName(sNameList[2]);
             auto sprite = view->getChildByTag(TAG_SPRITE);
             if (sprite)
             {
@@ -194,10 +185,9 @@ struct DownloaderTest : public TestCase
         bottomLeftView->setPosition(VisibleRect::center());
         this->addChild(bottomLeftView);
 
-        Node* bottomRightView = createDownloadView(sNameList[3], [this](Ref*)
-        {
+        Node* bottomRightView = createDownloadView(sNameList[3], [this](Ref*) {
             auto view = this->getChildByName(sNameList[3]);
-            auto btn = (ui::Button*)view->getChildByTag(TAG_BUTTON);
+            auto btn  = (ui::Button*)view->getChildByTag(TAG_BUTTON);
             btn->setEnabled(false);
             btn->setVisible(false);
             auto bar = (ui::LoadingBar*)view->getChildByTag(TAG_PROGRESS_BAR);
@@ -205,7 +195,8 @@ struct DownloaderTest : public TestCase
             bar->setVisible(true);
             bar->setEnabled(true);
             auto path = FileUtils::getInstance()->getWritablePath() + "CppTests/DownloaderTest/" + sNameList[3];
-            auto task = this->downloader->createDownloadFileTask(sURLList[3], path, sNameList[3], "730cfe31b344ba77d87d0a896af710d4", false);
+            auto task = this->downloader->createDownloadFileTask(sURLList[3], path, sNameList[3],
+                                                                 "730cfe31b344ba77d87d0a896af710d4", false);
             task->progressInfo.totalBytesExpected = 89945032;
         });
         bottomRightView->setName(sNameList[3]);
@@ -214,22 +205,20 @@ struct DownloaderTest : public TestCase
         this->addChild(bottomRightView);
 
         // define progress callback
-        downloader->onTaskProgress = [this](const network::DownloadTask& task)
-        {
-            Node* view = this->getChildByName(task.identifier);
-            auto bar = (ui::LoadingBar*)view->getChildByTag(TAG_PROGRESS_BAR);
+        downloader->onTaskProgress = [this](const network::DownloadTask& task) {
+            Node* view    = this->getChildByName(task.identifier);
+            auto bar      = (ui::LoadingBar*)view->getChildByTag(TAG_PROGRESS_BAR);
             float percent = float(task.progressInfo.totalBytesReceived * 100) / task.progressInfo.totalBytesExpected;
             bar->setPercent(percent);
             char buf[128];
-            sprintf(buf, "%.1f%%[total %d KB]", percent, int(task.progressInfo.totalBytesExpected/1024));
+            sprintf(buf, "%.1f%%[total %d KB]", percent, int(task.progressInfo.totalBytesExpected / 1024));
             auto status = (Label*)view->getChildByTag(TAG_STATUS);
             status->setString(buf);
         };
-        
+
         // define success callback
         downloader->onDataTaskSuccess = [this](const cocos2d::network::DownloadTask& task,
-                                               std::vector<unsigned char>& data)
-        {
+                                               std::vector<unsigned char>& data) {
             // create texture from data
             Texture2D* texture = nullptr;
             do
@@ -239,21 +228,21 @@ struct DownloaderTest : public TestCase
                 {
                     break;
                 }
-                
+
                 texture = new Texture2D();
                 if (false == texture->initWithImage(&img))
                 {
                     break;
                 }
-                auto sprite = Sprite::createWithTexture(texture);
-                auto view = this->getChildByName(task.identifier);
+                auto sprite   = Sprite::createWithTexture(texture);
+                auto view     = this->getChildByName(task.identifier);
                 auto viewSize = view->getContentSize();
                 sprite->setPosition(viewSize.width / 2, viewSize.height / 2);
                 auto spriteSize = sprite->getContentSize();
                 float scale = MIN((viewSize.height - 20) / spriteSize.height, (viewSize.width - 20) / spriteSize.width);
                 sprite->setScale(scale);
                 view->addChild(sprite, 5, TAG_SPRITE);
-                
+
                 auto btn = (ui::Button*)view->getChildByTag(TAG_BUTTON);
                 btn->setEnabled(true);
                 btn->setVisible(true);
@@ -262,14 +251,14 @@ struct DownloaderTest : public TestCase
             } while (0);
             CC_SAFE_RELEASE(texture);
         };
-        
-        downloader->onFileTaskSuccess = [this](const cocos2d::network::DownloadTask& task)
-        {
+
+        downloader->onFileTaskSuccess = [this](const cocos2d::network::DownloadTask& task) {
             Texture2D* texture = nullptr;
             do
             {
                 auto view = this->getChildByName(task.identifier);
-                if (task.storagePath.find(".png") != std::string::npos) {
+                if (task.storagePath.find(".png") != std::string::npos)
+                {
                     // create sprite from file
                     auto sprite   = Sprite::create(task.storagePath);
                     auto viewSize = view->getContentSize();
@@ -280,10 +269,12 @@ struct DownloaderTest : public TestCase
                     sprite->setScale(scale);
                     view->addChild(sprite, 5, TAG_SPRITE);
                     CC_SAFE_RELEASE(texture);
-                } else {
+                }
+                else
+                {
                     // download big file success
-                    auto msg = StringUtils::format("Download [%s] success.", task.identifier.c_str());
-                    auto status = (Label*) view->getChildByTag(TAG_STATUS);
+                    auto msg    = StringUtils::format("Download [%s] success.", task.identifier.c_str());
+                    auto status = (Label*)view->getChildByTag(TAG_STATUS);
                     status->setString(msg);
                 }
                 auto btn = (ui::Button*)view->getChildByTag(TAG_BUTTON);
@@ -293,23 +284,16 @@ struct DownloaderTest : public TestCase
                 bar->setVisible(false);
             } while (0);
         };
-        
+
         // define failed callback
-        downloader->onTaskError = [this](const cocos2d::network::DownloadTask& task,
-                                         int errorCode,
-                                         int errorCodeInternal,
-                                         const std::string& errorStr)
-        {
-            log("Failed to download : %s, identifier(%s) error code(%d), internal error code(%d) desc(%s)"
-                , task.requestURL.c_str()
-                , task.identifier.c_str()
-                , errorCode
-                , errorCodeInternal
-                , errorStr.c_str());
-            auto view = this->getChildByName(task.identifier);
+        downloader->onTaskError = [this](const cocos2d::network::DownloadTask& task, int errorCode,
+                                         int errorCodeInternal, std::string_view errorStr) {
+            log("Failed to download : %s, identifier(%s) error code(%d), internal error code(%d) desc(%s)",
+                task.requestURL.c_str(), task.identifier.c_str(), errorCode, errorCodeInternal, errorStr.data());
+            auto view   = this->getChildByName(task.identifier);
             auto status = (Label*)view->getChildByTag(TAG_STATUS);
             status->setString(errorStr.length() ? errorStr : "Download failed.");
-            
+
             auto btn = (ui::Button*)view->getChildByTag(TAG_BUTTON);
             btn->setEnabled(true);
             btn->setVisible(true);
@@ -339,25 +323,22 @@ struct DownloaderMultiTask : public TestCase
         char path[256];
         char name[64];
         // add 64 download task at same time.
-        for(int i=0; i< 64;i++){
+        for (int i = 0; i < 64; i++)
+        {
             sprintf(name, "%d_%s", i, sNameList[0]);
             sprintf(path, "%sCppTests/DownloaderTest/%s", FileUtils::getInstance()->getWritablePath().c_str(), name);
             log("downloader task create: %s", name);
             this->downloader->createDownloadFileTask(sURLList[0], path, name);
         }
 
-        downloader->onFileTaskSuccess = ([] (const network::DownloadTask& task) {
-            log("downloader task success: %s", task.identifier.c_str());
-        });
+        downloader->onFileTaskSuccess =
+            ([](const network::DownloadTask& task) { log("downloader task success: %s", task.identifier.c_str()); });
 
-        downloader->onTaskError = ([] (const network::DownloadTask& task, int errorCode, int errorCodeInternal, const std::string& errorStr) {
-            log("downloader task failed : %s, identifier(%s) error code(%d), internal error code(%d) desc(%s)"
-                , task.requestURL.c_str()
-                , task.identifier.c_str()
-                , errorCode
-                , errorCodeInternal
-                , errorStr.c_str());
-        });
+        downloader->onTaskError =
+            ([](const network::DownloadTask& task, int errorCode, int errorCodeInternal, std::string_view errorStr) {
+                log("downloader task failed : %s, identifier(%s) error code(%d), internal error code(%d) desc(%s)",
+                    task.requestURL.c_str(), task.identifier.c_str(), errorCode, errorCodeInternal, errorStr.data());
+            });
     }
 };
 
diff --git a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.cpp b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.cpp
index d77782ff1eb2..5c2c8a52bbeb 100644
--- a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.cpp
+++ b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.cpp
@@ -3,17 +3,17 @@
  Copyright (c) Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,7 +29,9 @@
 USING_NS_CC;
 using namespace cocos2d::network;
 
-#define CHROME_UA "User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+#define CHROME_UA                                                                                                   \
+    "User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 " \
+    "Safari/537.36"
 
 HttpClientTests::HttpClientTests()
 {
@@ -37,8 +39,7 @@ HttpClientTests::HttpClientTests()
     ADD_TEST_CASE(HttpClientClearRequestsTest);
 }
 
-HttpClientTest::HttpClientTest() 
-: _labelStatusCode(nullptr)
+HttpClientTest::HttpClientTest() : _labelStatusCode(nullptr)
 {
     auto winSize = Director::getInstance()->getWinSize();
 
@@ -47,51 +48,52 @@ HttpClientTest::HttpClientTest()
     auto cafile = FileUtils::getInstance()->fullPathForFilename("cacert.pem");
     httpClient->setSSLVerification(cafile);
     httpClient->enableCookies(nullptr);
-    CCLOG("The http cookie will store to: %s", httpClient->getCookieFilename().c_str());
+    CCLOG("The http cookie will store to: %s", httpClient->getCookieFilename().data());
 
     const int MARGIN = 40;
-    const int SPACE = 35;
+    const int SPACE  = 35;
 
-    const int LEFT = winSize.width / 2;
+    const int LEFT  = winSize.width / 2;
     const int RIGHT = winSize.width / 4 * 3;
-    
+
     auto menuRequest = Menu::create();
     menuRequest->setPosition(Vec2::ZERO);
     addChild(menuRequest);
-    
-    // Get 
+
+    // Get
     auto labelGet = Label::createWithTTF("Test Get", "fonts/arial.ttf", 22);
-    auto itemGet = MenuItemLabel::create(labelGet, CC_CALLBACK_1(HttpClientTest::onMenuGetTestClicked, this));
+    auto itemGet  = MenuItemLabel::create(labelGet, CC_CALLBACK_1(HttpClientTest::onMenuGetTestClicked, this));
     itemGet->setPosition(LEFT, winSize.height - MARGIN - SPACE);
     menuRequest->addChild(itemGet);
-    
+
     // Post
     auto labelPost = Label::createWithTTF("Test Post", "fonts/arial.ttf", 22);
-    auto itemPost = MenuItemLabel::create(labelPost, CC_CALLBACK_1(HttpClientTest::onMenuPostTestClicked, this));
+    auto itemPost  = MenuItemLabel::create(labelPost, CC_CALLBACK_1(HttpClientTest::onMenuPostTestClicked, this));
     itemPost->setPosition(LEFT, winSize.height - MARGIN - 2 * SPACE);
     menuRequest->addChild(itemPost);
-    
+
     // Post Binary
     auto labelPostBinary = Label::createWithTTF("Test Post Binary", "fonts/arial.ttf", 22);
-    auto itemPostBinary = MenuItemLabel::create(labelPostBinary, CC_CALLBACK_1(HttpClientTest::onMenuPostBinaryTestClicked, this));
+    auto itemPostBinary =
+        MenuItemLabel::create(labelPostBinary, CC_CALLBACK_1(HttpClientTest::onMenuPostBinaryTestClicked, this));
     itemPostBinary->setPosition(LEFT, winSize.height - MARGIN - 3 * SPACE);
     menuRequest->addChild(itemPostBinary);
 
     // Put
     auto labelPut = Label::createWithTTF("Test Put", "fonts/arial.ttf", 22);
-    auto itemPut = MenuItemLabel::create(labelPut, CC_CALLBACK_1(HttpClientTest::onMenuPutTestClicked, this));
+    auto itemPut  = MenuItemLabel::create(labelPut, CC_CALLBACK_1(HttpClientTest::onMenuPutTestClicked, this));
     itemPut->setPosition(LEFT, winSize.height - MARGIN - 4 * SPACE);
     menuRequest->addChild(itemPut);
 
     // Delete
     auto labelDelete = Label::createWithTTF("Test Delete", "fonts/arial.ttf", 22);
-    auto itemDelete = MenuItemLabel::create(labelDelete, CC_CALLBACK_1(HttpClientTest::onMenuDeleteTestClicked, this));
+    auto itemDelete  = MenuItemLabel::create(labelDelete, CC_CALLBACK_1(HttpClientTest::onMenuDeleteTestClicked, this));
     itemDelete->setPosition(LEFT, winSize.height - MARGIN - 5 * SPACE);
     menuRequest->addChild(itemDelete);
-    
+
     // Response Code Label
     _labelStatusCode = Label::createWithTTF("HTTP Status Code", "fonts/arial.ttf", 18);
-    _labelStatusCode->setPosition(winSize.width / 2,  winSize.height - MARGIN - 6 * SPACE);
+    _labelStatusCode->setPosition(winSize.width / 2, winSize.height - MARGIN - 6 * SPACE);
     addChild(_labelStatusCode);
 }
 
@@ -100,8 +102,8 @@ HttpClientTest::~HttpClientTest()
     HttpClient::destroyInstance();
 }
 
-void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref *sender)
-{   
+void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref* sender)
+{
     // test 1(sync request test)
     {
         HttpRequest* request = new HttpRequest();
@@ -111,7 +113,8 @@ void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref *sender)
         // request->setResponseCallback(CC_CALLBACK_2(HttpClientTest::onHttpRequestCompleted, this));
         request->setTag("GET test1");
         HttpResponse* response = HttpClient::getInstance()->sendSync(request);
-        if (response) {
+        if (response)
+        {
             onHttpRequestCompleted(HttpClient::getInstance(), response);
             response->release();
         }
@@ -129,7 +132,7 @@ void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref *sender)
         HttpClient::getInstance()->send(request);
         request->release();
     }
-    
+
     // test 3
     {
         HttpRequest* request = new HttpRequest();
@@ -143,8 +146,8 @@ void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref *sender)
         // don't forget to release it, pair to new
         request->release();
     }
-    
-    // test 4   
+
+    // test 4
     {
         HttpRequest* request = new HttpRequest();
         request->setUrl("https://httpbin.org/get");
@@ -167,13 +170,12 @@ void HttpClientTest::onMenuGetTestClicked(cocos2d::Ref *sender)
         HttpClient::getInstance()->send(request);
         request->release();
     }
-        
+
     // waiting
     _labelStatusCode->setString("waiting...");
- 
 }
 
-void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref *sender)
+void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref* sender)
 {
     // test 1
     {
@@ -182,7 +184,7 @@ void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref *sender)
         request->setRequestType(HttpRequest::Type::POST);
         request->setHeaders(std::vector<std::string>{CHROME_UA});
         request->setResponseCallback(CC_CALLBACK_2(HttpClientTest::onHttpRequestCompleted, this));
-        
+
         // write the post data
         const char* postData = "visitor=cocos2d&TestSuite=Extensions Test/NetworkTest";
         request->setRequestData(postData, strlen(postData));
@@ -190,7 +192,7 @@ void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref *sender)
         HttpClient::getInstance()->send(request);
         request->release();
     }
-    
+
     // test 2: set Content-Type
     {
         HttpRequest* request = new HttpRequest();
@@ -198,7 +200,7 @@ void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref *sender)
         request->setRequestType(HttpRequest::Type::POST);
         request->setHeaders(std::vector<std::string>{CHROME_UA, "Content-Type: application/json; charset=utf-8"});
         request->setResponseCallback(CC_CALLBACK_2(HttpClientTest::onHttpRequestCompleted, this));
-        
+
         // write the post data
         const char* postData = "visitor=cocos2d&TestSuite=Extensions Test/NetworkTest";
         request->setRequestData(postData, strlen(postData));
@@ -206,32 +208,30 @@ void HttpClientTest::onMenuPostTestClicked(cocos2d::Ref *sender)
         HttpClient::getInstance()->send(request);
         request->release();
     }
-    
+
     // waiting
     _labelStatusCode->setString("waiting...");
 }
 
-void HttpClientTest::onMenuPostBinaryTestClicked(cocos2d::Ref *sender)
+void HttpClientTest::onMenuPostBinaryTestClicked(cocos2d::Ref* sender)
 {
     HttpRequest* request = new HttpRequest();
     request->setUrl("https://httpbin.org/post");
     request->setRequestType(HttpRequest::Type::POST);
     request->setResponseCallback(CC_CALLBACK_2(HttpClientTest::onHttpRequestCompleted, this));
-    
+
     // write the post data
     char postData[22] = "binary=hello\0\0cocos2d";  // including \0, the strings after \0 should not be cut in response
-    request->setRequestData(postData, 22); 
+    request->setRequestData(postData, 22);
     request->setTag("POST Binary test");
     HttpClient::getInstance()->send(request);
     request->release();
-    
+
     // waiting
     _labelStatusCode->setString("waiting...");
 }
 
-
-
-void HttpClientTest::onMenuPutTestClicked(Ref *sender)
+void HttpClientTest::onMenuPutTestClicked(Ref* sender)
 {
     // test 1
     {
@@ -270,7 +270,7 @@ void HttpClientTest::onMenuPutTestClicked(Ref *sender)
     _labelStatusCode->setString("waiting...");
 }
 
-void HttpClientTest::onMenuDeleteTestClicked(Ref *sender)
+void HttpClientTest::onMenuDeleteTestClicked(Ref* sender)
 {
     // test 1
     {
@@ -298,35 +298,35 @@ void HttpClientTest::onMenuDeleteTestClicked(Ref *sender)
     _labelStatusCode->setString("waiting...");
 }
 
-void HttpClientTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *response)
+void HttpClientTest::onHttpRequestCompleted(HttpClient* sender, HttpResponse* response)
 {
     if (!response)
     {
         return;
     }
-    
+
     // You can get original request type from: response->request->reqType
-    if (0 != strlen(response->getHttpRequest()->getTag())) 
+    if (0 != strlen(response->getHttpRequest()->getTag()))
     {
         log("%s completed", response->getHttpRequest()->getTag());
     }
-    
-    int32_t statusCode = response->getResponseCode();
+
+    int32_t statusCode    = response->getResponseCode();
     char statusString[64] = {};
     sprintf(statusString, "HTTP Status Code: %d, tag = %s", statusCode, response->getHttpRequest()->getTag());
     _labelStatusCode->setString(statusString);
     log("response code: %d", statusCode);
-    
-    if (response->getResponseCode() != 200) 
+
+    if (response->getResponseCode() != 200)
     {
         log("response failed");
         // log("error buffer: %s", response->getErrorBuffer());
         return;
     }
-    
+
     // dump data
     auto buffer = response->getResponseData();
-    buffer->push_back('\0'); // to c_str
+    buffer->push_back('\0');  // to c_str
     log("Http Test, dump data: %s", buffer->data());
     log("\n");
     if (response->getHttpRequest()->getReferenceCount() != 2)
@@ -335,43 +335,44 @@ void HttpClientTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *re
     }
 }
 
-HttpClientClearRequestsTest::HttpClientClearRequestsTest()
-: _labelStatusCode(nullptr)
+HttpClientClearRequestsTest::HttpClientClearRequestsTest() : _labelStatusCode(nullptr)
 {
     auto winSize = Director::getInstance()->getWinSize();
-    
+
     const int MARGIN = 40;
-    const int SPACE = 35;
-    
+    const int SPACE  = 35;
+
     const int CENTER = winSize.width / 2;
-    
+
     auto menuRequest = Menu::create();
     menuRequest->setPosition(Vec2::ZERO);
     addChild(menuRequest);
-    
+
     // Get
     auto labelGet = Label::createWithTTF("Test Clear all Get", "fonts/arial.ttf", 22);
-    auto itemGet = MenuItemLabel::create(labelGet, CC_CALLBACK_1(HttpClientClearRequestsTest::onMenuCancelAllClicked, this));
+    auto itemGet =
+        MenuItemLabel::create(labelGet, CC_CALLBACK_1(HttpClientClearRequestsTest::onMenuCancelAllClicked, this));
     itemGet->setPosition(CENTER, winSize.height - MARGIN - SPACE);
     menuRequest->addChild(itemGet);
-    
+
     // Post
     auto labelPost = Label::createWithTTF("Test Clear but only with the tag DELETE", "fonts/arial.ttf", 22);
-    auto itemPost = MenuItemLabel::create(labelPost, CC_CALLBACK_1(HttpClientClearRequestsTest::onMenuCancelSomeClicked, this));
+    auto itemPost =
+        MenuItemLabel::create(labelPost, CC_CALLBACK_1(HttpClientClearRequestsTest::onMenuCancelSomeClicked, this));
     itemPost->setPosition(CENTER, winSize.height - MARGIN - 2 * SPACE);
     menuRequest->addChild(itemPost);
-    
+
     // Response Code Label
     _labelStatusCode = Label::createWithTTF("HTTP Status Code", "fonts/arial.ttf", 18);
-    _labelStatusCode->setPosition(winSize.width / 2,  winSize.height - MARGIN - 6 * SPACE);
+    _labelStatusCode->setPosition(winSize.width / 2, winSize.height - MARGIN - 6 * SPACE);
     addChild(_labelStatusCode);
-    
+
     // Tracking Data Label
     _labelTrakingData = Label::createWithTTF("Got 0 of 0 expected http requests", "fonts/arial.ttf", 16);
-    _labelTrakingData->setPosition(CENTER,  winSize.height - MARGIN - 5 * SPACE);
+    _labelTrakingData->setPosition(CENTER, winSize.height - MARGIN - 5 * SPACE);
     addChild(_labelTrakingData);
-    
-    _totalExpectedRequests = 0;
+
+    _totalExpectedRequests  = 0;
     _totalProcessedRequests = 0;
 }
 
@@ -380,9 +381,9 @@ HttpClientClearRequestsTest::~HttpClientClearRequestsTest()
     HttpClient::destroyInstance();
 }
 
-void HttpClientClearRequestsTest::onMenuCancelAllClicked(cocos2d::Ref *sender)
+void HttpClientClearRequestsTest::onMenuCancelAllClicked(cocos2d::Ref* sender)
 {
-    for (int i=0; i < 10; i++)
+    for (int i = 0; i < 10; i++)
     {
         HttpRequest* request = new HttpRequest();
         std::stringstream url;
@@ -390,28 +391,28 @@ void HttpClientClearRequestsTest::onMenuCancelAllClicked(cocos2d::Ref *sender)
         request->setUrl(url.str());
         request->setRequestType(HttpRequest::Type::GET);
         request->setResponseCallback(CC_CALLBACK_2(HttpClientClearRequestsTest::onHttpRequestCompleted, this));
-        
+
         url.str("");
         url << "TEST_" << std::to_string(i);
         request->setTag(url.str());
         HttpClient::getInstance()->send(request);
         request->release();
     }
-    
+
     _totalProcessedRequests = 0;
-    _totalExpectedRequests = 1;
-    
+    _totalExpectedRequests  = 1;
+
     HttpClient::getInstance()->setClearResponsePredicate(nullptr);
     HttpClient::getInstance()->clearResponseQueue();
-    
+
     // waiting
     _labelStatusCode->setString("waiting...");
 }
 
-void HttpClientClearRequestsTest::onMenuCancelSomeClicked(cocos2d::Ref *sender)
+void HttpClientClearRequestsTest::onMenuCancelSomeClicked(cocos2d::Ref* sender)
 {
     // test 1
-    for (int i=0; i < 10; i++)
+    for (int i = 0; i < 10; i++)
     {
         HttpRequest* request = new HttpRequest();
         std::stringstream url;
@@ -419,57 +420,57 @@ void HttpClientClearRequestsTest::onMenuCancelSomeClicked(cocos2d::Ref *sender)
         request->setUrl(url.str());
         request->setRequestType(HttpRequest::Type::GET);
         request->setResponseCallback(CC_CALLBACK_2(HttpClientClearRequestsTest::onHttpRequestCompleted, this));
-        
+
         url.str("");
-        if (i < 5) {
+        if (i < 5)
+        {
             url << "TEST_" << std::to_string(i);
             _totalExpectedRequests++;
         }
-        else {
+        else
+        {
             url << "DELETE_" << std::to_string(i);
         }
         request->setTag(url.str());
         HttpClient::getInstance()->send(request);
         request->release();
     }
-    
-   /* HttpClient::getInstance()->setClearRequestPredicate([&](HttpRequest* req)
-                                                         {
-                                                             auto r = !!strstr(req->getTag(), "DELETE_");
-                                                             return r;
-                                                         });*/
+
+    /* HttpClient::getInstance()->setClearRequestPredicate([&](HttpRequest* req)
+                                                          {
+                                                              auto r = !!strstr(req->getTag(), "DELETE_");
+                                                              return r;
+                                                          });*/
     HttpClient::getInstance()->setClearResponsePredicate(nullptr);
     HttpClient::getInstance()->clearResponseQueue();
-    
-    
+
     // waiting
     _labelStatusCode->setString("waiting...");
-    
 }
 
-void HttpClientClearRequestsTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *response)
+void HttpClientClearRequestsTest::onHttpRequestCompleted(HttpClient* sender, HttpResponse* response)
 {
     if (!response)
     {
         return;
     }
-    
+
     // You can get original request type from: response->request->reqType
     if (0 != strlen(response->getHttpRequest()->getTag()))
     {
         log("%s completed", response->getHttpRequest()->getTag());
     }
-    
-    int32_t statusCode = response->getResponseCode();
+
+    int32_t statusCode    = response->getResponseCode();
     char statusString[64] = {};
     sprintf(statusString, "HTTP Status Code: %d, tag = %s", statusCode, response->getHttpRequest()->getTag());
     _labelStatusCode->setString(statusString);
     log("response code: %d", statusCode);
-    
+
     _totalProcessedRequests++;
     sprintf(statusString, "Got %d of %d expected http requests", _totalProcessedRequests, _totalExpectedRequests);
     _labelTrakingData->setString(statusString);
-    
+
     if (!response->isSucceed())
     {
         log("response failed");
diff --git a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h
index 80c85ff28666..e188007e1c16 100644
--- a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h
+++ b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,16 +39,16 @@ class HttpClientTest : public TestCase
 
     HttpClientTest();
     virtual ~HttpClientTest();
-    
-    //Menu Callbacks
-    void onMenuGetTestClicked(cocos2d::Ref *sender);
-    void onMenuPostTestClicked(cocos2d::Ref *sender);
-    void onMenuPostBinaryTestClicked(cocos2d::Ref *sender);
-    void onMenuPutTestClicked(cocos2d::Ref *sender);
-    void onMenuDeleteTestClicked(cocos2d::Ref *sender);
-    
-    //Http Response Callback
-    void onHttpRequestCompleted(cocos2d::network::HttpClient *sender, cocos2d::network::HttpResponse *response);
+
+    // Menu Callbacks
+    void onMenuGetTestClicked(cocos2d::Ref* sender);
+    void onMenuPostTestClicked(cocos2d::Ref* sender);
+    void onMenuPostBinaryTestClicked(cocos2d::Ref* sender);
+    void onMenuPutTestClicked(cocos2d::Ref* sender);
+    void onMenuDeleteTestClicked(cocos2d::Ref* sender);
+
+    // Http Response Callback
+    void onHttpRequestCompleted(cocos2d::network::HttpClient* sender, cocos2d::network::HttpResponse* response);
 
     virtual std::string title() const override { return "Http Request Test"; }
 
@@ -60,19 +60,19 @@ class HttpClientClearRequestsTest : public TestCase
 {
 public:
     CREATE_FUNC(HttpClientClearRequestsTest);
-    
+
     HttpClientClearRequestsTest();
     virtual ~HttpClientClearRequestsTest();
-    
-    //Menu Callbacks
-    void onMenuCancelAllClicked(cocos2d::Ref *sender);
-    void onMenuCancelSomeClicked(cocos2d::Ref *sender);
-    
-    //Http Response Callback
-    void onHttpRequestCompleted(cocos2d::network::HttpClient *sender, cocos2d::network::HttpResponse *response);
-    
+
+    // Menu Callbacks
+    void onMenuCancelAllClicked(cocos2d::Ref* sender);
+    void onMenuCancelSomeClicked(cocos2d::Ref* sender);
+
+    // Http Response Callback
+    void onHttpRequestCompleted(cocos2d::network::HttpClient* sender, cocos2d::network::HttpResponse* response);
+
     virtual std::string title() const override { return "Http Request Test"; }
-    
+
 private:
     int _totalExpectedRequests;
     int _totalProcessedRequests;
@@ -80,4 +80,4 @@ class HttpClientClearRequestsTest : public TestCase
     cocos2d::Label* _labelStatusCode;
 };
 
-#endif //__HTTPREQUESTHTTP_H
+#endif  //__HTTPREQUESTHTTP_H
diff --git a/tests/cpp-tests/Classes/NetworkTest/NetworkTest.cpp b/tests/cpp-tests/Classes/NetworkTest/NetworkTest.cpp
index 4e320a70ffd7..1f518130f2f3 100644
--- a/tests/cpp-tests/Classes/NetworkTest/NetworkTest.cpp
+++ b/tests/cpp-tests/Classes/NetworkTest/NetworkTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,8 @@
 #include "HttpClientTest/HttpClientTest.h"
 #include "DownloaderTest/DownloaderTest.h"
 
-NetworkTests::NetworkTests() {
+NetworkTests::NetworkTests()
+{
     addTest("HttpClientTest", []() { return new HttpClientTests; });
     addTest("DownloaderTest", []() { return new DownloaderTests; });
 }
diff --git a/tests/cpp-tests/Classes/NetworkTest/NetworkTest.h b/tests/cpp-tests/Classes/NetworkTest/NetworkTest.h
index 917e95d037a3..e0574e76c225 100644
--- a/tests/cpp-tests/Classes/NetworkTest/NetworkTest.h
+++ b/tests/cpp-tests/Classes/NetworkTest/NetworkTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
index 90e304dece67..81dc4aea801e 100644
--- a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
+++ b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
@@ -53,151 +53,153 @@ AudioEngineTests::AudioEngineTests()
 
     ADD_TEST_CASE(AudioIssue18597Test);
     ADD_TEST_CASE(AudioIssue11143Test);
-    
-    //FIXME: Please keep AudioSwitchStateTest to the last position since this test case doesn't work well on each platforms.
+
+    // FIXME: Please keep AudioSwitchStateTest to the last position since this test case doesn't work well on each
+    // platforms.
     ADD_TEST_CASE(AudioSwitchStateTest);
 }
 
-namespace {
-    
-    class TextButton : public cocos2d::Label
+namespace
+{
+
+class TextButton : public cocos2d::Label
+{
+public:
+    static TextButton* create(std::string_view text, const std::function<void(TextButton*)>& onTriggered)
     {
-    public:
-        
-        static TextButton *create(const std::string& text, const std::function<void(TextButton*)> &onTriggered)
+        auto ret = new TextButton();
+
+        TTFConfig ttfconfig("fonts/arial.ttf", 25);
+        if (ret->setTTFConfig(ttfconfig))
         {
-            auto ret = new TextButton();
-            
-            TTFConfig ttfconfig("fonts/arial.ttf",25);
-            if (ret->setTTFConfig(ttfconfig)) {
-                ret->setString(text);
-                ret->_onTriggered = onTriggered;
-                
-                ret->autorelease();
-                
-                return ret;
-            }
-            
-            delete ret;
-            return nullptr;
+            ret->setString(text);
+            ret->_onTriggered = onTriggered;
+
+            ret->autorelease();
+
+            return ret;
         }
-        
-        void setEnabled(bool enabled)
+
+        delete ret;
+        return nullptr;
+    }
+
+    void setEnabled(bool enabled)
+    {
+        _enabled = enabled;
+        if (_enabled)
         {
-            _enabled = enabled;
-            if(_enabled){
-                this->setColor(Color3B::WHITE);
-            }
-            else {
-                this->setColor(Color3B::GRAY);
-            }
+            this->setColor(Color3B::WHITE);
         }
-        
-    private:
-        TextButton()
-        : _onTriggered(nullptr)
-        , _enabled(true)
+        else
         {
-            auto listener = EventListenerTouchOneByOne::create();
-            listener->setSwallowTouches(true);
-            
-            listener->onTouchBegan = CC_CALLBACK_2(TextButton::onTouchBegan, this);
-            listener->onTouchEnded = CC_CALLBACK_2(TextButton::onTouchEnded, this);
-            listener->onTouchCancelled = CC_CALLBACK_2(TextButton::onTouchCancelled, this);
-            
-            _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-            
+            this->setColor(Color3B::GRAY);
         }
-        
-        bool touchHits(Touch  *touch)
+    }
+
+private:
+    TextButton() : _onTriggered(nullptr), _enabled(true)
+    {
+        auto listener = EventListenerTouchOneByOne::create();
+        listener->setSwallowTouches(true);
+
+        listener->onTouchBegan     = CC_CALLBACK_2(TextButton::onTouchBegan, this);
+        listener->onTouchEnded     = CC_CALLBACK_2(TextButton::onTouchEnded, this);
+        listener->onTouchCancelled = CC_CALLBACK_2(TextButton::onTouchCancelled, this);
+
+        _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
+    }
+
+    bool touchHits(Touch* touch)
+    {
+        auto hitPos = this->convertToNodeSpace(touch->getLocation());
+        if (hitPos.x >= 0 && hitPos.y >= 0 && hitPos.x <= _contentSize.width && hitPos.y <= _contentSize.height)
         {
-            auto hitPos = this->convertToNodeSpace(touch->getLocation());
-            if (hitPos.x >= 0 && hitPos.y >= 0 && hitPos.x <= _contentSize.width && hitPos.y <= _contentSize.height) {
-                return true;
-            }
-            return false;
+            return true;
         }
-        
-        bool onTouchBegan(Touch  *touch, Event  *event)
+        return false;
+    }
+
+    bool onTouchBegan(Touch* touch, Event* event)
+    {
+        auto hits = touchHits(touch);
+        if (hits)
         {
-            auto hits = touchHits(touch);
-            if (hits){
-                scaleButtonTo(0.95f);
-            }
-            return hits;
+            scaleButtonTo(0.95f);
         }
-        
-        void onTouchEnded(Touch  *touch, Event  *event)
+        return hits;
+    }
+
+    void onTouchEnded(Touch* touch, Event* event)
+    {
+        if (_enabled)
         {
-            if(_enabled) {
-                auto hits = touchHits(touch);
-                if (hits && _onTriggered){
-                    _onTriggered(this);
-                }
+            auto hits = touchHits(touch);
+            if (hits && _onTriggered)
+            {
+                _onTriggered(this);
             }
-            
-            scaleButtonTo(1);
         }
-        
-        void onTouchCancelled(Touch  *touch, Event  *event)
-        {
-            scaleButtonTo(1);
-        }
-        
-        void scaleButtonTo(float scale)
-        {
-            auto action = ScaleTo::create(0.05f, scale);
-            action->setTag(10000);
-            stopActionByTag(10000);
-            runAction(action);
-        }
-        
-        std::function<void(TextButton*)> _onTriggered;
-        
-        bool _enabled;
-    };
-    
-    class SliderEx : public Slider
+
+        scaleButtonTo(1);
+    }
+
+    void onTouchCancelled(Touch* touch, Event* event) { scaleButtonTo(1); }
+
+    void scaleButtonTo(float scale)
     {
-    public:
-        static SliderEx* create(){
-            auto ret = new SliderEx();
-            if (ret->init())
-            {
-                ret->loadBarTexture("cocosui/sliderTrack.png");
-                ret->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
-                ret->loadProgressBarTexture("cocosui/sliderProgress.png");
-                ret->setTouchEnabled(true);
-                
-                ret->autorelease();
-                
-                return ret;
-            }
-            CC_SAFE_DELETE(ret);
+        auto action = ScaleTo::create(0.05f, scale);
+        action->setTag(10000);
+        stopActionByTag(10000);
+        runAction(action);
+    }
+
+    std::function<void(TextButton*)> _onTriggered;
+
+    bool _enabled;
+};
+
+class SliderEx : public Slider
+{
+public:
+    static SliderEx* create()
+    {
+        auto ret = new SliderEx();
+        if (ret->init())
+        {
+            ret->loadBarTexture("cocosui/sliderTrack.png");
+            ret->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
+            ret->loadProgressBarTexture("cocosui/sliderProgress.png");
+            ret->setTouchEnabled(true);
+
+            ret->autorelease();
+
             return ret;
         }
-        
-        void setRatio(float ratio) {
-            ratio = clampf(ratio, 0.0f, 1.0f);
-            
-            _ratio = ratio;
-            setPercent(100 * _ratio);
-        }
-        
-        float getRatio () {
-            _ratio = 1.0f * _percent / _maxPercent;
-            return _ratio;
-        }
-        
-    private:
-        float _ratio;
-    };
-}
+        CC_SAFE_DELETE(ret);
+        return ret;
+    }
 
-AudioEngineTestDemo::AudioEngineTestDemo()
-: _isDestroyed(std::make_shared<bool>(false))
-{
-}
+    void setRatio(float ratio)
+    {
+        ratio = clampf(ratio, 0.0f, 1.0f);
+
+        _ratio = ratio;
+        setPercent(100 * _ratio);
+    }
+
+    float getRatio()
+    {
+        _ratio = 1.0f * _percent / _maxPercent;
+        return _ratio;
+    }
+
+private:
+    float _ratio;
+};
+}  // namespace
+
+AudioEngineTestDemo::AudioEngineTestDemo() : _isDestroyed(std::make_shared<bool>(false)) {}
 
 void AudioEngineTestDemo::onExit()
 {
@@ -220,173 +222,184 @@ void AudioEngineTestDemo::onBackCallback(cocos2d::Ref* sender)
 // AudioControlTest
 bool AudioControlTest::init()
 {
-    auto ret = AudioEngineTestDemo::init();
-    _audioID = AudioEngine::INVALID_AUDIO_ID;
-    _loopEnabled = false;
-    _volume = 1.0f;
-    _duration = AudioEngine::TIME_UNKNOWN;
-    _timeRatio = 0.0f;
+    auto ret          = AudioEngineTestDemo::init();
+    _audioID          = AudioEngine::INVALID_AUDIO_ID;
+    _loopEnabled      = false;
+    _volume           = 1.0f;
+    _duration         = AudioEngine::TIME_UNKNOWN;
+    _timeRatio        = 0.0f;
     _updateTimeSlider = true;
-    _isStopped = false;
-    
+    _isStopped        = false;
+
     std::string fontFilePath = "fonts/arial.ttf";
-    
+
     auto& layerSize = this->getContentSize();
-    
+
     _playOverLabel = Label::createWithSystemFont("Play Over", "", 30);
-    _playOverLabel->setPosition(Vec2(layerSize/2) + Vec2(0, 30));
+    _playOverLabel->setPosition(Vec2(layerSize / 2) + Vec2(0, 30));
     _playOverLabel->setVisible(false);
     addChild(_playOverLabel, 99999);
 
-    auto playItem = TextButton::create("play", [&](TextButton* button){
-        if (_audioID == AudioEngine::INVALID_AUDIO_ID) {
+    auto playItem = TextButton::create("play", [&](TextButton* button) {
+        if (_audioID == AudioEngine::INVALID_AUDIO_ID)
+        {
             _audioID = AudioEngine::play2d("background.mp3", _loopEnabled, _volume);
-            
-            if(_audioID != AudioEngine::INVALID_AUDIO_ID) {
+
+            if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+            {
                 _isStopped = false;
-                
+
                 button->setEnabled(false);
-                AudioEngine::setFinishCallback(_audioID, [&](int id, const std::string& filePath){
+                AudioEngine::setFinishCallback(_audioID, [&](int id, std::string_view filePath) {
                     log("_audioID(%d), _isStopped:(%d), played over!!!", _audioID, _isStopped);
-                    
+
                     _playOverLabel->setVisible(true);
-                    
-                    scheduleOnce([&](float dt){
-                        _playOverLabel->setVisible(false);
-                    }, 2.0f, "hide_play_over_label");
-                    
-                    assert(!_isStopped); // Stop audio should not trigger finished callback
+
+                    scheduleOnce([&](float dt) { _playOverLabel->setVisible(false); }, 2.0f, "hide_play_over_label");
+
+                    assert(!_isStopped);  // Stop audio should not trigger finished callback
                     _audioID = AudioEngine::INVALID_AUDIO_ID;
                     ((TextButton*)_playItem)->setEnabled(true);
-                    
+
                     _timeRatio = 0.0f;
                     ((SliderEx*)_timeSlider)->setRatio(_timeRatio);
                 });
             }
         }
     });
-    _playItem = playItem;
-    playItem->setPosition(layerSize.width * 0.3f,layerSize.height * 0.8f);
+    _playItem     = playItem;
+    playItem->setPosition(layerSize.width * 0.3f, layerSize.height * 0.8f);
     addChild(playItem);
-    
-    auto stopItem = TextButton::create("stop", [&](TextButton* button){
-        if (_audioID != AudioEngine::INVALID_AUDIO_ID ) {
+
+    auto stopItem = TextButton::create("stop", [&](TextButton* button) {
+        if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+        {
             _isStopped = true;
             AudioEngine::stop(_audioID);
-            
+
             _audioID = AudioEngine::INVALID_AUDIO_ID;
             ((TextButton*)_playItem)->setEnabled(true);
         }
     });
-    stopItem->setPosition(layerSize.width * 0.7f,layerSize.height * 0.8f);
+    stopItem->setPosition(layerSize.width * 0.7f, layerSize.height * 0.8f);
     addChild(stopItem);
-    
-    auto pauseItem = TextButton::create("pause", [&](TextButton* button){
-        if (_audioID != AudioEngine::INVALID_AUDIO_ID ) {
+
+    auto pauseItem = TextButton::create("pause", [&](TextButton* button) {
+        if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+        {
             AudioEngine::pause(_audioID);
         }
     });
-    pauseItem->setPosition(layerSize.width * 0.3f,layerSize.height * 0.7f);
+    pauseItem->setPosition(layerSize.width * 0.3f, layerSize.height * 0.7f);
     addChild(pauseItem);
-    
-    auto resumeItem = TextButton::create("resume", [&](TextButton* button){
-        if (_audioID != AudioEngine::INVALID_AUDIO_ID ) {
+
+    auto resumeItem = TextButton::create("resume", [&](TextButton* button) {
+        if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+        {
             AudioEngine::resume(_audioID);
         }
     });
-    resumeItem->setPosition(layerSize.width * 0.7f,layerSize.height * 0.7f);
+    resumeItem->setPosition(layerSize.width * 0.7f, layerSize.height * 0.7f);
     addChild(resumeItem);
-    
-    auto loopItem = TextButton::create("enable-loop", [&](TextButton* button){
+
+    auto loopItem = TextButton::create("enable-loop", [&](TextButton* button) {
         _loopEnabled = !_loopEnabled;
 
-        if (_audioID != AudioEngine::INVALID_AUDIO_ID) {
+        if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+        {
             AudioEngine::setLoop(_audioID, _loopEnabled);
         }
-        if (_loopEnabled){
+        if (_loopEnabled)
+        {
             button->setString("disable-loop");
         }
-        else {
+        else
+        {
             button->setString("enable-loop");
         }
     });
     loopItem->setPosition(layerSize.width * 0.5f, layerSize.height * 0.5f);
     addChild(loopItem);
-    
+
     auto volumeSlider = SliderEx::create();
     volumeSlider->setPercent(100);
-    volumeSlider->addEventListener([&](Ref* sender, Slider::EventType event){
-        SliderEx *slider = dynamic_cast<SliderEx *>(sender);
-        _volume = slider->getRatio();
-        if (_audioID != AudioEngine::INVALID_AUDIO_ID ) {
+    volumeSlider->addEventListener([&](Ref* sender, Slider::EventType event) {
+        SliderEx* slider = dynamic_cast<SliderEx*>(sender);
+        _volume          = slider->getRatio();
+        if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+        {
             AudioEngine::setVolume(_audioID, _volume);
         }
     });
-    volumeSlider->setPosition(Vec2(layerSize.width * 0.5f,layerSize.height * 0.35f));
+    volumeSlider->setPosition(Vec2(layerSize.width * 0.5f, layerSize.height * 0.35f));
     addChild(volumeSlider);
-    
+
     auto timeSlider = SliderEx::create();
-    timeSlider->addEventListener([&](Ref* sender, Slider::EventType event){
-        SliderEx *slider = dynamic_cast<SliderEx *>(sender);
-        switch(event){
-            case Slider::EventType::ON_SLIDEBALL_DOWN:
-                _updateTimeSlider = false;
-                break;
-            case Slider::EventType::ON_SLIDEBALL_UP:
-                if (_audioID != AudioEngine::INVALID_AUDIO_ID && _duration != AudioEngine::TIME_UNKNOWN) {
-                    float ratio = (float)slider->getPercent() / 100;
-                    ratio = clampf(ratio, 0.0f, 1.0f);
-                    AudioEngine::setCurrentTime(_audioID, _duration * ratio);
-                }
-            case Slider::EventType::ON_SLIDEBALL_CANCEL:
-                _updateTimeSlider = true;
-            case Slider::EventType::ON_PERCENTAGE_CHANGED:
-            default:
-                //ignore
-                break;
+    timeSlider->addEventListener([&](Ref* sender, Slider::EventType event) {
+        SliderEx* slider = dynamic_cast<SliderEx*>(sender);
+        switch (event)
+        {
+        case Slider::EventType::ON_SLIDEBALL_DOWN:
+            _updateTimeSlider = false;
+            break;
+        case Slider::EventType::ON_SLIDEBALL_UP:
+            if (_audioID != AudioEngine::INVALID_AUDIO_ID && _duration != AudioEngine::TIME_UNKNOWN)
+            {
+                float ratio = (float)slider->getPercent() / 100;
+                ratio       = clampf(ratio, 0.0f, 1.0f);
+                AudioEngine::setCurrentTime(_audioID, _duration * ratio);
+            }
+        case Slider::EventType::ON_SLIDEBALL_CANCEL:
+            _updateTimeSlider = true;
+        case Slider::EventType::ON_PERCENTAGE_CHANGED:
+        default:
+            // ignore
+            break;
         }
     });
-    timeSlider->setPosition(Vec2(layerSize.width * 0.5f,layerSize.height * 0.25f));
+    timeSlider->setPosition(Vec2(layerSize.width * 0.5f, layerSize.height * 0.25f));
     addChild(timeSlider);
     _timeSlider = timeSlider;
-    
+
     auto& volumeSliderPos = volumeSlider->getPosition();
-    auto& sliderSize = volumeSlider->getContentSize();
-    auto volumeLabel = Label::createWithTTF("volume:  ", fontFilePath, 20);
+    auto& sliderSize      = volumeSlider->getContentSize();
+    auto volumeLabel      = Label::createWithTTF("volume:  ", fontFilePath, 20);
     volumeLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     volumeLabel->setPosition(volumeSliderPos.x - sliderSize.width / 2, volumeSliderPos.y);
     addChild(volumeLabel);
-    
+
     auto& timeSliderPos = timeSlider->getPosition();
-    auto timeLabel = Label::createWithTTF("time:  ", fontFilePath, 20);
+    auto timeLabel      = Label::createWithTTF("time:  ", fontFilePath, 20);
     timeLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     timeLabel->setPosition(timeSliderPos.x - sliderSize.width / 2, timeSliderPos.y);
     addChild(timeLabel);
-    
+
     this->schedule(CC_CALLBACK_1(AudioControlTest::update, this), 0.1f, "update_key");
-    
+
     return ret;
 }
 
 void AudioControlTest::update(float dt)
 {
-    if (_audioID != AudioEngine::INVALID_AUDIO_ID ) {
-        if(_duration == AudioEngine::TIME_UNKNOWN){
+    if (_audioID != AudioEngine::INVALID_AUDIO_ID)
+    {
+        if (_duration == AudioEngine::TIME_UNKNOWN)
+        {
             _duration = AudioEngine::getDuration(_audioID);
         }
-        if(_duration != AudioEngine::TIME_UNKNOWN){
-            auto time = AudioEngine::getCurrentTime(_audioID);
+        if (_duration != AudioEngine::TIME_UNKNOWN)
+        {
+            auto time  = AudioEngine::getCurrentTime(_audioID);
             _timeRatio = time / _duration;
-            if(_updateTimeSlider){
+            if (_updateTimeSlider)
+            {
                 ((SliderEx*)_timeSlider)->setRatio(_timeRatio);
             }
         }
     }
 }
 
-AudioControlTest::~AudioControlTest()
-{
-}
+AudioControlTest::~AudioControlTest() {}
 
 std::string AudioControlTest::title() const
 {
@@ -403,16 +416,16 @@ bool AudioLoadTest::init()
         stateLabel->setPosition(layerSize.width / 2, layerSize.height * 0.7f);
         addChild(stateLabel);
 
-        auto preloadItem = TextButton::create("preload", [&, stateLabel](TextButton* button){
+        auto preloadItem = TextButton::create("preload", [&, stateLabel](TextButton* button) {
             stateLabel->setString("status:loading...");
             auto isDestroyed = _isDestroyed;
-            AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [isDestroyed, stateLabel](bool isSuccess){
+            AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [isDestroyed, stateLabel](bool isSuccess) {
                 if (*isDestroyed)
                 {
                     CCLOG("AudioLoadTest scene was destroyed, no need to set the label text.");
                     return;
                 }
-                
+
                 if (isSuccess)
                 {
                     stateLabel->setString("status:load success");
@@ -426,13 +439,13 @@ bool AudioLoadTest::init()
         preloadItem->setPosition(layerSize.width * 0.35f, layerSize.height * 0.5f);
         addChild(preloadItem);
 
-        auto uncacheItem = TextButton::create("uncache", [&, stateLabel](TextButton* button){
+        auto uncacheItem = TextButton::create("uncache", [&, stateLabel](TextButton* button) {
             stateLabel->setString("status:uncache");
             AudioEngine::uncache("audio/SoundEffectsFX009/FX082.mp3");
         });
         uncacheItem->setPosition(layerSize.width * 0.65f, layerSize.height * 0.5f);
         addChild(uncacheItem);
-        
+
         return true;
     }
 
@@ -445,9 +458,7 @@ std::string AudioLoadTest::title() const
 }
 
 // AudioWavTest
-AudioWavTest::~AudioWavTest()
-{
-}
+AudioWavTest::~AudioWavTest() {}
 
 std::string AudioWavTest::title() const
 {
@@ -468,22 +479,26 @@ bool AudioWavTest::init()
         addChild(_stateLabel);
 
         auto playPrev = TextButton::create("Play Prev", [=](TextButton* button) {
-            if (_curIndex > 0) {
+            if (_curIndex > 0)
+            {
                 AudioEngine::stop(_audioID);
                 _audioID = AudioEngine::play2d(_wavFiles[--_curIndex]);
-                _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex, FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
+                _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex,
+                                                           FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
             }
-            });
+        });
         playPrev->setPosition(layerSize.width * 0.35f, layerSize.height * 0.5f);
         addChild(playPrev);
 
         auto playNext = TextButton::create("Play Next", [=](TextButton* button) {
-            if (_curIndex != -1 && _curIndex < (_wavFiles.size() - 1)) {
+            if (_curIndex != -1 && _curIndex < (_wavFiles.size() - 1))
+            {
                 AudioEngine::stop(_audioID);
                 _audioID = AudioEngine::play2d(_wavFiles[++_curIndex]);
-                _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex, FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
+                _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex,
+                                                           FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
             }
-            });
+        });
         playNext->setPosition(layerSize.width * 0.65f, layerSize.height * 0.5f);
         addChild(playNext);
 
@@ -497,10 +512,12 @@ void AudioWavTest::onEnter()
 {
     AudioEngineTestDemo::onEnter();
 
-    if (!_wavFiles.empty()) {
+    if (!_wavFiles.empty())
+    {
         _curIndex = 0;
-        _audioID = AudioEngine::play2d(_wavFiles[_curIndex]);
-        _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex, FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
+        _audioID  = AudioEngine::play2d(_wavFiles[_curIndex]);
+        _stateLabel->setString(StringUtils::format("[index: %d] %s", _curIndex,
+                                                   FileUtils::getFileShortName(_wavFiles[_curIndex]).c_str()));
     }
 }
 
@@ -508,48 +525,51 @@ void AudioWavTest::onEnter()
 bool PlaySimultaneouslyTest::init()
 {
     auto ret = AudioEngineTestDemo::init();
-    
+
     char text[36];
     int tmp = 81;
-    for(int index = 0; index < TEST_COUNT; ++index){
-        sprintf(text,"audio/SoundEffectsFX009/FX0%d.mp3",tmp + index);
+    for (int index = 0; index < TEST_COUNT; ++index)
+    {
+        sprintf(text, "audio/SoundEffectsFX009/FX0%d.mp3", tmp + index);
         _files[index] = text;
     }
     _playingcount = 0;
-    
-    auto playItem = TextButton::create("play-simultaneously", [&](TextButton* button){
+
+    auto playItem = TextButton::create("play-simultaneously", [&](TextButton* button) {
         int audioId;
         _playingcount = 0;
         button->setEnabled(false);
         auto startTime = utils::gettime();
-        for(int index = 0; index < TEST_COUNT; ++index){
+        for (int index = 0; index < TEST_COUNT; ++index)
+        {
             audioId = AudioEngine::play2d(_files[index]);
-            if(audioId != AudioEngine::INVALID_AUDIO_ID){
+            if (audioId != AudioEngine::INVALID_AUDIO_ID)
+            {
                 _playingcount += 1;
-                
-                AudioEngine::setFinishCallback(audioId, [&](int id, const std::string& filePath){
+
+                AudioEngine::setFinishCallback(audioId, [&](int id, std::string_view filePath) {
                     _playingcount -= 1;
-                    if(_playingcount <= 0){
+                    if (_playingcount <= 0)
+                    {
                         ((TextButton*)_playItem)->setEnabled(true);
                     }
                 });
             }
-            else {
-                log("%s,%d,Fail to play file:%s",__FILE__,__LINE__ ,_files[index].c_str());
+            else
+            {
+                log("%s,%d,Fail to play file:%s", __FILE__, __LINE__, _files[index].c_str());
             }
         }
-        log("diff time:%lf",utils::gettime() - startTime);
+        log("diff time:%lf", utils::gettime() - startTime);
     });
-    playItem->setPositionNormalized(Vec2(0.5f,0.5f));
+    playItem->setPositionNormalized(Vec2(0.5f, 0.5f));
     this->addChild(playItem);
     _playItem = playItem;
-    
+
     return ret;
 }
 
-PlaySimultaneouslyTest::~PlaySimultaneouslyTest()
-{
-}
+PlaySimultaneouslyTest::~PlaySimultaneouslyTest() {}
 
 std::string PlaySimultaneouslyTest::title() const
 {
@@ -560,7 +580,7 @@ std::string PlaySimultaneouslyTest::title() const
 bool AudioProfileTest::init()
 {
     auto ret = AudioEngineTestDemo::init();
-    
+
     char text[30];
     _files[0] = "background.mp3";
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
@@ -568,82 +588,81 @@ bool AudioProfileTest::init()
 #else
     _files[1] = "background.ogg";
 #endif
-    
+
     std::string fontFilePath = "fonts/arial.ttf";
-    _minDelay = 1.0f;
-    _time = 0.0f;
+    _minDelay                = 1.0f;
+    _time                    = 0.0f;
 
-    _audioProfile.name = "AudioProfileTest";
+    _audioProfile.name         = "AudioProfileTest";
     _audioProfile.maxInstances = 3;
-    _audioProfile.minDelay = 1.0;
-    
-    Vec2 pos(0.5f,0.7f);
-    for(int index = 0; index < FILE_COUNT; ++index){
-        sprintf(text,"play %s",_files[index].c_str());
-        
-        auto playItem = TextButton::create(text, [&](TextButton* button){
+    _audioProfile.minDelay     = 1.0;
+
+    Vec2 pos(0.5f, 0.7f);
+    for (int index = 0; index < FILE_COUNT; ++index)
+    {
+        sprintf(text, "play %s", _files[index].c_str());
+
+        auto playItem = TextButton::create(text, [&](TextButton* button) {
             int index = button->getTag();
-            auto id = AudioEngine::play2d(_files[index], false, 1.0f, &_audioProfile);
-            if(id != AudioEngine::INVALID_AUDIO_ID){
+            auto id   = AudioEngine::play2d(_files[index], false, 1.0f, &_audioProfile);
+            if (id != AudioEngine::INVALID_AUDIO_ID)
+            {
                 _time = _minDelay;
                 _audioCount += 1;
                 char show[30];
-                sprintf(show,"audio count:%d",_audioCount);
+                sprintf(show, "audio count:%d", _audioCount);
                 _showLabel->setString(show);
-                
-                AudioEngine::setFinishCallback(id, [&](int id, const std::string& filePath){
+
+                AudioEngine::setFinishCallback(id, [&](int id, std::string_view filePath) {
                     _audioCount -= 1;
                     char show[30];
-                    sprintf(show,"audio count:%d",_audioCount);
+                    sprintf(show, "audio count:%d", _audioCount);
                     _showLabel->setString(show);
                 });
             }
-            
         });
         playItem->setTag(index);
         playItem->setPositionNormalized(pos);
         this->addChild(playItem);
         pos.y -= 0.15f;
-        
     }
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
-    auto profileInfoLabel = Label::createWithTTF("AudioProfile Info:\n    max instance:3  \n    minimum delay:1.0", fontFilePath, 12);
+    Size size   = Director::getInstance()->getVisibleSize();
+
+    auto profileInfoLabel =
+        Label::createWithTTF("AudioProfile Info:\n    max instance:3  \n    minimum delay:1.0", fontFilePath, 12);
     profileInfoLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
     profileInfoLabel->setPosition(Vec2(origin.x, origin.y + size.height * 0.65f));
     addChild(profileInfoLabel);
-    
+
     _audioCount = 0;
-    _showLabel = Label::createWithTTF("audio count:0", fontFilePath, 12);
+    _showLabel  = Label::createWithTTF("audio count:0", fontFilePath, 12);
     _showLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
     _showLabel->setPosition(Vec2(origin.x, origin.y + size.height * 0.5f));
     addChild(_showLabel);
-    
+
     auto timeSlider = SliderEx::create();
     timeSlider->setEnabled(false);
     timeSlider->setPositionNormalized(pos);
     addChild(timeSlider);
     _timeSlider = timeSlider;
-    
+
     this->schedule(CC_CALLBACK_1(AudioProfileTest::update, this), 0.05f, "update_key");
-    
+
     return ret;
 }
 
 void AudioProfileTest::update(float dt)
 {
-    if(_time > 0.0f)
+    if (_time > 0.0f)
     {
         _time -= dt;
         ((SliderEx*)_timeSlider)->setRatio(_time / _minDelay);
     }
 }
 
-AudioProfileTest::~AudioProfileTest()
-{
-}
+AudioProfileTest::~AudioProfileTest() {}
 
 std::string AudioProfileTest::title() const
 {
@@ -659,29 +678,26 @@ std::string AudioProfileTest::subtitle() const
 bool InvalidAudioFileTest::init()
 {
     auto ret = AudioEngineTestDemo::init();
-    
-    auto playItem = TextButton::create("play unsupported media type", [&](TextButton* button){
+
+    auto playItem = TextButton::create("play unsupported media type", [&](TextButton* button) {
 #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
         AudioEngine::play2d("background.ogg");
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-        AudioEngine::play2d("background.caf"); 
+        AudioEngine::play2d("background.caf");
 #endif
     });
     playItem->setPositionNormalized(Vec2(0.5f, 0.6f));
     this->addChild(playItem);
-    
-    auto playItem2 = TextButton::create("play not-existent file", [&](TextButton* button){
-        AudioEngine::play2d("not-existent file.mp3");
-    });
+
+    auto playItem2 = TextButton::create("play not-existent file",
+                                        [&](TextButton* button) { AudioEngine::play2d("not-existent file.mp3"); });
     playItem2->setPositionNormalized(Vec2(0.5f, 0.4f));
     this->addChild(playItem2);
-    
+
     return ret;
 }
 
-InvalidAudioFileTest::~InvalidAudioFileTest()
-{
-}
+InvalidAudioFileTest::~InvalidAudioFileTest() {}
 
 std::string InvalidAudioFileTest::title() const
 {
@@ -697,19 +713,16 @@ std::string InvalidAudioFileTest::subtitle() const
 bool LargeAudioFileTest::init()
 {
     auto ret = AudioEngineTestDemo::init();
-    
-    auto playItem = TextButton::create("play large audio file", [&](TextButton* button){
-        AudioEngine::play2d("audio/LuckyDay.mp3");
-    });
+
+    auto playItem = TextButton::create("play large audio file",
+                                       [&](TextButton* button) { AudioEngine::play2d("audio/LuckyDay.mp3"); });
     playItem->setPositionNormalized(Vec2::ANCHOR_MIDDLE);
     this->addChild(playItem);
-    
+
     return ret;
 }
 
-LargeAudioFileTest::~LargeAudioFileTest()
-{
-}
+LargeAudioFileTest::~LargeAudioFileTest() {}
 
 std::string LargeAudioFileTest::title() const
 {
@@ -722,36 +735,33 @@ bool AudioIssue18597Test::init()
     {
         auto& layerSize = this->getContentSize();
 
-        //test case for https://github.com/cocos2d/cocos2d-x/issues/18597
-        this->schedule([=](float dt)
-                       {
-                           CCLOG("issues 18597 audio crash test");
-                           for (int i = 0; i< 2;++i)
-                           {
-                               auto id = AudioEngine::play2d("audio/MUS_BGM_Battle_Round1_v1.caf", true, 1.0f);
-                               this->runAction(Sequence::create(
-                                                                DelayTime::create(8.0f),
-                                                                CallFunc::create([=]()
-                                                                                 {
-                                                                                     AudioEngine::stop(id);
-                                                                                 }),
-                                                                nullptr
-                                                                ));
-                           }
-                       }, 2.0, 10000, 0.0, "audio test");
+        // test case for https://github.com/cocos2d/cocos2d-x/issues/18597
+        this->schedule(
+            [=](float dt) {
+                CCLOG("issues 18597 audio crash test");
+                for (int i = 0; i < 2; ++i)
+                {
+                    auto id = AudioEngine::play2d("audio/MUS_BGM_Battle_Round1_v1.caf", true, 1.0f);
+                    this->runAction(Sequence::create(DelayTime::create(8.0f),
+                                                     CallFunc::create([=]() { AudioEngine::stop(id); }), nullptr));
+                }
+            },
+            2.0, 10000, 0.0, "audio test");
         // add label to show the side effect of "UnqueueBuffers Before alSourceStop"
-        _time = 0.0;
+        _time          = 0.0;
         auto labelTime = Label::createWithBMFont("fonts/bitmapFontTest2.fnt", "time: ");
         labelTime->setPosition(layerSize.width * 0.5f, layerSize.height * 0.5f);
         labelTime->setTag(999);
         this->addChild(labelTime);
         // update label quickly
-        this->schedule([=](float dt){
-            _time += dt;
-            char timeString[20] = {0};
-            sprintf(timeString, "Time %2.2f", _time);
-            dynamic_cast<Label *>(this->getChildByTag(999))->setString(timeString);
-        }, 0.05, 1000000, 0, "update label quickly");
+        this->schedule(
+            [=](float dt) {
+                _time += dt;
+                char timeString[20] = {0};
+                sprintf(timeString, "Time %2.2f", _time);
+                dynamic_cast<Label*>(this->getChildByTag(999))->setString(timeString);
+            },
+            0.05, 1000000, 0, "update label quickly");
 
         return true;
     }
@@ -775,18 +785,19 @@ bool AudioIssue11143Test::init()
     {
         auto& layerSize = this->getContentSize();
 
-        auto playItem = TextButton::create("play", [](TextButton* button){
+        auto playItem = TextButton::create("play", [](TextButton* button) {
             AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3", true);
             AudioEngine::stopAll();
-            
-            auto audioId = AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3", true);
+
+            auto audioId  = AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3", true);
             char key[100] = {0};
             sprintf(key, "play another sound %d", audioId);
-            button->scheduleOnce([audioId](float dt){
-                AudioEngine::stop(audioId);
-                AudioEngine::play2d("audio/SoundEffectsFX009/FX083.mp3");
-            }, 0.3f, key);
-
+            button->scheduleOnce(
+                [audioId](float dt) {
+                    AudioEngine::stop(audioId);
+                    AudioEngine::play2d("audio/SoundEffectsFX009/FX083.mp3");
+                },
+                0.3f, key);
         });
         playItem->setPosition(layerSize.width * 0.5f, layerSize.height * 0.5f);
         addChild(playItem);
@@ -821,60 +832,83 @@ std::string AudioIssue11143Test::subtitle() const
 #define CC_PROFILER_RESET(__name__) ProfilingResetTimingBlock(__name__)
 
 #undef CC_PROFILER_START_CATEGORY
-#define CC_PROFILER_START_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingBeginTimingBlock(__name__); } while(0)
+#define CC_PROFILER_START_CATEGORY(__cat__, __name__) \
+    do                                                \
+    {                                                 \
+        if (__cat__)                                  \
+            ProfilingBeginTimingBlock(__name__);      \
+    } while (0)
 #undef CC_PROFILER_STOP_CATEGORY
-#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingEndTimingBlock(__name__); } while(0)
+#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) \
+    do                                               \
+    {                                                \
+        if (__cat__)                                 \
+            ProfilingEndTimingBlock(__name__);       \
+    } while (0)
 #undef CC_PROFILER_RESET_CATEGORY
-#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingResetTimingBlock(__name__); } while(0)
+#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) \
+    do                                                \
+    {                                                 \
+        if (__cat__)                                  \
+            ProfilingResetTimingBlock(__name__);      \
+    } while (0)
 
 #undef CC_PROFILER_START_INSTANCE
-#define CC_PROFILER_START_INSTANCE(__id__, __name__) do{ ProfilingBeginTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
+#define CC_PROFILER_START_INSTANCE(__id__, __name__)                                                      \
+    do                                                                                                    \
+    {                                                                                                     \
+        ProfilingBeginTimingBlock(String::createWithFormat("%08X - %s", __id__, __name__)->getCString()); \
+    } while (0)
 #undef CC_PROFILER_STOP_INSTANCE
-#define CC_PROFILER_STOP_INSTANCE(__id__, __name__) do{ ProfilingEndTimingBlock(    String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
+#define CC_PROFILER_STOP_INSTANCE(__id__, __name__)                                                     \
+    do                                                                                                  \
+    {                                                                                                   \
+        ProfilingEndTimingBlock(String::createWithFormat("%08X - %s", __id__, __name__)->getCString()); \
+    } while (0)
 #undef CC_PROFILER_RESET_INSTANCE
-#define CC_PROFILER_RESET_INSTANCE(__id__, __name__) do{ ProfilingResetTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0)
+#define CC_PROFILER_RESET_INSTANCE(__id__, __name__)                                                      \
+    do                                                                                                    \
+    {                                                                                                     \
+        ProfilingResetTimingBlock(String::createWithFormat("%08X - %s", __id__, __name__)->getCString()); \
+    } while (0)
 
 bool AudioPerformanceTest::init()
 {
     if (AudioEngineTestDemo::init())
     {
         std::vector<std::string> audioFiles = {
-            "audio/SoundEffectsFX009/FX081.mp3",
-            "audio/SoundEffectsFX009/FX082.mp3",
-            "audio/SoundEffectsFX009/FX083.mp3",
-            "audio/SoundEffectsFX009/FX084.mp3",
-            "audio/SoundEffectsFX009/FX085.mp3",
-            "audio/SoundEffectsFX009/FX086.mp3",
-            "audio/SoundEffectsFX009/FX087.mp3",
-            "audio/SoundEffectsFX009/FX088.mp3",
-            "audio/SoundEffectsFX009/FX089.mp3",
-            "audio/SoundEffectsFX009/FX090.mp3"
-        };
-        
+            "audio/SoundEffectsFX009/FX081.mp3", "audio/SoundEffectsFX009/FX082.mp3",
+            "audio/SoundEffectsFX009/FX083.mp3", "audio/SoundEffectsFX009/FX084.mp3",
+            "audio/SoundEffectsFX009/FX085.mp3", "audio/SoundEffectsFX009/FX086.mp3",
+            "audio/SoundEffectsFX009/FX087.mp3", "audio/SoundEffectsFX009/FX088.mp3",
+            "audio/SoundEffectsFX009/FX089.mp3", "audio/SoundEffectsFX009/FX090.mp3"};
+
         for (const auto& audioFile : audioFiles)
         {
             AudioEngine::preload(audioFile);
         }
-        
+
         auto& layerSize = this->getContentSize();
-        
-        auto playItem = TextButton::create("Start Test", [this, audioFiles](TextButton* button){
+
+        auto playItem = TextButton::create("Start Test", [this, audioFiles](TextButton* button) {
             button->setEnabled(false);
             static_cast<TextButton*>(getChildByName("DisplayButton"))->setEnabled(true);
-            
+
             unschedule("test");
-            schedule([audioFiles](float dt){
-                int index = cocos2d::random(0, (int)(audioFiles.size()-1));
-                CC_PROFILER_START("play2d");
-                AudioEngine::play2d(audioFiles[index]);
-                CC_PROFILER_STOP("play2d");
-            }, 0.25f, "test");
+            schedule(
+                [audioFiles](float dt) {
+                    int index = cocos2d::random(0, (int)(audioFiles.size() - 1));
+                    CC_PROFILER_START("play2d");
+                    AudioEngine::play2d(audioFiles[index]);
+                    CC_PROFILER_STOP("play2d");
+                },
+                0.25f, "test");
         });
         playItem->setPosition(layerSize.width * 0.5f, layerSize.height * 2 / 3);
         playItem->setName("PlayButton");
         addChild(playItem);
-        
-        auto displayItem = TextButton::create("Display Result", [this, playItem](TextButton* button){
+
+        auto displayItem = TextButton::create("Display Result", [this, playItem](TextButton* button) {
             unschedule("test");
             AudioEngine::stopAll();
             CC_PROFILER_DISPLAY_TIMERS();
@@ -885,10 +919,10 @@ bool AudioPerformanceTest::init()
         displayItem->setPosition(layerSize.width * 0.5f, layerSize.height / 3);
         displayItem->setName("DisplayButton");
         addChild(displayItem);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
@@ -914,7 +948,7 @@ void AudioSwitchStateTest::onEnter()
     // b. The latst audio test scene will stop all audio players,
     //   so if play any sound at init funciton, you can't herer
     // c. Please refer to AudioEngineTestDemo::onExit
-    // 
+    //
     AudioEngine::preload("audio/SoundEffectsFX009/FX081.mp3");
     AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3");
     AudioEngine::play2d("audio/LuckyDay.mp3");
@@ -932,7 +966,7 @@ std::string AudioSwitchStateTest::subtitle() const
 
 /////////////////////////////////////////////////////////////////////////
 
-void AudioSmallFileTest::onEnter() 
+void AudioSmallFileTest::onEnter()
 {
     AudioEngineTestDemo::onEnter();
 
@@ -942,7 +976,7 @@ void AudioSmallFileTest::onEnter()
     // b. The latst audio test scene will stop all audio players,
     //   so if play any sound at init funciton, you can't hear it
     // c. Please refer to AudioEngineTestDemo::onExit
-    // 
+    //
     AudioEngine::play2d("audio/SmallFile.mp3");
 }
 
@@ -967,7 +1001,7 @@ void AudioSmallFile2Test::onEnter()
     // b. The latst audio test scene will stop all audio players,
     //   so if play any sound at init funciton, you can't hear it
     // c. Please refer to AudioEngineTestDemo::onExit
-    // 
+    //
     AudioEngine::play2d("audio/SmallFile2.mp3");
 }
 
@@ -992,7 +1026,7 @@ void AudioSmallFile3Test::onEnter()
     // b. The latst audio test scene will stop all audio players,
     //   so if play any sound at init funciton, you can't hear it
     // c. Please refer to AudioEngineTestDemo::onExit
-    // 
+    //
     AudioEngine::play2d("audio/SmallFile3.mp3");
 }
 
@@ -1014,7 +1048,7 @@ void AudioPauseResumeAfterPlay::onEnter()
     int audioId = AudioEngine::play2d("audio/SoundEffectsFX009/FX082.mp3");
     AudioEngine::pause(audioId);
     AudioEngine::resume(audioId);
-    
+
     for (int i = 0; i < 10; ++i)
     {
         AudioEngine::pause(audioId);
@@ -1057,11 +1091,11 @@ void AudioPreloadSameFileMultipleTimes::onEnter()
 
     for (int i = 0; i < 10; ++i)
     {
-        AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed){
+        AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed) {
             log("111: %d preload %s", i, isSucceed ? "succeed" : "failed");
-            AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed){
+            AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed) {
                 log("222: %d preload %s", i, isSucceed ? "succeed" : "failed");
-                AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed){
+                AudioEngine::preload("audio/SoundEffectsFX009/FX082.mp3", [i](bool isSucceed) {
                     log("333: %d preload %s", i, isSucceed ? "succeed" : "failed");
                 });
             });
@@ -1082,33 +1116,33 @@ std::string AudioPreloadSameFileMultipleTimes::subtitle() const
 void AudioPlayFileInWritablePath::onEnter()
 {
     AudioEngineTestDemo::onEnter();
-    
-    auto fileUtils = FileUtils::getInstance();
+
+    auto fileUtils           = FileUtils::getInstance();
     std::string writablePath = fileUtils->getWritablePath();
-    std::string musicFile = "background.mp3";
+    std::string musicFile    = "background.mp3";
     std::string saveFilePath = writablePath + "background_in_writable_dir.mp3";
-    
+
     _oldSearchPaths = fileUtils->getOriginalSearchPaths();
     fileUtils->addSearchPath(writablePath, true);
 
     if (!fileUtils->isFileExist(saveFilePath))
     {
         Data data = fileUtils->getDataFromFile(musicFile);
-        FILE* fp = fopen(saveFilePath.c_str(), "wb");
+        FILE* fp  = fopen(saveFilePath.c_str(), "wb");
         if (fp != nullptr)
         {
             fwrite(data.getBytes(), data.getSize(), 1, fp);
             fclose(fp);
         }
     }
-    
+
     AudioEngine::play2d(saveFilePath);
 }
 
 void AudioPlayFileInWritablePath::onExit()
 {
     AudioEngineTestDemo::onExit();
-    
+
     FileUtils::getInstance()->setSearchPaths(_oldSearchPaths);
 }
 
@@ -1127,7 +1161,7 @@ void AudioPlayInFinishedCB::onEnter()
 {
     AudioEngineTestDemo::onEnter();
 
-    auto item = MenuItemFont::create("Play 3 files one by one", [this](Ref* sender){
+    auto item = MenuItemFont::create("Play 3 files one by one", [this](Ref* sender) {
         playMusic("background.mp3");
         playMusic("background.mp3");
         playMusic("background.mp3");
@@ -1155,23 +1189,25 @@ std::string AudioPlayInFinishedCB::subtitle() const
     return "After played over, click again, should also hear 3 audios";
 }
 
-void AudioPlayInFinishedCB::doPlay(const std::string& filename)
+void AudioPlayInFinishedCB::doPlay(std::string_view filename)
 {
     int playID = AudioEngine::play2d(filename, false, 1);
-    AudioEngine::setFinishCallback(playID, [this](int finishID, const std::string& file){
+    AudioEngine::setFinishCallback(playID, [this](int finishID, std::string_view file) {
         _playList.pop_front();
-        log("finish music %s",file.c_str());
-        if (!_playList.empty()) {
-            const std::string& name = _playList.front();
+        log("finish music %s", file.data());
+        if (!_playList.empty())
+        {
+            std::string_view name = _playList.front();
             doPlay(name);
         }
     });
 }
 
-void AudioPlayInFinishedCB::playMusic(const std::string& filename)
+void AudioPlayInFinishedCB::playMusic(std::string_view filename)
 {
-    _playList.push_back(filename);
-    if (_playList.size() == 1) {
+    _playList.push_back(std::string{filename});
+    if (_playList.size() == 1)
+    {
         doPlay(filename);
     }
 }
@@ -1182,9 +1218,7 @@ void AudioUncacheInFinishedCB::onEnter()
     AudioEngineTestDemo::onEnter();
 
     int id = AudioEngine::play2d("background.mp3");
-    AudioEngine::setFinishCallback(id, [](int i, const std::string& str){
-        AudioEngine::uncacheAll();
-    });
+    AudioEngine::setFinishCallback(id, [](int i, std::string_view str) { AudioEngine::uncacheAll(); });
 }
 
 void AudioUncacheInFinishedCB::onExit()
@@ -1201,5 +1235,3 @@ std::string AudioUncacheInFinishedCB::subtitle() const
 {
     return "Should not crash";
 }
-
-
diff --git a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
index 9152cd737a57..f5f4e2fbff16 100644
--- a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
+++ b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
@@ -27,12 +27,12 @@
 #include "platform/CCPlatformConfig.h"
 
 #ifndef __NEWAUDIOENGINE_TEST_H_
-#define __NEWAUDIOENGINE_TEST_H_
+#    define __NEWAUDIOENGINE_TEST_H_
 
-#include "cocos2d.h"
-#include "../BaseTest.h"
+#    include "cocos2d.h"
+#    include "../BaseTest.h"
 
-#include "audio/include/AudioEngine.h"
+#    include "audio/include/AudioEngine.h"
 
 DEFINE_TEST_SUITE(AudioEngineTests);
 
@@ -40,7 +40,7 @@ class AudioEngineTestDemo : public TestCase
 {
 public:
     AudioEngineTestDemo();
-    
+
     virtual std::string title() const override;
     virtual void onExit() override;
 
@@ -54,22 +54,22 @@ class AudioControlTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioControlTest);
-    
+
     virtual ~AudioControlTest();
-    
+
     virtual bool init() override;
-    
+
     virtual void update(float dt) override;
-    
+
     virtual std::string title() const override;
-    
+
 private:
     int _audioID;
     bool _loopEnabled;
     float _volume;
     float _duration;
     float _timeRatio;
-    
+
     void* _playItem;
     void* _timeSlider;
     bool _updateTimeSlider;
@@ -103,16 +103,17 @@ class PlaySimultaneouslyTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(PlaySimultaneouslyTest);
-    
+
     virtual ~PlaySimultaneouslyTest();
-    
+
     virtual bool init() override;
-    
+
     virtual std::string title() const override;
+
 private:
     static const int TEST_COUNT = 10;
     std::string _files[TEST_COUNT];
-    
+
     void* _playItem;
     int _playingcount;
 };
@@ -121,21 +122,21 @@ class AudioProfileTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioProfileTest);
-    
+
     virtual ~AudioProfileTest();
-    
+
     virtual bool init() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void update(float dt) override;
-    
+
 private:
     static const int FILE_COUNT = 2;
     std::string _files[FILE_COUNT];
     cocos2d::AudioProfile _audioProfile;
-    
+
     int _audioCount;
     cocos2d::Label* _showLabel;
     float _time;
@@ -147,31 +148,29 @@ class InvalidAudioFileTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(InvalidAudioFileTest);
-    
+
     virtual ~InvalidAudioFileTest();
-    
+
     virtual bool init() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
-   
 };
 
 class LargeAudioFileTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(LargeAudioFileTest);
-    
+
     virtual ~LargeAudioFileTest();
-    
+
     virtual bool init() override;
-    
+
     virtual std::string title() const override;
-    
+
 private:
-    
 };
 
 class AudioLoadTest : public AudioEngineTestDemo
@@ -212,9 +211,9 @@ class AudioPerformanceTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioPerformanceTest);
-    
+
     virtual bool init() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -223,7 +222,7 @@ class AudioSwitchStateTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioSwitchStateTest);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -233,9 +232,9 @@ class AudioSmallFileTest : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioSmallFileTest);
-    
+
     void onEnter() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -266,9 +265,9 @@ class AudioPauseResumeAfterPlay : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioPauseResumeAfterPlay);
-    
+
     virtual void onEnter() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -288,9 +287,9 @@ class AudioPreloadSameFileMultipleTimes : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioPreloadSameFileMultipleTimes);
-    
+
     virtual void onEnter() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -299,13 +298,13 @@ class AudioPlayFileInWritablePath : public AudioEngineTestDemo
 {
 public:
     CREATE_FUNC(AudioPlayFileInWritablePath);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     std::vector<std::string> _oldSearchPaths;
 };
@@ -322,8 +321,8 @@ class AudioPlayInFinishedCB : public AudioEngineTestDemo
     virtual std::string subtitle() const override;
 
 private:
-    void doPlay(const std::string& filename);
-    void playMusic(const std::string& filename);
+    void doPlay(std::string_view filename);
+    void playMusic(std::string_view filename);
     std::list<std::string> _playList;
 };
 
diff --git a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
index 7565c9fd9764..ee9c04310db3 100644
--- a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
+++ b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -71,33 +71,33 @@ void TouchableSpriteTest::onEnter()
     EventDispatcherTestDemo::onEnter();
 
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto containerForSprite1 = Node::create();
-    auto sprite1 = Sprite::create("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 80.0f));
+    auto sprite1             = Sprite::create("Images/CyanSquare.png");
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 80.0f));
     containerForSprite1->addChild(sprite1);
     addChild(containerForSprite1, 10);
-    
+
     auto sprite2 = Sprite::create("Images/MagentaSquare.png");
-    sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite2, 20);
-    
+
     auto sprite3 = Sprite::create("Images/YellowSquare.png");
     sprite3->setPosition(Vec2(0, 0));
     sprite2->addChild(sprite3, 1);
-    
+
     // Make sprite1 touchable
     auto listener1 = EventListenerTouchOneByOne::create();
     listener1->setSwallowTouches(true);
-    
-    listener1->onTouchBegan = [](Touch* touch, Event* event){
+
+    listener1->onTouchBegan = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
-        
+
         Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation());
-        Size s = target->getContentSize();
-        Rect rect = Rect(0, 0, s.width, s.height);
-        
+        Size s              = target->getContentSize();
+        Rect rect           = Rect(0, 0, s.width, s.height);
+
         if (rect.containsPoint(locationInNode))
         {
             log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y);
@@ -106,13 +106,13 @@ void TouchableSpriteTest::onEnter()
         }
         return false;
     };
-    
-    listener1->onTouchMoved = [](Touch* touch, Event* event){
+
+    listener1->onTouchMoved = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         target->setPosition(target->getPosition() + touch->getDelta());
     };
-    
-    listener1->onTouchEnded = [=](Touch* touch, Event* event){
+
+    listener1->onTouchEnded = [=](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         log("sprite onTouchesEnded.. ");
         target->setOpacity(255);
@@ -120,39 +120,36 @@ void TouchableSpriteTest::onEnter()
         {
             containerForSprite1->setLocalZOrder(100);
         }
-        else if(target == sprite1)
+        else if (target == sprite1)
         {
             containerForSprite1->setLocalZOrder(0);
         }
     };
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite3);
-    
 
-    auto removeAllTouchItem = MenuItemFont::create("Remove All Touch Listeners", [this](Ref* sender){
+    auto removeAllTouchItem = MenuItemFont::create("Remove All Touch Listeners", [this](Ref* sender) {
         auto senderItem = static_cast<MenuItemFont*>(sender);
         senderItem->setString("Only Next item could be clicked");
-        
+
         _eventDispatcher->removeEventListenersForType(EventListener::Type::TOUCH_ONE_BY_ONE);
-        
-        auto nextItem = MenuItemFont::create("Next", [=](Ref* sender){
-            getTestSuite()->enterNextTest();
-        });
-        
+
+        auto nextItem = MenuItemFont::create("Next", [=](Ref* sender) { getTestSuite()->enterNextTest(); });
+
         nextItem->setFontSizeObj(16);
         nextItem->setPosition(VisibleRect::right() + Vec2(-100.0f, -30.0f));
-        
+
         auto menu2 = Menu::create(nextItem, nullptr);
         menu2->setPosition(Vec2(0, 0));
         menu2->setAnchorPoint(Vec2(0, 0));
         this->addChild(menu2);
     });
-    
+
     removeAllTouchItem->setFontSizeObj(16);
     removeAllTouchItem->setPosition(VisibleRect::right() + Vec2(-100.0f, 0.0f));
-    
+
     auto menu = Menu::create(removeAllTouchItem, nullptr);
     menu->setPosition(Vec2(0, 0));
     menu->setAnchorPoint(Vec2(0, 0));
@@ -189,12 +186,7 @@ class TouchableSprite : public Sprite
     }
 
 protected:
-    TouchableSprite(int priority)
-    : _listener(nullptr)
-    , _fixedPriority(priority)
-    , _removeListenerOnTouchEnded(false)
-    {
-    }
+    TouchableSprite(int priority) : _listener(nullptr), _fixedPriority(priority), _removeListenerOnTouchEnded(false) {}
 
     virtual bool init() override
     {
@@ -203,12 +195,12 @@ class TouchableSprite : public Sprite
 
         auto listener = EventListenerTouchOneByOne::create();
         listener->setSwallowTouches(true);
-        
-        listener->onTouchBegan = [this](Touch* touch, Event* event){
+
+        listener->onTouchBegan = [this](Touch* touch, Event* event) {
             Vec2 locationInNode = this->convertToNodeSpace(touch->getLocation());
-            Size s = this->getContentSize();
-            Rect rect = Rect(0, 0, s.width, s.height);
-            
+            Size s              = this->getContentSize();
+            Rect rect           = Rect(0, 0, s.width, s.height);
+
             if (rect.containsPoint(locationInNode))
             {
                 log("TouchableSprite: onTouchBegan ...");
@@ -217,18 +209,18 @@ class TouchableSprite : public Sprite
             }
             return false;
         };
-        
-        listener->onTouchEnded = [this](Touch* touch, Event* event){
+
+        listener->onTouchEnded = [this](Touch* touch, Event* event) {
             log("TouchableSprite: onTouchEnded ...");
             this->setColor(Color3B::WHITE);
-            
+
             if (_removeListenerOnTouchEnded)
             {
                 _eventDispatcher->removeEventListener(_listener);
                 _listener = nullptr;
             }
         };
-        
+
         if (_fixedPriority != 0)
         {
             _eventDispatcher->addEventListenerWithFixedPriority(listener, _fixedPriority);
@@ -241,21 +233,22 @@ class TouchableSprite : public Sprite
         _listener = listener;
         return true;
     }
-    
+
     virtual void onExit() override
     {
         if (_listener != nullptr && _fixedPriority != 0)
         {
             _eventDispatcher->removeEventListener(_listener);
         }
-        
+
         Sprite::onExit();
     }
+
 public:
     void removeListenerOnTouchEnded(bool toRemove) { _removeListenerOnTouchEnded = toRemove; };
-    
+
     inline EventListener* getListener() { return _listener; };
-    
+
 private:
     EventListener* _listener;
     int _fixedPriority;
@@ -265,25 +258,24 @@ class TouchableSprite : public Sprite
 void FixedPriorityTest::onEnter()
 {
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto sprite1 = TouchableSprite::create(30);
     sprite1->setTexture("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 40.0f));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 40.0f));
     addChild(sprite1, 10);
-    
+
     auto sprite2 = TouchableSprite::create(20);
     sprite2->setTexture("Images/MagentaSquare.png");
-    sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite2, 20);
-    
+
     auto sprite3 = TouchableSprite::create(10);
     sprite3->setTexture("Images/YellowSquare.png");
     sprite3->setPosition(Vec2(0, 0));
     sprite2->addChild(sprite3, 1);
-
 }
 
 std::string FixedPriorityTest::title() const
@@ -300,26 +292,26 @@ std::string FixedPriorityTest::subtitle() const
 void RemoveListenerWhenDispatching::onEnter()
 {
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto sprite1 = Sprite::create("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite1, 10);
-    
+
     // Make sprite1 touchable
     auto listener1 = EventListenerTouchOneByOne::create();
     listener1->setSwallowTouches(true);
     setUserObject(listener1);
-    
+
     std::shared_ptr<bool> firstClick(new bool(true));
-    
-    listener1->onTouchBegan = [=](Touch* touch, Event* event){
+
+    listener1->onTouchBegan = [=](Touch* touch, Event* event) {
         Vec2 locationInNode = sprite1->convertToNodeSpace(touch->getLocation());
-        Size s = sprite1->getContentSize();
-        Rect rect = Rect(0, 0, s.width, s.height);
-        
+        Size s              = sprite1->getContentSize();
+        Rect rect           = Rect(0, 0, s.width, s.height);
+
         if (rect.containsPoint(locationInNode))
         {
             sprite1->setColor(Color3B::RED);
@@ -327,36 +319,36 @@ void RemoveListenerWhenDispatching::onEnter()
         }
         return false;
     };
-    
-    listener1->onTouchEnded = [=](Touch* touch, Event* event){
-        sprite1->setColor(Color3B::WHITE);
-    };
-    
+
+    listener1->onTouchEnded = [=](Touch* touch, Event* event) { sprite1->setColor(Color3B::WHITE); };
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
-    
+
     auto statusLabel = Label::createWithSystemFont("The sprite could be touched!", "", 20);
-    statusLabel->setPosition(origin + Vec2(size.width/2, size.height-90));
+    statusLabel->setPosition(origin + Vec2(size.width / 2, size.height - 90));
     addChild(statusLabel);
     std::shared_ptr<bool> enable(new bool(true));
     // Enable/Disable item
-    auto toggleItem = MenuItemToggle::createWithCallback([=](Ref* sender){
-        if (*enable)
-        {
-            _eventDispatcher->removeEventListener(listener1);
-            statusLabel->setString("The sprite could not be touched!");
-            
-            (*enable) = false;
-        }
-        else
-        {
-            _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
-            statusLabel->setString("The sprite could be touched!");
+    auto toggleItem = MenuItemToggle::createWithCallback(
+        [=](Ref* sender) {
+            if (*enable)
+            {
+                _eventDispatcher->removeEventListener(listener1);
+                statusLabel->setString("The sprite could not be touched!");
 
-            (*enable) = true;
-        }
-    }, MenuItemFont::create("Enabled"), MenuItemFont::create("Disabled"), nullptr);
-    
-    toggleItem->setPosition(origin + Vec2(size.width/2, 80.0f));
+                (*enable) = false;
+            }
+            else
+            {
+                _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
+                statusLabel->setString("The sprite could be touched!");
+
+                (*enable) = true;
+            }
+        },
+        MenuItemFont::create("Enabled"), MenuItemFont::create("Disabled"), nullptr);
+
+    toggleItem->setPosition(origin + Vec2(size.width / 2, 80.0f));
     auto menu = Menu::create(toggleItem, nullptr);
     menu->setPosition(Vec2(0.0f, 0.0f));
     menu->setAnchorPoint(Vec2(0.0f, 0.0f));
@@ -377,27 +369,27 @@ std::string RemoveListenerWhenDispatching::subtitle() const
 void CustomEventTest::onEnter()
 {
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     MenuItemFont::setFontSize(20);
-    
+
     auto statusLabel = Label::createWithSystemFont("No custom event 1 received!", "", 20);
-    statusLabel->setPosition(origin + Vec2(size.width/2, size.height-90));
+    statusLabel->setPosition(origin + Vec2(size.width / 2, size.height - 90));
     addChild(statusLabel);
 
-    _listener = EventListenerCustom::create("game_custom_event1", [=](EventCustom* event){
+    _listener = EventListenerCustom::create("game_custom_event1", [=](EventCustom* event) {
         std::string str("Custom event 1 received, ");
         char* buf = static_cast<char*>(event->getUserData());
         str += buf;
         str += " times";
         statusLabel->setString(str.c_str());
     });
-    
+
     _eventDispatcher->addEventListenerWithFixedPriority(_listener, 1);
-    
-    auto sendItem = MenuItemFont::create("Send Custom Event 1", [=](Ref* sender){
+
+    auto sendItem = MenuItemFont::create("Send Custom Event 1", [=](Ref* sender) {
         static int count = 0;
         ++count;
         char* buf = new char[10];
@@ -407,23 +399,23 @@ void CustomEventTest::onEnter()
         _eventDispatcher->dispatchEvent(&event);
         CC_SAFE_DELETE_ARRAY(buf);
     });
-    sendItem->setPosition(origin + Vec2(size.width/2, size.height/2));
-    
+    sendItem->setPosition(origin + Vec2(size.width / 2, size.height / 2));
+
     auto statusLabel2 = Label::createWithSystemFont("No custom event 2 received!", "", 20);
-    statusLabel2->setPosition(origin + Vec2(size.width/2, size.height-120));
+    statusLabel2->setPosition(origin + Vec2(size.width / 2, size.height - 120));
     addChild(statusLabel2);
-    
-    _listener2 = EventListenerCustom::create("game_custom_event2", [=](EventCustom* event){
+
+    _listener2 = EventListenerCustom::create("game_custom_event2", [=](EventCustom* event) {
         std::string str("Custom event 2 received, ");
         char* buf = static_cast<char*>(event->getUserData());
         str += buf;
         str += " times";
         statusLabel2->setString(str.c_str());
     });
-    
+
     _eventDispatcher->addEventListenerWithFixedPriority(_listener2, 1);
-    
-    auto sendItem2 = MenuItemFont::create("Send Custom Event 2", [=](Ref* sender){
+
+    auto sendItem2 = MenuItemFont::create("Send Custom Event 2", [=](Ref* sender) {
         static int count = 0;
         ++count;
         char* buf = new char[10];
@@ -433,8 +425,8 @@ void CustomEventTest::onEnter()
         _eventDispatcher->dispatchEvent(&event);
         CC_SAFE_DELETE_ARRAY(buf);
     });
-    sendItem2->setPosition(origin + Vec2(size.width/2, size.height/2 - 40));
-    
+    sendItem2->setPosition(origin + Vec2(size.width / 2, size.height / 2 - 40));
+
     auto menu = Menu::create(sendItem, sendItem2, nullptr);
     menu->setPosition(Vec2(0, 0));
     menu->setAnchorPoint(Vec2(0, 0));
@@ -462,29 +454,29 @@ std::string CustomEventTest::subtitle() const
 void LabelKeyboardEventTest::onEnter()
 {
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto statusLabel = Label::createWithSystemFont("No keyboard event received!", "", 20);
-    statusLabel->setPosition(origin + Vec2(size.width/2, size.height/2));
+    statusLabel->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(statusLabel);
-        
-    auto listener = EventListenerKeyboard::create();
-    listener->onKeyPressed = [](EventKeyboard::KeyCode keyCode, Event* event){
+
+    auto listener          = EventListenerKeyboard::create();
+    listener->onKeyPressed = [](EventKeyboard::KeyCode keyCode, Event* event) {
         char buf[100] = {0};
         sprintf(buf, "Key %d was pressed!", (int)keyCode);
         auto label = static_cast<Label*>(event->getCurrentTarget());
         label->setString(buf);
     };
-    
-    listener->onKeyReleased = [](EventKeyboard::KeyCode keyCode, Event* event){
+
+    listener->onKeyReleased = [](EventKeyboard::KeyCode keyCode, Event* event) {
         char buf[100] = {0};
         sprintf(buf, "Key %d was released!", (int)keyCode);
         auto label = static_cast<Label*>(event->getCurrentTarget());
         label->setString(buf);
     };
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, statusLabel);
 }
 
@@ -502,37 +494,39 @@ std::string LabelKeyboardEventTest::subtitle() const
 void SpriteAccelerationEventTest::onEnter()
 {
 #define FIX_POS(_pos, _min, _max) \
-if (_pos < _min)        \
-_pos = _min;        \
-else if (_pos > _max)   \
-_pos = _max;        \
+    if (_pos < _min)              \
+        _pos = _min;              \
+    else if (_pos > _max)         \
+        _pos = _max;
 
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     Device::setAccelerometerEnabled(true);
-    
+
     auto sprite = Sprite::create(s_Ball);
-    sprite->setPosition(origin + Vec2(size.width/2, size.height/2));
+    sprite->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite);
-    
-    auto listener = EventListenerAcceleration::create([=](Acceleration* acc, Event* event){
-        auto ballSize  = sprite->getContentSize();
-        
-        auto ptNow  = sprite->getPosition();
-        
+
+    auto listener = EventListenerAcceleration::create([=](Acceleration* acc, Event* event) {
+        auto ballSize = sprite->getContentSize();
+
+        auto ptNow = sprite->getPosition();
+
         log("acc: x = %lf, y = %lf", acc->x, acc->y);
-        
+
         ptNow.x += acc->x * 9.81f;
         ptNow.y += acc->y * 9.81f;
-        
-        FIX_POS(ptNow.x, (VisibleRect::left().x+ballSize.width / 2.0), (VisibleRect::right().x - ballSize.width / 2.0f));
-        FIX_POS(ptNow.y, (VisibleRect::bottom().y+ballSize.height / 2.0), (VisibleRect::top().y - ballSize.height / 2.0f));
+
+        FIX_POS(ptNow.x, (VisibleRect::left().x + ballSize.width / 2.0),
+                (VisibleRect::right().x - ballSize.width / 2.0f));
+        FIX_POS(ptNow.y, (VisibleRect::bottom().y + ballSize.height / 2.0),
+                (VisibleRect::top().y - ballSize.height / 2.0f));
         sprite->setPosition(ptNow);
     });
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, sprite);
 }
 
@@ -556,27 +550,27 @@ std::string SpriteAccelerationEventTest::subtitle() const
 void RemoveAndRetainNodeTest::onEnter()
 {
     _spriteSaved = false;
-    
+
     EventDispatcherTestDemo::onEnter();
-    
+
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     _sprite = Sprite::create("Images/CyanSquare.png");
-    _sprite->setPosition(origin+Vec2(size.width/2, size.height/2));
+    _sprite->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(_sprite, 10);
-    
+
     // Make sprite1 touchable
     auto listener1 = EventListenerTouchOneByOne::create();
     listener1->setSwallowTouches(true);
-    
-    listener1->onTouchBegan = [](Touch* touch, Event* event){
+
+    listener1->onTouchBegan = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
-        
+
         Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation());
-        Size s = target->getContentSize();
-        Rect rect = Rect(0, 0, s.width, s.height);
-        
+        Size s              = target->getContentSize();
+        Rect rect           = Rect(0, 0, s.width, s.height);
+
         if (rect.containsPoint(locationInNode))
         {
             log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y);
@@ -585,34 +579,31 @@ void RemoveAndRetainNodeTest::onEnter()
         }
         return false;
     };
-    
-    listener1->onTouchMoved = [](Touch* touch, Event* event){
+
+    listener1->onTouchMoved = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         target->setPosition(target->getPosition() + touch->getDelta());
     };
-    
-    listener1->onTouchEnded = [=](Touch* touch, Event* event){
+
+    listener1->onTouchEnded = [=](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         log("sprite onTouchesEnded.. ");
         target->setOpacity(255);
     };
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, _sprite);
-    
-    this->runAction(Sequence::create(DelayTime::create(5.0f),
-                                     CallFunc::create([this](){
-                                        _spriteSaved = true;
-                                        _sprite->retain();
-                                        _sprite->removeFromParentAndCleanup(false);
+
+    this->runAction(Sequence::create(DelayTime::create(5.0f), CallFunc::create([this]() {
+                                         _spriteSaved = true;
+                                         _sprite->retain();
+                                         _sprite->removeFromParentAndCleanup(false);
                                      }),
-                                     DelayTime::create(5.0f),
-                                     CallFunc::create([this](){
-                                        _spriteSaved = false;
-                                        this->addChild(_sprite);
-                                        _sprite->release();
+                                     DelayTime::create(5.0f), CallFunc::create([this]() {
+                                         _spriteSaved = false;
+                                         this->addChild(_sprite);
+                                         _sprite->release();
                                      }),
-                                     nullptr
-                                     ));
+                                     nullptr));
 }
 
 void RemoveAndRetainNodeTest::onExit()
@@ -634,66 +625,65 @@ std::string RemoveAndRetainNodeTest::subtitle() const
     return "Sprite should be removed after 5s, add to scene again after 5s";
 }
 
-//RemoveListenerAfterAddingTest
+// RemoveListenerAfterAddingTest
 void RemoveListenerAfterAddingTest::onEnter()
 {
     EventDispatcherTestDemo::onEnter();
 
-    auto item1 = MenuItemFont::create("Click Me 1", [this](Ref* sender){
-        auto listener = EventListenerTouchOneByOne::create();
-        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
+    auto item1 = MenuItemFont::create("Click Me 1", [this](Ref* sender) {
+        auto listener          = EventListenerTouchOneByOne::create();
+        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool {
             CCASSERT(false, "Should not come here!");
             return true;
         };
-        
+
         _eventDispatcher->addEventListenerWithFixedPriority(listener, -1);
         _eventDispatcher->removeEventListener(listener);
     });
 
     item1->setPosition(VisibleRect::center() + Vec2(0.0f, 80.0f));
-    
-    auto addNextButton = [this](){
-        auto next = MenuItemFont::create("Please Click Me To Reset!", [this](Ref* sender){
-            getTestSuite()->restartCurrTest();
-        });
+
+    auto addNextButton = [this]() {
+        auto next = MenuItemFont::create("Please Click Me To Reset!",
+                                         [this](Ref* sender) { getTestSuite()->restartCurrTest(); });
         next->setPosition(VisibleRect::center() + Vec2(0.0f, -40.0f));
-        
+
         auto menu = Menu::create(next, nullptr);
         menu->setPosition(VisibleRect::leftBottom());
         menu->setAnchorPoint(Vec2::ZERO);
         this->addChild(menu);
     };
-    
-    auto item2 = MenuItemFont::create("Click Me 2", [=](Ref* sender){
-        auto listener = EventListenerTouchOneByOne::create();
-        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
+
+    auto item2 = MenuItemFont::create("Click Me 2", [=](Ref* sender) {
+        auto listener          = EventListenerTouchOneByOne::create();
+        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool {
             CCASSERT(false, "Should not come here!");
             return true;
         };
-        
+
         _eventDispatcher->addEventListenerWithFixedPriority(listener, -1);
         _eventDispatcher->removeEventListenersForType(EventListener::Type::TOUCH_ONE_BY_ONE);
-        
+
         addNextButton();
     });
-    
+
     item2->setPosition(VisibleRect::center() + Vec2(0.0f, 40.0f));
-    
-    auto item3 = MenuItemFont::create("Click Me 3", [=](Ref* sender){
-        auto listener = EventListenerTouchOneByOne::create();
-        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
+
+    auto item3 = MenuItemFont::create("Click Me 3", [=](Ref* sender) {
+        auto listener          = EventListenerTouchOneByOne::create();
+        listener->onTouchBegan = [](Touch* touch, Event* event) -> bool {
             CCASSERT(false, "Should not come here!");
             return true;
         };
-        
+
         _eventDispatcher->addEventListenerWithFixedPriority(listener, -1);
         _eventDispatcher->removeAllEventListeners();
-        
+
         addNextButton();
     });
-    
+
     item3->setPosition(VisibleRect::center());
-    
+
     auto menu = Menu::create(item1, item2, item3, nullptr);
     menu->setPosition(VisibleRect::leftBottom());
     menu->setAnchorPoint(Vec2::ZERO);
@@ -716,18 +706,10 @@ std::string RemoveListenerAfterAddingTest::subtitle() const
     return "Should not crash!";
 }
 
-
 //
-//DirectorEventTest
+// DirectorEventTest
 //
-DirectorEventTest::DirectorEventTest()
-:_count1(0)
-,_count2(0)
-,_count3(0)
-,_count4(0)
-{
-
-}
+DirectorEventTest::DirectorEventTest() : _count1(0), _count2(0), _count3(0), _count4(0) {}
 
 void DirectorEventTest::onEnter()
 {
@@ -739,38 +721,40 @@ void DirectorEventTest::onEnter()
 
     _label1 = Label::createWithTTF(ttfConfig, "Update: 0");
     _label1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _label1->setPosition(30,s.height/2 + 60);
+    _label1->setPosition(30, s.height / 2 + 60);
     this->addChild(_label1);
 
     _label2 = Label::createWithTTF(ttfConfig, "Visit: 0");
     _label2->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _label2->setPosition(30,s.height/2 + 20);
+    _label2->setPosition(30, s.height / 2 + 20);
     this->addChild(_label2);
 
     _label3 = Label::createWithTTF(ttfConfig, "Draw: 0");
     _label3->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _label3->setPosition(30,30);
-    _label3->setPosition(30,s.height/2 - 20);
+    _label3->setPosition(30, 30);
+    _label3->setPosition(30, s.height / 2 - 20);
     this->addChild(_label3);
 
     _label4 = Label::createWithTTF(ttfConfig, "Projection: 0");
     _label4->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _label4->setPosition(30,30);
-    _label4->setPosition(30,s.height/2 - 60);
+    _label4->setPosition(30, 30);
+    _label4->setPosition(30, s.height / 2 - 60);
     this->addChild(_label4);
 
     auto dispatcher = Director::getInstance()->getEventDispatcher();
 
-    _event1 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_UPDATE, std::bind(&DirectorEventTest::onEvent1, this, std::placeholders::_1));
-    _event2 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_VISIT, std::bind(&DirectorEventTest::onEvent2, this, std::placeholders::_1));
-    _event3 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_DRAW, [&](EventCustom *event) {
+    _event1 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_UPDATE,
+                                                 std::bind(&DirectorEventTest::onEvent1, this, std::placeholders::_1));
+    _event2 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_VISIT,
+                                                 std::bind(&DirectorEventTest::onEvent2, this, std::placeholders::_1));
+    _event3 = dispatcher->addCustomEventListener(Director::EVENT_AFTER_DRAW, [&](EventCustom* event) {
         char buf[20];
-        snprintf(buf, sizeof(buf)-1, "Draw: %d", _count3++);
+        snprintf(buf, sizeof(buf) - 1, "Draw: %d", _count3++);
         _label3->setString(buf);
     });
-    _event4 = dispatcher->addCustomEventListener(Director::EVENT_PROJECTION_CHANGED, [&](EventCustom *event) {
+    _event4 = dispatcher->addCustomEventListener(Director::EVENT_PROJECTION_CHANGED, [&](EventCustom* event) {
         char buf[20];
-        snprintf(buf, sizeof(buf)-1, "Projection: %d", _count4++);
+        snprintf(buf, sizeof(buf) - 1, "Projection: %d", _count4++);
         _label4->setString(buf);
     });
 
@@ -787,7 +771,8 @@ void DirectorEventTest::update(float dt)
     static float time = 0;
 
     time += dt;
-    if(time > 0.5) {
+    if (time > 0.5)
+    {
         Director::getInstance()->setProjection(Director::Projection::_2D);
         time = 0;
     }
@@ -811,21 +796,20 @@ void DirectorEventTest::onExit()
     _event4->release();
 }
 
-void DirectorEventTest::onEvent1(EventCustom *event)
+void DirectorEventTest::onEvent1(EventCustom* event)
 {
     char buf[20];
-    snprintf(buf, sizeof(buf)-1, "Update: %d", _count1++);
+    snprintf(buf, sizeof(buf) - 1, "Update: %d", _count1++);
     _label1->setString(buf);
 }
 
-void DirectorEventTest::onEvent2(EventCustom *event)
+void DirectorEventTest::onEvent2(EventCustom* event)
 {
     char buf[20];
-    snprintf(buf, sizeof(buf)-1, "Visit: %d", _count2++);
+    snprintf(buf, sizeof(buf) - 1, "Visit: %d", _count2++);
     _label2->setString(buf);
 }
 
-
 std::string DirectorEventTest::title() const
 {
     return "Testing Director Events";
@@ -837,21 +821,19 @@ std::string DirectorEventTest::subtitle() const
 }
 
 // GlobalZTouchTest
-GlobalZTouchTest::GlobalZTouchTest()
-: _sprite(nullptr)
-, _accum(0)
+GlobalZTouchTest::GlobalZTouchTest() : _sprite(nullptr), _accum(0)
 {
-    
+
     auto listener = EventListenerTouchOneByOne::create();
     listener->setSwallowTouches(true);
-    
-    listener->onTouchBegan = [](Touch* touch, Event* event){
+
+    listener->onTouchBegan = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
-        
+
         Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation());
-        Size s = target->getContentSize();
-        Rect rect = Rect(0, 0, s.width, s.height);
-        
+        Size s              = target->getContentSize();
+        Rect rect           = Rect(0, 0, s.width, s.height);
+
         if (rect.containsPoint(locationInNode))
         {
             log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y);
@@ -860,26 +842,26 @@ GlobalZTouchTest::GlobalZTouchTest()
         }
         return false;
     };
-    
-    listener->onTouchMoved = [](Touch* touch, Event* event){
+
+    listener->onTouchMoved = [](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         target->setPosition(target->getPosition() + touch->getDelta());
     };
-    
-    listener->onTouchEnded = [=](Touch* touch, Event* event){
+
+    listener->onTouchEnded = [=](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         log("sprite onTouchesEnded.. ");
         target->setOpacity(255);
     };
-    
+
     const int SPRITE_COUNT = 8;
-    
+
     for (int i = 0; i < SPRITE_COUNT; i++)
     {
-        Sprite *sprite;
-        if(i==4)
+        Sprite* sprite;
+        if (i == 4)
         {
-            sprite = Sprite::create("Images/CyanSquare.png");
+            sprite  = Sprite::create("Images/CyanSquare.png");
             _sprite = sprite;
             _sprite->setGlobalZOrder(-1);
         }
@@ -887,22 +869,24 @@ GlobalZTouchTest::GlobalZTouchTest()
         {
             sprite = Sprite::create("Images/YellowSquare.png");
         }
-        
+
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener->clone(), sprite);
-        
+
         this->addChild(sprite);
-        
+
         Size visibleSize = Director::getInstance()->getVisibleSize();
-        sprite->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i, VisibleRect::center().y);
+        sprite->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i,
+                            VisibleRect::center().y);
     }
-    
+
     this->scheduleUpdate();
 }
 
 void GlobalZTouchTest::update(float dt)
 {
     _accum += dt;
-    if( _accum > 2.0f) {
+    if (_accum > 2.0f)
+    {
         float z = _sprite->getGlobalZOrder();
         _sprite->setGlobalZOrder(-z);
         _accum = 0;
@@ -921,45 +905,45 @@ std::string GlobalZTouchTest::subtitle() const
 
 StopPropagationTest::StopPropagationTest()
 {
-    static const int TAG_BLUE_SPRITE = 101;
+    static const int TAG_BLUE_SPRITE  = 101;
     static const int TAG_BLUE_SPRITE2 = 102;
 
     auto touchOneByOneListener = EventListenerTouchOneByOne::create();
     touchOneByOneListener->setSwallowTouches(true);
-    
-    touchOneByOneListener->onTouchBegan = [=](Touch* touch, Event* event){
+
+    touchOneByOneListener->onTouchBegan = [=](Touch* touch, Event* event) {
         // Skip if don't touch top half screen.
         if (!this->isPointInTopHalfAreaOfScreen(touch->getLocation()))
             return false;
-        
+
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         CCASSERT(target->getTag() == TAG_BLUE_SPRITE, "Yellow blocks shouldn't response event.");
-        
+
         if (this->isPointInNode(touch->getLocation(), target))
         {
             target->setOpacity(180);
             return true;
         }
-        
+
         // Stop propagation, so yellow blocks will not be able to receive event.
         event->stopPropagation();
         return false;
     };
-    
-    touchOneByOneListener->onTouchEnded = [=](Touch* touch, Event* event){
+
+    touchOneByOneListener->onTouchEnded = [=](Touch* touch, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         target->setOpacity(255);
     };
-    
-    auto touchAllAtOnceListener = EventListenerTouchAllAtOnce::create();
-    touchAllAtOnceListener->onTouchesBegan = [=](const std::vector<Touch*>& touches, Event* event){
+
+    auto touchAllAtOnceListener            = EventListenerTouchAllAtOnce::create();
+    touchAllAtOnceListener->onTouchesBegan = [=](const std::vector<Touch*>& touches, Event* event) {
         // Skip if don't touch top half screen.
         if (this->isPointInTopHalfAreaOfScreen(touches[0]->getLocation()))
             return;
-        
+
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         CCASSERT(target->getTag() == TAG_BLUE_SPRITE2, "Yellow blocks shouldn't response event.");
-        
+
         if (this->isPointInNode(touches[0]->getLocation(), target))
         {
             target->setOpacity(180);
@@ -967,15 +951,15 @@ StopPropagationTest::StopPropagationTest()
         // Stop propagation, so yellow blocks will not be able to receive event.
         event->stopPropagation();
     };
-    
-    touchAllAtOnceListener->onTouchesEnded = [=](const std::vector<Touch*>& touches, Event* event){
+
+    touchAllAtOnceListener->onTouchesEnded = [=](const std::vector<Touch*>& touches, Event* event) {
         // Skip if don't touch top half screen.
         if (this->isPointInTopHalfAreaOfScreen(touches[0]->getLocation()))
             return;
-        
+
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         CCASSERT(target->getTag() == TAG_BLUE_SPRITE2, "Yellow blocks shouldn't response event.");
-        
+
         if (this->isPointInNode(touches[0]->getLocation(), target))
         {
             target->setOpacity(255);
@@ -983,29 +967,30 @@ StopPropagationTest::StopPropagationTest()
         // Stop propagation, so yellow blocks will not be able to receive event.
         event->stopPropagation();
     };
-    
-    auto keyboardEventListener = EventListenerKeyboard::create();
-    keyboardEventListener->onKeyPressed = [](EventKeyboard::KeyCode /*key*/, Event* event){
+
+    auto keyboardEventListener          = EventListenerKeyboard::create();
+    keyboardEventListener->onKeyPressed = [](EventKeyboard::KeyCode /*key*/, Event* event) {
         auto target = static_cast<Sprite*>(event->getCurrentTarget());
         CC_UNUSED_PARAM(target);
-        CCASSERT(target->getTag() == TAG_BLUE_SPRITE || target->getTag() == TAG_BLUE_SPRITE2, "Yellow blocks shouldn't response event.");
+        CCASSERT(target->getTag() == TAG_BLUE_SPRITE || target->getTag() == TAG_BLUE_SPRITE2,
+                 "Yellow blocks shouldn't response event.");
         // Stop propagation, so yellow blocks will not be able to receive event.
         event->stopPropagation();
     };
-    
+
     const int SPRITE_COUNT = 8;
-    
+
     for (int i = 0; i < SPRITE_COUNT; i++)
     {
         Sprite* sprite;
         Sprite* sprite2;
-        
-        if(i==4)
+
+        if (i == 4)
         {
             sprite = Sprite::create("Images/CyanSquare.png");
             sprite->setTag(TAG_BLUE_SPRITE);
             addChild(sprite, 100);
-            
+
             sprite2 = Sprite::create("Images/CyanSquare.png");
             sprite2->setTag(TAG_BLUE_SPRITE2);
             addChild(sprite2, 100);
@@ -1017,26 +1002,27 @@ StopPropagationTest::StopPropagationTest()
             sprite2 = Sprite::create("Images/YellowSquare.png");
             addChild(sprite2, 0);
         }
-        
+
         _eventDispatcher->addEventListenerWithSceneGraphPriority(touchOneByOneListener->clone(), sprite);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(keyboardEventListener->clone(), sprite);
-        
+
         _eventDispatcher->addEventListenerWithSceneGraphPriority(touchAllAtOnceListener->clone(), sprite2);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(keyboardEventListener->clone(), sprite2);
 
-        
         Size visibleSize = Director::getInstance()->getVisibleSize();
-        sprite->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i, VisibleRect::center().y + sprite2->getContentSize().height/2 +10);
-        sprite2->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i, VisibleRect::center().y - sprite2->getContentSize().height/2-10);
+        sprite->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i,
+                            VisibleRect::center().y + sprite2->getContentSize().height / 2 + 10);
+        sprite2->setPosition(VisibleRect::left().x + visibleSize.width / (SPRITE_COUNT - 1) * i,
+                             VisibleRect::center().y - sprite2->getContentSize().height / 2 - 10);
     }
 }
 
 bool StopPropagationTest::isPointInNode(Vec2 pt, Node* node)
 {
     Vec2 locationInNode = node->convertToNodeSpace(pt);
-    Size s = node->getContentSize();
-    Rect rect = Rect(0, 0, s.width, s.height);
-    
+    Size s              = node->getContentSize();
+    Rect rect           = Rect(0, 0, s.width, s.height);
+
     if (rect.containsPoint(locationInNode))
     {
         return true;
@@ -1047,11 +1033,12 @@ bool StopPropagationTest::isPointInNode(Vec2 pt, Node* node)
 bool StopPropagationTest::isPointInTopHalfAreaOfScreen(Vec2 pt)
 {
     Size winSize = Director::getInstance()->getWinSize();
-    
-    if (pt.y >= winSize.height/2) {
+
+    if (pt.y >= winSize.height / 2)
+    {
         return true;
     }
-    
+
     return false;
 }
 
@@ -1069,59 +1056,56 @@ std::string StopPropagationTest::subtitle() const
 PauseResumeTargetTest::PauseResumeTargetTest()
 {
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto sprite1 = TouchableSprite::create();
     sprite1->setTexture("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 40.0f));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 40.0f));
     addChild(sprite1, -10);
-    
+
     auto sprite2 = TouchableSprite::create();
     sprite2->setTexture("Images/MagentaSquare.png");
-    sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite2, -20);
-    
-    auto sprite3 = TouchableSprite::create(100); // Sprite3 uses fixed priority listener
+
+    auto sprite3 = TouchableSprite::create(100);  // Sprite3 uses fixed priority listener
     sprite3->setTexture("Images/YellowSquare.png");
     sprite3->setPosition(Vec2(0, 0));
     sprite2->addChild(sprite3, -1);
-    
-    auto popup = MenuItemFont::create("Popup", [=](Ref* sender){
-        
+
+    auto popup = MenuItemFont::create("Popup", [=](Ref* sender) {
         sprite3->getListener()->setEnabled(false);
         _eventDispatcher->pauseEventListenersForTarget(this, true);
-        
+
         auto colorLayer = LayerColor::create(Color4B(0, 0, 255, 100));
         this->addChild(colorLayer, 99999);
-        
-        auto closeItem = MenuItemFont::create("close", [=](Ref* sender){
+
+        auto closeItem = MenuItemFont::create("close", [=](Ref* sender) {
             colorLayer->removeFromParent();
             _eventDispatcher->resumeEventListenersForTarget(this, true);
             sprite3->getListener()->setEnabled(true);
         });
-        
+
         closeItem->setPosition(VisibleRect::center());
-        
+
         auto closeMenu = Menu::create(closeItem, nullptr);
         closeMenu->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
         closeMenu->setPosition(Vec2::ZERO);
-        
+
         colorLayer->addChild(closeMenu);
     });
-    
+
     popup->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     popup->setPosition(VisibleRect::right());
-    
+
     auto menu = Menu::create(popup, nullptr);
     menu->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
     menu->setPosition(Vec2::ZERO);
-    
+
     addChild(menu);
 }
 
-PauseResumeTargetTest::~PauseResumeTargetTest()
-{
-}
+PauseResumeTargetTest::~PauseResumeTargetTest() {}
 
 std::string PauseResumeTargetTest::title() const
 {
@@ -1138,15 +1122,15 @@ PauseResumeTargetTest2::PauseResumeTargetTest2()
 {
     MenuItemFont::getFontSize();
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
+    Size size   = Director::getInstance()->getVisibleSize();
 
     _touchableSprite = TouchableSprite::create();
     _touchableSprite->retain();
     _touchableSprite->setTexture("Images/CyanSquare.png");
-    _touchableSprite->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 40.0f));
+    _touchableSprite->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 40.0f));
     addChild(_touchableSprite);
 
-    _itemPauseTouch = MenuItemFont::create("pauseTouch", [=](Ref* sender){
+    _itemPauseTouch = MenuItemFont::create("pauseTouch", [=](Ref* sender) {
         _itemPauseTouch->setEnabled(false);
         _itemResumeTouch->setEnabled(true);
 
@@ -1156,7 +1140,7 @@ PauseResumeTargetTest2::PauseResumeTargetTest2()
     _itemPauseTouch->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     _itemPauseTouch->setPosition(VisibleRect::right() + Vec2(-150.0f, 0.0f));
 
-    _itemResumeTouch = MenuItemFont::create("resumeTouch", [=](Ref* sender){
+    _itemResumeTouch = MenuItemFont::create("resumeTouch", [=](Ref* sender) {
         _itemPauseTouch->setEnabled(true);
         _itemResumeTouch->setEnabled(false);
 
@@ -1166,7 +1150,7 @@ PauseResumeTargetTest2::PauseResumeTargetTest2()
     _itemResumeTouch->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     _itemResumeTouch->setPosition(VisibleRect::right() + Vec2(0, 0));
 
-    _itemAddToScene = MenuItemFont::create("addToScene", [=](Ref* sender){
+    _itemAddToScene = MenuItemFont::create("addToScene", [=](Ref* sender) {
         _itemAddToScene->setEnabled(false);
         _itemRemoveFromScene->setEnabled(true);
 
@@ -1176,7 +1160,7 @@ PauseResumeTargetTest2::PauseResumeTargetTest2()
     _itemAddToScene->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
     _itemAddToScene->setPosition(VisibleRect::right() + Vec2(-150.0f, -50.0f));
 
-    _itemRemoveFromScene = MenuItemFont::create("removeFromScene", [=](Ref* sender){
+    _itemRemoveFromScene = MenuItemFont::create("removeFromScene", [=](Ref* sender) {
         _itemAddToScene->setEnabled(true);
         _itemRemoveFromScene->setEnabled(false);
         _touchableSprite->removeFromParentAndCleanup(false);
@@ -1220,24 +1204,23 @@ PauseResumeTargetTest3::PauseResumeTargetTest3()
 {
     MenuItemFont::getFontSize();
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
+    Size size   = Director::getInstance()->getVisibleSize();
 
     _touchableSprite = Sprite::create("Images/CyanSquare.png");
-    _touchableSprite->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 40.0f));
+    _touchableSprite->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 40.0f));
     addChild(_touchableSprite);
 
-    auto item = MenuItemFont::create("addListener", [=](Ref* sender){
-
+    auto item = MenuItemFont::create("addListener", [=](Ref* sender) {
         MenuItemFont* senderItem = static_cast<MenuItemFont*>(sender);
         senderItem->setEnabled(false);
 
         auto listener = EventListenerTouchOneByOne::create();
         listener->setSwallowTouches(true);
 
-        listener->onTouchBegan = [=](Touch* touch, Event* event){
+        listener->onTouchBegan = [=](Touch* touch, Event* event) {
             Vec2 locationInNode = _touchableSprite->convertToNodeSpace(touch->getLocation());
-            Size s = _touchableSprite->getContentSize();
-            Rect rect = Rect(0, 0, s.width, s.height);
+            Size s              = _touchableSprite->getContentSize();
+            Rect rect           = Rect(0, 0, s.width, s.height);
 
             if (rect.containsPoint(locationInNode))
             {
@@ -1248,7 +1231,7 @@ PauseResumeTargetTest3::PauseResumeTargetTest3()
             return false;
         };
 
-        listener->onTouchEnded = [this](Touch* touch, Event* event){
+        listener->onTouchEnded = [this](Touch* touch, Event* event) {
             log("TouchableSprite: onTouchEnded ...");
             _touchableSprite->setColor(Color3B::WHITE);
         };
@@ -1267,10 +1250,7 @@ PauseResumeTargetTest3::PauseResumeTargetTest3()
     addChild(menu);
 }
 
-PauseResumeTargetTest3::~PauseResumeTargetTest3()
-{
-
-}
+PauseResumeTargetTest3::~PauseResumeTargetTest3() {}
 
 std::string PauseResumeTargetTest3::title() const
 {
@@ -1283,16 +1263,14 @@ std::string PauseResumeTargetTest3::subtitle() const
 }
 
 // Issue4129
-Issue4129::Issue4129()
-: _bugFixed(false)
+Issue4129::Issue4129() : _bugFixed(false)
 {
-    _customlistener = _eventDispatcher->addCustomEventListener(EVENT_COME_TO_BACKGROUND, [this](EventCustom* event){
-        
+    _customlistener = _eventDispatcher->addCustomEventListener(EVENT_COME_TO_BACKGROUND, [this](EventCustom* event) {
         auto label = Label::createWithSystemFont("Yeah, this issue was fixed.", "", 20);
         label->setAnchorPoint(Vec2(0.0f, 0.5f));
         label->setPosition(Vec2(VisibleRect::left() + Vec2(0.0f, 30.0f)));
         this->addChild(label);
-        
+
         // After test, remove it.
         _eventDispatcher->removeEventListener(_customlistener);
         _customlistener = nullptr;
@@ -1300,32 +1278,32 @@ Issue4129::Issue4129()
         _bugFixed = true;
     });
 
-    auto removeAllTouchItem = MenuItemFont::create("Remove All Listeners", [this](Ref* sender){
+    auto removeAllTouchItem = MenuItemFont::create("Remove All Listeners", [this](Ref* sender) {
         auto senderItem = static_cast<MenuItemFont*>(sender);
         senderItem->setString("Only 'Reset' item could be clicked");
-        
+
         _eventDispatcher->removeAllEventListeners();
-        
-        auto nextItem = MenuItemFont::create("Reset", [=](Ref* sender){
+
+        auto nextItem = MenuItemFont::create("Reset", [=](Ref* sender) {
             CCASSERT(_bugFixed, "This issue was not fixed!");
             getTestSuite()->restartCurrTest();
         });
-        
+
         nextItem->setFontSizeObj(16);
         nextItem->setPosition(VisibleRect::right() + Vec2(-100.0f, -30.0f));
-        
+
         auto menu2 = Menu::create(nextItem, nullptr);
         menu2->setPosition(Vec2(0, 0));
         menu2->setAnchorPoint(Vec2(0, 0));
         this->addChild(menu2);
-        
+
         // Simulate to dispatch 'come to background' event
         _eventDispatcher->dispatchCustomEvent(EVENT_COME_TO_BACKGROUND);
     });
-    
+
     removeAllTouchItem->setFontSizeObj(16);
     removeAllTouchItem->setPosition(VisibleRect::right() + Vec2(-100.0f, 0.0f));
-    
+
     auto menu = Menu::create(removeAllTouchItem, nullptr);
     menu->setPosition(Vec2(0, 0));
     menu->setAnchorPoint(Vec2(0, 0));
@@ -1354,28 +1332,26 @@ std::string Issue4129::subtitle() const
 Issue4160::Issue4160()
 {
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
+    Size size   = Director::getInstance()->getVisibleSize();
+
     auto sprite1 = TouchableSprite::create(-30);
     sprite1->setTexture("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 40.0f));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 40.0f));
     addChild(sprite1, -10);
-    
+
     auto sprite2 = TouchableSprite::create(-20);
     sprite2->setTexture("Images/MagentaSquare.png");
     sprite2->removeListenerOnTouchEnded(true);
-    sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite2, -20);
-    
+
     auto sprite3 = TouchableSprite::create(-10);
     sprite3->setTexture("Images/YellowSquare.png");
     sprite3->setPosition(Vec2(0, 0));
     sprite2->addChild(sprite3, -1);
 }
 
-Issue4160::~Issue4160()
-{
-}
+Issue4160::~Issue4160() {}
 
 std::string Issue4160::title() const
 {
@@ -1391,13 +1367,12 @@ std::string Issue4160::subtitle() const
 class DanglingNodePointersTestSprite : public Sprite
 {
 public:
-    
-    typedef std::function<void (DanglingNodePointersTestSprite * sprite)> TappedCallback;
-    
-    static DanglingNodePointersTestSprite * create(const TappedCallback & tappedCallback)
+    typedef std::function<void(DanglingNodePointersTestSprite* sprite)> TappedCallback;
+
+    static DanglingNodePointersTestSprite* create(const TappedCallback& tappedCallback)
     {
         auto ret = new DanglingNodePointersTestSprite(tappedCallback);
-        
+
         if (ret->init())
         {
             ret->autorelease();
@@ -1409,46 +1384,38 @@ class DanglingNodePointersTestSprite : public Sprite
     }
 
 protected:
-    
-    DanglingNodePointersTestSprite(const TappedCallback & tappedCallback)
-    :
-        _eventListener(nullptr),
-        _tappedCallback(tappedCallback)
-    {
-        
-    }
-    
+    DanglingNodePointersTestSprite(const TappedCallback& tappedCallback)
+        : _eventListener(nullptr), _tappedCallback(tappedCallback)
+    {}
+
 public:
-    
     void onEnter() override
     {
         Sprite::onEnter();
-        
+
         _eventListener = EventListenerTouchOneByOne::create();
         _eventListener->setSwallowTouches(false);
-        
-        _eventListener->onTouchBegan = [this](Touch* touch, Event* event) -> bool
-        {
+
+        _eventListener->onTouchBegan = [this](Touch* touch, Event* event) -> bool {
             _tappedCallback(this);
-            return false;           // Don't claim the touch so it can propagate
+            return false;  // Don't claim the touch so it can propagate
         };
-        
-        _eventListener->onTouchEnded = [](Touch* touch, Event* event)
-        {
+
+        _eventListener->onTouchEnded = [](Touch* touch, Event* event) {
             // Do nothing
         };
-        
+
         _eventDispatcher->addEventListenerWithSceneGraphPriority(_eventListener, this);
     }
-    
+
     void onExit() override
     {
         _eventDispatcher->removeEventListenersForTarget(this);
         _eventListener = nullptr;
         Sprite::onExit();
     }
-    
-private:    
+
+private:
     EventListenerTouchOneByOne* _eventListener;
     TappedCallback _tappedCallback;
 };
@@ -1457,45 +1424,44 @@ DanglingNodePointersTest::DanglingNodePointersTest()
 {
 #if CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS == 1 && COCOS2D_DEBUG > 0
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
-    auto callback2 = [](DanglingNodePointersTestSprite * sprite2)
-    {
+    Size size   = Director::getInstance()->getVisibleSize();
+
+    auto callback2 = [](DanglingNodePointersTestSprite* sprite2) {
         CCASSERT(false, "This should never be called because the sprite gets removed from it's parent and destroyed!");
         exit(1);
     };
-    
-    auto callback1 = [callback2, origin, size](DanglingNodePointersTestSprite * sprite1)
-    {
-        DanglingNodePointersTestSprite * sprite2 = dynamic_cast<DanglingNodePointersTestSprite*>(sprite1->getChildren().at(0));
+
+    auto callback1 = [callback2, origin, size](DanglingNodePointersTestSprite* sprite1) {
+        DanglingNodePointersTestSprite* sprite2 =
+            dynamic_cast<DanglingNodePointersTestSprite*>(sprite1->getChildren().at(0));
         CCASSERT(sprite2, "The first child of sprite 1 should be sprite 2!");
-        CCASSERT(sprite2->getReferenceCount() == 1, "There should only be 1 reference to sprite 1, from it's parent node. Hence removing it will destroy it!");
-        sprite1->removeAllChildren();   // This call should cause sprite 2 to be destroyed
-        
+        CCASSERT(
+            sprite2->getReferenceCount() == 1,
+            "There should only be 1 reference to sprite 1, from it's parent node. Hence removing it will destroy it!");
+        sprite1->removeAllChildren();  // This call should cause sprite 2 to be destroyed
+
         // Recreate sprite 1 again
         sprite2 = DanglingNodePointersTestSprite::create(callback2);
         sprite2->setTexture("Images/MagentaSquare.png");
-        sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+        sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
         sprite1->addChild(sprite2, -20);
     };
-    
-    auto sprite1 = DanglingNodePointersTestSprite::create(callback1);    // Sprite 1 will receive touch before sprite 2
+
+    auto sprite1 = DanglingNodePointersTestSprite::create(callback1);  // Sprite 1 will receive touch before sprite 2
     sprite1->setTexture("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite1, -10);
-    
-    auto sprite2 = DanglingNodePointersTestSprite::create(callback2);   // Sprite 2 will be removed when sprite 1 is touched, should never receive an event.
+
+    auto sprite2 = DanglingNodePointersTestSprite::create(
+        callback2);  // Sprite 2 will be removed when sprite 1 is touched, should never receive an event.
     sprite2->setTexture("Images/MagentaSquare.png");
-    sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     sprite1->addChild(sprite2, -20);
-    
+
 #endif
 }
 
-DanglingNodePointersTest::~DanglingNodePointersTest()
-{
-    
-}
+DanglingNodePointersTest::~DanglingNodePointersTest() {}
 
 std::string DanglingNodePointersTest::title() const
 {
@@ -1505,41 +1471,38 @@ std::string DanglingNodePointersTest::title() const
 std::string DanglingNodePointersTest::subtitle() const
 {
 #if CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS == 1 && COCOS2D_DEBUG > 0
-    return  "Tap the square - should not crash!";
+    return "Tap the square - should not crash!";
 #else
-    return  "For test to work, must be compiled with:\n"
-            "CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS == 1\n&& COCOS2D_DEBUG > 0";
+    return "For test to work, must be compiled with:\n"
+           "CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS == 1\n&& COCOS2D_DEBUG > 0";
 #endif
 }
 
-
 RegisterAndUnregisterWhileEventHanldingTest::RegisterAndUnregisterWhileEventHanldingTest()
 {
     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-    Size size = Director::getInstance()->getVisibleSize();
-    
-    auto callback1 = [=](DanglingNodePointersTestSprite * sprite)
-    {
-        auto callback2 = [](DanglingNodePointersTestSprite * sprite)
-        {
+    Size size   = Director::getInstance()->getVisibleSize();
+
+    auto callback1 = [=](DanglingNodePointersTestSprite* sprite) {
+        auto callback2 = [](DanglingNodePointersTestSprite* sprite) {
             CCASSERT(false, "This should never get called!");
         };
-        
+
         {
             AutoreleasePool pool;
-            
+
             auto sprite2 = DanglingNodePointersTestSprite::create(callback2);
             sprite2->setTexture("Images/CyanSquare.png");
-            sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
-            
+            sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
+
             addChild(sprite2, 0);
             removeChild(sprite2);
         }
     };
-    
+
     auto sprite1 = DanglingNodePointersTestSprite::create(callback1);
     sprite1->setTexture("Images/CyanSquare.png");
-    sprite1->setPosition(origin+Vec2(size.width/2, size.height/2));
+    sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2));
     addChild(sprite1, -10);
 }
 
@@ -1550,24 +1513,23 @@ std::string RegisterAndUnregisterWhileEventHanldingTest::title() const
 
 std::string RegisterAndUnregisterWhileEventHanldingTest::subtitle() const
 {
-    return  "Tap the square multiple times - should not crash!";
+    return "Tap the square multiple times - should not crash!";
 }
 
 //
 WindowEventsTest::WindowEventsTest()
 {
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
     auto dispatcher = Director::getInstance()->getEventDispatcher();
     dispatcher->addCustomEventListener(GLViewImpl::EVENT_WINDOW_RESIZED, [](EventCustom* event) {
         // TODO: need to create resizeable window
         log("<<< WINDOW RESIZED! >>> ");
     });
-    dispatcher->addCustomEventListener(GLViewImpl::EVENT_WINDOW_FOCUSED, [](EventCustom* event) {
-        log("<<< WINDOW FOCUSED! >>> ");
-    });
-    dispatcher->addCustomEventListener(GLViewImpl::EVENT_WINDOW_UNFOCUSED, [](EventCustom* event) {
-        log("<<< WINDOW BLURRED! >>> ");
-    });
+    dispatcher->addCustomEventListener(GLViewImpl::EVENT_WINDOW_FOCUSED,
+                                       [](EventCustom* event) { log("<<< WINDOW FOCUSED! >>> "); });
+    dispatcher->addCustomEventListener(GLViewImpl::EVENT_WINDOW_UNFOCUSED,
+                                       [](EventCustom* event) { log("<<< WINDOW BLURRED! >>> "); });
 #endif
 }
 
@@ -1578,64 +1540,67 @@ std::string WindowEventsTest::title() const
 
 std::string WindowEventsTest::subtitle() const
 {
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
-    return  "Resize and Switch to another window and back. Read Logs.";
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
+    return "Resize and Switch to another window and back. Read Logs.";
 #else
-    return  "Unsupported platform.";
+    return "Unsupported platform.";
 #endif
 }
 
-
 // https://github.com/cocos2d/cocos2d-x/issues/8194
 Issue8194::Issue8194()
 {
-    auto origin = Director::getInstance()->getVisibleOrigin();
-    auto size = Director::getInstance()->getVisibleSize();
+    auto origin            = Director::getInstance()->getVisibleOrigin();
+    auto size              = Director::getInstance()->getVisibleSize();
     static bool nodesAdded = false;
 #define tagA 100
 #define tagB 101
     // dispatch custom event in another custom event, make the custom event "Issue8194" take effect immediately
-    _listener = getEventDispatcher()->addCustomEventListener(Director::EVENT_AFTER_UPDATE, [this](cocos2d::EventCustom *event){
-        if (nodesAdded)
-        {
-            // CCLOG("Fire Issue8194 Event");
-            getEventDispatcher()->dispatchCustomEvent("Issue8194");
-            
-            // clear test nodes and listeners
-            getEventDispatcher()->removeCustomEventListeners("Issue8194");
-            removeChildByTag(tagA);
-            removeChildByTag(tagB);
-            nodesAdded = false;
-        }
-    });
-    
+    _listener =
+        getEventDispatcher()->addCustomEventListener(Director::EVENT_AFTER_UPDATE, [this](cocos2d::EventCustom* event) {
+            if (nodesAdded)
+            {
+                // CCLOG("Fire Issue8194 Event");
+                getEventDispatcher()->dispatchCustomEvent("Issue8194");
+
+                // clear test nodes and listeners
+                getEventDispatcher()->removeCustomEventListeners("Issue8194");
+                removeChildByTag(tagA);
+                removeChildByTag(tagB);
+                nodesAdded = false;
+            }
+        });
+
     // When click this menuitem, it will add two node A and B, then send a custom event.
     // Because Node B's localZOrder < A's, the custom event should process by node B.
-    auto menuItem = MenuItemFont::create("Dispatch Custom Event", [this](Ref *sender) {
+    auto menuItem = MenuItemFont::create("Dispatch Custom Event", [this](Ref* sender) {
         // add nodeA to scene
         auto nodeA = Node::create();
         addChild(nodeA, 1, tagA);
-        
-        cocos2d::EventListenerCustom* listenerA = cocos2d::EventListenerCustom::create("Issue8194", [&](cocos2d::EventCustom *event){
-            _subtitleLabel->setString("Bug has been fixed.");
-            event->stopPropagation();
-        });
+
+        cocos2d::EventListenerCustom* listenerA =
+            cocos2d::EventListenerCustom::create("Issue8194", [&](cocos2d::EventCustom* event) {
+                _subtitleLabel->setString("Bug has been fixed.");
+                event->stopPropagation();
+            });
         getEventDispatcher()->addEventListenerWithSceneGraphPriority(listenerA, nodeA);
-       
+
         // add nodeB to scene
         auto nodeB = Node::create();
         addChild(nodeB, -1, tagB);
-        
-        cocos2d::EventListenerCustom* listenerB = cocos2d::EventListenerCustom::create("Issue8194", [&](cocos2d::EventCustom *event){
-            _subtitleLabel->setString("Bug exist yet.");
-            event->stopPropagation();
-        });
+
+        cocos2d::EventListenerCustom* listenerB =
+            cocos2d::EventListenerCustom::create("Issue8194", [&](cocos2d::EventCustom* event) {
+                _subtitleLabel->setString("Bug exist yet.");
+                event->stopPropagation();
+            });
         getEventDispatcher()->addEventListenerWithSceneGraphPriority(listenerB, nodeB);
-        
+
         nodesAdded = true;
     });
-    
-    menuItem->setPosition(origin.x + size.width/2, origin.y + size.height/2);
+
+    menuItem->setPosition(origin.x + size.width / 2, origin.y + size.height / 2);
     auto menu = Menu::create(menuItem, nullptr);
     menu->setPosition(Vec2::ZERO);
     addChild(menu);
@@ -1653,27 +1618,26 @@ std::string Issue8194::title() const
 
 std::string Issue8194::subtitle() const
 {
-    return  "After click button, should show 'Bug has been fixed.'";
+    return "After click button, should show 'Bug has been fixed.'";
 }
 
 Issue9898::Issue9898()
 {
     auto origin = Director::getInstance()->getVisibleOrigin();
-    auto size = Director::getInstance()->getVisibleSize();
+    auto size   = Director::getInstance()->getVisibleSize();
 
     auto nodeA = Node::create();
     addChild(nodeA);
 
-    _listener = cocos2d::EventListenerCustom::create("Issue9898", [&](cocos2d::EventCustom *event){
+    _listener = cocos2d::EventListenerCustom::create("Issue9898", [&](cocos2d::EventCustom* event) {
         _eventDispatcher->removeEventListener(_listener);
         _eventDispatcher->dispatchCustomEvent("Issue9898");
     });
     _eventDispatcher->addEventListenerWithSceneGraphPriority(_listener, nodeA);
 
-    auto menuItem = MenuItemFont::create("Dispatch Custom Event", [&](Ref *sender) {
-        _eventDispatcher->dispatchCustomEvent("Issue9898");
-    });
-    menuItem->setPosition(origin.x + size.width/2, origin.y + size.height/2);
+    auto menuItem = MenuItemFont::create("Dispatch Custom Event",
+                                         [&](Ref* sender) { _eventDispatcher->dispatchCustomEvent("Issue9898"); });
+    menuItem->setPosition(origin.x + size.width / 2, origin.y + size.height / 2);
     auto menu = Menu::create(menuItem, nullptr);
     menu->setPosition(Vec2::ZERO);
     addChild(menu);
@@ -1686,5 +1650,5 @@ std::string Issue9898::title() const
 
 std::string Issue9898::subtitle() const
 {
-    return  "Should not crash if dispatch event after remove\n event listener in callback";
+    return "Should not crash if dispatch event after remove\n event listener in callback";
 }
diff --git a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
index a42b46e57a5e..7b5ecaa1cea2 100644
--- a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
+++ b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,7 +44,6 @@ class EventDispatcherTestDemo : public TestCase
     virtual std::string title() const override;
 };
 
-
 class TouchableSpriteTest : public EventDispatcherTestDemo
 {
 public:
@@ -80,6 +79,7 @@ class CustomEventTest : public EventDispatcherTestDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::EventListenerCustom* _listener;
     cocos2d::EventListenerCustom* _listener2;
@@ -112,6 +112,7 @@ class RemoveAndRetainNodeTest : public EventDispatcherTestDemo
     virtual void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::Sprite* _sprite;
     bool _spriteSaved;
@@ -145,8 +146,8 @@ class DirectorEventTest : public EventDispatcherTestDemo
 
 protected:
     int _count1, _count2, _count3, _count4;
-    cocos2d::Label* _label1, *_label2, *_label3, *_label4;
-    cocos2d::EventListenerCustom* _event1, *_event2, *_event3, *_event4;
+    cocos2d::Label *_label1, *_label2, *_label3, *_label4;
+    cocos2d::EventListenerCustom *_event1, *_event2, *_event3, *_event4;
 };
 
 class GlobalZTouchTest : public EventDispatcherTestDemo
@@ -154,12 +155,12 @@ class GlobalZTouchTest : public EventDispatcherTestDemo
 public:
     CREATE_FUNC(GlobalZTouchTest);
     GlobalZTouchTest();
-    
+
     virtual void update(float dt) override;
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     cocos2d::Sprite* _sprite;
     float _accum;
@@ -170,10 +171,10 @@ class StopPropagationTest : public EventDispatcherTestDemo
 public:
     CREATE_FUNC(StopPropagationTest);
     StopPropagationTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     bool isPointInNode(cocos2d::Vec2 pt, cocos2d::Node* node);
     bool isPointInTopHalfAreaOfScreen(cocos2d::Vec2 pt);
@@ -185,10 +186,10 @@ class PauseResumeTargetTest : public EventDispatcherTestDemo
     CREATE_FUNC(PauseResumeTargetTest);
     PauseResumeTargetTest();
     virtual ~PauseResumeTargetTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
 };
 
@@ -230,10 +231,10 @@ class Issue4129 : public EventDispatcherTestDemo
     CREATE_FUNC(Issue4129);
     Issue4129();
     virtual ~Issue4129();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::EventListenerCustom* _customlistener;
     bool _bugFixed;
@@ -245,10 +246,10 @@ class Issue4160 : public EventDispatcherTestDemo
     CREATE_FUNC(Issue4160);
     Issue4160();
     virtual ~Issue4160();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
 };
 
@@ -258,7 +259,7 @@ class DanglingNodePointersTest : public EventDispatcherTestDemo
     CREATE_FUNC(DanglingNodePointersTest);
     DanglingNodePointersTest();
     virtual ~DanglingNodePointersTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -268,7 +269,7 @@ class RegisterAndUnregisterWhileEventHanldingTest : public EventDispatcherTestDe
 public:
     CREATE_FUNC(RegisterAndUnregisterWhileEventHanldingTest);
     RegisterAndUnregisterWhileEventHanldingTest();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -289,10 +290,10 @@ class Issue8194 : public EventDispatcherTestDemo
     CREATE_FUNC(Issue8194);
     Issue8194();
     virtual ~Issue8194();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::EventListenerCustom* _listener;
 };
diff --git a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
index 093f3e876fdd..cd0707a2b544 100644
--- a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
+++ b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
@@ -33,57 +33,57 @@ namespace
 {
 enum CustomProgramType : uint32_t
 {
-    BLUR = 1,
+    BLUR  = 1,
     SEPIA = 2,
 };
 }
 
 USING_NS_CC;
 
-class DurationRecorder {
+class DurationRecorder
+{
 public:
-    void startTick(const std::string &key) {
-        _durations[key] = - now();
-    }
+    void startTick(std::string_view key) { _durations[key] = -now(); }
 
-    int endTick(const std::string &key) {
-        auto n = now();
+    int endTick(std::string_view key)
+    {
+        auto n   = now();
         auto itr = _durations.find(key);
-        if(_durations.find(key) == _durations.end())
+        if (_durations.find(key) == _durations.end())
         {
             return -1;
         }
-        else if(itr->second < 0) {
+        else if (itr->second < 0)
+        {
             itr->second = n + itr->second;
         }
         return static_cast<int>(itr->second);
     }
 
-    inline int64_t now() const{
-        return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
+    inline int64_t now() const
+    {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch())
+            .count();
     }
 
-    void reset() {
-        _durations.clear();
-    }
+    void reset() { _durations.clear(); }
 
 private:
-    std::map<std::string, int64_t > _durations;
+    hlookup::string_map<int64_t> _durations;
 };
 
-
-
 NewRendererTests::NewRendererTests()
 {
     auto programCache = backend::ProgramCache::getInstance();
     programCache->registerCustomProgramFactory(CustomProgramType::BLUR, positionTextureColor_vert,
                                                FileUtils::getInstance()->getStringFromFile("Shaders/example_Blur.fsh"));
-    programCache->registerCustomProgramFactory(CustomProgramType::SEPIA, positionTextureColor_vert,
-                                               FileUtils::getInstance()->getStringFromFile("Shaders/example_Sepia.fsh"));
+    programCache->registerCustomProgramFactory(
+        CustomProgramType::SEPIA, positionTextureColor_vert,
+        FileUtils::getInstance()->getStringFromFile("Shaders/example_Sepia.fsh"));
 
     ADD_TEST_CASE(NewSpriteTest);
     ADD_TEST_CASE(GroupCommandTest);
-//    ADD_TEST_CASE(NewClippingNodeTest); // When depth and stencil are used together, ...
+    //    ADD_TEST_CASE(NewClippingNodeTest); // When depth and stencil are used together, ...
     ADD_TEST_CASE(NewDrawNodeTest);
     ADD_TEST_CASE(NewCullingTest);
     ADD_TEST_CASE(VBOFullTest);
@@ -91,7 +91,7 @@ NewRendererTests::NewRendererTests()
     ADD_TEST_CASE(CaptureNodeTest);
     ADD_TEST_CASE(BugAutoCulling);
     ADD_TEST_CASE(RendererBatchQuadTri);
-    ADD_TEST_CASE(RendererUniformBatch); 
+    ADD_TEST_CASE(RendererUniformBatch);
     ADD_TEST_CASE(RendererUniformBatch2);
     ADD_TEST_CASE(SpriteCreation);
     ADD_TEST_CASE(NonBatchSprites);
@@ -109,24 +109,21 @@ std::string MultiSceneTest::subtitle() const
 
 NewSpriteTest::NewSpriteTest()
 {
-    auto touchListener = EventListenerTouchAllAtOnce::create();
+    auto touchListener            = EventListenerTouchAllAtOnce::create();
     touchListener->onTouchesEnded = CC_CALLBACK_2(NewSpriteTest::onTouchesEnded, this);
 
     createSpriteTest();
     createNewSpriteTest();
 }
 
-NewSpriteTest::~NewSpriteTest()
-{
-
-}
+NewSpriteTest::~NewSpriteTest() {}
 
 void NewSpriteTest::createSpriteTest()
 {
     Size winSize = Director::getInstance()->getWinSize();
 
     Sprite* parent = Sprite::create("Images/grossini.png");
-    parent->setPosition(winSize.width/4, winSize.height/2);
+    parent->setPosition(winSize.width / 4, winSize.height / 2);
     Sprite* child1 = Sprite::create("Images/grossinis_sister1.png");
     child1->setPosition(0.0f, -20.0f);
     Sprite* child2 = Sprite::create("Images/grossinis_sister2.png");
@@ -157,7 +154,7 @@ void NewSpriteTest::createNewSpriteTest()
     Size winSize = Director::getInstance()->getWinSize();
 
     Sprite* parent = Sprite::create("Images/grossini.png");
-    parent->setPosition(winSize.width*2/3, winSize.height/2);
+    parent->setPosition(winSize.width * 2 / 3, winSize.height / 2);
     Sprite* child1 = Sprite::create("Images/grossinis_sister1.png");
     child1->setPosition(0.0f, -20.0f);
     Sprite* child2 = Sprite::create("Images/grossinis_sister2.png");
@@ -183,10 +180,7 @@ void NewSpriteTest::createNewSpriteTest()
     addChild(parent);
 }
 
-void NewSpriteTest::onTouchesEnded(const std::vector<Touch *> &touches, Event *event)
-{
-
-}
+void NewSpriteTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event) {}
 
 std::string NewSpriteTest::title() const
 {
@@ -202,13 +196,14 @@ class SpriteInGroupCommand : public Sprite
 {
 protected:
     GroupCommand _spriteWrapperCommand;
+
 public:
-    static SpriteInGroupCommand* create(const std::string& filename);
-    
-    virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
+    static SpriteInGroupCommand* create(std::string_view filename);
+
+    virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
 };
 
-SpriteInGroupCommand* SpriteInGroupCommand::create(const std::string &filename)
+SpriteInGroupCommand* SpriteInGroupCommand::create(std::string_view filename)
 {
     SpriteInGroupCommand* sprite = new SpriteInGroupCommand();
     sprite->initWithFile(filename);
@@ -216,7 +211,7 @@ SpriteInGroupCommand* SpriteInGroupCommand::create(const std::string &filename)
     return sprite;
 }
 
-void SpriteInGroupCommand::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void SpriteInGroupCommand::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     CCASSERT(renderer, "Render is null");
     _spriteWrapperCommand.init(_globalZOrder);
@@ -228,15 +223,13 @@ void SpriteInGroupCommand::draw(Renderer *renderer, const Mat4 &transform, uint3
 
 GroupCommandTest::GroupCommandTest()
 {
-    auto sprite = SpriteInGroupCommand::create("Images/grossini.png");
+    auto sprite  = SpriteInGroupCommand::create("Images/grossini.png");
     Size winSize = Director::getInstance()->getWinSize();
-    sprite->setPosition(winSize.width/2,winSize.height/2);
+    sprite->setPosition(winSize.width / 2, winSize.height / 2);
     addChild(sprite);
 }
 
-GroupCommandTest::~GroupCommandTest()
-{
-}
+GroupCommandTest::~GroupCommandTest() {}
 
 std::string GroupCommandTest::title() const
 {
@@ -253,51 +246,48 @@ NewClippingNodeTest::NewClippingNodeTest()
     auto s = Director::getInstance()->getWinSize();
 
     auto clipper = ClippingNode::create();
-    clipper->setTag( kTagClipperNode );
-    clipper->setContentSize(  Size(200.0f, 200.0f) );
-    clipper->setAnchorPoint(  Vec2(0.5f, 0.5f) );
-    clipper->setPosition( Vec2(s.width / 2, s.height / 2) );
+    clipper->setTag(kTagClipperNode);
+    clipper->setContentSize(Size(200.0f, 200.0f));
+    clipper->setAnchorPoint(Vec2(0.5f, 0.5f));
+    clipper->setPosition(Vec2(s.width / 2, s.height / 2));
 
     clipper->runAction(RepeatForever::create(RotateBy::create(1, 45)));
     this->addChild(clipper);
 
     // TODO: Fix draw node as clip node
-//    auto stencil = NewDrawNode::create();
-//    Vec2 rectangle[4];
-//    rectangle[0] = Vec2(0, 0);
-//    rectangle[1] = Vec2(clipper->getContentSize().width, 0);
-//    rectangle[2] = Vec2(clipper->getContentSize().width, clipper->getContentSize().height);
-//    rectangle[3] = Vec2(0, clipper->getContentSize().height);
-//
-//    Color4F white(1, 1, 1, 1);
-//    stencil->drawPolygon(rectangle, 4, white, 1, white);
-//    clipper->setStencil(stencil);
-
-    //Test with alpha Test
+    //    auto stencil = NewDrawNode::create();
+    //    Vec2 rectangle[4];
+    //    rectangle[0] = Vec2(0, 0);
+    //    rectangle[1] = Vec2(clipper->getContentSize().width, 0);
+    //    rectangle[2] = Vec2(clipper->getContentSize().width, clipper->getContentSize().height);
+    //    rectangle[3] = Vec2(0, clipper->getContentSize().height);
+    //
+    //    Color4F white(1, 1, 1, 1);
+    //    stencil->drawPolygon(rectangle, 4, white, 1, white);
+    //    clipper->setStencil(stencil);
+
+    // Test with alpha Test
     clipper->setAlphaThreshold(0.05f);
     auto stencil = Sprite::create("Images/grossini.png");
-    stencil->setPosition(s.width/2, s.height/2);
+    stencil->setPosition(s.width / 2, s.height / 2);
     clipper->setStencil(stencil);
 
     auto content = Sprite::create("Images/background2.png");
-    content->setTag( kTagContentNode );
-    content->setAnchorPoint(  Vec2(0.5f, 0.5f) );
-    content->setPosition( Vec2(clipper->getContentSize().width / 2, clipper->getContentSize().height / 2) );
+    content->setTag(kTagContentNode);
+    content->setAnchorPoint(Vec2(0.5f, 0.5f));
+    content->setPosition(Vec2(clipper->getContentSize().width / 2, clipper->getContentSize().height / 2));
     clipper->addChild(content);
 
     _scrolling = false;
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(NewClippingNodeTest::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(NewClippingNodeTest::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(NewClippingNodeTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
-NewClippingNodeTest::~NewClippingNodeTest()
-{
-
-}
+NewClippingNodeTest::~NewClippingNodeTest() {}
 
 std::string NewClippingNodeTest::title() const
 {
@@ -309,43 +299,45 @@ std::string NewClippingNodeTest::subtitle() const
     return "ClipNode";
 }
 
-void NewClippingNodeTest::onTouchesBegan(const std::vector<Touch *> &touches, Event *event)
+void NewClippingNodeTest::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
-    Touch *touch = touches[0];
+    Touch* touch = touches[0];
     auto clipper = this->getChildByTag(kTagClipperNode);
-    Vec2 point = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
-    auto rect = Rect(0, 0, clipper->getContentSize().width, clipper->getContentSize().height);
-    _scrolling = rect.containsPoint(point);
-    _lastPoint = point;
+    Vec2 point   = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
+    auto rect    = Rect(0, 0, clipper->getContentSize().width, clipper->getContentSize().height);
+    _scrolling   = rect.containsPoint(point);
+    _lastPoint   = point;
 }
 
-void NewClippingNodeTest::onTouchesMoved(const std::vector<Touch *> &touches, Event *event)
+void NewClippingNodeTest::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-    if (!_scrolling) return;
-    Touch *touch = touches[0];
+    if (!_scrolling)
+        return;
+    Touch* touch = touches[0];
     auto clipper = this->getChildByTag(kTagClipperNode);
-    auto point = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
-    Vec2 diff = point - _lastPoint;
+    auto point   = clipper->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
+    Vec2 diff    = point - _lastPoint;
     auto content = clipper->getChildByTag(kTagContentNode);
     content->setPosition(content->getPosition() + diff);
     _lastPoint = point;
 }
 
-void NewClippingNodeTest::onTouchesEnded(const std::vector<Touch *> &touches, Event *event)
+void NewClippingNodeTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    if (!_scrolling) return;
+    if (!_scrolling)
+        return;
     _scrolling = false;
 }
 
 /**
-* NewDrawNode
-*/
+ * NewDrawNode
+ */
 NewDrawNodeTest::NewDrawNodeTest()
 {
     auto s = Director::getInstance()->getWinSize();
 
     auto parent = Node::create();
-    parent->setPosition(s.width/2, s.height/2);
+    parent->setPosition(s.width / 2, s.height / 2);
     addChild(parent);
 
     auto rectNode = DrawNode::create();
@@ -360,10 +352,7 @@ NewDrawNodeTest::NewDrawNodeTest()
     parent->addChild(rectNode);
 }
 
-NewDrawNodeTest::~NewDrawNodeTest()
-{
-
-}
+NewDrawNodeTest::~NewDrawNodeTest() {}
 
 std::string NewDrawNodeTest::title() const
 {
@@ -377,53 +366,49 @@ std::string NewDrawNodeTest::subtitle() const
 
 NewCullingTest::NewCullingTest()
 {
-    Size size = Director::getInstance()->getWinSize();
+    Size size   = Director::getInstance()->getWinSize();
     auto sprite = Sprite::create("Images/btn-about-normal-vertical.png");
     sprite->setRotation(5);
-    sprite->setPosition(Vec2(size.width/2,size.height/3));
+    sprite->setPosition(Vec2(size.width / 2, size.height / 3));
     sprite->setScale(2);
     addChild(sprite);
 
     auto sprite2 = Sprite::create("Images/btn-about-normal-vertical.png");
     sprite2->setRotation(-85);
-    sprite2->setPosition(Vec2(size.width/2,size.height * 2/3));
+    sprite2->setPosition(Vec2(size.width / 2, size.height * 2 / 3));
     sprite2->setScale(2);
     addChild(sprite2);
-    
+
     auto listener = EventListenerTouchOneByOne::create();
     listener->setSwallowTouches(true);
-    
+
     listener->onTouchBegan = CC_CALLBACK_2(NewCullingTest::onTouchBegan, this);
     listener->onTouchMoved = CC_CALLBACK_2(NewCullingTest::onTouchMoved, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
 }
 
-bool NewCullingTest::onTouchBegan(Touch* touch, Event  *event)
+bool NewCullingTest::onTouchBegan(Touch* touch, Event* event)
 {
     auto pos = touch->getLocation();
     _lastPos = pos;
     return true;
 }
 
-void NewCullingTest::onTouchMoved(Touch* touch, Event  *event)
-{    
+void NewCullingTest::onTouchMoved(Touch* touch, Event* event)
+{
     auto pos = touch->getLocation();
-    
+
     auto offset = pos - _lastPos;
-    
+
     auto layerPos = getPosition();
-    auto newPos = layerPos + offset;
-    
+    auto newPos   = layerPos + offset;
+
     setPosition(newPos);
     _lastPos = pos;
 }
 
-NewCullingTest::~NewCullingTest()
-{
-    
-}
+NewCullingTest::~NewCullingTest() {}
 
 std::string NewCullingTest::title() const
 {
@@ -438,17 +423,16 @@ std::string NewCullingTest::subtitle() const
 SpriteCreation::SpriteCreation()
 {
 
-    Size s = Director::getInstance()->getWinSize();
+    Size s       = Director::getInstance()->getWinSize();
     Node* parent = Node::create();
-    parent->setPosition(s.width / 2,s.height / 2);
+    parent->setPosition(s.width / 2, s.height / 2);
     addChild(parent);
 
-
 #define KEY_CREATION "11"
 #define KEY_DESTROYATION "22"
 
-    labelCreate = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Sprite Creation: ..");
-    labelDestory= Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Destroy Sprites: ..");
+    labelCreate  = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Sprite Creation: ..");
+    labelDestory = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Destroy Sprites: ..");
 
     MenuItemFont::setFontName("fonts/arial.ttf");
     MenuItemFont::setFontSize(65);
@@ -491,41 +475,38 @@ void SpriteCreation::doTest()
 {
 
     DurationRecorder perf;
-    std::vector<std::string> predefineTextures = {
-            "Images/concave.png",
-            "Images/atlastest.png",
-            "Images/grossini_dance_atlas-mono.png",
-            "Images/HelloWorld.png",
-            "Images/background1.png",
-            "Images/background2.png",
-            "Images/stone.png",
-            "Images/issue_17116.png",
-            "Images/sprite_polygon_crash.png",
-            "Images/bitmapFontTest3.png",
-            "Images/cocos-html5.png",
-            "Images/Fog.png",
-            "Images/poly_test_textures.png",
-            "Images/powered.png",
-            "Images/bug14017.png",
-            "Images/test-rgba1.png",
-            "Images/grossinis_heads.png",
-            "Images/cocos2dbanner.png"
-    };
-
+    std::vector<std::string> predefineTextures = {"Images/concave.png",
+                                                  "Images/atlastest.png",
+                                                  "Images/grossini_dance_atlas-mono.png",
+                                                  "Images/HelloWorld.png",
+                                                  "Images/background1.png",
+                                                  "Images/background2.png",
+                                                  "Images/stone.png",
+                                                  "Images/issue_17116.png",
+                                                  "Images/sprite_polygon_crash.png",
+                                                  "Images/bitmapFontTest3.png",
+                                                  "Images/cocos-html5.png",
+                                                  "Images/Fog.png",
+                                                  "Images/poly_test_textures.png",
+                                                  "Images/powered.png",
+                                                  "Images/bug14017.png",
+                                                  "Images/test-rgba1.png",
+                                                  "Images/grossinis_heads.png",
+                                                  "Images/cocos2dbanner.png"};
 
     std::vector<Sprite*> spriteCache;
     spriteCache.reserve(totalSprites);
 
     perf.startTick(KEY_CREATION);
 
-    for (int i=0; i< totalSprites; ++i)
+    for (int i = 0; i < totalSprites; ++i)
     {
         auto* sprite = new Sprite();
-        if(sprite == nullptr )
+        if (sprite == nullptr)
         {
             break;
         }
-        if(!sprite->initWithFile(predefineTextures[i % predefineTextures.size()]))
+        if (!sprite->initWithFile(predefineTextures[i % predefineTextures.size()]))
         {
             delete sprite;
             break;
@@ -536,50 +517,54 @@ void SpriteCreation::doTest()
     auto creationDuration = perf.endTick(KEY_CREATION);
     perf.startTick(KEY_DESTROYATION);
 
-    for (int i=0; i< totalSprites; ++i)
+    for (int i = 0; i < totalSprites; ++i)
     {
         spriteCache[i]->release();
     }
     auto destroyDuration = perf.endTick(KEY_DESTROYATION);
     std::stringstream ss;
     auto t1_ms = creationDuration * 1.0 / 1000000;
-    ss << "Create "<< spriteCache.size()  << " sprites takes " << t1_ms<< " ms, " << (int64_t)(spriteCache.size() * 1000 / t1_ms) << " sprites per second!";
+    ss << "Create " << spriteCache.size() << " sprites takes " << t1_ms << " ms, "
+       << (int64_t)(spriteCache.size() * 1000 / t1_ms) << " sprites per second!";
     labelCreate->setString(ss.str());
 
-    if(t1_ms < 100) {
-        suggestDelta =(int) (0.5 * totalSprites);
-    } else if (t1_ms < 1000) {
-        suggestDelta =(int) (0.2 * totalSprites);
-    } else if(t1_ms) {
-        suggestDelta =(int) (0.1 * totalSprites);
+    if (t1_ms < 100)
+    {
+        suggestDelta = (int)(0.5 * totalSprites);
+    }
+    else if (t1_ms < 1000)
+    {
+        suggestDelta = (int)(0.2 * totalSprites);
+    }
+    else if (t1_ms)
+    {
+        suggestDelta = (int)(0.1 * totalSprites);
     }
 
     suggestDelta = suggestDelta < 1000 ? 1000 : suggestDelta - suggestDelta % 1000;
 
     ss.str("");
     auto t2_ms = destroyDuration * 1.0 / 1000000;
-    ss << "Destroy "<< spriteCache.size() << " sprites takes " <<  t2_ms<< " ms, " << (int64_t)(spriteCache.size() * 1000 / t2_ms) << " sprites per second!" ;
+    ss << "Destroy " << spriteCache.size() << " sprites takes " << t2_ms << " ms, "
+       << (int64_t)(spriteCache.size() * 1000 / t2_ms) << " sprites per second!";
     labelDestory->setString(ss.str());
 
     spriteCache.clear();
 }
 
-void SpriteCreation::addSpritesCallback(cocos2d::Ref *)
+void SpriteCreation::addSpritesCallback(cocos2d::Ref*)
 {
     updateSpriteCountLabel(totalSprites + suggestDelta);
     doTest();
 }
 
-void SpriteCreation::delSpritesCallback(cocos2d::Ref *)
+void SpriteCreation::delSpritesCallback(cocos2d::Ref*)
 {
     updateSpriteCountLabel(totalSprites - suggestDelta);
     doTest();
 }
 
-SpriteCreation::~SpriteCreation()
-{
-
-}
+SpriteCreation::~SpriteCreation() {}
 
 std::string SpriteCreation::title() const
 {
@@ -595,29 +580,25 @@ std::string SpriteCreation::subtitle() const
 #endif
 }
 
-
 VBOFullTest::VBOFullTest()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s       = Director::getInstance()->getWinSize();
     Node* parent = Node::create();
-    parent->setPosition(0,0);
+    parent->setPosition(0, 0);
     addChild(parent);
-    
-    for (int i=0; i< Renderer::VBO_SIZE / 3.9; ++i)
+
+    for (int i = 0; i < Renderer::VBO_SIZE / 3.9; ++i)
     {
         Sprite* sprite = Sprite::create("Images/grossini_dance_01.png");
         sprite->setScale(0.1f, 0.1f);
-        float x = ((float)std::rand()) /RAND_MAX;
-        float y = ((float)std::rand()) /RAND_MAX;
+        float x = ((float)std::rand()) / RAND_MAX;
+        float y = ((float)std::rand()) / RAND_MAX;
         sprite->setPosition(Vec2(x * s.width, y * s.height));
         parent->addChild(sprite);
     }
 }
 
-VBOFullTest::~VBOFullTest()
-{
-    
-}
+VBOFullTest::~VBOFullTest() {}
 
 std::string VBOFullTest::title() const
 {
@@ -634,23 +615,23 @@ CaptureScreenTest::CaptureScreenTest()
     Size s = Director::getInstance()->getWinSize();
     Vec2 left(s.width / 4, s.height / 2);
     Vec2 right(s.width / 4 * 3, s.height / 2);
-	
+
     auto sp1 = Sprite::create("Images/grossini.png");
     sp1->setPosition(left);
-    auto move1 = MoveBy::create(1, Vec2(s.width/2, 0.0f));
-    auto seq1 = RepeatForever::create(Sequence::create(move1, move1->reverse(), nullptr));
+    auto move1 = MoveBy::create(1, Vec2(s.width / 2, 0.0f));
+    auto seq1  = RepeatForever::create(Sequence::create(move1, move1->reverse(), nullptr));
     addChild(sp1);
     sp1->runAction(seq1);
     auto sp2 = Sprite::create("Images/grossinis_sister1.png");
     sp2->setPosition(right);
-    auto move2 = MoveBy::create(1, Vec2(-s.width/2, 0.0f));
-    auto seq2 = RepeatForever::create(Sequence::create(move2, move2->reverse(), nullptr));
+    auto move2 = MoveBy::create(1, Vec2(-s.width / 2, 0.0f));
+    auto seq2  = RepeatForever::create(Sequence::create(move2, move2->reverse(), nullptr));
     addChild(sp2);
     sp2->runAction(seq2);
 
     auto label1 = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "capture all");
-    auto mi1 = MenuItemLabel::create(label1, CC_CALLBACK_1(CaptureScreenTest::onCaptured, this));
-    auto menu = Menu::create(mi1, nullptr);
+    auto mi1    = MenuItemLabel::create(label1, CC_CALLBACK_1(CaptureScreenTest::onCaptured, this));
+    auto menu   = Menu::create(mi1, nullptr);
     addChild(menu);
     menu->setPosition(s.width / 2, s.height / 4);
 
@@ -677,12 +658,12 @@ void CaptureScreenTest::onCaptured(Ref*)
     Director::getInstance()->getTextureCache()->removeTextureForKey(_filename);
     removeChildByTag(childTag);
     _filename = "CaptureScreenTest.png";
-    // retain it to avoid crash caused by invoking afterCaptured 
+    // retain it to avoid crash caused by invoking afterCaptured
     this->retain();
     utils::captureScreen(CC_CALLBACK_2(CaptureScreenTest::afterCaptured, this), _filename);
 }
 
-void CaptureScreenTest::afterCaptured(bool succeed, const std::string& outputFile)
+void CaptureScreenTest::afterCaptured(bool succeed, std::string_view outputFile)
 {
     if (succeed)
     {
@@ -711,19 +692,19 @@ CaptureNodeTest::CaptureNodeTest()
     auto sp1 = Sprite::create("Images/grossini.png");
     sp1->setPosition(left);
     auto move1 = MoveBy::create(1, Vec2(s.width / 2, 0.0f));
-    auto seq1 = RepeatForever::create(Sequence::create(move1, move1->reverse(), nullptr));
+    auto seq1  = RepeatForever::create(Sequence::create(move1, move1->reverse(), nullptr));
     addChild(sp1);
     sp1->runAction(seq1);
     auto sp2 = Sprite::create("Images/grossinis_sister1.png");
     sp2->setPosition(right);
     auto move2 = MoveBy::create(1, Vec2(-s.width / 2, 0.0f));
-    auto seq2 = RepeatForever::create(Sequence::create(move2, move2->reverse(), nullptr));
+    auto seq2  = RepeatForever::create(Sequence::create(move2, move2->reverse(), nullptr));
     addChild(sp2);
     sp2->runAction(seq2);
 
     auto label1 = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "capture this scene");
-    auto mi1 = MenuItemLabel::create(label1, CC_CALLBACK_1(CaptureNodeTest::onCaptured, this));
-    auto menu = Menu::create(mi1, nullptr);
+    auto mi1    = MenuItemLabel::create(label1, CC_CALLBACK_1(CaptureNodeTest::onCaptured, this));
+    auto menu   = Menu::create(mi1, nullptr);
     addChild(menu);
     menu->setPosition(s.width / 2, s.height / 4);
 
@@ -746,46 +727,49 @@ std::string CaptureNodeTest::subtitle() const
 }
 
 void CaptureNodeTest::onCaptured(Ref*)
-{ 
+{
     Director::getInstance()->getTextureCache()->removeTextureForKey(_filename);
     removeChildByTag(childTag);
-    
+
     _filename = FileUtils::getInstance()->getWritablePath() + "/CaptureNodeTest.png";
 
     // capture this
-    auto callback = [&](RefPtr<Image> image){
+    auto callback = [&](RefPtr<Image> image) {
         // create a sprite with the captured image directly
         auto sp = Sprite::createWithTexture(Director::getInstance()->getTextureCache()->addImage(image, _filename));
         addChild(sp, 0, childTag);
         Size s = Director::getInstance()->getWinSize();
         sp->setPosition(s.width / 2, s.height / 2);
-        
+
         // store to disk
         image->saveToFile(_filename);
     };
-    
+
     auto callbackFunction = std::bind(callback, std::placeholders::_1);
     utils::captureNode(this, callbackFunction, 0.5);
 }
 
 BugAutoCulling::BugAutoCulling()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s       = Director::getInstance()->getWinSize();
     auto fastmap = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx");
     this->addChild(fastmap);
-    for (int i = 0; i < 30; i++) {
+    for (int i = 0; i < 30; i++)
+    {
         auto sprite = Sprite::create("Images/grossini.png");
-        sprite->setPosition(s.width/2 + s.width/10 * i, s.height/2);
+        sprite->setPosition(s.width / 2 + s.width / 10 * i, s.height / 2);
         this->addChild(sprite);
         auto label = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Label");
-        label->setPosition(s.width/2 + s.width/10 * i, s.height/2);
+        label->setPosition(s.width / 2 + s.width / 10 * i, s.height / 2);
         this->addChild(label);
     }
-    this->scheduleOnce([=](float){
-        auto camera = Director::getInstance()->getRunningScene()->getCameras().front();
-        auto move  = MoveBy::create(2.0f, Vec2(2 * s.width, 0.0f));
-        camera->runAction(Sequence::create(move, move->reverse(),nullptr));
-    }, 1.0f, "lambda-autoculling-bug");
+    this->scheduleOnce(
+        [=](float) {
+            auto camera = Director::getInstance()->getRunningScene()->getCameras().front();
+            auto move   = MoveBy::create(2.0f, Vec2(2 * s.width, 0.0f));
+            camera->runAction(Sequence::create(move, move->reverse(), nullptr));
+        },
+        1.0f, "lambda-autoculling-bug");
 }
 
 std::string BugAutoCulling::title() const
@@ -806,19 +790,19 @@ RendererBatchQuadTri::RendererBatchQuadTri()
 {
     Size s = Director::getInstance()->getWinSize();
 
-    for (int i=0; i<250; i++)
+    for (int i = 0; i < 250; i++)
     {
         int x = CCRANDOM_0_1() * s.width;
         int y = CCRANDOM_0_1() * s.height;
 
         auto label = LabelAtlas::create("This is a label", "fonts/tuffy_bold_italic-charmap.plist");
         label->setColor(Color3B::RED);
-        label->setPosition(Vec2(x,y));
+        label->setPosition(Vec2(x, y));
         addChild(label);
 
         auto sprite = Sprite::create("fonts/tuffy_bold_italic-charmap.png");
-        sprite->setTextureRect(Rect(0.0f,0.0f,100.0f,100.0f));
-        sprite->setPosition(Vec2(x,y));
+        sprite->setTextureRect(Rect(0.0f, 0.0f, 100.0f, 100.0f));
+        sprite->setPosition(Vec2(x, y));
         sprite->setColor(Color3B::BLUE);
         addChild(sprite);
     }
@@ -834,7 +818,6 @@ std::string RendererBatchQuadTri::subtitle() const
     return "QuadCommand and TriangleCommands are batched together";
 }
 
-
 //
 //
 // RendererUniformBatch
@@ -844,24 +827,27 @@ RendererUniformBatch::RendererUniformBatch()
 {
     Size s = Director::getInstance()->getWinSize();
 
-    auto blurState = createBlurProgramState();
+    auto blurState  = createBlurProgramState();
     auto sepiaState = createSepiaProgramState();
 
     auto x_inc = s.width / 20;
     auto y_inc = s.height / 6;
 
-    for (int y=0; y<6; ++y)
+    for (int y = 0; y < 6; ++y)
     {
-        for (int x=0; x<20; ++x)
+        for (int x = 0; x < 20; ++x)
         {
             auto sprite = Sprite::create("Images/grossini.png");
             sprite->setPosition(Vec2(x * x_inc, y * y_inc));
             sprite->setScale(0.4);
             addChild(sprite);
 
-            if (y>=4) {
+            if (y >= 4)
+            {
                 sprite->setProgramState(sepiaState);
-            } else if(y>=2) {
+            }
+            else if (y >= 2)
+            {
                 sprite->setProgramState(blurState);
             }
         }
@@ -870,18 +856,19 @@ RendererUniformBatch::RendererUniformBatch()
 
 cocos2d::backend::ProgramState* RendererUniformBatch::createBlurProgramState()
 {
-    auto programState = new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::BLUR));
+    auto programState =
+        new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::BLUR));
     programState->autorelease();
 
     backend::UniformLocation loc = programState->getUniformLocation("resolution");
-    auto resolution = Vec2(85, 121);
+    auto resolution              = Vec2(85, 121);
     programState->setUniform(loc, &resolution, sizeof(resolution));
 
-    loc = programState->getUniformLocation("blurRadius");
+    loc              = programState->getUniformLocation("blurRadius");
     float blurRadius = 10.0f;
     programState->setUniform(loc, &blurRadius, sizeof(blurRadius));
 
-    loc = programState->getUniformLocation("sampleNum");
+    loc             = programState->getUniformLocation("sampleNum");
     float sampleNum = 5.0f;
     programState->setUniform(loc, &sampleNum, sizeof(sampleNum));
 
@@ -890,9 +877,10 @@ cocos2d::backend::ProgramState* RendererUniformBatch::createBlurProgramState()
 
 cocos2d::backend::ProgramState* RendererUniformBatch::createSepiaProgramState()
 {
-    auto programState = new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::SEPIA));
+    auto programState =
+        new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::SEPIA));
 
-    //programState->updateUniformID();
+    // programState->updateUniformID();
 
     programState->autorelease();
     return programState;
@@ -908,7 +896,6 @@ std::string RendererUniformBatch::subtitle() const
     return "Only 9 draw calls should appear";
 }
 
-
 ////
 //// RendererUniformBatch2
 ////
@@ -917,15 +904,15 @@ RendererUniformBatch2::RendererUniformBatch2()
 {
     Size s = Director::getInstance()->getWinSize();
 
-    auto blurState = createBlurProgramState();
+    auto blurState  = createBlurProgramState();
     auto sepiaState = createSepiaProgramState();
 
     auto x_inc = s.width / 20;
     auto y_inc = s.height / 6;
 
-    for (int y=0; y<6; ++y)
+    for (int y = 0; y < 6; ++y)
     {
-        for (int x=0; x<20; ++x)
+        for (int x = 0; x < 20; ++x)
         {
             auto sprite = Sprite::create("Images/grossini.png");
             sprite->setPosition(Vec2(x * x_inc, y * y_inc));
@@ -943,26 +930,28 @@ RendererUniformBatch2::RendererUniformBatch2()
 
 backend::ProgramState* RendererUniformBatch2::createBlurProgramState()
 {
-    auto programState = new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::BLUR));
+    auto programState =
+        new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::BLUR));
 
     backend::UniformLocation loc = programState->getUniformLocation("resolution");
-    auto resolution = Vec2(85, 121);
+    auto resolution              = Vec2(85, 121);
     programState->setUniform(loc, &resolution, sizeof(resolution));
 
-    loc = programState->getUniformLocation("blurRadius");
+    loc              = programState->getUniformLocation("blurRadius");
     float blurRadius = 10.0f;
     programState->setUniform(loc, &blurRadius, sizeof(blurRadius));
 
-    loc = programState->getUniformLocation("sampleNum");
+    loc             = programState->getUniformLocation("sampleNum");
     float sampleNum = 5.0f;
     programState->setUniform(loc, &sampleNum, sizeof(sampleNum));
 
     return programState;
 }
 
-backend::ProgramState*  RendererUniformBatch2::createSepiaProgramState()
+backend::ProgramState* RendererUniformBatch2::createSepiaProgramState()
 {
-    auto programState = new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::SEPIA));
+    auto programState =
+        new backend::ProgramState(backend::ProgramCache::getInstance()->getCustomProgram(CustomProgramType::SEPIA));
     programState->autorelease();
     return programState;
 }
@@ -979,16 +968,15 @@ std::string RendererUniformBatch2::subtitle() const
 
 NonBatchSprites::NonBatchSprites()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s         = Director::getInstance()->getWinSize();
     _spritesAnchor = Node::create();
     _spritesAnchor->setPosition(0, 0);
     addChild(_spritesAnchor);
 
-
     _totalSprites = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "sprites");
     _totalSprites->setColor(Color3B::YELLOW);
     _totalSprites->enableOutline(Color4B::RED, 2);
-    _totalSprites->setPosition(s.width/2, s.height/2);
+    _totalSprites->setPosition(s.width / 2, s.height / 2);
 
     addChild(_totalSprites);
 
@@ -998,7 +986,7 @@ NonBatchSprites::NonBatchSprites()
 void NonBatchSprites::createSprite()
 {
 
-    Size s = Director::getInstance()->getWinSize();
+    Size s         = Director::getInstance()->getWinSize();
     Sprite* sprite = nullptr;
     if (_spriteIndex % 2 == 0)
     {
@@ -1009,7 +997,8 @@ void NonBatchSprites::createSprite()
         sprite = Sprite::create("Images/grossini_dance_01.png");
     }
 
-    if (!sprite) return;
+    if (!sprite)
+        return;
     auto r = rand_0_1() * 0.6 + 0.2;
     sprite->setScale(r, r);
     float x = ((float)std::rand()) / RAND_MAX;
@@ -1028,7 +1017,7 @@ void NonBatchSprites::createSprite()
 void NonBatchSprites::update(float dt)
 {
 
-    if( dt <= 1.0f / 28.0f && dt >= 1.0f/ 31.0f)
+    if (dt <= 1.0f / 28.0f && dt >= 1.0f / 31.0f)
     {
         _around30fps.hit();
     }
@@ -1037,25 +1026,30 @@ void NonBatchSprites::update(float dt)
         _around30fps.cancel();
     }
 
-    _maDt = 0.7f * _maDt  + 0.3f * dt;
-    _rmaDt = 0.5f * _rmaDt  + 0.5f * dt;
-    if(_maDt <= DEST_DT_30FPS) {
+    _maDt  = 0.7f * _maDt + 0.3f * dt;
+    _rmaDt = 0.5f * _rmaDt + 0.5f * dt;
+    if (_maDt <= DEST_DT_30FPS)
+    {
         _contSlow.cancel();
         _contFast.hit();
-        if(_contFast.ok()){
-            auto t2 = DEST_DT_30FPS - _rmaDt;
+        if (_contFast.ok())
+        {
+            auto t2    = DEST_DT_30FPS - _rmaDt;
             auto delta = (int)(t2 / _rmaDt * _spriteIndex * 0.1);
-            delta =std::min(20, std::max(1, delta));
-            for(int i =0 ;i< delta; i++) {
+            delta      = std::min(20, std::max(1, delta));
+            for (int i = 0; i < delta; i++)
+            {
                 createSprite();
             }
         }
-    }else{
+    }
+    else
+    {
         _contSlow.hit();
         _contFast.cancel();
     }
 
-    if(_contSlow.ok() || _around30fps.ok())
+    if (_contSlow.ok() || _around30fps.ok())
     {
         unscheduleUpdate();
         std::stringstream ss;
@@ -1065,10 +1059,7 @@ void NonBatchSprites::update(float dt)
     }
 }
 
-NonBatchSprites::~NonBatchSprites()
-{
-
-}
+NonBatchSprites::~NonBatchSprites() {}
 
 std::string NonBatchSprites::title() const
 {
@@ -1083,4 +1074,3 @@ std::string NonBatchSprites::subtitle() const
     return "RELEASE: simulate lots of sprites, drop to 30 fps";
 #endif
 }
-
diff --git a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h
index 5318e3de7780..68daf4a1a1a0 100644
--- a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h
+++ b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,8 +29,8 @@
 #include "../BaseTest.h"
 
 #define kTagSpriteBatchNode 100
-#define kTagClipperNode     101
-#define kTagContentNode     102
+#define kTagClipperNode 101
+#define kTagContentNode 102
 
 DEFINE_TEST_SUITE(NewRendererTests);
 
@@ -41,7 +41,6 @@ class MultiSceneTest : public TestCase
     virtual std::string subtitle() const override;
 
 protected:
-
 };
 
 class NewSpriteTest : public MultiSceneTest
@@ -65,10 +64,10 @@ class GroupCommandTest : public MultiSceneTest
 {
 public:
     CREATE_FUNC(GroupCommandTest);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     GroupCommandTest();
     virtual ~GroupCommandTest();
@@ -77,14 +76,13 @@ class GroupCommandTest : public MultiSceneTest
 class NewClippingNodeTest : public MultiSceneTest
 {
 public:
-
     CREATE_FUNC(NewClippingNodeTest);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
 protected:
     NewClippingNodeTest();
@@ -97,7 +95,6 @@ class NewClippingNodeTest : public MultiSceneTest
 class NewDrawNodeTest : public MultiSceneTest
 {
 public:
-
     CREATE_FUNC(NewDrawNodeTest)
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -110,16 +107,15 @@ class NewDrawNodeTest : public MultiSceneTest
 class NewCullingTest : public MultiSceneTest
 {
 public:
-    
     CREATE_FUNC(NewCullingTest)
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     NewCullingTest();
     virtual ~NewCullingTest();
-    bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event  *event);
-    void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event  *event);
+    bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
+    void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
     cocos2d::Vec2 _lastPos;
 };
 
@@ -130,24 +126,23 @@ class SpriteCreation : public MultiSceneTest
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 
-    void addSpritesCallback(Ref *);
-    void delSpritesCallback(Ref *);
+    void addSpritesCallback(Ref*);
+    void delSpritesCallback(Ref*);
 
     void updateSpriteCountLabel(int x);
 
     void doTest();
 
 protected:
-    int totalSprites = 1000;
-    int suggestDelta = 100;
-    cocos2d::Label*   _labelSpriteNum = nullptr;
-    cocos2d::Label*   labelCreate = nullptr;
-    cocos2d::Label*   labelDestory = nullptr;
+    int totalSprites                = 1000;
+    int suggestDelta                = 100;
+    cocos2d::Label* _labelSpriteNum = nullptr;
+    cocos2d::Label* labelCreate     = nullptr;
+    cocos2d::Label* labelDestory    = nullptr;
     SpriteCreation();
     virtual ~SpriteCreation();
 };
 
-
 class VBOFullTest : public MultiSceneTest
 {
 public:
@@ -160,10 +155,10 @@ class VBOFullTest : public MultiSceneTest
     virtual ~VBOFullTest();
 };
 
-
 class CaptureScreenTest : public MultiSceneTest
 {
     static const int childTag = 119;
+
 public:
     CREATE_FUNC(CaptureScreenTest);
     virtual std::string title() const override;
@@ -174,7 +169,7 @@ class CaptureScreenTest : public MultiSceneTest
     ~CaptureScreenTest();
 
     void onCaptured(cocos2d::Ref*);
-    void afterCaptured(bool succeed, const std::string& outputFile);
+    void afterCaptured(bool succeed, std::string_view outputFile);
 
     std::string _filename;
 };
@@ -182,6 +177,7 @@ class CaptureScreenTest : public MultiSceneTest
 class CaptureNodeTest : public MultiSceneTest
 {
     static const int childTag = 120;
+
 public:
     CREATE_FUNC(CaptureNodeTest);
     virtual std::string title() const override;
@@ -202,6 +198,7 @@ class BugAutoCulling : public MultiSceneTest
     CREATE_FUNC(BugAutoCulling);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 protected:
     BugAutoCulling();
 };
@@ -212,17 +209,18 @@ class RendererBatchQuadTri : public MultiSceneTest
     CREATE_FUNC(RendererBatchQuadTri);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 protected:
     RendererBatchQuadTri();
 };
 
-
 class RendererUniformBatch : public MultiSceneTest
 {
 public:
     CREATE_FUNC(RendererUniformBatch);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 protected:
     RendererUniformBatch();
 
@@ -236,6 +234,7 @@ class RendererUniformBatch2 : public MultiSceneTest
     CREATE_FUNC(RendererUniformBatch2);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 protected:
     RendererUniformBatch2();
 
@@ -251,30 +250,33 @@ class NonBatchSprites : public MultiSceneTest
     virtual std::string subtitle() const override;
 
     virtual void update(float dt) override;
+
 protected:
     NonBatchSprites();
 
     void createSprite();
 
     virtual ~NonBatchSprites();
-    class Ticker {
+    class Ticker
+    {
     public:
-        Ticker(int m):_max(m) {}
-        void hit() {_cnt += 1;}
-        void cancel() {_cnt = 0;}
-        bool ok() {return _cnt >= _max;}
+        Ticker(int m) : _max(m) {}
+        void hit() { _cnt += 1; }
+        void cancel() { _cnt = 0; }
+        bool ok() { return _cnt >= _max; }
+
     private:
         int _cnt = 0;
         int _max = 0;
     };
-    Node *_spritesAnchor = nullptr;
-    int _spriteIndex = 0;
-    float _maDt = 1.0f / 60.0f;
-    float _rmaDt =  1.0f/ 60.0f;
-    const float DEST_DT_30FPS = 1.0f / 30.0f;
-    cocos2d::Label * _totalSprites = nullptr;
-    Ticker _contSlow = Ticker(20);
-    Ticker _contFast = Ticker(2);
-    Ticker _around30fps = Ticker(60 * 3);
+    Node* _spritesAnchor          = nullptr;
+    int _spriteIndex              = 0;
+    float _maDt                   = 1.0f / 60.0f;
+    float _rmaDt                  = 1.0f / 60.0f;
+    const float DEST_DT_30FPS     = 1.0f / 30.0f;
+    cocos2d::Label* _totalSprites = nullptr;
+    Ticker _contSlow              = Ticker(20);
+    Ticker _contFast              = Ticker(2);
+    Ticker _around30fps           = Ticker(60 * 3);
 };
-#endif //__NewRendererTest_H_
+#endif  //__NewRendererTest_H_
diff --git a/tests/cpp-tests/Classes/NodeTest/NodeTest.cpp b/tests/cpp-tests/Classes/NodeTest/NodeTest.cpp
index 57435f4dd972..dc5f9d5ccf9b 100644
--- a/tests/cpp-tests/Classes/NodeTest/NodeTest.cpp
+++ b/tests/cpp-tests/Classes/NodeTest/NodeTest.cpp
@@ -30,7 +30,7 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
     kTagSprite1 = 1,
     kTagSprite2 = 2,
@@ -38,7 +38,6 @@ enum
     kTagSlider,
 };
 
-
 //------------------------------------------------------------------
 //
 // TestCocosNodeDemo
@@ -62,7 +61,7 @@ CocosNodeTests::CocosNodeTests()
     ADD_TEST_CASE(SchedulerCallbackTest);
     ADD_TEST_CASE(CameraOrbitTest);
     // TODO: Camera has been removed from CCNode; add new feature to support it
-    //ADD_TEST_CASE(CameraZoomTest);
+    // ADD_TEST_CASE(CameraZoomTest);
     ADD_TEST_CASE(ConvertToNode);
     ADD_TEST_CASE(NodeOpaqueTest);
     ADD_TEST_CASE(NodeNonOpaqueTest);
@@ -75,13 +74,9 @@ CocosNodeTests::CocosNodeTests()
     ADD_TEST_CASE(Issue16735Test);
 }
 
-TestCocosNodeDemo::TestCocosNodeDemo(void)
-{
-}
+TestCocosNodeDemo::TestCocosNodeDemo(void) {}
 
-TestCocosNodeDemo::~TestCocosNodeDemo(void)
-{
-}
+TestCocosNodeDemo::~TestCocosNodeDemo(void) {}
 
 std::string TestCocosNodeDemo::title() const
 {
@@ -99,36 +94,31 @@ void NodeTest2::onEnter()
     TestCocosNodeDemo::onEnter();
 
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto sp1 = Sprite::create(s_pathSister1);
     auto sp2 = Sprite::create(s_pathSister2);
     auto sp3 = Sprite::create(s_pathSister1);
     auto sp4 = Sprite::create(s_pathSister2);
-    
-    sp1->setPosition(Vec2(100.0f, s.height /2 ));
-    sp2->setPosition(Vec2(380.0f, s.height /2 ));
+
+    sp1->setPosition(Vec2(100.0f, s.height / 2));
+    sp2->setPosition(Vec2(380.0f, s.height / 2));
     addChild(sp1);
     addChild(sp2);
-    
+
     sp3->setScale(0.25f);
     sp4->setScale(0.25f);
-    
+
     sp1->addChild(sp3);
     sp2->addChild(sp4);
-    
+
     auto a1 = RotateBy::create(2, 360);
     auto a2 = ScaleBy::create(2, 2);
-    
-    auto action1 = RepeatForever::create( Sequence::create(a1, a2, a2->reverse(), nullptr) );
-    auto action2 = RepeatForever::create( Sequence::create(
-																	a1->clone(),
-																	a2->clone(),
-																	a2->reverse(),
-																	nullptr)
-												);
-    
-    sp2->setAnchorPoint(Vec2(0,0));
-    
+
+    auto action1 = RepeatForever::create(Sequence::create(a1, a2, a2->reverse(), nullptr));
+    auto action2 = RepeatForever::create(Sequence::create(a1->clone(), a2->clone(), a2->reverse(), nullptr));
+
+    sp2->setAnchorPoint(Vec2(0, 0));
+
     sp1->runAction(action1);
     sp2->runAction(action2);
 }
@@ -138,33 +128,32 @@ std::string NodeTest2::subtitle() const
     return "anchorPoint and children";
 }
 
-
 //------------------------------------------------------------------
 //
 // NodeTest4
 //
 //------------------------------------------------------------------
-#define SID_DELAY2        1
-#define SID_DELAY4        2
+#define SID_DELAY2 1
+#define SID_DELAY4 2
 
 NodeTest4::NodeTest4()
 {
     auto sp1 = Sprite::create(s_pathSister1);
     auto sp2 = Sprite::create(s_pathSister2);
-    
-    sp1->setPosition( Vec2(100,160) );
-    sp2->setPosition( Vec2(380,160) );
-    
+
+    sp1->setPosition(Vec2(100, 160));
+    sp2->setPosition(Vec2(380, 160));
+
     addChild(sp1, 0, 2);
     addChild(sp2, 0, 3);
-    
+
     schedule(CC_CALLBACK_1(NodeTest4::delay2, this), 2.0f, "delay2_key");
     schedule(CC_CALLBACK_1(NodeTest4::delay4, this), 4.0f, "delay4_key");
 }
 
 void NodeTest4::delay2(float dt)
 {
-    auto node = static_cast<Sprite*>(getChildByTag(2));
+    auto node    = static_cast<Sprite*>(getChildByTag(2));
     auto action1 = RotateBy::create(1, 360);
     node->runAction(action1);
 }
@@ -180,7 +169,6 @@ std::string NodeTest4::subtitle() const
     return "tags";
 }
 
-
 //------------------------------------------------------------------
 //
 // NodeTest5
@@ -190,23 +178,23 @@ NodeTest5::NodeTest5()
 {
     auto sp1 = Sprite::create(s_pathSister1);
     auto sp2 = Sprite::create(s_pathSister2);
-    
-    sp1->setPosition(Vec2(100.0f,160.0f));
-    sp2->setPosition(Vec2(380.0f,160.0f));
 
-    auto rot = RotateBy::create(2.0f, 360.0f);
+    sp1->setPosition(Vec2(100.0f, 160.0f));
+    sp2->setPosition(Vec2(380.0f, 160.0f));
+
+    auto rot      = RotateBy::create(2.0f, 360.0f);
     auto rot_back = rot->reverse();
-    auto forever = RepeatForever::create(Sequence::create(rot, rot_back, nullptr));
+    auto forever  = RepeatForever::create(Sequence::create(rot, rot_back, nullptr));
     auto forever2 = forever->clone();
     forever->setTag(101);
     forever2->setTag(102);
-                                                  
+
     addChild(sp1, 0, kTagSprite1);
     addChild(sp2, 0, kTagSprite2);
-            
+
     sp1->runAction(forever);
     sp2->runAction(forever2);
-    
+
     schedule(CC_CALLBACK_1(NodeTest5::addAndRemove, this), 2.0f, "add_and_remove_key");
 }
 
@@ -217,13 +205,13 @@ void NodeTest5::addAndRemove(float dt)
 
     sp1->retain();
     sp2->retain();
-    
+
     removeChild(sp1, false);
     removeChild(sp2, true);
-    
+
     addChild(sp1, 0, kTagSprite1);
     addChild(sp2, 0, kTagSprite2);
-    
+
     sp1->release();
     sp2->release();
 }
@@ -240,33 +228,33 @@ std::string NodeTest5::subtitle() const
 //------------------------------------------------------------------
 NodeTest6::NodeTest6()
 {
-    auto sp1 = Sprite::create(s_pathSister1);
+    auto sp1  = Sprite::create(s_pathSister1);
     auto sp11 = Sprite::create(s_pathSister1);
 
-    auto sp2 = Sprite::create(s_pathSister2);
+    auto sp2  = Sprite::create(s_pathSister2);
     auto sp21 = Sprite::create(s_pathSister2);
-        
-    sp1->setPosition(Vec2(100.0f,160.0f));
-    sp2->setPosition(Vec2(380.0f,160.0f));
-        
-    auto rot = RotateBy::create(2.0f, 360.0f);
-    auto rot_back = rot->reverse();
-    auto forever1 = RepeatForever::create(Sequence::create(rot, rot_back, nullptr));
+
+    sp1->setPosition(Vec2(100.0f, 160.0f));
+    sp2->setPosition(Vec2(380.0f, 160.0f));
+
+    auto rot       = RotateBy::create(2.0f, 360.0f);
+    auto rot_back  = rot->reverse();
+    auto forever1  = RepeatForever::create(Sequence::create(rot, rot_back, nullptr));
     auto forever11 = forever1->clone();
 
-    auto forever2 = forever1->clone();
+    auto forever2  = forever1->clone();
     auto forever21 = forever1->clone();
-    
+
     addChild(sp1, 0, kTagSprite1);
     sp1->addChild(sp11);
     addChild(sp2, 0, kTagSprite2);
     sp2->addChild(sp21);
-    
+
     sp1->runAction(forever1);
     sp11->runAction(forever11);
     sp2->runAction(forever2);
     sp21->runAction(forever21);
-    
+
     schedule(CC_CALLBACK_1(NodeTest6::addAndRemove, this), 2.0f, "add_and_remove_key");
 }
 
@@ -277,16 +265,15 @@ void NodeTest6::addAndRemove(float dt)
 
     sp1->retain();
     sp2->retain();
-    
+
     removeChild(sp1, false);
     removeChild(sp2, true);
-    
+
     addChild(sp1, 0, kTagSprite1);
     addChild(sp2, 0, kTagSprite2);
-    
+
     sp1->release();
     sp2->release();
-
 }
 
 std::string NodeTest6::subtitle() const
@@ -294,7 +281,6 @@ std::string NodeTest6::subtitle() const
     return "remove/cleanup with children";
 }
 
-
 //------------------------------------------------------------------
 //
 // StressTest1
@@ -306,8 +292,8 @@ StressTest1::StressTest1()
 
     auto sp1 = Sprite::create(s_pathSister1);
     addChild(sp1, 0, kTagSprite1);
-    
-    sp1->setPosition( Vec2(s.width/2, s.height/2) );        
+
+    sp1->setPosition(Vec2(s.width / 2, s.height / 2));
 
     schedule(CC_CALLBACK_1(StressTest1::shouldNotCrash, this), 1.0f, "should_not_crash_key");
 }
@@ -321,17 +307,15 @@ void StressTest1::shouldNotCrash(float dt)
     // if the node has timers, it crashes
     auto explosion = ParticleSun::create();
     explosion->setTexture(Director::getInstance()->getTextureCache()->addImage("Images/fire.png"));
-    
+
     // if it doesn't, it works Ok.
-//    auto explosion = [Sprite create:@"grossinis_sister2.png");
-
-    explosion->setPosition( Vec2(s.width/2, s.height/2) );
-    
-    runAction( Sequence::create(
-                            RotateBy::create(2, 360),
-                            CallFuncN::create(CC_CALLBACK_1(StressTest1::removeMe, this)),
-                            nullptr) );
-    
+    //    auto explosion = [Sprite create:@"grossinis_sister2.png");
+
+    explosion->setPosition(Vec2(s.width / 2, s.height / 2));
+
+    runAction(Sequence::create(RotateBy::create(2, 360), CallFuncN::create(CC_CALLBACK_1(StressTest1::removeMe, this)),
+                               nullptr));
+
     addChild(explosion);
 }
 
@@ -341,7 +325,6 @@ void StressTest1::removeMe(Node* node)
     getTestSuite()->enterNextTest();
 }
 
-
 std::string StressTest1::subtitle() const
 {
     return "stress test #1: no crashes";
@@ -355,38 +338,38 @@ std::string StressTest1::subtitle() const
 StressTest2::StressTest2()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto sublayer = Layer::create();
-    
+
     auto sp1 = Sprite::create(s_pathSister1);
-    sp1->setPosition( Vec2(80.0f, s.height/2) );
-    
-    auto move = MoveBy::create(3, Vec2(350.0f,0.0f));
-    auto move_ease_inout3 = EaseInOut::create(move->clone(), 2.0f);
+    sp1->setPosition(Vec2(80.0f, s.height / 2));
+
+    auto move                  = MoveBy::create(3, Vec2(350.0f, 0.0f));
+    auto move_ease_inout3      = EaseInOut::create(move->clone(), 2.0f);
     auto move_ease_inout_back3 = move_ease_inout3->reverse();
-    auto seq3 = Sequence::create( move_ease_inout3, move_ease_inout_back3, nullptr);
-    sp1->runAction( RepeatForever::create(seq3) );
+    auto seq3                  = Sequence::create(move_ease_inout3, move_ease_inout_back3, nullptr);
+    sp1->runAction(RepeatForever::create(seq3));
     sublayer->addChild(sp1, 1);
 
     auto fire = ParticleFire::create();
     fire->setTexture(Director::getInstance()->getTextureCache()->addImage("Images/fire.png"));
-    fire->setPosition( Vec2(80.0f, s.height/2-50) );
-    
+    fire->setPosition(Vec2(80.0f, s.height / 2 - 50));
+
     auto copy_seq3 = seq3->clone();
 
-    fire->runAction( RepeatForever::create(copy_seq3) );
+    fire->runAction(RepeatForever::create(copy_seq3));
     sublayer->addChild(fire, 2);
-            
-    schedule(CC_CALLBACK_1(StressTest2::shouldNotLeak,this), 6.0f, "should_not_leak_key");
-    
+
+    schedule(CC_CALLBACK_1(StressTest2::shouldNotLeak, this), 6.0f, "should_not_leak_key");
+
     addChild(sublayer, 0, kTagSprite1);
 }
 
 void StressTest2::shouldNotLeak(float dt)
 {
     unschedule("should_not_leak_key");
-    auto sublayer = static_cast<Layer*>( getChildByTag(kTagSprite1) );
-    sublayer->removeAllChildrenWithCleanup(true); 
+    auto sublayer = static_cast<Layer*>(getChildByTag(kTagSprite1));
+    sublayer->removeAllChildrenWithCleanup(true);
 }
 
 std::string StressTest2::subtitle() const
@@ -394,7 +377,6 @@ std::string StressTest2::subtitle() const
     return "stress test #2: no leaks";
 }
 
-
 //------------------------------------------------------------------
 //
 // SchedulerTest1
@@ -403,22 +385,20 @@ std::string StressTest2::subtitle() const
 SchedulerTest1::SchedulerTest1()
 {
     auto layer = Layer::create();
-    //CCLOG("retain count after init is %d", layer->getReferenceCount());                // 1
-    
+    // CCLOG("retain count after init is %d", layer->getReferenceCount());                // 1
+
     addChild(layer, 0);
-    //CCLOG("retain count after addChild is %d", layer->getReferenceCount());      // 2
-    
+    // CCLOG("retain count after addChild is %d", layer->getReferenceCount());      // 2
+
     layer->schedule(CC_CALLBACK_1(SchedulerTest1::doSomething, this), "do_something_key");
-    //CCLOG("retain count after schedule is %d", layer->getReferenceCount());      // 3 : (objective-c version), but win32 version is still 2, because Timer class don't save target.
-    
+    // CCLOG("retain count after schedule is %d", layer->getReferenceCount());      // 3 : (objective-c version), but
+    // win32 version is still 2, because Timer class don't save target.
+
     layer->unschedule("do_something_key");
-    //CCLOG("retain count after unschedule is %d", layer->getReferenceCount());        // STILL 3!  (win32 is '2')
+    // CCLOG("retain count after unschedule is %d", layer->getReferenceCount());        // STILL 3!  (win32 is '2')
 }
 
-void SchedulerTest1::doSomething(float dt)
-{
-
-}
+void SchedulerTest1::doSomething(float dt) {}
 
 std::string SchedulerTest1::subtitle() const
 {
@@ -437,21 +417,20 @@ SchedulerCallbackTest::SchedulerCallbackTest()
     node->setName("a node");
 
     _total = 0;
-    node->schedule([&](float dt) {
-        _total += dt;
-        log("hello world: %f - total: %f", dt, _total);
-    }
-                   ,0.5
-                   ,"some_key");
-
-
-    node->scheduleOnce([&](float dt) {
-        // the local variable "node" will go out of scope, so I have to get it from "this"
-        auto anode = this->getChildByName("a node");
-        anode->unschedule("some_key");
-    }
-                       ,5
-                       ,"ignore_key");
+    node->schedule(
+        [&](float dt) {
+            _total += dt;
+            log("hello world: %f - total: %f", dt, _total);
+        },
+        0.5, "some_key");
+
+    node->scheduleOnce(
+        [&](float dt) {
+            // the local variable "node" will go out of scope, so I have to get it from "this"
+            auto anode = this->getChildByName("a node");
+            anode->unschedule("some_key");
+        },
+        5, "ignore_key");
 }
 
 void SchedulerCallbackTest::onEnter()
@@ -478,24 +457,24 @@ NodeToWorld::NodeToWorld()
     //  - It tests different children anchor points
 
     auto back = Sprite::create(s_back3);
-    addChild( back, -10);
-    back->setAnchorPoint( Vec2(0,0) );
+    addChild(back, -10);
+    back->setAnchorPoint(Vec2(0, 0));
     auto backSize = back->getContentSize();
-    
+
     auto item = MenuItemImage::create(s_PlayNormal, s_PlaySelect);
     auto menu = Menu::create(item, nullptr);
     menu->alignItemsVertically();
-    menu->setPosition( Vec2(backSize.width/2, backSize.height/2));
+    menu->setPosition(Vec2(backSize.width / 2, backSize.height / 2));
     back->addChild(menu);
-    
+
     auto rot = RotateBy::create(5.0f, 360.0f);
-    auto fe = RepeatForever::create( rot);
-    item->runAction( fe );
-    
-    auto move = MoveBy::create(3.0f, Vec2(200.0f,0.0f));
+    auto fe  = RepeatForever::create(rot);
+    item->runAction(fe);
+
+    auto move      = MoveBy::create(3.0f, Vec2(200.0f, 0.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create( move, move_back, nullptr);
-    auto fe2 = RepeatForever::create(seq);
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    auto fe2       = RepeatForever::create(seq);
     back->runAction(fe2);
 }
 
@@ -516,32 +495,32 @@ NodeToWorld3D::NodeToWorld3D()
     //  - It tests different anchor Points
     //  - It tests different children anchor points
 
-    Size s = Director::getInstance()->getWinSize();
+    Size s      = Director::getInstance()->getWinSize();
     auto parent = Node::create();
     parent->setContentSize(s);
     parent->setAnchorPoint(Vec2(0.5f, 0.5f));
-    parent->setPosition(s.width/2, s.height/2);
+    parent->setPosition(s.width / 2, s.height / 2);
     this->addChild(parent);
 
     auto back = Sprite::create(s_back3);
-    parent->addChild( back, -10);
-    back->setAnchorPoint( Vec2(0.0f,0.0f) );
+    parent->addChild(back, -10);
+    back->setAnchorPoint(Vec2(0.0f, 0.0f));
     auto backSize = back->getContentSize();
 
     auto item = MenuItemImage::create(s_PlayNormal, s_PlaySelect);
     auto menu = Menu::create(item, nullptr);
     menu->alignItemsVertically();
-    menu->setPosition( Vec2(backSize.width/2, backSize.height/2));
+    menu->setPosition(Vec2(backSize.width / 2, backSize.height / 2));
     back->addChild(menu);
 
     auto rot = RotateBy::create(5, 360);
-    auto fe = RepeatForever::create( rot);
-    item->runAction( fe );
+    auto fe  = RepeatForever::create(rot);
+    item->runAction(fe);
 
-    auto move = MoveBy::create(3, Vec2(200.0f,0.0f));
+    auto move      = MoveBy::create(3, Vec2(200.0f, 0.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create( move, move_back, nullptr);
-    auto fe2 = RepeatForever::create(seq);
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    auto fe2       = RepeatForever::create(seq);
     back->runAction(fe2);
 
     auto orbit = OrbitCamera::create(10, 0, 1, 0, 360, 0, 90);
@@ -553,7 +532,6 @@ std::string NodeToWorld3D::subtitle() const
     return "nodeToParent transform in 3D";
 }
 
-
 //------------------------------------------------------------------
 //
 // CameraOrbitTest
@@ -581,47 +559,44 @@ CameraOrbitTest::CameraOrbitTest()
     auto s = Director::getInstance()->getWinSize();
 
     auto p = Sprite::create(s_back3);
-    addChild( p, 0);
-    p->setPosition( Vec2(s.width/2, s.height/2) );
-    p->setOpacity( 128 );
-    
+    addChild(p, 0);
+    p->setPosition(Vec2(s.width / 2, s.height / 2));
+    p->setOpacity(128);
+
     Sprite* sprite;
     OrbitCamera* orbit;
     Size ss;
 
     // LEFT
-    s = p->getContentSize();
+    s      = p->getContentSize();
     sprite = Sprite::create(s_pathGrossini);
     sprite->setScale(0.5f);
-    p->addChild(sprite, 0);        
-    sprite->setPosition( Vec2(s.width/4*1, s.height/2) );
+    p->addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 4 * 1, s.height / 2));
     orbit = OrbitCamera::create(2, 1, 0, 0, 360, 0, 0);
-    sprite->runAction( RepeatForever::create( orbit ) );
-    
+    sprite->runAction(RepeatForever::create(orbit));
+
     // CENTER
     sprite = Sprite::create(s_pathGrossini);
-    sprite->setScale( 1.0f );
-    p->addChild(sprite, 0);        
-    sprite->setPosition( Vec2(s.width/4*2, s.height/2) );
+    sprite->setScale(1.0f);
+    p->addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 4 * 2, s.height / 2));
     orbit = OrbitCamera::create(2, 1, 0, 0, 360, 45, 0);
-    sprite->runAction( RepeatForever::create( orbit ) );
-    
-    
+    sprite->runAction(RepeatForever::create(orbit));
+
     // RIGHT
     sprite = Sprite::create(s_pathGrossini);
-    sprite->setScale( 2.0f );
-    p->addChild(sprite, 0);        
-    sprite->setPosition( Vec2(s.width/4*3, s.height/2) );
-    ss = sprite->getContentSize();        
-    orbit = OrbitCamera::create(2, 1, 0, 0, 360, 90, -45),
-    sprite->runAction( RepeatForever::create(orbit) );
-            
-    
+    sprite->setScale(2.0f);
+    p->addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 4 * 3, s.height / 2));
+    ss    = sprite->getContentSize();
+    orbit = OrbitCamera::create(2, 1, 0, 0, 360, 90, -45), sprite->runAction(RepeatForever::create(orbit));
+
     // PARENT
     orbit = OrbitCamera::create(10, 1, 0, 0, 360, 0, 90);
-    p->runAction( RepeatForever::create( orbit ) );
+    p->runAction(RepeatForever::create(orbit));
 
-    setScale( 1 );
+    setScale(1);
 }
 
 std::string CameraOrbitTest::subtitle() const
@@ -651,27 +626,27 @@ void CameraZoomTest::onExit()
 CameraZoomTest::CameraZoomTest()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    Sprite *sprite;
-//    Camera *cam;
-    
+
+    Sprite* sprite;
+    //    Camera *cam;
+
     // LEFT
     sprite = Sprite::create(s_pathGrossini);
-    addChild( sprite, 0);        
-    sprite->setPosition( Vec2(s.width/4*1, s.height/2) );
-//    cam = sprite->getCamera();
-//    cam->setEye(0, 0, 415/2);
-//    cam->setCenter(0, 0, 0);
+    addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 4 * 1, s.height / 2));
+    //    cam = sprite->getCamera();
+    //    cam->setEye(0, 0, 415/2);
+    //    cam->setCenter(0, 0, 0);
 
     // CENTER
     sprite = Sprite::create(s_pathGrossini);
-    addChild( sprite, 0, 40);
-    sprite->setPosition(Vec2(s.width/4*2, s.height/2));
-    
+    addChild(sprite, 0, 40);
+    sprite->setPosition(Vec2(s.width / 4 * 2, s.height / 2));
+
     // RIGHT
     sprite = Sprite::create(s_pathGrossini);
-    addChild( sprite, 0, 20);
-    sprite->setPosition(Vec2(s.width/4*3, s.height/2));
+    addChild(sprite, 0, 20);
+    sprite->setPosition(Vec2(s.width / 4 * 3, s.height / 2));
 
     _z = 0;
     scheduleUpdate();
@@ -679,18 +654,18 @@ CameraZoomTest::CameraZoomTest()
 
 void CameraZoomTest::update(float dt)
 {
-    Node *sprite;
-//    Camera *cam;
+    Node* sprite;
+    //    Camera *cam;
 
     _z += dt * 100;
-    
+
     sprite = getChildByTag(20);
-//    cam = sprite->getCamera();
-//    cam->setEye(0, 0, _z);
+    //    cam = sprite->getCamera();
+    //    cam->setEye(0, 0, _z);
 
     sprite = getChildByTag(40);
-//    cam = sprite->getCamera();
-//    cam->setEye(0, 0, -_z);    
+    //    cam = sprite->getCamera();
+    //    cam->setEye(0, 0, -_z);
 }
 
 std::string CameraZoomTest::subtitle() const
@@ -719,59 +694,55 @@ void CameraCenterTest::onExit()
 CameraCenterTest::CameraCenterTest()
 {
     auto s = Director::getInstance()->getWinSize();
-            
-    Sprite *sprite;
-    OrbitCamera *orbit;
-    
+
+    Sprite* sprite;
+    OrbitCamera* orbit;
+
     // LEFT-TOP
     sprite = Sprite::create("Images/white-512x512.png");
-    addChild( sprite, 0);
-    sprite->setPosition(Vec2(s.width/5*1, s.height/5*1));
+    addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 5 * 1, s.height / 5 * 1));
     sprite->setColor(Color3B::RED);
     sprite->setTextureRect(Rect(0.0f, 0.0f, 120.0f, 50.0f));
     orbit = OrbitCamera::create(10.0f, 1.0f, 0.0f, 0.0f, 360.0f, 0.0f, 0.0f);
-    sprite->runAction(RepeatForever::create( orbit ));
-//        [sprite setAnchorPoint: Vec2(0,1));
+    sprite->runAction(RepeatForever::create(orbit));
+    //        [sprite setAnchorPoint: Vec2(0,1));
 
-    
-    
     // LEFT-BOTTOM
     sprite = Sprite::create("Images/white-512x512.png");
-    addChild( sprite, 0, 40);
-    sprite->setPosition(Vec2(s.width/5*1, s.height/5*4));
+    addChild(sprite, 0, 40);
+    sprite->setPosition(Vec2(s.width / 5 * 1, s.height / 5 * 4));
     sprite->setColor(Color3B::BLUE);
     sprite->setTextureRect(Rect(0.0f, 0.0f, 120.0f, 50.0f));
     orbit = OrbitCamera::create(10.0f, 1.0f, 0.0f, 0.0f, 360.0f, 0.0f, 0.0f);
-    sprite->runAction(RepeatForever::create( orbit ));
-
+    sprite->runAction(RepeatForever::create(orbit));
 
     // RIGHT-TOP
     sprite = Sprite::create("Images/white-512x512.png");
-    addChild( sprite, 0);    
-    sprite->setPosition(Vec2(s.width/5*4, s.height/5*1));
+    addChild(sprite, 0);
+    sprite->setPosition(Vec2(s.width / 5 * 4, s.height / 5 * 1));
     sprite->setColor(Color3B::YELLOW);
     sprite->setTextureRect(Rect(0.0f, 0.0f, 120.0f, 50.0f));
     orbit = OrbitCamera::create(10.0f, 1.0f, 0.0f, 0.0f, 360.0f, 0.0f, 0.0f);
-    sprite->runAction(RepeatForever::create( orbit) );
+    sprite->runAction(RepeatForever::create(orbit));
 
-    
     // RIGHT-BOTTOM
     sprite = Sprite::create("Images/white-512x512.png");
-    addChild( sprite, 0, 40);
-    sprite->setPosition(Vec2(s.width/5*4, s.height/5*4));
+    addChild(sprite, 0, 40);
+    sprite->setPosition(Vec2(s.width / 5 * 4, s.height / 5 * 4));
     sprite->setColor(Color3B::GREEN);
     sprite->setTextureRect(Rect(0.0f, 0.0f, 120.0f, 50.0f));
     orbit = OrbitCamera::create(10.0f, 1.0f, 0.0f, 0.0f, 360.0f, 0.0f, 0.0f);
-    sprite->runAction( RepeatForever::create( orbit ) );
+    sprite->runAction(RepeatForever::create(orbit));
 
     // CENTER
     sprite = Sprite::create("Images/white-512x512.png");
-    addChild( sprite, 0, 40);
-    sprite->setPosition(Vec2(s.width/2, s.height/2));
+    addChild(sprite, 0, 40);
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
     sprite->setColor(Color3B::WHITE);
     sprite->setTextureRect(Rect(0.0f, 0.0f, 120.0f, 50.0f));
     orbit = OrbitCamera::create(10.0f, 1.0f, 0.0f, 0.0f, 360.0f, 0.0f, 0.0f);
-    sprite->runAction(RepeatForever::create( orbit ) );
+    sprite->runAction(RepeatForever::create(orbit));
 }
 
 std::string CameraCenterTest::title() const
@@ -791,25 +762,25 @@ std::string CameraCenterTest::subtitle() const
 //------------------------------------------------------------------
 ConvertToNode::ConvertToNode()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(ConvertToNode::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto s = Director::getInstance()->getWinSize();
 
     auto rotate = RotateBy::create(10, 360);
     auto action = RepeatForever::create(rotate);
-    for(int i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++)
     {
         auto sprite = Sprite::create("Images/grossini.png");
-        sprite->setPosition(Vec2( s.width/4*(i+1), s.height/2));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
 
         auto point = Sprite::create("Images/r1.png");
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 10, 100 + i);
 
-        switch(i)
+        switch (i)
         {
         case 0:
             sprite->setAnchorPoint(Vec2::ZERO);
@@ -818,26 +789,26 @@ ConvertToNode::ConvertToNode()
             sprite->setAnchorPoint(Vec2(0.5f, 0.5f));
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2(1,1));
+            sprite->setAnchorPoint(Vec2(1, 1));
             break;
         }
 
         point->setPosition(sprite->getPosition());
 
-        sprite->runAction( action->clone() );
+        sprite->runAction(action->clone());
         addChild(sprite, i);
     }
 }
 
-void ConvertToNode::onTouchesEnded(const std::vector<Touch*>& touches, Event *event)
+void ConvertToNode::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for( auto& touch : touches)
+    for (auto& touch : touches)
     {
         auto location = touch->getLocation();
 
-        for( int i = 0; i < 3; i++)
+        for (int i = 0; i < 3; i++)
         {
-            auto node = getChildByTag(100+i);
+            auto node = getChildByTag(100 + i);
             Vec2 p1, p2;
 
             p1 = node->convertToNodeSpaceAR(location);
@@ -845,7 +816,7 @@ void ConvertToNode::onTouchesEnded(const std::vector<Touch*>& touches, Event *ev
 
             CCLOG("AR: x=%.2f, y=%.2f -- Not AR: x=%.2f, y=%.2f", p1.x, p1.y, p2.x, p2.y);
         }
-    }    
+    }
 }
 
 std::string ConvertToNode::title() const
@@ -862,12 +833,12 @@ std::string ConvertToNode::subtitle() const
 
 NodeOpaqueTest::NodeOpaqueTest()
 {
-    Sprite *background = nullptr;
+    Sprite* background = nullptr;
 
     for (int i = 0; i < 50; i++)
     {
         background = Sprite::create("Images/background1.png");
-        background->setBlendFunc( BlendFunc::ALPHA_PREMULTIPLIED );
+        background->setBlendFunc(BlendFunc::ALPHA_PREMULTIPLIED);
         background->setAnchorPoint(Vec2::ZERO);
         addChild(background);
     }
@@ -887,7 +858,7 @@ std::string NodeOpaqueTest::subtitle() const
 
 NodeNonOpaqueTest::NodeNonOpaqueTest()
 {
-    Sprite *background = nullptr;
+    Sprite* background = nullptr;
 
     for (int i = 0; i < 50; i++)
     {
@@ -915,10 +886,11 @@ NodeGlobalZValueTest::NodeGlobalZValueTest()
     Size s = Director::getInstance()->getWinSize();
     for (int i = 0; i < 9; i++)
     {
-        Sprite *sprite;
+        Sprite* sprite;
         auto parent = Node::create();
-        if(i==4) {
-            sprite = Sprite::create("Images/grossinis_sister2.png");
+        if (i == 4)
+        {
+            sprite  = Sprite::create("Images/grossinis_sister2.png");
             _sprite = sprite;
             _sprite->setGlobalZOrder(-1);
         }
@@ -929,7 +901,7 @@ NodeGlobalZValueTest::NodeGlobalZValueTest()
         this->addChild(parent);
 
         float w = sprite->getContentSize().width;
-        sprite->setPosition(s.width/2 - w*0.7*(i-5), s.height/2);
+        sprite->setPosition(s.width / 2 - w * 0.7 * (i - 5), s.height / 2);
     }
 
     this->scheduleUpdate();
@@ -940,7 +912,8 @@ void NodeGlobalZValueTest::update(float dt)
     static float accum = 0;
 
     accum += dt;
-    if( accum > 1) {
+    if (accum > 1)
+    {
         float z = _sprite->getGlobalZOrder();
         _sprite->setGlobalZOrder(-z);
         accum = 0;
@@ -957,35 +930,34 @@ std::string NodeGlobalZValueTest::subtitle() const
     return "Center Sprite should change go from foreground to background";
 }
 
-
 //
 // MySprite: Used by CameraTest1 and CameraTest2
 //
 class MySprite : public Sprite
 {
 public:
-    static MySprite* create(const std::string &spritefilename)
+    static MySprite* create(std::string_view spritefilename)
     {
         auto sprite = new MySprite;
         sprite->initWithFile(spritefilename);
         sprite->autorelease();
-        auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_COLOR);
+        auto program      = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_COLOR);
         auto programState = new backend::ProgramState(program);
         sprite->setProgramState(programState, false);
         return sprite;
     }
     bool setProgramState(backend::ProgramState* programState, bool needsRetain = true) override;
-    virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
+    virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
 
 protected:
     CustomCommand _customCommand;
-
 };
 
 bool MySprite::setProgramState(backend::ProgramState* programState, bool needsRetain)
 {
-    if (Sprite::setProgramState(programState, needsRetain)) {
-        auto& pipelineDescriptor = _customCommand.getPipelineDescriptor();
+    if (Sprite::setProgramState(programState, needsRetain))
+    {
+        auto& pipelineDescriptor        = _customCommand.getPipelineDescriptor();
         pipelineDescriptor.programState = programState;
 
         _customCommand.setDrawType(CustomCommand::DrawType::ARRAY);
@@ -997,11 +969,12 @@ bool MySprite::setProgramState(backend::ProgramState* programState, bool needsRe
     return false;
 }
 
-void MySprite::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void MySprite::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     const auto& projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-    auto mvpMatrix = projectionMat * transform;
-    _customCommand.getPipelineDescriptor().programState->setUniform(_mvpMatrixLocation, mvpMatrix.m, sizeof(mvpMatrix.m));
+    auto mvpMatrix            = projectionMat * transform;
+    _customCommand.getPipelineDescriptor().programState->setUniform(_mvpMatrixLocation, mvpMatrix.m,
+                                                                    sizeof(mvpMatrix.m));
     _customCommand.init(_globalZOrder, transform, flags);
     renderer->addCommand(&_customCommand);
 }
@@ -1034,18 +1007,18 @@ CameraTest1::CameraTest1()
     auto s = Director::getInstance()->getWinSize();
 
     _sprite1 = MySprite::create(s_back3);
-    addChild( _sprite1 );
-    _sprite1->setPosition( Vec2(1*s.width/4, s.height/2) );
+    addChild(_sprite1);
+    _sprite1->setPosition(Vec2(1 * s.width / 4, s.height / 2));
     _sprite1->setScale(0.5);
 
     _sprite2 = Sprite::create(s_back3);
-    addChild( _sprite2 );
-    _sprite2->setPosition( Vec2(3*s.width/4, s.height/2) );
+    addChild(_sprite2);
+    _sprite2->setPosition(Vec2(3 * s.width / 4, s.height / 2));
     _sprite2->setScale(0.5);
 
     auto camera = OrbitCamera::create(10, 0, 1, 0, 360, 0, 0);
-    _sprite1->runAction( camera );
-    _sprite2->runAction( camera->clone() );
+    _sprite1->runAction(camera);
+    _sprite2->runAction(camera->clone());
 }
 
 std::string CameraTest1::title() const
@@ -1085,13 +1058,13 @@ CameraTest2::CameraTest2()
     auto s = Director::getInstance()->getWinSize();
 
     _sprite1 = MySprite::create(s_back3);
-    addChild( _sprite1 );
-    _sprite1->setPosition( Vec2(1*s.width/4, s.height/2) );
+    addChild(_sprite1);
+    _sprite1->setPosition(Vec2(1 * s.width / 4, s.height / 2));
     _sprite1->setScale(0.5);
 
     _sprite2 = Sprite::create(s_back3);
-    addChild( _sprite2 );
-    _sprite2->setPosition( Vec2(3*s.width/4, s.height/2) );
+    addChild(_sprite2);
+    _sprite2->setPosition(Vec2(3 * s.width / 4, s.height / 2));
     _sprite2->setScale(0.5);
 
     Vec3 eye(150, 0, 200), center(0, 0, 0), up(0, 1, 0);
@@ -1103,7 +1076,6 @@ CameraTest2::CameraTest2()
 
     _sprite1->setAdditionalTransform(&lookupMatrix2);
     _sprite2->setAdditionalTransform(&lookupMatrix2);
-
 }
 
 std::string CameraTest2::title() const
@@ -1123,15 +1095,16 @@ std::string CameraTest2::subtitle() const
 //------------------------------------------------------------------
 NodeNormalizedPositionTest1::NodeNormalizedPositionTest1()
 {
-    Sprite *sprites[5];
+    Sprite* sprites[5];
     Vec2 positions[5];
-    positions[0] = Vec2(0.0f,0.0f);
-    positions[1] = Vec2(0.0f,1.0f);
-    positions[2] = Vec2(0.5f,0.5f);
-    positions[3] = Vec2(1.0f,0.0f);
-    positions[4] = Vec2(1.0f,1.0f);
+    positions[0] = Vec2(0.0f, 0.0f);
+    positions[1] = Vec2(0.0f, 1.0f);
+    positions[2] = Vec2(0.5f, 0.5f);
+    positions[3] = Vec2(1.0f, 0.0f);
+    positions[4] = Vec2(1.0f, 1.0f);
 
-    for(int i=0; i<5; i++) {
+    for (int i = 0; i < 5; i++)
+    {
         sprites[i] = Sprite::create("Images/grossini.png");
         sprites[i]->setPositionNormalized(positions[i]);
         addChild(sprites[i]);
@@ -1153,29 +1126,29 @@ std::string NodeNormalizedPositionTest1::subtitle() const
 // NodeNormalizedPositionTest2
 //
 //------------------------------------------------------------------
-NodeNormalizedPositionTest2::NodeNormalizedPositionTest2()
-: _accum(0)
+NodeNormalizedPositionTest2::NodeNormalizedPositionTest2() : _accum(0)
 {
-    Sprite *sprites[5];
+    Sprite* sprites[5];
     Vec2 positions[5];
-    positions[0] = Vec2(0.0f,0.0f);
-    positions[1] = Vec2(0.0f,1.0f);
-    positions[2] = Vec2(0.5f,0.5f);
-    positions[3] = Vec2(1.0f,0.0f);
-    positions[4] = Vec2(1.0f,1.0f);
+    positions[0] = Vec2(0.0f, 0.0f);
+    positions[1] = Vec2(0.0f, 1.0f);
+    positions[2] = Vec2(0.5f, 0.5f);
+    positions[3] = Vec2(1.0f, 0.0f);
+    positions[4] = Vec2(1.0f, 1.0f);
 
-    for(int i=0; i<5; i++) {
+    for (int i = 0; i < 5; i++)
+    {
         sprites[i] = Sprite::create("Images/grossini.png");
         sprites[i]->setPositionNormalized(positions[i]);
         addChild(sprites[i]);
     }
     scheduleUpdate();
 
-    setContentSize( Director::getInstance()->getWinSize());
+    setContentSize(Director::getInstance()->getWinSize());
     _copyContentSize = getContentSize();
 
-//    setAnchorPoint(Vec2(0.5,0.5));
-//    setPositionNormalized(Vec2(0.5,0.5));
+    //    setAnchorPoint(Vec2(0.5,0.5));
+    //    setPositionNormalized(Vec2(0.5,0.5));
 }
 
 std::string NodeNormalizedPositionTest2::title() const
@@ -1195,29 +1168,26 @@ void NodeNormalizedPositionTest2::update(float dt)
     // for 5 seconds
     float norm = sinf(_accum);
 
-    Size s = Size(_copyContentSize.width*norm, _copyContentSize.height*norm);
+    Size s = Size(_copyContentSize.width * norm, _copyContentSize.height * norm);
     setContentSize(s);
     CCLOG("s: %f,%f", s.width, s.height);
 }
 
-
 //------------------------------------------------------------------
 //
 // NodeNormalizedPositionBugTest
 //
 //------------------------------------------------------------------
-NodeNormalizedPositionBugTest::NodeNormalizedPositionBugTest()
-: _accum(0)
+NodeNormalizedPositionBugTest::NodeNormalizedPositionBugTest() : _accum(0)
 {
     Vec2 position;
-   
-    position = Vec2(0.5f,0.5f);
 
-    
+    position = Vec2(0.5f, 0.5f);
+
     sprite = Sprite::create("Images/grossini.png");
     sprite->setPositionNormalized(position);
     addChild(sprite);
-    
+
     scheduleUpdate();
 }
 
@@ -1234,10 +1204,10 @@ std::string NodeNormalizedPositionBugTest::subtitle() const
 void NodeNormalizedPositionBugTest::update(float dt)
 {
     _accum += dt;
-    
+
     // for 5 seconds
     float norm = clampf(sinf(_accum), 0, 1.0);
-    sprite->setPositionNormalized(Vec2(norm,norm));
+    sprite->setPositionNormalized(Vec2(norm, norm));
 }
 
 std::string NodeNameTest::title() const
@@ -1253,7 +1223,7 @@ std::string NodeNameTest::subtitle() const
 void NodeNameTest::onEnter()
 {
     TestCocosNodeDemo::onEnter();
-    
+
     this->scheduleOnce(CC_CALLBACK_1(NodeNameTest::test, this), 0.05f, "test_key");
 }
 
@@ -1265,7 +1235,7 @@ void NodeNameTest::onExit()
 void NodeNameTest::test(float dt)
 {
     auto parent = Node::create();
-    
+
     // setName(), getName() and getChildByName()
     char name[20];
     for (int i = 0; i < 10; ++i)
@@ -1275,17 +1245,17 @@ void NodeNameTest::test(float dt)
         node->setName(name);
         parent->addChild(node);
     }
-    
+
     for (int i = 0; i < 10; ++i)
     {
         sprintf(name, "node%d", i);
         auto node = parent->getChildByName(name);
-        log("find child: %s", node->getName().c_str());
+        log("find child: %s", node->getName().data());
     }
-    
+
     // enumerateChildren()
     // name = regular expression
-    int i = 0;
+    int i  = 0;
     parent = Node::create();
     for (int i = 0; i < 100; ++i)
     {
@@ -1294,24 +1264,24 @@ void NodeNameTest::test(float dt)
         node->setName(name);
         parent->addChild(node);
     }
-    
+
     i = 0;
     parent->enumerateChildren("node[[:digit:]]+", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
     CCAssert(i == 100, "");
-    
+
     i = 0;
     parent->enumerateChildren("node[[:digit:]]+", [&i](Node* node) -> bool {
         ++i;
         return true;
     });
     CCAssert(i == 1, "");
-    
+
     // enumerateChildren
     // name = node[[digit]]+/node
-    
+
     parent = Node::create();
     for (int i = 0; i < 10; ++i)
     {
@@ -1319,7 +1289,7 @@ void NodeNameTest::test(float dt)
         sprintf(name, "node%d", i);
         node->setName(name);
         parent->addChild(node);
-        
+
         for (int j = 0; j < 10; ++j)
         {
             auto child = Node::create();
@@ -1327,21 +1297,21 @@ void NodeNameTest::test(float dt)
             node->addChild(child);
         }
     }
-    
+
     i = 0;
     parent->enumerateChildren("node1/node", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
     CCAssert(i == 10, "");
-    
+
     i = 0;
     parent->enumerateChildren("node1/node", [&i](Node* node) -> bool {
         ++i;
         return true;
     });
     CCAssert(i == 1, "");
-    
+
     // search from root
     parent = Node::create();
     for (int i = 0; i < 10; ++i)
@@ -1350,7 +1320,7 @@ void NodeNameTest::test(float dt)
         sprintf(name, "node%d", i);
         node->setName(name);
         parent->addChild(node);
-        
+
         for (int j = 0; j < 10; ++j)
         {
             auto child = Node::create();
@@ -1358,21 +1328,21 @@ void NodeNameTest::test(float dt)
             node->addChild(child);
         }
     }
-    
+
     i = 0;
     parent->enumerateChildren("node[[:digit:]]+/node", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
     CCAssert(i == 100, "");
-    
+
     i = 0;
     parent->enumerateChildren("node[[:digit:]]+/node", [&i](Node* node) -> bool {
         ++i;
         return true;
     });
     CCAssert(i == 1, "");
-    
+
     // search from parent
     // name is xxx/..
     i = 0;
@@ -1381,14 +1351,14 @@ void NodeNameTest::test(float dt)
         return true;
     });
     CCAssert(i == 1, "");
-    
+
     i = 0;
     parent->getChildByName("node1")->enumerateChildren("node[[:digit:]]+/node/..", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
     CCAssert(i == 100, "");
-    
+
     // name = //xxx : search recursively
     parent = Node::create();
     for (int j = 0; j < 10; j++)
@@ -1397,7 +1367,7 @@ void NodeNameTest::test(float dt)
         sprintf(name, "node%d", j);
         node->setName(name);
         parent->addChild(node);
-        
+
         for (int k = 0; k < 10; ++k)
         {
             auto child = Node::create();
@@ -1406,30 +1376,30 @@ void NodeNameTest::test(float dt)
             node->addChild(child);
         }
     }
-    
+
     i = 0;
     parent->enumerateChildren("//node[[:digit:]]+", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
-    CCAssert(i == 110, ""); // 100(children) + 10(parent)
-    
+    CCAssert(i == 110, "");  // 100(children) + 10(parent)
+
     i = 0;
     parent->enumerateChildren("//node[[:digit:]]+", [&i](Node* node) -> bool {
         ++i;
         return true;
     });
     CCAssert(i == 1, "");
-    
+
     i = 0;
     parent->getChildByName("node1")->enumerateChildren("//node[[:digit:]]+/..", [&i](Node* node) -> bool {
         ++i;
         return false;
     });
     CCAssert(i == 110, "");
-    
+
     // utils::findChildren()
-    
+
     parent = Node::create();
     for (int i = 0; i < 50; ++i)
     {
@@ -1454,38 +1424,36 @@ void Issue16100Test::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto delay = DelayTime::create(0.1f);
-    auto f = CallFunc::create([this, s]()
-    {
+    auto f     = CallFunc::create([this, s]() {
         auto camera = Camera::createOrthographic(s.width * 2, s.height * 2, -1024, 1024);
         camera->setCameraFlag(CameraFlag::USER1);
         addChild(camera);
-    });
+        });
     this->runAction(Sequence::createWithTwoActions(delay, f));
 
     // grossini using default camera
     auto sprite = Sprite::create("Images/grossini.png");
     this->addChild(sprite);
 
-    sprite->setPosition(-200,s.height/3);
-    auto moveby = MoveBy::create(2, Vec2(400.0f,0.0f));
+    sprite->setPosition(-200, s.height / 3);
+    auto moveby     = MoveBy::create(2, Vec2(400.0f, 0.0f));
     auto movebyback = moveby->reverse();
-    auto seq = Sequence::create(moveby, movebyback, nullptr);
-    auto forever = RepeatForever::create(seq);
+    auto seq        = Sequence::create(moveby, movebyback, nullptr);
+    auto forever    = RepeatForever::create(seq);
 
     sprite->runAction(forever);
 
     sprite->setCameraMask((int)CameraFlag::DEFAULT);
 
-
     // grossini's sister using user camera
     auto sister = Sprite::create("Images/grossinis_sister1.png");
     this->addChild(sister);
 
-    sister->setPosition(-200,s.height*2/3);
-    auto moveby1 = MoveBy::create(2, Vec2(400.0f,0.0f));
+    sister->setPosition(-200, s.height * 2 / 3);
+    auto moveby1     = MoveBy::create(2, Vec2(400.0f, 0.0f));
     auto movebyback1 = moveby1->reverse();
-    auto seq1 = Sequence::create(moveby1, movebyback1, nullptr);
-    auto forever1 = RepeatForever::create(seq1);
+    auto seq1        = Sequence::create(moveby1, movebyback1, nullptr);
+    auto forever1    = RepeatForever::create(seq1);
 
     sister->runAction(forever1);
     sister->setCameraMask((int)CameraFlag::USER1);
@@ -1516,7 +1484,7 @@ void Issue16735Test::onEnter()
     TestCocosNodeDemo::onEnter();
 
     auto visibleSize = Director::getInstance()->getVisibleSize();
-    auto origin = Director::getInstance()->getVisibleOrigin();
+    auto origin      = Director::getInstance()->getVisibleOrigin();
 
     auto sprite1 = Sprite::create("Images/grossini.png");
     sprite1->setPosition(Vec2(visibleSize / 2) + origin);
@@ -1530,9 +1498,11 @@ void Issue16735Test::onEnter()
     addChild(sprite2);
 
     auto d = DrawNode::create();
-    d->drawLine(Vec2(origin.x, origin.y + visibleSize.height/2), Vec2(origin.x + visibleSize.width, origin.y + visibleSize.height/2), Color4F::RED);
-    d->drawLine(Vec2(origin.x + visibleSize.width/2, origin.y), Vec2(origin.x + visibleSize.width/2, origin.y + visibleSize.height), Color4F::RED);
-    
+    d->drawLine(Vec2(origin.x, origin.y + visibleSize.height / 2),
+                Vec2(origin.x + visibleSize.width, origin.y + visibleSize.height / 2), Color4F::RED);
+    d->drawLine(Vec2(origin.x + visibleSize.width / 2, origin.y),
+                Vec2(origin.x + visibleSize.width / 2, origin.y + visibleSize.height), Color4F::RED);
+
     addChild(d);
 }
 
diff --git a/tests/cpp-tests/Classes/NodeTest/NodeTest.h b/tests/cpp-tests/Classes/NodeTest/NodeTest.h
index 5f65beab126a..3151f99968c8 100644
--- a/tests/cpp-tests/Classes/NodeTest/NodeTest.h
+++ b/tests/cpp-tests/Classes/NodeTest/NodeTest.h
@@ -135,7 +135,6 @@ class SchedulerCallbackTest : public TestCocosNodeDemo
     SchedulerCallbackTest();
 };
 
-
 class NodeToWorld : public TestCocosNodeDemo
 {
 public:
@@ -180,7 +179,7 @@ class CameraZoomTest : public TestCocosNodeDemo
 
 protected:
     CameraZoomTest();
-    float    _z;
+    float _z;
 };
 
 class CameraCenterTest : public TestCocosNodeDemo
@@ -189,7 +188,7 @@ class CameraCenterTest : public TestCocosNodeDemo
     CREATE_FUNC(CameraCenterTest);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
 
@@ -309,10 +308,10 @@ class NodeNormalizedPositionBugTest : public TestCocosNodeDemo
     CREATE_FUNC(NodeNormalizedPositionBugTest);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     NodeNormalizedPositionBugTest();
-    
+
     void update(float dt) override;
     float _accum;
     cocos2d::Sprite* sprite;
@@ -324,7 +323,7 @@ class NodeNameTest : public TestCocosNodeDemo
     CREATE_FUNC(NodeNameTest);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
 
diff --git a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.cpp b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.cpp
index ae1777c1ebf3..4e5871c66a27 100644
--- a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.cpp
+++ b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,7 +37,7 @@ OpenURLTest::OpenURLTest()
     addChild(label, 0);
     label->setPosition(VisibleRect::center().x, VisibleRect::top().y - 50);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(OpenURLTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -49,7 +49,7 @@ OpenURLTest::OpenURLTest()
     _label->retain();
 }
 
-void OpenURLTest::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void OpenURLTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
     Application::getInstance()->openURL("http://www.cocos2d-x.org/");
 }
diff --git a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h
index f9cc7723315b..1c2282e71e6b 100644
--- a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h
+++ b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,9 +37,10 @@ class OpenURLTest : public TestCase
     OpenURLTest();
     ~OpenURLTest();
 
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 private:
     cocos2d::Label* _label;
 };
 
-#endif // _OPEN_URL_TEST_H_
+#endif  // _OPEN_URL_TEST_H_
diff --git a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp
index 7602612c5348..fea66cb5ffbb 100644
--- a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp
+++ b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,7 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
     kTagNode,
     kTagGrossini,
@@ -51,56 +51,52 @@ Parallax1::Parallax1()
     // Top Layer, a simple image
     auto cocosImage = Sprite::create(s_Power);
     // scale the image (optional)
-    cocosImage->setScale( 2.5f );
+    cocosImage->setScale(2.5f);
     // change the transform anchor point to 0,0 (optional)
-    cocosImage->setAnchorPoint( Vec2(0,0) );
-    
+    cocosImage->setAnchorPoint(Vec2(0, 0));
 
     // Middle layer: a Tile map atlas
     auto tilemap = TileMapAtlas::create(s_TilesPng, s_LevelMapTga, 16, 16);
     tilemap->releaseMap();
-    
+
     // change the transform anchor to 0,0 (optional)
-    tilemap->setAnchorPoint( Vec2(0, 0) );
+    tilemap->setAnchorPoint(Vec2(0, 0));
 
     // Anti Aliased images
     tilemap->getTexture()->setAntiAliasTexParameters();
-    
 
     // background layer: another image
     auto background = Sprite::create(s_back);
     // scale the image (optional)
-    background->setScale( 1.5f );
+    background->setScale(1.5f);
     // change the transform anchor point (optional)
-    background->setAnchorPoint( Vec2(0,0) );
+    background->setAnchorPoint(Vec2(0, 0));
 
-    
     // create a void node, a parent node
     auto voidNode = ParallaxNode::create();
-    
+
     // NOW add the 3 layers to the 'void' node
 
     // background image is moved at a ratio of 0.4x, 0.5y
-    voidNode->addChild(background, -1, Vec2(0.4f,0.5f), Vec2::ZERO);
-    
+    voidNode->addChild(background, -1, Vec2(0.4f, 0.5f), Vec2::ZERO);
+
     // tiles are moved at a ratio of 2.2x, 1.0y
-    voidNode->addChild(tilemap, 1, Vec2(2.2f,1.0f), Vec2(0,-200) );
-    
+    voidNode->addChild(tilemap, 1, Vec2(2.2f, 1.0f), Vec2(0, -200));
+
     // top image is moved at a ratio of 3.0x, 2.5y
-    voidNode->addChild(cocosImage, 2, Vec2(3.0f,2.5f), Vec2(200,800) );
-    
-    
+    voidNode->addChild(cocosImage, 2, Vec2(3.0f, 2.5f), Vec2(200, 800));
+
     // now create some actions that will move the 'void' node
     // and the children of the 'void' node will move at different
     // speed, thus, simulation the 3D environment
-    auto goUp = MoveBy::create(4, Vec2(0,-500) );
+    auto goUp   = MoveBy::create(4, Vec2(0, -500));
     auto goDown = goUp->reverse();
-    auto go = MoveBy::create(8, Vec2(-1000,0) );
+    auto go     = MoveBy::create(8, Vec2(-1000, 0));
     auto goBack = go->reverse();
-    auto seq = Sequence::create(goUp, go, goDown, goBack, nullptr);
-    voidNode->runAction( (RepeatForever::create(seq) ));
-    
-    addChild( voidNode );
+    auto seq    = Sequence::create(goUp, go, goDown, goBack, nullptr);
+    voidNode->runAction((RepeatForever::create(seq)));
+
+    addChild(voidNode);
 }
 
 std::string Parallax1::title() const
@@ -116,58 +112,55 @@ std::string Parallax1::title() const
 
 Parallax2::Parallax2()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(Parallax2::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     // Top Layer, a simple image
     auto cocosImage = Sprite::create(s_Power);
     // scale the image (optional)
-    cocosImage->setScale( 2.5f );
+    cocosImage->setScale(2.5f);
     // change the transform anchor point to 0,0 (optional)
-    cocosImage->setAnchorPoint( Vec2(0,0) );
-    
-    
+    cocosImage->setAnchorPoint(Vec2(0, 0));
+
     // Middle layer: a Tile map atlas
     auto tilemap = TileMapAtlas::create(s_TilesPng, s_LevelMapTga, 16, 16);
     tilemap->releaseMap();
-    
+
     // change the transform anchor to 0,0 (optional)
-    tilemap->setAnchorPoint( Vec2(0, 0) );
-    
+    tilemap->setAnchorPoint(Vec2(0, 0));
+
     // Anti Aliased images
     tilemap->getTexture()->setAntiAliasTexParameters();
-    
-    
+
     // background layer: another image
     auto background = Sprite::create(s_back);
     // scale the image (optional)
-    background->setScale( 1.5f );
+    background->setScale(1.5f);
     // change the transform anchor point (optional)
-    background->setAnchorPoint( Vec2(0,0) );
-    
-    
+    background->setAnchorPoint(Vec2(0, 0));
+
     // create a void node, a parent node
     auto voidNode = ParallaxNode::create();
-    
+
     // NOW add the 3 layers to the 'void' node
-    
+
     // background image is moved at a ratio of 0.4x, 0.5y
-    voidNode->addChild(background, -1, Vec2(0.4f,0.5f), Vec2::ZERO);
-    
+    voidNode->addChild(background, -1, Vec2(0.4f, 0.5f), Vec2::ZERO);
+
     // tiles are moved at a ratio of 1.0, 1.0y
-    voidNode->addChild(tilemap, 1, Vec2(1.0f,1.0f), Vec2(0,-200) );
-    
+    voidNode->addChild(tilemap, 1, Vec2(1.0f, 1.0f), Vec2(0, -200));
+
     // top image is moved at a ratio of 3.0x, 2.5y
-    voidNode->addChild( cocosImage, 2, Vec2(3.0f,2.5f), Vec2(200,1000) );
+    voidNode->addChild(cocosImage, 2, Vec2(3.0f, 2.5f), Vec2(200, 1000));
     addChild(voidNode, 0, kTagNode);
 }
 
-void Parallax2::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void Parallax2::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     auto diff = touches[0]->getDelta();
-    
-    auto node = getChildByTag(kTagNode);
+
+    auto node       = getChildByTag(kTagNode);
     auto currentPos = node->getPosition();
     node->setPosition(currentPos + diff);
 }
@@ -182,16 +175,12 @@ std::string Parallax2::title() const
 // Issue2572
 //
 //------------------------------------------------------------------
-Issue2572::Issue2572()
-: _moveTimer(0.0f)
-, _addTimer(0.0f)
-, _preListSize(0)
-, _printCount(0)
+Issue2572::Issue2572() : _moveTimer(0.0f), _addTimer(0.0f), _preListSize(0), _printCount(0)
 {
-    _addChildStep = 1.0f;
+    _addChildStep  = 1.0f;
     _wholeMoveTime = 3.0f;
     _wholeMoveSize = Vec2(-300, 0);
-    
+
     // create a parallax node, a parent node
     _paraNode = ParallaxNode::create();
     addChild(_paraNode, 0, kTagNode);
@@ -203,46 +192,50 @@ void Issue2572::update(float dt)
 {
     _addTimer += dt;
     _moveTimer += dt;
-    if (_moveTimer >= _wholeMoveTime) {
+    if (_moveTimer >= _wholeMoveTime)
+    {
         this->unscheduleUpdate();
         return;
     }
 
     _paraNode->setPosition(_paraNode->getPosition() + _wholeMoveSize * dt / _wholeMoveTime);
-    
-    if (_addTimer >= _addChildStep) {
+
+    if (_addTimer >= _addChildStep)
+    {
         _addTimer = 0.0f;
-        
-        auto child = Sprite::create("Images/Icon.png");
+
+        auto child    = Sprite::create("Images/Icon.png");
         Size viewSize = Director::getInstance()->getVisibleSize();
-        Vec2 offset = Vec2(viewSize.width / 2, viewSize.height/2);
-        _paraNode->addChild(child, 1, Vec2( 1, 0 ), offset );
-        
+        Vec2 offset   = Vec2(viewSize.width / 2, viewSize.height / 2);
+        _paraNode->addChild(child, 1, Vec2(1, 0), offset);
+
         _childList.pushBack(child);
     }
 
     // After a child added, output the position of the children 3 times.
     // Bug : The first output is much different with the second one & the third one.
-    if (_childList.size() != _preListSize) {
-        switch (_printCount) {
-            case 0:
-            case 1:
-            case 2:
-                log( "--child count-- %zd", _childList.size());
-                for (const auto& obj : _childList)
-                {
-                    Sprite* obstacle = dynamic_cast<Sprite*>( obj );
-                    log("child position : (%.2f, %.2f)", obstacle->getPositionX(), obstacle->getPositionY());
-                }
-                log("-------------------");
-                _printCount++;
-                break;
-            case 3:
-                _preListSize = _childList.size();
-                _printCount = 0;
-                break;
-            default:
-                break;
+    if (_childList.size() != _preListSize)
+    {
+        switch (_printCount)
+        {
+        case 0:
+        case 1:
+        case 2:
+            log("--child count-- %zd", _childList.size());
+            for (const auto& obj : _childList)
+            {
+                Sprite* obstacle = dynamic_cast<Sprite*>(obj);
+                log("child position : (%.2f, %.2f)", obstacle->getPositionX(), obstacle->getPositionY());
+            }
+            log("-------------------");
+            _printCount++;
+            break;
+        case 3:
+            _preListSize = _childList.size();
+            _printCount  = 0;
+            break;
+        default:
+            break;
         }
     }
 }
diff --git a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h
index 5c69fe222d17..5b85f3128a81 100644
--- a/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h
+++ b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,9 +38,9 @@ class ParallaxDemo : public TestCase
 class Parallax1 : public ParallaxDemo
 {
 protected:
-    cocos2d::Node*        _root;
-    cocos2d::Node*        _target;
-    cocos2d::MotionStreak*        _streak;
+    cocos2d::Node* _root;
+    cocos2d::Node* _target;
+    cocos2d::MotionStreak* _streak;
 
 public:
     CREATE_FUNC(Parallax1);
@@ -51,14 +51,14 @@ class Parallax1 : public ParallaxDemo
 class Parallax2 : public ParallaxDemo
 {
 protected:
-    cocos2d::Node*        _root;
-    cocos2d::Node*        _target;
-    cocos2d::MotionStreak*        _streak;
+    cocos2d::Node* _root;
+    cocos2d::Node* _target;
+    cocos2d::MotionStreak* _streak;
 
 public:
     CREATE_FUNC(Parallax2);
     Parallax2();
-    
+
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
     virtual std::string title() const override;
@@ -73,17 +73,17 @@ class Issue2572 : public ParallaxDemo
     cocos2d::Vector<cocos2d::Sprite*> _childList;
     ssize_t _preListSize;
     int _printCount;
-    
+
     float _addChildStep;
     float _wholeMoveTime;
     cocos2d::Vec2 _wholeMoveSize;
 
     virtual void update(float dt) override;
-    
+
 public:
     CREATE_FUNC(Issue2572);
     Issue2572();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
diff --git a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
index 83f2a1f93e53..fa825c423914 100644
--- a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
+++ b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
@@ -2,19 +2,19 @@
  Copyright (c) 2012 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -51,83 +51,76 @@ Particle3DTests::Particle3DTests()
     ADD_TEST_CASE(Particle3DWithSprite3DDemo);
 }
 
-std::string Particle3DTestDemo::title() const 
+std::string Particle3DTestDemo::title() const
 {
     return "Particle3D Test";
 }
 
 bool Particle3DTestDemo::init()
 {
-    if (!TestCase::init()) return false;
+    if (!TestCase::init())
+        return false;
 
     FileUtils::getInstance()->addSearchPath("Particle3D/materials");
     FileUtils::getInstance()->addSearchPath("Particle3D/scripts");
     FileUtils::getInstance()->addSearchPath("Sprite3DTest");
-    //FileUtils::getInstance()->addSearchPath("Particle3D/textures");
+    // FileUtils::getInstance()->addSearchPath("Particle3D/textures");
 
     Size size = Director::getInstance()->getWinSize();
-    _camera = Camera::createPerspective(30.0f, size.width / size.height, 1.0f, 1000.0f);
+    _camera   = Camera::createPerspective(30.0f, size.width / size.height, 1.0f, 1000.0f);
     _camera->setPosition3D(Vec3(0.0f, 0.0f, 100.0f));
     _camera->lookAt(Vec3(0.0f, 0.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
     _camera->setCameraFlag(CameraFlag::USER1);
     this->addChild(_camera);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(Particle3DTestDemo::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(Particle3DTestDemo::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(Particle3DTestDemo::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
-
-    TTFConfig config("fonts/tahoma.ttf",10);
-    _particleLab = Label::createWithTTF(config,"Particle Count: 0",TextHAlignment::LEFT);
+    TTFConfig config("fonts/tahoma.ttf", 10);
+    _particleLab = Label::createWithTTF(config, "Particle Count: 0", TextHAlignment::LEFT);
     _particleLab->retain();
     _particleLab->setPosition(Vec2(0.0f, size.height / 6.0f));
     _particleLab->setAnchorPoint(Vec2(0.0f, 0.0f));
     this->addChild(_particleLab);
-    
+
     scheduleUpdate();
     return true;
 }
 
-void Particle3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event  *event)
-{
-    
-}
+void Particle3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
 
-void Particle3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Particle3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
     if (touches.size())
     {
         auto touch = touches[0];
         auto delta = touch->getDelta();
-        
+
         _angle -= CC_DEGREES_TO_RADIANS(delta.x);
         _camera->setPosition3D(Vec3(100.0f * sinf(_angle), 0.0f, 100.0f * cosf(_angle)));
         _camera->lookAt(Vec3(0.0f, 0.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
     }
 }
 
-void Particle3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event  *event)
-{
-    
-}
+void Particle3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
 
-Particle3DTestDemo::Particle3DTestDemo( void )
-: _angle(0.0f)
-{
-
-}
+Particle3DTestDemo::Particle3DTestDemo(void) : _angle(0.0f) {}
 
-void Particle3DTestDemo::update( float delta )
+void Particle3DTestDemo::update(float delta)
 {
-    ParticleSystem3D *ps = static_cast<ParticleSystem3D *>(this->getChildByTag(PARTICLE_SYSTEM_TAG));
-    if (ps){
+    ParticleSystem3D* ps = static_cast<ParticleSystem3D*>(this->getChildByTag(PARTICLE_SYSTEM_TAG));
+    if (ps)
+    {
         unsigned int count = 0;
-        auto children = ps->getChildren();
-        for (auto iter : children){
-            ParticleSystem3D *child = dynamic_cast<ParticleSystem3D *>(iter);
-            if (child){
+        auto children      = ps->getChildren();
+        for (auto iter : children)
+        {
+            ParticleSystem3D* child = dynamic_cast<ParticleSystem3D*>(iter);
+            if (child)
+            {
                 count += child->getAliveParticleCount();
             }
         }
@@ -138,56 +131,55 @@ void Particle3DTestDemo::update( float delta )
     }
 }
 
-Particle3DTestDemo::~Particle3DTestDemo( void )
+Particle3DTestDemo::~Particle3DTestDemo(void)
 {
     _particleLab->release();
 }
 
-std::string Particle3DAdvancedLodSystemDemo::subtitle() const 
+std::string Particle3DAdvancedLodSystemDemo::subtitle() const
 {
     return "AdvancedSystem";
 }
 
 bool Particle3DAdvancedLodSystemDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("advancedLodSystem.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
 
-    auto scale = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
+    auto scale  = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
     auto rotate = RotateBy::create(1.0f, Vec3(0.0f, 0.0f, 100.0f));
     rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
     rootps->runAction(RepeatForever::create(Sequence::create(scale, scale->reverse(), nullptr)));
     rootps->startParticleSystem();
 
-
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
 
     return true;
 }
 
-std::string Particle3DBlackHoleDemo::subtitle() const 
+std::string Particle3DBlackHoleDemo::subtitle() const
 {
     return "BlackHole";
 }
 
 bool Particle3DBlackHoleDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("blackHole.pu", "pu_mediapack_01.material");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
     rootps->setPosition(-25.0f, 0.0f);
-    auto moveby = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
+    auto moveby  = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
     auto moveby1 = MoveBy::create(2.0f, Vec2(-50.0f, 0.0f));
-//    auto scale = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
-//    auto rotate = RotateBy::create(1.0f, Vec3(100.0f, 100.0f, 100.0f));
+    //    auto scale = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
+    //    auto rotate = RotateBy::create(1.0f, Vec3(100.0f, 100.0f, 100.0f));
     rootps->runAction(RepeatForever::create(Sequence::create(moveby, moveby1, nullptr)));
-    //rootps->runAction(RepeatForever::create(Sequence::create(scale, scale->reverse(), nullptr)));
-    //rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
+    // rootps->runAction(RepeatForever::create(Sequence::create(scale, scale->reverse(), nullptr)));
+    // rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
     rootps->startParticleSystem();
 
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
@@ -195,22 +187,22 @@ bool Particle3DBlackHoleDemo::init()
     return true;
 }
 
-std::string Particle3DHypnoDemo::subtitle() const 
+std::string Particle3DHypnoDemo::subtitle() const
 {
     return "Hypno";
 }
 
 bool Particle3DHypnoDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("hypno.pu", "pu_mediapack_01.material");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
-//    auto scale = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
-//    auto rotate = RotateBy::create(1.0f, Vec3(0.0, 100.0f, 0.0f));
-    //rootps->runAction(RepeatForever::create(Sequence::create(scale, scale->reverse(), nullptr)));
-    //rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
+    //    auto scale = ScaleBy::create(1.0f, 2.0f, 2.0f, 2.0f);
+    //    auto rotate = RotateBy::create(1.0f, Vec3(0.0, 100.0f, 0.0f));
+    // rootps->runAction(RepeatForever::create(Sequence::create(scale, scale->reverse(), nullptr)));
+    // rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
     rootps->startParticleSystem();
 
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
@@ -218,14 +210,14 @@ bool Particle3DHypnoDemo::init()
     return true;
 }
 
-std::string Particle3DTimeShiftDemo::subtitle() const 
+std::string Particle3DTimeShiftDemo::subtitle() const
 {
     return "TimeShift";
 }
 
 bool Particle3DTimeShiftDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("timeShift.pu", "pu_mediapack_01.material");
@@ -238,14 +230,14 @@ bool Particle3DTimeShiftDemo::init()
     return true;
 }
 
-std::string Particle3DUVAnimDemo::subtitle() const 
+std::string Particle3DUVAnimDemo::subtitle() const
 {
     return "UVAnim";
 }
 
 bool Particle3DUVAnimDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("UVAnimation.pu", "pu_mediapack_01.material");
@@ -257,14 +249,14 @@ bool Particle3DUVAnimDemo::init()
     return true;
 }
 
-std::string Particle3DFirePlaceDemo::subtitle() const 
+std::string Particle3DFirePlaceDemo::subtitle() const
 {
     return "Fire";
 }
 
 bool Particle3DFirePlaceDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("mp_torch.pu", "pu_mediapack_01.material");
@@ -277,43 +269,41 @@ bool Particle3DFirePlaceDemo::init()
     return true;
 }
 
-std::string Particle3DLineStreakDemo::subtitle() const 
+std::string Particle3DLineStreakDemo::subtitle() const
 {
     return "LineStreak";
 }
 
 bool Particle3DLineStreakDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("lineStreak.pu", "pu_mediapack_01.material");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
     rootps->setScale(5.0f);
-    //rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
+    // rootps->runAction(RepeatForever::create(Sequence::create(rotate, nullptr)));
     rootps->startParticleSystem();
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
 
-
-    //auto sprite = Sprite::create("pump_streak_04.png");
-    //sprite->setCameraMask((unsigned short)CameraFlag::USER1);
-    //sprite->setScale(0.5f);
-    //this->addChild(sprite);
+    // auto sprite = Sprite::create("pump_streak_04.png");
+    // sprite->setCameraMask((unsigned short)CameraFlag::USER1);
+    // sprite->setScale(0.5f);
+    // this->addChild(sprite);
 
     return true;
 }
 
-std::string Particle3DElectricBeamSystemDemo::subtitle() const 
+std::string Particle3DElectricBeamSystemDemo::subtitle() const
 {
     return "ElectricBeamSystem";
 }
 
 bool Particle3DElectricBeamSystemDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
-
     auto rootps = PUParticleSystem3D::create("electricBeamSystem.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
     rootps->startParticleSystem();
@@ -322,78 +312,75 @@ bool Particle3DElectricBeamSystemDemo::init()
     return true;
 }
 
-std::string Particle3DFlareShieldDemo::subtitle() const 
+std::string Particle3DFlareShieldDemo::subtitle() const
 {
     return "flareShield";
 }
 
 bool Particle3DFlareShieldDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
-
     auto rootps = PUParticleSystem3D::create("flareShield.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
-    //rootps->setScale(0.25f);
+    // rootps->setScale(0.25f);
     rootps->startParticleSystem();
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
 
     return true;
 }
 
-std::string Particle3DLightningBoltDemo::subtitle() const 
+std::string Particle3DLightningBoltDemo::subtitle() const
 {
     return "LightningBolt";
 }
 
 bool Particle3DLightningBoltDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
-
     auto rootps = PUParticleSystem3D::create("lightningBolt.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
-    //rootps->setScale(0.25f);
+    // rootps->setScale(0.25f);
     rootps->startParticleSystem();
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
 
     return true;
 }
 
-std::string Particle3DExplosionSystemDemo::subtitle() const 
+std::string Particle3DExplosionSystemDemo::subtitle() const
 {
     return "ExplosionSystem";
 }
 
 bool Particle3DExplosionSystemDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
-
     auto rootps = PUParticleSystem3D::create("explosionSystem.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
-    //rootps->setScale(5.0f);
-    //rootps->setPosition(-25.0f, 0.0f);
-    //auto moveby = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
-    //auto moveby1 = MoveBy::create(2.0f, Vec2(-50.0f, 0.0f));
-    //rootps->runAction(RepeatForever::create(Sequence::create(moveby, moveby1, nullptr)));
+    // rootps->setScale(5.0f);
+    // rootps->setPosition(-25.0f, 0.0f);
+    // auto moveby = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
+    // auto moveby1 = MoveBy::create(2.0f, Vec2(-50.0f, 0.0f));
+    // rootps->runAction(RepeatForever::create(Sequence::create(moveby, moveby1, nullptr)));
     rootps->startParticleSystem();
     this->addChild(rootps, 0, PARTICLE_SYSTEM_TAG);
 
     return true;
 }
 
-std::string Particle3DCanOfWormsDemo::subtitle() const 
+std::string Particle3DCanOfWormsDemo::subtitle() const
 {
     return "CanOfWorms";
 }
 
 bool Particle3DCanOfWormsDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("canOfWorms.pu");
@@ -404,14 +391,14 @@ bool Particle3DCanOfWormsDemo::init()
     return true;
 }
 
-std::string Particle3DRibbonTrailDemo::subtitle() const 
+std::string Particle3DRibbonTrailDemo::subtitle() const
 {
     return "RibbonTrailTest";
 }
 
 bool Particle3DRibbonTrailDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("ribbonTrailTest.pu");
@@ -422,14 +409,14 @@ bool Particle3DRibbonTrailDemo::init()
     return true;
 }
 
-std::string Particle3DWeaponTrailDemo::subtitle() const 
+std::string Particle3DWeaponTrailDemo::subtitle() const
 {
     return "WeaponTrail";
 }
 
 bool Particle3DWeaponTrailDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     auto rootps = PUParticleSystem3D::create("weaponTrail.pu");
@@ -440,23 +427,23 @@ bool Particle3DWeaponTrailDemo::init()
     return true;
 }
 
-std::string Particle3DWithSprite3DDemo::subtitle() const 
+std::string Particle3DWithSprite3DDemo::subtitle() const
 {
     return "Particle3DWithSprite3D";
 }
 
 bool Particle3DWithSprite3DDemo::init()
 {
-    if (!Particle3DTestDemo::init()) 
+    if (!Particle3DTestDemo::init())
         return false;
 
     std::string c3bfileName = "Sprite3DTest/orc.c3b";
-    auto sprite = Sprite3D::create(c3bfileName);
+    auto sprite             = Sprite3D::create(c3bfileName);
     this->addChild(sprite);
     sprite->setPosition3D(Vec3(-20.0f, 0.0f, 0.0f));
     sprite->setRotation3D(Vec3(0, 180, 0));
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
-    //sprite->setOpacity(100);
+    // sprite->setOpacity(100);
     auto animation = Animation3D::create(c3bfileName);
     if (animation)
     {
@@ -470,7 +457,6 @@ bool Particle3DWithSprite3DDemo::init()
     billboard->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(billboard);
 
-
     auto rootps = PUParticleSystem3D::create("lineStreak.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
     rootps->startParticleSystem();
diff --git a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h
index 162cff0b4127..e5ee56de6f7d 100644
--- a/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h
+++ b/tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,27 +38,26 @@ class Particle3DTestDemo : public TestCase
     CREATE_FUNC(Particle3DTestDemo);
     Particle3DTestDemo();
     virtual ~Particle3DTestDemo();
-    
+
     // overrides
     virtual bool init() override;
     virtual std::string title() const override;
     virtual void update(float delta) override;
-    
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
 protected:
-    std::string    _title;
-    cocos2d::Camera *_camera;
-    cocos2d::Label *_particleLab;
+    std::string _title;
+    cocos2d::Camera* _camera;
+    cocos2d::Label* _particleLab;
     float _angle;
 };
 
 class Particle3DAdvancedLodSystemDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DAdvancedLodSystemDemo);
     Particle3DAdvancedLodSystemDemo(){};
     virtual ~Particle3DAdvancedLodSystemDemo(){};
@@ -71,7 +70,6 @@ class Particle3DAdvancedLodSystemDemo : public Particle3DTestDemo
 class Particle3DBlackHoleDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DBlackHoleDemo);
     Particle3DBlackHoleDemo(){};
     virtual ~Particle3DBlackHoleDemo(){};
@@ -84,7 +82,6 @@ class Particle3DBlackHoleDemo : public Particle3DTestDemo
 class Particle3DHypnoDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DHypnoDemo);
     Particle3DHypnoDemo(){};
     virtual ~Particle3DHypnoDemo(){};
@@ -97,7 +94,6 @@ class Particle3DHypnoDemo : public Particle3DTestDemo
 class Particle3DTimeShiftDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DTimeShiftDemo);
     Particle3DTimeShiftDemo(){};
     virtual ~Particle3DTimeShiftDemo(){};
@@ -107,11 +103,9 @@ class Particle3DTimeShiftDemo : public Particle3DTestDemo
     virtual bool init() override;
 };
 
-
 class Particle3DUVAnimDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DUVAnimDemo);
     Particle3DUVAnimDemo(){};
     virtual ~Particle3DUVAnimDemo(){};
@@ -124,7 +118,6 @@ class Particle3DUVAnimDemo : public Particle3DTestDemo
 class Particle3DFirePlaceDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DFirePlaceDemo);
     Particle3DFirePlaceDemo(){};
     virtual ~Particle3DFirePlaceDemo(){};
@@ -137,7 +130,6 @@ class Particle3DFirePlaceDemo : public Particle3DTestDemo
 class Particle3DLineStreakDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DLineStreakDemo);
     Particle3DLineStreakDemo(){};
     virtual ~Particle3DLineStreakDemo(){};
@@ -150,7 +142,6 @@ class Particle3DLineStreakDemo : public Particle3DTestDemo
 class Particle3DElectricBeamSystemDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DElectricBeamSystemDemo);
     Particle3DElectricBeamSystemDemo(){};
     virtual ~Particle3DElectricBeamSystemDemo(){};
@@ -163,7 +154,6 @@ class Particle3DElectricBeamSystemDemo : public Particle3DTestDemo
 class Particle3DFlareShieldDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DFlareShieldDemo);
     Particle3DFlareShieldDemo(){};
     virtual ~Particle3DFlareShieldDemo(){};
@@ -176,7 +166,6 @@ class Particle3DFlareShieldDemo : public Particle3DTestDemo
 class Particle3DLightningBoltDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DLightningBoltDemo);
     Particle3DLightningBoltDemo(){};
     virtual ~Particle3DLightningBoltDemo(){};
@@ -189,7 +178,6 @@ class Particle3DLightningBoltDemo : public Particle3DTestDemo
 class Particle3DExplosionSystemDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DExplosionSystemDemo);
     Particle3DExplosionSystemDemo(){};
     virtual ~Particle3DExplosionSystemDemo(){};
@@ -202,7 +190,6 @@ class Particle3DExplosionSystemDemo : public Particle3DTestDemo
 class Particle3DCanOfWormsDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DCanOfWormsDemo);
     Particle3DCanOfWormsDemo(){};
     virtual ~Particle3DCanOfWormsDemo(){};
@@ -215,7 +202,6 @@ class Particle3DCanOfWormsDemo : public Particle3DTestDemo
 class Particle3DRibbonTrailDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DRibbonTrailDemo);
     Particle3DRibbonTrailDemo(){};
     virtual ~Particle3DRibbonTrailDemo(){};
@@ -228,7 +214,6 @@ class Particle3DRibbonTrailDemo : public Particle3DTestDemo
 class Particle3DWeaponTrailDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DWeaponTrailDemo);
     Particle3DWeaponTrailDemo(){};
     virtual ~Particle3DWeaponTrailDemo(){};
@@ -241,7 +226,6 @@ class Particle3DWeaponTrailDemo : public Particle3DTestDemo
 class Particle3DWithSprite3DDemo : public Particle3DTestDemo
 {
 public:
-
     CREATE_FUNC(Particle3DWithSprite3DDemo);
     Particle3DWithSprite3DDemo(){};
     virtual ~Particle3DWithSprite3DDemo(){};
diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp
index 25835ac0baae..5f83849541fe 100644
--- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp
+++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,7 +28,8 @@
 
 USING_NS_CC;
 
-enum {
+enum
+{
     kTagParticleCount = 1,
 };
 
@@ -45,7 +46,7 @@ void DemoFirework::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
 
     setEmitterPosition();
 }
@@ -55,7 +56,6 @@ std::string DemoFirework::subtitle() const
     return "ParticleFireworks";
 }
 
-
 //------------------------------------------------------------------
 //
 // DemoFire
@@ -69,9 +69,9 @@ void DemoFire::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );//.pvr");
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));  //.pvr");
     auto p = _emitter->getPosition();
-    _emitter->setPosition( Vec2(p.x, 100.0f) );
+    _emitter->setPosition(Vec2(p.x, 100.0f));
 
     setEmitterPosition();
 }
@@ -94,7 +94,7 @@ void DemoSun::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     setEmitterPosition();
 }
@@ -112,17 +112,15 @@ std::string DemoSun::subtitle() const
 void DemoPause::onEnter()
 {
     ParticleDemo::onEnter();
-    
+
     _emitter = ParticleSmoke::create();
     _emitter->retain();
     _background->addChild(_emitter, 10);
-    
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
-    
-    setEmitterPosition();
-    schedule(CC_SCHEDULE_SELECTOR(DemoPause::pauseEmitter), 2.0f);
 
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
+    setEmitterPosition();
+    schedule(CC_SCHEDULE_SELECTOR(DemoPause::pauseEmitter), 2.0f);
 }
 void DemoPause::pauseEmitter(float time)
 {
@@ -154,7 +152,7 @@ void DemoGalaxy::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     setEmitterPosition();
 }
@@ -176,7 +174,7 @@ void DemoFlower::onEnter()
     _emitter = ParticleFlower::create();
     _emitter->retain();
     _background->addChild(_emitter, 10);
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
 
     setEmitterPosition();
 }
@@ -200,7 +198,7 @@ void DemoBigFlower::onEnter()
 
     _background->addChild(_emitter, 10);
     ////_emitter->release();    // win32 :  use this line or remove this line and use autorelease()
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
 
     _emitter->setDuration(-1);
 
@@ -224,7 +222,7 @@ void DemoBigFlower::onEnter()
     _emitter->setTangentialAccelVar(0);
 
     // emitter position
-    _emitter->setPosition( Vec2(160,240) );
+    _emitter->setPosition(Vec2(160, 240));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -256,7 +254,7 @@ void DemoBigFlower::onEnter()
     _emitter->setEndSize(ParticleSystem::START_SIZE_EQUAL_TO_END_SIZE);
 
     // emits per second
-    _emitter->setEmissionRate(_emitter->getTotalParticles()/_emitter->getLife());
+    _emitter->setEmissionRate(_emitter->getTotalParticles() / _emitter->getLife());
 
     // additive
     _emitter->setBlendAdditive(true);
@@ -283,7 +281,7 @@ void DemoRotFlower::onEnter()
 
     _background->addChild(_emitter, 10);
     ////_emitter->release();    // win32 : Remove this line
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars2) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars2));
 
     // duration
     _emitter->setDuration(-1);
@@ -308,7 +306,7 @@ void DemoRotFlower::onEnter()
     _emitter->setTangentialAccelVar(0);
 
     // emitter position
-    _emitter->setPosition( Vec2(160,240) );
+    _emitter->setPosition(Vec2(160, 240));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -340,7 +338,7 @@ void DemoRotFlower::onEnter()
     _emitter->setEndSize(ParticleSystem::START_SIZE_EQUAL_TO_END_SIZE);
 
     // emits per second
-    _emitter->setEmissionRate(_emitter->getTotalParticles()/_emitter->getLife());
+    _emitter->setEmissionRate(_emitter->getTotalParticles() / _emitter->getLife());
 
     // additive
     _emitter->setBlendAdditive(false);
@@ -366,7 +364,7 @@ void DemoMeteor::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     setEmitterPosition();
 }
@@ -389,7 +387,7 @@ void DemoSpiral::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     setEmitterPosition();
 }
@@ -412,7 +410,7 @@ void DemoExplosion::onEnter()
     _emitter->retain();
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
 
     _emitter->setAutoRemoveOnFinish(true);
 
@@ -436,10 +434,10 @@ void DemoSmoke::onEnter()
     _emitter = ParticleSmoke::create();
     _emitter->retain();
     _background->addChild(_emitter, 10);
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     auto p = _emitter->getPosition();
-    _emitter->setPosition( Vec2( p.x, 100.0f) );
+    _emitter->setPosition(Vec2(p.x, 100.0f));
 
     setEmitterPosition();
 }
@@ -463,31 +461,30 @@ void DemoSnow::onEnter()
     _background->addChild(_emitter, 10);
 
     auto p = _emitter->getPosition();
-    _emitter->setPosition( Vec2( p.x, p.y-110) );
+    _emitter->setPosition(Vec2(p.x, p.y - 110));
     _emitter->setLife(3);
     _emitter->setLifeVar(1);
 
     // gravity
-    _emitter->setGravity(Vec2(0.0f,-10.0f));
+    _emitter->setGravity(Vec2(0.0f, -10.0f));
 
     // speed of particles
     _emitter->setSpeed(130);
     _emitter->setSpeedVar(30);
 
-
     Color4F startColor = _emitter->getStartColor();
-    startColor.r = 0.9f;
-    startColor.g = 0.9f;
-    startColor.b = 0.9f;
+    startColor.r       = 0.9f;
+    startColor.g       = 0.9f;
+    startColor.b       = 0.9f;
     _emitter->setStartColor(startColor);
 
     Color4F startColorVar = _emitter->getStartColorVar();
-    startColorVar.b = 0.1f;
+    startColorVar.b       = 0.1f;
     _emitter->setStartColorVar(startColorVar);
 
-    _emitter->setEmissionRate(_emitter->getTotalParticles()/_emitter->getLife());
+    _emitter->setEmissionRate(_emitter->getTotalParticles() / _emitter->getLife());
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_snow) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_snow));
 
     setEmitterPosition();
 }
@@ -511,10 +508,10 @@ void DemoRain::onEnter()
     _background->addChild(_emitter, 10);
 
     auto p = _emitter->getPosition();
-    _emitter->setPosition( Vec2( p.x, p.y-100) );
+    _emitter->setPosition(Vec2(p.x, p.y - 100));
     _emitter->setLife(4);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     setEmitterPosition();
 }
@@ -533,8 +530,8 @@ void DemoModernArt::onEnter()
 {
     ParticleDemo::onEnter();
 
-//FIXME: If use ParticleSystemPoint, bada 1.0 device will crash.
-//  Crash place: ParticleSystemPoint.cpp Line 149, function: glDrawArrays(GL_POINTS, 0, _particleIdx);
+    // FIXME: If use ParticleSystemPoint, bada 1.0 device will crash.
+    //   Crash place: ParticleSystemPoint.cpp Line 149, function: glDrawArrays(GL_POINTS, 0, _particleIdx);
     _emitter = ParticleSystemQuad::createWithTotalParticles(1000);
     _emitter->retain();
 
@@ -547,7 +544,7 @@ void DemoModernArt::onEnter()
     _emitter->setDuration(-1);
 
     // gravity
-    _emitter->setGravity(Vec2(0.0f,0.0f));
+    _emitter->setGravity(Vec2(0.0f, 0.0f));
 
     // angle
     _emitter->setAngle(0);
@@ -566,7 +563,7 @@ void DemoModernArt::onEnter()
     _emitter->setSpeedVar(10);
 
     // emitter position
-    _emitter->setPosition( Vec2( s.width/2, s.height/2) );
+    _emitter->setPosition(Vec2(s.width / 2, s.height / 2));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -574,7 +571,7 @@ void DemoModernArt::onEnter()
     _emitter->setLifeVar(0.3f);
 
     // emits per frame
-    _emitter->setEmissionRate(_emitter->getTotalParticles()/_emitter->getLife());
+    _emitter->setEmissionRate(_emitter->getTotalParticles() / _emitter->getLife());
 
     // color of particles
     Color4F startColor(0.5f, 0.5f, 0.5f, 1.0f);
@@ -596,7 +593,7 @@ void DemoModernArt::onEnter()
     _emitter->setEndSizeVar(8.0f);
 
     // texture
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     // additive
     _emitter->setBlendAdditive(false);
@@ -623,7 +620,7 @@ void DemoRing::onEnter()
 
     _background->addChild(_emitter, 10);
 
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
     _emitter->setLifeVar(0);
     _emitter->setLife(10);
     _emitter->setSpeed(100);
@@ -656,23 +653,23 @@ void ParallaxParticle::onEnter()
     auto p1 = Sprite::create(s_back3);
     auto p2 = Sprite::create(s_back3);
 
-    p->addChild( p1, 1, Vec2(0.5f,1.0f), Vec2(0.0f,250.0f) );
-    p->addChild(p2, 2, Vec2(1.5f,1.0f), Vec2(0.0f,50.0f) );
+    p->addChild(p1, 1, Vec2(0.5f, 1.0f), Vec2(0.0f, 250.0f));
+    p->addChild(p2, 2, Vec2(1.5f, 1.0f), Vec2(0.0f, 50.0f));
 
     _emitter = ParticleFlower::create();
     _emitter->retain();
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
     p1->addChild(_emitter, 10);
-    _emitter->setPosition( Vec2(250,200) );
+    _emitter->setPosition(Vec2(250, 200));
 
     auto par = ParticleSun::create();
     p2->addChild(par, 10);
-    par->setTexture( Director::getInstance()->getTextureCache()->addImage(s_fire) );
+    par->setTexture(Director::getInstance()->getTextureCache()->addImage(s_fire));
 
-    auto move = MoveBy::create(4, Vec2(300.0f,0.0f));
+    auto move      = MoveBy::create(4, Vec2(300.0f, 0.0f));
     auto move_back = move->reverse();
-    auto seq = Sequence::create( move, move_back, nullptr);
+    auto seq       = Sequence::create(move, move_back, nullptr);
     p->runAction(RepeatForever::create(seq));
 }
 
@@ -690,7 +687,7 @@ void RadiusMode1::onEnter()
 {
     ParticleDemo::onEnter();
 
-	_color->setColor(Color3B::BLACK);
+    _color->setColor(Color3B::BLACK);
     removeChild(_background, true);
     _background = nullptr;
 
@@ -715,14 +712,13 @@ void RadiusMode1::onEnter()
     _emitter->setRotatePerSecond(180);
     _emitter->setRotatePerSecondVar(0);
 
-
     // angle
     _emitter->setAngle(90);
     _emitter->setAngleVar(0);
 
     // emitter position
     auto size = Director::getInstance()->getWinSize();
-    _emitter->setPosition(Vec2(size.width/2, size.height/2));
+    _emitter->setPosition(Vec2(size.width / 2, size.height / 2));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -799,14 +795,13 @@ void RadiusMode2::onEnter()
     _emitter->setRotatePerSecond(45);
     _emitter->setRotatePerSecondVar(0);
 
-
     // angle
     _emitter->setAngle(90);
     _emitter->setAngleVar(0);
 
     // emitter position
     auto size = Director::getInstance()->getWinSize();
-    _emitter->setPosition(Vec2(size.width/2, size.height/2));
+    _emitter->setPosition(Vec2(size.width / 2, size.height / 2));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -883,14 +878,13 @@ void Issue704::onEnter()
     _emitter->setRotatePerSecond(0);
     _emitter->setRotatePerSecondVar(0);
 
-
     // angle
     _emitter->setAngle(90);
     _emitter->setAngleVar(0);
 
     // emitter position
     auto size = Director::getInstance()->getWinSize();
-    _emitter->setPosition(Vec2(size.width/2, size.height/2));
+    _emitter->setPosition(Vec2(size.width / 2, size.height / 2));
     _emitter->setPosVar(Vec2::ZERO);
 
     // life of particles
@@ -955,7 +949,8 @@ void Issue870::onEnter()
     _background = nullptr;
 
     _emitter = ParticleSystemQuad::create("Particles/SpinningPeas.plist");
-    _emitter->setTextureWithRect(Director::getInstance()->getTextureCache()->addImage("Images/particles.png"), Rect(0,0,32,32));
+    _emitter->setTextureWithRect(Director::getInstance()->getTextureCache()->addImage("Images/particles.png"),
+                                 Rect(0, 0, 32, 32));
     addChild(_emitter, 10);
     _emitter->retain();
 
@@ -965,8 +960,8 @@ void Issue870::onEnter()
 
 void Issue870::updateQuads(float dt)
 {
-    _index = (_index + 1) % 4;
-    auto rect = Rect(_index * 32, 0, 32, 32);
+    _index      = (_index + 1) % 4;
+    auto rect   = Rect(_index * 32, 0, 32, 32);
     auto system = (ParticleSystemQuad*)_emitter;
     system->setTextureWithRect(_emitter->getTexture(), rect);
 }
@@ -995,7 +990,7 @@ void DemoParticleFromFile::onEnter()
     _background = nullptr;
 
     std::string filename = "Particles/" + _title + ".plist";
-    _emitter = ParticleSystemQuad::create(filename);
+    _emitter             = ParticleSystemQuad::create(filename);
     _emitter->retain();
     addChild(_emitter, 10);
 
@@ -1038,22 +1033,22 @@ ParticleTests::ParticleTests()
     ADD_TEST_CASE(DemoRing);
     ADD_TEST_CASE(ParallaxParticle);
     ADD_TEST_CASE(DemoPause);
-    addTestCase("BoilingFoam", [](){return DemoParticleFromFile::create("BoilingFoam");});
-    addTestCase("BurstPipe", [](){return DemoParticleFromFile::create("BurstPipe"); });
-    addTestCase("Comet", [](){return DemoParticleFromFile::create("Comet"); });
-    addTestCase("debian", [](){return DemoParticleFromFile::create("debian"); });
-    addTestCase("ExplodingRing", [](){return DemoParticleFromFile::create("ExplodingRing"); });
-    addTestCase("LavaFlow", [](){return DemoParticleFromFile::create("LavaFlow"); });
-    addTestCase("SpinningPeas", [](){return DemoParticleFromFile::create("SpinningPeas"); });
-    addTestCase("SpookyPeas", [](){return DemoParticleFromFile::create("SpookyPeas"); });
-    addTestCase("Upsidedown", [](){return DemoParticleFromFile::create("Upsidedown"); });
-    addTestCase("Flower", [](){return DemoParticleFromFile::create("Flower"); });
-    addTestCase("Spiral", [](){return DemoParticleFromFile::create("Spiral"); });
-    addTestCase("Galaxy", [](){return DemoParticleFromFile::create("Galaxy"); });
-    addTestCase("Phoenix", [](){return DemoParticleFromFile::create("Phoenix"); });
-    addTestCase("lines", [](){return DemoParticleFromFile::create("lines"); });
-    addTestCase("ButterFly", [](){return DemoParticleFromFile::create("ButterFly"); });
-    addTestCase("ButterFlyYFlipped", [](){return DemoParticleFromFile::create("ButterFlyYFlipped"); });
+    addTestCase("BoilingFoam", []() { return DemoParticleFromFile::create("BoilingFoam"); });
+    addTestCase("BurstPipe", []() { return DemoParticleFromFile::create("BurstPipe"); });
+    addTestCase("Comet", []() { return DemoParticleFromFile::create("Comet"); });
+    addTestCase("debian", []() { return DemoParticleFromFile::create("debian"); });
+    addTestCase("ExplodingRing", []() { return DemoParticleFromFile::create("ExplodingRing"); });
+    addTestCase("LavaFlow", []() { return DemoParticleFromFile::create("LavaFlow"); });
+    addTestCase("SpinningPeas", []() { return DemoParticleFromFile::create("SpinningPeas"); });
+    addTestCase("SpookyPeas", []() { return DemoParticleFromFile::create("SpookyPeas"); });
+    addTestCase("Upsidedown", []() { return DemoParticleFromFile::create("Upsidedown"); });
+    addTestCase("Flower", []() { return DemoParticleFromFile::create("Flower"); });
+    addTestCase("Spiral", []() { return DemoParticleFromFile::create("Spiral"); });
+    addTestCase("Galaxy", []() { return DemoParticleFromFile::create("Galaxy"); });
+    addTestCase("Phoenix", []() { return DemoParticleFromFile::create("Phoenix"); });
+    addTestCase("lines", []() { return DemoParticleFromFile::create("lines"); });
+    addTestCase("ButterFly", []() { return DemoParticleFromFile::create("ButterFly"); });
+    addTestCase("ButterFlyYFlipped", []() { return DemoParticleFromFile::create("ButterFlyYFlipped"); });
     ADD_TEST_CASE(RadiusMode1);
     ADD_TEST_CASE(RadiusMode2);
     ADD_TEST_CASE(Issue704);
@@ -1086,12 +1081,12 @@ void ParticleDemo::onEnter()
 
     MenuItemFont::setFontSize(32);
 
-	_color = LayerColor::create( Color4B(127,127,127,255) );
-	this->addChild(_color);
+    _color = LayerColor::create(Color4B(127, 127, 127, 255));
+    this->addChild(_color);
 
     _emitter = nullptr;
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(ParticleDemo::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(ParticleDemo::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(ParticleDemo::onTouchesEnded, this);
@@ -1099,34 +1094,31 @@ void ParticleDemo::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-    auto item4 = MenuItemToggle::createWithCallback( CC_CALLBACK_1(ParticleDemo::toggleCallback, this),
-                                                               MenuItemFont::create( "Free Movement" ),
-                                                               MenuItemFont::create( "Relative Movement" ),
-                                                               MenuItemFont::create( "Grouped Movement" ),
-                                                               nullptr );
+    auto item4 = MenuItemToggle::createWithCallback(
+        CC_CALLBACK_1(ParticleDemo::toggleCallback, this), MenuItemFont::create("Free Movement"),
+        MenuItemFont::create("Relative Movement"), MenuItemFont::create("Grouped Movement"), nullptr);
 
     auto menu = Menu::create(item4, nullptr);
 
-    menu->setPosition( Vec2::ZERO );
-    item4->setPosition( Vec2( VisibleRect::left().x, VisibleRect::bottom().y+ 100) );
-    item4->setAnchorPoint( Vec2(0,0) );
+    menu->setPosition(Vec2::ZERO);
+    item4->setPosition(Vec2(VisibleRect::left().x, VisibleRect::bottom().y + 100));
+    item4->setAnchorPoint(Vec2(0, 0));
 
-    addChild( menu, 100 );
+    addChild(menu, 100);
 
     auto labelAtlas = LabelAtlas::create("0000", "fps_images.png", 12, 32, '.');
     addChild(labelAtlas, 100, kTagParticleCount);
-    labelAtlas->setPosition(Vec2(s.width-66,50.0f));
+    labelAtlas->setPosition(Vec2(s.width - 66, 50.0f));
 
     // moving background
     _background = Sprite::create(s_back3);
     addChild(_background, 5);
-    _background->setPosition( Vec2(s.width/2, s.height-180) );
+    _background->setPosition(Vec2(s.width / 2, s.height - 180));
 
-    auto move = MoveBy::create(4, Vec2(300,0) );
+    auto move      = MoveBy::create(4, Vec2(300, 0));
     auto move_back = move->reverse();
-    auto seq = Sequence::create( move, move_back, nullptr);
-    _background->runAction( RepeatForever::create(seq) );
-
+    auto seq       = Sequence::create(move, move_back, nullptr);
+    _background->runAction(RepeatForever::create(seq));
 
     scheduleUpdate();
 }
@@ -1141,17 +1133,17 @@ std::string ParticleDemo::subtitle() const
     return "No title";
 }
 
-void ParticleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event  *event)
+void ParticleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
     onTouchesEnded(touches, event);
 }
 
-void ParticleDemo::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void ParticleDemo::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     return onTouchesEnded(touches, event);
 }
 
-void ParticleDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event  *event)
+void ParticleDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
     auto touch = touches[0];
 
@@ -1165,7 +1157,7 @@ void ParticleDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event  *ev
 
     if (_emitter != nullptr)
     {
-        _emitter->setPosition(location -pos);
+        _emitter->setPosition(location - pos);
     }
 }
 
@@ -1173,7 +1165,7 @@ void ParticleDemo::update(float dt)
 {
     if (_emitter)
     {
-        auto atlas = (LabelAtlas*)getChildByTag(kTagParticleCount);
+        auto atlas  = (LabelAtlas*)getChildByTag(kTagParticleCount);
         char str[5] = {0};
         sprintf(str, "%04d", _emitter->getParticleCount());
         atlas->setString(str);
@@ -1189,7 +1181,7 @@ void ParticleDemo::toggleCallback(Ref* sender)
         else if (_emitter->getPositionType() == ParticleSystem::PositionType::FREE)
             _emitter->setPositionType(ParticleSystem::PositionType::RELATIVE);
         else if (_emitter->getPositionType() == ParticleSystem::PositionType::RELATIVE)
-            _emitter->setPositionType(ParticleSystem::PositionType::GROUPED );
+            _emitter->setPositionType(ParticleSystem::PositionType::GROUPED);
     }
 }
 
@@ -1198,7 +1190,7 @@ void ParticleDemo::setEmitterPosition()
     auto s = Director::getInstance()->getWinSize();
     if (_emitter != nullptr)
     {
-        _emitter->setPosition( Vec2(s.width / 2, s.height / 2) );
+        _emitter->setPosition(Vec2(s.width / 2, s.height / 2));
     }
 }
 
@@ -1220,24 +1212,24 @@ void ParticleBatchHybrid::onEnter()
 
     addChild(batch, 10);
 
-     schedule(CC_SCHEDULE_SELECTOR(ParticleBatchHybrid::switchRender), 2.0f);
+    schedule(CC_SCHEDULE_SELECTOR(ParticleBatchHybrid::switchRender), 2.0f);
 
-     auto node = Node::create();
-     addChild(node);
+    auto node = Node::create();
+    addChild(node);
 
-     _parent1 = batch;
-     _parent2 = node;
+    _parent1 = batch;
+    _parent2 = node;
 }
 
 void ParticleBatchHybrid::switchRender(float dt)
 {
-     bool usingBatch = ( _emitter->getBatchNode() != nullptr );
-     _emitter->removeFromParentAndCleanup(false);
+    bool usingBatch = (_emitter->getBatchNode() != nullptr);
+    _emitter->removeFromParentAndCleanup(false);
 
-     auto newParent = (usingBatch ? _parent2  : _parent1 );
-     newParent->addChild(_emitter);
+    auto newParent = (usingBatch ? _parent2 : _parent1);
+    newParent->addChild(_emitter);
 
-     log("Particle: Using new parent: %s", usingBatch ? "CCNode" : "CCParticleBatchNode");
+    log("Particle: Using new parent: %s", usingBatch ? "CCNode" : "CCParticleBatchNode");
 }
 
 std::string ParticleBatchHybrid::title() const
@@ -1261,17 +1253,17 @@ void ParticleBatchMultipleEmitters::onEnter()
     _background = nullptr;
 
     auto emitter1 = ParticleSystemQuad::create("Particles/LavaFlow.plist");
-    emitter1->setStartColor(Color4F(1,0,0,1));
+    emitter1->setStartColor(Color4F(1, 0, 0, 1));
     auto emitter2 = ParticleSystemQuad::create("Particles/LavaFlow.plist");
-    emitter2->setStartColor(Color4F(0,1,0,1));
+    emitter2->setStartColor(Color4F(0, 1, 0, 1));
     auto emitter3 = ParticleSystemQuad::create("Particles/LavaFlow.plist");
-    emitter3->setStartColor(Color4F(0,0,1,1));
+    emitter3->setStartColor(Color4F(0, 0, 1, 1));
 
     auto s = Director::getInstance()->getWinSize();
 
-    emitter1->setPosition(Vec2( s.width/1.25f, s.height/1.25f));
-    emitter2->setPosition(Vec2( s.width/2, s.height/2));
-    emitter3->setPosition(Vec2( s.width/4, s.height/4));
+    emitter1->setPosition(Vec2(s.width / 1.25f, s.height / 1.25f));
+    emitter2->setPosition(Vec2(s.width / 2, s.height / 2));
+    emitter3->setPosition(Vec2(s.width / 4, s.height / 4));
 
     auto batch = ParticleBatchNode::createWithTexture(emitter1->getTexture());
 
@@ -1303,38 +1295,38 @@ void ParticleReorder::onEnter()
     removeChild(_background, true);
     _background = nullptr;
 
-    auto ignore = ParticleSystemQuad::create("Particles/SmallSun.plist");
+    auto ignore  = ParticleSystemQuad::create("Particles/SmallSun.plist");
     auto parent1 = Node::create();
     auto parent2 = ParticleBatchNode::createWithTexture(ignore->getTexture());
     ignore->unscheduleUpdate();
 
-    for( unsigned int i=0; i<2;i++)
+    for (unsigned int i = 0; i < 2; i++)
     {
-        auto parent = ( i==0 ? parent1 : parent2 );
+        auto parent = (i == 0 ? parent1 : parent2);
 
         auto emitter1 = ParticleSystemQuad::create("Particles/SmallSun.plist");
-        emitter1->setStartColor(Color4F(1,0,0,1));
+        emitter1->setStartColor(Color4F(1, 0, 0, 1));
         emitter1->setBlendAdditive(false);
         auto emitter2 = ParticleSystemQuad::create("Particles/SmallSun.plist");
-        emitter2->setStartColor(Color4F(0,1,0,1));
+        emitter2->setStartColor(Color4F(0, 1, 0, 1));
         emitter2->setBlendAdditive(false);
         auto emitter3 = ParticleSystemQuad::create("Particles/SmallSun.plist");
-        emitter3->setStartColor(Color4F(0,0,1,1));
+        emitter3->setStartColor(Color4F(0, 0, 1, 1));
         emitter3->setBlendAdditive(false);
 
         auto s = Director::getInstance()->getWinSize();
 
-        int neg = (i==0 ? 1 : -1 );
+        int neg = (i == 0 ? 1 : -1);
 
-        emitter1->setPosition(Vec2( s.width/2-30,    s.height/2+60*neg));
-        emitter2->setPosition(Vec2( s.width/2,        s.height/2+60*neg));
-        emitter3->setPosition(Vec2( s.width/2+30,    s.height/2+60*neg));
+        emitter1->setPosition(Vec2(s.width / 2 - 30, s.height / 2 + 60 * neg));
+        emitter2->setPosition(Vec2(s.width / 2, s.height / 2 + 60 * neg));
+        emitter3->setPosition(Vec2(s.width / 2 + 30, s.height / 2 + 60 * neg));
 
         parent->addChild(emitter1, 0, 1);
         parent->addChild(emitter2, 0, 2);
         parent->addChild(emitter3, 0, 3);
 
-        addChild(parent, 10, 1000+i);
+        addChild(parent, 10, 1000 + i);
     }
 
     schedule(CC_SCHEDULE_SELECTOR(ParticleReorder::reorderParticles), 1.0f);
@@ -1352,24 +1344,28 @@ std::string ParticleReorder::subtitle() const
 
 void ParticleReorder::reorderParticles(float dt)
 {
-    for( int i=0; i<2;i++) {
-        auto parent = getChildByTag(1000+i);
+    for (int i = 0; i < 2; i++)
+    {
+        auto parent = getChildByTag(1000 + i);
 
         auto child1 = parent->getChildByTag(1);
         auto child2 = parent->getChildByTag(2);
         auto child3 = parent->getChildByTag(3);
 
-        if( _order % 3 == 0 ) {
+        if (_order % 3 == 0)
+        {
             parent->reorderChild(child1, 1);
             parent->reorderChild(child2, 2);
             parent->reorderChild(child3, 3);
-
-        } else if (_order % 3 == 1 ) {
+        }
+        else if (_order % 3 == 1)
+        {
             parent->reorderChild(child1, 3);
             parent->reorderChild(child2, 1);
             parent->reorderChild(child3, 2);
-
-        } else if (_order % 3 == 2 ) {
+        }
+        else if (_order % 3 == 2)
+        {
             parent->reorderChild(child1, 2);
             parent->reorderChild(child2, 3);
             parent->reorderChild(child3, 1);
@@ -1382,7 +1378,7 @@ void ParticleReorder::reorderParticles(float dt)
 class RainbowEffect : public ParticleSystemQuad
 {
 public:
-    bool init()override;
+    bool init() override;
     virtual bool initWithTotalParticles(int numberOfParticles) override;
     virtual void update(float dt) override;
 };
@@ -1394,7 +1390,7 @@ bool RainbowEffect::init()
 
 bool RainbowEffect::initWithTotalParticles(int numberOfParticles)
 {
-    if( ParticleSystemQuad::initWithTotalParticles(numberOfParticles) )
+    if (ParticleSystemQuad::initWithTotalParticles(numberOfParticles))
     {
         // additive
         setBlendAdditive(false);
@@ -1406,7 +1402,7 @@ bool RainbowEffect::initWithTotalParticles(int numberOfParticles)
         setEmitterMode(ParticleSystem::Mode::GRAVITY);
 
         // Gravity Mode: gravity
-        setGravity(Vec2(0.0f,0.0f));
+        setGravity(Vec2(0.0f, 0.0f));
 
         // Gravity mode: radial acceleration
         setRadialAccel(0);
@@ -1416,14 +1412,13 @@ bool RainbowEffect::initWithTotalParticles(int numberOfParticles)
         setSpeed(120);
         setSpeedVar(0);
 
-
         // angle
         setAngle(180);
         setAngleVar(0);
 
         // emitter position
         auto winSize = Director::getInstance()->getWinSize();
-        setPosition(Vec2(winSize.width/2, winSize.height/2));
+        setPosition(Vec2(winSize.width / 2, winSize.height / 2));
         setPosVar(Vec2::ZERO);
 
         // life of particles
@@ -1436,7 +1431,7 @@ bool RainbowEffect::initWithTotalParticles(int numberOfParticles)
         setEndSize(ParticleSystem::START_SIZE_EQUAL_TO_END_SIZE);
 
         // emits per seconds
-        setEmissionRate(getTotalParticles()/getLife());
+        setEmissionRate(getTotalParticles() / getLife());
 
         // color of particles
         setStartColor(Color4F(Color4B(50, 50, 50, 50)));
@@ -1446,10 +1441,10 @@ bool RainbowEffect::initWithTotalParticles(int numberOfParticles)
         _startColorVar.g = 0.0f;
         _startColorVar.b = 0.0f;
         _startColorVar.a = 0.0f;
-        _endColorVar.r = 0.0f;
-        _endColorVar.g = 0.0f;
-        _endColorVar.b = 0.0f;
-        _endColorVar.a = 0.0f;
+        _endColorVar.r   = 0.0f;
+        _endColorVar.g   = 0.0f;
+        _endColorVar.b   = 0.0f;
+        _endColorVar.a   = 0.0f;
 
         setTexture(Director::getInstance()->getTextureCache()->addImage("Images/particles.png"));
         return true;
@@ -1464,7 +1459,6 @@ void RainbowEffect::update(float dt)
     ParticleSystemQuad::update(dt);
 }
 
-
 void Issue1201::onEnter()
 {
     ParticleDemo::onEnter();
@@ -1473,14 +1467,14 @@ void Issue1201::onEnter()
     removeChild(_background, true);
     _background = nullptr;
 
-    RainbowEffect *particle = new RainbowEffect();
+    RainbowEffect* particle = new RainbowEffect();
     particle->initWithTotalParticles(50);
 
     addChild(particle);
 
     auto s = Director::getInstance()->getWinSize();
 
-    particle->setPosition(Vec2(s.width/2, s.height/2));
+    particle->setPosition(Vec2(s.width / 2, s.height / 2));
 
     _emitter = particle;
 }
@@ -1505,17 +1499,17 @@ void MultipleParticleSystems::onEnter()
 
     Director::getInstance()->getTextureCache()->addImage("Images/particles.png");
 
-    for (int i = 0; i<5; i++) {
+    for (int i = 0; i < 5; i++)
+    {
         auto particleSystem = ParticleSystemQuad::create("Particles/SpinningPeas.plist");
 
-        particleSystem->setPosition(Vec2(i*50.0f,i*50.0f));
+        particleSystem->setPosition(Vec2(i * 50.0f, i * 50.0f));
 
         particleSystem->setPositionType(ParticleSystem::PositionType::GROUPED);
         addChild(particleSystem);
     }
 
     _emitter = nullptr;
-
 }
 
 std::string MultipleParticleSystems::title() const
@@ -1530,11 +1524,12 @@ std::string MultipleParticleSystems::subtitle() const
 
 void MultipleParticleSystems::update(float dt)
 {
-    auto atlas = (LabelAtlas*) getChildByTag(kTagParticleCount);
+    auto atlas = (LabelAtlas*)getChildByTag(kTagParticleCount);
+
+    unsigned int count = 0;
 
-    unsigned int count = 0; 
-    
-    for(const auto &child : _children) {
+    for (const auto& child : _children)
+    {
         auto item = dynamic_cast<ParticleSystem*>(child);
         if (item != nullptr)
         {
@@ -1557,16 +1552,17 @@ void MultipleParticleSystemsBatched::onEnter()
     removeChild(_background, true);
     _background = nullptr;
 
-    ParticleBatchNode *batchNode = ParticleBatchNode::createWithTexture(nullptr, 3000);
+    ParticleBatchNode* batchNode = ParticleBatchNode::createWithTexture(nullptr, 3000);
 
     addChild(batchNode, 1, 2);
 
-    for (int i = 0; i<5; i++) {
+    for (int i = 0; i < 5; i++)
+    {
 
         auto particleSystem = ParticleSystemQuad::create("Particles/SpinningPeas.plist");
 
         particleSystem->setPositionType(ParticleSystem::PositionType::GROUPED);
-        particleSystem->setPosition(Vec2(i*50.0f,i*50.0f));
+        particleSystem->setPosition(Vec2(i * 50.0f, i * 50.0f));
 
         batchNode->setTexture(particleSystem->getTexture());
         batchNode->addChild(particleSystem);
@@ -1577,12 +1573,13 @@ void MultipleParticleSystemsBatched::onEnter()
 
 void MultipleParticleSystemsBatched::update(float dt)
 {
-    auto atlas = (LabelAtlas*) getChildByTag(kTagParticleCount);
+    auto atlas = (LabelAtlas*)getChildByTag(kTagParticleCount);
 
     int count = 0;
 
     auto batchNode = getChildByTag(2);
-    for(const auto &child : batchNode->getChildren()) {
+    for (const auto& child : batchNode->getChildren())
+    {
         auto item = dynamic_cast<ParticleSystem*>(child);
         if (item != nullptr)
         {
@@ -1615,12 +1612,13 @@ void AddAndDeleteParticleSystems::onEnter()
     removeChild(_background, true);
     _background = nullptr;
 
-    //adds the texture inside the plist to the texture cache
+    // adds the texture inside the plist to the texture cache
     _batchNode = ParticleBatchNode::createWithTexture((Texture2D*)nullptr, 16000);
 
     addChild(_batchNode, 1, 2);
 
-    for (int i = 0; i<6; i++) {
+    for (int i = 0; i < 6; i++)
+    {
 
         auto particleSystem = ParticleSystemQuad::create("Particles/Spiral.plist");
         _batchNode->setTexture(particleSystem->getTexture());
@@ -1628,34 +1626,32 @@ void AddAndDeleteParticleSystems::onEnter()
         particleSystem->setPositionType(ParticleSystem::PositionType::GROUPED);
         particleSystem->setTotalParticles(200);
 
-        particleSystem->setPosition(Vec2(i*15 +100.0f,i*15+100.0f));
+        particleSystem->setPosition(Vec2(i * 15 + 100.0f, i * 15 + 100.0f));
 
         unsigned int randZ = rand() % 100;
         _batchNode->addChild(particleSystem, randZ, -1);
-
     }
 
     schedule(CC_SCHEDULE_SELECTOR(AddAndDeleteParticleSystems::removeSystem), 0.5f);
     _emitter = nullptr;
-
 }
 
 void AddAndDeleteParticleSystems::removeSystem(float dt)
 {
     ssize_t nChildrenCount = _batchNode->getChildren().size();
-    if (nChildrenCount > 0) 
+    if (nChildrenCount > 0)
     {
         CCLOG("remove random system");
         unsigned int uRand = rand() % (nChildrenCount - 1);
         _batchNode->removeChild(_batchNode->getChildren().at(uRand), true);
 
         auto particleSystem = ParticleSystemQuad::create("Particles/Spiral.plist");
-        //add new
+        // add new
 
         particleSystem->setPositionType(ParticleSystem::PositionType::GROUPED);
         particleSystem->setTotalParticles(200);
 
-        particleSystem->setPosition(Vec2(rand() % 300 ,rand() % 400));
+        particleSystem->setPosition(Vec2(rand() % 300, rand() % 400));
 
         CCLOG("add a new system");
         unsigned int randZ = rand() % 100;
@@ -1665,12 +1661,13 @@ void AddAndDeleteParticleSystems::removeSystem(float dt)
 
 void AddAndDeleteParticleSystems::update(float dt)
 {
-    auto atlas = (LabelAtlas*) getChildByTag(kTagParticleCount);
+    auto atlas = (LabelAtlas*)getChildByTag(kTagParticleCount);
 
     int count = 0;
 
     auto batchNode = getChildByTag(2);
-    for(const auto &child : batchNode->getChildren()) {
+    for (const auto& child : batchNode->getChildren())
+    {
         auto item = dynamic_cast<ParticleSystem*>(child);
         if (item != nullptr)
         {
@@ -1700,15 +1697,15 @@ void ReorderParticleSystems::onEnter()
     ParticleDemo::onEnter();
 
     _color->setColor(Color3B::BLACK);
-    removeChild(_background ,true);
+    removeChild(_background, true);
     _background = nullptr;
 
-    _batchNode = ParticleBatchNode::create("Images/stars-grayscale.png" ,3000);
+    _batchNode = ParticleBatchNode::create("Images/stars-grayscale.png", 3000);
 
     addChild(_batchNode, 1, 2);
 
-
-    for (int i = 0; i<3; i++) {
+    for (int i = 0; i < 3; i++)
+    {
 
         auto particleSystem = ParticleSystemQuad::createWithTotalParticles(200);
         particleSystem->retain();
@@ -1724,14 +1721,13 @@ void ReorderParticleSystems::onEnter()
         particleSystem->setStartRadius(100);
         particleSystem->setStartRadiusVar(0);
         particleSystem->setEndRadius(ParticleSystem::START_RADIUS_EQUAL_TO_END_RADIUS);
-        particleSystem->setEndRadiusVar(0);    // not used when start == end
+        particleSystem->setEndRadiusVar(0);  // not used when start == end
 
         // radius mode: degrees per second
         // 45 * 4 seconds of life = 180 degrees
         particleSystem->setRotatePerSecond(45);
         particleSystem->setRotatePerSecondVar(0);
 
-
         // angle
         particleSystem->setAngle(90);
         particleSystem->setAngleVar(0);
@@ -1750,8 +1746,8 @@ void ReorderParticleSystems::onEnter()
         particleSystem->setEndSpinVar(0);
 
         // color of particles
-        float color[3] = {0,0,0};
-        color[i] = 1;
+        float color[3] = {0, 0, 0};
+        color[i]       = 1;
         Color4F startColor(color[0], color[1], color[2], 1.0f);
         particleSystem->setStartColor(startColor);
 
@@ -1770,12 +1766,11 @@ void ReorderParticleSystems::onEnter()
         particleSystem->setEndSize(ParticleSystem::START_SIZE_EQUAL_TO_END_SIZE);
 
         // emits per second
-        particleSystem->setEmissionRate(particleSystem->getTotalParticles()/particleSystem->getLife());
+        particleSystem->setEmissionRate(particleSystem->getTotalParticles() / particleSystem->getLife());
 
         // additive
 
-        particleSystem->setPosition(Vec2(i*10+120.0f,200.0f));
-
+        particleSystem->setPosition(Vec2(i * 10 + 120.0f, 200.0f));
 
         _batchNode->addChild(particleSystem);
         particleSystem->setPositionType(ParticleSystem::PositionType::FREE);
@@ -1783,21 +1778,18 @@ void ReorderParticleSystems::onEnter()
         particleSystem->release();
 
         //[pBNode addChild:particleSystem z:10 tag:0);
-
     }
 
     schedule(CC_SCHEDULE_SELECTOR(ReorderParticleSystems::reorderSystem), 2.0f);
     _emitter = nullptr;
-
 }
 
 void ReorderParticleSystems::reorderSystem(float time)
 {
     auto system = static_cast<ParticleSystem*>(_batchNode->getChildren().at(1));
-    _batchNode->reorderChild(system, system->getLocalZOrder() - 1);     
+    _batchNode->reorderChild(system, system->getLocalZOrder() - 1);
 }
 
-
 void ReorderParticleSystems::update(float dt)
 {
     auto atlas = static_cast<LabelAtlas*>(getChildByTag(kTagParticleCount));
@@ -1805,7 +1797,8 @@ void ReorderParticleSystems::update(float dt)
     int count = 0;
 
     auto batchNode = getChildByTag(2);
-    for(const auto &child : batchNode->getChildren()) {
+    for (const auto& child : batchNode->getChildren())
+    {
         auto item = dynamic_cast<ParticleSystem*>(child);
         if (item != nullptr)
         {
@@ -1849,7 +1842,7 @@ void PremultipliedAlphaTest::readdParticle(float delta)
     {
         this->addChild(_emitter);
     }
-    
+
     _hasEmitter = !_hasEmitter;
 }
 
@@ -1857,17 +1850,17 @@ void PremultipliedAlphaTest::onEnter()
 {
     ParticleDemo::onEnter();
 
-	_color->setColor(Color3B::BLUE);
+    _color->setColor(Color3B::BLUE);
     this->removeChild(_background, true);
     _background = nullptr;
 
     _emitter = ParticleSystemQuad::create("Particles/BoilingFoam.plist");
     _emitter->retain();
     // Particle Designer "normal" blend func causes black halo on premul textures (ignores multiplication)
-    //this->emitter.blendFunc = (BlendFunc){ BlendFactor::SRC_ALPHA, BlendFactor::ONE_MINUS_SRC_ALPHA };
+    // this->emitter.blendFunc = (BlendFunc){ BlendFactor::SRC_ALPHA, BlendFactor::ONE_MINUS_SRC_ALPHA };
 
     // Cocos2d "normal" blend func for premul causes alpha to be ignored (oversaturates colors)
-    _emitter->setBlendFunc( BlendFunc::ALPHA_PREMULTIPLIED );
+    _emitter->setBlendFunc(BlendFunc::ALPHA_PREMULTIPLIED);
 
     CCASSERT(_emitter->isOpacityModifyRGB(), "Particle texture does not have premultiplied alpha, test is useless");
 
@@ -1881,7 +1874,7 @@ void PremultipliedAlphaTest::onEnter()
 
     this->addChild(_emitter, 10);
     _hasEmitter = true;
-    
+
     schedule(CC_SCHEDULE_SELECTOR(PremultipliedAlphaTest::readdParticle), 1.0f);
 }
 
@@ -1891,13 +1884,13 @@ void PremultipliedAlphaTest2::onEnter()
 {
     ParticleDemo::onEnter();
 
-	_color->setColor(Color3B::BLACK);
+    _color->setColor(Color3B::BLACK);
     this->removeChild(_background, true);
     _background = nullptr;
 
     _emitter = ParticleSystemQuad::create("Particles/TestPremultipliedAlpha.plist");
     _emitter->retain();
-    this->addChild(_emitter ,10);
+    this->addChild(_emitter, 10);
 }
 
 std::string PremultipliedAlphaTest2::title() const
@@ -1910,26 +1903,25 @@ std::string PremultipliedAlphaTest2::subtitle() const
     return "Arrows should be faded";
 }
 
-
 // Issue3990
 
 void Issue3990::onEnter()
 {
     ParticleDemo::onEnter();
-    
-	_color->setColor(Color3B::BLACK);
+
+    _color->setColor(Color3B::BLACK);
     this->removeChild(_background, true);
     _background = nullptr;
-    
+
     _emitter = ParticleSystemQuad::create("Particles/Spiral.plist");
-    
+
     _emitter->setPositionType(ParticleSystem::PositionType::GROUPED);
     _emitter->setTotalParticles(1000);
     _emitter->setEmissionRate(_emitter->getTotalParticles() / _emitter->getLife());
     _emitter->setPosition(VisibleRect::center());
-    
+
     _emitter->retain();
-    this->addChild(_emitter ,10);
+    this->addChild(_emitter, 10);
 }
 
 std::string Issue3990::title() const
@@ -1942,20 +1934,19 @@ std::string Issue3990::subtitle() const
     return "Show '998' or '999' at bottom right side";
 }
 
-
 // ParticleVisibleTest
 void ParticleVisibleTest::onEnter()
 {
     ParticleDemo::onEnter();
-    
+
     _emitter = ParticleFireworks::create();
     _emitter->retain();
     _background->addChild(_emitter, 10);
-    
-    _emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
-    
+
+    _emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
+
     schedule(CC_SCHEDULE_SELECTOR(ParticleVisibleTest::callback), 1);
-    
+
     setEmitterPosition();
 }
 
@@ -1981,17 +1972,18 @@ void ParticleAutoBatching::onEnter()
 {
     ParticleDemo::onEnter();
 
-	_color->setColor(Color3B::BLACK);
+    _color->setColor(Color3B::BLACK);
     this->removeChild(_background, true);
     _background = nullptr;
 
     Size s = Director::getInstance()->getWinSize();
 
-    for(int i=0; i<10; i++) {
+    for (int i = 0; i < 10; i++)
+    {
         auto particle = ParticleSystemQuad::create("Particles/SmallSun.plist");
         particle->setTotalParticles(100);
-        particle->setPosition(Vec2(i*s.width/11, s.height/2));
-        this->addChild(particle ,10);
+        particle->setPosition(Vec2(i * s.width / 11, s.height / 2));
+        this->addChild(particle, 10);
     }
 }
 
@@ -2005,43 +1997,39 @@ std::string ParticleAutoBatching::subtitle() const
     return "All 10 particles should be drawin in one batch";
 }
 
-
 //
 // ParticleResetTotalParticles
 //
 void ParticleResetTotalParticles::onEnter()
 {
     ParticleDemo::onEnter();
-    
+
     _color->setColor(Color3B::BLACK);
     removeChild(_background, true);
     _background = nullptr;
-    
+
     auto p = ParticleFire::createWithTotalParticles(10);
     this->addChild(p);
-    
+
     auto add = MenuItemFont::create("add 10 particles",
-                                    [p](Ref*)->void
-                                    {
-                                        p->setTotalParticles(p->getTotalParticles() + 10 );
-                                    });
+                                    [p](Ref*) -> void { p->setTotalParticles(p->getTotalParticles() + 10); });
     add->setFontSizeObj(20);
     add->setPosition(Vec2(0, 25));
-    
-    auto remove = MenuItemFont::create("remove 10 particles",
-                                       [p](Ref*)->void
-                                       {
-                                           int count = p->getTotalParticles() - 10;
-                                           if (count < 0) { count = 0; }
-                                           p->setTotalParticles(count);
-                                       });
+
+    auto remove = MenuItemFont::create("remove 10 particles", [p](Ref*) -> void {
+        int count = p->getTotalParticles() - 10;
+        if (count < 0)
+        {
+            count = 0;
+        }
+        p->setTotalParticles(count);
+    });
     remove->setPosition(Vec2(0, -25));
     remove->setFontSizeObj(20);
-    
+
     auto menu = Menu::create(add, remove, nullptr);
     menu->setPosition(Vec2(VisibleRect::center()));
     this->addChild(menu);
-    
 }
 
 std::string ParticleResetTotalParticles::title() const
@@ -2096,7 +2084,7 @@ void ParticleSpriteFrame::onEnter()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Particles/SpriteFrame.plist");
 
-    _emitter->setDisplayFrame( SpriteFrameCache::getInstance()->getSpriteFrameByName("dot.png") );
+    _emitter->setDisplayFrame(SpriteFrameCache::getInstance()->getSpriteFrameByName("dot.png"));
 
     setEmitterPosition();
 }
diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h
index 49efbfd52f56..b2858025683b 100644
--- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h
+++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,7 +39,7 @@ class ParticleDemo : public TestCase
 public:
     ~ParticleDemo();
 
-    virtual void onEnter()override;
+    virtual void onEnter() override;
 
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -185,7 +185,7 @@ class ParallaxParticle : public ParticleDemo
 class DemoParticleFromFile : public ParticleDemo
 {
 public:
-    static DemoParticleFromFile* create(const std::string& file)
+    static DemoParticleFromFile* create(std::string_view file)
     {
         auto ret = new DemoParticleFromFile;
         if (ret->init())
@@ -203,12 +203,9 @@ class DemoParticleFromFile : public ParticleDemo
     }
 
     std::string _title;
-    
+
     virtual void onEnter() override;
-    virtual std::string subtitle() const override
-    {
-        return _title;
-    }
+    virtual std::string subtitle() const override { return _title; }
 };
 
 class RadiusMode1 : public ParticleDemo
@@ -266,6 +263,7 @@ class ParticleBatchHybrid : public ParticleDemo
     void switchRender(float dt);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::Node* _parent1;
     cocos2d::Node* _parent2;
@@ -289,6 +287,7 @@ class ParticleReorder : public ParticleDemo
     void reorderParticles(float dt);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     unsigned int _order;
 };
@@ -322,6 +321,7 @@ class AddAndDeleteParticleSystems : public ParticleDemo
     void removeSystem(float dt);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::ParticleBatchNode* _batchNode;
 };
@@ -335,6 +335,7 @@ class ReorderParticleSystems : public ParticleDemo
     virtual void update(float dt) override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
+
 private:
     cocos2d::ParticleBatchNode* _batchNode;
 };
@@ -342,6 +343,7 @@ class ReorderParticleSystems : public ParticleDemo
 class PremultipliedAlphaTest : public ParticleDemo
 {
     bool _hasEmitter;
+
 public:
     CREATE_FUNC(PremultipliedAlphaTest);
     virtual void onEnter() override;
diff --git a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
index 9d530d4177f4..b440a48d5ed9 100644
--- a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
+++ b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
@@ -2,19 +2,19 @@
  Copyright (c) 2012 cocos2d-x.org
  Copyright (c) 2015-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -48,7 +48,7 @@ enum
 #define ARRAY_SIZE_Y 3
 #define ARRAY_SIZE_Z 4
 
-static cocos2d::Scene *physicsScene = nullptr;
+static cocos2d::Scene* physicsScene = nullptr;
 
 Physics3DTests::Physics3DTests()
 {
@@ -69,7 +69,7 @@ void Physics3DDemoDisabled::onEnter()
 {
     TTFConfig ttfConfig("fonts/arial.ttf", 16);
     auto label = Label::createWithTTF(ttfConfig, "Should define CC_USE_3D_PHYSICS\n to run this test case");
-    
+
     auto size = Director::getInstance()->getWinSize();
     label->setPosition(Vec2(size.width / 2, size.height / 2));
 
@@ -90,12 +90,13 @@ std::string Physics3DTestDemo::subtitle() const
 
 bool Physics3DTestDemo::init()
 {
-    if (!TestCase::init()) return false;
-    
+    if (!TestCase::init())
+        return false;
+
     if (initWithPhysics())
     {
         getPhysics3DWorld()->setDebugDrawEnable(false);
-        
+
         physicsScene = this;
         Size size = Director::getInstance()->getWinSize();
         _camera = Camera::createPerspective(30.0f, size.width / size.height, 1.0f, 1000.0f);
@@ -103,20 +104,23 @@ bool Physics3DTestDemo::init()
         _camera->lookAt(Vec3(0.0f, 0.0f, 0.0f), Vec3(0.0f, 1.0f, 0.0f));
         _camera->setCameraFlag(CameraFlag::USER1);
         this->addChild(_camera);
-        
+
         auto listener = EventListenerTouchAllAtOnce::create();
         listener->onTouchesBegan = CC_CALLBACK_2(Physics3DTestDemo::onTouchesBegan, this);
         listener->onTouchesMoved = CC_CALLBACK_2(Physics3DTestDemo::onTouchesMoved, this);
         listener->onTouchesEnded = CC_CALLBACK_2(Physics3DTestDemo::onTouchesEnded, this);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-        
+
         TTFConfig ttfConfig("fonts/arial.ttf", 10);
-        auto label = Label::createWithTTF(ttfConfig,"DebugDraw OFF");
-        auto menuItem = MenuItemLabel::create(label, [=](Ref* /*ref*/){
-            if (getPhysics3DWorld()->isDebugDrawEnabled()){
+        auto label = Label::createWithTTF(ttfConfig, "DebugDraw OFF");
+        auto menuItem = MenuItemLabel::create(label, [=](Ref* /*ref*/) {
+            if (getPhysics3DWorld()->isDebugDrawEnabled())
+            {
                 getPhysics3DWorld()->setDebugDrawEnable(false);
                 label->setString("DebugDraw OFF");
-            }else{
+            }
+            else
+            {
                 getPhysics3DWorld()->setDebugDrawEnable(true);
                 label->setString("DebugDraw ON");
             }
@@ -125,7 +129,7 @@ bool Physics3DTestDemo::init()
         auto menu = Menu::create(menuItem, nullptr);
         menu->setPosition(Vec2::ZERO);
         menuItem->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-        menuItem->setPosition( Vec2(VisibleRect::left().x, VisibleRect::top().y-50) );
+        menuItem->setPosition(Vec2(VisibleRect::left().x, VisibleRect::top().y - 50));
         this->addChild(menu);
 
         _angle = 0.0f;
@@ -135,13 +139,13 @@ bool Physics3DTestDemo::init()
     return false;
 }
 
-void Physics3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Physics3DTestDemo::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
     _needShootBox = true;
     event->stopPropagation();
 }
 
-void Physics3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Physics3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
     if (touches.size() && _camera)
     {
@@ -160,9 +164,10 @@ void Physics3DTestDemo::onTouchesMoved(const std::vector<Touch*>& touches, cocos
     }
 }
 
-void Physics3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Physics3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-    if (!_needShootBox) return;
+    if (!_needShootBox)
+        return;
     if (!touches.empty())
     {
         auto location = touches[0]->getLocationInView();
@@ -176,22 +181,13 @@ void Physics3DTestDemo::onTouchesEnded(const std::vector<Touch*>& touches, cocos
     }
 }
 
-Physics3DTestDemo::Physics3DTestDemo()
-{
+Physics3DTestDemo::Physics3DTestDemo() {}
 
-}
+void Physics3DTestDemo::update(float /*delta*/) {}
 
-void Physics3DTestDemo::update( float /*delta*/ )
-{
-    
-}
-
-Physics3DTestDemo::~Physics3DTestDemo()
-{
-    
-}
+Physics3DTestDemo::~Physics3DTestDemo() {}
 
-void Physics3DTestDemo::shootBox( const cocos2d::Vec3 &des )
+void Physics3DTestDemo::shootBox(const cocos2d::Vec3& des)
 {
     Physics3DRigidBodyDes rbDes;
     Vec3 linearVel = des - _camera->getPosition3D();
@@ -214,10 +210,10 @@ void Physics3DTestDemo::shootBox( const cocos2d::Vec3 &des )
     sprite->setPosition3D(_camera->getPosition3D());
     sprite->setScale(0.5f);
     sprite->syncNodeToPhysics();
-    
-    //optimize, only sync node to physics
-    sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE); //sync node to physics
-    
+
+    // optimize, only sync node to physics
+    sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);  // sync node to physics
+
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
 }
 
@@ -231,11 +227,11 @@ bool BasicPhysics3DDemo::init()
     if (!Physics3DTestDemo::init())
         return false;
 
-    //create floor
+    // create floor
     Physics3DRigidBodyDes rbDes;
     rbDes.mass = 0.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(60.0f, 1.0f, 60.0f));
-    
+
     auto floor = PhysicsSprite3D::create("Sprite3DTest/box.c3t", &rbDes);
     floor->setTexture("Sprite3DTest/plane.png");
     floor->setScaleX(60);
@@ -243,26 +239,26 @@ bool BasicPhysics3DDemo::init()
     this->addChild(floor);
     floor->setCameraMask((unsigned short)CameraFlag::USER1);
     floor->syncNodeToPhysics();
-    //static object sync is not needed
+    // static object sync is not needed
     floor->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
-    
-    //create several boxes using PhysicsSprite3D
+
+    // create several boxes using PhysicsSprite3D
     rbDes.mass = 1.f;
     rbDes.shape = Physics3DShape::createBox(Vec3(0.8f, 0.8f, 0.8f));
-    float start_x = START_POS_X - ARRAY_SIZE_X/2;
+    float start_x = START_POS_X - ARRAY_SIZE_X / 2;
     float start_y = START_POS_Y;
-    float start_z = START_POS_Z - ARRAY_SIZE_Z/2;
+    float start_z = START_POS_Z - ARRAY_SIZE_Z / 2;
 
-    for (int k=0;k<ARRAY_SIZE_Y;k++)
+    for (int k = 0; k < ARRAY_SIZE_Y; k++)
     {
-        for (int i=0;i<ARRAY_SIZE_X;i++)
+        for (int i = 0; i < ARRAY_SIZE_X; i++)
         {
-            for(int j = 0;j<ARRAY_SIZE_Z;j++)
+            for (int j = 0; j < ARRAY_SIZE_Z; j++)
             {
-                float x = 1.0*i + start_x;
-                float y = 5.0+1.0*k + start_y;
-                float z = 1.0*j + start_z;
-                
+                float x = 1.0 * i + start_x;
+                float y = 5.0 + 1.0 * k + start_y;
+                float z = 1.0 * j + start_z;
+
                 auto sprite = PhysicsSprite3D::create("Sprite3DTest/box.c3t", &rbDes);
                 sprite->setTexture("Images/CyanSquare.png");
                 sprite->setPosition3D(Vec3(x, y, z));
@@ -285,7 +281,7 @@ std::string Physics3DConstraintDemo::subtitle() const
     return "Physics3D Constraint";
 }
 
-std::string Physics3DKinematicDemo::subtitle() const 
+std::string Physics3DKinematicDemo::subtitle() const
 {
     return "Physics3D Kinematic";
 }
@@ -295,7 +291,7 @@ bool Physics3DKinematicDemo::init()
     if (!Physics3DTestDemo::init())
         return false;
 
-    //create floor
+    // create floor
     Physics3DRigidBodyDes rbDes;
     rbDes.mass = 0.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(60.0f, 1.0f, 60.0f));
@@ -307,21 +303,21 @@ bool Physics3DKinematicDemo::init()
     this->addChild(floor);
     floor->setCameraMask((unsigned short)CameraFlag::USER1);
     floor->syncNodeToPhysics();
-    //static object sync is not needed
+    // static object sync is not needed
     floor->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
 
-    //create Kinematics
+    // create Kinematics
     for (unsigned int i = 0; i < 3; ++i)
     {
-        rbDes.mass = 0.f; //kinematic objects. zero mass so that it can not be affected by other dynamic objects
+        rbDes.mass = 0.f;  // kinematic objects. zero mass so that it can not be affected by other dynamic objects
         rbDes.shape = Physics3DShape::createBox(Vec3(2.0f, 2.0f, 2.0f));
-        
+
         auto sprite = PhysicsSprite3D::create("Sprite3DTest/box.c3t", &rbDes);
         sprite->setTexture("Images/CyanSquare.png");
         sprite->setCameraMask((unsigned short)CameraFlag::USER1);
         auto rigidBody = static_cast<Physics3DRigidBody*>(sprite->getPhysicsObj());
         rigidBody->setKinematic(true);
-        
+
         this->addChild(sprite);
 
         sprite->setScale(2.0f);
@@ -330,24 +326,24 @@ bool Physics3DKinematicDemo::init()
         sprite->runAction(RepeatForever::create(Sequence::create(moveby, moveby->reverse(), nullptr)));
     }
 
-    //create Dynamic
+    // create Dynamic
     {
-        //create several spheres
+        // create several spheres
         rbDes.mass = 1.f;
         rbDes.shape = Physics3DShape::createSphere(0.5f);
-        float start_x = START_POS_X - ARRAY_SIZE_X/2;
+        float start_x = START_POS_X - ARRAY_SIZE_X / 2;
         float start_y = START_POS_Y + 5.0f;
-        float start_z = START_POS_Z - ARRAY_SIZE_Z/2;
+        float start_z = START_POS_Z - ARRAY_SIZE_Z / 2;
 
-        for (int k=0;k<ARRAY_SIZE_Y;k++)
+        for (int k = 0; k < ARRAY_SIZE_Y; k++)
         {
-            for (int i=0;i<ARRAY_SIZE_X;i++)
+            for (int i = 0; i < ARRAY_SIZE_X; i++)
             {
-                for(int j = 0;j<ARRAY_SIZE_Z;j++)
+                for (int j = 0; j < ARRAY_SIZE_Z; j++)
                 {
-                    float x = 1.0*i + start_x;
-                    float y = 5.0+1.0*k + start_y;
-                    float z = 1.0*j + start_z;
+                    float x = 1.0 * i + start_x;
+                    float y = 5.0 + 1.0 * k + start_y;
+                    float z = 1.0 * j + start_z;
                     rbDes.originalTransform.setIdentity();
                     rbDes.originalTransform.translate(x, y, z);
 
@@ -358,28 +354,26 @@ bool Physics3DKinematicDemo::init()
                     this->addChild(sprite);
                     sprite->setPosition3D(Vec3(x, y, z));
                     sprite->syncNodeToPhysics();
-                    
+
                     sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
                 }
             }
         }
     }
 
-
     physicsScene->setPhysics3DDebugCamera(_camera);
     return true;
 }
 
-
 bool Physics3DConstraintDemo::init()
 {
     if (!Physics3DTestDemo::init())
         return false;
-    
-    //PhysicsSprite3D = Sprite3D + Physics3DComponent
+
+    // PhysicsSprite3D = Sprite3D + Physics3DComponent
     Physics3DRigidBodyDes rbDes;
     rbDes.disableSleep = true;
-    //create box
+    // create box
     auto sprite = Sprite3D::create("Sprite3DTest/orc.c3b");
     rbDes.mass = 10.f;
     rbDes.shape = Physics3DShape::createBox(Vec3(5.0f, 5.0f, 5.0f));
@@ -387,24 +381,24 @@ bool Physics3DConstraintDemo::init()
     Quaternion quat;
     Quaternion::createFromAxisAngle(Vec3(0.f, 1.f, 0.f), CC_DEGREES_TO_RADIANS(180), &quat);
     auto component = Physics3DComponent::create(rigidBody, Vec3(0.f, -3.f, 0.f), quat);
-    
+
     sprite->addComponent(component);
     addChild(sprite);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     sprite->setScale(0.4f);
     sprite->setPosition3D(Vec3(-20.f, 5.f, 0.f));
-    //sync node position to physics
+    // sync node position to physics
     component->syncNodeToPhysics();
-    //physics controlled, we will not set position for it, so we can skip sync node position to physics
+    // physics controlled, we will not set position for it, so we can skip sync node position to physics
     component->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
-    
+
     physicsScene->setPhysics3DDebugCamera(_camera);
-    
-    //create point to point constraint
+
+    // create point to point constraint
     Physics3DConstraint* constraint = Physics3DPointToPointConstraint::create(rigidBody, Vec3(2.5f, 2.5f, 2.5f));
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
-    
-    //create hinge constraint
+
+    // create hinge constraint
     rbDes.mass = 1.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(8.0f, 8.0f, 1.f));
     rigidBody = Physics3DRigidBody::create(&rbDes);
@@ -418,12 +412,11 @@ bool Physics3DConstraintDemo::init()
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
     component->syncNodeToPhysics();
-    rigidBody->setAngularVelocity(Vec3(0,3,0));
+    rigidBody->setAngularVelocity(Vec3(0, 3, 0));
     constraint = Physics3DHingeConstraint::create(rigidBody, Vec3(4.f, 4.f, 0.5f), Vec3(0.f, 1.f, 0.f));
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
-    
-    
-    //create slider constraint
+
+    // create slider constraint
     rbDes.mass = 1.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(3.0f, 2.0f, 3.f));
     rigidBody = Physics3DRigidBody::create(&rbDes);
@@ -437,8 +430,8 @@ bool Physics3DConstraintDemo::init()
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
     component->syncNodeToPhysics();
-    rigidBody->setLinearVelocity(Vec3(0,3,0));
-    
+    rigidBody->setLinearVelocity(Vec3(0, 3, 0));
+
     rbDes.mass = 0.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(3.0f, 3.0f, 3.f));
     auto rigidBodyB = Physics3DRigidBody::create(&rbDes);
@@ -461,8 +454,8 @@ bool Physics3DConstraintDemo::init()
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
     ((Physics3DSliderConstraint*)constraint)->setLowerLinLimit(-5.f);
     ((Physics3DSliderConstraint*)constraint)->setUpperLinLimit(5.f);
-    
-    //create ConeTwist constraint
+
+    // create ConeTwist constraint
     rbDes.mass = 1.f;
     rbDes.shape = Physics3DShape::createBox(Vec3(3.f, 3.f, 3.f));
     rigidBody = Physics3DRigidBody::create(&rbDes);
@@ -482,9 +475,10 @@ bool Physics3DConstraintDemo::init()
     frameInA.m[14] = 0.f;
     constraint = Physics3DConeTwistConstraint::create(rigidBody, frameInA);
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint, true);
-    ((Physics3DConeTwistConstraint*)constraint)->setLimit(CC_DEGREES_TO_RADIANS(10), CC_DEGREES_TO_RADIANS(10), CC_DEGREES_TO_RADIANS(40));
-    
-    //create 6 dof constraint
+    ((Physics3DConeTwistConstraint*)constraint)
+        ->setLimit(CC_DEGREES_TO_RADIANS(10), CC_DEGREES_TO_RADIANS(10), CC_DEGREES_TO_RADIANS(40));
+
+    // create 6 dof constraint
     rbDes.mass = 1.0f;
     rbDes.shape = Physics3DShape::createBox(Vec3(3.0f, 3.0f, 3.f));
     rigidBody = Physics3DRigidBody::create(&rbDes);
@@ -500,27 +494,27 @@ bool Physics3DConstraintDemo::init()
     frameInA.setIdentity();
     constraint = Physics3D6DofConstraint::create(rigidBody, frameInA, false);
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
-    ((Physics3D6DofConstraint*)constraint)->setAngularLowerLimit(Vec3(0,0,0));
-    ((Physics3D6DofConstraint*)constraint)->setAngularUpperLimit(Vec3(0,0,0));
-    ((Physics3D6DofConstraint*)constraint)->setLinearLowerLimit(Vec3(-10,0,0));
-    ((Physics3D6DofConstraint*)constraint)->setLinearUpperLimit(Vec3(10,0,0));
+    ((Physics3D6DofConstraint*)constraint)->setAngularLowerLimit(Vec3(0, 0, 0));
+    ((Physics3D6DofConstraint*)constraint)->setAngularUpperLimit(Vec3(0, 0, 0));
+    ((Physics3D6DofConstraint*)constraint)->setLinearLowerLimit(Vec3(-10, 0, 0));
+    ((Physics3D6DofConstraint*)constraint)->setLinearUpperLimit(Vec3(10, 0, 0));
 
     return true;
 }
 
-void Physics3DConstraintDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)
+void Physics3DConstraintDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    //ray trace
-    if(_camera)
+    // ray trace
+    if (_camera)
     {
         auto touch = touches[0];
         auto location = touch->getLocationInView();
         Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
-        
+
         auto size = Director::getInstance()->getWinSize();
         _camera->unproject(size, &nearP, &nearP);
         _camera->unproject(size, &farP, &farP);
-        
+
         Physics3DWorld::HitResult result;
         bool ret = physicsScene->getPhysics3DWorld()->rayCast(nearP, farP, &result);
         if (ret && result.hitObj->getObjType() == Physics3DObject::PhysicsObjType::RIGID_BODY)
@@ -528,8 +522,9 @@ void Physics3DConstraintDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>&
             auto mat = result.hitObj->getWorldTransform().getInversed();
             Vec3 position;
             mat.transformPoint(result.hitPosition, &position);
-            
-            _constraint = Physics3DPointToPointConstraint::create(static_cast<Physics3DRigidBody*>(result.hitObj), position);
+
+            _constraint =
+                Physics3DPointToPointConstraint::create(static_cast<Physics3DRigidBody*>(result.hitObj), position);
             physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(_constraint, true);
             _pickingDistance = (result.hitPosition - nearP).length();
             event->stopPropagation();
@@ -539,16 +534,16 @@ void Physics3DConstraintDemo::onTouchesBegan(const std::vector<cocos2d::Touch*>&
     Physics3DTestDemo::onTouchesBegan(touches, event);
     _needShootBox = false;
 }
-void Physics3DConstraintDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)
+void Physics3DConstraintDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
     if (_constraint)
     {
         auto p2pConstraint = ((Physics3DPointToPointConstraint*)_constraint);
-        
+
         auto touch = touches[0];
         auto location = touch->getLocationInView();
         Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
-        
+
         auto size = Director::getInstance()->getWinSize();
         _camera->unproject(size, &nearP, &nearP);
         _camera->unproject(size, &farP, &farP);
@@ -559,7 +554,7 @@ void Physics3DConstraintDemo::onTouchesMoved(const std::vector<cocos2d::Touch*>&
     }
     Physics3DTestDemo::onTouchesMoved(touches, event);
 }
-void Physics3DConstraintDemo::onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event)
+void Physics3DConstraintDemo::onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
     if (_constraint)
     {
@@ -576,23 +571,27 @@ bool Physics3DTerrainDemo::init()
     if (!Physics3DTestDemo::init())
         return false;
 
-    Terrain::DetailMap r("TerrainTest/dirt.jpg"),g("TerrainTest/Grass2.jpg",10),b("TerrainTest/road.jpg"),a("TerrainTest/GreenSkin.jpg",20);
-    
-    Terrain::TerrainData data("TerrainTest/heightmap129.jpg","TerrainTest/alphamap.png",r,g,b,a,Size(32,32), 20.0f, 1.0f);
-    auto terrain = Terrain::create(data,Terrain::CrackFixedType::SKIRT);
+    Terrain::DetailMap r("TerrainTest/dirt.jpg"), g("TerrainTest/Grass2.jpg", 10), b("TerrainTest/road.jpg"),
+        a("TerrainTest/GreenSkin.jpg", 20);
+
+    Terrain::TerrainData data("TerrainTest/heightmap129.jpg", "TerrainTest/alphamap.png", r, g, b, a, Size(32, 32),
+                              20.0f, 1.0f);
+    auto terrain = Terrain::create(data, Terrain::CrackFixedType::SKIRT);
     terrain->setMaxDetailMapAmount(4);
     terrain->setCameraMask(2);
     terrain->setDrawWire(false);
-    
+
     terrain->setSkirtHeightRatio(3);
-    terrain->setLODDistance(64,128,192);
+    terrain->setLODDistance(64, 128, 192);
     terrain->setCameraMask((unsigned short)CameraFlag::USER1);
 
-    //create terrain
+    // create terrain
     std::vector<float> heidata = terrain->getHeightData();
     auto size = terrain->getTerrainSize();
     Physics3DColliderDes colliderDes;
-    colliderDes.shape = Physics3DShape::createHeightfield(size.width, size.height, &heidata[0], 1.0f, terrain->getMinHeight(), terrain->getMaxHeight(), true, false, true);
+    colliderDes.shape =
+        Physics3DShape::createHeightfield(size.width, size.height, &heidata[0], 1.0f, terrain->getMinHeight(),
+                                          terrain->getMaxHeight(), true, false, true);
     auto collider = Physics3DCollider::create(&colliderDes);
     auto component = Physics3DComponent::create(collider);
     terrain->addComponent(component);
@@ -600,24 +599,23 @@ bool Physics3DTerrainDemo::init()
     component->syncNodeToPhysics();
     component->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
 
-
-    //create several spheres
+    // create several spheres
     Physics3DRigidBodyDes rbDes;
     rbDes.mass = 1.f;
     rbDes.shape = Physics3DShape::createSphere(0.5f);
-    float start_x = START_POS_X - ARRAY_SIZE_X/2 + 5.0f;
+    float start_x = START_POS_X - ARRAY_SIZE_X / 2 + 5.0f;
     float start_y = START_POS_Y + 20.0f;
-    float start_z = START_POS_Z - ARRAY_SIZE_Z/2;
+    float start_z = START_POS_Z - ARRAY_SIZE_Z / 2;
 
-    for (int k=0;k<ARRAY_SIZE_Y;k++)
+    for (int k = 0; k < ARRAY_SIZE_Y; k++)
     {
-        for (int i=0;i<ARRAY_SIZE_X;i++)
+        for (int i = 0; i < ARRAY_SIZE_X; i++)
         {
-            for(int j = 0;j<ARRAY_SIZE_Z;j++)
+            for (int j = 0; j < ARRAY_SIZE_Z; j++)
             {
-                float x = 1.0*i + start_x;
-                float y = 5.0+1.0*k + start_y;
-                float z = 1.0*j + start_z;
+                float x = 1.0 * i + start_x;
+                float y = 5.0 + 1.0 * k + start_y;
+                float z = 1.0 * j + start_z;
 
                 auto sprite = PhysicsSprite3D::create("Sprite3DTest/sphere.c3b", &rbDes);
                 sprite->setTexture("Sprite3DTest/plane.png");
@@ -631,7 +629,7 @@ bool Physics3DTerrainDemo::init()
         }
     }
 
-    //create mesh
+    // create mesh
     std::vector<Vec3> trianglesList = Bundle3D::getTrianglesList("Sprite3DTest/boss.c3b");
 
     colliderDes.shape = Physics3DShape::createMesh(&trianglesList[0], (int)trianglesList.size() / 3);
@@ -644,7 +642,7 @@ bool Physics3DTerrainDemo::init()
     sprite->syncNodeToPhysics();
     sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
 
-    std::vector<std::pair<Physics3DShape*, Mat4> > shapeList;
+    std::vector<std::pair<Physics3DShape*, Mat4>> shapeList;
     {
         Mat4 localTrans;
         auto bodyshape = Physics3DShape::createBox(Vec3(2.0f, 4.0f, 2.0f));
@@ -655,11 +653,15 @@ bool Physics3DTerrainDemo::init()
         shapeList.push_back(std::make_pair(headshape, localTrans));
         auto lhandshape = Physics3DShape::createBox(Vec3(1.0f, 3.0f, 1.0f));
         Mat4::createRotation(Vec3(1.0f, 0.0f, 0.0f), CC_DEGREES_TO_RADIANS(15.0f), &localTrans);
-        localTrans.m[12] = -1.5f; localTrans.m[13] = 2.5f; localTrans.m[14] = -2.5f;
+        localTrans.m[12] = -1.5f;
+        localTrans.m[13] = 2.5f;
+        localTrans.m[14] = -2.5f;
         shapeList.push_back(std::make_pair(lhandshape, localTrans));
         auto rhandshape = Physics3DShape::createBox(Vec3(1.0f, 3.0f, 1.0f));
         Mat4::createRotation(Vec3(1.0f, 0.0f, 0.0f), CC_DEGREES_TO_RADIANS(-15.0f), &localTrans);
-        localTrans.m[12] = 2.0f; localTrans.m[13] = 2.5f; localTrans.m[14] = 1.f;
+        localTrans.m[12] = 2.0f;
+        localTrans.m[13] = 2.5f;
+        localTrans.m[14] = 1.f;
         shapeList.push_back(std::make_pair(rhandshape, localTrans));
 
         rbDes.mass = 10.0f;
@@ -675,17 +677,16 @@ bool Physics3DTerrainDemo::init()
         this->addChild(sprite);
     }
 
-
     physicsScene->setPhysics3DDebugCamera(_camera);
     return true;
 }
 
-std::string Physics3DTerrainDemo::subtitle() const 
+std::string Physics3DTerrainDemo::subtitle() const
 {
     return "Physics3D Terrain";
 }
 
-std::string Physics3DCollisionCallbackDemo::subtitle() const 
+std::string Physics3DCollisionCallbackDemo::subtitle() const
 {
     return "Physics3D CollisionCallback";
 }
@@ -700,7 +701,8 @@ bool Physics3DCollisionCallbackDemo::init()
 
         float scale = 2.0f;
         std::vector<Vec3> trianglesList = Bundle3D::getTrianglesList("Sprite3DTest/boss.c3b");
-        for (auto& it : trianglesList) {
+        for (auto& it : trianglesList)
+        {
             it *= scale;
         }
 
@@ -714,31 +716,33 @@ bool Physics3DCollisionCallbackDemo::init()
         sprite->setScale(scale);
         sprite->setCameraMask((unsigned short)CameraFlag::USER1);
         this->addChild(sprite);
-        //preload
+        // preload
         //
-        rigidBody->setCollisionCallback([=](const Physics3DCollisionInfo &ci){
-            if (!ci.collisionPointList.empty()){
-                if (ci.objA->getMask() != 0){
+        rigidBody->setCollisionCallback([=](const Physics3DCollisionInfo& ci) {
+            if (!ci.collisionPointList.empty())
+            {
+                if (ci.objA->getMask() != 0)
+                {
                     auto ps = PUParticleSystem3D::create("Particle3D/scripts/mp_hit_04.pu");
                     ps->setPosition3D(ci.collisionPointList[0].worldPositionOnB);
                     ps->setScale(0.05f);
                     ps->startParticleSystem();
                     ps->setCameraMask(2);
                     this->addChild(ps);
-                    ps->runAction(Sequence::create(DelayTime::create(1.0f), CallFunc::create([=](){
-                        ps->removeFromParent();
-                    }), nullptr));
+                    ps->runAction(Sequence::create(DelayTime::create(1.0f),
+                                                   CallFunc::create([=]() { ps->removeFromParent(); }), nullptr));
                     ci.objA->setMask(0);
                 }
             }
-            //CCLOG("------------BoxB Collision Info------------");
-            //CCLOG("Collision Point Num: %d", ci.collisionPointList.size());
-            //for (auto &iter : ci.collisionPointList){
-            //	CCLOG("Collision Position On A: (%.2f, %.2f, %.2f)", iter.worldPositionOnA.x, iter.worldPositionOnA.y, iter.worldPositionOnA.z);
-            //	CCLOG("Collision Position On B: (%.2f, %.2f, %.2f)", iter.worldPositionOnB.x, iter.worldPositionOnB.y, iter.worldPositionOnB.z);
-            //	CCLOG("Collision Normal On B: (%.2f, %.2f, %.2f)", iter.worldNormalOnB.x, iter.worldNormalOnB.y, iter.worldNormalOnB.z);
-            //}
-            //CCLOG("------------BoxB Collision Info------------");
+            // CCLOG("------------BoxB Collision Info------------");
+            // CCLOG("Collision Point Num: %d", ci.collisionPointList.size());
+            // for (auto &iter : ci.collisionPointList){
+            //	CCLOG("Collision Position On A: (%.2f, %.2f, %.2f)", iter.worldPositionOnA.x, iter.worldPositionOnA.y,
+            // iter.worldPositionOnA.z); 	CCLOG("Collision Position On B: (%.2f, %.2f, %.2f)",
+            // iter.worldPositionOnB.x, iter.worldPositionOnB.y, iter.worldPositionOnB.z); 	CCLOG("Collision Normal
+            // On B: (%.2f, %.2f, %.2f)", iter.worldNormalOnB.x, iter.worldNormalOnB.y, iter.worldNormalOnB.z);
+            // }
+            // CCLOG("------------BoxB Collision Info------------");
         });
     }
 
@@ -814,17 +818,18 @@ bool Physics3DColliderDemo::init()
         doorRight->setCameraMask((unsigned short)CameraFlag::USER1);
         node->addChild(doorRight);
 
-
-        collider->onTriggerEnter = [=](Physics3DObject *otherObject){
-            if (otherObject == playerBody){
+        collider->onTriggerEnter = [=](Physics3DObject* otherObject) {
+            if (otherObject == playerBody)
+            {
                 auto moveby = MoveBy::create(1.0f, Vec3(-5.0f, 0.0f, 0.0f));
                 doorLeft->runAction(moveby);
                 doorRight->runAction(moveby->reverse());
             }
         };
 
-        collider->onTriggerExit = [=](Physics3DObject *otherObject){
-            if (otherObject == playerBody){
+        collider->onTriggerExit = [=](Physics3DObject* otherObject) {
+            if (otherObject == playerBody)
+            {
                 auto moveby = MoveBy::create(1.0f, Vec3(5.0f, 0.0f, 0.0f));
                 doorLeft->runAction(moveby);
                 doorRight->runAction(moveby->reverse());
diff --git a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.h b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.h
index a53773cb83ed..b6085e58799d 100644
--- a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.h
+++ b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,8 +29,9 @@
 #include "../BaseTest.h"
 #include <string>
 
-namespace cocos2d {
-    class Physics3DConstraint;
+namespace cocos2d
+{
+class Physics3DConstraint;
 }
 
 DEFINE_TEST_SUITE(Physics3DTests);
@@ -51,32 +52,30 @@ class Physics3DTestDemo : public TestCase
     CREATE_FUNC(Physics3DTestDemo);
     Physics3DTestDemo();
     virtual ~Physics3DTestDemo();
-    
+
     // overrides
     virtual bool init() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void update(float delta) override;
-    
-    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
 
-protected:
+    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
-    void shootBox(const cocos2d::Vec3 &des);
+protected:
+    void shootBox(const cocos2d::Vec3& des);
 
 protected:
-    std::string    _title;
-    cocos2d::Camera *_camera = nullptr;
-    float _angle = 0.f;
-    bool _needShootBox = false;
+    std::string _title;
+    cocos2d::Camera* _camera = nullptr;
+    float _angle             = 0.f;
+    bool _needShootBox       = false;
 };
 
 class BasicPhysics3DDemo : public Physics3DTestDemo
 {
 public:
-
     CREATE_FUNC(BasicPhysics3DDemo);
     BasicPhysics3DDemo(){};
     virtual ~BasicPhysics3DDemo(){};
@@ -89,28 +88,26 @@ class BasicPhysics3DDemo : public Physics3DTestDemo
 class Physics3DConstraintDemo : public Physics3DTestDemo
 {
 public:
-    
     CREATE_FUNC(Physics3DConstraintDemo);
-    Physics3DConstraintDemo():_constraint(nullptr), _pickingDistance(0.f){};
+    Physics3DConstraintDemo() : _constraint(nullptr), _pickingDistance(0.f){};
     virtual ~Physics3DConstraintDemo(){};
-    
+
     virtual std::string subtitle() const override;
-    
+
     virtual bool init() override;
-    
-    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event) override;
-    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event) override;
-    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event) override;
-    
+
+    virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override;
+    virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override;
+    virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) override;
+
 protected:
-    cocos2d::Physics3DConstraint*     _constraint; //for picking
-    float                             _pickingDistance; //picking distance
+    cocos2d::Physics3DConstraint* _constraint;  // for picking
+    float _pickingDistance;                     // picking distance
 };
 
 class Physics3DKinematicDemo : public Physics3DTestDemo
 {
 public:
-
     CREATE_FUNC(Physics3DKinematicDemo);
     Physics3DKinematicDemo(){};
     virtual ~Physics3DKinematicDemo(){};
@@ -123,7 +120,6 @@ class Physics3DKinematicDemo : public Physics3DTestDemo
 class Physics3DCollisionCallbackDemo : public Physics3DTestDemo
 {
 public:
-
     CREATE_FUNC(Physics3DCollisionCallbackDemo);
     Physics3DCollisionCallbackDemo(){};
     virtual ~Physics3DCollisionCallbackDemo(){};
@@ -136,7 +132,6 @@ class Physics3DCollisionCallbackDemo : public Physics3DTestDemo
 class Physics3DTerrainDemo : public Physics3DTestDemo
 {
 public:
-
     CREATE_FUNC(Physics3DTerrainDemo);
     Physics3DTerrainDemo(){};
     virtual ~Physics3DTerrainDemo(){};
@@ -151,7 +146,6 @@ class Physics3DTerrainDemo : public Physics3DTestDemo
 class Physics3DColliderDemo : public Physics3DTestDemo
 {
 public:
-
     CREATE_FUNC(Physics3DColliderDemo);
     Physics3DColliderDemo(){};
     virtual ~Physics3DColliderDemo(){};
diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
index 69a4ca06b9d4..56b75ada3e0a 100644
--- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
+++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,9 +26,9 @@
 
 #if CC_USE_PHYSICS
 
-#include <cmath>
-#include "ui/CocosGUI.h"
-#include "../testResource.h"
+#    include <cmath>
+#    include "ui/CocosGUI.h"
+#    include "../testResource.h"
 
 USING_NS_CC;
 
@@ -56,25 +56,19 @@ PhysicsTests::PhysicsTests()
 
 namespace
 {
-    Color4F STATIC_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
-    const int DRAG_BODYS_TAG = 0x80;
-}
+Color4F STATIC_COLOR(1.0f, 0.0f, 0.0f, 1.0f);
+const int DRAG_BODYS_TAG = 0x80;
+}  // namespace
 
 void PhysicsDemo::toggleDebug()
 {
-#if CC_USE_PHYSICS
+#    if CC_USE_PHYSICS
     _debugDraw = !_debugDraw;
     _physicsWorld->setDebugDrawMask(_debugDraw ? PhysicsWorld::DEBUGDRAW_ALL : PhysicsWorld::DEBUGDRAW_NONE);
-#endif
+#    endif
 }
 
-
-PhysicsDemo::PhysicsDemo()
-: _spriteTexture(nullptr)
-, _ball(nullptr)
-, _debugDraw(false)
-{
-}
+PhysicsDemo::PhysicsDemo() : _spriteTexture(nullptr), _ball(nullptr), _debugDraw(false) {}
 
 bool PhysicsDemo::init()
 {
@@ -82,9 +76,7 @@ bool PhysicsDemo::init()
     return initWithPhysics();
 }
 
-PhysicsDemo::~PhysicsDemo()
-{
-}
+PhysicsDemo::~PhysicsDemo() {}
 
 std::string PhysicsDemo::title() const
 {
@@ -94,37 +86,38 @@ std::string PhysicsDemo::title() const
 void PhysicsDemo::onEnter()
 {
     TestCase::onEnter();
-    
+
     _spriteTexture = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 100)->getTexture();
-    
+
     // menu for debug layer
     MenuItemFont::setFontSize(18);
     auto item = MenuItemFont::create("Toggle debug", CC_CALLBACK_1(PhysicsDemo::toggleDebugCallback, this));
-    
+
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
-    menu->setPosition(Vec2(VisibleRect::right().x - item->getContentSize().width / 2 - 10, VisibleRect::top().y - item->getContentSize().height / 2 - 10));
+    menu->setPosition(Vec2(VisibleRect::right().x - item->getContentSize().width / 2 - 10,
+                           VisibleRect::top().y - item->getContentSize().height / 2 - 10));
 }
 
-Sprite* PhysicsDemo::addGrossiniAtPosition(Vec2 p, float scale/* = 1.0*/)
+Sprite* PhysicsDemo::addGrossiniAtPosition(Vec2 p, float scale /* = 1.0*/)
 {
     CCLOG("Add sprite %0.2f x %02.f", p.x, p.y);
-    
+
     int posx, posy;
-    
+
     posx = CCRANDOM_0_1() * 200.0f;
     posy = CCRANDOM_0_1() * 200.0f;
-    
+
     posx = (posx % 4) * 85;
     posy = (posy % 3) * 121;
-    
+
     auto sp = Sprite::createWithTexture(_spriteTexture, Rect(posx, posy, 85, 121));
-    
+
     sp->setScale(scale);
     sp->setPosition(p);
     sp->addComponent(PhysicsBody::createBox(Size(48.0f, 108.0f)));
     this->addChild(sp);
-    
+
     return sp;
 }
 
@@ -135,56 +128,61 @@ void PhysicsDemo::toggleDebugCallback(Ref* /*sender*/)
 
 namespace
 {
-    const int LOGO_WIDTH = 188;
-    const int LOGO_HEIGHT = 35;
-    const int LOGO_RAW_LENGTH = 24;
-    const int LOGO_IMAGE[] =
-    {
-        15, -16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, -64, 15, 63, -32, -2, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, -64, 15, 127, -125, -1, -128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 127, -64, 15, 127, 15, -1, -64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -64, 15, -2,
-        31, -1, -64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -64, 0, -4, 63, -1, -32, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -64, 15, -8, 127, -1, -32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        1, -1, -64, 0, -8, -15, -1, -32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -31, -1, -64, 15, -8, -32,
-        -1, -32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, -15, -1, -64, 9, -15, -32, -1, -32, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, -15, -1, -64, 0, -15, -32, -1, -32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 63, -7, -1, -64, 9, -29, -32, 127, -61, -16, 63, 15, -61, -1, -8, 31, -16, 15, -8, 126, 7, -31,
-        -8, 31, -65, -7, -1, -64, 9, -29, -32, 0, 7, -8, 127, -97, -25, -1, -2, 63, -8, 31, -4, -1, 15, -13,
-        -4, 63, -1, -3, -1, -64, 9, -29, -32, 0, 7, -8, 127, -97, -25, -1, -2, 63, -8, 31, -4, -1, 15, -13,
-        -2, 63, -1, -3, -1, -64, 9, -29, -32, 0, 7, -8, 127, -97, -25, -1, -1, 63, -4, 63, -4, -1, 15, -13,
-        -2, 63, -33, -1, -1, -32, 9, -25, -32, 0, 7, -8, 127, -97, -25, -1, -1, 63, -4, 63, -4, -1, 15, -13,
-        -1, 63, -33, -1, -1, -16, 9, -25, -32, 0, 7, -8, 127, -97, -25, -1, -1, 63, -4, 63, -4, -1, 15, -13,
-        -1, 63, -49, -1, -1, -8, 9, -57, -32, 0, 7, -8, 127, -97, -25, -8, -1, 63, -2, 127, -4, -1, 15, -13,
-        -1, -65, -49, -1, -1, -4, 9, -57, -32, 0, 7, -8, 127, -97, -25, -8, -1, 63, -2, 127, -4, -1, 15, -13,
-        -1, -65, -57, -1, -1, -2, 9, -57, -32, 0, 7, -8, 127, -97, -25, -8, -1, 63, -2, 127, -4, -1, 15, -13,
-        -1, -1, -57, -1, -1, -1, 9, -57, -32, 0, 7, -1, -1, -97, -25, -8, -1, 63, -1, -1, -4, -1, 15, -13, -1,
-        -1, -61, -1, -1, -1, -119, -57, -32, 0, 7, -1, -1, -97, -25, -8, -1, 63, -1, -1, -4, -1, 15, -13, -1,
-        -1, -61, -1, -1, -1, -55, -49, -32, 0, 7, -1, -1, -97, -25, -8, -1, 63, -1, -1, -4, -1, 15, -13, -1,
-        -1, -63, -1, -1, -1, -23, -49, -32, 127, -57, -1, -1, -97, -25, -1, -1, 63, -1, -1, -4, -1, 15, -13,
-        -1, -1, -63, -1, -1, -1, -16, -49, -32, -1, -25, -1, -1, -97, -25, -1, -1, 63, -33, -5, -4, -1, 15,
-        -13, -1, -1, -64, -1, -9, -1, -7, -49, -32, -1, -25, -8, 127, -97, -25, -1, -1, 63, -33, -5, -4, -1,
-        15, -13, -1, -1, -64, -1, -13, -1, -32, -49, -32, -1, -25, -8, 127, -97, -25, -1, -2, 63, -49, -13,
-        -4, -1, 15, -13, -1, -1, -64, 127, -7, -1, -119, -17, -15, -1, -25, -8, 127, -97, -25, -1, -2, 63,
-        -49, -13, -4, -1, 15, -13, -3, -1, -64, 127, -8, -2, 15, -17, -1, -1, -25, -8, 127, -97, -25, -1,
-        -8, 63, -49, -13, -4, -1, 15, -13, -3, -1, -64, 63, -4, 120, 0, -17, -1, -1, -25, -8, 127, -97, -25,
-        -8, 0, 63, -57, -29, -4, -1, 15, -13, -4, -1, -64, 63, -4, 0, 15, -17, -1, -1, -25, -8, 127, -97,
-        -25, -8, 0, 63, -57, -29, -4, -1, -1, -13, -4, -1, -64, 31, -2, 0, 0, 103, -1, -1, -57, -8, 127, -97,
-        -25, -8, 0, 63, -57, -29, -4, -1, -1, -13, -4, 127, -64, 31, -2, 0, 15, 103, -1, -1, -57, -8, 127,
-        -97, -25, -8, 0, 63, -61, -61, -4, 127, -1, -29, -4, 127, -64, 15, -8, 0, 0, 55, -1, -1, -121, -8,
-        127, -97, -25, -8, 0, 63, -61, -61, -4, 127, -1, -29, -4, 63, -64, 15, -32, 0, 0, 23, -1, -2, 3, -16,
-        63, 15, -61, -16, 0, 31, -127, -127, -8, 31, -1, -127, -8, 31, -128, 7, -128, 0, 0
-    };
-    
-    int getPixel(int x, int y)
-    {
-        return (LOGO_IMAGE[(x >> 3) + y * LOGO_RAW_LENGTH] >> (~x & 0x7)) & 1;
-    }
-    
-    float frand()
-    {
-        return rand() / RAND_MAX;
-    }
-}
+const int LOGO_WIDTH      = 188;
+const int LOGO_HEIGHT     = 35;
+const int LOGO_RAW_LENGTH = 24;
+const int LOGO_IMAGE[]    = {
+    15,  -16, 0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    7,   -64, 15,  63,  -32, -2,  0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   31,  -64, 15,  127, -125, -1,   -128, 0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   127, -64,  15,   127,  15,  -1,  -64, 0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    1,    -1,   -64, 15,  -2,  31,   -1,  -64, 0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   1,   -1,  -64,  0,   -4,  63,   -1,   -32,  0,   0,
+    0,   0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    1,   -1,  -64,  15,   -8,   127, -1,
+    -32, 0,   0,   0,   0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    1,    -1,   -64, 0,
+    -8,  -15, -1,  -32, 0,   0,   0,   0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    1,   -31,
+    -1,  -64, 15,  -8,  -32, -1,  -32, 0,    0,    0,    0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   7,   -15, -1,  -64, 9,   -15, -32,  -1,   -32,  0,   0,   0,   0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   31,  -15, -1,  -64,  0,    -15,  -32, -1,  -32, 0,    0,   0,   0,    0,    0,    0,   0,
+    0,   0,   0,   0,   0,   0,   0,   63,   -7,   -1,   -64, 9,   -29, -32,  127, -61, -16,  63,   15,   -61, -1,
+    -8,  31,  -16, 15,  -8,  126, 7,   -31,  -8,   31,   -65, -7,  -1,  -64,  9,   -29, -32,  0,    7,    -8,  127,
+    -97, -25, -1,  -2,  63,  -8,  31,  -4,   -1,   15,   -13, -4,  63,  -1,   -3,  -1,  -64,  9,    -29,  -32, 0,
+    7,   -8,  127, -97, -25, -1,  -2,  63,   -8,   31,   -4,  -1,  15,  -13,  -2,  63,  -1,   -3,   -1,   -64, 9,
+    -29, -32, 0,   7,   -8,  127, -97, -25,  -1,   -1,   63,  -4,  63,  -4,   -1,  15,  -13,  -2,   63,   -33, -1,
+    -1,  -32, 9,   -25, -32, 0,   7,   -8,   127,  -97,  -25, -1,  -1,  63,   -4,  63,  -4,   -1,   15,   -13, -1,
+    63,  -33, -1,  -1,  -16, 9,   -25, -32,  0,    7,    -8,  127, -97, -25,  -1,  -1,  63,   -4,   63,   -4,  -1,
+    15,  -13, -1,  63,  -49, -1,  -1,  -8,   9,    -57,  -32, 0,   7,   -8,   127, -97, -25,  -8,   -1,   63,  -2,
+    127, -4,  -1,  15,  -13, -1,  -65, -49,  -1,   -1,   -4,  9,   -57, -32,  0,   7,   -8,   127,  -97,  -25, -8,
+    -1,  63,  -2,  127, -4,  -1,  15,  -13,  -1,   -65,  -57, -1,  -1,  -2,   9,   -57, -32,  0,    7,    -8,  127,
+    -97, -25, -8,  -1,  63,  -2,  127, -4,   -1,   15,   -13, -1,  -1,  -57,  -1,  -1,  -1,   9,    -57,  -32, 0,
+    7,   -1,  -1,  -97, -25, -8,  -1,  63,   -1,   -1,   -4,  -1,  15,  -13,  -1,  -1,  -61,  -1,   -1,   -1,  -119,
+    -57, -32, 0,   7,   -1,  -1,  -97, -25,  -8,   -1,   63,  -1,  -1,  -4,   -1,  15,  -13,  -1,   -1,   -61, -1,
+    -1,  -1,  -55, -49, -32, 0,   7,   -1,   -1,   -97,  -25, -8,  -1,  63,   -1,  -1,  -4,   -1,   15,   -13, -1,
+    -1,  -63, -1,  -1,  -1,  -23, -49, -32,  127,  -57,  -1,  -1,  -97, -25,  -1,  -1,  63,   -1,   -1,   -4,  -1,
+    15,  -13, -1,  -1,  -63, -1,  -1,  -1,   -16,  -49,  -32, -1,  -25, -1,   -1,  -97, -25,  -1,   -1,   63,  -33,
+    -5,  -4,  -1,  15,  -13, -1,  -1,  -64,  -1,   -9,   -1,  -7,  -49, -32,  -1,  -25, -8,   127,  -97,  -25, -1,
+    -1,  63,  -33, -5,  -4,  -1,  15,  -13,  -1,   -1,   -64, -1,  -13, -1,   -32, -49, -32,  -1,   -25,  -8,  127,
+    -97, -25, -1,  -2,  63,  -49, -13, -4,   -1,   15,   -13, -1,  -1,  -64,  127, -7,  -1,   -119, -17,  -15, -1,
+    -25, -8,  127, -97, -25, -1,  -2,  63,   -49,  -13,  -4,  -1,  15,  -13,  -3,  -1,  -64,  127,  -8,   -2,  15,
+    -17, -1,  -1,  -25, -8,  127, -97, -25,  -1,   -8,   63,  -49, -13, -4,   -1,  15,  -13,  -3,   -1,   -64, 63,
+    -4,  120, 0,   -17, -1,  -1,  -25, -8,   127,  -97,  -25, -8,  0,   63,   -57, -29, -4,   -1,   15,   -13, -4,
+    -1,  -64, 63,  -4,  0,   15,  -17, -1,   -1,   -25,  -8,  127, -97, -25,  -8,  0,   63,   -57,  -29,  -4,  -1,
+    -1,  -13, -4,  -1,  -64, 31,  -2,  0,    0,    103,  -1,  -1,  -57, -8,   127, -97, -25,  -8,   0,    63,  -57,
+    -29, -4,  -1,  -1,  -13, -4,  127, -64,  31,   -2,   0,   15,  103, -1,   -1,  -57, -8,   127,  -97,  -25, -8,
+    0,   63,  -61, -61, -4,  127, -1,  -29,  -4,   127,  -64, 15,  -8,  0,    0,   55,  -1,   -1,   -121, -8,  127,
+    -97, -25, -8,  0,   63,  -61, -61, -4,   127,  -1,   -29, -4,  63,  -64,  15,  -32, 0,    0,    23,   -1,  -2,
+    3,   -16, 63,  15,  -61, -16, 0,   31,   -127, -127, -8,  31,  -1,  -127, -8,  31,  -128, 7,    -128, 0,   0};
+
+int getPixel(int x, int y)
+{
+    return (LOGO_IMAGE[(x >> 3) + y * LOGO_RAW_LENGTH] >> (~x & 0x7)) & 1;
+}
+
+float frand()
+{
+    return rand() / RAND_MAX;
+}
+}  // namespace
 
 Sprite* PhysicsDemo::makeBall(Vec2 point, float radius, PhysicsMaterial material)
 {
@@ -193,12 +191,12 @@ Sprite* PhysicsDemo::makeBall(Vec2 point, float radius, PhysicsMaterial material
         ball = Sprite::createWithTexture(_ball->getTexture());
     else
         ball = Sprite::create("Images/ball.png");
-    
+
     ball->setScale(0.13f * radius);
-    
+
     ball->addComponent(PhysicsBody::createCircle(ball->getContentSize().width / 2, material));
     ball->setPosition(Vec2(point.x, point.y));
-    
+
     return ball;
 }
 
@@ -213,15 +211,15 @@ Sprite* PhysicsDemo::makeBox(Vec2 point, Size size, int color, PhysicsMaterial m
     {
         yellow = color == 1;
     }
-    
+
     auto box = yellow ? Sprite::create("Images/YellowSquare.png") : Sprite::create("Images/CyanSquare.png");
     box->setScaleX(size.width / 100.0f);
     box->setScaleY(size.height / 100.0f);
-    
+
     box->addComponent(PhysicsBody::createBox(box->getContentSize(), material));
-    
+
     box->setPosition(Vec2(point.x, point.y));
-    
+
     return box;
 }
 
@@ -236,9 +234,9 @@ Sprite* PhysicsDemo::makeTriangle(Vec2 point, Size size, int color, PhysicsMater
     {
         yellow = color == 1;
     }
-    
+
     auto triangle = yellow ? Sprite::create("Images/YellowTriangle.png") : Sprite::create("Images/CyanTriangle.png");
-    
+
     if (size.height == 0)
     {
         triangle->setScale(size.width / 100.0f);
@@ -248,20 +246,22 @@ Sprite* PhysicsDemo::makeTriangle(Vec2 point, Size size, int color, PhysicsMater
         triangle->setScaleX(size.width / 50.0f);
         triangle->setScaleY(size.height / 43.5f);
     }
-    
-    Vec2 vers[] = { Vec2(0.0f, triangle->getContentSize().height / 2), Vec2(triangle->getContentSize().width / 2, -triangle->getContentSize().height / 2), Vec2(-triangle->getContentSize().width / 2, -triangle->getContentSize().height / 2) };
-    
+
+    Vec2 vers[] = {Vec2(0.0f, triangle->getContentSize().height / 2),
+                   Vec2(triangle->getContentSize().width / 2, -triangle->getContentSize().height / 2),
+                   Vec2(-triangle->getContentSize().width / 2, -triangle->getContentSize().height / 2)};
+
     triangle->addComponent(PhysicsBody::createPolygon(vers, 3, material));
     triangle->setPosition(Vec2(point.x, point.y));
-    
+
     return triangle;
 }
 
 bool PhysicsDemo::onTouchBegan(Touch* touch, Event* event)
 {
     auto location = touch->getLocation();
-    auto arr = _physicsWorld->getShapes(location);
-    
+    auto arr      = _physicsWorld->getShapes(location);
+
     PhysicsBody* body = nullptr;
     for (auto& obj : arr)
     {
@@ -271,10 +271,10 @@ bool PhysicsDemo::onTouchBegan(Touch* touch, Event* event)
             break;
         }
     }
-    
+
     if (body != nullptr)
     {
-        Node* mouse = Node::create();
+        Node* mouse      = Node::create();
         auto physicsBody = PhysicsBody::create(PHYSICS_INFINITY, PHYSICS_INFINITY);
         physicsBody->setDynamic(false);
         mouse->addComponent(physicsBody);
@@ -284,17 +284,17 @@ bool PhysicsDemo::onTouchBegan(Touch* touch, Event* event)
         joint->setMaxForce(5000.0f * body->getMass());
         _physicsWorld->addJoint(joint);
         _mouses.insert(std::make_pair(touch->getID(), mouse));
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 void PhysicsDemo::onTouchMoved(Touch* touch, Event* /*event*/)
 {
     auto it = _mouses.find(touch->getID());
-    
+
     if (it != _mouses.end())
     {
         it->second->setPosition(touch->getLocation());
@@ -304,7 +304,7 @@ void PhysicsDemo::onTouchMoved(Touch* touch, Event* /*event*/)
 void PhysicsDemo::onTouchEnded(Touch* touch, Event* /*event*/)
 {
     auto it = _mouses.find(touch->getID());
-    
+
     if (it != _mouses.end())
     {
         this->removeChild(it->second);
@@ -317,11 +317,11 @@ void PhysicsDemo::onTouchEnded(Touch* touch, Event* /*event*/)
 void PhysicsDemoLogoSmash::onEnter()
 {
     PhysicsDemo::onEnter();
-    
+
     _physicsWorld->setGravity(Vec2(0.0f, 0.0f));
     _physicsWorld->setUpdateRate(5.0f);
-    
-    _ball = SpriteBatchNode::create("Images/ball.png", sizeof(LOGO_IMAGE)/sizeof(LOGO_IMAGE[0]));
+
+    _ball = SpriteBatchNode::create("Images/ball.png", sizeof(LOGO_IMAGE) / sizeof(LOGO_IMAGE[0]));
     addChild(_ball);
     for (int y = 0; y < LOGO_HEIGHT; ++y)
     {
@@ -331,26 +331,27 @@ void PhysicsDemoLogoSmash::onEnter()
             {
                 float xJitter = 0.05 * frand();
                 float yJitter = 0.05 * frand();
-                
-                Node* ball = makeBall(Vec2(2*(x - LOGO_WIDTH/2 + xJitter) + VisibleRect::getVisibleRect().size.width/2,
-                                           2*(LOGO_HEIGHT-y + yJitter) + VisibleRect::getVisibleRect().size.height/2 - LOGO_HEIGHT/2),
-                                      0.95f, PhysicsMaterial(0.01f, 0.0f, 0.0f));
-                
+
+                Node* ball =
+                    makeBall(Vec2(2 * (x - LOGO_WIDTH / 2 + xJitter) + VisibleRect::getVisibleRect().size.width / 2,
+                                  2 * (LOGO_HEIGHT - y + yJitter) + VisibleRect::getVisibleRect().size.height / 2 -
+                                      LOGO_HEIGHT / 2),
+                             0.95f, PhysicsMaterial(0.01f, 0.0f, 0.0f));
+
                 auto physicsBody = ball->getPhysicsBody();
                 physicsBody->setMass(1.0);
                 physicsBody->setMoment(PHYSICS_INFINITY);
-                
+
                 _ball->addChild(ball);
             }
         }
     }
-    
-    
+
     auto bullet = makeBall(Vec2(400.0f, 0.0f), 10, PhysicsMaterial(PHYSICS_INFINITY, 0, 0));
     bullet->getPhysicsBody()->setVelocity(Vec2(200.0f, 0.0f));
-    
-    bullet->setPosition(Vec2(-500.0f, VisibleRect::getVisibleRect().size.height/2));
-    
+
+    bullet->setPosition(Vec2(-500.0f, VisibleRect::getVisibleRect().size.height / 2));
+
     _ball->addChild(bullet);
 }
 
@@ -369,20 +370,20 @@ PhysicsDemoClickAdd::~PhysicsDemoClickAdd()
 void PhysicsDemoClickAdd::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto touchListener = EventListenerTouchAllAtOnce::create();
+
+    auto touchListener            = EventListenerTouchAllAtOnce::create();
     touchListener->onTouchesEnded = CC_CALLBACK_2(PhysicsDemoClickAdd::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     Device::setAccelerometerEnabled(true);
     auto accListener = EventListenerAcceleration::create(CC_CALLBACK_2(PhysicsDemoClickAdd::onAcceleration, this));
     _eventDispatcher->addEventListenerWithSceneGraphPriority(accListener, this);
-    
+
     auto node = Node::create();
     node->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size));
     node->setPosition(VisibleRect::center());
     this->addChild(node);
-    
+
     addGrossiniAtPosition(VisibleRect::center());
 }
 
@@ -393,49 +394,49 @@ std::string PhysicsDemoClickAdd::subtitle() const
 
 void PhysicsDemoClickAdd::onTouchesEnded(const std::vector<Touch*>& touches, Event* /*event*/)
 {
-    //Add a new body/atlas sprite at the touched location
-    
-    for( auto touch: touches)
+    // Add a new body/atlas sprite at the touched location
+
+    for (auto touch : touches)
     {
         auto location = touch->getLocation();
-        
-        addGrossiniAtPosition( location );
+
+        addGrossiniAtPosition(location);
     }
 }
 
 void PhysicsDemoClickAdd::onAcceleration(Acceleration* acc, Event* /*event*/)
 {
-    static float prevX=0, prevY=0;
-    
-#define FILTER_FACTOR 0.05f
-    
-    float accelX = (float) acc->x * FILTER_FACTOR + (1- FILTER_FACTOR)*prevX;
-    float accelY = (float) acc->y * FILTER_FACTOR + (1- FILTER_FACTOR)*prevY;
-    
+    static float prevX = 0, prevY = 0;
+
+#    define FILTER_FACTOR 0.05f
+
+    float accelX = (float)acc->x * FILTER_FACTOR + (1 - FILTER_FACTOR) * prevX;
+    float accelY = (float)acc->y * FILTER_FACTOR + (1 - FILTER_FACTOR) * prevY;
+
     prevX = accelX;
     prevY = accelY;
-    
-    auto v = Vec2( accelX, accelY);
-    v = v * 200;
-    
+
+    auto v = Vec2(accelX, accelY);
+    v      = v * 200;
+
     _physicsWorld->setGravity(v);
 }
 
 void PhysicsDemoPyramidStack::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemoPyramidStack::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemoPyramidStack::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemoPyramidStack::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     auto node = Node::create();
     node->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f),
-        VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
+                                                      VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
     this->addChild(node);
-    
+
     auto ball = Sprite::create("Images/ball.png");
     ball->setScale(1);
     ball->setTag(100);
@@ -444,9 +445,9 @@ void PhysicsDemoPyramidStack::onEnter()
     body->setTag(DRAG_BODYS_TAG);
     ball->setPosition(VisibleRect::bottom() + Vec2(0.0f, 60.0f));
     this->addChild(ball);
-    
+
     scheduleOnce(CC_SCHEDULE_SELECTOR(PhysicsDemoPyramidStack::updateOnce), 3.0);
-    
+
     for (int i = 0; i < 14; i++)
     {
         for (int j = 0; j <= i; j++)
@@ -469,55 +470,53 @@ std::string PhysicsDemoPyramidStack::title() const
     return "Pyramid Stack";
 }
 
-PhysicsDemoRayCast::PhysicsDemoRayCast()
-: _angle(0.0f)
-, _node(nullptr)
-, _mode(0)
-{}
+PhysicsDemoRayCast::PhysicsDemoRayCast() : _angle(0.0f), _node(nullptr), _mode(0) {}
 
 void PhysicsDemoRayCast::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto listener = EventListenerTouchAllAtOnce::create();
+
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(PhysicsDemoRayCast::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     _physicsWorld->setGravity(Point::ZERO);
-    
+
     auto node = DrawNode::create();
-    node->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f), VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
-    node->drawSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f), VisibleRect::rightBottom() + Vec2(0.0f, 50.0f), 1, STATIC_COLOR);
+    node->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f),
+                                                      VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
+    node->drawSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f), VisibleRect::rightBottom() + Vec2(0.0f, 50.0f), 1,
+                      STATIC_COLOR);
     this->addChild(node);
-    
+
     MenuItemFont::setFontSize(18);
     auto item = MenuItemFont::create("Change Mode(any)", CC_CALLBACK_1(PhysicsDemoRayCast::changeModeCallback, this));
-    
+
     auto menu = Menu::create(item, nullptr);
     this->addChild(menu);
     menu->setPosition(Vec2(VisibleRect::left().x + 100, VisibleRect::top().y - 10));
-    
+
     scheduleUpdate();
 }
 
 void PhysicsDemoRayCast::changeModeCallback(Ref* sender)
 {
     _mode = (_mode + 1) % 3;
-    
+
     switch (_mode)
     {
-        case 0:
-            ((MenuItemFont*)sender)->setString("Change Mode(any)");
-            break;
-        case 1:
-            ((MenuItemFont*)sender)->setString("Change Mode(nearest)");
-            break;
-        case 2:
-            ((MenuItemFont*)sender)->setString("Change Mode(multiple)");
-            break;
-            
-        default:
-            break;
+    case 0:
+        ((MenuItemFont*)sender)->setString("Change Mode(any)");
+        break;
+    case 1:
+        ((MenuItemFont*)sender)->setString("Change Mode(nearest)");
+        break;
+    case 2:
+        ((MenuItemFont*)sender)->setString("Change Mode(multiple)");
+        break;
+
+    default:
+        break;
     }
 }
 
@@ -529,104 +528,104 @@ bool PhysicsDemoRayCast::anyRay(PhysicsWorld& /*world*/, const PhysicsRayCastInf
 
 void PhysicsDemoRayCast::update(float /*delta*/)
 {
-    float L = 150.0f;
+    float L     = 150.0f;
     Vec2 point1 = VisibleRect::center();
     Vec2 d(L * cosf(_angle), L * sinf(_angle));
     Vec2 point2 = point1 + d;
-    
+
     removeChild(_node);
     _node = DrawNode::create();
     switch (_mode)
     {
-        case 0:
+    case 0:
+    {
+        Vec2 point3 = point2;
+        auto func   = CC_CALLBACK_3(PhysicsDemoRayCast::anyRay, this);
+
+        _physicsWorld->rayCast(func, point1, point2, &point3);
+        _node->drawSegment(point1, point3, 1, STATIC_COLOR);
+
+        if (point2 != point3)
         {
-            Vec2 point3 = point2;
-            auto func = CC_CALLBACK_3(PhysicsDemoRayCast::anyRay, this);
-            
-            _physicsWorld->rayCast(func, point1, point2, &point3);
-            _node->drawSegment(point1, point3, 1, STATIC_COLOR);
-            
-            if (point2 != point3)
-            {
-                _node->drawDot(point3, 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
-            }
-            addChild(_node);
-            
-            break;
+            _node->drawDot(point3, 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
         }
-        case 1:
-        {
-            Vec2 point3 = point2;
-            float friction = 1.0f;
-            PhysicsRayCastCallbackFunc func = [&point3, &friction](PhysicsWorld& /*world*/, const PhysicsRayCastInfo& info, void* /*data*/)->bool
-            {
-                if (friction > info.fraction)
-                {
-                    point3 = info.contact;
-                    friction = info.fraction;
-                }
-                
-                return true;
-            };
-            
-            _physicsWorld->rayCast(func, point1, point2, nullptr);
-            _node->drawSegment(point1, point3, 1, STATIC_COLOR);
-            
-            if (point2 != point3)
+        addChild(_node);
+
+        break;
+    }
+    case 1:
+    {
+        Vec2 point3                     = point2;
+        float friction                  = 1.0f;
+        PhysicsRayCastCallbackFunc func = [&point3, &friction](PhysicsWorld& /*world*/, const PhysicsRayCastInfo& info,
+                                                               void* /*data*/) -> bool {
+            if (friction > info.fraction)
             {
-                _node->drawDot(point3, 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
+                point3   = info.contact;
+                friction = info.fraction;
             }
-            addChild(_node);
-            
-            break;
-        }
-        case 2:
+
+            return true;
+        };
+
+        _physicsWorld->rayCast(func, point1, point2, nullptr);
+        _node->drawSegment(point1, point3, 1, STATIC_COLOR);
+
+        if (point2 != point3)
         {
-#define MAX_MULTI_RAYCAST_NUM 5
-            Vec2 points[MAX_MULTI_RAYCAST_NUM];
-            int num = 0;
-            
-            PhysicsRayCastCallbackFunc func = [&points, &num](PhysicsWorld& /*world*/, const PhysicsRayCastInfo& info, void* /*data*/)->bool
-            {
-                if (num < MAX_MULTI_RAYCAST_NUM)
-                {
-                    points[num++] = info.contact;
-                }
-                
-                return true;
-            };
-            
-            _physicsWorld->rayCast(func, point1, point2, nullptr);
-            
-            _node->drawSegment(point1, point2, 1, STATIC_COLOR);
-            
-            for (int i = 0; i < num; ++i)
+            _node->drawDot(point3, 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
+        }
+        addChild(_node);
+
+        break;
+    }
+    case 2:
+    {
+#    define MAX_MULTI_RAYCAST_NUM 5
+        Vec2 points[MAX_MULTI_RAYCAST_NUM];
+        int num = 0;
+
+        PhysicsRayCastCallbackFunc func = [&points, &num](PhysicsWorld& /*world*/, const PhysicsRayCastInfo& info,
+                                                          void* /*data*/) -> bool {
+            if (num < MAX_MULTI_RAYCAST_NUM)
             {
-                _node->drawDot(points[i], 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
+                points[num++] = info.contact;
             }
-            
-            addChild(_node);
-            
-            break;
+
+            return true;
+        };
+
+        _physicsWorld->rayCast(func, point1, point2, nullptr);
+
+        _node->drawSegment(point1, point2, 1, STATIC_COLOR);
+
+        for (int i = 0; i < num; ++i)
+        {
+            _node->drawDot(points[i], 2, Color4F(1.0f, 1.0f, 1.0f, 1.0f));
         }
-            
-        default:
-            break;
+
+        addChild(_node);
+
+        break;
     }
-    
+
+    default:
+        break;
+    }
+
     _angle += 0.25f * (float)M_PI / 180.0f;
 }
 
 void PhysicsDemoRayCast::onTouchesEnded(const std::vector<Touch*>& touches, Event* /*event*/)
 {
-    //Add a new body/atlas sprite at the touched location
-    
-    for (auto &touch : touches)
+    // Add a new body/atlas sprite at the touched location
+
+    for (auto& touch : touches)
     {
         auto location = touch->getLocation();
-        
+
         float r = CCRANDOM_0_1();
-        
+
         if (r < 1.0f / 3.0f)
         {
             addChild(makeBall(location, 5 + CCRANDOM_0_1() * 10));
@@ -651,36 +650,36 @@ void PhysicsDemoActions::onEnter()
 {
     PhysicsDemo::onEnter();
     _physicsWorld->setGravity(Vec2::ZERO);
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemoActions::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemoActions::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemoActions::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     auto node = Node::create();
     node->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size));
     node->setPosition(VisibleRect::center());
     this->addChild(node);
-    
+
     Sprite* sp1 = addGrossiniAtPosition(VisibleRect::center());
     Sprite* sp2 = addGrossiniAtPosition(VisibleRect::left() + Vec2(50.0f, 0.0f));
     Sprite* sp3 = addGrossiniAtPosition(VisibleRect::right() - Vec2(20.0f, 0.0f));
     Sprite* sp4 = addGrossiniAtPosition(VisibleRect::leftTop() + Vec2(50.0f, -50.0f));
     sp4->getPhysicsBody()->setGravityEnable(false);
-    
+
     sp1->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     sp2->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     sp3->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     sp4->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
-    
-    auto actionTo = JumpTo::create(2, Vec2(100, 100), 50, 4);
-    auto actionBy = JumpBy::create(2, Vec2(300, 0), 50, 4);
-    auto actionUp = JumpBy::create(2, Vec2(0, 50), 80, 4);
+
+    auto actionTo     = JumpTo::create(2, Vec2(100, 100), 50, 4);
+    auto actionBy     = JumpBy::create(2, Vec2(300, 0), 50, 4);
+    auto actionUp     = JumpBy::create(2, Vec2(0, 50), 80, 4);
     auto actionByBack = actionBy->reverse();
-    auto rotateBy = RotateBy::create(2, 180);
+    auto rotateBy     = RotateBy::create(2, 180);
     auto rotateByBack = RotateBy::create(2, -180);
-    
+
     sp1->runAction(RepeatForever::create(actionUp));
     sp2->runAction(RepeatForever::create(Sequence::create(actionBy, actionByBack, nullptr)));
     sp3->runAction(actionTo);
@@ -694,238 +693,245 @@ std::string PhysicsDemoActions::title() const
 
 // implementation of PhysicsDemoJoints
 
-
 void PhysicsDemoJoints::onEnter()
 {
     PhysicsDemo::onEnter();
     toggleDebug();
-    
-    auto listener = EventListenerTouchOneByOne::create();
+
+    auto listener          = EventListenerTouchOneByOne::create();
     listener->onTouchBegan = CC_CALLBACK_2(PhysicsDemo::onTouchBegan, this);
     listener->onTouchMoved = CC_CALLBACK_2(PhysicsDemo::onTouchMoved, this);
     listener->onTouchEnded = CC_CALLBACK_2(PhysicsDemo::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
-    float width = (VisibleRect::getVisibleRect().size.width - 10) / 4;
+
+    float width  = (VisibleRect::getVisibleRect().size.width - 10) / 4;
     float height = (VisibleRect::getVisibleRect().size.height - 50) / 4;
-    
-    Node* node = Node::create();
+
+    Node* node       = Node::create();
     PhysicsBody* box = PhysicsBody::create();
     node->addComponent(box);
-    
+
     box->setDynamic(false);
     node->setPosition(Point::ZERO);
     this->addChild(node);
-    
+
     for (int i = 0; i < 4; ++i)
     {
         for (int j = 0; j < 4; ++j)
         {
-            Vec2 offset(VisibleRect::leftBottom().x + 5 + j * width + width/2, VisibleRect::leftBottom().y + 50 + i * height + height/2);
+            Vec2 offset(VisibleRect::leftBottom().x + 5 + j * width + width / 2,
+                        VisibleRect::leftBottom().y + 50 + i * height + height / 2);
             box->addShape(PhysicsShapeEdgeBox::create(Size(width, height), PHYSICSSHAPE_MATERIAL_DEFAULT, 1, offset));
-            
-            switch (i*4 + j)
+
+            switch (i * 4 + j)
             {
-                case 0:
-                {
-                    auto sp1 = makeBall(offset - Vec2(30, 0), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBall(offset + Vec2(30, 0), 10);
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointPin* joint = PhysicsJointPin::construct(sp1PhysicsBody, sp2PhysicsBody, offset);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 1:
-                {
-                    
-                    auto sp1 = makeBall(offset - Vec2(30.0f, 0.0f), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointFixed* joint = PhysicsJointFixed::construct(sp1PhysicsBody, sp2PhysicsBody, offset);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 2:
-                {
-                    auto sp1 = makeBall(offset - Vec2(30.0f, 0.0f), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointDistance* joint = PhysicsJointDistance::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO, Point::ZERO);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 3:
-                {
-                    auto sp1 = makeBall(offset - Vec2(30.0f, 0.0f), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointLimit* joint = PhysicsJointLimit::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO, Point::ZERO, 30.0f, 60.0f);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 4:
-                {
-                    auto sp1 = makeBall(offset - Vec2(30.0f, 0.0f), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointSpring* joint = PhysicsJointSpring::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO, Point::ZERO, 500.0f, 0.3f);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 5:
-                {
-                    auto sp1 = makeBall(offset - Vec2(30.0f, 0.0f), 10);
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    PhysicsJointGroove* joint = PhysicsJointGroove::construct(sp1PhysicsBody, sp2PhysicsBody, Vec2(30.0f, 15.0f), Vec2(30.0f, -15.0f), Vec2(-30.0f, 0.0f));
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 6:
-                {
-                    auto sp1 = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
-                    PhysicsJointRotarySpring* joint = PhysicsJointRotarySpring::construct(sp1PhysicsBody, sp2PhysicsBody, 3000.0f, 60.0f);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 7:
-                {
-                    auto sp1 = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
-                    PhysicsJointRotaryLimit* joint = PhysicsJointRotaryLimit::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f,(float) M_PI_2);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 8:
-                {
-                    auto sp1 = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
-                    PhysicsJointRatchet* joint = PhysicsJointRatchet::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f, (float)M_PI_2);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 9:
-                {
-                    auto sp1 = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
-                    PhysicsJointGear* joint = PhysicsJointGear::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f, 2.0f);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                case 10:
-                {
-                    auto sp1 = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp1PhysicsBody = sp1->getPhysicsBody();
-                    sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    auto sp2 = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
-                    auto sp2PhysicsBody = sp2->getPhysicsBody();
-                    sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
-                    
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
-                    getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
-                    PhysicsJointMotor* joint = PhysicsJointMotor::construct(sp1PhysicsBody, sp2PhysicsBody, (float)M_PI_2);
-                    getPhysicsWorld()->addJoint(joint);
-                    
-                    this->addChild(sp1);
-                    this->addChild(sp2);
-                    break;
-                }
-                default:
-                    break;
+            case 0:
+            {
+                auto sp1            = makeBall(offset - Vec2(30, 0), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBall(offset + Vec2(30, 0), 10);
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointPin* joint = PhysicsJointPin::construct(sp1PhysicsBody, sp2PhysicsBody, offset);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 1:
+            {
+
+                auto sp1            = makeBall(offset - Vec2(30.0f, 0.0f), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointFixed* joint = PhysicsJointFixed::construct(sp1PhysicsBody, sp2PhysicsBody, offset);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 2:
+            {
+                auto sp1            = makeBall(offset - Vec2(30.0f, 0.0f), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointDistance* joint =
+                    PhysicsJointDistance::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO, Point::ZERO);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 3:
+            {
+                auto sp1            = makeBall(offset - Vec2(30.0f, 0.0f), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointLimit* joint = PhysicsJointLimit::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO,
+                                                                        Point::ZERO, 30.0f, 60.0f);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 4:
+            {
+                auto sp1            = makeBall(offset - Vec2(30.0f, 0.0f), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointSpring* joint = PhysicsJointSpring::construct(sp1PhysicsBody, sp2PhysicsBody, Point::ZERO,
+                                                                          Point::ZERO, 500.0f, 0.3f);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 5:
+            {
+                auto sp1            = makeBall(offset - Vec2(30.0f, 0.0f), 10);
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                PhysicsJointGroove* joint = PhysicsJointGroove::construct(
+                    sp1PhysicsBody, sp2PhysicsBody, Vec2(30.0f, 15.0f), Vec2(30.0f, -15.0f), Vec2(-30.0f, 0.0f));
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 6:
+            {
+                auto sp1            = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
+                PhysicsJointRotarySpring* joint =
+                    PhysicsJointRotarySpring::construct(sp1PhysicsBody, sp2PhysicsBody, 3000.0f, 60.0f);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 7:
+            {
+                auto sp1            = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
+                PhysicsJointRotaryLimit* joint =
+                    PhysicsJointRotaryLimit::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f, (float)M_PI_2);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 8:
+            {
+                auto sp1            = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
+                PhysicsJointRatchet* joint =
+                    PhysicsJointRatchet::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f, (float)M_PI_2);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 9:
+            {
+                auto sp1            = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
+                PhysicsJointGear* joint = PhysicsJointGear::construct(sp1PhysicsBody, sp2PhysicsBody, 0.0f, 2.0f);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            case 10:
+            {
+                auto sp1            = makeBox(offset - Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp1PhysicsBody = sp1->getPhysicsBody();
+                sp1PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                auto sp2            = makeBox(offset + Vec2(30.0f, 0.0f), Size(30.0f, 10.0f));
+                auto sp2PhysicsBody = sp2->getPhysicsBody();
+                sp2PhysicsBody->setTag(DRAG_BODYS_TAG);
+
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp1PhysicsBody, box, sp1->getPosition()));
+                getPhysicsWorld()->addJoint(PhysicsJointPin::construct(sp2PhysicsBody, box, sp2->getPosition()));
+                PhysicsJointMotor* joint = PhysicsJointMotor::construct(sp1PhysicsBody, sp2PhysicsBody, (float)M_PI_2);
+                getPhysicsWorld()->addJoint(joint);
+
+                this->addChild(sp1);
+                this->addChild(sp2);
+                break;
+            }
+            default:
+                break;
             }
         }
     }
@@ -940,52 +946,55 @@ void PhysicsDemoPump::onEnter()
 {
     PhysicsDemo::onEnter();
     toggleDebug();
-    
-    _distance = 0.0f;
-    _rotationV = 0.0f;
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    _distance                   = 0.0f;
+    _rotationV                  = 0.0f;
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemoPump::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemoPump::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemoPump::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
     scheduleUpdate();
-    
-    auto node = Node::create();
+
+    auto node     = Node::create();
     auto nodeBody = PhysicsBody::create();
     node->addComponent(nodeBody);
     nodeBody->setDynamic(false);
-    
+
     PhysicsMaterial staticMaterial(PHYSICS_INFINITY, 0, 0.5f);
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(50, 0), VisibleRect::leftTop() + Vec2(50, -130), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(190, 0), VisibleRect::leftTop() + Vec2(100, -50), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(100, -50), VisibleRect::leftTop() + Vec2(100, -90), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(50, -130), VisibleRect::leftTop() + Vec2(100, -145), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(100, -145), VisibleRect::leftBottom() + Vec2(100, 80), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(150, -80), VisibleRect::leftBottom() + Vec2(150, 80), staticMaterial, 2.0f));
-    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(150, -80), VisibleRect::rightTop() + Vec2(-100, -150), staticMaterial, 2.0f));
-    
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(50, 0),
+                                                       VisibleRect::leftTop() + Vec2(50, -130), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(190, 0),
+                                                       VisibleRect::leftTop() + Vec2(100, -50), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(100, -50),
+                                                       VisibleRect::leftTop() + Vec2(100, -90), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(VisibleRect::leftTop() + Vec2(50, -130),
+                                                       VisibleRect::leftTop() + Vec2(100, -145), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(
+        VisibleRect::leftTop() + Vec2(100, -145), VisibleRect::leftBottom() + Vec2(100, 80), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(
+        VisibleRect::leftTop() + Vec2(150, -80), VisibleRect::leftBottom() + Vec2(150, 80), staticMaterial, 2.0f));
+    nodeBody->addShape(PhysicsShapeEdgeSegment::create(
+        VisibleRect::leftTop() + Vec2(150, -80), VisibleRect::rightTop() + Vec2(-100, -150), staticMaterial, 2.0f));
+
     nodeBody->setCategoryBitmask(0x01);
     node->setPosition(Vec2::ZERO);
     this->addChild(node);
-    
+
     // balls
     for (int i = 0; i < 6; ++i)
     {
-        auto ball = makeBall(VisibleRect::leftTop() + Vec2(75 + CCRANDOM_0_1() * 90, 0.0f), 22, PhysicsMaterial(0.05f, 0.0f, 0.1f));
+        auto ball = makeBall(VisibleRect::leftTop() + Vec2(75 + CCRANDOM_0_1() * 90, 0.0f), 22,
+                             PhysicsMaterial(0.05f, 0.0f, 0.1f));
         ball->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
         addChild(ball);
     }
-    
-    Vec2 vec[4] =
-    {
-        VisibleRect::leftTop() + Vec2(102, -148),
-        VisibleRect::leftTop() + Vec2(148, -161),
-        VisibleRect::leftBottom() + Vec2(148, 20),
-        VisibleRect::leftBottom() + Vec2(102, 20)
-    };
-    
+
+    Vec2 vec[4] = {VisibleRect::leftTop() + Vec2(102, -148), VisibleRect::leftTop() + Vec2(148, -161),
+                   VisibleRect::leftBottom() + Vec2(148, 20), VisibleRect::leftBottom() + Vec2(102, 20)};
+
     // pump
-    auto pump = Node::create();
+    auto pump   = Node::create();
     auto center = PhysicsShape::getPolygonCenter(vec, 4);
     pump->setPosition(center);
     auto pumpBody = PhysicsBody::createPolygon(vec, 4, PHYSICSBODY_MATERIAL_DEFAULT, -center);
@@ -993,8 +1002,8 @@ void PhysicsDemoPump::onEnter()
     this->addChild(pump);
     pumpBody->setCategoryBitmask(0x02);
     pumpBody->setGravityEnable(false);
-    
-    // small gear 
+
+    // small gear
     auto sgearBody = PhysicsBody::createCircle(44);
     sgearBody->setCategoryBitmask(0x04);
     sgearBody->setCollisionBitmask(0x04);
@@ -1003,27 +1012,27 @@ void PhysicsDemoPump::onEnter()
     sgear->addComponent(sgearBody);
     sgear->setPosition(VisibleRect::leftBottom() + Vec2(125.0f, 0.0f));
     this->addChild(sgear);
-    
+
     _physicsWorld->addJoint(PhysicsJointPin::construct(nodeBody, sgearBody, sgear->getPosition()));
     _physicsWorld->addJoint(PhysicsJointDistance::construct(pumpBody, sgearBody, Vec2(0.0f, 0.0f), Vec2(0.0f, -44.0f)));
-    
-    // big gear 
+
+    // big gear
     auto bgearBody = PhysicsBody::createCircle(100);
     bgearBody->setCategoryBitmask(0x04);
     auto bgear = Node::create();
     bgear->addComponent(bgearBody);
     bgear->setPosition(VisibleRect::leftBottom() + Vec2(275.0f, 0.0f));
     this->addChild(bgear);
-    
+
     _physicsWorld->addJoint(PhysicsJointPin::construct(bgearBody, nodeBody, bgear->getPosition()));
     _physicsWorld->addJoint(PhysicsJointGear::construct(sgearBody, bgearBody, (float)-M_PI_2, -2.0f));
-    
+
     // plugger
-    Vec2 seg[] = { VisibleRect::leftTop() + Vec2(75, -120), VisibleRect::leftBottom() + Vec2(75, -100) };
+    Vec2 seg[]     = {VisibleRect::leftTop() + Vec2(75, -120), VisibleRect::leftBottom() + Vec2(75, -100)};
     Vec2 segCenter = (seg[1] + seg[0]) / 2;
     seg[1] -= segCenter;
     seg[0] -= segCenter;
-    
+
     auto pluggerBody = PhysicsBody::createEdgeSegment(seg[0], seg[1], PhysicsMaterial(0.01f, 0.0f, 0.5f), 20);
     pluggerBody->setDynamic(true);
     pluggerBody->setMass(30);
@@ -1033,9 +1042,10 @@ void PhysicsDemoPump::onEnter()
     plugger->addComponent(pluggerBody);
     plugger->setPosition(segCenter);
     this->addChild(plugger);
-    
+
     sgearBody->setCollisionBitmask(0x04 | 0x01);
-    _physicsWorld->addJoint(PhysicsJointPin::construct(nodeBody, pluggerBody, VisibleRect::leftBottom() + Vec2(75.0f, -90.0f)));
+    _physicsWorld->addJoint(
+        PhysicsJointPin::construct(nodeBody, pluggerBody, VisibleRect::leftBottom() + Vec2(75.0f, -90.0f)));
     _physicsWorld->addJoint(PhysicsJointDistance::construct(pluggerBody, sgearBody, Vec2::ZERO, Vec2(44.0f, 0.0f)));
 }
 
@@ -1045,27 +1055,29 @@ void PhysicsDemoPump::update(float delta)
     {
         if (body->getTag() == DRAG_BODYS_TAG && body->getPosition().y < 0.0f)
         {
-            if (body->getNode()!=nullptr)
+            if (body->getNode() != nullptr)
             {
                 body->getNode()->setPosition(VisibleRect::leftTop() + Vec2(75 + CCRANDOM_0_1() * 90, 0.0f));
             }
-            
+
             body->setVelocity(Vec2(0.0f, 0.0f));
         }
     }
-    
+
     PhysicsBody* gear = _physicsWorld->getBody(1);
-    
+
     if (gear != nullptr)
     {
         if (_distance != 0.0f)
         {
             _rotationV += _distance / 2500.0f;
-            
-            if (_rotationV > 30) _rotationV = 30.0f;
-            if (_rotationV < -30) _rotationV = -30.0f;
+
+            if (_rotationV > 30)
+                _rotationV = 30.0f;
+            if (_rotationV < -30)
+                _rotationV = -30.0f;
         }
-        
+
         gear->setAngularVelocity(_rotationV);
         _rotationV *= 0.995f;
     }
@@ -1074,23 +1086,23 @@ void PhysicsDemoPump::update(float delta)
 bool PhysicsDemoPump::onTouchBegan(Touch* touch, Event* event)
 {
     PhysicsDemo::onTouchBegan(touch, event);
-    
+
     _distance = touch->getLocation().x - VisibleRect::center().x;
-    
+
     return true;
 }
 
 void PhysicsDemoPump::onTouchMoved(Touch* touch, Event* event)
 {
     PhysicsDemo::onTouchMoved(touch, event);
-    
+
     _distance = touch->getLocation().x - VisibleRect::center().x;
 }
 
 void PhysicsDemoPump::onTouchEnded(Touch* touch, Event* event)
 {
     PhysicsDemo::onTouchEnded(touch, event);
-    
+
     _distance = 0;
 }
 
@@ -1107,33 +1119,33 @@ std::string PhysicsDemoPump::subtitle() const
 void PhysicsDemoOneWayPlatform::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemoOneWayPlatform::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemoOneWayPlatform::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemoOneWayPlatform::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     auto ground = Node::create();
     ground->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0.0f, 50.0f),
-        VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
+                                                        VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
     this->addChild(ground);
-    
-    auto platform = makeBox(VisibleRect::center(), Size(200.0f, 50.0f));
+
+    auto platform     = makeBox(VisibleRect::center(), Size(200.0f, 50.0f));
     auto platformBody = platform->getPhysicsBody();
     platformBody->setDynamic(false);
     platformBody->setContactTestBitmask(0xFFFFFFFF);
     this->addChild(platform);
-    
-    auto ball = makeBall(VisibleRect::center() - Vec2(0.0f, 50.0f), 20);
+
+    auto ball     = makeBall(VisibleRect::center() - Vec2(0.0f, 50.0f), 20);
     auto ballBody = ball->getPhysicsBody();
     ballBody->setVelocity(Vec2(0.0f, 150.0f));
     ballBody->setTag(DRAG_BODYS_TAG);
     ballBody->setMass(1.0f);
     ballBody->setContactTestBitmask(0xFFFFFFFF);
     this->addChild(ball);
-    
-    auto contactListener = EventListenerPhysicsContactWithBodies::create(platformBody, ballBody);
+
+    auto contactListener            = EventListenerPhysicsContactWithBodies::create(platformBody, ballBody);
     contactListener->onContactBegin = CC_CALLBACK_1(PhysicsDemoOneWayPlatform::onContactBegin, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(contactListener, this);
 }
@@ -1152,19 +1164,20 @@ void PhysicsDemoSlice::onEnter()
 {
     PhysicsDemo::onEnter();
     toggleDebug();
-    
+
     _sliceTag = 1;
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
-    touchListener->onTouchBegan = [](Touch* /*touch*/, Event* /*event*/)->bool{ return true; };
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
+    touchListener->onTouchBegan = [](Touch* /*touch*/, Event* /*event*/) -> bool { return true; };
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemoSlice::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     auto ground = Node::create();
-    ground->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0, 50), VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
+    ground->addComponent(PhysicsBody::createEdgeSegment(VisibleRect::leftBottom() + Vec2(0, 50),
+                                                        VisibleRect::rightBottom() + Vec2(0.0f, 50.0f)));
     this->addChild(ground);
-    
-    auto box = Node::create();
+
+    auto box       = Node::create();
     Vec2 points[4] = {Vec2(-100.0f, -100.0f), Vec2(-100.0f, 100.0f), Vec2(100.0f, 100.0f), Vec2(100.0f, -100.0f)};
     box->addComponent(PhysicsBody::createPolygon(points, 4));
     box->setPosition(VisibleRect::center());
@@ -1172,59 +1185,59 @@ void PhysicsDemoSlice::onEnter()
     addChild(box);
 }
 
-bool PhysicsDemoSlice::slice(PhysicsWorld &/*world*/, const PhysicsRayCastInfo& info, void* /*data*/)
+bool PhysicsDemoSlice::slice(PhysicsWorld& /*world*/, const PhysicsRayCastInfo& info, void* /*data*/)
 {
     if (info.shape->getBody()->getTag() != _sliceTag)
     {
         return true;
     }
-    
+
     if (!info.shape->containsPoint(info.start) && !info.shape->containsPoint(info.end))
     {
         Vec2 normal = info.end - info.start;
-        normal = normal.getPerp().getNormalized();
-        float dist = info.start.dot(normal);
-        
+        normal      = normal.getPerp().getNormalized();
+        float dist  = info.start.dot(normal);
+
         clipPoly(dynamic_cast<PhysicsShapePolygon*>(info.shape), normal, dist);
         clipPoly(dynamic_cast<PhysicsShapePolygon*>(info.shape), -normal, -dist);
-        
+
         info.shape->getBody()->removeFromWorld();
     }
-    
+
     return true;
 }
 
 void PhysicsDemoSlice::clipPoly(PhysicsShapePolygon* shape, Vec2 normal, float distance)
 {
     PhysicsBody* body = shape->getBody();
-    int count = shape->getPointsCount();
-    int pointsCount = 0;
-    Vec2* points = new Vec2[count + 1];
-    
-    for (int i=0, j=count-1; i<count; j=i, ++i)
+    int count         = shape->getPointsCount();
+    int pointsCount   = 0;
+    Vec2* points      = new Vec2[count + 1];
+
+    for (int i = 0, j = count - 1; i < count; j = i, ++i)
     {
-        Vec2 a = body->local2World(shape->getPoint(j));
+        Vec2 a      = body->local2World(shape->getPoint(j));
         float aDist = a.dot(normal) - distance;
-        
+
         if (aDist < 0.0f)
         {
             points[pointsCount] = a;
             ++pointsCount;
         }
-        
-        Vec2 b = body->local2World(shape->getPoint(i));
+
+        Vec2 b      = body->local2World(shape->getPoint(i));
         float bDist = b.dot(normal) - distance;
-        
-        if (aDist*bDist < 0.0f)
+
+        if (aDist * bDist < 0.0f)
         {
-            float t = std::fabs(aDist)/(std::fabs(aDist) + std::fabs(bDist));
+            float t             = std::fabs(aDist) / (std::fabs(aDist) + std::fabs(bDist));
             points[pointsCount] = a.lerp(b, t);
             ++pointsCount;
         }
     }
-    
-    Vec2 center = PhysicsShape::getPolygonCenter(points, pointsCount);
-    Node* node = Node::create();
+
+    Vec2 center          = PhysicsShape::getPolygonCenter(points, pointsCount);
+    Node* node           = Node::create();
     PhysicsBody* polygon = PhysicsBody::createPolygon(points, pointsCount, PHYSICSBODY_MATERIAL_DEFAULT, -center);
     node->setPosition(center);
     node->addComponent(polygon);
@@ -1232,11 +1245,11 @@ void PhysicsDemoSlice::clipPoly(PhysicsShapePolygon* shape, Vec2 normal, float d
     polygon->setAngularVelocity(body->getAngularVelocity());
     polygon->setTag(_sliceTag);
     addChild(node);
-    
+
     delete[] points;
 }
 
-void PhysicsDemoSlice::onTouchEnded(Touch *touch, Event* /*event*/)
+void PhysicsDemoSlice::onTouchEnded(Touch* touch, Event* /*event*/)
 {
     auto func = CC_CALLBACK_3(PhysicsDemoSlice::slice, this);
     getPhysicsWorld()->rayCast(func, touch->getStartLocation(), touch->getLocation(), nullptr);
@@ -1257,12 +1270,12 @@ void PhysicsDemoBug3988::onEnter()
     PhysicsDemo::onEnter();
     toggleDebug();
     _physicsWorld->setGravity(Vec2::ZERO);
-    
-    auto ball  = Sprite::create("Images/YellowSquare.png");
+
+    auto ball = Sprite::create("Images/YellowSquare.png");
     ball->setPosition(VisibleRect::center() - Vec2(100.0f, 0.0f));
     ball->setRotation(30.0f);
     this->addChild(ball);
-    
+
     auto physicsBall = makeBox(VisibleRect::center() + Vec2(100.0f, 0.0f), Size(100.0f, 100.0f));
     physicsBall->setRotation(30.0f);
     this->addChild(physicsBall);
@@ -1283,13 +1296,12 @@ void PhysicsContactTest::onEnter()
     PhysicsDemo::onEnter();
     _physicsWorld->setGravity(Vec2::ZERO);
     auto s = VisibleRect::getVisibleRect().size;
-    
-    _yellowBoxNum = 50;
-    _blueBoxNum = 50;
+
+    _yellowBoxNum      = 50;
+    _blueBoxNum        = 50;
     _yellowTriangleNum = 50;
-    _blueTriangleNum = 50;
-    
-    
+    _blueTriangleNum   = 50;
+
     MenuItemFont::setFontSize(65);
     auto decrease1 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this));
     decrease1->setColor(Color3B(0, 200, 20));
@@ -1297,30 +1309,30 @@ void PhysicsContactTest::onEnter()
     increase1->setColor(Color3B(0, 200, 20));
     decrease1->setTag(1);
     increase1->setTag(1);
-    
+
     float prevMenuPos = getSubtitleLable()->getPosition().y - getSubtitleLable()->getContentSize().height;
-    float menuStep = (getSubtitleLable()->getPosition().y  -getRestartTestItem()->getPosition().y)*0.25f;
-    auto menu1 = Menu::create(decrease1, increase1, nullptr);
+    float menuStep    = (getSubtitleLable()->getPosition().y - getRestartTestItem()->getPosition().y) * 0.25f;
+    auto menu1        = Menu::create(decrease1, increase1, nullptr);
     menu1->alignItemsHorizontally();
     menu1->setPosition(Vec2(s.width / 2, prevMenuPos));
     addChild(menu1, 1);
-    
+
     auto label = Label::createWithTTF("yellow box", "fonts/arial.ttf", 32);
     addChild(label, 1);
     label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
-    
+
     auto decrease2 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this));
     decrease2->setColor(Color3B(0, 200, 20));
     auto increase2 = MenuItemFont::create(" + ", CC_CALLBACK_1(PhysicsContactTest::onIncrease, this));
     increase2->setColor(Color3B(0, 200, 20));
     decrease2->setTag(2);
     increase2->setTag(2);
-    
+
     auto menu2 = Menu::create(decrease2, increase2, nullptr);
     menu2->alignItemsHorizontally();
     menu2->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
     addChild(menu2, 1);
-    
+
     label = Label::createWithTTF("blue box", "fonts/arial.ttf", 32);
     addChild(label, 1);
     label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
@@ -1331,12 +1343,12 @@ void PhysicsContactTest::onEnter()
     increase3->setColor(Color3B(0, 200, 20));
     decrease3->setTag(3);
     increase3->setTag(3);
-    
+
     auto menu3 = Menu::create(decrease3, increase3, nullptr);
     menu3->alignItemsHorizontally();
     menu3->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
     addChild(menu3, 1);
-    
+
     label = Label::createWithTTF("yellow triangle", "fonts/arial.ttf", 32);
     addChild(label, 1);
     label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
@@ -1347,12 +1359,12 @@ void PhysicsContactTest::onEnter()
     increase4->setColor(Color3B(0, 200, 20));
     decrease4->setTag(4);
     increase4->setTag(4);
-    
+
     auto menu4 = Menu::create(decrease4, increase4, nullptr);
     menu4->alignItemsHorizontally();
     menu4->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
     addChild(menu4, 1);
-    
+
     label = Label::createWithTTF("blue triangle", "fonts/arial.ttf", 32);
     addChild(label, 1);
     label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
@@ -1364,23 +1376,27 @@ void PhysicsContactTest::onDecrease(Ref* sender)
 {
     switch (dynamic_cast<Node*>(sender)->getTag())
     {
-        case 1:
-            if (_yellowBoxNum > 0) _yellowBoxNum -= 50;
-            break;
-        case 2:
-            if (_blueBoxNum > 0) _blueBoxNum -= 50;
-            break;
-        case 3:
-            if (_yellowTriangleNum > 0) _yellowTriangleNum -= 50;
-            break;
-        case 4:
-            if (_blueTriangleNum > 0) _blueTriangleNum -= 50;
-            break;
-            
-        default:
-            break;
+    case 1:
+        if (_yellowBoxNum > 0)
+            _yellowBoxNum -= 50;
+        break;
+    case 2:
+        if (_blueBoxNum > 0)
+            _blueBoxNum -= 50;
+        break;
+    case 3:
+        if (_yellowTriangleNum > 0)
+            _yellowTriangleNum -= 50;
+        break;
+    case 4:
+        if (_blueTriangleNum > 0)
+            _blueTriangleNum -= 50;
+        break;
+
+    default:
+        break;
     }
-    
+
     resetTest();
 }
 
@@ -1388,23 +1404,23 @@ void PhysicsContactTest::onIncrease(Ref* sender)
 {
     switch (dynamic_cast<Node*>(sender)->getTag())
     {
-        case 1:
-            _yellowBoxNum += 50;
-            break;
-        case 2:
-            _blueBoxNum += 50;
-            break;
-        case 3:
-            _yellowTriangleNum += 50;
-            break;
-        case 4:
-            _blueTriangleNum += 50;
-            break;
-            
-        default:
-            break;
+    case 1:
+        _yellowBoxNum += 50;
+        break;
+    case 2:
+        _blueBoxNum += 50;
+        break;
+    case 3:
+        _yellowTriangleNum += 50;
+        break;
+    case 4:
+        _blueTriangleNum += 50;
+        break;
+
+    default:
+        break;
     }
-    
+
     resetTest();
 }
 
@@ -1414,126 +1430,126 @@ void PhysicsContactTest::resetTest()
     auto root = Node::create();
     root->setTag(10);
     this->addChild(root);
-    
-    auto s = VisibleRect::getVisibleRect().size;
+
+    auto s            = VisibleRect::getVisibleRect().size;
     float prevMenuPos = getSubtitleLable()->getPosition().y - getSubtitleLable()->getContentSize().height;
-    float menuStep = (getSubtitleLable()->getPosition().y - getRestartTestItem()->getPosition().y)*0.25f;
+    float menuStep    = (getSubtitleLable()->getPosition().y - getRestartTestItem()->getPosition().y) * 0.25f;
     std::string strNum;
     char buffer[10];
-    
+
     sprintf(buffer, "%d", _yellowBoxNum);
     auto label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
     root->addChild(label, 1);
     label->setPosition(Vec2(s.width / 2, prevMenuPos));
-    
+
     sprintf(buffer, "%d", _blueBoxNum);
     label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
     root->addChild(label, 1);
-    label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
-    
+    label->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
+
     sprintf(buffer, "%d", _yellowTriangleNum);
     label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
     root->addChild(label, 1);
-    label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
-    
+    label->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
+
     sprintf(buffer, "%d", _blueTriangleNum);
     label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
     root->addChild(label, 1);
-    label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
-    
+    label->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
+
     auto wall = Node::create();
     wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f)));
     wall->setPosition(VisibleRect::center());
     root->addChild(wall);
-    
-    auto contactListener = EventListenerPhysicsContact::create();
+
+    auto contactListener            = EventListenerPhysicsContact::create();
     contactListener->onContactBegin = CC_CALLBACK_1(PhysicsContactTest::onContactBegin, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(contactListener, this);
-    
+
     // yellow box, will collide with itself and blue box.
     for (int i = 0; i < _yellowBoxNum; ++i)
     {
         Size size(10 + CCRANDOM_0_1() * 10, 10 + CCRANDOM_0_1() * 10);
-        Size winSize = VisibleRect::getVisibleRect().size;
+        Size winSize  = VisibleRect::getVisibleRect().size;
         Vec2 position = Vec2(winSize.width, winSize.height) - Vec2(size.width, size.height);
-        position.x = position.x * CCRANDOM_0_1();
-        position.y = position.y * CCRANDOM_0_1();
-        position = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
+        position.x    = position.x * CCRANDOM_0_1();
+        position.y    = position.y * CCRANDOM_0_1();
+        position      = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
         Vec2 velocity((float)(CCRANDOM_0_1() - 0.5) * 200, (float)(CCRANDOM_0_1() - 0.5) * 200);
-        auto box = makeBox(position, size, 1, PhysicsMaterial(0.1f, 1, 0.0f));
+        auto box     = makeBox(position, size, 1, PhysicsMaterial(0.1f, 1, 0.0f));
         auto boxBody = box->getPhysicsBody();
         boxBody->setVelocity(velocity);
-        boxBody->setCategoryBitmask(0x01);    // 0001
-        boxBody->setContactTestBitmask(0x04); // 0100
-        boxBody->setCollisionBitmask(0x03);   // 0011
+        boxBody->setCategoryBitmask(0x01);     // 0001
+        boxBody->setContactTestBitmask(0x04);  // 0100
+        boxBody->setCollisionBitmask(0x03);    // 0011
         root->addChild(box);
     }
-    
+
     // blue box, will collide with blue box.
     for (int i = 0; i < _blueBoxNum; ++i)
     {
         Size size(10 + CCRANDOM_0_1() * 10, 10 + CCRANDOM_0_1() * 10);
-        Size winSize = VisibleRect::getVisibleRect().size;
+        Size winSize  = VisibleRect::getVisibleRect().size;
         Vec2 position = Vec2(winSize.width, winSize.height) - Vec2(size.width, size.height);
-        position.x = position.x * CCRANDOM_0_1();
-        position.y = position.y * CCRANDOM_0_1();
-        position = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
+        position.x    = position.x * CCRANDOM_0_1();
+        position.y    = position.y * CCRANDOM_0_1();
+        position      = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
         Vec2 velocity((float)(CCRANDOM_0_1() - 0.5) * 200, (float)(CCRANDOM_0_1() - 0.5) * 200);
-        auto box = makeBox(position, size, 2, PhysicsMaterial(0.1f, 1, 0.0f));
+        auto box     = makeBox(position, size, 2, PhysicsMaterial(0.1f, 1, 0.0f));
         auto boxBody = box->getPhysicsBody();
         boxBody->setVelocity(velocity);
-        boxBody->setCategoryBitmask(0x02);    // 0010
-        boxBody->setContactTestBitmask(0x08); // 1000
-        boxBody->setCollisionBitmask(0x01);   // 0001
+        boxBody->setCategoryBitmask(0x02);     // 0010
+        boxBody->setContactTestBitmask(0x08);  // 1000
+        boxBody->setCollisionBitmask(0x01);    // 0001
         root->addChild(box);
     }
-    
+
     // yellow triangle, will collide with itself and blue box.
     for (int i = 0; i < _yellowTriangleNum; ++i)
     {
         Size size(10 + CCRANDOM_0_1() * 10, 10 + CCRANDOM_0_1() * 10);
-        Size winSize = VisibleRect::getVisibleRect().size;
+        Size winSize  = VisibleRect::getVisibleRect().size;
         Vec2 position = Vec2(winSize.width, winSize.height) - Vec2(size.width, size.height);
-        position.x = position.x * CCRANDOM_0_1();
-        position.y = position.y * CCRANDOM_0_1();
-        position = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
+        position.x    = position.x * CCRANDOM_0_1();
+        position.y    = position.y * CCRANDOM_0_1();
+        position      = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
         Vec2 velocity((float)(CCRANDOM_0_1() - 0.5) * 300, (float)(CCRANDOM_0_1() - 0.5) * 300);
-        auto triangle = makeTriangle(position, size, 1, PhysicsMaterial(0.1f, 1, 0.0f));
+        auto triangle     = makeTriangle(position, size, 1, PhysicsMaterial(0.1f, 1, 0.0f));
         auto triangleBody = triangle->getPhysicsBody();
         triangleBody->setVelocity(velocity);
-        triangleBody->setCategoryBitmask(0x04);    // 0100
-        triangleBody->setContactTestBitmask(0x01); // 0001
-        triangleBody->setCollisionBitmask(0x06);   // 0110
+        triangleBody->setCategoryBitmask(0x04);     // 0100
+        triangleBody->setContactTestBitmask(0x01);  // 0001
+        triangleBody->setCollisionBitmask(0x06);    // 0110
         root->addChild(triangle);
     }
-    
+
     // blue triangle, will collide with yellow box.
     for (int i = 0; i < _blueTriangleNum; ++i)
     {
         Size size(10 + CCRANDOM_0_1() * 10, 10 + CCRANDOM_0_1() * 10);
-        Size winSize = VisibleRect::getVisibleRect().size;
+        Size winSize  = VisibleRect::getVisibleRect().size;
         Vec2 position = Vec2(winSize.width, winSize.height) - Vec2(size.width, size.height);
-        position.x = position.x * CCRANDOM_0_1();
-        position.y = position.y * CCRANDOM_0_1();
-        position = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
+        position.x    = position.x * CCRANDOM_0_1();
+        position.y    = position.y * CCRANDOM_0_1();
+        position      = VisibleRect::leftBottom() + position + Vec2(size.width / 2, size.height / 2);
         Vec2 velocity((float)(CCRANDOM_0_1() - 0.5) * 300, (float)(CCRANDOM_0_1() - 0.5) * 300);
-        auto triangle = makeTriangle(position, size, 2, PhysicsMaterial(0.1f, 1, 0.0f));
+        auto triangle     = makeTriangle(position, size, 2, PhysicsMaterial(0.1f, 1, 0.0f));
         auto triangleBody = triangle->getPhysicsBody();
         triangleBody->setVelocity(velocity);
-        triangleBody->setCategoryBitmask(0x08);    // 1000
-        triangleBody->setContactTestBitmask(0x02); // 0010
-        triangleBody->setCollisionBitmask(0x01);   // 0001
+        triangleBody->setCategoryBitmask(0x08);     // 1000
+        triangleBody->setContactTestBitmask(0x02);  // 0010
+        triangleBody->setCollisionBitmask(0x01);    // 0001
         root->addChild(triangle);
     }
 }
 
 bool PhysicsContactTest::onContactBegin(PhysicsContact& contact)
 {
-    PhysicsBody* a = contact.getShapeA()->getBody();
-    PhysicsBody* b = contact.getShapeB()->getBody();
+    PhysicsBody* a    = contact.getShapeA()->getBody();
+    PhysicsBody* b    = contact.getShapeB()->getBody();
     PhysicsBody* body = (a->getCategoryBitmask() == 0x04 || a->getCategoryBitmask() == 0x08) ? a : b;
     CC_ASSERT(body->getCategoryBitmask() == 0x04 || body->getCategoryBitmask() == 0x08);
-    
+
     return true;
 }
 
@@ -1552,21 +1568,21 @@ void PhysicsPositionRotationTest::onEnter()
     PhysicsDemo::onEnter();
     toggleDebug();
     _physicsWorld->setGravity(Point::ZERO);
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemo::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemo::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemo::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     auto wall = Node::create();
     wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size));
     wall->setPosition(VisibleRect::center());
     addChild(wall);
-    
+
     // anchor test
     auto anchorNode = Sprite::create("Images/YellowSquare.png");
-    //anchorNode->setAnchorPoint(Vec2(0.1f, 0.9f));
+    // anchorNode->setAnchorPoint(Vec2(0.1f, 0.9f));
     anchorNode->setPosition(100, 100);
     anchorNode->setScale(0.25);
     anchorNode->addComponent(PhysicsBody::createBox(anchorNode->getContentSize()));
@@ -1574,15 +1590,15 @@ void PhysicsPositionRotationTest::onEnter()
     addChild(anchorNode);
 
     anchorNode->getPhysicsBody()->setAngularVelocity(-5.0f);
-    
-    //parent test
+
+    // parent test
     auto parent = Sprite::create("Images/YellowSquare.png");
     parent->setPosition(300, 100);
     parent->setScale(0.5);
     parent->addComponent(PhysicsBody::createBox(parent->getContentSize()));
     parent->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     addChild(parent);
-    
+
     auto leftBall = Sprite::create("Images/YellowSquare.png");
     leftBall->setPosition(-50, 0);
     leftBall->Node::setScale(0.5);
@@ -1591,7 +1607,7 @@ void PhysicsPositionRotationTest::onEnter()
     parent->addChild(leftBall);
 
     parent->getPhysicsBody()->setAngularVelocity(5.0f);
-    
+
     // offset position rotation test
     auto offsetPosNode = Sprite::create("Images/YellowSquare.png");
     offsetPosNode->setPosition(100, 200);
@@ -1603,7 +1619,7 @@ void PhysicsPositionRotationTest::onEnter()
     addChild(offsetPosNode);
 
     offsetPosNode->getPhysicsBody()->setAngularVelocity(5.0f);
-    
+
     return;
 }
 
@@ -1615,32 +1631,33 @@ std::string PhysicsPositionRotationTest::title() const
 void PhysicsSetGravityEnableTest::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemo::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemo::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemo::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     // wall
     auto wall = Node::create();
-    wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    wall->addComponent(
+        PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     wall->setPosition(VisibleRect::center());
     addChild(wall);
-    
+
     // common box
     auto commonBox = makeBox(Vec2(100, 100), Size(50, 50), 1);
     commonBox->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     commonBox->getPhysicsBody()->setGravityEnable(true);
     addChild(commonBox);
-    
-    auto box = makeBox(Vec2(200, 100), Size(50, 50), 2);
+
+    auto box     = makeBox(Vec2(200, 100), Size(50, 50), 2);
     auto boxBody = box->getPhysicsBody();
     boxBody->setMass(20);
     boxBody->setTag(DRAG_BODYS_TAG);
     boxBody->setGravityEnable(false);
     addChild(box);
-    
+
     auto ball = makeBall(Vec2(200, 200), 50);
     ball->setTag(2);
     auto ballBody = ball->getPhysicsBody();
@@ -1648,7 +1665,7 @@ void PhysicsSetGravityEnableTest::onEnter()
     ballBody->setGravityEnable(false);
     ballBody->setMass(50);
     addChild(ball);
-    
+
     scheduleOnce(CC_SCHEDULE_SELECTOR(PhysicsSetGravityEnableTest::onScheduleOnce), 1.0);
 }
 
@@ -1656,7 +1673,7 @@ void PhysicsSetGravityEnableTest::onScheduleOnce(float /*delta*/)
 {
     auto ball = getChildByTag(2);
     ball->getPhysicsBody()->setMass(200);
-    
+
     _physicsWorld->setGravity(Vec2(0, -98));
 }
 
@@ -1673,38 +1690,39 @@ std::string PhysicsSetGravityEnableTest::subtitle() const
 void PhysicsDemoBug5482::onEnter()
 {
     PhysicsDemo::onEnter();
-    
+
     toggleDebug();
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsDemo::onTouchBegan, this);
     touchListener->onTouchMoved = CC_CALLBACK_2(PhysicsDemo::onTouchMoved, this);
     touchListener->onTouchEnded = CC_CALLBACK_2(PhysicsDemo::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     _bodyInA = false;
-    
+
     // wall
     auto wall = Node::create();
-    wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    wall->addComponent(
+        PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     wall->setPosition(VisibleRect::center());
     addChild(wall);
-    
-    //button
+
+    // button
     MenuItemFont::setFontSize(18);
     _button = MenuItemFont::create("Set Body To A", CC_CALLBACK_1(PhysicsDemoBug5482::changeBodyCallback, this));
-    
+
     auto menu = Menu::create(_button, nullptr);
     this->addChild(menu);
-    
+
     _nodeA = Sprite::create("Images/YellowSquare.png");
     _nodeA->setPosition(VisibleRect::center().x - 150, 100);
     this->addChild(_nodeA);
-    
+
     _nodeB = Sprite::create("Images/YellowSquare.png");
     _nodeB->setPosition(VisibleRect::center().x + 150, 100);
     this->addChild(_nodeB);
-    
+
     _body = PhysicsBody::createBox(_nodeA->getContentSize());
     _body->setTag(DRAG_BODYS_TAG);
     _body->retain();
@@ -1749,18 +1767,18 @@ std::string PhysicsDemoBug5482::subtitle() const
 void PhysicsFixedUpdate::onEnter()
 {
     PhysicsDemo::onEnter();
-    
+
     toggleDebug();
     _physicsWorld->setGravity(Point::ZERO);
-    
+
     // wall
     auto wall = Node::create();
     wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f)));
     wall->setPosition(VisibleRect::center());
     this->addChild(wall);
-    
+
     addBall();
-    
+
     scheduleOnce(CC_SCHEDULE_SELECTOR(PhysicsFixedUpdate::updateStart), 2);
 }
 
@@ -1778,17 +1796,17 @@ void PhysicsFixedUpdate::addBall()
 void PhysicsFixedUpdate::updateStart(float /*delta*/)
 {
     addBall();
-    
+
     _physicsWorld->setFixedUpdateRate(180);
 }
 
 void PhysicsFixedUpdate::update(float /*delta*/)
 {
-    
+
     // use fixed time and calculate 3 times per frame makes physics simulate more precisely.
     for (int i = 0; i < 3; ++i)
     {
-        _physicsWorld->step(1/180.0f);
+        _physicsWorld->step(1 / 180.0f);
     }
 }
 
@@ -1802,7 +1820,7 @@ std::string PhysicsFixedUpdate::subtitle() const
     return "The second ball should not run across the wall";
 }
 
-bool PhysicsTransformTest::onTouchBegan(Touch *touch, Event* /*event*/)
+bool PhysicsTransformTest::onTouchBegan(Touch* touch, Event* /*event*/)
 {
     _parentSprite->setPosition(_rootLayer->convertTouchToNodeSpace(touch));
     return false;
@@ -1813,60 +1831,64 @@ void PhysicsTransformTest::onEnter()
     PhysicsDemo::onEnter();
     toggleDebug();
     _physicsWorld->setGravity(Point::ZERO);
-    
-    auto touchListener = EventListenerTouchOneByOne::create();
+
+    auto touchListener          = EventListenerTouchOneByOne::create();
     touchListener->onTouchBegan = CC_CALLBACK_2(PhysicsTransformTest::onTouchBegan, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(touchListener, this);
-    
+
     _rootLayer = Layer::create();
     addChild(_rootLayer);
-    
+
     auto wall = Node::create();
-    wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    wall->addComponent(
+        PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     wall->setPosition(VisibleRect::center());
     _rootLayer->addChild(wall);
-    
-    //parent test
+
+    // parent test
     _parentSprite = Sprite::create("Images/YellowSquare.png");
     _parentSprite->setPosition(200, 100);
     _parentSprite->setScale(0.25);
-    _parentSprite->addComponent(PhysicsBody::createBox(_parentSprite->getContentSize(), PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    _parentSprite->addComponent(
+        PhysicsBody::createBox(_parentSprite->getContentSize(), PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     _parentSprite->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     _parentSprite->setTag(1);
     _rootLayer->addChild(_parentSprite);
-    
+
     auto leftBall = Sprite::create("Images/ball.png");
     leftBall->setPosition(-30, 0);
     leftBall->setScale(2);
-    leftBall->addComponent(PhysicsBody::createCircle(leftBall->getContentSize().width/2, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    leftBall->addComponent(
+        PhysicsBody::createCircle(leftBall->getContentSize().width / 2, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     leftBall->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     _parentSprite->addChild(leftBall);
-    
-    ScaleTo* scaleTo = ScaleTo::create(2.0, 0.5);
+
+    ScaleTo* scaleTo   = ScaleTo::create(2.0, 0.5);
     ScaleTo* scaleBack = ScaleTo::create(2.0, 1.0);
     _parentSprite->runAction(RepeatForever::create(Sequence::create(scaleTo, scaleBack, nullptr)));
-    
+
     auto normal = Sprite::create("Images/YellowSquare.png");
     normal->setPosition(300, 100);
     normal->setScale(0.25, 0.5);
     normal->addComponent(PhysicsBody::createBox(normal->getContentSize(), PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     normal->getPhysicsBody()->setTag(DRAG_BODYS_TAG);
     _rootLayer->addChild(normal);
-    
+
     auto bullet = Sprite::create("Images/ball.png");
     bullet->setPosition(200, 200);
-    bullet->addComponent(PhysicsBody::createCircle(bullet->getContentSize().width/2, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
+    bullet->addComponent(
+        PhysicsBody::createCircle(bullet->getContentSize().width / 2, PhysicsMaterial(0.1f, 1.0f, 0.0f)));
     bullet->getPhysicsBody()->setVelocity(Vec2(100.0f, 100.0f));
     _rootLayer->addChild(bullet);
-    
-    MoveBy* move = MoveBy::create(2.0f, Vec2(100.0f, 100.0f));
-    MoveBy* move2 = MoveBy::create(2.0f, Vec2(-200.0f, 0.0f));
-    MoveBy* move3 = MoveBy::create(2.0f, Vec2(100.0f, -100.0f));
-    ScaleTo* scale = ScaleTo::create(3.0f, 0.3f);
+
+    MoveBy* move    = MoveBy::create(2.0f, Vec2(100.0f, 100.0f));
+    MoveBy* move2   = MoveBy::create(2.0f, Vec2(-200.0f, 0.0f));
+    MoveBy* move3   = MoveBy::create(2.0f, Vec2(100.0f, -100.0f));
+    ScaleTo* scale  = ScaleTo::create(3.0f, 0.3f);
     ScaleTo* scale2 = ScaleTo::create(3.0f, 1.0f);
-    
+
     RotateBy* rotate = RotateBy::create(6.0f, 360);
-    
+
     _rootLayer->runAction(RepeatForever::create(Sequence::create(move, move2, move3, nullptr)));
     _rootLayer->runAction(RepeatForever::create(Sequence::create(scale, scale2, nullptr)));
     _rootLayer->runAction(RepeatForever::create(rotate));
@@ -1880,22 +1902,24 @@ std::string PhysicsTransformTest::title() const
 void PhysicsIssue9959::onEnter()
 {
     PhysicsDemo::onEnter();
-    
-    auto origin = Director::getInstance()->getVisibleOrigin();
+
+    auto origin      = Director::getInstance()->getVisibleOrigin();
     auto visibleSize = Director::getInstance()->getVisibleSize();
-    
+
     auto scale9Sprite1 = ui::Scale9Sprite::create("Images/ball.png");
-    scale9Sprite1->setPosition(origin + visibleSize/2);
+    scale9Sprite1->setPosition(origin + visibleSize / 2);
     addChild(scale9Sprite1);
-    scale9Sprite1->runAction(RepeatForever::create(Sequence::create(MoveBy::create(2.0f, Vec2(100.0f,0.0f)), MoveBy::create(2.0f, Vec2(-100.0f, 0.0f)), NULL)));
-    
+    scale9Sprite1->runAction(RepeatForever::create(
+        Sequence::create(MoveBy::create(2.0f, Vec2(100.0f, 0.0f)), MoveBy::create(2.0f, Vec2(-100.0f, 0.0f)), NULL)));
+
     auto scale9Sprite2 = ui::Scale9Sprite::create("Images/ball.png");
-    scale9Sprite2->setPosition(origin + visibleSize/2 + Vec2(0.0f, 50.0f));
+    scale9Sprite2->setPosition(origin + visibleSize / 2 + Vec2(0.0f, 50.0f));
     addChild(scale9Sprite2);
-    scale9Sprite2->runAction(RepeatForever::create(Sequence::create(ScaleTo::create(2.0f, 1.5f), ScaleTo::create(2.0f, 1.0f), NULL)));
-    
+    scale9Sprite2->runAction(
+        RepeatForever::create(Sequence::create(ScaleTo::create(2.0f, 1.5f), ScaleTo::create(2.0f, 1.0f), NULL)));
+
     auto scale9Sprite3 = ui::Scale9Sprite::create("Images/ball.png");
-    scale9Sprite3->setPosition(origin + visibleSize/2 + Vec2(0.0f, -50.0f));
+    scale9Sprite3->setPosition(origin + visibleSize / 2 + Vec2(0.0f, -50.0f));
     addChild(scale9Sprite3);
     scale9Sprite3->runAction(RepeatForever::create(RotateBy::create(2.0f, 360.0f)));
 }
@@ -1915,7 +1939,7 @@ void PhysicsIssue15932::onEnter()
 {
     PhysicsDemo::onEnter();
 
-    PhysicsBody *pb=PhysicsBody::createBox(Size(15,5),PhysicsMaterial(0.1f,0.0f,1.0f));
+    PhysicsBody* pb = PhysicsBody::createBox(Size(15, 5), PhysicsMaterial(0.1f, 0.0f, 1.0f));
     this->addComponent(pb);
     this->removeComponent(pb);
 }
diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
index 739ff05f887c..1f8680446542 100644
--- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
+++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,7 +30,6 @@
 
 #if CC_USE_PHYSICS
 
-
 DEFINE_TEST_SUITE(PhysicsTests);
 
 class PhysicsDemo : public TestCase
@@ -38,26 +37,33 @@ class PhysicsDemo : public TestCase
 public:
     PhysicsDemo();
     virtual ~PhysicsDemo();
-    
+
     virtual bool init() override;
     virtual void onEnter() override;
     virtual std::string title() const override;
-    
+
     void toggleDebugCallback(cocos2d::Ref* sender);
-    
+
     cocos2d::Sprite* addGrossiniAtPosition(cocos2d::Vec2 p, float scale = 1.0);
-    cocos2d::Sprite* makeBall(cocos2d::Vec2 point, float radius, cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
-    cocos2d::Sprite* makeBox(cocos2d::Vec2 point, cocos2d::Size size, int color = 0, cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
-    cocos2d::Sprite* makeTriangle(cocos2d::Vec2 point, cocos2d::Size size, int color = 0, cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
-    
+    cocos2d::Sprite* makeBall(cocos2d::Vec2 point,
+                              float radius,
+                              cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
+    cocos2d::Sprite* makeBox(cocos2d::Vec2 point,
+                             cocos2d::Size size,
+                             int color                         = 0,
+                             cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
+    cocos2d::Sprite* makeTriangle(cocos2d::Vec2 point,
+                                  cocos2d::Size size,
+                                  int color                         = 0,
+                                  cocos2d::PhysicsMaterial material = cocos2d::PHYSICSBODY_MATERIAL_DEFAULT);
+
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
     void toggleDebug();
-    
+
 protected:
-    
     cocos2d::Texture2D* _spriteTexture;
     cocos2d::SpriteBatchNode* _ball;
     std::unordered_map<int, cocos2d::Node*> _mouses;
@@ -68,7 +74,7 @@ class PhysicsDemoLogoSmash : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoLogoSmash);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
 };
@@ -77,11 +83,11 @@ class PhysicsDemoClickAdd : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoClickAdd);
-    
+
     virtual ~PhysicsDemoClickAdd();
     void onEnter() override;
     virtual std::string subtitle() const override;
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onAcceleration(cocos2d::Acceleration* acc, cocos2d::Event* event);
 };
@@ -90,7 +96,7 @@ class PhysicsDemoPyramidStack : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoPyramidStack);
-    
+
     void onEnter() override;
     void updateOnce(float delta);
     virtual std::string title() const override;
@@ -100,18 +106,18 @@ class PhysicsDemoRayCast : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoRayCast);
-    
+
     PhysicsDemoRayCast();
-    
+
     void onEnter() override;
     virtual std::string title() const override;
     void update(float delta) override;
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
     void changeModeCallback(cocos2d::Ref* sender);
-    
+
     bool anyRay(cocos2d::PhysicsWorld& world, const cocos2d::PhysicsRayCastInfo& info, void* data);
-    
+
 private:
     float _angle;
     cocos2d::DrawNode* _node;
@@ -122,7 +128,7 @@ class PhysicsDemoActions : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoActions);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
 };
@@ -131,7 +137,7 @@ class PhysicsDemoJoints : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoJoints);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
 };
@@ -140,16 +146,16 @@ class PhysicsDemoPump : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoPump);
-    
+
     void onEnter() override;
     void update(float delta) override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchMoved(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
 private:
     float _distance;
     float _rotationV;
@@ -159,10 +165,10 @@ class PhysicsDemoOneWayPlatform : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoOneWayPlatform);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
-    
+
     bool onContactBegin(cocos2d::PhysicsContact& contact);
 };
 
@@ -170,16 +176,16 @@ class PhysicsDemoSlice : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoSlice);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     bool slice(cocos2d::PhysicsWorld& world, const cocos2d::PhysicsRayCastInfo& info, void* data);
     void clipPoly(cocos2d::PhysicsShapePolygon* shape, cocos2d::Vec2 normal, float distance);
-    
+
     void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
 private:
     int _sliceTag;
 };
@@ -188,7 +194,7 @@ class PhysicsDemoBug3988 : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoBug3988);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -198,16 +204,16 @@ class PhysicsContactTest : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsContactTest);
-    
+
     void onEnter() override;
     void resetTest();
     bool onContactBegin(cocos2d::PhysicsContact& contact);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void onDecrease(cocos2d::Ref* sender);
     void onIncrease(cocos2d::Ref* sender);
-    
+
 private:
     int _yellowBoxNum;
     int _blueBoxNum;
@@ -219,7 +225,7 @@ class PhysicsPositionRotationTest : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsPositionRotationTest);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
 };
@@ -228,7 +234,7 @@ class PhysicsSetGravityEnableTest : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsSetGravityEnableTest);
-    
+
     void onEnter() override;
     void onScheduleOnce(float delta);
     virtual std::string title() const override;
@@ -239,13 +245,14 @@ class PhysicsDemoBug5482 : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsDemoBug5482);
-    
+
     void onEnter() override;
     void onExit() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void changeBodyCallback(cocos2d::Ref* sender);
+
 private:
     cocos2d::Sprite* _nodeA;
     cocos2d::Sprite* _nodeB;
@@ -270,12 +277,12 @@ class PhysicsTransformTest : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsTransformTest);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
-    
+
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
-    
+
 private:
     cocos2d::Sprite* _parentSprite;
     cocos2d::Layer* _rootLayer;
@@ -285,7 +292,7 @@ class PhysicsIssue9959 : public PhysicsDemo
 {
 public:
     CREATE_FUNC(PhysicsIssue9959);
-    
+
     void onEnter() override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
@@ -301,4 +308,4 @@ class PhysicsIssue15932 : public PhysicsDemo
     virtual std::string subtitle() const override;
 };
 
-#endif // #if CC_USE_PHYSICS
\ No newline at end of file
+#endif  // #if CC_USE_PHYSICS
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp
index f4972ac0d7a2..f6402a84604e 100644
--- a/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp
+++ b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,19 +34,16 @@ ReleasePoolTests::ReleasePoolTests()
 class TestObject : public Ref
 {
 public:
-    TestObject() : _name(""){}
-    
-    TestObject(std::string name) : _name(name)
-    {
-        CCLOG("TestObject:%s is created", _name.c_str());
-    }
-    
+    TestObject() : _name("") {}
+
+    TestObject(std::string name) : _name(name) { CCLOG("TestObject:%s is created", _name.c_str()); }
+
     ~TestObject()
     {
         if (_name.size() > 0)
             CCLOG("TestObject:%s is destroyed", _name.c_str());
     }
-    
+
 private:
     std::string _name;
 };
@@ -61,23 +58,23 @@ bool ReleasePoolTest::init()
     auto label = Label::createWithTTF("AutoreasePool Test", "fonts/arial.ttf", 32);
     addChild(label, 9999);
     label->setPosition(Vec2(VisibleRect::center().x, VisibleRect::top().y - 30));
-    
+
     // reference count should be added when added into auto release pool
-    
-    TestObject *obj = new TestObject("testobj");
+
+    TestObject* obj = new TestObject("testobj");
     obj->autorelease();
     assert(obj->getReferenceCount() == 1);
-    
+
     // should retain first before invoking autorelease
     obj->retain();
     obj->autorelease();
     assert(obj->getReferenceCount() == 2);
-    
+
     // create an autorelease pool in stack
-    
+
     {
         AutoreleasePool pool1;
-        
+
         // can invoke autorelease more than once
         obj->retain();
         obj->autorelease();
@@ -85,16 +82,16 @@ bool ReleasePoolTest::init()
         obj->retain();
         obj->autorelease();
         assert(obj->getReferenceCount() == 4);
-        
+
         // retain, release can work together with autorelease pool
         obj->retain();
         assert(obj->getReferenceCount() == 5);
         obj->release();
         assert(obj->getReferenceCount() == 4);
     }
-    
+
     assert(obj->getReferenceCount() == 2);
-    
+
     // example of using temple autorelease pool
     {
         AutoreleasePool pool2;
@@ -102,17 +99,17 @@ bool ReleasePoolTest::init()
         for (int i = 0; i < 100; ++i)
         {
             snprintf(name, 20, "object%d", i);
-            TestObject *tmpObj = new TestObject(name);
+            TestObject* tmpObj = new TestObject(name);
             tmpObj->autorelease();
         }
     }
-    
+
     // object in pool2 should be released
 
     {
         new AutoreleasePool;
         PoolManager::destroyInstance();
     }
-    
+
     return true;
 }
diff --git a/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h
index ca6d66710987..a3aafe41a97a 100644
--- a/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h
+++ b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,8 +37,8 @@ class ReleasePoolTest : public TestCase
     CREATE_FUNC(ReleasePoolTest);
 
     virtual bool init() override;
+
 private:
-    
 };
 
-#endif // __RELEASE_POOL_TEST_H__
+#endif  // __RELEASE_POOL_TEST_H__
diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp
index c323dbf3ab1c..4ef301969c5a 100644
--- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp
+++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,12 +37,12 @@ RenderTextureTests::RenderTextureTests()
     ADD_TEST_CASE(SpriteRenderTextureBug);
     ADD_TEST_CASE(RenderTexturePartTest);
     ADD_TEST_CASE(Issue16113Test);
-//    ADD_TEST_CASE(RenderTextureWithSprite3DIssue16894); this Test makes no sense
+    //    ADD_TEST_CASE(RenderTextureWithSprite3DIssue16894); this Test makes no sense
 };
 
 /**
-* Implementation of RenderTextureSave
-*/
+ * Implementation of RenderTextureSave
+ */
 RenderTextureSave::RenderTextureSave()
 {
     auto s = Director::getInstance()->getWinSize();
@@ -56,17 +56,20 @@ RenderTextureSave::RenderTextureSave()
     // so we can just parent it to the scene like any other Node
     this->addChild(_target, -1);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(RenderTextureSave::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     // Save Image menu
     MenuItemFont::setFontSize(16);
-    auto item1 = MenuItemFont::create("Save Image PMA", CC_CALLBACK_1(RenderTextureSave::saveImageWithPremultipliedAlpha, this));
-    auto item2 = MenuItemFont::create("Save Image Non-PMA", CC_CALLBACK_1(RenderTextureSave::saveImageWithNonPremultipliedAlpha, this));
+    auto item1 =
+        MenuItemFont::create("Save Image PMA", CC_CALLBACK_1(RenderTextureSave::saveImageWithPremultipliedAlpha, this));
+    auto item2 = MenuItemFont::create("Save Image Non-PMA",
+                                      CC_CALLBACK_1(RenderTextureSave::saveImageWithNonPremultipliedAlpha, this));
     auto item3 = MenuItemFont::create("Add Image", CC_CALLBACK_1(RenderTextureSave::addImage, this));
     auto item4 = MenuItemFont::create("Clear to Random", CC_CALLBACK_1(RenderTextureSave::clearImage, this));
-    auto item5 = MenuItemFont::create("Clear to Transparent", CC_CALLBACK_1(RenderTextureSave::clearImageTransparent, this));
+    auto item5 =
+        MenuItemFont::create("Clear to Transparent", CC_CALLBACK_1(RenderTextureSave::clearImageTransparent, this));
     auto menu = Menu::create(item1, item2, item3, item4, item5, nullptr);
     this->addChild(menu);
     menu->alignItemsVertically();
@@ -83,7 +86,7 @@ std::string RenderTextureSave::subtitle() const
     return "Press 'Save Image' to create an snapshot of the render texture";
 }
 
-void RenderTextureSave::clearImage(cocos2d::Ref *sender)
+void RenderTextureSave::clearImage(cocos2d::Ref* sender)
 {
     _target->clear(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1());
 }
@@ -100,8 +103,7 @@ void RenderTextureSave::saveImageWithPremultipliedAlpha(cocos2d::Ref* sender)
     char png[20];
     sprintf(png, "image-pma-%d.png", counter);
 
-    auto callback = [&](RenderTexture* rt, const std::string& path)
-    {
+    auto callback = [&](RenderTexture* rt, std::string_view path) {
         auto sprite = Sprite::create(path);
         addChild(sprite);
         sprite->setScale(0.3f);
@@ -112,22 +114,21 @@ void RenderTextureSave::saveImageWithPremultipliedAlpha(cocos2d::Ref* sender)
 
     _target->retain();
     _target->saveToFile(png, Image::Format::PNG, true, callback);
-    //Add this function to avoid crash if we switch to a new scene.
+    // Add this function to avoid crash if we switch to a new scene.
     Director::getInstance()->getRenderer()->render();
     CCLOG("Image saved %s", png);
 
     counter++;
 }
 
-void RenderTextureSave::saveImageWithNonPremultipliedAlpha(cocos2d::Ref *sender)
+void RenderTextureSave::saveImageWithNonPremultipliedAlpha(cocos2d::Ref* sender)
 {
     static int counter = 0;
 
     char png[20];
     sprintf(png, "image-no-pma-%d.png", counter);
-    
-    auto callback = [&](RenderTexture* rt, const std::string& path)
-    {
+
+    auto callback = [&](RenderTexture* rt, std::string_view path) {
         auto sprite = Sprite::create(path);
         addChild(sprite);
         sprite->setScale(0.3f);
@@ -135,11 +136,11 @@ void RenderTextureSave::saveImageWithNonPremultipliedAlpha(cocos2d::Ref *sender)
         sprite->setRotation(counter * 3);
         rt->release();
     };
-    
+
     _target->retain();
     _target->saveToFileAsNonPMA(png, Image::Format::PNG, true, callback);
-                                                                 
-    //Add this function to avoid crash if we switch to a new scene.
+
+    // Add this function to avoid crash if we switch to a new scene.
     Director::getInstance()->getRenderer()->render();
     CCLOG("Image saved %s", png);
 
@@ -154,7 +155,9 @@ void RenderTextureSave::addImage(cocos2d::Ref* sender)
     _target->begin();
 
     Sprite* sprite = Sprite::create("Images/test-rgba1.png");
-    sprite->setPosition(sprite->getContentSize().width + CCRANDOM_0_1() * (s.width - sprite->getContentSize().width), sprite->getContentSize().height + CCRANDOM_0_1() * (s.height - sprite->getContentSize().height));
+    sprite->setPosition(
+        sprite->getContentSize().width + CCRANDOM_0_1() * (s.width - sprite->getContentSize().width),
+        sprite->getContentSize().height + CCRANDOM_0_1() * (s.height - sprite->getContentSize().height));
     sprite->visit();
 
     // finish drawing and return context back to the screen
@@ -169,46 +172,46 @@ RenderTextureSave::~RenderTextureSave()
 
 void RenderTextureSave::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-     auto touch = touches[0];
-     auto start = touch->getLocation();
-     auto end = touch->getPreviousLocation();
-
-     // begin drawing to the render texture
-     _target->begin();
-
-     // for extra points, we'll draw this smoothly from the last position and vary the sprite's
-     // scale/rotation/offset
-     float distance = start.getDistance(end);
-     if (distance > 1)
-     {
-         int d = (int)distance;
-         _brushs.clear();
-         for(int i = 0; i < d; ++i)
-         {
-             Sprite * sprite = Sprite::create("Images/fire.png");
-             sprite->setColor(Color3B::RED);
-             sprite->setOpacity(20);
-             _brushs.pushBack(sprite);
-         }
-         for (int i = 0; i < d; i++)
-         {
-             float difx = end.x - start.x;
-             float dify = end.y - start.y;
-             float delta = (float)i / distance;
-             _brushs.at(i)->setPosition(Vec2(start.x + (difx * delta), start.y + (dify * delta)));
-             _brushs.at(i)->setRotation(rand() % 360);
-             float r = (float)(rand() % 50 / 50.f) + 0.25f;
-             _brushs.at(i)->setScale(r);
-             /*_brush->setColor(Color3B(CCRANDOM_0_1() * 127 + 128, 255, 255));*/
-             // Use CCRANDOM_0_1() will cause error when loading libtests.so on android, I don't know why.
-             _brushs.at(i)->setColor(Color3B(rand() % 127 + 128, 255, 255));
-             // Call visit to draw the brush, don't call draw..
-             _brushs.at(i)->visit();
-         }
-     }
-
-     // finish drawing and return context back to the screen
-     _target->end();
+    auto touch = touches[0];
+    auto start = touch->getLocation();
+    auto end   = touch->getPreviousLocation();
+
+    // begin drawing to the render texture
+    _target->begin();
+
+    // for extra points, we'll draw this smoothly from the last position and vary the sprite's
+    // scale/rotation/offset
+    float distance = start.getDistance(end);
+    if (distance > 1)
+    {
+        int d = (int)distance;
+        _brushs.clear();
+        for (int i = 0; i < d; ++i)
+        {
+            Sprite* sprite = Sprite::create("Images/fire.png");
+            sprite->setColor(Color3B::RED);
+            sprite->setOpacity(20);
+            _brushs.pushBack(sprite);
+        }
+        for (int i = 0; i < d; i++)
+        {
+            float difx  = end.x - start.x;
+            float dify  = end.y - start.y;
+            float delta = (float)i / distance;
+            _brushs.at(i)->setPosition(Vec2(start.x + (difx * delta), start.y + (dify * delta)));
+            _brushs.at(i)->setRotation(rand() % 360);
+            float r = (float)(rand() % 50 / 50.f) + 0.25f;
+            _brushs.at(i)->setScale(r);
+            /*_brush->setColor(Color3B(CCRANDOM_0_1() * 127 + 128, 255, 255));*/
+            // Use CCRANDOM_0_1() will cause error when loading libtests.so on android, I don't know why.
+            _brushs.at(i)->setColor(Color3B(rand() % 127 + 128, 255, 255));
+            // Call visit to draw the brush, don't call draw..
+            _brushs.at(i)->visit();
+        }
+    }
+
+    // finish drawing and return context back to the screen
+    _target->end();
 }
 
 /**
@@ -218,27 +221,27 @@ void RenderTextureSave::onTouchesMoved(const std::vector<Touch*>& touches, Event
 RenderTextureIssue937::RenderTextureIssue937()
 {
     /*
-    *     1    2
-    * A: A1   A2
-    *
-    * B: B1   B2
-    *
-    *  A1: premulti sprite
-    *  A2: premulti render
-    *
-    *  B1: non-premulti sprite
-    *  B2: non-premulti render
-    */
-    auto background = LayerColor::create(Color4B(200,200,200,255));
+     *     1    2
+     * A: A1   A2
+     *
+     * B: B1   B2
+     *
+     *  A1: premulti sprite
+     *  A2: premulti render
+     *
+     *  B1: non-premulti sprite
+     *  B2: non-premulti render
+     */
+    auto background = LayerColor::create(Color4B(200, 200, 200, 255));
     addChild(background);
 
-    auto s = Director::getInstance()->getWinSize();
+    auto s            = Director::getInstance()->getWinSize();
     auto spr_premulti = Sprite::create("Images/fire.png");
-    spr_premulti->setPosition(Vec2(s.width/2-16, s.height/2+16));
+    spr_premulti->setPosition(Vec2(s.width / 2 - 16, s.height / 2 + 16));
 
     auto spr_nonpremulti = Sprite::create("Images/fire.png");
-    spr_nonpremulti->setPosition(Vec2(s.width/2-16, s.height/2-16));
-    
+    spr_nonpremulti->setPosition(Vec2(s.width / 2 - 16, s.height / 2 - 16));
+
     /* A2 & B2 setup */
     auto rend = RenderTexture::create(32, 64, backend::PixelFormat::RGBA8);
 
@@ -250,7 +253,8 @@ RenderTextureIssue937::RenderTextureIssue937()
     auto spr_size = spr_premulti->getContentSize();
     rend->setKeepMatrix(true);
     Size pixelSize = Director::getInstance()->getWinSizeInPixels();
-    rend->setVirtualViewport(Vec2(s.width/2-32, s.height/2-32),Rect(0,0,s.width,s.height),Rect(0,0,pixelSize.width,pixelSize.height));
+    rend->setVirtualViewport(Vec2(s.width / 2 - 32, s.height / 2 - 32), Rect(0, 0, s.width, s.height),
+                             Rect(0, 0, pixelSize.width, pixelSize.height));
 
     // It's possible to modify the RenderTexture blending function by
     //        [[rend sprite] setBlendFunc:(BlendFunc) {BlendFactor::ONE, BlendFactor::ONE_MINUS_SRC_ALPHA}];
@@ -259,7 +263,7 @@ RenderTextureIssue937::RenderTextureIssue937()
     spr_nonpremulti->visit();
     rend->end();
 
-    rend->setPosition(Vec2(s.width/2+16, s.height/2));
+    rend->setPosition(Vec2(s.width / 2 + 16, s.height / 2));
 
     addChild(spr_nonpremulti);
     addChild(spr_premulti);
@@ -277,18 +281,18 @@ std::string RenderTextureIssue937::subtitle() const
 }
 
 /**
-* Implementation of RenderTextureZbuffer
-*/
+ * Implementation of RenderTextureZbuffer
+ */
 
 RenderTextureZbuffer::RenderTextureZbuffer()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(RenderTextureZbuffer::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(RenderTextureZbuffer::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(RenderTextureZbuffer::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
-    auto size = Director::getInstance()->getWinSize();
+
+    auto size  = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("vertexZ = 50", "fonts/Marker Felt.ttf", 64);
     label->setPosition(Vec2(size.width / 2, size.height * 0.25f));
     this->addChild(label);
@@ -352,12 +356,12 @@ std::string RenderTextureZbuffer::subtitle() const
     return "Touch screen. It should be green";
 }
 
-void RenderTextureZbuffer::onTouchesBegan(const std::vector<Touch*>& touches, Event *event)
+void RenderTextureZbuffer::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
 {
 
-    for (auto &item: touches)
+    for (auto& item : touches)
     {
-        auto touch = static_cast<Touch*>(item);
+        auto touch    = static_cast<Touch*>(item);
         auto location = touch->getLocation();
 
         sp1->setPosition(location);
@@ -374,9 +378,9 @@ void RenderTextureZbuffer::onTouchesBegan(const std::vector<Touch*>& touches, Ev
 
 void RenderTextureZbuffer::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
-    for (auto &item: touches)
+    for (auto& item : touches)
     {
-        auto touch = static_cast<Touch*>(item);
+        auto touch    = static_cast<Touch*>(item);
         auto location = touch->getLocation();
 
         sp1->setPosition(location);
@@ -403,7 +407,7 @@ void RenderTextureZbuffer::renderScreenShot()
     {
         return;
     }
-    
+
     texture->begin();
 
     this->visit();
@@ -418,49 +422,47 @@ void RenderTextureZbuffer::renderScreenShot()
     this->addChild(sprite, 999999);
     sprite->setColor(Color3B::GREEN);
 
-    sprite->runAction(Sequence::create(FadeTo::create(2, 0),
-                                          Hide::create(),
-                                          nullptr));
+    sprite->runAction(Sequence::create(FadeTo::create(2, 0), Hide::create(), nullptr));
 }
 
 RenderTexturePartTest::RenderTexturePartTest()
 {
-    auto sprite1 = Sprite::create("Images/grossini.png");
-    auto sprite11 = Sprite::create("Images/grossini.png");
-    auto sprite2 = Sprite::create("Images/grossinis_sister1.png");
-    auto sprite22 = Sprite::create("Images/grossinis_sister1.png");
-    Size size = Director::getInstance()->getWinSize();
+    auto sprite1     = Sprite::create("Images/grossini.png");
+    auto sprite11    = Sprite::create("Images/grossini.png");
+    auto sprite2     = Sprite::create("Images/grossinis_sister1.png");
+    auto sprite22    = Sprite::create("Images/grossinis_sister1.png");
+    Size size        = Director::getInstance()->getWinSize();
     Size sprite1Size = sprite1->getContentSize();
-    sprite1->setPosition((size.width-sprite1Size.width)/2 - 20, (size.height - sprite1Size.height)/2 - 20);
-    sprite11->setPosition(size.width/2 + 20, (size.height - sprite1Size.height)/2 - 20);
-    
-    sprite2->setPosition((size.width-sprite1Size.width)/2 - 20, size.height/2 + 20);
-    sprite22->setPosition(size.width/2 + 20, size.height/2 + 20);
-    
+    sprite1->setPosition((size.width - sprite1Size.width) / 2 - 20, (size.height - sprite1Size.height) / 2 - 20);
+    sprite11->setPosition(size.width / 2 + 20, (size.height - sprite1Size.height) / 2 - 20);
+
+    sprite2->setPosition((size.width - sprite1Size.width) / 2 - 20, size.height / 2 + 20);
+    sprite22->setPosition(size.width / 2 + 20, size.height / 2 + 20);
+
     addChild(sprite1);
     addChild(sprite11);
     addChild(sprite2);
     addChild(sprite22);
-    
+
     _rend = RenderTexture::create(200, 200, backend::PixelFormat::RGBA8);
     _rend->retain();
     _rend->setKeepMatrix(true);
     Size pixelSize = Director::getInstance()->getWinSizeInPixels();
-    _rend->setVirtualViewport(Vec2(size.width/2-150, size.height/2-150),Rect(0,0,size.width,size.height),Rect(0,0,pixelSize.width,pixelSize.height));
-    
+    _rend->setVirtualViewport(Vec2(size.width / 2 - 150, size.height / 2 - 150), Rect(0, 0, size.width, size.height),
+                              Rect(0, 0, pixelSize.width, pixelSize.height));
+
     _rend->beginWithClear(1, 0, 0, 1);
     sprite1->visit();
     sprite11->visit();
     sprite2->visit();
     sprite22->visit();
     _rend->end();
-    
-    _spriteDraw = Sprite::createWithTexture(_rend->getSprite()->getTexture());
-    FiniteTimeAction* baseAction = MoveBy::create(1, Vec2(size.width,0.0f));
-    _spriteDraw->setPosition(0,size.height/2);
+
+    _spriteDraw                  = Sprite::createWithTexture(_rend->getSprite()->getTexture());
+    FiniteTimeAction* baseAction = MoveBy::create(1, Vec2(size.width, 0.0f));
+    _spriteDraw->setPosition(0, size.height / 2);
     _spriteDraw->setScaleY(-1);
-    _spriteDraw->runAction(RepeatForever::create(Sequence::create
-                                          (baseAction,baseAction->reverse(), nullptr)));
+    _spriteDraw->runAction(RepeatForever::create(Sequence::create(baseAction, baseAction->reverse(), nullptr)));
     addChild(_spriteDraw);
 }
 
@@ -494,14 +496,16 @@ RenderTextureTestDepthStencil::RenderTextureTestDepthStencil()
     _spriteDS->retain();
     _spriteDS->setPosition(Vec2(s.width * 0.25f, 0.0f));
     _spriteDS->setScale(10);
-    
+
     _spriteDraw = Sprite::create("Images/fire.png");
     _spriteDraw->retain();
     _spriteDraw->setPosition(Vec2(s.width * 0.25f, 0.0f));
     _spriteDraw->setScale(10);
     //! move sprite half width and height, and draw only where not marked
-    _spriteDraw->setPosition(_spriteDraw->getPosition() + Vec2(_spriteDraw->getContentSize().width * _spriteDraw->getScale() * 0.5f, _spriteDraw->getContentSize().height * _spriteDraw->getScale() * 0.5f));
-    
+    _spriteDraw->setPosition(_spriteDraw->getPosition() +
+                             Vec2(_spriteDraw->getContentSize().width * _spriteDraw->getScale() * 0.5f,
+                                  _spriteDraw->getContentSize().height * _spriteDraw->getScale() * 0.5f));
+
     _rtx = RenderTexture::create(s.width, s.height, backend::PixelFormat::RGBA4, PixelFormat::D24S8);
 
     _rtx->setPosition(Vec2(s.width * 0.5f, s.height * 0.5f));
@@ -513,16 +517,16 @@ RenderTextureTestDepthStencil::~RenderTextureTestDepthStencil()
 {
     CC_SAFE_RELEASE(_spriteDraw);
     CC_SAFE_RELEASE(_spriteDS);
-    
+
     // restore depth stencil desc
     _renderer->setDepthStencilDesc(_dsDesc);
     _renderer->setStencilTest(bitmask::any(_dsDesc.flags, DepthStencilFlags::STENCIL_TEST));
 }
 
-void RenderTextureTestDepthStencil::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void RenderTextureTestDepthStencil::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     _rtx->beginWithClear(0, 0, 0, 0, 0, 0);
-	
+
     _renderCmds[0].init(_globalZOrder);
     _renderCmds[0].func = CC_CALLBACK_0(RenderTextureTestDepthStencil::onBeforeClear, this);
     renderer->addCommand(&_renderCmds[0]);
@@ -532,17 +536,17 @@ void RenderTextureTestDepthStencil::draw(Renderer *renderer, const Mat4 &transfo
     renderer->addCommand(&_renderCmds[1]);
 
     _spriteDS->visit();
-    
+
     _renderCmds[2].init(_globalZOrder);
     _renderCmds[2].func = CC_CALLBACK_0(RenderTextureTestDepthStencil::onBeforeDraw, this);
     renderer->addCommand(&_renderCmds[2]);
 
     _spriteDraw->visit();
-    
+
     _renderCmds[3].init(_globalZOrder);
     _renderCmds[3].func = CC_CALLBACK_0(RenderTextureTestDepthStencil::onAfterDraw, this);
     renderer->addCommand(&_renderCmds[3]);
-    
+
     /// !!!end will set current render target to default renderTarget
     /// !!!all render target share one depthStencilDesc, TODO: optimize me?
     _rtx->end();
@@ -558,7 +562,8 @@ void RenderTextureTestDepthStencil::onBeforeStencil()
     //! mark sprite quad into stencil buffer
     _renderer->setStencilTest(true);
     _renderer->setStencilCompareFunction(backend::CompareFunction::NEVER, 1, 0xFF);
-    _renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::REPLACE, backend::StencilOperation::REPLACE);
+    _renderer->setStencilOperation(backend::StencilOperation::REPLACE, backend::StencilOperation::REPLACE,
+                                   backend::StencilOperation::REPLACE);
 }
 
 void RenderTextureTestDepthStencil::onBeforeDraw()
@@ -585,59 +590,59 @@ std::string RenderTextureTestDepthStencil::subtitle() const
 RenderTextureTargetNode::RenderTextureTargetNode()
 {
     /*
-	 *     1    2
-	 * A: A1   A2
-	 *
-	 * B: B1   B2
-	 *
-	 *  A1: premulti sprite
-	 *  A2: premulti render
-	 *
-	 *  B1: non-premulti sprite
-	 *  B2: non-premulti render
-	 */
-    auto background = LayerColor::create(Color4B(40,40,40,255));
+     *     1    2
+     * A: A1   A2
+     *
+     * B: B1   B2
+     *
+     *  A1: premulti sprite
+     *  A2: premulti render
+     *
+     *  B1: non-premulti sprite
+     *  B2: non-premulti render
+     */
+    auto background = LayerColor::create(Color4B(40, 40, 40, 255));
     addChild(background);
-    
+
     // sprite 1
     sprite1 = Sprite::create("Images/fire.png");
-    
+
     // sprite 2
     sprite2 = Sprite::create("Images/fire_rgba8888.pvr");
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
+
     /* Create the render texture */
-    auto renderTexture = RenderTexture::create(s.width, s.height, backend::PixelFormat::RGBA4);
+    auto renderTexture  = RenderTexture::create(s.width, s.height, backend::PixelFormat::RGBA4);
     this->renderTexture = renderTexture;
-    
-    renderTexture->setPosition(Vec2(s.width/2, s.height/2));
+
+    renderTexture->setPosition(Vec2(s.width / 2, s.height / 2));
     // renderTexture->setScale(2.0f);
-    
+
     /* add the sprites to the render texture */
     renderTexture->addChild(sprite1);
     renderTexture->addChild(sprite2);
     renderTexture->setClearColor(Color4F(0, 0, 0, 0));
     renderTexture->setClearFlags(ClearFlag::COLOR);
-    
+
     /* add the render texture to the scene */
     addChild(renderTexture);
-    
+
     renderTexture->setAutoDraw(true);
-    
+
     scheduleUpdate();
-    
+
     // Toggle clear on / off
     auto item = MenuItemFont::create("Clear On/Off", CC_CALLBACK_1(RenderTextureTargetNode::touched, this));
     auto menu = Menu::create(item, nullptr);
     addChild(menu);
 
-    menu->setPosition(Vec2(s.width/2, s.height/2));
+    menu->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 void RenderTextureTargetNode::touched(Ref* sender)
 {
-    //TODO: minggo
+    // TODO: minggo
     if (renderTexture->getClearFlags() == ClearFlag::NONE)
     {
         renderTexture->setClearFlags(ClearFlag::COLOR);
@@ -645,17 +650,17 @@ void RenderTextureTargetNode::touched(Ref* sender)
     else
     {
         renderTexture->setClearFlags(ClearFlag::NONE);
-        renderTexture->setClearColor(Color4F( CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
+        renderTexture->setClearColor(Color4F(CCRANDOM_0_1(), CCRANDOM_0_1(), CCRANDOM_0_1(), 1));
     }
 }
 
 void RenderTextureTargetNode::update(float dt)
 {
     static float time = 0;
-    float r = 80;
+    float r           = 80;
     sprite1->setPosition(Vec2(cosf(time * 2) * r, sinf(time * 2) * r));
     sprite2->setPosition(Vec2(sinf(time * 2) * r, cosf(time * 2) * r));
-    
+
     time += dt;
 }
 
@@ -677,7 +682,8 @@ SpriteRenderTextureBug::SimpleSprite::~SimpleSprite()
     CC_SAFE_RELEASE(_rt);
 }
 
-SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::SimpleSprite::create(const char* filename, const Rect &rect)
+SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::SimpleSprite::create(const char* filename,
+                                                                                   const Rect& rect)
 {
     auto sprite = new SimpleSprite();
     if (sprite->initWithFile(filename, rect))
@@ -688,73 +694,71 @@ SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::SimpleSprite::crea
     {
         CC_SAFE_DELETE(sprite);
     }
-    
+
     return sprite;
 }
 
-void SpriteRenderTextureBug::SimpleSprite::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void SpriteRenderTextureBug::SimpleSprite::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     if (_rt == nullptr)
     {
-		auto s = Director::getInstance()->getWinSize();
-        _rt = RenderTexture::create(s.width, s.height, backend::PixelFormat::RGBA8);
+        auto s = Director::getInstance()->getWinSize();
+        _rt    = RenderTexture::create(s.width, s.height, backend::PixelFormat::RGBA8);
         _rt->retain();
-	}
-	_rt->beginWithClear(0.0f, 0.0f, 0.0f, 1.0f);
-	_rt->end();
+    }
+    _rt->beginWithClear(0.0f, 0.0f, 0.0f, 1.0f);
+    _rt->end();
 
     Sprite::draw(renderer, transform, flags);
-    
 }
 
 SpriteRenderTextureBug::SpriteRenderTextureBug()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(SpriteRenderTextureBug::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    addNewSpriteWithCoords(Vec2(s.width/2, s.height/2));
+    addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 }
 
 SpriteRenderTextureBug::SimpleSprite* SpriteRenderTextureBug::addNewSpriteWithCoords(const Vec2& p)
 {
     int idx = CCRANDOM_0_1() * 1400 / 100;
-	int x = (idx%5) * 85;
-	int y = (idx/5) * 121;
-    
-    auto sprite = SpriteRenderTextureBug::SimpleSprite::create("Images/grossini_dance_atlas.png",
-                                                                                                Rect(x,y,85,121));
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
+
+    auto sprite = SpriteRenderTextureBug::SimpleSprite::create("Images/grossini_dance_atlas.png", Rect(x, y, 85, 121));
     addChild(sprite);
-    
+
     sprite->setPosition(p);
-    
-	FiniteTimeAction *action = nullptr;
-	float rd = CCRANDOM_0_1();
-    
-	if (rd < 0.20)
+
+    FiniteTimeAction* action = nullptr;
+    float rd                 = CCRANDOM_0_1();
+
+    if (rd < 0.20)
         action = ScaleBy::create(3, 2);
-	else if (rd < 0.40)
-		action = RotateBy::create(3, 360);
-	else if (rd < 0.60)
-		action = Blink::create(1, 3);
-	else if (rd < 0.8 )
-		action = TintBy::create(2, 0, -255, -255);
-	else
-		action = FadeOut::create(2);
-    
+    else if (rd < 0.40)
+        action = RotateBy::create(3, 360);
+    else if (rd < 0.60)
+        action = Blink::create(1, 3);
+    else if (rd < 0.8)
+        action = TintBy::create(2, 0, -255, -255);
+    else
+        action = FadeOut::create(2);
+
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
-    
+    auto seq         = Sequence::create(action, action_back, nullptr);
+
     sprite->runAction(RepeatForever::create(seq));
-    
-    //return sprite;
+
+    // return sprite;
     return nullptr;
 }
 
 void SpriteRenderTextureBug::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for (auto &touch: touches)
+    for (auto& touch : touches)
     {
         auto location = touch->getLocation();
         addNewSpriteWithCoords(location);
@@ -771,7 +775,6 @@ std::string SpriteRenderTextureBug::subtitle() const
     return "Touch the screen. Sprite should appear on under the touch";
 }
 
-
 //
 // Issue16113Test
 //
@@ -781,24 +784,22 @@ Issue16113Test::Issue16113Test()
 
     // Save Image menu
     MenuItemFont::setFontSize(16);
-    auto item1 = MenuItemFont::create("Save Image", [&](Ref* ref){
+    auto item1 = MenuItemFont::create("Save Image", [&](Ref* ref) {
         auto winSize = Director::getInstance()->getVisibleSize();
-        auto text = Label::createWithTTF("hello world", "fonts/Marker Felt.ttf", 40);
+        auto text    = Label::createWithTTF("hello world", "fonts/Marker Felt.ttf", 40);
         text->setTextColor(Color4B::RED);
         auto target = RenderTexture::create(winSize.width, winSize.height, backend::PixelFormat::RGBA8);
-        target->beginWithClear(0,0,0,0);
-        text->setPosition(winSize.width / 2,winSize.height/2);
+        target->beginWithClear(0, 0, 0, 0);
+        text->setPosition(winSize.width / 2, winSize.height / 2);
         text->Node::visit();
         target->end();
-        auto callback = [&](RenderTexture* rt, const std::string& path){
-            rt->release();
-        };
+        auto callback = [&](RenderTexture* rt, std::string_view path) { rt->release(); };
         target->retain();
         target->saveToFile("issue16113.png", Image::Format::PNG, true, callback);
     });
-    auto menu = Menu::create(item1, nullptr);
+    auto menu  = Menu::create(item1, nullptr);
     this->addChild(menu);
-    menu->setPosition(s.width/2, s.height/2);
+    menu->setPosition(s.width / 2, s.height / 2);
 }
 
 std::string Issue16113Test::title() const
@@ -816,55 +817,56 @@ std::string Issue16113Test::subtitle() const
 //
 RenderTextureWithSprite3DIssue16894::RenderTextureWithSprite3DIssue16894()
 {
-     auto visibleSize = Director::getInstance()->getVisibleSize();
-     Vec2 origin = Director::getInstance()->getVisibleOrigin();
-
-     for (int i = 0; i < 3; ++i)
-     {
-         // Ship - Model is from cocos2d-x test project
-         auto ship = Sprite3D::create("Sprite3DTest/boss.c3b");
-         ship->setScale(6);
-         ship->setRotation3D(Vec3(180.0f,45.0f,0.0f));
-         ship->setPosition(Vec2(visibleSize.width/4 + origin.x, visibleSize.height/2 + origin.y));
-         ship->setForce2DQueue(true);
-         ship->retain();
-
-         if (i == 0)
-         {
-             addChild(ship, 1);
-             //// Rotate Ship
-             auto spin = RotateBy::create(4, Vec3(0.0f,180.0f,0.0f));
-             auto repeatspin = RepeatForever::create(spin);
-             ship->runAction(repeatspin);
-         }
-         _ship[i] = ship;
-     }
-
-     // RenderTextures
-     _renderTexDefault = RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8);
-     _renderTexDefault->setKeepMatrix(true);
-     addChild(_renderTexDefault);
-     _renderTexDefault->setPosition(visibleSize.width/4 * 3, visibleSize.height/2);
-
-     _renderTexWithBuffer = RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8, backend::PixelFormat::D24S8);
-     _renderTexWithBuffer->setKeepMatrix(true);
-     addChild(_renderTexWithBuffer);
-     _renderTexWithBuffer->setPosition(visibleSize.width/4 * 4, visibleSize.height/2);
-
-     // Update
-     scheduleUpdate();
-
-     auto label1 = Label::createWithTTF("Normal Sprite3D\n", "fonts/arial.ttf", 10);
-     label1->setPosition(Vec2(visibleSize.width/4 * 1, 60.0f));
-     this->addChild(label1, 1);
-
-     auto label2 = Label::createWithTTF("RenderTexture\nDefault - No depth buffer", "fonts/arial.ttf", 10);
-     label2->setPosition(Vec2(visibleSize.width/4 * 2, 60.0f));
-     this->addChild(label2, 1);
-
-     auto label3 = Label::createWithTTF("RenderTexture\nGL_DEPTH24_STENCIL8", "fonts/arial.ttf", 10);
-     label3->setPosition(Vec2(visibleSize.width/4 * 3, 60.0f));
-     this->addChild(label3, 1);
+    auto visibleSize = Director::getInstance()->getVisibleSize();
+    Vec2 origin      = Director::getInstance()->getVisibleOrigin();
+
+    for (int i = 0; i < 3; ++i)
+    {
+        // Ship - Model is from cocos2d-x test project
+        auto ship = Sprite3D::create("Sprite3DTest/boss.c3b");
+        ship->setScale(6);
+        ship->setRotation3D(Vec3(180.0f, 45.0f, 0.0f));
+        ship->setPosition(Vec2(visibleSize.width / 4 + origin.x, visibleSize.height / 2 + origin.y));
+        ship->setForce2DQueue(true);
+        ship->retain();
+
+        if (i == 0)
+        {
+            addChild(ship, 1);
+            //// Rotate Ship
+            auto spin       = RotateBy::create(4, Vec3(0.0f, 180.0f, 0.0f));
+            auto repeatspin = RepeatForever::create(spin);
+            ship->runAction(repeatspin);
+        }
+        _ship[i] = ship;
+    }
+
+    // RenderTextures
+    _renderTexDefault = RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8);
+    _renderTexDefault->setKeepMatrix(true);
+    addChild(_renderTexDefault);
+    _renderTexDefault->setPosition(visibleSize.width / 4 * 3, visibleSize.height / 2);
+
+    _renderTexWithBuffer = RenderTexture::create(visibleSize.width, visibleSize.height, backend::PixelFormat::RGBA8,
+                                                 backend::PixelFormat::D24S8);
+    _renderTexWithBuffer->setKeepMatrix(true);
+    addChild(_renderTexWithBuffer);
+    _renderTexWithBuffer->setPosition(visibleSize.width / 4 * 4, visibleSize.height / 2);
+
+    // Update
+    scheduleUpdate();
+
+    auto label1 = Label::createWithTTF("Normal Sprite3D\n", "fonts/arial.ttf", 10);
+    label1->setPosition(Vec2(visibleSize.width / 4 * 1, 60.0f));
+    this->addChild(label1, 1);
+
+    auto label2 = Label::createWithTTF("RenderTexture\nDefault - No depth buffer", "fonts/arial.ttf", 10);
+    label2->setPosition(Vec2(visibleSize.width / 4 * 2, 60.0f));
+    this->addChild(label2, 1);
+
+    auto label3 = Label::createWithTTF("RenderTexture\nGL_DEPTH24_STENCIL8", "fonts/arial.ttf", 10);
+    label3->setPosition(Vec2(visibleSize.width / 4 * 3, 60.0f));
+    this->addChild(label3, 1);
 }
 
 RenderTextureWithSprite3DIssue16894::~RenderTextureWithSprite3DIssue16894()
@@ -875,7 +877,7 @@ RenderTextureWithSprite3DIssue16894::~RenderTextureWithSprite3DIssue16894()
     }
 }
 
-void RenderTextureWithSprite3DIssue16894::visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags)
+void RenderTextureWithSprite3DIssue16894::visit(Renderer* renderer, const Mat4& parentTransform, uint32_t parentFlags)
 {
     RenderTextureTest::visit(renderer, parentTransform, parentFlags);
 
diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
index da83e5ee0a82..6ef68c0a4cc8 100644
--- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
+++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,8 +32,7 @@
 DEFINE_TEST_SUITE(RenderTextureTests);
 
 class RenderTextureTest : public TestCase
-{
-};
+{};
 
 class RenderTextureSave : public RenderTextureTest
 {
@@ -79,17 +78,17 @@ class RenderTextureZbuffer : public RenderTextureTest
     void renderScreenShot();
 
 private:
-    cocos2d::SpriteBatchNode *mgr;
-
-    cocos2d::Sprite *sp1;
-    cocos2d::Sprite *sp2;
-    cocos2d::Sprite *sp3;
-    cocos2d::Sprite *sp4;
-    cocos2d::Sprite *sp5;
-    cocos2d::Sprite *sp6;
-    cocos2d::Sprite *sp7;
-    cocos2d::Sprite *sp8;
-    cocos2d::Sprite *sp9;
+    cocos2d::SpriteBatchNode* mgr;
+
+    cocos2d::Sprite* sp1;
+    cocos2d::Sprite* sp2;
+    cocos2d::Sprite* sp3;
+    cocos2d::Sprite* sp4;
+    cocos2d::Sprite* sp5;
+    cocos2d::Sprite* sp6;
+    cocos2d::Sprite* sp7;
+    cocos2d::Sprite* sp8;
+    cocos2d::Sprite* sp9;
 };
 
 class RenderTextureTestDepthStencil : public RenderTextureTest
@@ -101,13 +100,14 @@ class RenderTextureTestDepthStencil : public RenderTextureTest
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
+
 private:
     cocos2d::CallbackCommand _renderCmds[4];
     void onBeforeClear();
     void onBeforeStencil();
     void onBeforeDraw();
     void onAfterDraw();
-    
+
 private:
     cocos2d::Renderer* _renderer;
     cocos2d::backend::DepthStencilDescriptor _dsDesc;
@@ -120,15 +120,16 @@ class RenderTextureTargetNode : public RenderTextureTest
 {
 private:
     cocos2d::Sprite *sprite1, *sprite2;
-    cocos2d::RenderTexture *renderTexture;
+    cocos2d::RenderTexture* renderTexture;
+
 public:
     CREATE_FUNC(RenderTextureTargetNode);
     RenderTextureTargetNode();
-    
-    virtual void update(float t)override;
+
+    virtual void update(float t) override;
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void touched(cocos2d::Ref* sender);
 };
 
@@ -140,7 +141,7 @@ class RenderTexturePartTest : public RenderTextureTest
     virtual ~RenderTexturePartTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 private:
     cocos2d::RenderTexture* _rend;
     cocos2d::Sprite* _spriteDraw;
@@ -149,26 +150,26 @@ class RenderTexturePartTest : public RenderTextureTest
 class SpriteRenderTextureBug : public RenderTextureTest
 {
 public:
-    
     class SimpleSprite : public cocos2d::Sprite
     {
     public:
-        static SimpleSprite* create(const char* filename, const cocos2d::Rect &rect);
+        static SimpleSprite* create(const char* filename, const cocos2d::Rect& rect);
         SimpleSprite();
         ~SimpleSprite();
         virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags);
+
     public:
         cocos2d::RenderTexture* _rt;
     };
-        
+
 public:
     CREATE_FUNC(SpriteRenderTextureBug);
     SpriteRenderTextureBug();
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     SimpleSprite* addNewSpriteWithCoords(const cocos2d::Vec2& p);
 };
 
@@ -188,7 +189,9 @@ class RenderTextureWithSprite3DIssue16894 : public RenderTextureTest
     RenderTextureWithSprite3DIssue16894();
     virtual ~RenderTextureWithSprite3DIssue16894();
 
-    virtual void visit(cocos2d::Renderer *renderer, const cocos2d::Mat4& parentTransform, uint32_t parentFlags) override;
+    virtual void visit(cocos2d::Renderer* renderer,
+                       const cocos2d::Mat4& parentTransform,
+                       uint32_t parentFlags) override;
 
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
diff --git a/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp
index 405cf7f2bec0..af81db761415 100644
--- a/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp
+++ b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,19 +41,19 @@ void TestLayer::onEnter()
 {
     Layer::onEnter();
 
-    float x,y;
-    
+    float x, y;
+
     auto size = Director::getInstance()->getWinSize();
-    x = size.width;
-    y = size.height;
+    x         = size.width;
+    y         = size.height;
 
-    //auto array = [UIFont familyNames];
-    //for( String *s in array )
-    //    NSLog( s );
+    // auto array = [UIFont familyNames];
+    // for( String *s in array )
+    //     NSLog( s );
     auto label = Label::createWithSystemFont("cocos2d", "Tahoma", 64);
 
-    label->setPosition( Vec2(x/2,y/2) );
-    
+    label->setPosition(Vec2(x / 2, y / 2));
+
     addChild(label);
 }
 
@@ -66,43 +66,43 @@ void SpriteLayer::onEnter()
 {
     Layer::onEnter();
 
-    float x,y;
-    
+    float x, y;
+
     auto size = Director::getInstance()->getWinSize();
-    x = size.width;
-    y = size.height;
-    
-    auto sprite = Sprite::create(s_pathGrossini);
+    x         = size.width;
+    y         = size.height;
+
+    auto sprite        = Sprite::create(s_pathGrossini);
     auto spriteSister1 = Sprite::create(s_pathSister1);
     auto spriteSister2 = Sprite::create(s_pathSister2);
-    
+
     sprite->setScale(1.5f);
     spriteSister1->setScale(1.5f);
     spriteSister2->setScale(1.5f);
-    
-    sprite->setPosition(Vec2(x/2,y/2));
-    spriteSister1->setPosition(Vec2(40.0f,y/2));
-    spriteSister2->setPosition(Vec2(x-40,y/2));
+
+    sprite->setPosition(Vec2(x / 2, y / 2));
+    spriteSister1->setPosition(Vec2(40.0f, y / 2));
+    spriteSister2->setPosition(Vec2(x - 40, y / 2));
 
     auto rot = RotateBy::create(16, -3600);
-    
+
     addChild(sprite);
     addChild(spriteSister1);
     addChild(spriteSister2);
-    
+
     sprite->runAction(rot);
 
-    auto jump1 = JumpBy::create(4, Vec2(-400,0), 100, 4);
+    auto jump1 = JumpBy::create(4, Vec2(-400, 0), 100, 4);
     auto jump2 = jump1->reverse();
-    
-    auto rot1 = RotateBy::create(4, 360*2);
+
+    auto rot1 = RotateBy::create(4, 360 * 2);
     auto rot2 = rot1->reverse();
-    
-    spriteSister1->runAction(Repeat::create( Sequence::create(jump2, jump1, nullptr), 5 ));
-    spriteSister2->runAction(Repeat::create( Sequence::create(jump1->clone(), jump2->clone(), nullptr), 5 ));
-    
-    spriteSister1->runAction(Repeat::create( Sequence::create(rot1, rot2, nullptr), 5 ));
-    spriteSister2->runAction(Repeat::create( Sequence::create(rot2->clone(), rot1->clone(), nullptr), 5 ));
+
+    spriteSister1->runAction(Repeat::create(Sequence::create(jump2, jump1, nullptr), 5));
+    spriteSister2->runAction(Repeat::create(Sequence::create(jump1->clone(), jump2->clone(), nullptr), 5));
+
+    spriteSister1->runAction(Repeat::create(Sequence::create(rot1, rot2, nullptr), 5));
+    spriteSister2->runAction(Repeat::create(Sequence::create(rot2->clone(), rot1->clone(), nullptr), 5));
 }
 
 //------------------------------------------------------------------
@@ -115,32 +115,32 @@ void RotateWorldMainLayer::onEnter()
 {
     Layer::onEnter();
 
-    float x,y;
-    
+    float x, y;
+
     auto size = Director::getInstance()->getWinSize();
-    x = size.width;
-    y = size.height;
-    
-    auto blue =  LayerColor::create(Color4B(0,0,255,255));
-    auto red =   LayerColor::create(Color4B(255,0,0,255));
-    auto green = LayerColor::create(Color4B(0,255,0,255));
-    auto white = LayerColor::create(Color4B(255,255,255,255));
+    x         = size.width;
+    y         = size.height;
+
+    auto blue  = LayerColor::create(Color4B(0, 0, 255, 255));
+    auto red   = LayerColor::create(Color4B(255, 0, 0, 255));
+    auto green = LayerColor::create(Color4B(0, 255, 0, 255));
+    auto white = LayerColor::create(Color4B(255, 255, 255, 255));
 
     blue->setScale(0.5f);
-    blue->setPosition(Vec2(-x/4,-y/4));
-    blue->addChild( SpriteLayer::create() );
-    
+    blue->setPosition(Vec2(-x / 4, -y / 4));
+    blue->addChild(SpriteLayer::create());
+
     red->setScale(0.5f);
-    red->setPosition(Vec2(x/4,-y/4));
+    red->setPosition(Vec2(x / 4, -y / 4));
 
     green->setScale(0.5f);
-    green->setPosition(Vec2(-x/4,y/4));
+    green->setPosition(Vec2(-x / 4, y / 4));
     green->addChild(TestLayer::create());
 
     white->setScale(0.5f);
-    white->setPosition(Vec2(x/4,y/4));
+    white->setPosition(Vec2(x / 4, y / 4));
     white->setIgnoreAnchorPointForPosition(false);
-    white->setPosition(Vec2(x/4*3,y/4*3));
+    white->setPosition(Vec2(x / 4 * 3, y / 4 * 3));
 
     addChild(blue, -1);
     addChild(white);
@@ -148,7 +148,7 @@ void RotateWorldMainLayer::onEnter()
     addChild(red);
 
     auto rot = RotateBy::create(8, 720);
-    
+
     blue->runAction(rot);
     red->runAction(rot->clone());
     green->runAction(rot->clone());
diff --git a/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h
index 4ac221670469..576dcd9fa47a 100644
--- a/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h
+++ b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp
index 1a9374549fda..3787d4b03229 100644
--- a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp
+++ b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,21 +37,21 @@ using namespace spine;
 class SkeletonAnimationCullingFix : public SkeletonAnimation
 {
 public:
-    SkeletonAnimationCullingFix()
-    : SkeletonAnimation()
-    {}
-    
+    SkeletonAnimationCullingFix() : SkeletonAnimation() {}
+
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags) override
     {
         glDisable(GL_CULL_FACE);
         SkeletonAnimation::draw(renderer, transform, transformFlags);
         RenderState::StateBlock::invalidate(cocos2d::RenderState::StateBlock::RS_ALL_ONES);
     }
-    
-    static SkeletonAnimationCullingFix* createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1)
+
+    static SkeletonAnimationCullingFix* createWithFile(std::string_view skeletonDataFile,
+                                                       std::string_view atlasFile,
+                                                       float scale = 1)
     {
         SkeletonAnimationCullingFix* node = new SkeletonAnimationCullingFix();
-        spAtlas* atlas = spAtlas_createFromFile(atlasFile.c_str(), 0);
+        spAtlas* atlas                    = spAtlas_createFromFile(atlasFile.c_str(), 0);
         node->initWithJsonFile(skeletonDataFile, atlas, scale);
         node->autorelease();
         return node;
@@ -76,40 +76,40 @@ class Scene3DTestScene : public TestCase
 {
 public:
     CREATE_FUNC(Scene3DTestScene);
-    
+
     bool onTouchBegan(Touch* touch, Event* event) { return true; }
     void onTouchEnd(Touch*, Event*);
-    
+
 private:
     Scene3DTestScene();
     virtual ~Scene3DTestScene();
     bool init() override;
-    
+
     void createWorld3D();
     void createUI();
     void createPlayerDlg();
     void createDetailDlg();
     void createDescDlg();
-    
+
     // init in init()
-    std::vector<Camera *> _gameCameras;
+    std::vector<Camera*> _gameCameras;
     Node* _worldScene;
     Node* _dlgScene;
     Node* _osdScene;
-    
+
     // init in createWorld3D()
-    TextureCube*        _textureCube;
-    Skybox*             _skyBox;
-    cocos2d::Terrain*   _terrain;
-    Player *            _player;
-    Node*               _monsters[2];
-    
+    TextureCube* _textureCube;
+    Skybox* _skyBox;
+    cocos2d::Terrain* _terrain;
+    Player* _player;
+    Node* _monsters[2];
+
     // init in createUI()
     Node* _playerItem;
     Node* _detailItem;
     Node* _descItem;
     Node* _ui;
-    
+
     // init in createPlayerDlg()
     Node* _playerDlg;
     // init in createDetailDlg()
@@ -127,18 +127,19 @@ class Scene3DTestScene : public TestCase
         SHOES,
         MAX_TYPE,
     };
-    
-    std::vector<std::string> _skins[(int)SkinType::MAX_TYPE]; //all skins
-    int                      _curSkin[(int)SkinType::MAX_TYPE]; //current skin index
+
+    std::vector<std::string> _skins[(int)SkinType::MAX_TYPE];  // all skins
+    int _curSkin[(int)SkinType::MAX_TYPE];                     // current skin index
     cocos2d::Sprite3D* _reskinGirl;
-    
+
     // for capture screen
     static const int SNAPSHOT_TAG = 119;
     std::string _snapshotFile;
 };
 
 /** Define the sub scenes in test. */
-enum GAME_SCENE {
+enum GAME_SCENE
+{
     SCENE_UI = 0,
     SCENE_WORLD,
     SCENE_DIALOG,
@@ -147,7 +148,8 @@ enum GAME_SCENE {
 };
 
 /** Define the layers in scene, layer separated by camera mask. */
-enum SCENE_LAYER {
+enum SCENE_LAYER
+{
     LAYER_BACKGROUND = 0,
     LAYER_DEFAULT,
     LAYER_MIDDLE,
@@ -156,7 +158,8 @@ enum SCENE_LAYER {
 };
 
 /** Define the all cameras, which in Scene3DTest, render order. */
-enum GAME_CAMERAS_ORDER {
+enum GAME_CAMERAS_ORDER
+{
     CAMERA_WORLD_3D_SKYBOX = 0,
     CAMERA_WORLD_3D_SCENE,
     CAMERA_UI_2D,
@@ -172,78 +175,65 @@ enum GAME_CAMERAS_ORDER {
 /*
  Defined s_CF and s_CM to avoid force conversion when call Camera::setCameraFlag
  and Node::setCameraMask.
- 
+
  Usage:
  -   Camera::setCameraFlag(s_CF[<SCENE_LAYER_INDEX>]);
  -   Node::setCameraMask(s_CM[<SCENE_LAYER_INDEX>]);
- 
+
  Note:
  For LAYER_DEFAULT, we use CameraFlag::DEFAULT, thus we don't need to set
  camera flag/mask for this layer, for other layers we must to set camera
  flag/mask to distinguish between each other.
  */
-static CameraFlag s_CF[LAYER_COUNT] =
-{
-    CameraFlag::USER1,      //  LAYER_BACKGROUND
-    CameraFlag::DEFAULT,    //  LAYER_DEFAULT
-    CameraFlag::USER3,      //  LAYER_MIDDLE
-    CameraFlag::USER4,      //  LAYER_TOP
+static CameraFlag s_CF[LAYER_COUNT] = {
+    CameraFlag::USER1,    //  LAYER_BACKGROUND
+    CameraFlag::DEFAULT,  //  LAYER_DEFAULT
+    CameraFlag::USER3,    //  LAYER_MIDDLE
+    CameraFlag::USER4,    //  LAYER_TOP
 };
 
-static unsigned short s_CM[LAYER_COUNT] =
-{
+static unsigned short s_CM[LAYER_COUNT] = {
     (unsigned short)s_CF[0],
     (unsigned short)s_CF[1],
     (unsigned short)s_CF[2],
     (unsigned short)s_CF[3],
 };
 
-static const char * s_CameraNames[CAMERA_COUNT] =
-{
-    "World 3D Skybox",
-    "World 3D Scene",
-    "UI 2D",
-    "Dialog 2D Base",
-    "Dialog 3D Model",
-    "Dialog 2D Above",
-    "OSD 2D Base",
-    "OSD 3D Model",
-    "OSD 2D Above"
-};
+static const char* s_CameraNames[CAMERA_COUNT] = {"World 3D Skybox", "World 3D Scene",  "UI 2D",
+                                                  "Dialog 2D Base",  "Dialog 3D Model", "Dialog 2D Above",
+                                                  "OSD 2D Base",     "OSD 3D Model",    "OSD 2D Above"};
 
 /** The scenes, located in different position, won't see each other. */
 static Vec3 s_scenePositons[SCENE_COUNT] = {
-    Vec3(0, 0, 0),          //  center  :   UI scene
-    Vec3(0, 10000, 0),      //  top     :   World sub scene
-    Vec3(10000, 0, 0),      //  right   :   Dialog sub scene
-    Vec3(0, -10000, 0),     //  bottom  :   OSD sub scene
+    Vec3(0, 0, 0),       //  center  :   UI scene
+    Vec3(0, 10000, 0),   //  top     :   World sub scene
+    Vec3(10000, 0, 0),   //  right   :   Dialog sub scene
+    Vec3(0, -10000, 0),  //  bottom  :   OSD sub scene
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implements Scene3DTestScene
 
 Scene3DTestScene::Scene3DTestScene()
-: _worldScene(nullptr)
-, _dlgScene(nullptr)
-, _osdScene(nullptr)
-, _textureCube(nullptr)
-, _skyBox(nullptr)
-, _terrain(nullptr)
-, _player(nullptr)
-, _playerItem(nullptr)
-, _detailItem(nullptr)
-, _descItem(nullptr)
-, _ui(nullptr)
-, _playerDlg(nullptr)
-, _detailDlg(nullptr)
-, _descDlg(nullptr)
+    : _worldScene(nullptr)
+    , _dlgScene(nullptr)
+    , _osdScene(nullptr)
+    , _textureCube(nullptr)
+    , _skyBox(nullptr)
+    , _terrain(nullptr)
+    , _player(nullptr)
+    , _playerItem(nullptr)
+    , _detailItem(nullptr)
+    , _descItem(nullptr)
+    , _ui(nullptr)
+    , _playerDlg(nullptr)
+    , _detailDlg(nullptr)
+    , _descDlg(nullptr)
 {
     _monsters[0] = _monsters[1] = nullptr;
 }
 
-Scene3DTestScene::~Scene3DTestScene()
-{
-}
+Scene3DTestScene::~Scene3DTestScene() {}
 
 bool Scene3DTestScene::init()
 {
@@ -255,17 +245,14 @@ bool Scene3DTestScene::init()
         // prepare for camera creation, we need several custom cameras
         _gameCameras.resize(CAMERA_COUNT);
         auto visibleSize = Director::getInstance()->getVisibleSize();
-        Camera *ca = nullptr;   // temp variable
-        
+        Camera* ca       = nullptr;  // temp variable
+
         ////////////////////////////////////////////////////////////////////////
         // create world 3D scene, this scene has two camera
         _worldScene = Node::create();
         // create a camera to look the skybox
         ca = _gameCameras[CAMERA_WORLD_3D_SKYBOX] =
-            Camera::createPerspective(60,
-                                      visibleSize.width / visibleSize.height,
-                                      10,
-                                      1000);
+            Camera::createPerspective(60, visibleSize.width / visibleSize.height, 10, 1000);
         ca->setDepth(CAMERA_WORLD_3D_SKYBOX);
         ca->setName(s_CameraNames[CAMERA_WORLD_3D_SKYBOX]);
         ca->setCameraFlag(s_CF[LAYER_BACKGROUND]);
@@ -273,10 +260,7 @@ bool Scene3DTestScene::init()
         _worldScene->addChild(ca);
         // create a camera to look the 3D models in world 3D scene
         ca = _gameCameras[CAMERA_WORLD_3D_SCENE] =
-            Camera::createPerspective(60,
-                                      visibleSize.width/visibleSize.height,
-                                      0.1f,
-                                      200);
+            Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
         ca->setDepth(CAMERA_WORLD_3D_SCENE);
         ca->setName(s_CameraNames[CAMERA_WORLD_3D_SCENE]);
         _worldScene->addChild(ca);
@@ -288,11 +272,11 @@ bool Scene3DTestScene::init()
         _worldScene->addChild(_monsters[0]);
         _worldScene->addChild(_monsters[1]);
         // move camera above player
-        ca->setPosition3D(_player->getPosition3D()+Vec3(0, 45, 60));
-        ca->setRotation3D(Vec3(-45,0,0));
+        ca->setPosition3D(_player->getPosition3D() + Vec3(0, 45, 60));
+        ca->setRotation3D(Vec3(-45, 0, 0));
         _worldScene->setPosition3D(s_scenePositons[SCENE_WORLD]);
         this->addChild(_worldScene);
-        
+
         ////////////////////////////////////////////////////////////////////////
         // test scene is UI scene, use default camera
         // use the default camera to look 2D base UI layer
@@ -302,7 +286,7 @@ bool Scene3DTestScene::init()
         // create UI element and add to ui scene
         createUI();
         this->addChild(_ui);
-        
+
         ////////////////////////////////////////////////////////////////////////
         // create dialog scene, this scene has two dialog and three cameras
         _dlgScene = Node::create();
@@ -365,43 +349,39 @@ bool Scene3DTestScene::init()
 
         ////////////////////////////////////////////////////////////////////////
         // add touch event callback
-        auto listener = EventListenerTouchOneByOne::create();
+        auto listener          = EventListenerTouchOneByOne::create();
         listener->onTouchBegan = CC_CALLBACK_2(Scene3DTestScene::onTouchBegan, this);
         listener->onTouchEnded = CC_CALLBACK_2(Scene3DTestScene::onTouchEnd, this);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
         ret = true;
     } while (0);
-    
+
     return ret;
 }
 
 void Scene3DTestScene::createWorld3D()
 {
     // create skybox
-    //create and set our custom shader
-    auto shader = GLProgram::createWithFilenames("Sprite3DTest/cube_map.vert",
-                                                 "Sprite3DTest/cube_map.frag");
-    auto state = GLProgramState::create(shader);
-    
+    // create and set our custom shader
+    auto shader = GLProgram::createWithFilenames("Sprite3DTest/cube_map.vert", "Sprite3DTest/cube_map.frag");
+    auto state  = GLProgramState::create(shader);
+
     // create the second texture for cylinder
-    _textureCube = TextureCube::create("Sprite3DTest/skybox/left.jpg",
-                                       "Sprite3DTest/skybox/right.jpg",
-                                       "Sprite3DTest/skybox/top.jpg",
-                                       "Sprite3DTest/skybox/bottom.jpg",
-                                       "Sprite3DTest/skybox/front.jpg",
-                                       "Sprite3DTest/skybox/back.jpg");
-    //set texture parameters
+    _textureCube = TextureCube::create("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg",
+                                       "Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
+                                       "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
+    // set texture parameters
     Texture2D::TexParams tRepeatParams;
-    tRepeatParams.magFilter = GL_LINEAR;
-    tRepeatParams.minFilter = GL_LINEAR;
+    tRepeatParams.magFilter    = GL_LINEAR;
+    tRepeatParams.minFilter    = GL_LINEAR;
     tRepeatParams.sAddressMode = GL_MIRRORED_REPEAT;
     tRepeatParams.tAddressMode = GL_MIRRORED_REPEAT;
     _textureCube->setTexParameters(tRepeatParams);
-    
+
     // pass the texture sampler to our custom shader
     state->setUniformTexture("u_cubeTex", _textureCube);
-    
+
     // add skybox
     _skyBox = Skybox::create();
     _skyBox->setCameraMask(s_CM[LAYER_BACKGROUND]);
@@ -409,28 +389,24 @@ void Scene3DTestScene::createWorld3D()
 
     // create terrain
     Terrain::DetailMap r("TerrainTest/dirt.jpg");
-    Terrain::DetailMap g("TerrainTest/Grass2.jpg",10);
+    Terrain::DetailMap g("TerrainTest/Grass2.jpg", 10);
     Terrain::DetailMap b("TerrainTest/road.jpg");
-    Terrain::DetailMap a("TerrainTest/GreenSkin.jpg",20);
-    Terrain::TerrainData data("TerrainTest/heightmap16.jpg",
-                              "TerrainTest/alphamap.png",
-                              r,g,b,a,Size(32,32),40.0f,2);
-    _terrain = Terrain::create(data,Terrain::CrackFixedType::SKIRT);
+    Terrain::DetailMap a("TerrainTest/GreenSkin.jpg", 20);
+    Terrain::TerrainData data("TerrainTest/heightmap16.jpg", "TerrainTest/alphamap.png", r, g, b, a, Size(32, 32),
+                              40.0f, 2);
+    _terrain = Terrain::create(data, Terrain::CrackFixedType::SKIRT);
     _terrain->setMaxDetailMapAmount(4);
     _terrain->setDrawWire(false);
 
     _terrain->setSkirtHeightRatio(3);
-    _terrain->setLODDistance(64,128,192);
-    
+    _terrain->setLODDistance(64, 128, 192);
+
     // create player
-    _player = Player::create("Sprite3DTest/girl.c3b",
-                             _gameCameras[CAMERA_WORLD_3D_SCENE],
-                             _terrain);
+    _player = Player::create("Sprite3DTest/girl.c3b", _gameCameras[CAMERA_WORLD_3D_SCENE], _terrain);
     _player->setScale(0.08f);
-    _player->setPositionY(_terrain->getHeight(_player->getPositionX(),
-                                              _player->getPositionZ()));
-    
-    auto animation = Animation3D::create("Sprite3DTest/girl.c3b","Take 001");
+    _player->setPositionY(_terrain->getHeight(_player->getPositionX(), _player->getPositionZ()));
+
+    auto animation = Animation3D::create("Sprite3DTest/girl.c3b", "Take 001");
     if (animation)
     {
         auto animate = Animate3D::create(animation);
@@ -438,30 +414,29 @@ void Scene3DTestScene::createWorld3D()
     }
     // add a particle 3d above player
     auto rootps =
-        PUParticleSystem3D::create("Particle3D/scripts/blackHole.pu",
-                                   "Particle3D/materials/pu_mediapack_01.material");
+        PUParticleSystem3D::create("Particle3D/scripts/blackHole.pu", "Particle3D/materials/pu_mediapack_01.material");
     rootps->setScale(2);
     rootps->setPosition3D(Vec3(0, 150, 0));
-    auto moveby = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
+    auto moveby  = MoveBy::create(2.0f, Vec2(50.0f, 0.0f));
     auto moveby1 = MoveBy::create(2.0f, Vec2(-50.0f, 0.0f));
     rootps->runAction(RepeatForever::create(Sequence::create(moveby, moveby1, nullptr)));
     rootps->startParticleSystem();
-    
+
     _player->addChild(rootps, 0);
-    
+
     // add BillBoard for test blend
     auto billboard = BillBoard::create("Images/btn-play-normal.png");
-    billboard->setPosition3D(Vec3(0,180,0));
+    billboard->setPosition3D(Vec3(0, 180, 0));
     _player->addChild(billboard);
-    
+
     // create two Sprite3D monster, one is transparent
     auto monster = Sprite3D::create("Sprite3DTest/orc.c3b");
-    monster->setRotation3D(Vec3(0,180,0));
+    monster->setRotation3D(Vec3(0, 180, 0));
     monster->setPosition3D(_player->getPosition3D() + Vec3(50, -10, 0));
     monster->setOpacity(128);
     _monsters[0] = monster;
-    monster = Sprite3D::create("Sprite3DTest/orc.c3b");
-    monster->setRotation3D(Vec3(0,180,0));
+    monster      = Sprite3D::create("Sprite3DTest/orc.c3b");
+    monster->setRotation3D(Vec3(0, 180, 0));
     monster->setPosition3D(_player->getPosition3D() + Vec3(-50, -5, 0));
     _monsters[1] = monster;
 }
@@ -469,22 +444,18 @@ void Scene3DTestScene::createWorld3D()
 void Scene3DTestScene::createUI()
 {
     _ui = Layer::create();
-    
+
     // first, add menu to ui
     // create player button
-    auto showPlayerDlgItem = MenuItemImage::create("Images/Pea.png",
-                                                   "Images/Pea.png",
-                                                   [this](Ref* sender){
+    auto showPlayerDlgItem = MenuItemImage::create("Images/Pea.png", "Images/Pea.png", [this](Ref* sender) {
         this->_playerDlg->setVisible(!this->_playerDlg->isVisible());
     });
     showPlayerDlgItem->setName("showPlayerDlgItem");
     showPlayerDlgItem->setPosition(VisibleRect::left().x + 30, VisibleRect::top().y - 30);
-    
+
     // create description button
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
-    auto descItem = MenuItemLabel::create(Label::createWithTTF(ttfConfig, "Description"),
-                                          [this](Ref* sender)
-    {
+    auto descItem = MenuItemLabel::create(Label::createWithTTF(ttfConfig, "Description"), [this](Ref* sender) {
         if (this->_descDlg->isVisible())
         {
             // hide descDlg
@@ -501,31 +472,26 @@ void Scene3DTestScene::createUI()
     descItem->setName("descItem");
     descItem->setPosition(Vec2(VisibleRect::right().x - 50, VisibleRect::top().y - 25));
 
-    auto menu = Menu::create(showPlayerDlgItem,
-                             descItem,
-                             nullptr);
+    auto menu = Menu::create(showPlayerDlgItem, descItem, nullptr);
     menu->setPosition(Vec2::ZERO);
     _ui->addChild(menu);
-    
+
     // second, add cameras control button to ui
-    auto createCameraButton = [this](int tag, const char* text)-> Node *
-    {
-        auto cb = ui::CheckBox::create("cocosui/check_box_normal.png",
-                                       "cocosui/check_box_normal_press.png",
-                                       "cocosui/check_box_active.png",
-                                       "cocosui/check_box_normal_disable.png",
+    auto createCameraButton = [this](int tag, const char* text) -> Node* {
+        auto cb = ui::CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                       "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
                                        "cocosui/check_box_active_disable.png");
         cb->setTag(tag);
         cb->setSelected(true);
-        if (text) cb->setName(text);
+        if (text)
+            cb->setName(text);
         cb->setAnchorPoint(Vec2(0, 0.5));
         cb->setScale(0.8f);
-        cb->addClickEventListener([this](Ref* sender)
-            {
-                auto index = static_cast<Node *>(sender)->getTag();
-                auto camera = this->_gameCameras[index];
-                camera->setVisible(!camera->isVisible());
-            });
+        cb->addClickEventListener([this](Ref* sender) {
+            auto index  = static_cast<Node*>(sender)->getTag();
+            auto camera = this->_gameCameras[index];
+            camera->setVisible(!camera->isVisible());
+        });
         if (text)
         {
             auto label = ui::Text::create();
@@ -536,7 +502,7 @@ void Scene3DTestScene::createUI()
         }
         return cb;
     };
-    
+
     Vec2 pos = VisibleRect::leftBottom();
     pos.y += 30;
     float stepY = 25;
@@ -563,11 +529,11 @@ void Scene3DTestScene::createUI()
 void Scene3DTestScene::createPlayerDlg()
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist);
-    
+
     Size dlgSize(190, 240);
-    Vec2 pos = VisibleRect::center();
+    Vec2 pos     = VisibleRect::center();
     float margin = 10;
-    
+
     // first, create dialog ui part, include background, title and buttons
     _playerDlg = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png");
     _playerDlg->setContentSize(dlgSize);
@@ -575,12 +541,12 @@ void Scene3DTestScene::createPlayerDlg()
     pos.y -= margin;
     pos.x -= margin;
     _playerDlg->setPosition(pos);
-    
+
     // title
-    auto title = Label::createWithTTF("Player Dialog","fonts/arial.ttf",16);
+    auto title = Label::createWithTTF("Player Dialog", "fonts/arial.ttf", 16);
     title->setPosition(dlgSize.width / 2, dlgSize.height - margin * 2);
     _playerDlg->addChild(title);
-    
+
     // player background
     Size bgSize(110, 180);
     Vec2 bgPos(margin, dlgSize.height / 2 - margin);
@@ -599,59 +565,50 @@ void Scene3DTestScene::createPlayerDlg()
     itemBg->setAnchorPoint(itemAnchor);
     itemBg->setPosition(itemPos);
     _playerDlg->addChild(itemBg);
-    
+
     auto item = ui::Button::create("crystal.png", "", "", ui::Widget::TextureResType::PLIST);
     item->setTitleText("Crystal");
     item->setScale(1.5);
     item->setAnchorPoint(itemAnchor);
     item->setPosition(itemPos);
-    item->addClickEventListener([this](Ref* sender){
-        this->_detailDlg->setVisible(!this->_detailDlg->isVisible());
-    });
+    item->addClickEventListener([this](Ref* sender) { this->_detailDlg->setVisible(!this->_detailDlg->isVisible()); });
     _playerDlg->addChild(item);
-    
+
     // second, add 3d actor, which on dialog layer
     std::string filename = "Sprite3DTest/girl.c3b";
-    auto girl = Sprite3D::create(filename);
+    auto girl            = Sprite3D::create(filename);
     girl->setScale(0.5);
     girl->setPosition(bgSize.width / 2, margin * 2);
     girl->setCameraMask(s_CM[LAYER_MIDDLE]);
     playerBg->addChild(girl);
 
     // third, add zoom in/out button, which is 2d ui element and over 3d actor
-    ui::Button* zoomIn = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                    "cocosui/animationbuttonpressed.png");
+    ui::Button* zoomIn = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
     zoomIn->setScale(0.5);
     zoomIn->setAnchorPoint(Vec2(1, 1));
     zoomIn->setPosition(Vec2(bgSize.width / 2 - margin / 2, bgSize.height - margin));
-    zoomIn->addClickEventListener([girl](Ref* sender){
-        girl->setScale(girl->getScale() * 2);
-    });
+    zoomIn->addClickEventListener([girl](Ref* sender) { girl->setScale(girl->getScale() * 2); });
     zoomIn->setTitleText("Zoom In");
     zoomIn->setName("Zoom In");
     zoomIn->setCameraMask(s_CM[LAYER_TOP]);
     playerBg->addChild(zoomIn);
 
-    ui::Button* zoomOut = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                            "cocosui/animationbuttonpressed.png");
+    ui::Button* zoomOut = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
     zoomOut->setScale(0.5);
     zoomOut->setAnchorPoint(Vec2(0, 1));
     zoomOut->setPosition(Vec2(bgSize.width / 2 + margin / 2, bgSize.height - margin));
-    zoomOut->addClickEventListener([girl](Ref* sender){
-        girl->setScale(girl->getScale() / 2);
-    });
+    zoomOut->addClickEventListener([girl](Ref* sender) { girl->setScale(girl->getScale() / 2); });
     zoomOut->setTitleText("Zoom Out");
     zoomOut->setName("Zoom Out");
     zoomOut->setCameraMask(s_CM[LAYER_TOP]);
     playerBg->addChild(zoomOut);
-    
+
     // forth, add slider bar
     ui::Slider* slider = ui::Slider::create("cocosui/slidbar.png", "cocosui/sliderballnormal.png");
     slider->setScale9Enabled(true);
     slider->setPosition(Vec2(bgSize.width / 2, margin));
     slider->setContentSize(Size(bgSize.width - margin, slider->getContentSize().height));
-    slider->addEventListener([girl, slider](Ref* sender,ui::Slider::EventType type)
-    {
+    slider->addEventListener([girl, slider](Ref* sender, ui::Slider::EventType type) {
         girl->setRotation3D(Vec3(0, 360 * slider->getPercent() / 100, 0));
     });
     slider->setName("Slider");
@@ -662,11 +619,11 @@ void Scene3DTestScene::createPlayerDlg()
 void Scene3DTestScene::createDetailDlg()
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist);
-    
+
     Size dlgSize(190, 240);
-    Vec2 pos = VisibleRect::center();
+    Vec2 pos     = VisibleRect::center();
     float margin = 10;
-    
+
     // create dialog
     // use Scale9Sprite as background, it won't swallow touch event
     _detailDlg = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png");
@@ -676,62 +633,56 @@ void Scene3DTestScene::createDetailDlg()
     pos.y -= margin;
     pos.x += margin;
     _detailDlg->setPosition(pos);
-    
+
     // title
-    auto title = Label::createWithTTF("Detail Dialog","fonts/arial.ttf",16);
+    auto title = Label::createWithTTF("Detail Dialog", "fonts/arial.ttf", 16);
     title->setPosition(dlgSize.width / 2, dlgSize.height - margin * 2);
     _detailDlg->addChild(title);
 
-    
     // add capture screen buttons
-    ui::Button* capture = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                             "cocosui/animationbuttonpressed.png");
+    ui::Button* capture = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
     capture->setScale(0.5);
     capture->setAnchorPoint(Vec2(0.5, 0));
     capture->setPosition(Vec2(dlgSize.width / 3, margin));
-    capture->addClickEventListener([this](Ref* sender)
-    {
+    capture->addClickEventListener([this](Ref* sender) {
         Director::getInstance()->getTextureCache()->removeTextureForKey(_snapshotFile);
         _osdScene->removeChildByTag(SNAPSHOT_TAG);
         _snapshotFile = "CaptureScreenTest.png";
-        utils::captureScreen([this](bool succeed, const std::string& outputFile)
-        {
-            if (!succeed)
-            {
-                log("Capture screen failed.");
-                return;
-            }
-            auto sp = Sprite::create(outputFile);
-            _osdScene->addChild(sp, 0, SNAPSHOT_TAG);
-            Size s = Director::getInstance()->getWinSize();
-            sp->setPosition(s.width / 2, s.height / 2);
-            sp->setScale(0.25);
-            _snapshotFile = outputFile;
-        }, _snapshotFile);
+        utils::captureScreen(
+            [this](bool succeed, std::string_view outputFile) {
+                if (!succeed)
+                {
+                    log("Capture screen failed.");
+                    return;
+                }
+                auto sp = Sprite::create(outputFile);
+                _osdScene->addChild(sp, 0, SNAPSHOT_TAG);
+                Size s = Director::getInstance()->getWinSize();
+                sp->setPosition(s.width / 2, s.height / 2);
+                sp->setScale(0.25);
+                _snapshotFile = outputFile;
+            },
+            _snapshotFile);
     });
     capture->setTitleText("Take Snapshot");
     capture->setName("Take Snapshot");
     _detailDlg->addChild(capture);
-    
-    ui::Button* remove = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                            "cocosui/animationbuttonpressed.png");
+
+    ui::Button* remove = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
     remove->setScale(0.5);
     remove->setAnchorPoint(Vec2(0.5, 0));
     remove->setPosition(Vec2(dlgSize.width * 2 / 3, margin));
-    remove->addClickEventListener([this](Ref* sender)
-    {
-        _osdScene->removeChildByTag(SNAPSHOT_TAG);
-    });
+    remove->addClickEventListener([this](Ref* sender) { _osdScene->removeChildByTag(SNAPSHOT_TAG); });
     remove->setTitleText("Del Snapshot");
     remove->setName("Del Snapshot");
     _detailDlg->addChild(remove);
-    
+
     // add a spine ffd animation on it
     auto skeletonNode =
         SkeletonAnimationCullingFix::createWithFile("spine/goblins-pro.json", "spine/goblins.atlas", 1.5f);
     skeletonNode->setAnimation(0, "walk", true);
     skeletonNode->setSkin("goblin");
-    
+
     skeletonNode->setScale(0.25);
     Size windowSize = Director::getInstance()->getWinSize();
     skeletonNode->setPosition(Vec2(dlgSize.width / 2, remove->getContentSize().height / 2 + 2 * margin));
@@ -741,11 +692,11 @@ void Scene3DTestScene::createDetailDlg()
 void Scene3DTestScene::createDescDlg()
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist);
-    
+
     Size dlgSize(440, 240);
-    Vec2 pos = VisibleRect::center();
+    Vec2 pos     = VisibleRect::center();
     float margin = 10;
-    
+
     // first, create dialog, add title and description text on it
     // use Layout, which setTouchEnabled(true), as background, it will swallow touch event
     auto desdDlg = ui::Layout::create();
@@ -758,9 +709,8 @@ void Scene3DTestScene::createDescDlg()
     desdDlg->setTouchEnabled(true);
     _descDlg = desdDlg;
 
-    
     // title
-    auto title = Label::createWithTTF("Description Dialog","fonts/arial.ttf",16);
+    auto title = Label::createWithTTF("Description Dialog", "fonts/arial.ttf", 16);
     title->setPosition(dlgSize.width / 2, dlgSize.height - margin * 2);
     _descDlg->addChild(title);
 
@@ -768,28 +718,28 @@ void Scene3DTestScene::createDescDlg()
     Size textSize(400, 220);
     Vec2 textPos(margin, dlgSize.height - (20 + margin));
     std::string desc = std::string(
-    "    Scene 3D test for 2D and 3D mix rendering.\n"
-    "- Game world composite with terrain, skybox and 3D objects.\n"
-    "- UI composite with 2D nodes.\n"
-    "- Click the icon at the topleft conner, will show a player dialog which "
-    "there is a 3D sprite on it.\n"
-    "- There are two button to zoom the player model, which should keep above "
-    "on 3D model.\n"
-    " - This description dialog should above all other elements.\n"
-    "\n"
-    "    Game scene composite with root scene and three sub scene. These scene "
-    " located at different location, they can't see each other.\n"
-    "- Root scene contains ui layer\n"
-    "- World scene contains skybox and 3d scene.\n"
-    "- Dialog scene contains actor dialog and detail dialog.\n"
-    "- OSD scene contains description dialog.\n"
-    "\n"
-    "Click \"Description\" button to hide this dialog.\n");
+        "    Scene 3D test for 2D and 3D mix rendering.\n"
+        "- Game world composite with terrain, skybox and 3D objects.\n"
+        "- UI composite with 2D nodes.\n"
+        "- Click the icon at the topleft conner, will show a player dialog which "
+        "there is a 3D sprite on it.\n"
+        "- There are two button to zoom the player model, which should keep above "
+        "on 3D model.\n"
+        " - This description dialog should above all other elements.\n"
+        "\n"
+        "    Game scene composite with root scene and three sub scene. These scene "
+        " located at different location, they can't see each other.\n"
+        "- Root scene contains ui layer\n"
+        "- World scene contains skybox and 3d scene.\n"
+        "- Dialog scene contains actor dialog and detail dialog.\n"
+        "- OSD scene contains description dialog.\n"
+        "\n"
+        "Click \"Description\" button to hide this dialog.\n");
     auto text = Label::createWithSystemFont(desc, "", 9, textSize);
     text->setAnchorPoint(Vec2(0, 1));
     text->setPosition(textPos);
     _descDlg->addChild(text);
-    
+
     // second, add a 3D model
     std::string fileName = "Sprite3DTest/ReskinGirl.c3b";
     Vec2 girlPos(textPos.x + textSize.width - 40, margin);
@@ -802,46 +752,47 @@ void Scene3DTestScene::createDescDlg()
     if (animation)
     {
         auto animate = Animate3D::create(animation);
-        
+
         _reskinGirl->runAction(RepeatForever::create(animate));
     }
-    
+
     auto& body = _skins[(int)SkinType::UPPER_BODY];
     body.push_back("Girl_UpperBody01");
     body.push_back("Girl_UpperBody02");
-    
+
     auto& pants = _skins[(int)SkinType::PANTS];
     pants.push_back("Girl_LowerBody01");
     pants.push_back("Girl_LowerBody02");
-    
+
     auto& shoes = _skins[(int)SkinType::SHOES];
     shoes.push_back("Girl_Shoes01");
     shoes.push_back("Girl_Shoes02");
-    
+
     auto& hair = _skins[(int)SkinType::HAIR];
     hair.push_back("Girl_Hair01");
     hair.push_back("Girl_Hair02");
-    
+
     auto& face = _skins[(int)SkinType::FACE];
     face.push_back("Girl_Face01");
     face.push_back("Girl_Face02");
-    
+
     auto& hand = _skins[(int)SkinType::HAND];
     hand.push_back("Girl_Hand01");
     hand.push_back("Girl_Hand02");
-    
+
     auto& glasses = _skins[(int)SkinType::GLASSES];
     glasses.push_back("");
     glasses.push_back("Girl_Glasses01");
-    
+
     memset(_curSkin, 0, (int)SkinType::MAX_TYPE * sizeof(int));
-    
-    auto applyCurSkin = [this]()
-    {
-        for (ssize_t i = 0; i < this->_reskinGirl->getMeshCount(); i++) {
-            auto mesh = this->_reskinGirl->getMeshByIndex(static_cast<int>(i));
+
+    auto applyCurSkin = [this]() {
+        for (ssize_t i = 0; i < this->_reskinGirl->getMeshCount(); i++)
+        {
+            auto mesh      = this->_reskinGirl->getMeshByIndex(static_cast<int>(i));
             bool isVisible = false;
-            for (int j = 0; j < (int)SkinType::MAX_TYPE; j++) {
+            for (int j = 0; j < (int)SkinType::MAX_TYPE; j++)
+            {
                 if (mesh->getName() == _skins[j].at(_curSkin[j]))
                 {
                     isVisible = true;
@@ -852,30 +803,22 @@ void Scene3DTestScene::createDescDlg()
         }
     };
     applyCurSkin();
-    
+
     // third, add reskin buttons above 3D model
-    static const std::string btnTexts[SkinType::MAX_TYPE] =
-    {
-        "Hair",
-        "Glasses",
-        "Face",
-        "Coat",
-        "Hand",
-        "Pants",
-        "Shoes",
+    static const std::string btnTexts[SkinType::MAX_TYPE] = {
+        "Hair", "Glasses", "Face", "Coat", "Hand", "Pants", "Shoes",
     };
     Vec2 btnPos(dlgSize.width - margin, margin);
-    for (int i = SkinType::MAX_TYPE - 1; i >= 0; --i) {
-        auto btn = ui::Button::create("cocosui/animationbuttonnormal.png",
-                                      "cocosui/animationbuttonpressed.png");
+    for (int i = SkinType::MAX_TYPE - 1; i >= 0; --i)
+    {
+        auto btn = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         btn->setScale(0.5);
         btn->setTag(i);
         btn->setAnchorPoint(Vec2(1, 0));
         btn->setPosition(btnPos);
         btnPos.y += 20;
-        btn->addClickEventListener([this, applyCurSkin](Ref* sender)
-        {
-            auto index = static_cast<Node *>(sender)->getTag();
+        btn->addClickEventListener([this, applyCurSkin](Ref* sender) {
+            auto index = static_cast<Node*>(sender)->getTag();
             if (index < SkinType::MAX_TYPE)
             {
                 _curSkin[index] = (_curSkin[index] + 1) % _skins[index].size();
@@ -891,13 +834,13 @@ void Scene3DTestScene::createDescDlg()
 void Scene3DTestScene::onTouchEnd(Touch* touch, Event* event)
 {
     auto location = touch->getLocation();
-    auto camera = _gameCameras[CAMERA_WORLD_3D_SCENE];
-    if(camera != Camera::getVisitingCamera())
+    auto camera   = _gameCameras[CAMERA_WORLD_3D_SCENE];
+    if (camera != Camera::getVisitingCamera())
     {
         return;
     }
 
-    if(_player)
+    if (_player)
     {
         Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
         // convert screen touch location to the world location on near and far plane
@@ -914,12 +857,12 @@ void Scene3DTestScene::onTouchEnd(Touch* touch, Event* event)
         }
         else
         {
-            dir = collisionPoint - _player->getPosition3D();
+            dir   = collisionPoint - _player->getPosition3D();
             dir.y = 0;
             dir.normalize();
-            _player->_headingAngle =  -1*acos(dir.dot(Vec3(0,0,-1)));
-            dir.cross(dir,Vec3(0,0,-1),&_player->_headingAxis);
-            _player->_targetPos=collisionPoint;
+            _player->_headingAngle = -1 * acos(dir.dot(Vec3(0, 0, -1)));
+            dir.cross(dir, Vec3(0, 0, -1), &_player->_headingAxis);
+            _player->_targetPos = collisionPoint;
             _player->forward();
         }
     }
diff --git a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.h b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.h
index 838ef0e2d13a..e247a6d9ca68 100644
--- a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.h
+++ b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/SceneTest/SceneTest.cpp b/tests/cpp-tests/Classes/SceneTest/SceneTest.cpp
index 43ca221bb7e9..3f031f2d49d6 100644
--- a/tests/cpp-tests/Classes/SceneTest/SceneTest.cpp
+++ b/tests/cpp-tests/Classes/SceneTest/SceneTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -49,29 +49,30 @@ enum
 
 SceneTestLayer1::SceneTestLayer1()
 {
-    auto item1 = MenuItemFont::create( "Test pushScene", CC_CALLBACK_1(SceneTestLayer1::onPushScene, this));
-    auto item2 = MenuItemFont::create( "Test pushScene w/transition", CC_CALLBACK_1(SceneTestLayer1::onPushSceneTran, this));
-    auto item3 = MenuItemFont::create( "Quit", CC_CALLBACK_1(SceneTestLayer1::onQuit, this));
-    
-    auto menu = Menu::create( item1, item2, item3, nullptr );
+    auto item1 = MenuItemFont::create("Test pushScene", CC_CALLBACK_1(SceneTestLayer1::onPushScene, this));
+    auto item2 =
+        MenuItemFont::create("Test pushScene w/transition", CC_CALLBACK_1(SceneTestLayer1::onPushSceneTran, this));
+    auto item3 = MenuItemFont::create("Quit", CC_CALLBACK_1(SceneTestLayer1::onQuit, this));
+
+    auto menu = Menu::create(item1, item2, item3, nullptr);
     menu->alignItemsVertically();
-    
-    addChild( menu );
-    
-    auto s = Director::getInstance()->getWinSize();
+
+    addChild(menu);
+
+    auto s      = Director::getInstance()->getWinSize();
     auto sprite = Sprite::create(s_pathGrossini);
     addChild(sprite);
-    sprite->setPosition( Vec2(s.width-40, s.height/2) );
+    sprite->setPosition(Vec2(s.width - 40, s.height / 2));
     auto rotate = RotateBy::create(2, 360);
     auto repeat = RepeatForever::create(rotate);
     sprite->runAction(repeat);
 
-    schedule( CC_SCHEDULE_SELECTOR(SceneTestLayer1::testDealloc) );
+    schedule(CC_SCHEDULE_SELECTOR(SceneTestLayer1::testDealloc));
 }
 
 void SceneTestLayer1::testDealloc(float dt)
 {
-    //CCLOG("SceneTestLayer1:testDealloc");
+    // CCLOG("SceneTestLayer1:testDealloc");
 }
 
 void SceneTestLayer1::onEnter()
@@ -88,31 +89,30 @@ void SceneTestLayer1::onEnterTransitionDidFinish()
 
 SceneTestLayer1::~SceneTestLayer1()
 {
-    //NSLog(@"SceneTestLayer1 - dealloc");
+    // NSLog(@"SceneTestLayer1 - dealloc");
 }
 
 void SceneTestLayer1::onPushScene(Ref* sender)
 {
     auto scene = SceneTestScene::create(2);
-    Director::getInstance()->pushScene( scene );
+    Director::getInstance()->pushScene(scene);
 }
 
 void SceneTestLayer1::onPushSceneTran(Ref* sender)
 {
     auto scene = SceneTestScene::create(2);
-    Director::getInstance()->pushScene( TransitionSlideInT::create(1, scene) );
+    Director::getInstance()->pushScene(TransitionSlideInT::create(1, scene));
 }
 
-
 void SceneTestLayer1::onQuit(Ref* sender)
 {
-    //getCocosApp()->exit();
-    //Director::getInstance()->popScene();
+    // getCocosApp()->exit();
+    // Director::getInstance()->popScene();
 
     //// HA HA... no more terminate on sdk v3.0
     //// http://developer.apple.com/iphone/library/qa/qa2008/qa1561.html
-    //if( [[UIApplication sharedApplication] respondsToSelector:@selector(terminate)] )
-    //    [[UIApplication sharedApplication] performSelector:@selector(terminate)];
+    // if( [[UIApplication sharedApplication] respondsToSelector:@selector(terminate)] )
+    //     [[UIApplication sharedApplication] performSelector:@selector(terminate)];
 }
 
 //------------------------------------------------------------------
@@ -125,30 +125,31 @@ SceneTestLayer2::SceneTestLayer2()
 {
     _timeCounter = 0;
 
-    auto item1 = MenuItemFont::create( "replaceScene", CC_CALLBACK_1(SceneTestLayer2::onReplaceScene, this));
-    auto item2 = MenuItemFont::create( "replaceScene w/transition", CC_CALLBACK_1(SceneTestLayer2::onReplaceSceneTran, this));
-    auto item3 = MenuItemFont::create( "Go Back", CC_CALLBACK_1(SceneTestLayer2::onGoBack, this));
-    
-    auto menu = Menu::create( item1, item2, item3, nullptr );
+    auto item1 = MenuItemFont::create("replaceScene", CC_CALLBACK_1(SceneTestLayer2::onReplaceScene, this));
+    auto item2 =
+        MenuItemFont::create("replaceScene w/transition", CC_CALLBACK_1(SceneTestLayer2::onReplaceSceneTran, this));
+    auto item3 = MenuItemFont::create("Go Back", CC_CALLBACK_1(SceneTestLayer2::onGoBack, this));
+
+    auto menu = Menu::create(item1, item2, item3, nullptr);
     menu->alignItemsVertically();
-    
-    addChild( menu );
 
-    auto s = Director::getInstance()->getWinSize();
+    addChild(menu);
+
+    auto s      = Director::getInstance()->getWinSize();
     auto sprite = Sprite::create(s_pathGrossini);
     addChild(sprite);
-    sprite->setPosition( Vec2(s.width-40, s.height/2) );
+    sprite->setPosition(Vec2(s.width - 40, s.height / 2));
     auto rotate = RotateBy::create(2, 360);
     auto repeat = RepeatForever::create(rotate);
     sprite->runAction(repeat);
 
-    schedule( CC_SCHEDULE_SELECTOR(SceneTestLayer2::testDealloc) );
+    schedule(CC_SCHEDULE_SELECTOR(SceneTestLayer2::testDealloc));
 }
 
 void SceneTestLayer2::testDealloc(float dt)
 {
     //_timeCounter += dt;
-    //if( _timeCounter > 10 )
+    // if( _timeCounter > 10 )
     //    onReplaceScene(this);
 }
 
@@ -160,13 +161,13 @@ void SceneTestLayer2::onGoBack(Ref* sender)
 void SceneTestLayer2::onReplaceScene(Ref* sender)
 {
     auto scene = SceneTestScene::create(3);
-    Director::getInstance()->replaceScene( scene );
+    Director::getInstance()->replaceScene(scene);
 }
 
 void SceneTestLayer2::onReplaceSceneTran(Ref* sender)
 {
     auto scene = SceneTestScene::create(3);
-    Director::getInstance()->replaceScene( TransitionFlipX::create(2, scene) );
+    Director::getInstance()->replaceScene(TransitionFlipX::create(2, scene));
 }
 
 //------------------------------------------------------------------
@@ -175,21 +176,21 @@ void SceneTestLayer2::onReplaceSceneTran(Ref* sender)
 //
 //------------------------------------------------------------------
 
-SceneTestLayer3::SceneTestLayer3()
-{
-
-}
+SceneTestLayer3::SceneTestLayer3() {}
 
 bool SceneTestLayer3::init()
 {
-    if (LayerColor::initWithColor(Color4B(0,0,255,255)))
+    if (LayerColor::initWithColor(Color4B(0, 0, 255, 255)))
     {
         auto s = Director::getInstance()->getWinSize();
 
-        auto item0 = MenuItemFont::create("Touch to pushScene (self)", CC_CALLBACK_1(SceneTestLayer3::item0Clicked, this));
+        auto item0 =
+            MenuItemFont::create("Touch to pushScene (self)", CC_CALLBACK_1(SceneTestLayer3::item0Clicked, this));
         auto item1 = MenuItemFont::create("Touch to popScene", CC_CALLBACK_1(SceneTestLayer3::item1Clicked, this));
-        auto item2 = MenuItemFont::create("Touch to popToRootScene", CC_CALLBACK_1(SceneTestLayer3::item2Clicked, this));
-        auto item3 = MenuItemFont::create("Touch to popToSceneStackLevel(2)", CC_CALLBACK_1(SceneTestLayer3::item3Clicked, this));
+        auto item2 =
+            MenuItemFont::create("Touch to popToRootScene", CC_CALLBACK_1(SceneTestLayer3::item2Clicked, this));
+        auto item3 = MenuItemFont::create("Touch to popToSceneStackLevel(2)",
+                                          CC_CALLBACK_1(SceneTestLayer3::item3Clicked, this));
 
         auto menu = Menu::create(item0, item1, item2, item3, nullptr);
         this->addChild(menu);
@@ -199,7 +200,7 @@ bool SceneTestLayer3::init()
 
         auto sprite = Sprite::create(s_pathGrossini);
         addChild(sprite);
-        sprite->setPosition( Vec2(s.width/2, 40.0f) );
+        sprite->setPosition(Vec2(s.width / 2, 40.0f));
         auto rotate = RotateBy::create(2, 360);
         auto repeat = RepeatForever::create(rotate);
         sprite->runAction(repeat);
@@ -215,10 +216,10 @@ void SceneTestLayer3::testDealloc(float dt)
 
 void SceneTestLayer3::item0Clicked(Ref* sender)
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s        = Director::getInstance()->getWinSize();
     auto newScene = Scene::createWithSize(s);
     newScene->addChild(SceneTestLayer3::create());
-    Director::getInstance()->pushScene(TransitionFade::create(0.5, newScene, Color3B(0,255,255)));
+    Director::getInstance()->pushScene(TransitionFade::create(0.5, newScene, Color3B(0, 255, 255)));
 }
 
 void SceneTestLayer3::item1Clicked(Ref* sender)
diff --git a/tests/cpp-tests/Classes/SceneTest/SceneTest.h b/tests/cpp-tests/Classes/SceneTest/SceneTest.h
index 85d04303e9f2..a2f10b48a9e6 100644
--- a/tests/cpp-tests/Classes/SceneTest/SceneTest.h
+++ b/tests/cpp-tests/Classes/SceneTest/SceneTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,11 +45,12 @@ class SceneTestLayer1 : public cocos2d::Layer
     void onPushScene(cocos2d::Ref* sender);
     void onPushSceneTran(cocos2d::Ref* sender);
     void onQuit(cocos2d::Ref* sender);
-} ;
+};
 
 class SceneTestLayer2 : public cocos2d::Layer
 {
-    float    _timeCounter;
+    float _timeCounter;
+
 public:
     CREATE_FUNC(SceneTestLayer2);
 
@@ -59,7 +60,7 @@ class SceneTestLayer2 : public cocos2d::Layer
     void onGoBack(cocos2d::Ref* sender);
     void onReplaceScene(cocos2d::Ref* sender);
     void onReplaceSceneTran(cocos2d::Ref* sender);
-} ;
+};
 
 class SceneTestLayer3 : public cocos2d::LayerColor
 {
@@ -74,7 +75,7 @@ class SceneTestLayer3 : public cocos2d::LayerColor
     void item1Clicked(cocos2d::Ref* sender);
     void item2Clicked(cocos2d::Ref* sender);
     void item3Clicked(cocos2d::Ref* sender);
-} ;
+};
 
 class SceneTestScene : public TestCase
 {
diff --git a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp
index cd087e2f5eb0..9b6afdca3daa 100644
--- a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp
+++ b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,8 @@ USING_NS_CC;
 USING_NS_CC_EXT;
 using namespace cocos2d::ui;
 
-enum {
+enum
+{
     kTagAnimationDance = 1,
 };
 
@@ -82,7 +83,7 @@ void SchedulerAutoremove::autoremove(float dt)
     accum += dt;
     CCLOG("autoremove scheduler: Time: %f", accum);
 
-    if( accum > 3 )
+    if (accum > 3)
     {
         unschedule(CC_SCHEDULE_SELECTOR(SchedulerAutoremove::autoremove));
         CCLOG("autoremove scheduler: scheduler removed");
@@ -149,15 +150,9 @@ std::string SchedulerPauseResume::subtitle() const
 //
 //------------------------------------------------------------------
 
-SchedulerPauseResumeAll::SchedulerPauseResumeAll()
-{
-    
-}
+SchedulerPauseResumeAll::SchedulerPauseResumeAll() {}
 
-SchedulerPauseResumeAll::~SchedulerPauseResumeAll()
-{
-
-}
+SchedulerPauseResumeAll::~SchedulerPauseResumeAll() {}
 
 void SchedulerPauseResumeAll::onEnter()
 {
@@ -206,12 +201,9 @@ void SchedulerPauseResumeAll::pause(float /*dt*/)
 
     // should have only 2 items: ActionManager, self
     CCASSERT(_pausedTargets.size() == 2, "Error: pausedTargets should have only 2 items");
-    
+
     // because target 'this' has been paused above, so use another node(tag:123) as target
-    getChildByTag(123)->scheduleOnce([this](float dt)
-                                     {
-                                         this->resume(dt);
-                                     }, 2.0f, "test resume");
+    getChildByTag(123)->scheduleOnce([this](float dt) { this->resume(dt); }, 2.0f, "test resume");
 }
 
 void SchedulerPauseResumeAll::resume(float /*dt*/)
@@ -238,15 +230,9 @@ std::string SchedulerPauseResumeAll::subtitle() const
 //
 //------------------------------------------------------------------
 
-SchedulerPauseResumeAllUser::SchedulerPauseResumeAllUser()
-{
+SchedulerPauseResumeAllUser::SchedulerPauseResumeAllUser() {}
 
-}
-
-SchedulerPauseResumeAllUser::~SchedulerPauseResumeAllUser()
-{
-
-}
+SchedulerPauseResumeAllUser::~SchedulerPauseResumeAllUser() {}
 
 void SchedulerPauseResumeAllUser::onEnter()
 {
@@ -255,7 +241,7 @@ void SchedulerPauseResumeAllUser::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2(s.width/2, s.height/2));
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
     sprite->setTag(123);
     this->addChild(sprite);
     sprite->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
@@ -287,13 +273,10 @@ void SchedulerPauseResumeAllUser::tick2(float /*dt*/)
 void SchedulerPauseResumeAllUser::pause(float /*dt*/)
 {
     log("Pausing, tick1 and tick2 should be called three times");
-    auto director = Director::getInstance();
+    auto director  = Director::getInstance();
     _pausedTargets = director->getScheduler()->pauseAllTargetsWithMinPriority(Scheduler::PRIORITY_NON_SYSTEM_MIN);
     // because target 'this' has been paused above, so use another node(tag:123) as target
-    getChildByTag(123)->scheduleOnce([this](float dt)
-                                     {
-                                         this->resume(dt);
-                                     }, 2.0f, "test resume");
+    getChildByTag(123)->scheduleOnce([this](float dt) { this->resume(dt); }, 2.0f, "test resume");
 }
 
 void SchedulerPauseResumeAllUser::resume(float /*dt*/)
@@ -313,7 +296,6 @@ std::string SchedulerPauseResumeAllUser::subtitle() const
     return "ticks will pause after 3s, then resume at 5s. See console";
 }
 
-
 //------------------------------------------------------------------
 //
 // SchedulerUnscheduleAll
@@ -377,7 +359,7 @@ void SchedulerUnscheduleAllHard::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2(s.width/2, s.height/2));
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
     this->addChild(sprite);
     sprite->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
 
@@ -392,12 +374,13 @@ void SchedulerUnscheduleAllHard::onEnter()
 
 void SchedulerUnscheduleAllHard::onExit()
 {
-    if(!_actionManagerActive) {
+    if (!_actionManagerActive)
+    {
         // Restore the director's action manager.
         auto director = Director::getInstance();
         director->getScheduler()->scheduleUpdate(director->getActionManager(), Scheduler::PRIORITY_SYSTEM, false);
     }
-    
+
     SchedulerTestLayer::onExit();
 }
 
@@ -449,7 +432,7 @@ void SchedulerUnscheduleAllUserLevel::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2(s.width/2, s.height/2));
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
     this->addChild(sprite);
     sprite->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
 
@@ -554,15 +537,13 @@ void SchedulerSchedulesAndRemove::scheduleAndUnschedule(float /*dt*/)
 // TestNode
 //
 //------------------------------------------------------------------
-void TestNode::initWithString(const std::string& str, int priority)
+void TestNode::initWithString(std::string_view str, int priority)
 {
     _string = str;
     scheduleUpdateWithPriority(priority);
 }
 
-TestNode::~TestNode()
-{
-}
+TestNode::~TestNode() {}
 
 void TestNode::update(float /*dt*/)
 {
@@ -617,10 +598,10 @@ void SchedulerUpdate::removeUpdates(float /*dt*/)
 
     for (auto& c : children)
     {
-        auto obj = static_cast<Ref*>(c);
+        auto obj  = static_cast<Ref*>(c);
         auto node = static_cast<Node*>(obj);
-        
-        if (! node)
+
+        if (!node)
         {
             break;
         }
@@ -659,7 +640,7 @@ void SchedulerUpdateAndCustom::update(float dt)
 
 void SchedulerUpdateAndCustom::tick(float dt)
 {
-    CCLOG("custom selector called:%f",dt);
+    CCLOG("custom selector called:%f", dt);
 }
 
 void SchedulerUpdateAndCustom::stopSelectors(float /*dt*/)
@@ -747,7 +728,7 @@ void RescheduleSelector::schedUpdate(float dt)
     _ticks++;
 
     CCLOG("schedUpdate: %.4f", dt);
-    if ( _ticks > 3 )
+    if (_ticks > 3)
     {
         _interval += 1.0f;
         schedule(CC_SCHEDULE_SELECTOR(RescheduleSelector::schedUpdate), _interval);
@@ -760,7 +741,7 @@ void RescheduleSelector::schedUpdate(float dt)
 void SchedulerDelayAndRepeat::onEnter()
 {
     SchedulerTestLayer::onEnter();
-    schedule(CC_SCHEDULE_SELECTOR(SchedulerDelayAndRepeat::update), 0, 4 , 3.f);
+    schedule(CC_SCHEDULE_SELECTOR(SchedulerDelayAndRepeat::update), 0, 4, 3.f);
     CCLOG("update is scheduled should begin after 3 seconds");
 }
 
@@ -783,9 +764,11 @@ void SchedulerDelayAndRepeat::update(float dt)
 
 ControlSlider* SchedulerTimeScale::sliderCtl()
 {
-    ControlSlider * slider = ControlSlider::create("extensions/sliderTrack2.png","extensions/sliderProgress2.png" ,"extensions/sliderThumb.png");
+    ControlSlider* slider = ControlSlider::create("extensions/sliderTrack2.png", "extensions/sliderProgress2.png",
+                                                  "extensions/sliderThumb.png");
 
-    slider->addTargetWithActionForControlEvents(this, cccontrol_selector(SchedulerTimeScale::sliderAction), Control::EventType::VALUE_CHANGED);
+    slider->addTargetWithActionForControlEvents(this, cccontrol_selector(SchedulerTimeScale::sliderAction),
+                                                Control::EventType::VALUE_CHANGED);
 
     slider->setMinimumValue(-3.0f);
     slider->setMaximumValue(3.0f);
@@ -810,26 +793,26 @@ void SchedulerTimeScale::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     // rotate and jump
-    auto jump1 = JumpBy::create(4, Vec2(-s.width+80,0.0f), 100, 4);
+    auto jump1 = JumpBy::create(4, Vec2(-s.width + 80, 0.0f), 100, 4);
     auto jump2 = jump1->reverse();
-    auto rot1 = RotateBy::create(4, 360*2);
-    auto rot2 = rot1->reverse();
+    auto rot1  = RotateBy::create(4, 360 * 2);
+    auto rot2  = rot1->reverse();
 
     auto seq3_1 = Sequence::create(jump2, jump1, nullptr);
     auto seq3_2 = Sequence::create(rot1, rot2, nullptr);
-    auto spawn = Spawn::create(seq3_1, seq3_2, nullptr);
+    auto spawn  = Spawn::create(seq3_1, seq3_2, nullptr);
     auto action = Repeat::create(spawn, 50);
 
     auto action2 = action->clone();
     auto action3 = action->clone();
 
     auto grossini = Sprite::create("Images/grossini.png");
-    auto tamara = Sprite::create("Images/grossinis_sister1.png");
-    auto kathia = Sprite::create("Images/grossinis_sister2.png");
+    auto tamara   = Sprite::create("Images/grossinis_sister1.png");
+    auto kathia   = Sprite::create("Images/grossinis_sister2.png");
 
-    grossini->setPosition(Vec2(40.0f,80.0f));
-    tamara->setPosition(Vec2(40.0f,80.0f));
-    kathia->setPosition(Vec2(40.0f,80.0f));
+    grossini->setPosition(Vec2(40.0f, 80.0f));
+    tamara->setPosition(Vec2(40.0f, 80.0f));
+    kathia->setPosition(Vec2(40.0f, 80.0f));
 
     addChild(grossini);
     addChild(tamara);
@@ -840,7 +823,7 @@ void SchedulerTimeScale::onEnter()
     kathia->runAction(Speed::create(action3, 1.0f));
 
     auto emitter = ParticleFireworks::create();
-    emitter->setTexture( Director::getInstance()->getTextureCache()->addImage(s_stars1) );
+    emitter->setTexture(Director::getInstance()->getTextureCache()->addImage(s_stars1));
     addChild(emitter);
 
     _sliderCtl = sliderCtl();
@@ -866,21 +849,23 @@ std::string SchedulerTimeScale::subtitle() const
     return "Fast-forward and rewind using scheduler.timeScale";
 }
 
-//TwoSchedulers
+// TwoSchedulers
 
-ControlSlider *TwoSchedulers::sliderCtl()
+ControlSlider* TwoSchedulers::sliderCtl()
 {
-   // auto frame = CGRectMake(12.0f, 12.0f, 120.0f, 7.0f);
-    ControlSlider *slider = ControlSlider::create("extensions/sliderTrack2.png","extensions/sliderProgress2.png" ,"extensions/sliderThumb.png");
-        //[[UISlider alloc] initWithFrame:frame];
-    slider->addTargetWithActionForControlEvents(this, cccontrol_selector(TwoSchedulers::sliderAction), Control::EventType::VALUE_CHANGED);
+    // auto frame = CGRectMake(12.0f, 12.0f, 120.0f, 7.0f);
+    ControlSlider* slider = ControlSlider::create("extensions/sliderTrack2.png", "extensions/sliderProgress2.png",
+                                                  "extensions/sliderThumb.png");
+    //[[UISlider alloc] initWithFrame:frame];
+    slider->addTargetWithActionForControlEvents(this, cccontrol_selector(TwoSchedulers::sliderAction),
+                                                Control::EventType::VALUE_CHANGED);
 
     // in case the parent view draws with a custom color or gradient, use a transparent color
-    //slider.backgroundColor = [UIColor clearColor];
+    // slider.backgroundColor = [UIColor clearColor];
 
     slider->setMinimumValue(0.0f);
     slider->setMaximumValue(2.0f);
-    //slider.continuous = YES;
+    // slider.continuous = YES;
     slider->setValue(1.0f);
 
     return slider;
@@ -890,10 +875,10 @@ void TwoSchedulers::sliderAction(Ref* sender, Control::EventType /*controlEvent*
 {
     float scale;
 
-    ControlSlider *slider = static_cast<ControlSlider*>(sender);
-    scale = slider->getValue();
+    ControlSlider* slider = static_cast<ControlSlider*>(sender);
+    scale                 = slider->getValue();
 
-    if( sender == sliderCtl1 )
+    if (sender == sliderCtl1)
         sched1->setTimeScale(scale);
     else
         sched2->setTimeScale(scale);
@@ -905,19 +890,19 @@ void TwoSchedulers::onEnter()
 
     auto s = Director::getInstance()->getWinSize();
 
-        // rotate and jump
-    auto jump1 = JumpBy::create(4, Vec2(0,0), 100, 4);
+    // rotate and jump
+    auto jump1 = JumpBy::create(4, Vec2(0, 0), 100, 4);
     auto jump2 = jump1->reverse();
 
-    auto seq = Sequence::create(jump2, jump1, nullptr);
+    auto seq    = Sequence::create(jump2, jump1, nullptr);
     auto action = RepeatForever::create(seq);
 
-        //
-        // Center
-        //
+    //
+    // Center
+    //
     auto grossini = Sprite::create("Images/grossini.png");
     addChild(grossini);
-    grossini->setPosition(Vec2(s.width/2,100.0f));
+    grossini->setPosition(Vec2(s.width / 2, 100.0f));
     grossini->runAction(action->clone());
 
     auto defaultScheduler = Director::getInstance()->getScheduler();
@@ -935,7 +920,7 @@ void TwoSchedulers::onEnter()
     actionManager1 = new ActionManager();
     sched1->scheduleUpdate(actionManager1, 0, false);
 
-    for( unsigned int i=0; i < 10; i++ ) 
+    for (unsigned int i = 0; i < 10; i++)
     {
         auto sprite = Sprite::create("Images/grossinis_sister1.png");
 
@@ -943,12 +928,11 @@ void TwoSchedulers::onEnter()
         sprite->setActionManager(actionManager1);
 
         addChild(sprite);
-        sprite->setPosition(Vec2(30+15*i,100.0f));
+        sprite->setPosition(Vec2(30 + 15 * i, 100.0f));
 
         sprite->runAction(action->clone());
     }
 
-
     //
     // Right:
     //
@@ -961,14 +945,15 @@ void TwoSchedulers::onEnter()
     actionManager2 = new ActionManager();
     sched2->scheduleUpdate(actionManager2, 0, false);
 
-    for( unsigned int i=0; i < 10; i++ ) {
+    for (unsigned int i = 0; i < 10; i++)
+    {
         auto sprite = Sprite::create("Images/grossinis_sister2.png");
 
         // IMPORTANT: Set the actionManager running any action
         sprite->setActionManager(actionManager2);
 
         addChild(sprite);
-        sprite->setPosition(Vec2(s.width-30-15*i,100.0f));
+        sprite->setPosition(Vec2(s.width - 30 - 15 * i, 100.0f));
 
         sprite->runAction(action->clone());
     }
@@ -981,10 +966,9 @@ void TwoSchedulers::onEnter()
     sliderCtl2 = sliderCtl();
     addChild(sliderCtl2);
     sliderCtl2->retain();
-    sliderCtl2->setPosition(Vec2(s.width / 4.0f*3.0f, VisibleRect::top().y-20));
+    sliderCtl2->setPosition(Vec2(s.width / 4.0f * 3.0f, VisibleRect::top().y - 20));
 }
 
-
 TwoSchedulers::~TwoSchedulers()
 {
     auto defaultScheduler = Director::getInstance()->getScheduler();
@@ -1018,42 +1002,41 @@ class TestNode2 : public Node
 public:
     CREATE_FUNC(TestNode2);
 
-	~TestNode2() {
-		cocos2d::log("Delete TestNode (should not crash)");
-		this->unscheduleAllCallbacks();
-	}
+    ~TestNode2()
+    {
+        cocos2d::log("Delete TestNode (should not crash)");
+        this->unscheduleAllCallbacks();
+    }
 
-	void update(float /*dt*/) {
-	}
+    void update(float /*dt*/) {}
 };
 
 void SchedulerIssue2268::onEnter()
 {
-	SchedulerTestLayer::onEnter();
-
-	testNode = TestNode2::create();
-	testNode->retain();
-	testNode->schedule(SEL_SCHEDULE(&TestNode::update));
-	this->addChild(testNode);
+    SchedulerTestLayer::onEnter();
 
+    testNode = TestNode2::create();
+    testNode->retain();
+    testNode->schedule(SEL_SCHEDULE(&TestNode::update));
+    this->addChild(testNode);
 
-	this->scheduleOnce(SEL_SCHEDULE(&SchedulerIssue2268::update), 0.25f);
+    this->scheduleOnce(SEL_SCHEDULE(&SchedulerIssue2268::update), 0.25f);
 }
 
 void SchedulerIssue2268::update(float /*dt*/)
 {
-	if ( testNode != nullptr ) {
-		// do something with testNode
-
-		// at some point we are done, pause the nodes actions and schedulers
-		testNode->removeFromParentAndCleanup(false);
+    if (testNode != nullptr)
+    {
+        // do something with testNode
 
-		// at some other point we are completely done with the node and want to clear it
-		testNode->unscheduleAllCallbacks();
-		testNode->release();
-		testNode = nullptr;
+        // at some point we are done, pause the nodes actions and schedulers
+        testNode->removeFromParentAndCleanup(false);
 
-	}
+        // at some other point we are completely done with the node and want to clear it
+        testNode->unscheduleAllCallbacks();
+        testNode->release();
+        testNode = nullptr;
+    }
 }
 SchedulerIssue2268::~SchedulerIssue2268()
 {
@@ -1075,44 +1058,48 @@ std::string SchedulerIssue2268::subtitle() const
 
 void SchedulerIssueWithReschedule::onEnter()
 {
-	SchedulerTestLayer::onEnter();
-    
+    SchedulerTestLayer::onEnter();
+
     Size widgetSize = getContentSize();
-    
+
     auto status_text = Text::create("Checking..", "fonts/Marker Felt.ttf", 18);
     status_text->setColor(Color3B(255, 255, 255));
     status_text->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
     addChild(status_text);
-    
+
     // schedule(callback, target, interval, repeat, delay, paused, key);
     auto verified = std::make_shared<bool>();
-    *verified = false;
-
-	_scheduler->schedule([this, verified](float dt){
-        log("SchedulerIssueWithReschedule - first timer");
-        
-        _scheduler->schedule([verified](float dt){
-            log("SchedulerIssueWithReschedule - second timer. OK");
-            *verified = true;
-        }, this, 0.1f, 0, 0, false, "test_timer");
-        
-    }, this, 0.1f, 0, 0, false, "test_timer");
-    
-    _scheduler->schedule([verified, status_text](float dt){
-        if (*verified)
-        {
-            log("SchedulerIssueWithReschedule - test OK");
-            status_text->setString("OK");
-            status_text->setColor(Color3B(0, 255, 0));
-        }
-        else
-        {
-            log("SchedulerIssueWithReschedule - test failed!");
-            status_text->setString("Failed");
-            status_text->setColor(Color3B(255, 0, 0));
-        }
-
-    }, this, 0.5f, 0, 0, false, "test_verify_timer");
+    *verified     = false;
+
+    _scheduler->schedule(
+        [this, verified](float dt) {
+            log("SchedulerIssueWithReschedule - first timer");
+
+            _scheduler->schedule(
+                [verified](float dt) {
+                    log("SchedulerIssueWithReschedule - second timer. OK");
+                    *verified = true;
+                },
+                this, 0.1f, 0, 0, false, "test_timer");
+        },
+        this, 0.1f, 0, 0, false, "test_timer");
+
+    _scheduler->schedule(
+        [verified, status_text](float dt) {
+            if (*verified)
+            {
+                log("SchedulerIssueWithReschedule - test OK");
+                status_text->setString("OK");
+                status_text->setColor(Color3B(0, 255, 0));
+            }
+            else
+            {
+                log("SchedulerIssueWithReschedule - test failed!");
+                status_text->setString("Failed");
+                status_text->setColor(Color3B(255, 0, 0));
+            }
+        },
+        this, 0.5f, 0, 0, false, "test_verify_timer");
 }
 
 std::string SchedulerIssueWithReschedule::title() const
@@ -1127,10 +1114,7 @@ std::string SchedulerIssueWithReschedule::subtitle() const
 
 // ScheduleCallbackTest
 
-ScheduleCallbackTest::~ScheduleCallbackTest()
-{
-    
-}
+ScheduleCallbackTest::~ScheduleCallbackTest() {}
 
 std::string ScheduleCallbackTest::title() const
 {
@@ -1154,13 +1138,12 @@ static void ScheduleCallbackTest_global_callback(float dt)
 void ScheduleCallbackTest::onEnter()
 {
     SchedulerTestLayer::onEnter();
-    
-    _scheduler->schedule([](float dt){
-        log("In the callback of schedule(lambda, ...), dt = %f", dt);
-    }, this, 1.0f, false, "lambda");
-    
+
+    _scheduler->schedule([](float dt) { log("In the callback of schedule(lambda, ...), dt = %f", dt); }, this, 1.0f,
+                         false, "lambda");
+
     _scheduler->schedule(CC_CALLBACK_1(ScheduleCallbackTest::callback, this), this, 1.0f, false, "member_function");
-    
+
     _scheduler->schedule(ScheduleCallbackTest_global_callback, this, 1.0f, false, "global_function");
 }
 
@@ -1169,7 +1152,6 @@ void ScheduleCallbackTest::callback(float dt)
     log("In the callback of schedule(CC_CALLBACK_1(XXX::member_function), this), this, ...), dt = %f", dt);
 }
 
-
 // ScheduleUpdatePriority
 
 std::string ScheduleUpdatePriority::title() const
@@ -1193,10 +1175,10 @@ bool ScheduleUpdatePriority::onTouchBegan(Touch* /*touch*/, Event* /*event*/)
 void ScheduleUpdatePriority::onEnter()
 {
     SchedulerTestLayer::onEnter();
-    
+
     scheduleUpdate();
 
-    auto listener = EventListenerTouchOneByOne::create();
+    auto listener          = EventListenerTouchOneByOne::create();
     listener->onTouchBegan = CC_CALLBACK_2(ScheduleUpdatePriority::onTouchBegan, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
@@ -1207,9 +1189,7 @@ void ScheduleUpdatePriority::onExit()
     unscheduleUpdate();
 }
 
-void ScheduleUpdatePriority::update(float /*dt*/)
-{
-}
+void ScheduleUpdatePriority::update(float /*dt*/) {}
 
 void SchedulerIssue10232::onEnter()
 {
@@ -1217,9 +1197,8 @@ void SchedulerIssue10232::onEnter()
 
     this->scheduleOnce(SEL_SCHEDULE(&SchedulerIssue2268::update), 0.25f);
 
-    this->scheduleOnce([](float /*dt*/){
-        log("SchedulerIssue10232:Schedules a lambda function");
-    }, 0.25f,"SchedulerIssue10232");
+    this->scheduleOnce([](float /*dt*/) { log("SchedulerIssue10232:Schedules a lambda function"); }, 0.25f,
+                       "SchedulerIssue10232");
 }
 
 void SchedulerIssue10232::update(float /*dt*/)
@@ -1240,7 +1219,7 @@ std::string SchedulerIssue10232::subtitle() const
 void SchedulerRemoveAllFunctionsToBePerformedInCocosThread::onEnter()
 {
     SchedulerTestLayer::onEnter();
-    
+
     _sprite = Sprite::create("Images/grossinis_sister1.png");
     _sprite->setPosition(VisibleRect::center());
     this->addChild(_sprite);
@@ -1253,23 +1232,14 @@ void SchedulerRemoveAllFunctionsToBePerformedInCocosThread::onExit()
     this->unscheduleUpdate();
 }
 
-void SchedulerRemoveAllFunctionsToBePerformedInCocosThread::update(float dt) {
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this] () {
-        _sprite->setVisible(false);
-    });
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this] () {
-        _sprite->setVisible(false);
-    });
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this] () {
-        _sprite->setVisible(false);
-    });
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this] () {
-        _sprite->setVisible(false);
-    });
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this] () {
-        _sprite->setVisible(false);
-    });
-    if(!TestController::getInstance()->isAutoTestRunning())
+void SchedulerRemoveAllFunctionsToBePerformedInCocosThread::update(float dt)
+{
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]() { _sprite->setVisible(false); });
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]() { _sprite->setVisible(false); });
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]() { _sprite->setVisible(false); });
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]() { _sprite->setVisible(false); });
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]() { _sprite->setVisible(false); });
+    if (!TestController::getInstance()->isAutoTestRunning())
         Director::getInstance()->getScheduler()->removeAllFunctionsToBePerformedInCocosThread();
 }
 
@@ -1283,34 +1253,34 @@ std::string SchedulerRemoveAllFunctionsToBePerformedInCocosThread::subtitle() co
     return "Sprite should be visible";
 }
 
-//class SchedulerIssue17149: public SchedulerTestLayer
+// class SchedulerIssue17149: public SchedulerTestLayer
 //{
-//public:
-//    CREATE_FUNC(SchedulerIssue17149);
-//    
-//    virtual std::string title() const override;
-//    void onEnter() override;
-//    void update(float dt) override;
-//    
-//private:
-//    class ClassA
-//    {
-//    public:
-//        void update(float dt);
-//        
-//        int _member1;
-//        int _member2;
-//        int _member3;
-//    };
-//    
-//    class ClassB
-//    {
-//        void update(float dt);
-//        int _member1;
-//        int _member2;
-//        int _member3;
-//    };
-//};
+// public:
+//     CREATE_FUNC(SchedulerIssue17149);
+//
+//     virtual std::string title() const override;
+//     void onEnter() override;
+//     void update(float dt) override;
+//
+// private:
+//     class ClassA
+//     {
+//     public:
+//         void update(float dt);
+//
+//         int _member1;
+//         int _member2;
+//         int _member3;
+//     };
+//
+//     class ClassB
+//     {
+//         void update(float dt);
+//         int _member1;
+//         int _member2;
+//         int _member3;
+//     };
+// };
 
 // SchedulerIssue17149: https://github.com/cocos2d/cocos2d-x/issues/17149
 
@@ -1346,35 +1316,27 @@ void SchedulerIssue17149::update(float dt)
     CCLOG("Address one: %p", classa);
     Director::getInstance()->getScheduler()->scheduleUpdate(classa, 1, false);
     Director::getInstance()->getScheduler()->unscheduleUpdate(classa);
-    
+
     auto classb = new (_memoryPool) ClassB();
     CCLOG("Address one: %p", classb);
     Director::getInstance()->getScheduler()->scheduleUpdate(classb, 1, false);
-    
+
     unscheduleUpdate();
 }
 
-SchedulerIssue17149::ClassA::ClassA()
-: _member1(1)
-, _member2(2)
-, _member3(3)
-{}
+SchedulerIssue17149::ClassA::ClassA() : _member1(1), _member2(2), _member3(3) {}
 
 void SchedulerIssue17149::ClassA::update(float dt)
 {
     CCLOG("i'm ClassA: %d%d%d", _member1, _member2, _member3);
 }
 
-SchedulerIssue17149::ClassB::ClassB()
-: _member1(4)
-, _member2(5)
-, _member3(6)
-{}
+SchedulerIssue17149::ClassB::ClassB() : _member1(4), _member2(5), _member3(6) {}
 
 void SchedulerIssue17149::ClassB::update(float dt)
 {
     CCLOG("i'm ClassB: %d%d%d", _member1, _member2, _member3);
-    
+
     Director::getInstance()->getScheduler()->unscheduleUpdate(this);
 }
 
@@ -1399,7 +1361,7 @@ void SchedulerRemoveEntryWhileUpdate::onEnter()
     SchedulerTestLayer::onEnter();
     for (auto i = 0; i < 500; ++i)
     {
-        TestClass *nextObj = nullptr;
+        TestClass* nextObj = nullptr;
         if (i != 0)
         {
             nextObj = _testvector[i - 1];
@@ -1412,7 +1374,7 @@ void SchedulerRemoveEntryWhileUpdate::onEnter()
 
 void SchedulerRemoveEntryWhileUpdate::onExit()
 {
-    for (auto obj: _testvector)
+    for (auto obj : _testvector)
     {
         getScheduler()->unscheduleUpdate(obj);
         delete obj;
@@ -1421,12 +1383,9 @@ void SchedulerRemoveEntryWhileUpdate::onExit()
     SchedulerTestLayer::onExit();
 }
 
-SchedulerRemoveEntryWhileUpdate::TestClass::TestClass(int index, TestClass *nextObj, cocos2d::Scheduler* scheduler)
-: _nextObj(nextObj)
-, _index(index)
-, _scheduler(scheduler)
-{
-}
+SchedulerRemoveEntryWhileUpdate::TestClass::TestClass(int index, TestClass* nextObj, cocos2d::Scheduler* scheduler)
+    : _nextObj(nextObj), _index(index), _scheduler(scheduler)
+{}
 
 void SchedulerRemoveEntryWhileUpdate::TestClass::update(float dt)
 {
@@ -1435,7 +1394,7 @@ void SchedulerRemoveEntryWhileUpdate::TestClass::update(float dt)
         CCLOG("Error: cleaned object must not be called.");
         return;
     }
-    
+
     if (_index % 50 == 1 && _nextObj != nullptr)
     {
         _scheduler->unscheduleUpdate(_nextObj);
@@ -1463,39 +1422,36 @@ void SchedulerRemoveSelectorDuringCall::onEnter()
 {
     SchedulerTestLayer::onEnter();
 
-    Scheduler* const scheduler( Director::getInstance()->getScheduler() );
-    
-    scheduler->setTimeScale( 10 );
-    scheduler->schedule
-      (SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this,
-       0.01f, CC_REPEAT_FOREVER, 0.0f, !isRunning());
+    Scheduler* const scheduler(Director::getInstance()->getScheduler());
+
+    scheduler->setTimeScale(10);
+    scheduler->schedule(SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this, 0.01f, CC_REPEAT_FOREVER,
+                        0.0f, !isRunning());
 
     _scheduled = true;
 }
 
 void SchedulerRemoveSelectorDuringCall::onExit()
 {
-    Scheduler* const scheduler( Director::getInstance()->getScheduler() );
+    Scheduler* const scheduler(Director::getInstance()->getScheduler());
 
-    scheduler->setTimeScale( 1 );
-    scheduler->unschedule
-      (SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this);
+    scheduler->setTimeScale(1);
+    scheduler->unschedule(SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this);
 
     _scheduled = false;
     SchedulerTestLayer::onExit();
 }
 
-void SchedulerRemoveSelectorDuringCall::callback( float )
+void SchedulerRemoveSelectorDuringCall::callback(float)
 {
-    if ( !_scheduled )
+    if (!_scheduled)
     {
         cocos2d::log("Error: unscheduled callback must not be called.");
         return;
     }
-    
+
     _scheduled = false;
 
-    Scheduler* const scheduler( Director::getInstance()->getScheduler() );
-    scheduler->unschedule
-      (SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this);
+    Scheduler* const scheduler(Director::getInstance()->getScheduler());
+    scheduler->unschedule(SEL_SCHEDULE(&SchedulerRemoveSelectorDuringCall::callback), this);
 }
diff --git a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h
index 4156e2e3b668..4ff67d1b79f8 100644
--- a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h
+++ b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,7 +29,6 @@
 #include "extensions/cocos-ext.h"
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(SchedulerTests);
 
 class SchedulerTestLayer : public TestCase
@@ -48,6 +47,7 @@ class SchedulerAutoremove : public SchedulerTestLayer
 
     void autoremove(float dt);
     void tick(float dt);
+
 private:
     float accum;
 };
@@ -86,6 +86,7 @@ class SchedulerPauseResumeAll : public SchedulerTestLayer
     void pause(float dt);
     using SchedulerTestLayer::resume;
     void resume(float dt);
+
 private:
     std::set<void*> _pausedTargets;
 };
@@ -108,6 +109,7 @@ class SchedulerPauseResumeAllUser : public SchedulerTestLayer
     void pause(float dt);
     using SchedulerTestLayer::resume;
     void resume(float dt);
+
 private:
     std::set<void*> _pausedTargets;
 };
@@ -143,6 +145,7 @@ class SchedulerUnscheduleAllHard : public SchedulerTestLayer
     void tick3(float dt);
     void tick4(float dt);
     void unscheduleAll(float dt);
+
 private:
     bool _actionManagerActive;
 };
@@ -226,8 +229,9 @@ class TestNode : public cocos2d::Node
 
     ~TestNode();
 
-    void initWithString(const std::string& str, int priority);
+    void initWithString(std::string_view str, int priority);
     virtual void update(float dt) override;
+
 private:
     std::string _string;
 };
@@ -242,9 +246,10 @@ class RescheduleSelector : public SchedulerTestLayer
     virtual std::string subtitle() const override;
 
     void schedUpdate(float dt);
+
 private:
     float _interval;
-    int   _ticks;
+    int _ticks;
 };
 
 class SchedulerDelayAndRepeat : public SchedulerTestLayer
@@ -272,7 +277,6 @@ class SchedulerTimeScale : public SchedulerTestLayer
     cocos2d::extension::ControlSlider* _sliderCtl;
 };
 
-
 class TwoSchedulers : public SchedulerTestLayer
 {
 public:
@@ -322,14 +326,14 @@ class ScheduleCallbackTest : public SchedulerTestLayer
 {
 public:
     CREATE_FUNC(ScheduleCallbackTest);
-    
+
     ~ScheduleCallbackTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void onEnter() override;
-    
+
     void callback(float dt);
-    
+
 private:
 };
 
@@ -342,9 +346,9 @@ class ScheduleUpdatePriority : public SchedulerTestLayer
     virtual std::string subtitle() const override;
     void onEnter() override;
     void onExit() override;
-    
+
     virtual void update(float dt) override;
-    
+
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
 };
 
@@ -364,93 +368,94 @@ class SchedulerRemoveAllFunctionsToBePerformedInCocosThread : public SchedulerTe
 {
 public:
     CREATE_FUNC(SchedulerRemoveAllFunctionsToBePerformedInCocosThread);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void onEnter() override;
     void onExit() override;
     void update(float dt) override;
-    
+
 private:
-    cocos2d::Sprite *_sprite;
+    cocos2d::Sprite* _sprite;
 };
 
-class SchedulerIssue17149: public SchedulerTestLayer
+class SchedulerIssue17149 : public SchedulerTestLayer
 {
 public:
     CREATE_FUNC(SchedulerIssue17149);
     SchedulerIssue17149();
     ~SchedulerIssue17149();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void update(float dt) override;
-    
+
 private:
     class ClassA
     {
     public:
         ClassA();
-        
+
         void update(float dt);
-        
+
         int _member1;
         int _member2;
         int _member3;
     };
-    
+
     class ClassB
     {
     public:
         ClassB();
         void update(float dt);
-        
+
         int _member1;
         int _member2;
         int _member3;
     };
-    
-    void *_memoryPool;
+
+    void* _memoryPool;
 };
 
-class SchedulerRemoveEntryWhileUpdate: public SchedulerTestLayer
+class SchedulerRemoveEntryWhileUpdate : public SchedulerTestLayer
 {
 public:
     CREATE_FUNC(SchedulerRemoveEntryWhileUpdate);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
 private:
     class TestClass
     {
     public:
-        TestClass(int index, TestClass *nextObj, cocos2d::Scheduler* scheduler);
+        TestClass(int index, TestClass* nextObj, cocos2d::Scheduler* scheduler);
         void update(float dt);
+
     private:
-        TestClass *_nextObj = nullptr;
-        int _index = 0;
-        cocos2d::Scheduler *_scheduler = nullptr;
-        bool _cleanedUp = false;
+        TestClass* _nextObj            = nullptr;
+        int _index                     = 0;
+        cocos2d::Scheduler* _scheduler = nullptr;
+        bool _cleanedUp                = false;
     };
-    std::vector<TestClass *> _testvector;
+    std::vector<TestClass*> _testvector;
 };
 
-class SchedulerRemoveSelectorDuringCall: public SchedulerTestLayer
+class SchedulerRemoveSelectorDuringCall : public SchedulerTestLayer
 {
 public:
     CREATE_FUNC(SchedulerRemoveSelectorDuringCall);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void onExit() override;
-    
+
 private:
-    void callback( float );
+    void callback(float);
 
 private:
     bool _scheduled;
diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp
index c3c67d0a463f..4638da7eafe5 100644
--- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp
+++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,19 +31,21 @@
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-#define SET_UNIFORM(ps, name, value)  do {   \
-decltype(value) __v = value;                           \
-auto __loc = (ps)->getUniformLocation(name);  \
-(ps)->setUniform(__loc, &__v, sizeof(__v));  \
-} while(false) 
-
-#define SET_TEXTURE(ps, name, idx, value)  do {   \
-auto * __v = value;                           \
-auto __loc = (ps)->getUniformLocation(name);  \
-(ps)->setTexture(__loc, idx, __v);  \
-} while(false) 
-
-
+#define SET_UNIFORM(ps, name, value)                          \
+    do                                                        \
+    {                                                         \
+        decltype(value) __v = value;                          \
+        auto __loc          = (ps)->getUniformLocation(name); \
+        (ps)->setUniform(__loc, &__v, sizeof(__v));           \
+    } while (false)
+
+#define SET_TEXTURE(ps, name, idx, value)            \
+    do                                               \
+    {                                                \
+        auto* __v  = value;                          \
+        auto __loc = (ps)->getUniformLocation(name); \
+        (ps)->setTexture(__loc, idx, __v);           \
+    } while (false)
 
 ShaderTests::ShaderTests()
 {
@@ -61,28 +63,21 @@ ShaderTests::ShaderTests()
 }
 
 ///---------------------------------------
-// 
+//
 // ShaderNode
-// 
+//
 ///---------------------------------------
-enum 
+enum
 {
     SIZE_X = 256,
     SIZE_Y = 256,
 };
 
-ShaderNode::ShaderNode()
-:_center(Vec2(0.0f, 0.0f))
-,_resolution(Vec2(0.0f, 0.0f))
-,_time(0.0f)
-{
-}
+ShaderNode::ShaderNode() : _center(Vec2(0.0f, 0.0f)), _resolution(Vec2(0.0f, 0.0f)), _time(0.0f) {}
 
-ShaderNode::~ShaderNode()
-{
-}
+ShaderNode::~ShaderNode() {}
 
-ShaderNode* ShaderNode::shaderNodeWithVertex(const std::string &vert, const std::string& frag)
+ShaderNode* ShaderNode::shaderNodeWithVertex(std::string_view vert, std::string_view frag)
 {
     auto node = new ShaderNode();
     node->initWithVertex(vert, frag);
@@ -91,28 +86,28 @@ ShaderNode* ShaderNode::shaderNodeWithVertex(const std::string &vert, const std:
     return node;
 }
 
-bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag)
+bool ShaderNode::initWithVertex(std::string_view vert, std::string_view frag)
 {
     _vertFileName = vert;
     _fragFileName = frag;
 
     loadShaderVertex(vert, frag);
 
-    _time = 0;
+    _time       = 0;
     _resolution = Vec2(SIZE_X, SIZE_Y);
 
     scheduleUpdate();
 
     setContentSize(Size(SIZE_X, SIZE_Y));
     setAnchorPoint(Vec2(0.5f, 0.5f));
-    
+
     // init custom command
-    auto layout = _programState->getVertexLayout();
+    auto layout     = _programState->getVertexLayout();
     auto attrPosLoc = _programState->getAttributeLocation("a_position");
     layout->setAttribute("a_position", attrPosLoc, backend::VertexFormat::FLOAT2, 0, false);
 
     float w = SIZE_X, h = SIZE_Y;
-    Vec2 vertices[6] = { Vec2(0.0f,0.0f), Vec2(w,0.0f), Vec2(w,h), Vec2(0.0f,0.0f), Vec2(0.0f,h), Vec2(w,h) };
+    Vec2 vertices[6] = {Vec2(0.0f, 0.0f), Vec2(w, 0.0f), Vec2(w, h), Vec2(0.0f, 0.0f), Vec2(0.0f, h), Vec2(w, h)};
     layout->setLayout(sizeof(Vec2));
 
     /*
@@ -120,7 +115,7 @@ bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag
      *
      * keywords: CC_USE_METAL , CC_USE_GL
      */
-    
+
     _customCommand.createVertexBuffer(sizeof(Vec2), 6, CustomCommand::BufferUsage::STATIC);
     _customCommand.updateVertexBuffer(vertices, sizeof(vertices));
 
@@ -129,23 +124,26 @@ bool ShaderNode::initWithVertex(const std::string &vert, const std::string &frag
     return true;
 }
 
-void ShaderNode::loadShaderVertex(const std::string &vert, const std::string &frag)
+void ShaderNode::loadShaderVertex(std::string_view vert, std::string_view frag)
 {
     auto fileUtiles = FileUtils::getInstance();
 
     // frag
     auto fragmentFilePath = fileUtiles->fullPathForFilename(frag);
-    auto fragSource = fileUtiles->getStringFromFile(fragmentFilePath);
+    auto fragSource       = fileUtiles->getStringFromFile(fragmentFilePath);
 
     // vert
     std::string vertSource;
-    if (vert.empty()) {
-        vertSource = position_vert; 
-    } else {
+    if (vert.empty())
+    {
+        vertSource = position_vert;
+    }
+    else
+    {
         std::string vertexFilePath = fileUtiles->fullPathForFilename(vert);
-        vertSource = fileUtiles->getStringFromFile(vertexFilePath);
+        vertSource                 = fileUtiles->getStringFromFile(vertexFilePath);
     }
-    auto program = backend::Device::getInstance()->newProgram(vertSource.c_str(), fragSource.c_str());
+    auto program      = backend::Device::getInstance()->newProgram(vertSource.c_str(), fragSource.c_str());
     auto programState = new backend::ProgramState(program);
     setProgramState(programState);
     CC_SAFE_RELEASE(programState);
@@ -157,26 +155,26 @@ void ShaderNode::update(float dt)
     _time += dt;
 }
 
-void ShaderNode::setPosition(const Vec2 &newPosition)
+void ShaderNode::setPosition(const Vec2& newPosition)
 {
     Node::setPosition(newPosition);
-    auto position = getPosition();
-    auto frameSize = Director::getInstance()->getOpenGLView()->getFrameSize();
-    auto visibleSize = Director::getInstance()->getVisibleSize();
+    auto position     = getPosition();
+    auto frameSize    = Director::getInstance()->getOpenGLView()->getFrameSize();
+    auto visibleSize  = Director::getInstance()->getVisibleSize();
     auto retinaFactor = Director::getInstance()->getOpenGLView()->getRetinaFactor();
-    _center = Vec2(position.x * frameSize.width / visibleSize.width * retinaFactor, position.y * frameSize.height / visibleSize.height * retinaFactor);
+    _center           = Vec2(position.x * frameSize.width / visibleSize.width * retinaFactor,
+                             position.y * frameSize.height / visibleSize.height * retinaFactor);
 }
 
-void ShaderNode::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void ShaderNode::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     _customCommand.init(_globalZOrder, transform, flags);
-    
+
     _programState->setUniform(_locResolution, &_resolution, sizeof(_resolution));
     _programState->setUniform(_locCenter, &_center, sizeof(_center));
 
-
     auto projectionMatrix = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-    auto finalMatrix = projectionMatrix * transform;
+    auto finalMatrix      = projectionMatrix * transform;
 
     _programState->setUniform(_locMVP, finalMatrix.m, sizeof(finalMatrix.m));
 
@@ -195,28 +193,26 @@ void ShaderNode::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
 
 void ShaderNode::updateUniforms()
 {
-    if(_programState == nullptr)
+    if (_programState == nullptr)
         return;
 
-    _locResolution  = _programState->getUniformLocation("resolution");
-    _locCenter      = _programState->getUniformLocation("center");
-    _locMVP         = _programState->getUniformLocation("u_MVPMatrix");
-    _locTime        = _programState->getUniformLocation("u_Time");
-    _locSinTime     = _programState->getUniformLocation("u_SinTime");
-    _locCosTime     = _programState->getUniformLocation("u_CosTime");
-    _locScreenSize  = _programState->getUniformLocation("u_screenSize");
-    
-    const Vec2& frameSize = Director::getInstance()->getOpenGLView()->getFrameSize();
-    float retinaFactor = Director::getInstance()->getOpenGLView()->getRetinaFactor();
+    _locResolution = _programState->getUniformLocation("resolution");
+    _locCenter     = _programState->getUniformLocation("center");
+    _locMVP        = _programState->getUniformLocation("u_MVPMatrix");
+    _locTime       = _programState->getUniformLocation("u_Time");
+    _locSinTime    = _programState->getUniformLocation("u_SinTime");
+    _locCosTime    = _programState->getUniformLocation("u_CosTime");
+    _locScreenSize = _programState->getUniformLocation("u_screenSize");
+
+    const Vec2& frameSize   = Director::getInstance()->getOpenGLView()->getFrameSize();
+    float retinaFactor      = Director::getInstance()->getOpenGLView()->getRetinaFactor();
     auto screenSizeInPixels = frameSize * retinaFactor;
     _programState->setUniform(_locScreenSize, &screenSizeInPixels, sizeof(screenSizeInPixels));
 }
 
 /// ShaderMonjori
 
-ShaderMonjori::ShaderMonjori()
-{
-}
+ShaderMonjori::ShaderMonjori() {}
 
 bool ShaderMonjori::init()
 {
@@ -225,7 +221,7 @@ bool ShaderMonjori::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Monjori.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
 
@@ -245,11 +241,8 @@ std::string ShaderMonjori::subtitle() const
     return "Monjori plane deformations";
 }
 
-
 /// ShaderMandelbrot
-ShaderMandelbrot::ShaderMandelbrot()
-{
-}
+ShaderMandelbrot::ShaderMandelbrot() {}
 
 bool ShaderMandelbrot::init()
 {
@@ -258,12 +251,12 @@ bool ShaderMandelbrot::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Mandelbrot.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
         return true;
     }
-    
+
     return false;
 }
 
@@ -278,9 +271,7 @@ std::string ShaderMandelbrot::subtitle() const
 }
 
 /// ShaderJulia
-ShaderJulia::ShaderJulia()
-{
-}
+ShaderJulia::ShaderJulia() {}
 
 bool ShaderJulia::init()
 {
@@ -289,7 +280,7 @@ bool ShaderJulia::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Julia.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
         return true;
@@ -308,11 +299,8 @@ std::string ShaderJulia::subtitle() const
     return "Julia shader";
 }
 
-
 /// ShaderHeart
-ShaderHeart::ShaderHeart()
-{
-}
+ShaderHeart::ShaderHeart() {}
 
 bool ShaderHeart::init()
 {
@@ -321,7 +309,7 @@ bool ShaderHeart::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Heart.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
 
@@ -342,9 +330,7 @@ std::string ShaderHeart::subtitle() const
 }
 
 /// ShaderFlower
-ShaderFlower::ShaderFlower()
-{
-}
+ShaderFlower::ShaderFlower() {}
 
 bool ShaderFlower::init()
 {
@@ -353,7 +339,7 @@ bool ShaderFlower::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Flower.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
 
@@ -374,9 +360,7 @@ std::string ShaderFlower::subtitle() const
 }
 
 /// ShaderPlasma
-ShaderPlasma::ShaderPlasma()
-{
-}
+ShaderPlasma::ShaderPlasma() {}
 
 bool ShaderPlasma::init()
 {
@@ -385,7 +369,7 @@ bool ShaderPlasma::init()
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/example_Plasma.fsh");
 
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(sn);
 
@@ -411,10 +395,10 @@ class SpriteBlur : public Sprite
 {
 public:
     ~SpriteBlur();
-    bool initWithTexture(Texture2D* texture, const Rect&  rect);
+    bool initWithTexture(Texture2D* texture, const Rect& rect);
     void initProgram();
 
-    static SpriteBlur* create(const char *pszFileName);
+    static SpriteBlur* create(const char* pszFileName);
     void setBlurRadius(float radius);
     void setBlurSampleNum(float num);
 
@@ -423,14 +407,12 @@ class SpriteBlur : public Sprite
     float _blurSampleNum;
 };
 
-SpriteBlur::~SpriteBlur()
-{
-}
+SpriteBlur::~SpriteBlur() {}
 
-SpriteBlur* SpriteBlur::create(const char *pszFileName)
+SpriteBlur* SpriteBlur::create(const char* pszFileName)
 {
     SpriteBlur* pRet = new SpriteBlur();
-    bool result = pRet->initWithFile("");
+    bool result      = pRet->initWithFile("");
     cocos2d::log("Test call Sprite::initWithFile with bad file name result is : %s", result ? "true" : "false");
 
     if (pRet->initWithFile(pszFileName))
@@ -441,23 +423,22 @@ SpriteBlur* SpriteBlur::create(const char *pszFileName)
     {
         CC_SAFE_DELETE(pRet);
     }
-    
+
     return pRet;
 }
 
 bool SpriteBlur::initWithTexture(Texture2D* texture, const Rect& rect)
 {
     _blurRadius = 0;
-    if( Sprite::initWithTexture(texture, rect) ) 
+    if (Sprite::initWithTexture(texture, rect))
     {
 #if CC_ENABLE_CACHE_TEXTURE_DATA
-        auto listener = EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom* event){
-                initProgram();
-            });
+        auto listener =
+            EventListenerCustom::create(EVENT_RENDERER_RECREATED, [this](EventCustom* event) { initProgram(); });
 
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 #endif
-        
+
         initProgram();
 
         return true;
@@ -471,18 +452,19 @@ void SpriteBlur::initProgram()
     std::string fragSource = FileUtils::getInstance()->getStringFromFile(
         FileUtils::getInstance()->fullPathForFilename("Shaders/example_Blur.fsh"));
 
-    auto program = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource.data());
+    auto program      = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource.data());
     auto programState = new backend::ProgramState(program);
     setProgramState(programState);
     CC_SAFE_RELEASE(programState);
     CC_SAFE_RELEASE(program);
-    
+
     auto size = getTexture()->getContentSizeInPixels();
 
     SET_UNIFORM(_programState, "resolution", size);
     SET_UNIFORM(_programState, "blurRadius", _blurRadius);
     SET_UNIFORM(_programState, "sampleNum", 7.0f);
-    SET_UNIFORM(_programState, "u_PMatrix", Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION));
+    SET_UNIFORM(_programState, "u_PMatrix",
+                Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION));
 }
 
 void SpriteBlur::setBlurRadius(float radius)
@@ -499,9 +481,7 @@ void SpriteBlur::setBlurSampleNum(float num)
 
 // ShaderBlur
 
-ShaderBlur::ShaderBlur()
-{
-}
+ShaderBlur::ShaderBlur() {}
 
 std::string ShaderBlur::title() const
 {
@@ -510,67 +490,70 @@ std::string ShaderBlur::title() const
 
 std::string ShaderBlur::subtitle() const
 {
-     return "Gaussian blur";
+    return "Gaussian blur";
 }
 
 void ShaderBlur::createSliderCtls()
 {
     auto screenSize = Director::getInstance()->getWinSize();
-    
+
     {
-        ControlSlider *slider = ControlSlider::create("extensions/sliderTrack.png","extensions/sliderProgress.png" ,"extensions/sliderThumb.png");
+        ControlSlider* slider = ControlSlider::create("extensions/sliderTrack.png", "extensions/sliderProgress.png",
+                                                      "extensions/sliderThumb.png");
         slider->setAnchorPoint(Vec2(0.5f, 1.0f));
         slider->setMinimumValue(0.0f);
         slider->setMaximumValue(25.0f);
         slider->setScale(0.6f);
         slider->setPosition(Vec2(screenSize.width / 4.0f, screenSize.height / 3.0f + 24.0f));
-        slider->addTargetWithActionForControlEvents(this, cccontrol_selector(ShaderBlur::onRadiusChanged), Control::EventType::VALUE_CHANGED);
+        slider->addTargetWithActionForControlEvents(this, cccontrol_selector(ShaderBlur::onRadiusChanged),
+                                                    Control::EventType::VALUE_CHANGED);
         slider->setValue(2.0f);
         addChild(slider);
         _sliderRadiusCtl = slider;
-        
+
         auto label = Label::createWithTTF("Blur Radius", "fonts/arial.ttf", 12.0f);
         addChild(label);
         label->setPosition(Vec2(screenSize.width / 4.0f, screenSize.height / 3.0f));
     }
-    
+
     {
-        ControlSlider *slider = ControlSlider::create("extensions/sliderTrack.png","extensions/sliderProgress.png" ,"extensions/sliderThumb.png");
+        ControlSlider* slider = ControlSlider::create("extensions/sliderTrack.png", "extensions/sliderProgress.png",
+                                                      "extensions/sliderThumb.png");
         slider->setAnchorPoint(Vec2(0.5f, 1.0f));
         slider->setMinimumValue(0.0f);
         slider->setMaximumValue(11.0f);
         slider->setScale(0.6f);
         slider->setPosition(Vec2(screenSize.width / 4.0f, screenSize.height / 3.0f - 10.0f));
-        slider->addTargetWithActionForControlEvents(this, cccontrol_selector(ShaderBlur::onSampleNumChanged), Control::EventType::VALUE_CHANGED);
+        slider->addTargetWithActionForControlEvents(this, cccontrol_selector(ShaderBlur::onSampleNumChanged),
+                                                    Control::EventType::VALUE_CHANGED);
         slider->setValue(7.0f);
         addChild(slider);
         _sliderNumCtrl = slider;
-        
+
         auto label = Label::createWithTTF("Blur Sample Num", "fonts/arial.ttf", 12.0f);
         addChild(label);
         label->setPosition(Vec2(screenSize.width / 4.0f, screenSize.height / 3.0f - 34.0f));
     }
- 
 }
 
 bool ShaderBlur::init()
 {
-    if( ShaderTestDemo::init() ) 
+    if (ShaderTestDemo::init())
     {
         _blurSprite = SpriteBlur::create("Images/grossini.png");
         auto sprite = Sprite::create("Images/grossini.png");
-        auto s = Director::getInstance()->getWinSize();
-        _blurSprite->setPosition(Vec2(s.width/3, s.height/2 + 30.0f));
-        sprite->setPosition(Vec2(2*s.width/3, s.height/2 + 30.0f));
+        auto s      = Director::getInstance()->getWinSize();
+        _blurSprite->setPosition(Vec2(s.width / 3, s.height / 2 + 30.0f));
+        sprite->setPosition(Vec2(2 * s.width / 3, s.height / 2 + 30.0f));
 
         addChild(_blurSprite);
         addChild(sprite);
-        
+
         auto label = Label::createWithTTF("Normal Sprite", "fonts/arial.ttf", 12.0f);
         addChild(label);
-        label->setPosition(Vec2(2*s.width/3, s.height/3.0f));
+        label->setPosition(Vec2(2 * s.width / 3, s.height / 3.0f));
         createSliderCtls();
-        
+
         return true;
     }
 
@@ -591,36 +574,34 @@ void ShaderBlur::onSampleNumChanged(Ref* sender, Control::EventType)
 
 // ShaderRetroEffect
 
-ShaderRetroEffect::ShaderRetroEffect()
-: _label(nullptr)
-, _accum(0.0f)
-{
-}
+ShaderRetroEffect::ShaderRetroEffect() : _label(nullptr), _accum(0.0f) {}
 
 bool ShaderRetroEffect::init()
 {
-    if( ShaderTestDemo::init() ) {
-        
-        auto fragStr = FileUtils::getInstance()->getStringFromFile(FileUtils::getInstance()->fullPathForFilename("Shaders/example_HorizontalColor.fsh"));
-        char * fragSource = (char*)fragStr.c_str();
+    if (ShaderTestDemo::init())
+    {
+
+        auto fragStr = FileUtils::getInstance()->getStringFromFile(
+            FileUtils::getInstance()->fullPathForFilename("Shaders/example_HorizontalColor.fsh"));
+        char* fragSource = (char*)fragStr.c_str();
 
-        auto program = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource);
-        auto p = new backend::ProgramState(program);
+        auto program  = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource);
+        auto p        = new backend::ProgramState(program);
         auto director = Director::getInstance();
         const auto& screenSizeLocation = p->getUniformLocation("u_screenSize");
-        const auto& frameSize = director->getOpenGLView()->getFrameSize();
-        float retinaFactor = director->getOpenGLView()->getRetinaFactor();
-        auto screenSizeInPixels = frameSize * retinaFactor;
+        const auto& frameSize          = director->getOpenGLView()->getFrameSize();
+        float retinaFactor             = director->getOpenGLView()->getRetinaFactor();
+        auto screenSizeInPixels        = frameSize * retinaFactor;
         p->setUniform(screenSizeLocation, &screenSizeInPixels, sizeof(screenSizeInPixels));
-        
+
         auto s = director->getWinSize();
 
-        _label = Label::createWithBMFont("fonts/west_england-64.fnt","RETRO EFFECT");
+        _label = Label::createWithBMFont("fonts/west_england-64.fnt", "RETRO EFFECT");
         _label->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         _label->setProgramState(p);
         CC_SAFE_RELEASE(p);
 
-        _label->setPosition(Vec2(s.width/2,s.height/2));
+        _label->setPosition(Vec2(s.width / 2, s.height / 2));
 
         addChild(_label);
 
@@ -642,11 +623,11 @@ void ShaderRetroEffect::update(float dt)
         if (sprite != nullptr)
         {
             auto oldPosition = sprite->getPosition();
-            sprite->setPosition(Vec2( oldPosition.x, sinf( _accum * 2 + i/2.0) * 20  ));
-            
+            sprite->setPosition(Vec2(oldPosition.x, sinf(_accum * 2 + i / 2.0) * 20));
+
             // add fabs() to prevent negative scaling
-            float scaleY = ( sinf( _accum * 2 + i/2.0 + 0.707) );
-            
+            float scaleY = (sinf(_accum * 2 + i / 2.0 + 0.707));
+
             sprite->setScaleY(scaleY);
         }
     }
@@ -662,10 +643,7 @@ std::string ShaderRetroEffect::subtitle() const
     return "sin() effect with moving colors";
 }
 
-
-ShaderLensFlare::ShaderLensFlare()
-{
-}
+ShaderLensFlare::ShaderLensFlare() {}
 
 std::string ShaderLensFlare::title() const
 {
@@ -682,24 +660,22 @@ bool ShaderLensFlare::init()
     if (ShaderTestDemo::init())
     {
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/shadertoy_LensFlare.fsh");
-        
+
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
-        sn->setContentSize(Size(s.width/2,s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
+        sn->setContentSize(Size(s.width / 2, s.height / 2));
         addChild(sn);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 //
 // ShaderGlow
 //
-ShaderGlow::ShaderGlow()
-{
-}
+ShaderGlow::ShaderGlow() {}
 
 std::string ShaderGlow::title() const
 {
@@ -716,24 +692,22 @@ bool ShaderGlow::init()
     if (ShaderTestDemo::init())
     {
         auto sn = ShaderNode::shaderNodeWithVertex("", "Shaders/shadertoy_Glow.fsh");
-        
+
         auto s = Director::getInstance()->getWinSize();
-        sn->setPosition(Vec2(s.width/2, s.height/2));
-        sn->setContentSize(Size(s.width/2,s.height/2));
+        sn->setPosition(Vec2(s.width / 2, s.height / 2));
+        sn->setContentSize(Size(s.width / 2, s.height / 2));
         addChild(sn);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 //
 // ShaderMultiTexture
 //
-ShaderMultiTexture::ShaderMultiTexture():_changedTextureId(0)
-{
-}
+ShaderMultiTexture::ShaderMultiTexture() : _changedTextureId(0) {}
 
 std::string ShaderMultiTexture::title() const
 {
@@ -759,12 +733,11 @@ ui::Slider* ShaderMultiTexture::createSliderCtl()
     addChild(slider);
 
     slider->addEventListener([&](Ref* sender, ui::Slider::EventType type) {
-
         if (type == ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
         {
             ui::Slider* slider = dynamic_cast<ui::Slider*>(sender);
-            float p = slider->getPercent() / 100.0f;
-            auto state = _sprite->getProgramState();
+            float p            = slider->getPercent() / 100.0f;
+            auto state         = _sprite->getProgramState();
             SET_UNIFORM(state, "u_interpolate", p);
         }
     });
@@ -780,36 +753,35 @@ bool ShaderMultiTexture::init()
         // Left: normal sprite
         auto left = Sprite::create("Images/grossinis_sister1.png");
         addChild(left);
-        left->setPosition(s.width*1/4, s.height/2);
+        left->setPosition(s.width * 1 / 4, s.height / 2);
 
         // Right: normal sprite
         auto right = Sprite::create("Images/grossinis_sister2.png");
         addChild(right, 0, rightSpriteTag);
-        right->setPosition(s.width*3/4, s.height/2);
-
+        right->setPosition(s.width * 3 / 4, s.height / 2);
 
         // Center: MultiTexture
         _sprite = Sprite::createWithTexture(left->getTexture());
         addChild(_sprite);
-        _sprite->setPosition(Vec2(s.width/2, s.height/2));
+        _sprite->setPosition(Vec2(s.width / 2, s.height / 2));
 
-        auto * fu = FileUtils::getInstance();
-        auto vertexShader = fu->getStringFromFile("Shaders/example_MultiTexture.vsh");
+        auto* fu            = FileUtils::getInstance();
+        auto vertexShader   = fu->getStringFromFile("Shaders/example_MultiTexture.vsh");
         auto fragmentShader = fu->getStringFromFile("Shaders/example_MultiTexture.fsh");
-        auto program = backend::Device::getInstance()->newProgram(vertexShader.c_str(), fragmentShader.c_str());
-        auto programState = new backend::ProgramState(program);
+        auto program        = backend::Device::getInstance()->newProgram(vertexShader.c_str(), fragmentShader.c_str());
+        auto programState   = new backend::ProgramState(program);
         _sprite->setProgramState(programState);
 
-        SET_TEXTURE(programState, "u_texture1", 1,  right->getTexture()->getBackendTexture());
-        SET_UNIFORM(programState, "u_interpolate",0.5f);
+        SET_TEXTURE(programState, "u_texture1", 1, right->getTexture()->getBackendTexture());
+        SET_UNIFORM(programState, "u_interpolate", 0.5f);
 
         // slider
         createSliderCtl();
-        
+
         // menu
         auto label = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "change");
-        auto mi = MenuItemLabel::create(label, CC_CALLBACK_1(ShaderMultiTexture::changeTexture, this));
-        auto menu = Menu::create(mi, nullptr);
+        auto mi    = MenuItemLabel::create(label, CC_CALLBACK_1(ShaderMultiTexture::changeTexture, this));
+        auto menu  = Menu::create(mi, nullptr);
         addChild(menu);
         menu->setPosition(s.width * 7 / 8, s.height / 2);
 
@@ -823,13 +795,11 @@ bool ShaderMultiTexture::init()
 
 void ShaderMultiTexture::changeTexture(Ref*)
 {
-    static const int textureFilesCount = 3;
-    static const std::string textureFiles[textureFilesCount] = {
-        "Images/grossini.png",
-        "Images/grossinis_sister1.png",
-        "Images/grossinis_sister2.png"
-    };
-    auto texture = Director::getInstance()->getTextureCache()->addImage(textureFiles[_changedTextureId++ % textureFilesCount]);
+    static const int textureFilesCount                       = 3;
+    static const std::string textureFiles[textureFilesCount] = {"Images/grossini.png", "Images/grossinis_sister1.png",
+                                                                "Images/grossinis_sister2.png"};
+    auto texture =
+        Director::getInstance()->getTextureCache()->addImage(textureFiles[_changedTextureId++ % textureFilesCount]);
     Sprite* right = dynamic_cast<Sprite*>(getChildByTag(rightSpriteTag));
     right->setTexture(texture);
     auto programState = _sprite->getProgramState();
diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h
index fba81f198de2..de6b78e69f92 100644
--- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h
+++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -114,7 +114,7 @@ class ShaderBlur : public ShaderTestDemo
     void createSliderCtls();
     void onRadiusChanged(cocos2d::Ref* sender, cocos2d::extension::Control::EventType controlEvent);
     void onSampleNumChanged(cocos2d::Ref* sender, cocos2d::extension::Control::EventType controlEvent);
-    
+
 protected:
     SpriteBlur* _blurSprite;
     cocos2d::extension::ControlSlider* _sliderRadiusCtl;
@@ -130,31 +130,33 @@ class ShaderRetroEffect : public ShaderTestDemo
     virtual std::string subtitle() const override;
     virtual bool init() override;
     virtual void update(float dt) override;
+
 protected:
     cocos2d::Label* _label;
-    float           _accum;
+    float _accum;
 };
 
 class ShaderNode : public cocos2d::Node
 {
 public:
     CREATE_FUNC(ShaderNode);
-    static ShaderNode* shaderNodeWithVertex(const std::string &vert, const std::string &frag);
+    static ShaderNode* shaderNodeWithVertex(std::string_view vert, std::string_view frag);
 
     virtual void update(float dt) override;
-    virtual void setPosition(const cocos2d::Vec2 &newPosition) override;
+    virtual void setPosition(const cocos2d::Vec2& newPosition) override;
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
 
 protected:
     ShaderNode();
     ~ShaderNode();
 
-    bool initWithVertex(const std::string &vert, const std::string &frag);
-    void loadShaderVertex(const std::string &vert, const std::string &frag);
+    bool initWithVertex(std::string_view vert, std::string_view frag);
+    void loadShaderVertex(std::string_view vert, std::string_view frag);
 
-    virtual bool setProgramState(cocos2d::backend::ProgramState *programState, bool needsRetain = true) override
+    virtual bool setProgramState(cocos2d::backend::ProgramState* programState, bool needsRetain = true) override
     {
-        if (Node::setProgramState(programState, needsRetain)) {
+        if (Node::setProgramState(programState, needsRetain))
+        {
             _customCommand.getPipelineDescriptor().programState = programState;
             updateUniforms();
             return true;
@@ -164,20 +166,20 @@ class ShaderNode : public cocos2d::Node
 
     void updateUniforms();
 
-    cocos2d::Vec2                   _center;
-    cocos2d::Vec2                   _resolution;
-    float                           _time;
-    std::string                     _vertFileName;
-    std::string                     _fragFileName;
-    cocos2d::CustomCommand          _customCommand;
-
-    cocos2d::backend::UniformLocation   _locResolution;
-    cocos2d::backend::UniformLocation   _locCenter;
-    cocos2d::backend::UniformLocation   _locMVP;
-    cocos2d::backend::UniformLocation   _locTime;
-    cocos2d::backend::UniformLocation   _locSinTime;
-    cocos2d::backend::UniformLocation   _locCosTime;
-    cocos2d::backend::UniformLocation   _locScreenSize;
+    cocos2d::Vec2 _center;
+    cocos2d::Vec2 _resolution;
+    float _time;
+    std::string _vertFileName;
+    std::string _fragFileName;
+    cocos2d::CustomCommand _customCommand;
+
+    cocos2d::backend::UniformLocation _locResolution;
+    cocos2d::backend::UniformLocation _locCenter;
+    cocos2d::backend::UniformLocation _locMVP;
+    cocos2d::backend::UniformLocation _locTime;
+    cocos2d::backend::UniformLocation _locSinTime;
+    cocos2d::backend::UniformLocation _locCosTime;
+    cocos2d::backend::UniformLocation _locScreenSize;
 };
 
 class ShaderLensFlare : public ShaderTestDemo
@@ -185,7 +187,7 @@ class ShaderLensFlare : public ShaderTestDemo
 public:
     CREATE_FUNC(ShaderLensFlare);
     ShaderLensFlare();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual bool init() override;
@@ -196,7 +198,7 @@ class ShaderGlow : public ShaderTestDemo
 public:
     CREATE_FUNC(ShaderGlow);
     ShaderGlow();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual bool init() override;
@@ -205,6 +207,7 @@ class ShaderGlow : public ShaderTestDemo
 class ShaderMultiTexture : public ShaderTestDemo
 {
     static const int rightSpriteTag = 2014;
+
 public:
     CREATE_FUNC(ShaderMultiTexture);
     ShaderMultiTexture();
@@ -217,4 +220,3 @@ class ShaderMultiTexture : public ShaderTestDemo
     virtual std::string subtitle() const override;
     virtual bool init() override;
 };
-
diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.vsh.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.vsh.h
index d86799574a0e..ff57caebb0af 100644
--- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.vsh.h
+++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.vsh.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,14 +22,11 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#define STRINGIFY(A)  #A
+#define STRINGIFY(A) #A
 static const char* shadertestvsh = STRINGIFY(
 
-attribute vec4 a_position;
-                                             
-void main()
-{
-    gl_Position = CC_MVPMatrix * a_position;
-}
+    attribute vec4 a_position;
+
+    void main() { gl_Position = CC_MVPMatrix * a_position; }
 
 );
diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp
index 6d0d55c45df8..aad7e72045ab 100644
--- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp
+++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp
@@ -32,18 +32,21 @@
 
 USING_NS_CC;
 
-#define SET_UNIFORM(ps, name, value)  do {   \
-decltype(value) __v = value;                           \
-auto __loc = (ps)->getUniformLocation(name);  \
-(ps)->setUniform(__loc, &__v, sizeof(__v));  \
-} while(false) 
-
-#define SET_TEXTURE(ps, name, idx, value)  do {   \
-auto * __v = value;                           \
-auto __loc = (ps)->getUniformLocation(name);  \
-(ps)->setTexture(__loc, idx, __v);  \
-} while(false) 
-
+#define SET_UNIFORM(ps, name, value)                          \
+    do                                                        \
+    {                                                         \
+        decltype(value) __v = value;                          \
+        auto __loc          = (ps)->getUniformLocation(name); \
+        (ps)->setUniform(__loc, &__v, sizeof(__v));           \
+    } while (false)
+
+#define SET_TEXTURE(ps, name, idx, value)            \
+    do                                               \
+    {                                                \
+        auto* __v  = value;                          \
+        auto __loc = (ps)->getUniformLocation(name); \
+        (ps)->setTexture(__loc, idx, __v);           \
+    } while (false)
 
 Shader2Tests::Shader2Tests()
 {
@@ -54,13 +57,13 @@ Shader2Tests::Shader2Tests()
 //
 // EffectSprite
 //
-static int tuple_sort( const std::tuple<ssize_t,Effect*,QuadCommand> &tuple1, const std::tuple<ssize_t,Effect*,QuadCommand> &tuple2 )
+static int tuple_sort(const std::tuple<ssize_t, Effect*, QuadCommand>& tuple1,
+                      const std::tuple<ssize_t, Effect*, QuadCommand>& tuple2)
 {
     return std::get<0>(tuple1) < std::get<0>(tuple2);
 }
 
-
-static void updateUniforms(backend::ProgramState *programState)
+static void updateUniforms(backend::ProgramState* programState)
 {
     float time = Director::getInstance()->getTotalFrames() * Director::getInstance()->getAnimationInterval();
     Vec4 uTime(time / 10.0f, time, time * 2.0f, time * 4.0f);
@@ -76,9 +79,11 @@ class Effect;
 class EffectSprite : public Sprite
 {
 public:
-    static EffectSprite *create(const std::string& filename) {
+    static EffectSprite* create(std::string_view filename)
+    {
         auto ret = new EffectSprite;
-        if(ret->initWithFile(filename)) {
+        if (ret->initWithFile(filename))
+        {
             ret->autorelease();
             return ret;
         }
@@ -86,8 +91,10 @@ class EffectSprite : public Sprite
         return nullptr;
     }
 
-    void setEffect(Effect* effect) {
-        if(_defaultEffect != effect) {
+    void setEffect(Effect* effect)
+    {
+        if (_defaultEffect != effect)
+        {
             effect->setTarget(this);
 
             CC_SAFE_RELEASE(_defaultEffect);
@@ -97,34 +104,37 @@ class EffectSprite : public Sprite
             setProgramState(_defaultEffect->getProgramState());
         }
     }
-    void addEffect(Effect *effect, ssize_t order) {
+    void addEffect(Effect* effect, ssize_t order)
+    {
         effect->retain();
         effect->setTarget(this);
 
-        _effects.push_back(std::make_tuple(order,effect,QuadCommand()));
+        _effects.push_back(std::make_tuple(order, effect, QuadCommand()));
 
         std::sort(std::begin(_effects), std::end(_effects), tuple_sort);
     }
 
-    void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override
+    void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override
     {
 #if CC_USE_CULLING
         // Don't do calculate the culling if the transform was not updated
-        _insideBounds = (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
+        _insideBounds =
+            (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
 
-        if(_insideBounds)
+        if (_insideBounds)
 #endif
         {
             // negative effects: order < 0
-            int idx=0;
-            for(auto &effect : _effects) {
+            int idx = 0;
+            for (auto& effect : _effects)
+            {
 
-                if(std::get<0>(effect) >=0)
+                if (std::get<0>(effect) >= 0)
                     break;
                 auto* programState = std::get<1>(effect)->getProgramState();
                 if (programState)
                 {
-                    QuadCommand &q = std::get<2>(effect);
+                    QuadCommand& q = std::get<2>(effect);
                     q.init(_globalZOrder, _texture, _blendFunc, &_quad, 1, transform, flags);
                     updateUniforms(programState);
                     renderer->addCommand(&q);
@@ -139,8 +149,9 @@ class EffectSprite : public Sprite
             renderer->addCommand(&_trianglesCommand);
 
             // positive effects: order >= 0
-            for(auto it = std::begin(_effects)+idx; it != std::end(_effects); ++it) {
-                QuadCommand &q = std::get<2>(*it);
+            for (auto it = std::begin(_effects) + idx; it != std::end(_effects); ++it)
+            {
+                QuadCommand& q     = std::get<2>(*it);
                 auto* programState = std::get<1>(*it)->getProgramState();
                 updateUniforms(programState);
                 q.init(_globalZOrder, _texture, _blendFunc, &_quad, 1, transform, flags);
@@ -150,19 +161,19 @@ class EffectSprite : public Sprite
             }
         }
     }
+
 protected:
-    EffectSprite() : _defaultEffect(nullptr)
+    EffectSprite() : _defaultEffect(nullptr) { _effects.reserve(2); }
+    ~EffectSprite()
     {
-        _effects.reserve(2);
-    }
-    ~EffectSprite() {
-        for(auto &tuple : _effects) {
+        for (auto& tuple : _effects)
+        {
             std::get<1>(tuple)->release();
         }
         CC_SAFE_RELEASE(_defaultEffect);
     }
 
-    std::vector<std::tuple<ssize_t,Effect*,QuadCommand>> _effects;
+    std::vector<std::tuple<ssize_t, Effect*, QuadCommand>> _effects;
     Effect* _defaultEffect;
 };
 
@@ -170,16 +181,16 @@ class EffectSprite : public Sprite
 // Effect
 //
 
-bool Effect::initProgramState(const std::string &fragmentFilename)
+bool Effect::initProgramState(std::string_view fragmentFilename)
 {
-    auto fileUtiles = FileUtils::getInstance();
+    auto fileUtiles       = FileUtils::getInstance();
     auto fragmentFullPath = fileUtiles->fullPathForFilename(fragmentFilename);
-    auto fragSource = fileUtiles->getStringFromFile(fragmentFullPath);
-    
+    auto fragSource       = fileUtiles->getStringFromFile(fragmentFullPath);
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     _fragSource = fragSource;
 #endif
-    auto program = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource.c_str());
+    auto program      = backend::Device::getInstance()->newProgram(positionTextureColor_vert, fragSource.c_str());
     auto programState = new backend::ProgramState(program);
     CC_SAFE_RELEASE(_programState);
     CC_SAFE_RELEASE(program);
@@ -188,9 +199,7 @@ bool Effect::initProgramState(const std::string &fragmentFilename)
     return _programState != nullptr;
 }
 
-Effect::Effect()
-{
-}
+Effect::Effect() {}
 
 Effect::~Effect()
 {
@@ -202,22 +211,22 @@ class EffectBlur : public Effect
 {
 public:
     CREATE_FUNC(EffectBlur);
-    virtual void setTarget(EffectSprite *sprite) override;
+    virtual void setTarget(EffectSprite* sprite) override;
     void setBlurRadius(float radius);
     void setBlurSampleNum(float num);
 
 protected:
     bool init(float blurRadius = 10.0f, float sampleNum = 5.0f);
-    
+
     float _blurRadius;
     float _blurSampleNum;
 };
 
-void EffectBlur::setTarget(EffectSprite *sprite)
+void EffectBlur::setTarget(EffectSprite* sprite)
 {
     if (_programState == nullptr)
         return;
-    
+
     Size size = sprite->getTexture()->getContentSizeInPixels();
     SET_UNIFORM(_programState, "resolution", size);
     SET_UNIFORM(_programState, "blurRadius", _blurRadius);
@@ -227,9 +236,9 @@ void EffectBlur::setTarget(EffectSprite *sprite)
 bool EffectBlur::init(float blurRadius, float sampleNum)
 {
     initProgramState("Shaders/example_Blur.fsh");
-    _blurRadius = blurRadius;
+    _blurRadius    = blurRadius;
     _blurSampleNum = sampleNum;
-    
+
     return true;
 }
 
@@ -254,7 +263,7 @@ class EffectOutline : public Effect
         initProgramState("Shaders/example_Outline.fsh");
 
         Vec3 color(1.0f, 0.2f, 0.3f);
-        float radius = 0.01f;
+        float radius    = 0.01f;
         float threshold = 1.75;
 
         SET_UNIFORM(_programState, "u_outlineColor", color);
@@ -271,7 +280,8 @@ class EffectNoise : public Effect
     CREATE_FUNC(EffectNoise);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_Noisy.fsh");
         return true;
     }
@@ -290,7 +300,8 @@ class EffectEdgeDetect : public Effect
     CREATE_FUNC(EffectEdgeDetect);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_EdgeDetection.fsh");
         return true;
     }
@@ -309,7 +320,8 @@ class EffectGreyScale : public Effect
     CREATE_FUNC(EffectGreyScale);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_GreyScale.fsh");
         return true;
     }
@@ -322,7 +334,8 @@ class EffectSepia : public Effect
     CREATE_FUNC(EffectSepia);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_Sepia.fsh");
         return true;
     }
@@ -335,7 +348,8 @@ class EffectBloom : public Effect
     CREATE_FUNC(EffectBloom);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_Bloom.fsh");
         return true;
     }
@@ -354,7 +368,8 @@ class EffectCelShading : public Effect
     CREATE_FUNC(EffectCelShading);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_CelShading.fsh");
         return true;
     }
@@ -373,7 +388,8 @@ class EffectLensFlare : public Effect
     CREATE_FUNC(EffectLensFlare);
 
 protected:
-    bool init() {
+    bool init()
+    {
         initProgramState("Shaders/example_LensFlare.fsh");
         return true;
     }
@@ -384,7 +400,6 @@ class EffectLensFlare : public Effect
         SET_UNIFORM(_programState, "textureResolution", Vec2(s.width, s.height));
         s = Director::getInstance()->getWinSize();
         SET_UNIFORM(_programState, "resolution", Vec2(s.width, s.height));
-
     }
 };
 
@@ -392,12 +407,12 @@ class EffectNormalMapped : public Effect
 {
 public:
     CREATE_FUNC(EffectNormalMapped);
-    static EffectNormalMapped* create(const std::string&normalMapFileName)
+    static EffectNormalMapped* create(std::string_view normalMapFileName)
     {
-        EffectNormalMapped *normalMappedSprite = new EffectNormalMapped();
+        EffectNormalMapped* normalMappedSprite = new EffectNormalMapped();
         if (normalMappedSprite->init() && normalMappedSprite->initNormalMap(normalMapFileName))
         {
-            
+
             normalMappedSprite->autorelease();
             return normalMappedSprite;
         }
@@ -407,15 +422,16 @@ class EffectNormalMapped : public Effect
     void setKBump(float value);
     void setLightPos(const Vec3& pos);
     void setLightColor(const Color4F& color);
-    float getKBump()const{return _kBump;}
+    float getKBump() const { return _kBump; }
+
 protected:
     bool init();
-    bool initNormalMap(const std::string&normalMapFileName);
+    bool initNormalMap(std::string_view normalMapFileName);
     virtual void setTarget(EffectSprite* sprite) override;
     EffectSprite* _sprite;
     Vec3 _lightPos;
     Color4F _lightColor;
-    float  _kBump;
+    float _kBump;
 };
 
 bool EffectNormalMapped::init()
@@ -424,7 +440,7 @@ bool EffectNormalMapped::init()
     _kBump = 2;
     return true;
 }
-bool EffectNormalMapped::initNormalMap(const std::string& normalMapFileName)
+bool EffectNormalMapped::initNormalMap(std::string_view normalMapFileName)
 {
     auto normalMapTexture = Director::getInstance()->getTextureCache()->addImage(normalMapFileName);
     SET_TEXTURE(_programState, "u_normalMap", 1, normalMapTexture->getBackendTexture());
@@ -441,7 +457,6 @@ void EffectNormalMapped::setKBump(float value)
 {
     _kBump = value;
     SET_UNIFORM(_programState, "u_kBump", _kBump);
-
 }
 
 void EffectNormalMapped::setLightPos(const Vec3& pos)
@@ -454,54 +469,50 @@ void EffectNormalMapped::setLightColor(const Color4F& color)
 {
     _lightColor = color;
     SET_UNIFORM(_programState, "u_diffuseL", Vec3(_lightColor.r, _lightColor.g, _lightColor.b));
-
 }
 
-EffectSpriteTest::EffectSpriteTest()
-{
-}
+EffectSpriteTest::EffectSpriteTest() {}
 
 bool EffectSpriteTest::init()
 {
-    if (ShaderTestDemo2::init()) {
+    if (ShaderTestDemo2::init())
+    {
 
         auto layer = LayerColor::create(Color4B::BLUE);
         this->addChild(layer);
 
         auto s = Director::getInstance()->getWinSize();
 
-        auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png",
-                                          [&](Ref *sender) {
-                                              _vectorIndex--;
-                                              if(_vectorIndex<0)
-                                                  _vectorIndex = _effects.size()-1;
-                                              _sprite->setEffect(_effects.at(_vectorIndex));
-                                          });
-
-        auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png",
-                                          [&](Ref *sender) {
-                                              _vectorIndex++;
-                                              if(_vectorIndex>=_effects.size())
-                                                  _vectorIndex = 0;
-                                              _sprite->setEffect(_effects.at(_vectorIndex));
-                                          });
+        auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png", [&](Ref* sender) {
+            _vectorIndex--;
+            if (_vectorIndex < 0)
+                _vectorIndex = _effects.size() - 1;
+            _sprite->setEffect(_effects.at(_vectorIndex));
+        });
+
+        auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png", [&](Ref* sender) {
+            _vectorIndex++;
+            if (_vectorIndex >= _effects.size())
+                _vectorIndex = 0;
+            _sprite->setEffect(_effects.at(_vectorIndex));
+        });
 
         auto menu = Menu::create(itemPrev, itemNext, nullptr);
         menu->alignItemsHorizontally();
         menu->setScale(0.5);
-        menu->setAnchorPoint(Vec2(0.0f,0.0f));
-        menu->setPosition(Vec2(s.width/2,70.0f));
+        menu->setAnchorPoint(Vec2(0.0f, 0.0f));
+        menu->setPosition(Vec2(s.width / 2, 70.0f));
         addChild(menu);
 
         _sprite = EffectSprite::create("Images/grossini.png");
-        _sprite->setPosition(Vec2(0.0f, s.height/2));
+        _sprite->setPosition(Vec2(0.0f, s.height / 2));
         addChild(_sprite);
 
-        auto jump = JumpBy::create(4, Vec2(s.width,0.0f), 100, 4);
-        auto rot = RotateBy::create(4, 720);
-        auto spawn = Spawn::create(jump, rot, nullptr);
-        auto rev = spawn->reverse();
-        auto seq = Sequence::create(spawn, rev, nullptr);
+        auto jump   = JumpBy::create(4, Vec2(s.width, 0.0f), 100, 4);
+        auto rot    = RotateBy::create(4, 720);
+        auto spawn  = Spawn::create(jump, rot, nullptr);
+        auto rev    = spawn->reverse();
+        auto seq    = Sequence::create(spawn, rev, nullptr);
         auto repeat = RepeatForever::create(seq);
         _sprite->runAction(repeat);
 
@@ -517,44 +528,44 @@ bool EffectSpriteTest::init()
         _effects.pushBack(EffectLensFlare::create());
 
         _vectorIndex = 0;
-        _sprite->setEffect( _effects.at(_vectorIndex) );
+        _sprite->setEffect(_effects.at(_vectorIndex));
+
+        //        _sprite->addEffect( _effects.at(8), -10 );
+        //        _sprite->addEffect( _effects.at(1), 1 );
 
-//        _sprite->addEffect( _effects.at(8), -10 );
-//        _sprite->addEffect( _effects.at(1), 1 );
-        
         return true;
     }
     return false;
 }
 
-EffectSpriteLamp::EffectSpriteLamp()
-{
-}
+EffectSpriteLamp::EffectSpriteLamp() {}
 
 bool EffectSpriteLamp::init()
 {
-    if (ShaderTestDemo2::init()) {
-        
-        auto s = Director::getInstance()->getWinSize();
+    if (ShaderTestDemo2::init())
+    {
+
+        auto s  = Director::getInstance()->getWinSize();
         _sprite = EffectSprite::create("Images/elephant1_Diffuse.png");
-        //auto contentSize = _sprite->getContentSize();
-        _sprite->setPosition(Vec2(s.width/2, s.height/2));
+        // auto contentSize = _sprite->getContentSize();
+        _sprite->setPosition(Vec2(s.width / 2, s.height / 2));
         addChild(_sprite);
-        
+
         auto lampEffect = EffectNormalMapped::create("Images/elephant1_Normal.png");
-        
-        Vec3 pos(150,150, 50);
+
+        Vec3 pos(150, 150, 50);
         _lightSprite = Sprite::create("Images/ball.png");
         this->addChild(_lightSprite);
-        _lightSprite->setPosition(Vec2(pos.x, s.height- pos.y));
+        _lightSprite->setPosition(Vec2(pos.x, s.height - pos.y));
         Mat4 mat = _sprite->getNodeToWorldTransform();
-        Point lightPosInLocalSpace = PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
-        lampEffect->setLightColor(Color4F(1,1,1,1));
+        Point lightPosInLocalSpace =
+            PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
+        lampEffect->setLightColor(Color4F(1, 1, 1, 1));
         lampEffect->setLightPos(Vec3(lightPosInLocalSpace.x, lightPosInLocalSpace.y, 50.0f));
         lampEffect->setKBump(2);
         _sprite->setEffect(lampEffect);
-        _effect = lampEffect;
-        auto listener = EventListenerTouchAllAtOnce::create();
+        _effect                  = lampEffect;
+        auto listener            = EventListenerTouchAllAtOnce::create();
         listener->onTouchesBegan = CC_CALLBACK_2(EffectSpriteLamp::onTouchesBegan, this);
         listener->onTouchesMoved = CC_CALLBACK_2(EffectSpriteLamp::onTouchesMoved, this);
         listener->onTouchesEnded = CC_CALLBACK_2(EffectSpriteLamp::onTouchesEnded, this);
@@ -564,48 +575,50 @@ bool EffectSpriteLamp::init()
     return false;
 }
 
-
-void EffectSpriteLamp::onTouchesBegan(const std::vector<Touch*>& touches, Event *unused_event)
+void EffectSpriteLamp::onTouchesBegan(const std::vector<Touch*>& touches, Event* unused_event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
-        auto touch = item;
-        auto s = Director::getInstance()->getWinSize();
+        auto touch         = item;
+        auto s             = Director::getInstance()->getWinSize();
         Point loc_winSpace = touch->getLocationInView();
-        _lightSprite->setPosition(Vec2( loc_winSpace.x,  s.height - loc_winSpace.y));
-        Vec3 pos(loc_winSpace.x,loc_winSpace.y, 50);
+        _lightSprite->setPosition(Vec2(loc_winSpace.x, s.height - loc_winSpace.y));
+        Vec3 pos(loc_winSpace.x, loc_winSpace.y, 50);
         Mat4 mat = _sprite->getNodeToWorldTransform();
-        Point lightPosInLocalSpace = PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
+        Point lightPosInLocalSpace =
+            PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
         ((EffectNormalMapped*)_effect)->setLightPos(Vec3(lightPosInLocalSpace.x, lightPosInLocalSpace.y, 50.0f));
     }
 }
 
-void EffectSpriteLamp::onTouchesMoved(const std::vector<Touch*>& touches, Event *unused_event)
+void EffectSpriteLamp::onTouchesMoved(const std::vector<Touch*>& touches, Event* unused_event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
-        auto touch = item;
-        auto s = Director::getInstance()->getWinSize();
+        auto touch         = item;
+        auto s             = Director::getInstance()->getWinSize();
         Point loc_winSpace = touch->getLocationInView();
-        _lightSprite->setPosition(Vec2( loc_winSpace.x, s.height - loc_winSpace.y));
-        Vec3 pos(loc_winSpace.x,loc_winSpace.y, 50);
+        _lightSprite->setPosition(Vec2(loc_winSpace.x, s.height - loc_winSpace.y));
+        Vec3 pos(loc_winSpace.x, loc_winSpace.y, 50);
         Mat4 mat = _sprite->getNodeToWorldTransform();
-        Point lightPosInLocalSpace = PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
+        Point lightPosInLocalSpace =
+            PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
         ((EffectNormalMapped*)_effect)->setLightPos(Vec3(lightPosInLocalSpace.x, lightPosInLocalSpace.y, 50.0f));
     }
 }
 
-void EffectSpriteLamp::onTouchesEnded(const std::vector<Touch*>& touches, Event *unused_event)
+void EffectSpriteLamp::onTouchesEnded(const std::vector<Touch*>& touches, Event* unused_event)
 {
-    for ( auto &item: touches )
+    for (auto& item : touches)
     {
-        auto touch = item;
-        auto s = Director::getInstance()->getWinSize();
+        auto touch         = item;
+        auto s             = Director::getInstance()->getWinSize();
         Point loc_winSpace = touch->getLocationInView();
-        _lightSprite->setPosition(Vec2( loc_winSpace.x, s.height - loc_winSpace.y));
-        Vec3 pos(loc_winSpace.x,loc_winSpace.y, 50);
+        _lightSprite->setPosition(Vec2(loc_winSpace.x, s.height - loc_winSpace.y));
+        Vec3 pos(loc_winSpace.x, loc_winSpace.y, 50);
         Mat4 mat = _sprite->getNodeToWorldTransform();
-        Point lightPosInLocalSpace = PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
+        Point lightPosInLocalSpace =
+            PointApplyAffineTransform(Vec2(pos.x, pos.y), _sprite->getWorldToNodeAffineTransform());
         ((EffectNormalMapped*)_effect)->setLightPos(Vec3(lightPosInLocalSpace.x, lightPosInLocalSpace.y, 50.0f));
     }
 }
diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h
index 834707dea71a..dd7620d9db15 100644
--- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h
+++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,13 +28,12 @@
 #include "extensions/cocos-ext.h"
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(Shader2Tests);
 
 class ShaderTestDemo2 : public TestCase
 {
 public:
-    virtual std::string title() const override { return "Effects on Sprites";}
+    virtual std::string title() const override { return "Effects on Sprites"; }
 };
 
 //
@@ -46,10 +45,10 @@ class Effect : public cocos2d::Ref
 {
 public:
     cocos2d::backend::ProgramState* getProgramState() const { return _programState; }
-    virtual void setTarget(EffectSprite *sprite){}
+    virtual void setTarget(EffectSprite* sprite) {}
 
 protected:
-    bool initProgramState(const std::string &fragmentFilename);
+    bool initProgramState(std::string_view fragmentFilename);
     Effect();
     virtual ~Effect();
     cocos2d::backend::ProgramState* _programState = nullptr;
@@ -65,12 +64,12 @@ class EffectSpriteTest : public ShaderTestDemo2
     CREATE_FUNC(EffectSpriteTest);
     EffectSpriteTest();
     virtual bool init();
-    virtual std::string subtitle() const {return "Different effects on Sprite";}
+    virtual std::string subtitle() const { return "Different effects on Sprite"; }
 
 protected:
     ssize_t _vectorIndex;
     cocos2d::Vector<Effect*> _effects;
-    EffectSprite *_sprite;
+    EffectSprite* _sprite;
 };
 
 class EffectSpriteLamp : public ShaderTestDemo2
@@ -79,14 +78,15 @@ class EffectSpriteLamp : public ShaderTestDemo2
     CREATE_FUNC(EffectSpriteLamp);
     EffectSpriteLamp();
     virtual bool init();
-    virtual std::string subtitle() const {return "Sprite Lamp effects";}
-    //callback
+    virtual std::string subtitle() const { return "Sprite Lamp effects"; }
+    // callback
 public:
     virtual void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* unused_event);
     virtual void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* unused_event);
     virtual void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* unused_event);
+
 protected:
-    EffectSprite *_sprite;
+    EffectSprite* _sprite;
     Effect* _effect;
     cocos2d::Sprite* _lightSprite;
 };
diff --git a/tests/cpp-tests/Classes/ShaderTest/shaderTest.psh.h b/tests/cpp-tests/Classes/ShaderTest/shaderTest.psh.h
index cdda57fbd53d..cfcf6a018514 100644
--- a/tests/cpp-tests/Classes/ShaderTest/shaderTest.psh.h
+++ b/tests/cpp-tests/Classes/ShaderTest/shaderTest.psh.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,477 +22,416 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#define STRINGIFY(A)  #A
+#define STRINGIFY(A) #A
 
 static const char* starFlame = STRINGIFY(
-                                         
-                                         
-                                         uniform vec2 center;
-                                         uniform vec2 resolution;
-                                         
-                                         
-                                         vec2   iResolution = resolution;           // viewport resolution (in pixels)
-                                         float  iGlobalTime = CC_Time[1];           // shader playback time (in seconds)
-                                         //uniform float     iChannelTime[4];       // channel playback time (in seconds)
-                                         //uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
-                                         vec4      iMouse = vec4(0,0,0,0);                // mouse pixel coords. xy: current (if MLB down), zw: click
-                                         //uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
-                                         
-                                         float noise(vec3 p) //Thx to Las^Mercury
-{
-	vec3 i = floor(p);
-	vec4 a = dot(i, vec3(1., 57., 21.)) + vec4(0., 57., 21., 78.);
-	vec3 f = cos((p-i)*acos(-1.))*(-.5)+.5;
-	a = mix(sin(cos(a)*a),sin(cos(1.+a)*(1.+a)), f.x);
-	a.xy = mix(a.xz, a.yw, f.y);
-	return mix(a.x, a.y, f.z);
-}
-                                         
-                                         float sphere(vec3 p, vec4 spr)
-{
-	return length(spr.xyz-p) - spr.w;
-}
-                                         
-                                         float flame(vec3 p)
-{
-	float d = sphere(p*vec3(1.,.5,1.), vec4(.0,-1.,.0,1.));
-	return d + (noise(p+vec3(.0,iGlobalTime*2.,.0)) + noise(p*3.)*.5)*.25*(p.y) ;
-}
-                                         
-                                         float scene(vec3 p)
-{
-	return min(100.-length(p) , abs(flame(p)) );
-}
-                                         
-                                         vec4 raymarch(vec3 org, vec3 dir)
-{
-	float d = 0.0 ;
-    float glow = 0.0;
-    float eps = 0.02;
-	vec3  p = org;
-	bool glowed = false;
-	
-	for(int i=0; i<64; i++)
-	{
-		d = scene(p) + eps;
-		p += d * dir;
-		if( d>eps )
-		{
-			if(flame(p) < .0)
-				glowed=true;
-			if(glowed)
-       			glow = float(i)/64.;
-		}
-	}
-	return vec4(p,glow);
-}
-                                         
-                                         void main()
-{
-	vec2 v = -1.0 + (2.0 * gl_FragCoord.xy)/ iResolution.xy;
-    //vec2 v = 2.0 * gl_FragCoord.xy / iResolution.xy;
-	v.x *= iResolution.x/iResolution.y;
-	
-	vec3 org = vec3(0., -2., 4.);
-	vec3 dir = normalize(vec3(v.x*1.6, -v.y, -1.5));
-	
-	vec4 p = raymarch(org, dir);
-	float glow = p.w;
-	
-	vec4 col = mix(vec4(1.,.5,.1,1.), vec4(0.1,.5,1.,1.), p.y*.02+.4);
-	
-	gl_FragColor = mix(vec4(0.), col, pow(glow*2.,4.));
-    //gl_FragColor = col;
-	//gl_FragColor = mix(vec4(1.), mix(vec4(1.,.5,.1,1.),vec4(0.1,.5,1.,1.),p.y*.02+.4), pow(glow*2.,4.));
-    
-}
-                                    
-);
 
+    uniform vec2 center; uniform vec2 resolution;
 
+    vec2 iResolution  = resolution;  // viewport resolution (in pixels)
+    float iGlobalTime = CC_Time[1];  // shader playback time (in seconds)
+    // uniform float     iChannelTime[4];       // channel playback time (in seconds)
+    // uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
+    vec4 iMouse = vec4(0, 0, 0, 0);  // mouse pixel coords. xy: current (if MLB down), zw: click
+    // uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
 
+    float noise(vec3 p)  // Thx to Las^Mercury
+    {
+        vec3 i = floor(p);
+        vec4 a = dot(i, vec3(1., 57., 21.)) + vec4(0., 57., 21., 78.);
+        vec3 f = cos((p - i) * acos(-1.)) * (-.5) + .5;
+        a      = mix(sin(cos(a) * a), sin(cos(1. + a) * (1. + a)), f.x);
+        a.xy   = mix(a.xz, a.yw, f.y);
+        return mix(a.x, a.y, f.z);
+    }
 
-static const char* starNestFrg = STRINGIFY(
+    float sphere(vec3 p, vec4 spr) { return length(spr.xyz - p) - spr.w; }
+
+    float flame(vec3 p) {
+        float d = sphere(p * vec3(1., .5, 1.), vec4(.0, -1., .0, 1.));
+        return d + (noise(p + vec3(.0, iGlobalTime * 2., .0)) + noise(p * 3.) * .5) * .25 * (p.y);
+    }
+
+    float scene(vec3 p) { return min(100. - length(p), abs(flame(p))); }
+
+    vec4 raymarch(vec3 org, vec3 dir) {
+        float d     = 0.0;
+        float glow  = 0.0;
+        float eps   = 0.02;
+        vec3 p      = org;
+        bool glowed = false;
+
+        for (int i = 0; i < 64; i++)
+        {
+            d = scene(p) + eps;
+            p += d * dir;
+            if (d > eps)
+            {
+                if (flame(p) < .0)
+                    glowed = true;
+                if (glowed)
+                    glow = float(i) / 64.;
+            }
+        }
+        return vec4(p, glow);
+    }
+
+    void main() {
+        vec2 v = -1.0 + (2.0 * gl_FragCoord.xy) / iResolution.xy;
+        // vec2 v = 2.0 * gl_FragCoord.xy / iResolution.xy;
+        v.x *= iResolution.x / iResolution.y;
+
+        vec3 org = vec3(0., -2., 4.);
+        vec3 dir = normalize(vec3(v.x * 1.6, -v.y, -1.5));
+
+        vec4 p     = raymarch(org, dir);
+        float glow = p.w;
+
+        vec4 col = mix(vec4(1., .5, .1, 1.), vec4(0.1, .5, 1., 1.), p.y * .02 + .4);
+
+        gl_FragColor = mix(vec4(0.), col, pow(glow * 2., 4.));
+        // gl_FragColor = col;
+        // gl_FragColor = mix(vec4(1.), mix(vec4(1.,.5,.1,1.),vec4(0.1,.5,1.,1.),p.y*.02+.4), pow(glow*2.,4.));
+    }
 
-                                           
-                                           
-                                           uniform vec2 center;
-                                           uniform vec2 resolution;
-                                           
-                                           vec2   iCenter = center;
-                                           vec2   iResolution = resolution;           // viewport resolution (in pixels)
-                                           float  iGlobalTime = CC_Time[1];           // shader playback time (in seconds)
-                                           //uniform float     iChannelTime[4];       // channel playback time (in seconds)
-                                           //uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
-                                           vec4      iMouse = vec4(0,0,0,0);                // mouse pixel coords. xy: current (if MLB down), zw: click
-                                           //uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
-                                           
-                                           // Star Nest by Pablo Román Andrioli
-                                           
-                                           // This content is under the MIT License.
-                                           
-                                           int iterations =  17;
-                                           float formuparam = 0.53;
-                                           
-                                           int volsteps = 20;
-                                           float stepsize = 0.1;
-                                           
-                                           float zoom =  0.800;
-                                           float tile =  0.850;
-                                           float speed =  0.010;
-                                           
-                                           float brightness = 0.0015;
-                                           float darkmatter = 0.300;
-                                           float distfading = 0.730;
-                                           float saturation = 0.850;
-                                           
-                                           
-void main()
-{
-    //	iCenter = vec2(300, 300);
-	//get coords and direction
-    vec2 uv=gl_FragCoord.xy/iResolution.xy -.5;
-	//vec2 uv=gl_FragCoord.xy/iResolution.xy     ;
-	//vec2 uv = ( 2* gl_FragCoord.xy - iCenter.xy) /  resolution.xy;
-	uv.y*=iResolution.y/iResolution.x;
-	
-	//vec2 uv = 2.0* (gl_FragCoord.xy-iResolution.xy)/min(iResolution.y,iResolution.x);
-	
-	vec3 dir=vec3(uv*zoom,1.);
-	float time=iGlobalTime*speed+.25;
-    
-	//mouse rotation
-	float a1=.5+iMouse.x/iResolution.x*2.;
-	float a2=.8+iMouse.y/iResolution.y*2.;
-	mat2 rot1=mat2(cos(a1),sin(a1),-sin(a1),cos(a1));
-	mat2 rot2=mat2(cos(a2),sin(a2),-sin(a2),cos(a2));
-	dir.xz*=rot1;
-	dir.xy*=rot2;
-	vec3 from=vec3(1.,.5,0.5);
-	from+=vec3(time*2.,time,-2.);
-	from.xz*=rot1;
-	from.xy*=rot2;
-	
-	//volumetric rendering
-	float s=0.1;
-    float fade=1.;
-	vec3 v=vec3(0.);
-	for (int r=0; r<volsteps; r++) {
-		vec3 p=from+s*dir*.5;
-		p = abs(vec3(tile)-mod(p,vec3(tile*2.))); // tiling fold
-
-        float a= 0.;
-        float pa=0.;
-		for (int i=0; i<iterations; i++) {
-			p=abs(p)/dot(p,p)-formuparam; // the magic formula
-			a+=abs(length(p)-pa); // absolute sum of average change
-			pa=length(p);
-		}
-		float dm=max(0.,darkmatter-a*a*.001); //dark matter
-		a*=a*a; // add contrast
-		if (r>6) fade*=1.-dm; // dark matter, don't render near
-		//v+=vec3(dm,dm*.5,0.);
-		v+=fade;
-		v+=vec3(s,s*s,s*s*s*s)*a*brightness*fade; // coloring based on distance
-		fade*=distfading; // distance fading
-		s+=stepsize;
-	}
-	v=mix(vec3(length(v)),v,saturation); //color adjust
-	gl_FragColor = vec4(v*.01,1.);
-	
-}
 );
 
+static const char* starNestFrg = STRINGIFY(
+
+    uniform vec2 center; uniform vec2 resolution;
+
+    vec2 iCenter      = center;
+    vec2 iResolution  = resolution;  // viewport resolution (in pixels)
+    float iGlobalTime = CC_Time[1];  // shader playback time (in seconds)
+    // uniform float     iChannelTime[4];       // channel playback time (in seconds)
+    // uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
+    vec4 iMouse = vec4(0, 0, 0, 0);  // mouse pixel coords. xy: current (if MLB down), zw: click
+    // uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
+
+    // Star Nest by Pablo Román Andrioli
+
+    // This content is under the MIT License.
+
+    int iterations   = 17;
+    float formuparam = 0.53;
+
+    int volsteps   = 20;
+    float stepsize = 0.1;
+
+    float zoom  = 0.800;
+    float tile  = 0.850;
+    float speed = 0.010;
+
+    float brightness = 0.0015;
+    float darkmatter = 0.300;
+    float distfading = 0.730;
+    float saturation = 0.850;
+
+    void main() {
+        //	iCenter = vec2(300, 300);
+        // get coords and direction
+        vec2 uv = gl_FragCoord.xy / iResolution.xy - .5;
+        // vec2 uv=gl_FragCoord.xy/iResolution.xy     ;
+        // vec2 uv = ( 2* gl_FragCoord.xy - iCenter.xy) /  resolution.xy;
+        uv.y *= iResolution.y / iResolution.x;
+
+        // vec2 uv = 2.0* (gl_FragCoord.xy-iResolution.xy)/min(iResolution.y,iResolution.x);
+
+        vec3 dir   = vec3(uv * zoom, 1.);
+        float time = iGlobalTime * speed + .25;
+
+        // mouse rotation
+        float a1  = .5 + iMouse.x / iResolution.x * 2.;
+        float a2  = .8 + iMouse.y / iResolution.y * 2.;
+        mat2 rot1 = mat2(cos(a1), sin(a1), -sin(a1), cos(a1));
+        mat2 rot2 = mat2(cos(a2), sin(a2), -sin(a2), cos(a2));
+        dir.xz *= rot1;
+        dir.xy *= rot2;
+        vec3 from = vec3(1., .5, 0.5);
+        from += vec3(time * 2., time, -2.);
+        from.xz *= rot1;
+        from.xy *= rot2;
+
+        // volumetric rendering
+        float s    = 0.1;
+        float fade = 1.;
+        vec3 v     = vec3(0.);
+        for (int r = 0; r < volsteps; r++)
+        {
+            vec3 p = from + s * dir * .5;
+            p      = abs(vec3(tile) - mod(p, vec3(tile * 2.)));  // tiling fold
+
+            float a  = 0.;
+            float pa = 0.;
+            for (int i = 0; i < iterations; i++)
+            {
+                p = abs(p) / dot(p, p) - formuparam;  // the magic formula
+                a += abs(length(p) - pa);             // absolute sum of average change
+                pa = length(p);
+            }
+            float dm = max(0., darkmatter - a * a * .001);  // dark matter
+            a *= a * a;                                     // add contrast
+            if (r > 6)
+                fade *= 1. - dm;  // dark matter, don't render near
+            // v+=vec3(dm,dm*.5,0.);
+            v += fade;
+            v += vec3(s, s * s, s * s * s * s) * a * brightness * fade;  // coloring based on distance
+            fade *= distfading;                                          // distance fading
+            s += stepsize;
+        }
+        v            = mix(vec3(length(v)), v, saturation);  // color adjust
+        gl_FragColor = vec4(v * .01, 1.);
+    });
 
 static const char* shadertoyRelentlessFrag = STRINGIFY(
 
+    uniform vec2 center; uniform vec2 resolution;
+
+    vec2 iCenter      = center;
+    vec2 iResolution  = resolution;  // viewport resolution (in pixels)
+    float iGlobalTime = CC_Time[1];  // shader playback time (in seconds)
+                                     // uniform float     iChannelTime[4];       // channel playback time (in seconds)
+    // uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
+
+    vec4 iMouse = vec4(0, 0, 0, 0);  // mouse pixel coords. xy: current (if MLB down), zw: click
+    // uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
+
+    // srtuss, 2013
+    // collecting some design ideas for a new game project.
+    // no raymarching is used.
+
+    // if i could add a custom soundtrack, it'd use this one (essential for desired sensation)
+    // http://www.youtube.com/watch?v=1uFAu65tZpo
+
+    //#define GREEN_VERSION
+
+    // ** improved camera shaking
+    // ** cleaned up code
+    // ** added stuff to the gates
+
+    float time = iGlobalTime;
+
+    vec2 rotate(vec2 p, float a) {
+        return vec2(p.x * cos(a) - p.y * sin(a), p.x * sin(a) + p.y * cos(a));
+    } float box(vec2 p, vec2 b, float r) { return length(max(abs(p) - b, 0.0)) - r; }
+
+    // iq's ray-plane-intersection code
+    vec3 intersect(in vec3 o, in vec3 d, vec3 c, vec3 u, vec3 v) {
+        vec3 q = o - c;
+        return vec3(dot(cross(u, v), q), dot(cross(q, u), d), dot(cross(v, q), d)) / dot(cross(v, u), d);
+    }
+
+    // some noise functions for fast developing
+    float rand11(float p) { return fract(sin(p * 591.32) * 43758.5357); }
+
+    float rand12(vec2 p) { return fract(sin(dot(p.xy, vec2(12.9898, 78.233))) * 43758.5357); }
+
+    vec2 rand21(float p) { return fract(vec2(sin(p * 591.32), cos(p * 391.32))); }
+
+    vec2 rand22(in vec2 p) { return fract(vec2(sin(p.x * 591.32 + p.y * 154.077), cos(p.x * 391.32 + p.y * 49.077))); }
+
+    float noise11(float p) {
+        float fl = floor(p);
+        return mix(rand11(fl), rand11(fl + 1.0), fract(p));  // smoothstep(0.0, 1.0, fract(p)));
+    }
+
+    float fbm11(float p) { return noise11(p) * 0.5 + noise11(p * 2.0) * 0.25 + noise11(p * 5.0) * 0.125; }
+
+    vec3 noise31(float p) { return vec3(noise11(p), noise11(p + 18.952), noise11(p - 11.372)) * 2.0 - 1.0; }
+
+    // something that looks a bit like godrays coming from the surface
+    float sky(vec3 p) {
+        float a = atan(p.x, p.z);
+        float t = time * 0.1;
+        float v =
+            rand11(floor(a * 4.0 + t)) * 0.5 + rand11(floor(a * 8.0 - t)) * 0.25 + rand11(floor(a * 16.0 + t)) * 0.125;
+        return v;
+    }
+
+    vec3 voronoi(in vec2 x) {
+        vec2 n = floor(x);  // grid cell id
+        vec2 f = fract(x);  // grid internal position
+        vec2 mg;            // shortest distance...
+        vec2 mr;            // ..and second shortest distance
+        float md  = 8.0;
+        float md2 = 8.0;
+        for (int j = -1; j <= 1; j++)
+        {
+            for (int i = -1; i <= 1; i++)
+            {
+                vec2 g = vec2(float(i), float(j));  // cell id
+                vec2 o = rand22(n + g);             // offset to edge point
+                vec2 r = g + o - f;
+
+                float d = max(abs(r.x), abs(r.y));  // distance to the edge
+
+                if (d < md)
+                {
+                    md2 = md;
+                    md  = d;
+                    mr  = r;
+                    mg  = g;
+                }
+                else if (d < md2)
+                {
+                    md2 = d;
+                }
+            }
+        }
+        return vec3(n + mg, md2 - md);
+    }
+
+    //#define A2V(a) vec2(sin((a) * 6.28318531 / 100.0), cos((a) * 6.28318531 / 100.0))
+    vec2 A2V(float a) { return vec2(sin((a)*6.28318531 / 100.0), cos((a)*6.28318531 / 100.0)); }
+
+    float circles(vec2 p) {
+        float v;
+        float w;
+        float l;
+        float c;
+        vec2 pp;
+        l = length(p);
+
+        pp = rotate(p, time * 3.0);
+        c  = max(dot(pp, normalize(vec2(-0.2, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5))));
+        c  = min(c, max(dot(pp, normalize(vec2(0.5, -0.5))), -dot(pp, normalize(vec2(0.2, -0.5)))));
+        c  = min(c, max(dot(pp, normalize(vec2(0.3, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5)))));
+
+        // innerest stuff
+        v = abs(l - 0.5) - 0.03;
+        v = max(v, -c);
+        v = min(v, abs(l - 0.54) - 0.02);
+        v = min(v, abs(l - 0.64) - 0.05);
+
+        pp = rotate(p, time * -1.333);
+        c  = max(dot(pp, A2V(-5.0)), -dot(pp, A2V(5.0)));
+        c  = min(c, max(dot(pp, A2V(25.0 - 5.0)), -dot(pp, A2V(25.0 + 5.0))));
+        c  = min(c, max(dot(pp, A2V(50.0 - 5.0)), -dot(pp, A2V(50.0 + 5.0))));
+        c  = min(c, max(dot(pp, A2V(75.0 - 5.0)), -dot(pp, A2V(75.0 + 5.0))));
+
+        w = abs(l - 0.83) - 0.09;
+        v = min(v, max(w, c));
+
+        return v;
+    }
+
+    float shade1(float d) {
+        float v = 1.0 - smoothstep(0.0, mix(0.012, 0.2, 0.0), d);
+        float g = exp(d * -20.0);
+        return v + g * 0.5;
+    }
+
+    void main() {
+        vec2 uv = gl_FragCoord.xy / iResolution.xy;
+        uv      = uv * 2.0 - 1.0;
+        uv.x *= iResolution.x / iResolution.y;
+
+        // using an iq styled camera this time :)
+        // ray origin
+        vec3 ro = 0.7 * vec3(cos(0.2 * time), 0.0, sin(0.2 * time));
+        ro.y    = cos(0.6 * time) * 0.3 + 0.65;
+        // camera look at
+        vec3 ta = vec3(0.0, 0.2, 0.0);
+
+        // camera shake intensity
+        float shake = clamp(3.0 * (1.0 - length(ro.yz)), 0.3, 1.0);
+        float st    = mod(time, 10.0) * 143.0;
+
+        // build camera matrix
+        vec3 ww = normalize(ta - ro + noise31(st) * shake * 0.01);
+        vec3 uu = normalize(cross(ww, normalize(vec3(0.0, 1.0, 0.2 * sin(time)))));
+        vec3 vv = normalize(cross(uu, ww));
+        // obtain ray direction
+        vec3 rd = normalize(uv.x * uu + uv.y * vv + 1.0 * ww);
+
+        // shaking and movement
+        ro += noise31(-st) * shake * 0.015;
+        ro.x += time * 2.0;
+
+        float inten = 0.0;
+
+        // background
+        float sd = dot(rd, vec3(0.0, 1.0, 0.0));
+        inten    = pow(1.0 - abs(sd), 20.0) + pow(sky(rd), 5.0) * step(0.0, rd.y) * 0.2;
+
+        vec3 its;
+        float v;
+        float g;
+
+        // voronoi floor layers
+        for (int i = 0; i < 4; i++)
+        {
+            float layer = float(i);
+            its = intersect(ro, rd, vec3(0.0, -5.0 - layer * 5.0, 0.0), vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
+            if (its.x > 0.0)
+            {
+                vec3 vo = voronoi((its.yz) * 0.05 + 8.0 * rand21(float(i)));
+                v       = exp(-100.0 * (vo.z - 0.02));
+
+                float fx = 0.0;
+
+                // add some special fx to lowest layer
+                if (i == 3)
+                {
+                    float crd = 0.0;                           // fract(time * 0.2) * 50.0 - 25.0;
+                    float fxi = cos(vo.x * 0.2 + time * 1.5);  // abs(crd - vo.x);
+                    fx        = clamp(smoothstep(0.9, 1.0, fxi), 0.0, 0.9) * 1.0 * rand12(vo.xy);
+                    fx *= exp(-3.0 * vo.z) * 2.0;
+                }
+                inten += v * 0.1 + fx;
+            }
+        }
+
+        // draw the gates, 4 should be enough
+        float gatex = floor(ro.x / 8.0 + 0.5) * 8.0 + 4.0;
+        float go    = -16.0;
+        for (int i = 0; i < 4; i++)
+        {
+            its = intersect(ro, rd, vec3(gatex + go, 0.0, 0.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.0, 1.0));
+            if (dot(its.yz, its.yz) < 2.0 && its.x > 0.0)
+            {
+                v = circles(its.yz);
+                inten += shade1(v);
+            }
+
+            go += 8.0;
+        }
+
+        // draw the stream
+        for (int j = 0; j < 20; j++)
+        {
+            float id = float(j);
+
+            vec3 bp  = vec3(0.0, (rand11(id) * 2.0 - 1.0) * 0.25, 0.0);
+            vec3 its = intersect(ro, rd, bp, vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
+
+            if (its.x > 0.0)
+            {
+                vec2 pp   = its.yz;
+                float spd = (1.0 + rand11(id) * 3.0) * 2.5;
+                pp.y += time * spd;
+                pp += (rand21(id) * 2.0 - 1.0) * vec2(0.3, 1.0);
+                float rep = rand11(id) + 1.5;
+                pp.y      = mod(pp.y, rep * 2.0) - rep;
+                float d   = box(pp, vec2(0.02, 0.3), 0.1);
+                float foc = 0.0;
+                float v   = 1.0 - smoothstep(0.0, 0.03, abs(d) - 0.001);
+                float g   = min(exp(d * -20.0), 2.0);
+
+                inten += (v + g * 0.7) * 0.5;
+            }
+        }
+
+        inten *= 0.4 + (sin(time) * 0.5 + 0.5) * 0.6;
 
-uniform vec2 center;
-uniform vec2 resolution;
-                                                       
-vec2   iCenter = center;
-vec2   iResolution = resolution;           // viewport resolution (in pixels)
-float  iGlobalTime = CC_Time[1];           // shader playback time (in seconds)
- //uniform float     iChannelTime[4];       // channel playback time (in seconds)
-//uniform vec3      iChannelResolution[4]; // channel resolution (in pixels)
-
-vec4      iMouse = vec4(0,0,0,0);                // mouse pixel coords. xy: current (if MLB down), zw: click
-//uniform sampler2D iChannel0;          // input channel. XX = 2D/Cube
-                                                       
-// srtuss, 2013
-// collecting some design ideas for a new game project.
-// no raymarching is used.
-                                                       
-// if i could add a custom soundtrack, it'd use this one (essential for desired sensation)
-// http://www.youtube.com/watch?v=1uFAu65tZpo
-                                                       
-                                                       
-//#define GREEN_VERSION
-                                                       
-// ** improved camera shaking
-// ** cleaned up code
-// ** added stuff to the gates
-                                                       
-                                                       
-                                                       
-float time = iGlobalTime;
-                                                       
-vec2 rotate(vec2 p, float a)
-{
-	return vec2(p.x * cos(a) - p.y * sin(a), p.x * sin(a) + p.y * cos(a));
-}
-                                                       float box(vec2 p, vec2 b, float r)
-{
-	return length(max(abs(p) - b, 0.0)) - r;
-}
-                                                       
-// iq's ray-plane-intersection code
-vec3 intersect(in vec3 o, in vec3 d, vec3 c, vec3 u, vec3 v)
-{
-	vec3 q = o - c;
-	return vec3(
-                dot(cross(u, v), q),
-                dot(cross(q, u), d),
-                dot(cross(v, q), d)) / dot(cross(v, u), d);
-}
-                                                       
-// some noise functions for fast developing
-float rand11(float p)
-{
-    return fract(sin(p * 591.32) * 43758.5357);
-}
-                                                       
-float rand12(vec2 p)
-{
-    return fract(sin(dot(p.xy, vec2(12.9898, 78.233))) * 43758.5357);
-}
-                                                       
-vec2 rand21(float p)
-{
-	return fract(vec2(sin(p * 591.32), cos(p * 391.32)));
-}
-                                                       
-vec2 rand22(in vec2 p)
-{
-	return fract(vec2(sin(p.x * 591.32 + p.y * 154.077), cos(p.x * 391.32 + p.y * 49.077)));
-}
-   
-                                                       
-float noise11(float p)
-{
-	float fl = floor(p);
-	return mix(rand11(fl), rand11(fl + 1.0), fract(p));//smoothstep(0.0, 1.0, fract(p)));
-}
-                                                       
-float fbm11(float p)
-{
-	return noise11(p) * 0.5 + noise11(p * 2.0) * 0.25 + noise11(p * 5.0) * 0.125;
-}
-          
-vec3 noise31(float p)
-{
-	return vec3(noise11(p), noise11(p + 18.952), noise11(p - 11.372)) * 2.0 - 1.0;
-}
-                                                       
-// something that looks a bit like godrays coming from the surface
-float sky(vec3 p)
-{
-	float a = atan(p.x, p.z);
-	float t = time * 0.1;
-	float v = rand11(floor(a * 4.0 + t)) * 0.5 + rand11(floor(a * 8.0 - t)) * 0.25 + rand11(floor(a * 16.0 + t)) * 0.125;
-	return v;
-}
-                                                       
-vec3 voronoi(in vec2 x)
-{
-	vec2 n = floor(x); // grid cell id
-	vec2 f = fract(x); // grid internal position
-	vec2 mg; // shortest distance...
-	vec2 mr; // ..and second shortest distance
-	float md = 8.0;
-    float md2 = 8.0;
-	for(int j = -1; j <= 1; j ++)
-	{
-		for(int i = -1; i <= 1; i ++)
-		{
-			vec2 g = vec2(float(i), float(j)); // cell id
-			vec2 o = rand22(n + g); // offset to edge point
-			vec2 r = g + o - f;
-            
-			float d = max(abs(r.x), abs(r.y)); // distance to the edge
-            
-			if(d < md)
-            {md2 = md; md = d; mr = r; mg = g;}
-			else if(d < md2)
-            {md2 = d;}
-		}
-	}
-	return vec3(n + mg, md2 - md);
-}
-                                                       
-//#define A2V(a) vec2(sin((a) * 6.28318531 / 100.0), cos((a) * 6.28318531 / 100.0))
-vec2 A2V(float a)
-{
-    return vec2(sin((a) * 6.28318531 / 100.0), cos((a) * 6.28318531 / 100.0));
-}
-                                                
-                                                       
-                                                       
-float circles(vec2 p)
-{
-	float v;
-    float w;
-    float l;
-    float c;
-	vec2 pp;
-	l = length(p);
-    
-    
-	pp = rotate(p, time * 3.0);
-	c = max(dot(pp, normalize(vec2(-0.2, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5))));
-	c = min(c, max(dot(pp, normalize(vec2(0.5, -0.5))), -dot(pp, normalize(vec2(0.2, -0.5)))));
-	c = min(c, max(dot(pp, normalize(vec2(0.3, 0.5))), -dot(pp, normalize(vec2(0.2, 0.5)))));
-    
-	// innerest stuff
-	v = abs(l - 0.5) - 0.03;
-	v = max(v, -c);
-	v = min(v, abs(l - 0.54) - 0.02);
-	v = min(v, abs(l - 0.64) - 0.05);
-    
-	pp = rotate(p, time * -1.333);
-	c = max(dot(pp, A2V(-5.0)), -dot(pp, A2V(5.0)));
-	c = min(c, max(dot(pp, A2V(25.0 - 5.0)), -dot(pp, A2V(25.0 + 5.0))));
-	c = min(c, max(dot(pp, A2V(50.0 - 5.0)), -dot(pp, A2V(50.0 + 5.0))));
-	c = min(c, max(dot(pp, A2V(75.0 - 5.0)), -dot(pp, A2V(75.0 + 5.0))));
-    
-	w = abs(l - 0.83) - 0.09;
-	v = min(v, max(w, c));
-    
-	return v;
-}
-                                                       
-float shade1(float d)
-{
-	float v = 1.0 - smoothstep(0.0, mix(0.012, 0.2, 0.0), d);
-	float g = exp(d * -20.0);
-	return v + g * 0.5;
-}
-                                                       
-void main()
-{
-	vec2 uv = gl_FragCoord.xy / iResolution.xy;
-	uv = uv * 2.0 - 1.0;
-	uv.x *= iResolution.x / iResolution.y;
-    
-    
-	// using an iq styled camera this time :)
-	// ray origin
-	vec3 ro = 0.7 * vec3(cos(0.2 * time), 0.0, sin(0.2 * time));
-	ro.y = cos(0.6 * time) * 0.3 + 0.65;
-	// camera look at
-	vec3 ta = vec3(0.0, 0.2, 0.0);
-    
-	// camera shake intensity
-	float shake = clamp(3.0 * (1.0 - length(ro.yz)), 0.3, 1.0);
-	float st = mod(time, 10.0) * 143.0;
-    
-	// build camera matrix
-	vec3 ww = normalize(ta - ro + noise31(st) * shake * 0.01);
-	vec3 uu = normalize(cross(ww, normalize(vec3(0.0, 1.0, 0.2 * sin(time)))));
-	vec3 vv = normalize(cross(uu, ww));
-	// obtain ray direction
-	vec3 rd = normalize(uv.x * uu + uv.y * vv + 1.0 * ww);
-    
-	// shaking and movement
-	ro += noise31(-st) * shake * 0.015;
-	ro.x += time * 2.0;
-    
-	float inten = 0.0;
-    
-	// background
-	float sd = dot(rd, vec3(0.0, 1.0, 0.0));
-	inten = pow(1.0 - abs(sd), 20.0) + pow(sky(rd), 5.0) * step(0.0, rd.y) * 0.2;
-    
-	vec3 its;
-	float v;
-    float g;
-    
-	// voronoi floor layers
-	for(int i = 0; i < 4; i ++)
-	{
-		float layer = float(i);
-		its = intersect(ro, rd, vec3(0.0, -5.0 - layer * 5.0, 0.0), vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
-		if(its.x > 0.0)
-		{
-			vec3 vo = voronoi((its.yz) * 0.05 + 8.0 * rand21(float(i)));
-			v = exp(-100.0 * (vo.z - 0.02));
-            
-			float fx = 0.0;
-            
-			// add some special fx to lowest layer
-			if(i == 3)
-			{
-				float crd = 0.0;//fract(time * 0.2) * 50.0 - 25.0;
-				float fxi = cos(vo.x * 0.2 + time * 1.5);//abs(crd - vo.x);
-				fx = clamp(smoothstep(0.9, 1.0, fxi), 0.0, 0.9) * 1.0 * rand12(vo.xy);
-				fx *= exp(-3.0 * vo.z) * 2.0;
-			}
-			inten += v * 0.1 + fx;
-		}
-	}
-    
-	// draw the gates, 4 should be enough
-	float gatex = floor(ro.x / 8.0 + 0.5) * 8.0 + 4.0;
-	float go = -16.0;
-	for(int i = 0; i < 4; i ++)
-	{
-		its = intersect(ro, rd, vec3(gatex + go, 0.0, 0.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.0, 1.0));
-		if(dot(its.yz, its.yz) < 2.0 && its.x > 0.0)
-		{
-			v = circles(its.yz);
-			inten += shade1(v);
-		}
-        
-		go += 8.0;
-	}
-    
-	// draw the stream
-	for(int j = 0; j < 20; j ++)
-	{
-		float id = float(j);
-        
-		vec3 bp = vec3(0.0, (rand11(id) * 2.0 - 1.0) * 0.25, 0.0);
-		vec3 its = intersect(ro, rd, bp, vec3(1.0, 0.0, 0.0), vec3(0.0, 0.0, 1.0));
-        
-		if(its.x > 0.0)
-		{
-			vec2 pp = its.yz;
-			float spd = (1.0 + rand11(id) * 3.0) * 2.5;
-			pp.y += time * spd;
-			pp += (rand21(id) * 2.0 - 1.0) * vec2(0.3, 1.0);
-			float rep = rand11(id) + 1.5;
-			pp.y = mod(pp.y, rep * 2.0) - rep;
-			float d = box(pp, vec2(0.02, 0.3), 0.1);
-			float foc = 0.0;
-			float v = 1.0 - smoothstep(0.0, 0.03, abs(d) - 0.001);
-			float g = min(exp(d * -20.0), 2.0);
-            
-			inten += (v + g * 0.7) * 0.5;
-            
-		}
-	}
-    
-	inten *= 0.4 + (sin(time) * 0.5 + 0.5) * 0.6;
-    
-	// find a color for the computed intensity
+    // find a color for the computed intensity
 #ifdef GREEN_VERSION
-	vec3 col = pow(vec3(inten), vec3(2.0, 0.15, 9.0));
+        vec3 col = pow(vec3(inten), vec3(2.0, 0.15, 9.0));
 #else
-	vec3 col = pow(vec3(inten), 1.5 * vec3(0.15, 2.0, 9.0));
+        vec3 col = pow(vec3(inten), 1.5 * vec3(0.15, 2.0, 9.0));
 #endif
-    
-	gl_FragColor = vec4(col, 1.0);
-}
 
+        gl_FragColor = vec4(col, 1.0);
+    }
 
 );
diff --git a/tests/cpp-tests/Classes/SpineTest/SpineTest.cpp b/tests/cpp-tests/Classes/SpineTest/SpineTest.cpp
index c3db5b490be9..d8fc202f4725 100644
--- a/tests/cpp-tests/Classes/SpineTest/SpineTest.cpp
+++ b/tests/cpp-tests/Classes/SpineTest/SpineTest.cpp
@@ -34,7 +34,6 @@ using namespace cocos2d;
 using namespace std;
 using namespace spine;
 
-
 #define NUM_SKELETONS 50
 #define SPINE_NODE_SCALE_FACTOR 0.4
 
@@ -44,9 +43,12 @@ PowInterpolation pow2(2);
 PowOutInterpolation powOut2(2);
 SwirlVertexEffect effect(400, powOut2);
 
-
-
-#define SCALE_SKELETON_NODE(node) do { if(node) node->setScale(SPINE_NODE_SCALE_FACTOR); } while(false)
+#define SCALE_SKELETON_NODE(node)                    \
+    do                                               \
+    {                                                \
+        if (node)                                    \
+            node->setScale(SPINE_NODE_SCALE_FACTOR); \
+    } while (false)
 
 //------------------------------------------------------------------
 //
@@ -54,10 +56,9 @@ SwirlVertexEffect effect(400, powOut2);
 //
 //------------------------------------------------------------------
 
-
 SpineTests::SpineTests()
 {
-    auto fu = FileUtils::getInstance();
+    auto fu      = FileUtils::getInstance();
     _searchPaths = fu->getSearchPaths();
     fu->addSearchPath("spine", true);
 
@@ -87,27 +88,24 @@ SpineTests::~SpineTests()
 #endif
 }
 
-SpineTestLayer::SpineTestLayer()
-: _title("")
-{}
-
-SpineTestLayer::~SpineTestLayer()
-{
+SpineTestLayer::SpineTestLayer() : _title("") {}
 
-}
+SpineTestLayer::~SpineTestLayer() {}
 
 std::string SpineTestLayer::title() const
- {
-     return _title;
- }
+{
+    return _title;
+}
 
 bool SpineTestLayer::init()
-{   
-    if (!TestCase::init()) return false;
+{
+    if (!TestCase::init())
+        return false;
 
     EventListenerTouchOneByOne* listener = EventListenerTouchOneByOne::create();
-    listener->onTouchBegan = [this](Touch* touch, cocos2d::Event* event) -> bool {
-        if (!skeletonNode) return true;
+    listener->onTouchBegan               = [this](Touch* touch, cocos2d::Event* event) -> bool {
+        if (!skeletonNode)
+            return true;
         _touchIndex = (_touchIndex + 1) % 3;
         if (_touchIndex == 0)
         {
@@ -134,9 +132,11 @@ bool SpineTestLayer::init()
 }
 
 // BatchingExample
-bool BatchingExample::init () {
-    if (!SpineTestLayer::init()) return false;
-    
+bool BatchingExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
+
     _title = "Batching";
 
     _atlas = new (__FILE__, __LINE__) Atlas("spineboy.atlas", &textureLoader, true);
@@ -148,9 +148,10 @@ bool BatchingExample::init () {
 
     // Load the skeleton data.
     SkeletonJson* json = new (__FILE__, __LINE__) SkeletonJson(_attachmentLoader);
-    json->setScale(0.6f); // Resizes skeleton data to 60% of the size it was in Spine.
+    json->setScale(0.6f);  // Resizes skeleton data to 60% of the size it was in Spine.
     _skeletonData = json->readSkeletonDataFile("spineboy-pro.json");
-    CCASSERT(_skeletonData, (json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file."));
+    CCASSERT(_skeletonData,
+             (json->getError().isEmpty() ? json->getError().buffer() : "Error reading skeleton data file."));
     delete json;
 
     // Setup mix times.
@@ -160,7 +161,8 @@ bool BatchingExample::init () {
 
     int xMin = _contentSize.width * 0.10f, xMax = _contentSize.width * 0.90f;
     int yMin = 0, yMax = _contentSize.height * 0.7f;
-    for (int i = 0; i < NUM_SKELETONS; i++) {
+    for (int i = 0; i < NUM_SKELETONS; i++)
+    {
         // Each skeleton node shares the same atlas, skeleton data, and mix times.
         SkeletonAnimation* skeletonNode = SkeletonAnimation::createWithData(_skeletonData, false);
         skeletonNode->setAnimationStateData(_stateData);
@@ -172,22 +174,19 @@ bool BatchingExample::init () {
         // alternative setting two color tint for groups of 10 skeletons
         // should end up with #skeletons / 10 batches
         // if (j++ < 10)
-//			skeletonNode->setTwoColorTint(true);
-//		if (j == 20) j = 0;
+        //			skeletonNode->setTwoColorTint(true);
+        //		if (j == 20) j = 0;
         // skeletonNode->setTwoColorTint(true);
 
-        skeletonNode->setPosition(Vec2(
-            RandomHelper::random_int(xMin, xMax),
-            RandomHelper::random_int(yMin, yMax)
-        ));
+        skeletonNode->setPosition(Vec2(RandomHelper::random_int(xMin, xMax), RandomHelper::random_int(yMin, yMax)));
         addChild(skeletonNode);
     }
     SCALE_SKELETON_NODE(skeletonNode);
     return true;
 }
 
-
-BatchingExample::~BatchingExample() {
+BatchingExample::~BatchingExample()
+{
     // SkeletonAnimation instances are cocos2d-x nodes and are disposed of automatically as normal, but the data created
     // manually to be shared across multiple SkeletonAnimations needs to be disposed of manually.
 
@@ -197,14 +196,14 @@ BatchingExample::~BatchingExample() {
     delete _atlas;
 }
 
+bool CoinExample::init()
+{
 
-bool CoinExample::init() {
-    
-    if (!SpineTestLayer::init()) return false;
+    if (!SpineTestLayer::init())
+        return false;
 
     _title = "Coin";
 
-
     skeletonNode = SkeletonAnimation::createWithBinaryFile("coin-pro.skel", "coin.atlas", 1);
     skeletonNode->setAnimation(0, "animation", true);
 
@@ -216,12 +215,12 @@ bool CoinExample::init() {
     return true;
 }
 
+bool GoblinsExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
 
-
-bool GoblinsExample::init() {
-    if (!SpineTestLayer::init()) return false;
-
-    _title = "Goblins";
+    _title       = "Goblins";
     skeletonNode = SkeletonAnimation::createWithJsonFile("goblins-pro.json", "goblins.atlas", 1.5f);
     skeletonNode->setAnimation(0, "walk", true);
     skeletonNode->setSkin("goblin");
@@ -232,9 +231,10 @@ bool GoblinsExample::init() {
     return true;
 }
 
-
-bool IKExample::init() {
-    if (!SpineTestLayer::init()) return false;
+bool IKExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
 
     _title = "IKExample";
 
@@ -262,11 +262,11 @@ bool IKExample::init() {
     // the current mouse location. The location is converted
     // to the skeleton's coordinate system.
     EventListenerMouse* mouseListener = EventListenerMouse::create();
-    mouseListener->onMouseMove = [this](cocos2d::Event* event) -> void {
+    mouseListener->onMouseMove        = [this](cocos2d::Event* event) -> void {
         // convert the mosue location to the skeleton's coordinate space
         // and store it.
         EventMouse* mouseEvent = dynamic_cast<EventMouse*>(event);
-        position = skeletonNode->convertToNodeSpace(mouseEvent->getLocationInView());
+        position               = skeletonNode->convertToNodeSpace(mouseEvent->getLocationInView());
     };
     _eventDispatcher->addEventListenerWithSceneGraphPriority(mouseListener, this);
 
@@ -284,7 +284,7 @@ bool IKExample::init() {
     // again so the change of the IK target position is
     // applied to the rest of the skeleton.
     skeletonNode->setPostUpdateWorldTransformsListener([this](SkeletonAnimation* node) -> void {
-        Bone* crosshair = node->findBone("crosshair"); // The bone should be cached
+        Bone* crosshair = node->findBone("crosshair");  // The bone should be cached
         float localX = 0, localY = 0;
         crosshair->getParent()->worldToLocal(position.x, position.y, localX, localY);
         crosshair->setX(localX);
@@ -292,22 +292,23 @@ bool IKExample::init() {
         crosshair->setAppliedValid(false);
 
         node->getSkeleton()->updateWorldTransform();
-        });
+    });
 
     SCALE_SKELETON_NODE(skeletonNode);
     return true;
 }
 
-
-
-MixAndMatchExample::~MixAndMatchExample() {
+MixAndMatchExample::~MixAndMatchExample()
+{
     delete skin;
     delete skin2;
 }
 
-bool MixAndMatchExample::init() {
-    if (!SpineTestLayer::init()) return false;
-    
+bool MixAndMatchExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
+
     _title = "Mix and Match";
 
     skeletonNode = SkeletonAnimation::createWithBinaryFile("mix-and-match-pro.skel", "mix-and-match.atlas", 0.5);
@@ -318,7 +319,7 @@ bool MixAndMatchExample::init() {
     // skins. Using the skin API, a new skin is created which is
     // a combination of all these individual item skins.
     SkeletonData* skeletonData = skeletonNode->getSkeleton()->getData();
-    skin = new (__FILE__, __LINE__) Skin("mix-and-match");
+    skin                       = new (__FILE__, __LINE__) Skin("mix-and-match");
     skin->addSkin(skeletonData->findSkin("skin-base"));
     skin->addSkin(skeletonData->findSkin("nose/short"));
     skin->addSkin(skeletonData->findSkin("eyelids/girly"));
@@ -330,7 +331,7 @@ bool MixAndMatchExample::init() {
     skin->addSkin(skeletonData->findSkin("accessories/hat-red-yellow"));
     skeletonNode->getSkeleton()->setSkin(skin);
 
-    skeletonNode->setPosition(Vec2(_contentSize.width / 3, _contentSize.height / 2 - 100 ));
+    skeletonNode->setPosition(Vec2(_contentSize.width / 3, _contentSize.height / 2 - 100));
     addChild(skeletonNode);
 
     SCALE_SKELETON_NODE(skeletonNode);
@@ -346,7 +347,7 @@ bool MixAndMatchExample::init() {
     // skins. Using the skin API, a new skin is created which is
     // a combination of all these individual item skins.
     SkeletonData* skeletonData2 = skeletonNode->getSkeleton()->getData();
-    skin2 = new (__FILE__, __LINE__) Skin("mix-and-match");
+    skin2                       = new (__FILE__, __LINE__) Skin("mix-and-match");
     skin2->addSkin(skeletonData->findSkin("skin-base"));
     skin2->addSkin(skeletonData->findSkin("nose/short"));
     skin2->addSkin(skeletonData->findSkin("eyelids/girly"));
@@ -367,11 +368,12 @@ bool MixAndMatchExample::init() {
     return true;
 }
 
+bool RaptorExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
 
-bool RaptorExample::init() {
-    if (!SpineTestLayer::init()) return false;
-
-    _title = "Raptor";
+    _title       = "Raptor";
     skeletonNode = SkeletonAnimation::createWithJsonFile("raptor-pro.json", "raptor.atlas", 0.5f);
     skeletonNode->setAnimation(0, "walk", true);
     skeletonNode->addAnimation(1, "gun-grab", false, 2);
@@ -391,16 +393,20 @@ bool RaptorExample::init() {
     return true;
 }
 
-void RaptorExample::update(float fDelta) {
+void RaptorExample::update(float fDelta)
+{
     swirlTime += fDelta;
     float percent = spine::MathUtil::fmod(swirlTime, 2);
-    if (percent > 1) percent = 1 - (percent - 1);
+    if (percent > 1)
+        percent = 1 - (percent - 1);
     effect.setAngle(pow2.interpolate(-60.0f, 60.0f, percent));
 }
 
-bool SkeletonRendererSeparatorExample::init() {
-    if (!SpineTestLayer::init()) return false;
-    
+bool SkeletonRendererSeparatorExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
+
     _title = "Seperator";
 
     // Spineboy's back, which will manage the animation and GPU resources
@@ -408,7 +414,8 @@ bool SkeletonRendererSeparatorExample::init() {
     skeletonNode = SkeletonAnimation::createWithJsonFile("spineboy-pro.json", "spineboy.atlas", 0.6f);
     skeletonNode->setMix("walk", "jump", 0.4);
     skeletonNode->setAnimation(0, "walk", true);
-    skeletonNode->setSlotsRange(skeletonNode->findSlot("rear-upper-arm")->getData().getIndex(), skeletonNode->findSlot("rear-shin")->getData().getIndex());
+    skeletonNode->setSlotsRange(skeletonNode->findSlot("rear-upper-arm")->getData().getIndex(),
+                                skeletonNode->findSlot("rear-shin")->getData().getIndex());
     skeletonNode->setPosition(Vec2(_contentSize.width / 2, 20));
 
     // A simple rectangle to go between the front and back slots of Spineboy
@@ -439,14 +446,16 @@ bool SkeletonRendererSeparatorExample::init() {
     return true;
 }
 
-void SkeletonRendererSeparatorExample::update(float deltaTime) {
+void SkeletonRendererSeparatorExample::update(float deltaTime)
+{
     // Test releasing memory.
     // Director::getInstance()->replaceScene(SpineboyExample::scene());
 }
 
-
-bool SpineboyExample::init() {
-    if (!SpineTestLayer::init()) return false;
+bool SpineboyExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
 
     _title = "Spineboy";
 
@@ -454,22 +463,15 @@ bool SpineboyExample::init() {
 
     skeletonNode->setStartListener([](TrackEntry* entry) {
         log("%d start: %s", entry->getTrackIndex(), entry->getAnimation()->getName().buffer());
-        });
-    skeletonNode->setInterruptListener([](TrackEntry* entry) {
-        log("%d interrupt", entry->getTrackIndex());
-        });
-    skeletonNode->setEndListener([](TrackEntry* entry) {
-        log("%d end", entry->getTrackIndex());
-        });
-    skeletonNode->setCompleteListener([](TrackEntry* entry) {
-        log("%d complete", entry->getTrackIndex());
-        });
-    skeletonNode->setDisposeListener([](TrackEntry* entry) {
-        log("%d dispose", entry->getTrackIndex());
-        });
+    });
+    skeletonNode->setInterruptListener([](TrackEntry* entry) { log("%d interrupt", entry->getTrackIndex()); });
+    skeletonNode->setEndListener([](TrackEntry* entry) { log("%d end", entry->getTrackIndex()); });
+    skeletonNode->setCompleteListener([](TrackEntry* entry) { log("%d complete", entry->getTrackIndex()); });
+    skeletonNode->setDisposeListener([](TrackEntry* entry) { log("%d dispose", entry->getTrackIndex()); });
     skeletonNode->setEventListener([](TrackEntry* entry, spine::Event* event) {
-        log("%d event: %s, %d, %f, %s", entry->getTrackIndex(), event->getData().getName().buffer(), event->getIntValue(), event->getFloatValue(), event->getStringValue().buffer());
-        });
+        log("%d event: %s, %d, %f, %s", entry->getTrackIndex(), event->getData().getName().buffer(),
+            event->getIntValue(), event->getFloatValue(), event->getStringValue().buffer());
+    });
 
     skeletonNode->setMix("walk", "jump", 0.4);
     skeletonNode->setMix("jump", "run", 0.4);
@@ -477,12 +479,11 @@ bool SpineboyExample::init() {
     TrackEntry* jumpEntry = skeletonNode->addAnimation(0, "jump", false, 1);
     skeletonNode->addAnimation(0, "run", true);
 
-    skeletonNode->setTrackStartListener(jumpEntry, [](TrackEntry* entry) {
-        log("jumped!");
-        });
+    skeletonNode->setTrackStartListener(jumpEntry, [](TrackEntry* entry) { log("jumped!"); });
 
     // skeletonNode->addAnimation(1, "test", true);
-    // skeletonNode->runAction(RepeatForever::create(Sequence::create(FadeOut::create(1), FadeIn::create(1), DelayTime::create(5), NULL)));
+    // skeletonNode->runAction(RepeatForever::create(Sequence::create(FadeOut::create(1), FadeIn::create(1),
+    // DelayTime::create(5), NULL)));
 
     skeletonNode->setPosition(Vec2(_contentSize.width / 2, 20));
     addChild(skeletonNode);
@@ -493,16 +494,18 @@ bool SpineboyExample::init() {
     return true;
 }
 
-void SpineboyExample::update(float deltaTime) {
+void SpineboyExample::update(float deltaTime)
+{
     // Test releasing memory.
     // Director::getInstance()->replaceScene(SpineboyExample::scene());
 }
 
+bool TankExample::init()
+{
+    if (!SpineTestLayer::init())
+        return false;
 
-bool TankExample::init() {
-    if (!SpineTestLayer::init()) return false;
-
-    _title = "Tank";
+    _title       = "Tank";
     skeletonNode = SkeletonAnimation::createWithBinaryFile("tank-pro.skel", "tank.atlas", 0.5f);
     skeletonNode->setAnimation(0, "shoot", true);
 
diff --git a/tests/cpp-tests/Classes/SpineTest/SpineTest.h b/tests/cpp-tests/Classes/SpineTest/SpineTest.h
index acc2ef616d13..9413e0d905c6 100644
--- a/tests/cpp-tests/Classes/SpineTest/SpineTest.h
+++ b/tests/cpp-tests/Classes/SpineTest/SpineTest.h
@@ -31,10 +31,10 @@
 #include <spine/spine-cocos2dx.h>
 
 #ifdef COCOS2D_DEBUG
-#include <spine/Debug.h>
+#    include <spine/Debug.h>
 #endif
 
-//DEFINE_TEST_SUITE(SpineTests);
+// DEFINE_TEST_SUITE(SpineTests);
 
 class SpineTests : public TestSuite
 {
@@ -42,6 +42,7 @@ class SpineTests : public TestSuite
     SpineTests();
 
     virtual ~SpineTests();
+
 private:
     std::vector<std::string> _searchPaths;
 #ifdef COCOS2D_DEBUG
@@ -57,16 +58,16 @@ class SpineTestLayer : public TestCase
 
     virtual bool init();
     virtual std::string title() const override;
+
 protected:
-    std::string    _title;
+    std::string _title;
     spine::SkeletonAnimation* skeletonNode = nullptr;
-    int _touchIndex = 0;
+    int _touchIndex                        = 0;
 };
 
-
-class BatchingExample : public SpineTestLayer {
+class BatchingExample : public SpineTestLayer
+{
 public:
-
     CREATE_FUNC(BatchingExample);
     ~BatchingExample();
 
@@ -79,26 +80,24 @@ class BatchingExample : public SpineTestLayer {
     spine::AnimationStateData* _stateData;
 };
 
-
-class CoinExample : public SpineTestLayer {
+class CoinExample : public SpineTestLayer
+{
 public:
-
     CREATE_FUNC(CoinExample);
 
     virtual bool init();
-
 };
-class GoblinsExample : public SpineTestLayer {
+class GoblinsExample : public SpineTestLayer
+{
 public:
     CREATE_FUNC(GoblinsExample);
-    
-    virtual bool init ();
-    
+
+    virtual bool init();
 };
 
-class IKExample : public SpineTestLayer {
+class IKExample : public SpineTestLayer
+{
 public:
-
     CREATE_FUNC(IKExample);
 
     virtual bool init();
@@ -107,9 +106,9 @@ class IKExample : public SpineTestLayer {
     cocos2d::Vec2 position;
 };
 
-class MixAndMatchExample : public SpineTestLayer {
+class MixAndMatchExample : public SpineTestLayer
+{
 public:
-    
     CREATE_FUNC(MixAndMatchExample);
 
     virtual bool init();
@@ -121,7 +120,8 @@ class MixAndMatchExample : public SpineTestLayer {
     spine::Skin* skin2;
 };
 
-class RaptorExample : public SpineTestLayer {
+class RaptorExample : public SpineTestLayer
+{
 public:
     CREATE_FUNC(RaptorExample);
 
@@ -133,7 +133,8 @@ class RaptorExample : public SpineTestLayer {
     float swirlTime;
 };
 
-class SkeletonRendererSeparatorExample : public SpineTestLayer {
+class SkeletonRendererSeparatorExample : public SpineTestLayer
+{
 public:
     CREATE_FUNC(SkeletonRendererSeparatorExample);
 
@@ -144,25 +145,24 @@ class SkeletonRendererSeparatorExample : public SpineTestLayer {
 private:
     spine::SkeletonRenderer* frontNode;
     cocos2d::DrawNode* betweenNode;
-
 };
 
-class SpineboyExample : public SpineTestLayer {
+class SpineboyExample : public SpineTestLayer
+{
 public:
     CREATE_FUNC(SpineboyExample);
 
     virtual bool init();
 
     virtual void update(float deltaTime);
-
 };
 
-class TankExample : public SpineTestLayer {
+class TankExample : public SpineTestLayer
+{
 public:
     CREATE_FUNC(TankExample);
 
     virtual bool init();
-
 };
 
-#endif // _EXAMPLELAYER_H_
+#endif  // _EXAMPLELAYER_H_
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp
index 08a77b5cf8a8..3877e0de03d5 100644
--- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp
+++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,6 @@
 #include "renderer/backend/Buffer.h"
 NS_CC_BEGIN
 
-
 DrawNode3D::DrawNode3D()
 {
     _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
@@ -50,33 +49,34 @@ DrawNode3D* DrawNode3D::create()
     {
         CC_SAFE_DELETE(ret);
     }
-    
+
     return ret;
 }
 
 void DrawNode3D::ensureCapacity(int count)
 {
-    CCASSERT(count>=0, "capacity must be >= 0");
-    
+    CCASSERT(count >= 0, "capacity must be >= 0");
+
     auto EXTENDED_SIZE = _bufferLines.size() + count;
 
     _bufferLines.reserve(EXTENDED_SIZE);
 
-    if (!_customCommand.getVertexBuffer() || _customCommand.getVertexBuffer()->getSize() < (EXTENDED_SIZE * sizeof(_bufferLines[0])))
+    if (!_customCommand.getVertexBuffer() ||
+        _customCommand.getVertexBuffer()->getSize() < (EXTENDED_SIZE * sizeof(_bufferLines[0])))
     {
-        _customCommand.createVertexBuffer(sizeof(V3F_C4B), EXTENDED_SIZE + (EXTENDED_SIZE >> 1), CustomCommand::BufferUsage::DYNAMIC);
+        _customCommand.createVertexBuffer(sizeof(V3F_C4B), EXTENDED_SIZE + (EXTENDED_SIZE >> 1),
+                                          CustomCommand::BufferUsage::DYNAMIC);
     }
-
 }
 
 bool DrawNode3D::init()
 {
-    _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
-    auto &pd = _customCommand.getPipelineDescriptor();
-    auto program = backend::Program::getBuiltinProgram(backend::ProgramType::LINE_COLOR_3D);
+    _blendFunc        = BlendFunc::ALPHA_PREMULTIPLIED;
+    auto& pd          = _customCommand.getPipelineDescriptor();
+    auto program      = backend::Program::getBuiltinProgram(backend::ProgramType::LINE_COLOR_3D);
     _programStateLine = new backend::ProgramState(program);
-    pd.programState = _programStateLine;
-    
+    pd.programState   = _programStateLine;
+
     _locMVPMatrix = _programStateLine->getUniformLocation("u_MVPMatrix");
 
     _customCommand.setBeforeCallback(CC_CALLBACK_0(DrawNode3D::onBeforeDraw, this));
@@ -91,35 +91,36 @@ bool DrawNode3D::init()
     _customCommand.setPrimitiveType(CustomCommand::PrimitiveType::LINE);
 
     const auto& attributeInfo = _programStateLine->getProgram()->getActiveAttributes();
-    auto iter = attributeInfo.find("a_position");
-    if(iter != attributeInfo.end())
+    auto iter                 = attributeInfo.find("a_position");
+    if (iter != attributeInfo.end())
     {
         layout->setAttribute("a_position", iter->second.location, backend::VertexFormat::FLOAT3, 0, false);
     }
     iter = attributeInfo.find("a_color");
-    if(iter != attributeInfo.end())
+    if (iter != attributeInfo.end())
     {
         layout->setAttribute("a_color", iter->second.location, backend::VertexFormat::UBYTE4, sizeof(Vec3), true);
     }
     layout->setLayout(sizeof(V3F_C4B));
-    
-    _customCommand.createVertexBuffer(sizeof(V3F_C4B), INITIAL_VERTEX_BUFFER_LENGTH, CustomCommand::BufferUsage::DYNAMIC);
+
+    _customCommand.createVertexBuffer(sizeof(V3F_C4B), INITIAL_VERTEX_BUFFER_LENGTH,
+                                      CustomCommand::BufferUsage::DYNAMIC);
     _isDirty = true;
 
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     // Need to listen the event only when not use batchnode, because it will use VBO
-    auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event){
-    /** listen the event that coming to foreground on Android */
+    auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event) {
+        /** listen the event that coming to foreground on Android */
         this->init();
     });
 
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 #endif
-    
+
     return true;
 }
 
-void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void DrawNode3D::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     _customCommand.init(_globalZOrder, transform, flags);
 
@@ -127,7 +128,8 @@ void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
 
     if (_isDirty && !_bufferLines.empty())
     {
-        _customCommand.updateVertexBuffer(_bufferLines.data(), (unsigned int)(_bufferLines.size() * sizeof(_bufferLines[0])));
+        _customCommand.updateVertexBuffer(_bufferLines.data(),
+                                          (unsigned int)(_bufferLines.size() * sizeof(_bufferLines[0])));
         _customCommand.setVertexDrawInfo(0, _bufferLines.size());
         _isDirty = false;
     }
@@ -138,51 +140,53 @@ void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
     }
 }
 
-void DrawNode3D::updateCommand(cocos2d::Renderer* renderer,const Mat4 &transform, uint32_t flags)
+void DrawNode3D::updateCommand(cocos2d::Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
-    auto &matrixP = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-    auto mvp = matrixP * transform;
+    auto& matrixP = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
+    auto mvp      = matrixP * transform;
 
     _programStateLine->setUniform(_locMVPMatrix, mvp.m, sizeof(mvp.m));
 
-
-    auto &blend = _customCommand.getPipelineDescriptor().blendDescriptor;
-    blend.blendEnabled = true;
+    auto& blend                = _customCommand.getPipelineDescriptor().blendDescriptor;
+    blend.blendEnabled         = true;
     blend.sourceRGBBlendFactor = blend.sourceAlphaBlendFactor = _blendFunc.src;
     blend.destinationRGBBlendFactor = blend.destinationAlphaBlendFactor = _blendFunc.dst;
 
     CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, _bufferLines.size());
 }
 
-void DrawNode3D::drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color)
+void DrawNode3D::drawLine(const Vec3& from, const Vec3& to, const Color4F& color)
 {
     unsigned int vertex_count = 2;
     ensureCapacity(vertex_count);
-    
+
     Color4B col = Color4B(color);
-    V3F_C4B a = {Vec3(from.x, from.y, from.z), col};
-    V3F_C4B b = {Vec3(to.x, to.y, to.z), col, };
+    V3F_C4B a   = {Vec3(from.x, from.y, from.z), col};
+    V3F_C4B b   = {
+        Vec3(to.x, to.y, to.z),
+        col,
+    };
 
     _bufferLines.push_back(a);
     _bufferLines.push_back(b);
-    
+
     _isDirty = true;
 }
 
-void DrawNode3D::drawCube(Vec3* vertices, const Color4F &color)
+void DrawNode3D::drawCube(Vec3* vertices, const Color4F& color)
 {
     // front face
     drawLine(vertices[0], vertices[1], color);
     drawLine(vertices[1], vertices[2], color);
     drawLine(vertices[2], vertices[3], color);
     drawLine(vertices[3], vertices[0], color);
-    
+
     // back face
     drawLine(vertices[4], vertices[5], color);
     drawLine(vertices[5], vertices[6], color);
     drawLine(vertices[6], vertices[7], color);
     drawLine(vertices[7], vertices[4], color);
-    
+
     // edge
     drawLine(vertices[0], vertices[7], color);
     drawLine(vertices[1], vertices[6], color);
@@ -201,24 +205,22 @@ const BlendFunc& DrawNode3D::getBlendFunc() const
     return _blendFunc;
 }
 
-void DrawNode3D::setBlendFunc(const BlendFunc &blendFunc)
+void DrawNode3D::setBlendFunc(const BlendFunc& blendFunc)
 {
     _blendFunc = blendFunc;
 }
 
-
 void DrawNode3D::onBeforeDraw()
 {
-    auto *renderer = Director::getInstance()->getRenderer();
+    auto* renderer            = Director::getInstance()->getRenderer();
     _rendererDepthTestEnabled = renderer->getDepthTest();
     renderer->setDepthTest(true);
 }
 
 void DrawNode3D::onAfterDraw()
 {
-    auto *renderer = Director::getInstance()->getRenderer();
+    auto* renderer = Director::getInstance()->getRenderer();
     renderer->setDepthTest(_rendererDepthTestEnabled);
 }
 
-
 NS_CC_END
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h
index 68cb1a3b1726..9326f334a0d7 100644
--- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h
+++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2014-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,88 +33,84 @@ NS_CC_BEGIN
 /**
  * Copy DrawNode for 3D geometry drawing.
  */
-class DrawNode3D: public cocos2d::Node
+class DrawNode3D : public cocos2d::Node
 {
 public:
     /** creates and initialize a DrawNode3D node */
     static cocos2d::DrawNode3D* create();
-    
+
     /**
      * Draw 3D Line
      */
-    void drawLine(const cocos2d::Vec3 &from, const cocos2d::Vec3 &to, const Color4F &color);
-    
+    void drawLine(const cocos2d::Vec3& from, const cocos2d::Vec3& to, const Color4F& color);
+
     /**
-    * Draw 3D cube
-    * @param point to a vertex array who has 8 element.
-    *        vertices[0]:Left-top-front,
-    *        vertices[1]:Left-bottom-front,
-    *        vertices[2]:Right-bottom-front,
-    *        vertices[3]:Right-top-front,
-    *        vertices[4]:Right-top-back,
-    *        vertices[5]:Right-bottom-back,
-    *        vertices[6]:Left-bottom-back,
-    *        vertices[7]:Left-top-back.
-    * @param color
-    */
-    void drawCube(cocos2d::Vec3* vertices, const Color4F &color);
-    
+     * Draw 3D cube
+     * @param point to a vertex array who has 8 element.
+     *        vertices[0]:Left-top-front,
+     *        vertices[1]:Left-bottom-front,
+     *        vertices[2]:Right-bottom-front,
+     *        vertices[3]:Right-top-front,
+     *        vertices[4]:Right-top-back,
+     *        vertices[5]:Right-bottom-back,
+     *        vertices[6]:Left-bottom-back,
+     *        vertices[7]:Left-top-back.
+     * @param color
+     */
+    void drawCube(cocos2d::Vec3* vertices, const Color4F& color);
+
     /** Clear the geometry in the node's buffer. */
     void clear();
-    
+
     /**
-    * @js NA
-    * @lua NA
-    */
+     * @js NA
+     * @lua NA
+     */
     const BlendFunc& getBlendFunc() const;
-    
+
     /**
-    * @code
-    * When this function bound into js or lua,the parameter will be changed
-    * In js: var setBlendFunc(var src, var dst)
-    * @endcode
-    * @lua NA
-    */
-    void setBlendFunc(const BlendFunc &blendFunc);
+     * @code
+     * When this function bound into js or lua,the parameter will be changed
+     * In js: var setBlendFunc(var src, var dst)
+     * @endcode
+     * @lua NA
+     */
+    void setBlendFunc(const BlendFunc& blendFunc);
 
     void updateCommand(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags);
-    
+
     // Overrides
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
-    
-CC_CONSTRUCTOR_ACCESS:
-    DrawNode3D();
+
+    CC_CONSTRUCTOR_ACCESS : DrawNode3D();
     virtual ~DrawNode3D();
     virtual bool init() override;
 
 protected:
-
     void onBeforeDraw();
     void onAfterDraw();
 
     struct V3F_C4B
     {
-        cocos2d::Vec3     vertices;
-        Color4B  colors;
+        cocos2d::Vec3 vertices;
+        Color4B colors;
     };
     void ensureCapacity(int count);
 
-
-    BlendFunc   _blendFunc;
+    BlendFunc _blendFunc;
     cocos2d::CustomCommand _customCommand;
-    backend::ProgramState* _programStateLine                    = nullptr;
-    backend::DepthStencilDescriptor *_depthstencilDescriptor    = nullptr;
+    backend::ProgramState* _programStateLine                 = nullptr;
+    backend::DepthStencilDescriptor* _depthstencilDescriptor = nullptr;
     backend::UniformLocation _locMVPMatrix;
     std::vector<V3F_C4B> _bufferLines;
-    
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(DrawNode3D);
 
-    bool _isDirty                   = true;
-    bool _rendererDepthTestEnabled  = true;
+    bool _isDirty                  = true;
+    bool _rendererDepthTestEnabled = true;
 };
 
 NS_CC_END
 
-#endif // __DRAW_NODE_3D_H__
+#endif  // __DRAW_NODE_3D_H__
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
index ead732aea947..f26008eef706 100644
--- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
+++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
@@ -157,7 +157,7 @@ std::string Sprite3DEmptyTest::subtitle() const
 
 Sprite3DBasicTest::Sprite3DBasicTest()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DBasicTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -167,22 +167,22 @@ Sprite3DBasicTest::Sprite3DBasicTest()
 
 void Sprite3DBasicTest::addNewSpriteWithCoords(Vec2 p)
 {
-    //int idx = (int)(CCRANDOM_0_1() * 1400.0f / 100.0f);
-    //int x = (idx%5) * 85;
-    //int y = (idx/5) * 121;
+    // int idx = (int)(CCRANDOM_0_1() * 1400.0f / 100.0f);
+    // int x = (idx%5) * 85;
+    // int y = (idx/5) * 121;
 
-//    //option 1: load a obj that contain the texture in it
-//    auto sprite = Sprite3D::create("sprite3dTest/scene01.obj");
+    //    //option 1: load a obj that contain the texture in it
+    //    auto sprite = Sprite3D::create("sprite3dTest/scene01.obj");
 
-    //option 2: load obj and assign the texture
+    // option 2: load obj and assign the texture
     auto sprite = Sprite3D::create("Sprite3DTest/boss1.obj");
     sprite->setScale(3.f);
     sprite->setTexture("Sprite3DTest/boss.png");
 
     //
-    //sprite->setEffect(cocos2d::EFFECT_OUTLINE);
+    // sprite->setEffect(cocos2d::EFFECT_OUTLINE);
 
-    //add to scene
+    // add to scene
     addChild(sprite);
 
     sprite->setPosition(Vec2(p.x, p.y));
@@ -201,7 +201,7 @@ void Sprite3DBasicTest::addNewSpriteWithCoords(Vec2 p)
     else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
+    auto seq         = Sequence::create(action, action_back, nullptr);
 
     sprite->runAction(RepeatForever::create(seq));
 }
@@ -234,42 +234,39 @@ std::string Sprite3DBasicTest::subtitle() const
 
 Sprite3DUVAnimationTest::Sprite3DUVAnimationTest()
 {
-    //the offset use to translating texture
+    // the offset use to translating texture
     _cylinder_texture_offset = 0;
-    _shining_duration = 0;
-    Size visibleSize = Director::getInstance()->getVisibleSize();
+    _shining_duration        = 0;
+    Size visibleSize         = Director::getInstance()->getVisibleSize();
 
-    //use custom camera
+    // use custom camera
     auto camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
     camera->setCameraFlag(CameraFlag::USER1);
 
-    //create cylinder
+    // create cylinder
     auto cylinder = Sprite3D::create("Sprite3DTest/cylinder.c3b");
-    auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/UVAnimation.material");
-    _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
+    auto mat      = Sprite3DMaterial::createWithFilename("Sprite3DTest/UVAnimation.material");
+    _state        = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
     cylinder->setMaterial(mat);
 
     this->addChild(cylinder);
     this->setCameraMask(2);
     this->addChild(camera);
 
-    //adjust cylinder's position & rotation
+    // adjust cylinder's position & rotation
     cylinder->setPosition3D(Vec3(0.0f, -15.0f, -50.0f));
     cylinder->setRotation3D(Vec3(-90.0f, 0.0f, 0.0f));
 
-    //the callback function update cylinder's texcoord
+    // the callback function update cylinder's texcoord
     schedule(CC_SCHEDULE_SELECTOR(Sprite3DUVAnimationTest::cylinderUpdate));
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [=](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [=](EventCustom*) {
         auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/UVAnimation.material");
 
         cylinder->setMaterial(mat);
         _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, -1);
 #endif
 }
@@ -293,23 +290,25 @@ std::string Sprite3DUVAnimationTest::subtitle() const
 
 void Sprite3DUVAnimationTest::cylinderUpdate(float dt)
 {
-    //callback function to update cylinder's texcoord
+    // callback function to update cylinder's texcoord
     static bool fade_in = true;
-    _cylinder_texture_offset += 0.3*dt;
+    _cylinder_texture_offset += 0.3 * dt;
     _cylinder_texture_offset = (_cylinder_texture_offset > 1) ? 0 : _cylinder_texture_offset;
     if (fade_in)
     {
         _shining_duration += 0.5 * dt;
-        if (_shining_duration > 1) fade_in = false;
+        if (_shining_duration > 1)
+            fade_in = false;
     }
     else
     {
         _shining_duration -= 0.5 * dt;
-        if (_shining_duration < 0) fade_in = true;
+        if (_shining_duration < 0)
+            fade_in = true;
     }
 
-    //pass the result to shader
-    auto offsetLoc = _state->getUniformLocation("offset");
+    // pass the result to shader
+    auto offsetLoc   = _state->getUniformLocation("offset");
     auto durationLoc = _state->getUniformLocation("duration");
     _state->setUniform(offsetLoc, &_cylinder_texture_offset, sizeof(_cylinder_texture_offset));
     _state->setUniform(durationLoc, &_shining_duration, sizeof(_shining_duration));
@@ -324,7 +323,7 @@ Sprite3DFakeShadowTest::Sprite3DFakeShadowTest()
 {
     Size visibleSize = Director::getInstance()->getVisibleSize();
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(Sprite3DFakeShadowTest::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(Sprite3DFakeShadowTest::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DFakeShadowTest::onTouchesEnded, this);
@@ -332,35 +331,33 @@ Sprite3DFakeShadowTest::Sprite3DFakeShadowTest()
 
     auto layer = Layer::create();
     addChild(layer, 0);
-    //create Camera
+    // create Camera
     _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
     _camera->setCameraFlag(CameraFlag::USER1);
     _camera->setPosition3D(Vec3(0.0f, 20.0f, 25.0f));
     _camera->setRotation3D(Vec3(-60.0f, 0.0f, 0.0f));
 
-    //create a plane
+    // create a plane
     _plane = Sprite3D::create("Sprite3DTest/plane.c3t");
     _plane->setRotation3D(Vec3(90.0f, 0.0f, 0.0f));
 
-
     auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/FakeShadow.material");
-    _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
+    _state   = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
     _plane->setMaterial(mat);
 
-
-    auto location = _state->getUniformLocation("u_model_matrix");
+    auto location  = _state->getUniformLocation("u_model_matrix");
     auto transform = _plane->getNodeToWorldTransform();
     _state->setUniform(location, transform.m, sizeof(transform.m));
 
     layer->addChild(_plane);
 
-    //create the orc
+    // create the orc
     _orc = Sprite3D::create("Sprite3DTest/orc.c3b");
     _orc->setScale(0.2f);
     _orc->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     _orc->setPosition3D(Vec3(0.0f, 0.0f, 10.0f));
     _targetPos = _orc->getPosition3D();
-    location = _state->getUniformLocation("u_target_pos");
+    location   = _state->getUniformLocation("u_target_pos");
     _state->setUniform(location, &_targetPos, sizeof(_targetPos));
     layer->addChild(_orc);
     layer->addChild(_camera);
@@ -369,20 +366,17 @@ Sprite3DFakeShadowTest::Sprite3DFakeShadowTest()
     schedule(CC_SCHEDULE_SELECTOR(Sprite3DFakeShadowTest::updateCamera), 0.0f);
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [this](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom*) {
         auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/FakeShadow.material");
-        _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
+        _state   = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
         _plane->setMaterial(mat);
         backend::UniformLocation loc = _state->getUniformLocation("u_model_matrix");
-        auto trans = _plane->getNodeToWorldTransform();
+        auto trans                   = _plane->getNodeToWorldTransform();
         _state->setUniform(loc, &trans, sizeof(trans));
-        loc = _state->getUniformLocation("u_target_pos");
+        loc      = _state->getUniformLocation("u_target_pos");
         auto pos = _orc->getPosition3D();
         _state->setUniform(loc, &pos, sizeof(pos));
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, -1);
 #endif
 }
@@ -407,7 +401,6 @@ std::string Sprite3DFakeShadowTest::subtitle() const
 void Sprite3DFakeShadowTest::Move(cocos2d::Ref* sender, int value)
 {
     _orc->setPositionX(_orc->getPositionX() + value);
-
 }
 
 void Sprite3DFakeShadowTest::updateCamera(float fDelta)
@@ -421,7 +414,7 @@ void Sprite3DFakeShadowTest::updateCamera(float fDelta)
             Vec3 curPos = _orc->getPosition3D();
 
             Vec3 newFaceDir = _targetPos - curPos;
-            newFaceDir.y = 0;
+            newFaceDir.y    = 0;
             newFaceDir.normalize();
             Vec3 up;
             _orc->getNodeToWorldTransform().getUpVector(&up);
@@ -441,8 +434,8 @@ void Sprite3DFakeShadowTest::updateCamera(float fDelta)
             mat.m[6] = up.z;
             mat.m[7] = 0.0f;
 
-            mat.m[8] = newFaceDir.x;
-            mat.m[9] = newFaceDir.y;
+            mat.m[8]  = newFaceDir.x;
+            mat.m[9]  = newFaceDir.y;
             mat.m[10] = newFaceDir.z;
             mat.m[11] = 0.0f;
 
@@ -455,19 +448,18 @@ void Sprite3DFakeShadowTest::updateCamera(float fDelta)
     }
 }
 
-
 void Sprite3DFakeShadowTest::move3D(float elapsedTime)
 {
-    Vec3 curPos = _orc->getPosition3D();
+    Vec3 curPos     = _orc->getPosition3D();
     Vec3 newFaceDir = _targetPos - curPos;
-    newFaceDir.y = 0.0f;
+    newFaceDir.y    = 0.0f;
     newFaceDir.normalize();
     Vec3 offset = newFaceDir * 25.0f * elapsedTime;
     curPos += offset;
     _orc->setPosition3D(curPos);
     offset.x = offset.x;
     offset.z = offset.z;
-    //pass the newest orc position
+    // pass the newest orc position
     auto location = _state->getUniformLocation("u_target_pos");
     auto position = _orc->getPosition3D();
     _state->setUniform(location, &position, sizeof(position));
@@ -481,10 +473,10 @@ void Sprite3DFakeShadowTest::updateState(float elapsedTime)
     curFaceDir = -curFaceDir;
     curFaceDir.normalize();
     Vec3 newFaceDir = _targetPos - curPos;
-    newFaceDir.y = 0.0f;
+    newFaceDir.y    = 0.0f;
     newFaceDir.normalize();
     float cosAngle = std::fabs(Vec3::dot(curFaceDir, newFaceDir) - 1.0f);
-    float dist = curPos.distanceSquared(_targetPos);
+    float dist     = curPos.distanceSquared(_targetPos);
     if (dist <= 4.0f)
     {
         if (cosAngle <= 0.01f)
@@ -506,20 +498,15 @@ bool Sprite3DFakeShadowTest::isState(unsigned int state, unsigned int bit) const
     return (state & bit) == bit;
 }
 
-void Sprite3DFakeShadowTest::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event *event)
-{
+void Sprite3DFakeShadowTest::onTouchesBegan(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
 
-}
+void Sprite3DFakeShadowTest::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event) {}
 
-void Sprite3DFakeShadowTest::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event *event)
+void Sprite3DFakeShadowTest::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
-}
-
-void Sprite3DFakeShadowTest::onTouchesEnded(const std::vector<Touch*>& touches, cocos2d::Event *event)
-{
-    for (auto &item : touches)
+    for (auto& item : touches)
     {
-        auto touch = item;
+        auto touch    = item;
         auto location = touch->getLocationInView();
         if (_camera)
         {
@@ -528,16 +515,16 @@ void Sprite3DFakeShadowTest::onTouchesEnded(const std::vector<Touch*>& touches,
                 Vec3 nearP(location.x, location.y, -1.0f), farP(location.x, location.y, 1.0f);
 
                 auto size = Director::getInstance()->getWinSize();
-                nearP = _camera->unproject(nearP);
-                farP = _camera->unproject(farP);
+                nearP     = _camera->unproject(nearP);
+                farP      = _camera->unproject(farP);
                 Vec3 dir(farP - nearP);
                 float dist = 0.0f;
-                float ndd = Vec3::dot(Vec3(0, 1, 0), dir);
+                float ndd  = Vec3::dot(Vec3(0, 1, 0), dir);
                 if (ndd == 0)
                     dist = 0.0f;
                 float ndo = Vec3::dot(Vec3(0, 1, 0), nearP);
-                dist = (0 - ndo) / ndd;
-                Vec3 p = nearP + dist * dir;
+                dist      = (0 - ndo) / ndd;
+                Vec3 p    = nearP + dist * dir;
 
                 if (p.x > 100)
                     p.x = 100;
@@ -562,12 +549,12 @@ void Sprite3DFakeShadowTest::onTouchesEnded(const std::vector<Touch*>& touches,
 Sprite3DBasicToonShaderTest::Sprite3DBasicToonShaderTest()
 {
     Size visibleSize = Director::getInstance()->getVisibleSize();
-    auto _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
+    auto _camera     = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
     _camera->setCameraFlag(CameraFlag::USER1);
     // create a teapot
     auto teapot = Sprite3D::create("Sprite3DTest/teapot.c3b");
-    auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/BasicToon.material");
-    _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
+    auto mat    = Sprite3DMaterial::createWithFilename("Sprite3DTest/BasicToon.material");
+    _state      = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
     teapot->setMaterial(mat);
 
     teapot->setPosition3D(Vec3(0.0f, -5.0f, -20.0f));
@@ -578,14 +565,11 @@ Sprite3DBasicToonShaderTest::Sprite3DBasicToonShaderTest()
     addChild(_camera);
     setCameraMask(2);
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [=](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [=](EventCustom*) {
         auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/BasicToon.material");
-        _state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
+        _state   = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
         teapot->setMaterial(mat);
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, -1);
 #endif
 }
@@ -609,15 +593,15 @@ std::string Sprite3DBasicToonShaderTest::subtitle() const
 
 //------------------------------------------------------------------
 //
-// Sprite3DLightMapTest 
+// Sprite3DLightMapTest
 //
 //------------------------------------------------------------------
 Sprite3DLightMapTest::Sprite3DLightMapTest()
 {
-    //the assets are from the OpenVR demo
-    //get the visible size.
+    // the assets are from the OpenVR demo
+    // get the visible size.
     Size visibleSize = Director::getInstance()->getVisibleSize();
-    _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
+    _camera          = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
     _camera->setCameraFlag(CameraFlag::USER1);
     _camera->setPosition3D(Vec3(0.0f, 25.0f, 15.0f));
     _camera->setRotation3D(Vec3(-35.0f, 0.0f, 0.0f));
@@ -627,22 +611,19 @@ Sprite3DLightMapTest::Sprite3DLightMapTest()
     addChild(_camera);
     setCameraMask(2);
 
-    //add a point light
+    // add a point light
     auto light = PointLight::create(Vec3(35, 75, -20.5), Color3B(255, 255, 255), 150);
     addChild(light);
-    //set the ambient light 
+    // set the ambient light
     auto ambient = AmbientLight::create(Color3B(55, 55, 55));
     addChild(ambient);
 
-    //create a listener
-    auto listener = EventListenerTouchAllAtOnce::create();
+    // create a listener
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(Sprite3DLightMapTest::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
-Sprite3DLightMapTest::~Sprite3DLightMapTest()
-{
-
-}
+Sprite3DLightMapTest::~Sprite3DLightMapTest() {}
 std::string Sprite3DLightMapTest::title() const
 {
     return "light map test";
@@ -657,11 +638,11 @@ void Sprite3DLightMapTest::onTouchesMoved(const std::vector<cocos2d::Touch*>& to
 {
     if (touches.size() == 1)
     {
-        float delta = Director::getInstance()->getDeltaTime();
-        auto touch = touches[0];
-        auto location = touch->getLocation();
+        float delta           = Director::getInstance()->getDeltaTime();
+        auto touch            = touches[0];
+        auto location         = touch->getLocation();
         auto PreviousLocation = touch->getPreviousLocation();
-        Point newPos = PreviousLocation - location;
+        Point newPos          = PreviousLocation - location;
 
         Vec3 cameraDir;
         Vec3 cameraRightDir;
@@ -671,9 +652,9 @@ void Sprite3DLightMapTest::onTouchesMoved(const std::vector<cocos2d::Touch*>& to
         _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
         cameraRightDir.normalize();
         cameraRightDir.y = 0;
-        Vec3 cameraPos = _camera->getPosition3D();
-        cameraPos += cameraDir * newPos.y*delta;
-        cameraPos += cameraRightDir * newPos.x*delta;
+        Vec3 cameraPos   = _camera->getPosition3D();
+        cameraPos += cameraDir * newPos.y * delta;
+        cameraPos += cameraRightDir * newPos.x * delta;
         _camera->setPosition3D(cameraPos);
     }
 }
@@ -693,7 +674,7 @@ Sprite3DHitTest::Sprite3DHitTest()
     sprite1->setTexture("Sprite3DTest/boss.png");
     sprite1->setPosition(Vec2(s.width / 2, s.height / 2));
 
-    //add to scene
+    // add to scene
     addChild(sprite1);
     sprite1->runAction(RepeatForever::create(RotateBy::create(3.0f, 360.0f)));
 
@@ -704,11 +685,10 @@ Sprite3DHitTest::Sprite3DHitTest()
     sprite2->setPosition(Vec2(s.width / 2, s.height / 2));
     sprite2->setAnchorPoint(Vec2(0.5f, 0.5f));
 
-    //add to scene
+    // add to scene
     addChild(sprite2);
     sprite2->runAction(RepeatForever::create(RotateBy::create(3.0f, -360.0f)));
 
-
     // Make sprite1 touchable
     auto listener1 = EventListenerTouchOneByOne::create();
     listener1->setSwallowTouches(true);
@@ -739,7 +719,6 @@ Sprite3DHitTest::Sprite3DHitTest()
 
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2);
-
 }
 
 std::string Sprite3DHitTest::title() const
@@ -757,21 +736,18 @@ Sprite3DEffectTest::Sprite3DEffectTest()
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DEffectTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [this](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom*) {
         auto material = Sprite3DMaterial::createWithFilename("Sprite3DTest/outline.material");
         material->setTechnique("outline_noneskinned");
         for (auto& sprite : _sprites)
         {
             sprite->setMaterial(material->clone());
         }
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, 1);
 #endif
 }
@@ -794,15 +770,15 @@ std::string Sprite3DEffectTest::subtitle() const
 
 void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p)
 {
-    //option 2: load obj and assign the texture
-    auto sprite = Sprite3D::create("Sprite3DTest/boss1.obj");
+    // option 2: load obj and assign the texture
+    auto sprite   = Sprite3D::create("Sprite3DTest/boss1.obj");
     auto material = Sprite3DMaterial::createWithFilename("Sprite3DTest/outline.material");
     material->setTechnique("outline_noneskinned");
     sprite->setMaterial(material);
     sprite->setScale(6.f);
     Director::getInstance()->getTextureCache()->removeUnusedTextures();
 
-    //add to scene
+    // add to scene
     addChild(sprite);
 
     sprite->setPosition(Vec2(p.x, p.y));
@@ -821,7 +797,7 @@ void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p)
     else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
+    auto seq         = Sequence::create(action, action_back, nullptr);
 
     sprite->runAction(RepeatForever::create(seq));
     _sprites.push_back(sprite);
@@ -846,7 +822,8 @@ AsyncLoadSprite3DTest::AsyncLoadSprite3DTest()
 
     TTFConfig ttfConfig("fonts/arial.ttf", 15);
     auto label1 = Label::createWithTTF(ttfConfig, "AsyncLoad Sprite3D");
-    auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(AsyncLoadSprite3DTest::menuCallback_asyncLoadSprite, this));
+    auto item1 =
+        MenuItemLabel::create(label1, CC_CALLBACK_1(AsyncLoadSprite3DTest::menuCallback_asyncLoadSprite, this));
 
     auto s = Director::getInstance()->getWinSize();
     item1->setPosition(s.width * .5f, s.height * .8f);
@@ -862,9 +839,7 @@ AsyncLoadSprite3DTest::AsyncLoadSprite3DTest()
     menuCallback_asyncLoadSprite(nullptr);
 }
 
-AsyncLoadSprite3DTest::~AsyncLoadSprite3DTest()
-{
-}
+AsyncLoadSprite3DTest::~AsyncLoadSprite3DTest() {}
 
 std::string AsyncLoadSprite3DTest::title() const
 {
@@ -877,43 +852,45 @@ std::string AsyncLoadSprite3DTest::subtitle() const
 
 void AsyncLoadSprite3DTest::menuCallback_asyncLoadSprite(Ref* sender)
 {
-    //Note that you must stop the tasks before leaving the scene.
+    // Note that you must stop the tasks before leaving the scene.
     AsyncTaskPool::getInstance()->stopTasks(AsyncTaskPool::TaskType::TASK_IO);
 
     auto node = getChildByTag(101);
-    node->removeAllChildren(); //remove all loaded sprite
+    node->removeAllChildren();  // remove all loaded sprite
 
-    //remove cache data
+    // remove cache data
     Sprite3DCache::getInstance()->removeAllSprite3DData();
     int32_t index = 0;
-    for (const auto& path : _paths) {
+    for (const auto& path : _paths)
+    {
         Sprite3D::createAsync(path, CC_CALLBACK_2(AsyncLoadSprite3DTest::asyncLoad_Callback, this), (void*)index++);
     }
 }
 
 void AsyncLoadSprite3DTest::asyncLoad_Callback(Sprite3D* sprite, void* param)
 {
-    auto index = static_cast<int>((uintptr_t)param);
-    auto node = getChildByTag(101);
-    auto s = Director::getInstance()->getWinSize();
+    auto index  = static_cast<int>((uintptr_t)param);
+    auto node   = getChildByTag(101);
+    auto s      = Director::getInstance()->getWinSize();
     float width = s.width / _paths.size();
     Vec2 point(width * (0.5f + index), s.height / 2.f);
     sprite->setPosition(point);
     node->addChild(sprite);
 }
 
-
 Sprite3DWithSkinTest::Sprite3DWithSkinTest()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithSkinTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
-    // switch animation quality. In fact, you can set the sprite3d out of frustum to Animate3DQuality::QUALITY_NONE, it can save a lot of cpu time
+    // switch animation quality. In fact, you can set the sprite3d out of frustum to Animate3DQuality::QUALITY_NONE, it
+    // can save a lot of cpu time
     MenuItemFont::setFontName("fonts/arial.ttf");
     MenuItemFont::setFontSize(15);
     _animateQuality = (int)Animate3DQuality::QUALITY_LOW;
-    _menuItem = MenuItemFont::create(getAnimationQualityMessage(), CC_CALLBACK_1(Sprite3DWithSkinTest::switchAnimationQualityCallback, this));
+    _menuItem       = MenuItemFont::create(getAnimationQualityMessage(),
+                                           CC_CALLBACK_1(Sprite3DWithSkinTest::switchAnimationQualityCallback, this));
     _menuItem->setColor(Color3B(0, 200, 20));
     auto menu = Menu::create(_menuItem, NULL);
     menu->setPosition(Vec2::ZERO);
@@ -937,7 +914,7 @@ std::string Sprite3DWithSkinTest::subtitle() const
 void Sprite3DWithSkinTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/orc.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(3);
     sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     sprite->setPosition(Vec2(p.x, p.y));
@@ -950,7 +927,7 @@ void Sprite3DWithSkinTest::addNewSpriteWithCoords(Vec2 p)
         auto animate = Animate3D::create(animation);
         bool inverse = (std::rand() % 3 == 0);
 
-        int rand2 = std::rand();
+        int rand2   = std::rand();
         float speed = 1.0f;
         if (rand2 % 3 == 1)
         {
@@ -992,7 +969,7 @@ void Sprite3DWithSkinTest::switchAnimationQualityCallback(Ref* sender)
     for (auto iter : _sprits)
     {
         RepeatForever* repAction = dynamic_cast<RepeatForever*>(iter->getActionByTag(110));
-        Animate3D* animate3D = dynamic_cast<Animate3D*>(repAction->getInnerAction());
+        Animate3D* animate3D     = dynamic_cast<Animate3D*>(repAction->getInnerAction());
         animate3D->setQuality((Animate3DQuality)_animateQuality);
     }
 }
@@ -1009,7 +986,7 @@ void Sprite3DWithSkinTest::onTouchesEnded(const std::vector<Touch*>& touches, Ev
 
 Sprite3DWithSkinOutlineTest::Sprite3DWithSkinOutlineTest()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithSkinOutlineTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -1017,17 +994,14 @@ Sprite3DWithSkinOutlineTest::Sprite3DWithSkinOutlineTest()
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [this](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom*) {
         auto material = Sprite3DMaterial::createWithFilename("Sprite3DTest/outline.material");
         material->setTechnique("outline_skinned");
         for (auto& sprite : _sprites)
         {
             sprite->setMaterial(material->clone());
         }
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, 1);
 #endif
 }
@@ -1050,7 +1024,7 @@ void Sprite3DWithSkinOutlineTest::addNewSpriteWithCoords(Vec2 p)
 {
 
     std::string fileName = "Sprite3DTest/orc.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
 
     auto material = Sprite3DMaterial::createWithFilename("Sprite3DTest/outline.material");
     material->setTechnique("outline_skinned");
@@ -1067,7 +1041,7 @@ void Sprite3DWithSkinOutlineTest::addNewSpriteWithCoords(Vec2 p)
         auto animate = Animate3D::create(animation);
         bool inverse = (std::rand() % 3 == 0);
 
-        int rand2 = std::rand();
+        int rand2   = std::rand();
         float speed = 1.0f;
         if (rand2 % 3 == 1)
         {
@@ -1094,15 +1068,11 @@ void Sprite3DWithSkinOutlineTest::onTouchesEnded(const std::vector<Touch*>& touc
 }
 
 Animate3DTest::Animate3DTest()
-    : _sprite(nullptr)
-    , _swim(nullptr)
-    , _hurt(nullptr)
-    , _elapseTransTime(0.f)
-    , _moveAction(nullptr)
+    : _sprite(nullptr), _swim(nullptr), _hurt(nullptr), _elapseTransTime(0.f), _moveAction(nullptr)
 {
     addSprite3D();
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Animate3DTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -1152,17 +1122,17 @@ void Animate3DTest::update(float dt)
 void Animate3DTest::addSprite3D()
 {
     std::string fileName = "Sprite3DTest/tortoise.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(0.1f);
     auto s = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(s.width * 4.f / 5.f, s.height / 2.f));
     addChild(sprite);
-    _sprite = sprite;
+    _sprite        = sprite;
     auto animation = Animation3D::create(fileName);
     if (animation)
     {
         auto animate = Animate3D::create(animation, 0.f, 1.933f);
-        _swim = RepeatForever::create(animate);
+        _swim        = RepeatForever::create(animate);
         sprite->runAction(_swim);
 
         _swim->retain();
@@ -1173,7 +1143,8 @@ void Animate3DTest::addSprite3D()
 
     _moveAction = MoveTo::create(4.f, Vec2(s.width / 5.f, s.height / 2.f));
     _moveAction->retain();
-    auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(Animate3DTest::reachEndCallBack, this)), nullptr);
+    auto seq =
+        Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(Animate3DTest::reachEndCallBack, this)), nullptr);
     seq->setTag(100);
     sprite->runAction(seq);
 }
@@ -1186,17 +1157,18 @@ void Animate3DTest::reachEndCallBack()
     inverse->retain();
     _moveAction->release();
     _moveAction = inverse;
-    auto rot = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f));
-    auto seq = Sequence::create(rot, _moveAction, CallFunc::create(CC_CALLBACK_0(Animate3DTest::reachEndCallBack, this)), nullptr);
+    auto rot    = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f));
+    auto seq    = Sequence::create(rot, _moveAction,
+                                   CallFunc::create(CC_CALLBACK_0(Animate3DTest::reachEndCallBack, this)), nullptr);
     seq->setTag(100);
     _sprite->runAction(seq);
 }
 
 void Animate3DTest::renewCallBack()
 {
-    //rerun swim action
+    // rerun swim action
     _sprite->runAction(_swim);
-    _state = State::HURT_TO_SWIMMING;
+    _state           = State::HURT_TO_SWIMMING;
     _elapseTransTime = 0.0f;
 }
 
@@ -1211,15 +1183,16 @@ void Animate3DTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* ev
             float len = (_sprite->getPosition() - location).length();
             if (len < 40)
             {
-                //hurt the tortoise
+                // hurt the tortoise
                 if (_state == State::SWIMMING)
                 {
                     _elapseTransTime = 0.0f;
-                    _state = State::SWIMMING_TO_HURT;
+                    _state           = State::SWIMMING_TO_HURT;
                     _sprite->stopAction(_hurt);
                     _sprite->runAction(_hurt);
                     auto delay = DelayTime::create(_hurt->getDuration() - Animate3D::getTransitionTime());
-                    auto seq = Sequence::create(delay, CallFunc::create(CC_CALLBACK_0(Animate3DTest::renewCallBack, this)), nullptr);
+                    auto seq   = Sequence::create(
+                          delay, CallFunc::create(CC_CALLBACK_0(Animate3DTest::renewCallBack, this)), nullptr);
                     seq->setTag(101);
                     _sprite->runAction(seq);
                 }
@@ -1229,14 +1202,12 @@ void Animate3DTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* ev
     }
 }
 
-AttachmentTest::AttachmentTest()
-    : _hasWeapon(false)
-    , _sprite(nullptr)
+AttachmentTest::AttachmentTest() : _hasWeapon(false), _sprite(nullptr)
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(AttachmentTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
@@ -1252,13 +1223,13 @@ std::string AttachmentTest::subtitle() const
 void AttachmentTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/orc.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(5);
     sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     addChild(sprite);
     sprite->setPosition(Vec2(p.x, p.y));
 
-    //test attach
+    // test attach
     auto sp = Sprite3D::create("Sprite3DTest/axe.c3b");
     sprite->getAttachNode("Bip001 R Hand")->addChild(sp);
 
@@ -1269,7 +1240,7 @@ void AttachmentTest::addNewSpriteWithCoords(Vec2 p)
 
         sprite->runAction(RepeatForever::create(animate));
     }
-    _sprite = sprite;
+    _sprite    = sprite;
     _hasWeapon = true;
 }
 
@@ -1287,26 +1258,25 @@ void AttachmentTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* e
     _hasWeapon = !_hasWeapon;
 }
 
-Sprite3DReskinTest::Sprite3DReskinTest()
-    : _sprite(nullptr)
+Sprite3DReskinTest::Sprite3DReskinTest() : _sprite(nullptr)
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DReskinTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
     auto label1 = Label::createWithTTF(ttfConfig, "Hair");
-    auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
+    auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
     auto label2 = Label::createWithTTF(ttfConfig, "Glasses");
-    auto item2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
+    auto item2  = MenuItemLabel::create(label2, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
     auto label3 = Label::createWithTTF(ttfConfig, "Coat");
-    auto item3 = MenuItemLabel::create(label3, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
+    auto item3  = MenuItemLabel::create(label3, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
     auto label4 = Label::createWithTTF(ttfConfig, "Pants");
-    auto item4 = MenuItemLabel::create(label4, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
+    auto item4  = MenuItemLabel::create(label4, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
     auto label5 = Label::createWithTTF(ttfConfig, "Shoes");
-    auto item5 = MenuItemLabel::create(label5, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
+    auto item5  = MenuItemLabel::create(label5, CC_CALLBACK_1(Sprite3DReskinTest::menuCallback_reSkin, this));
     item1->setPosition(Vec2(VisibleRect::left().x + 50, VisibleRect::bottom().y + item1->getContentSize().height * 4));
     item2->setPosition(Vec2(VisibleRect::left().x + 50, VisibleRect::bottom().y + item1->getContentSize().height * 5));
     item3->setPosition(Vec2(VisibleRect::left().x + 50, VisibleRect::bottom().y + item1->getContentSize().height * 6));
@@ -1320,7 +1290,6 @@ Sprite3DReskinTest::Sprite3DReskinTest()
     auto pMenu1 = Menu::create(item1, item2, item3, item4, item5, nullptr);
     pMenu1->setPosition(Vec2(0.0f, 0.0f));
     this->addChild(pMenu1, 10);
-
 }
 void Sprite3DReskinTest::menuCallback_reSkin(Ref* sender)
 {
@@ -1344,7 +1313,7 @@ std::string Sprite3DReskinTest::subtitle() const
 void Sprite3DReskinTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/ReskinGirl.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(4);
     sprite->setRotation3D(Vec3(0.0f, 0.0f, 0.0f));
     addChild(sprite);
@@ -1391,16 +1360,16 @@ void Sprite3DReskinTest::addNewSpriteWithCoords(Vec2 p)
     applyCurSkin();
 }
 
-void Sprite3DReskinTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
-{
-}
+void Sprite3DReskinTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event) {}
 
 void Sprite3DReskinTest::applyCurSkin()
 {
-    for (ssize_t i = 0; i < _sprite->getMeshCount(); i++) {
-        auto mesh = _sprite->getMeshByIndex(static_cast<int>(i));
+    for (ssize_t i = 0; i < _sprite->getMeshCount(); i++)
+    {
+        auto mesh      = _sprite->getMeshByIndex(static_cast<int>(i));
         bool isVisible = false;
-        for (int j = 0; j < (int)SkinType::MAX_TYPE; j++) {
+        for (int j = 0; j < (int)SkinType::MAX_TYPE; j++)
+        {
             if (mesh->getName() == _skins[j].at(_curSkin[j]))
             {
                 isVisible = true;
@@ -1413,7 +1382,7 @@ void Sprite3DReskinTest::applyCurSkin()
 
 Sprite3DWithOBBPerformanceTest::Sprite3DWithOBBPerformanceTest()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(Sprite3DWithOBBPerformanceTest::onTouchesBegan, this);
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithOBBPerformanceTest::onTouchesEnded, this);
     listener->onTouchesMoved = CC_CALLBACK_2(Sprite3DWithOBBPerformanceTest::onTouchesMoved, this);
@@ -1455,7 +1424,7 @@ void Sprite3DWithOBBPerformanceTest::addNewOBBWithCoords(Vec2 p)
 {
     Vec3 extents = Vec3(10, 10, 10);
     AABB aabb(-extents, extents);
-    auto obb = OBB(aabb);
+    auto obb    = OBB(aabb);
     obb._center = Vec3(p.x, p.y, 0);
     _obb.push_back(obb);
 }
@@ -1465,7 +1434,7 @@ void Sprite3DWithOBBPerformanceTest::onTouchesBegan(const std::vector<Touch*>& t
     for (const auto& touch : touches)
     {
         auto location = touch->getLocationInView();
-        auto obbSize = _obb.size();
+        auto obbSize  = _obb.size();
         if (obbSize)
         {
             _intersetList.clear();
@@ -1483,17 +1452,14 @@ void Sprite3DWithOBBPerformanceTest::onTouchesBegan(const std::vector<Touch*>& t
     }
 }
 
-void Sprite3DWithOBBPerformanceTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
-{
-
-}
+void Sprite3DWithOBBPerformanceTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event) {}
 
 void Sprite3DWithOBBPerformanceTest::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     for (const auto& touch : touches)
     {
         auto location = touch->getLocation();
-        auto obbSize = _obb.size();
+        auto obbSize  = _obb.size();
 
         for (decltype(obbSize) i = 0; i < obbSize; i++)
         {
@@ -1544,16 +1510,16 @@ void Sprite3DWithOBBPerformanceTest::initDrawBox()
 void Sprite3DWithOBBPerformanceTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/tortoise.c3b";
-    auto sprite = Sprite3D::create(fileName);
-    AABB aabb = sprite->getAABB();
-    _obbt = OBB(aabb);
-    _obbtOri = _obbt;
+    auto sprite          = Sprite3D::create(fileName);
+    AABB aabb            = sprite->getAABB();
+    _obbt                = OBB(aabb);
+    _obbtOri             = _obbt;
 
     sprite->setScale(0.1f);
     auto s = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(s.width * 4.f / 5.f, s.height / 2.f));
     addChild(sprite);
-    _sprite = sprite;
+    _sprite        = sprite;
     auto animation = Animation3D::create(fileName);
     if (animation)
     {
@@ -1563,12 +1529,11 @@ void Sprite3DWithOBBPerformanceTest::addNewSpriteWithCoords(Vec2 p)
 
     _moveAction = MoveTo::create(4.f, Vec2(s.width / 5.f, s.height / 2.f));
     _moveAction->retain();
-    auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerformanceTest::reachEndCallBack, this)), nullptr);
+    auto seq = Sequence::create(
+        _moveAction, CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerformanceTest::reachEndCallBack, this)), nullptr);
     seq->setTag(100);
     sprite->runAction(seq);
 
-
-
     _drawDebug = DrawNode3D::create();
     addChild(_drawDebug);
 }
@@ -1581,8 +1546,10 @@ void Sprite3DWithOBBPerformanceTest::reachEndCallBack()
     inverse->retain();
     _moveAction->release();
     _moveAction = inverse;
-    auto rot = RotateBy::create(1.0f, Vec3(0.f, 180.f, 0.f));
-    auto seq = Sequence::create(rot, _moveAction, CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerformanceTest::reachEndCallBack, this)), nullptr);
+    auto rot    = RotateBy::create(1.0f, Vec3(0.f, 180.f, 0.f));
+    auto seq    = Sequence::create(rot, _moveAction,
+                                   CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerformanceTest::reachEndCallBack, this)),
+                                   nullptr);
     seq->setTag(100);
     _sprite->runAction(seq);
 }
@@ -1596,10 +1563,11 @@ void Sprite3DWithOBBPerformanceTest::addOBBWithCount(float value)
 {
     for (int i = 0; i < value; i++)
     {
-        Vec2 randompos = Vec2(CCRANDOM_0_1() * Director::getInstance()->getWinSize().width, CCRANDOM_0_1() * Director::getInstance()->getWinSize().height);
-        Vec3 extents = Vec3(10, 10, 10);
+        Vec2 randompos = Vec2(CCRANDOM_0_1() * Director::getInstance()->getWinSize().width,
+                              CCRANDOM_0_1() * Director::getInstance()->getWinSize().height);
+        Vec3 extents   = Vec3(10, 10, 10);
         AABB aabb(-extents, extents);
-        auto obb = OBB(aabb);
+        auto obb    = OBB(aabb);
         obb._center = Vec3(randompos.x, randompos.y, 0);
         _obb.push_back(obb);
     }
@@ -1645,9 +1613,9 @@ void Sprite3DWithOBBPerformanceTest::unproject(const Mat4& viewProjection, const
 
 void Sprite3DWithOBBPerformanceTest::calculateRayByLocationInView(Ray* ray, const Vec2& location)
 {
-    auto dir = Director::getInstance();
+    auto dir  = Director::getInstance();
     auto view = dir->getWinSize();
-    auto mat = dir->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
+    auto mat  = dir->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
 
     Vec3 src = Vec3(location.x, location.y, -1);
     Vec3 nearPoint;
@@ -1661,13 +1629,11 @@ void Sprite3DWithOBBPerformanceTest::calculateRayByLocationInView(Ray* ray, cons
     Vec3::subtract(farPoint, nearPoint, &direction);
     direction.normalize();
 
-    ray->_origin = nearPoint;
+    ray->_origin    = nearPoint;
     ray->_direction = direction;
 }
 
-Sprite3DMirrorTest::Sprite3DMirrorTest()
-    : _sprite(nullptr)
-    , _mirrorSprite(nullptr)
+Sprite3DMirrorTest::Sprite3DMirrorTest() : _sprite(nullptr), _mirrorSprite(nullptr)
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
@@ -1684,13 +1650,13 @@ std::string Sprite3DMirrorTest::subtitle() const
 void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/orc.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(5);
     sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     addChild(sprite);
     sprite->setPosition(Vec2(p.x - 80, p.y));
 
-    //test attach
+    // test attach
     auto sp = Sprite3D::create("Sprite3DTest/axe.c3b");
     sprite->getAttachNode("Bip001 R Hand")->addChild(sp);
 
@@ -1701,10 +1667,10 @@ void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p)
 
         sprite->runAction(RepeatForever::create(animate));
     }
-    _sprite = sprite;
+    _sprite    = sprite;
     _hasWeapon = true;
 
-    //create mirror Sprite3D
+    // create mirror Sprite3D
     sprite = Sprite3D::create(fileName);
     sprite->setScale(5);
     sprite->setScaleX(-5);
@@ -1713,7 +1679,7 @@ void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p)
     addChild(sprite);
     sprite->setPosition(Vec2(p.x + 80, p.y));
 
-    //test attach
+    // test attach
     sp = Sprite3D::create("Sprite3DTest/axe.c3b");
     sprite->getAttachNode("Bip001 R Hand")->addChild(sp);
 
@@ -1727,10 +1693,7 @@ void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p)
     _mirrorSprite = sprite;
 }
 
-QuaternionTest::QuaternionTest()
-    : _arcSpeed(CC_DEGREES_TO_RADIANS(90))
-    , _radius(100.f)
-    , _accAngle(0.f)
+QuaternionTest::QuaternionTest() : _arcSpeed(CC_DEGREES_TO_RADIANS(90)), _radius(100.f), _accAngle(0.f)
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2.f, s.height / 2.f));
@@ -1748,12 +1711,12 @@ std::string QuaternionTest::subtitle() const
 void QuaternionTest::addNewSpriteWithCoords(Vec2 p)
 {
     std::string fileName = "Sprite3DTest/tortoise.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setScale(0.1f);
     auto s = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(s.width / 2.f + _radius * cosf(_accAngle), s.height / 2.f + _radius * sinf(_accAngle)));
     addChild(sprite);
-    _sprite = sprite;
+    _sprite        = sprite;
     auto animation = Animation3D::create(fileName);
     if (animation)
     {
@@ -1777,24 +1740,21 @@ void QuaternionTest::update(float delta)
     _sprite->setRotationQuat(quat);
 }
 
-UseCaseSprite3D::UseCaseSprite3D()
-    : _caseIdx(0)
+UseCaseSprite3D::UseCaseSprite3D() : _caseIdx(0)
 {
     auto s = Director::getInstance()->getWinSize();
 
     _useCaseTitles[0] = "transparent 3d sprite and 2d sprite";
     _useCaseTitles[1] = "ui - 3d - ui";
 
-    auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png",
-        [&](Ref *sender) {
+    auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png", [&](Ref* sender) {
         _caseIdx--;
         if (_caseIdx < 0)
             _caseIdx = (int)USECASE::MAX_CASE_NUM - 1;
         this->switchCase();
     });
 
-    auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png",
-        [&](Ref *sender) {
+    auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png", [&](Ref* sender) {
         _caseIdx++;
         if (_caseIdx >= (int)USECASE::MAX_CASE_NUM)
             _caseIdx = 0;
@@ -1813,7 +1773,7 @@ UseCaseSprite3D::UseCaseSprite3D()
 
     addChild(menu);
 
-    //setup camera
+    // setup camera
     auto camera = Camera::createPerspective(40, s.width / s.height, 0.01f, 1000.f);
     camera->setCameraFlag(CameraFlag::USER1);
     camera->setPosition3D(Vec3(0.f, 30.f, 100.f));
@@ -1839,10 +1799,10 @@ void UseCaseSprite3D::switchCase()
 
     auto s = Director::getInstance()->getWinSize();
     _label->setString(_useCaseTitles[_caseIdx]);
-    if (_caseIdx == 0) // use case 1, 3d transparent sprite + 2d sprite
+    if (_caseIdx == 0)  // use case 1, 3d transparent sprite + 2d sprite
     {
         std::string filename = "Sprite3DTest/girl.c3b";
-        auto sprite = Sprite3D::create(filename);
+        auto sprite          = Sprite3D::create(filename);
         sprite->setScale(0.15f);
         auto animation = Animation3D::create(filename);
         if (animation)
@@ -1852,7 +1812,7 @@ void UseCaseSprite3D::switchCase()
         }
 
         auto circleBack = Sprite3D::create();
-        auto circle = Sprite::create("Sprite3DTest/circle.png");
+        auto circle     = Sprite::create("Sprite3DTest/circle.png");
         circleBack->setScale(0.5f);
         circleBack->addChild(circle);
         circle->runAction(RepeatForever::create(RotateBy::create(3, Vec3(0.f, 0.f, 360.f))));
@@ -1877,7 +1837,7 @@ void UseCaseSprite3D::switchCase()
         scheduleUpdate();
         update(0.f);
     }
-    else if (_caseIdx == 1) // use case 2, ui - 3d - ui, last ui should on the top
+    else if (_caseIdx == 1)  // use case 2, ui - 3d - ui, last ui should on the top
     {
         auto layer = LayerColor::create(Color4B(0, 0, 100, 255), s.width / 2.f, s.height / 2.f);
         layer->setPosition(s.width * 0.25f, s.height * 0.25f);
@@ -1885,7 +1845,7 @@ void UseCaseSprite3D::switchCase()
         addChild(layer);
 
         std::string filename = "Sprite3DTest/girl.c3b";
-        auto sprite = Sprite3D::create(filename);
+        auto sprite          = Sprite3D::create(filename);
         sprite->setScale(0.5f);
         auto animation = Animation3D::create(filename);
         if (animation)
@@ -1898,12 +1858,14 @@ void UseCaseSprite3D::switchCase()
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Message");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UseCaseSprite3D::menuCallback_Message, this));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UseCaseSprite3D::menuCallback_Message, this));
         auto label2 = Label::createWithTTF(ttfConfig, "Message");
-        auto item2 = MenuItemLabel::create(label2, CC_CALLBACK_1(UseCaseSprite3D::menuCallback_Message, this));
+        auto item2  = MenuItemLabel::create(label2, CC_CALLBACK_1(UseCaseSprite3D::menuCallback_Message, this));
 
-        item1->setPosition(Vec2(s.width * 0.5f - item1->getContentSize().width * 0.5f, s.height * 0.5f - item1->getContentSize().height));
-        item2->setPosition(Vec2(s.width * 0.5f - item1->getContentSize().width * 0.5f, s.height * 0.5f - item1->getContentSize().height * 2.f));
+        item1->setPosition(Vec2(s.width * 0.5f - item1->getContentSize().width * 0.5f,
+                                s.height * 0.5f - item1->getContentSize().height));
+        item2->setPosition(Vec2(s.width * 0.5f - item1->getContentSize().width * 0.5f,
+                                s.height * 0.5f - item1->getContentSize().height * 2.f));
 
         auto pMenu1 = Menu::create(item1, item2, nullptr);
         pMenu1->setPosition(Vec2(0.0f, 0.0f));
@@ -1915,14 +1877,14 @@ void UseCaseSprite3D::switchCase()
 
 void UseCaseSprite3D::menuCallback_Message(Ref* sender)
 {
-    auto layer = getChildByTag(101);
-    auto message = layer->getChildByTag(102); // message layer
+    auto layer   = getChildByTag(101);
+    auto message = layer->getChildByTag(102);  // message layer
     if (message)
         layer->removeChild(message);
     else
     {
         // create a new message layer on the top
-        auto s = layer->getContentSize();
+        auto s            = layer->getContentSize();
         auto messagelayer = LayerColor::create(Color4B(100, 100, 0, 255));
         messagelayer->setContentSize(Size(s.width * 0.5f, s.height * 0.5f));
         messagelayer->setPosition(Vec2(s.width * 0.25f, s.height * 0.25f));
@@ -1945,9 +1907,9 @@ void UseCaseSprite3D::update(float delta)
         float radius = 30.f;
         float x = cosf(accAngle) * radius, z = sinf(accAngle) * radius;
 
-        auto node = getChildByTag(101);
+        auto node     = getChildByTag(101);
         auto sprite3d = node->getChildByTag(3);
-        auto circle = node->getChildByTag(2);
+        auto circle   = node->getChildByTag(2);
 
         sprite3d->setPositionX(x);
         sprite3d->setPositionZ(z);
@@ -1958,13 +1920,11 @@ void UseCaseSprite3D::update(float delta)
 
 /////////////////////////////////////////////
 // Node Frame Animation
-NodeAnimationTest::NodeAnimationTest()
-    :_vectorIndex(0)
+NodeAnimationTest::NodeAnimationTest() : _vectorIndex(0)
 {
     auto s = Director::getInstance()->getWinSize();
 
-    auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png",
-        [&](Ref *sender) {
+    auto itemPrev = MenuItemImage::create("Images/b1.png", "Images/b2.png", [&](Ref* sender) {
         _sprites[_vectorIndex]->setVisible(false);
 
         int tIndex = _vectorIndex - 1;
@@ -1976,8 +1936,7 @@ NodeAnimationTest::NodeAnimationTest()
         _sprites[_vectorIndex]->setVisible(true);
     });
 
-    auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png",
-        [&](Ref *sender) {
+    auto itemNext = MenuItemImage::create("Images/f1.png", "Images/f2.png", [&](Ref* sender) {
         _sprites[_vectorIndex]->setVisible(false);
 
         int tIndex = _vectorIndex + 1;
@@ -2013,7 +1972,7 @@ void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p)
 
     // add jumping ball
     std::string fileName = "Sprite3DTest/ball.c3b";
-    auto sprite = Sprite3D::create(fileName);
+    auto sprite          = Sprite3D::create(fileName);
     sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     sprite->setScale(3);
     sprite->setPosition(Vec2(s.width / 2.f, s.height / 3.f));
@@ -2028,7 +1987,7 @@ void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p)
     if (animation)
     {
         auto animate = Animate3D::create(animation);
-        auto act = RepeatForever::create(animate);
+        auto act     = RepeatForever::create(animate);
         act->setTag(0);
         sprite->runAction(act);
     }
@@ -2037,7 +1996,7 @@ void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p)
 
     // add jumping orc
     fileName = "Sprite3DTest/orc_jump.c3t";
-    sprite = Sprite3D::create(fileName);
+    sprite   = Sprite3D::create(fileName);
     sprite->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
     sprite->setScale(3);
     sprite->setPosition(Vec2(s.width / 2.f, s.height / 3.f));
@@ -2046,7 +2005,7 @@ void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p)
     if (animation)
     {
         auto animate = Animate3D::create(animation);
-        auto act = RepeatForever::create(animate);
+        auto act     = RepeatForever::create(animate);
         act->setTag(0);
         sprite->runAction(act);
     }
@@ -2054,10 +2013,7 @@ void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p)
     _sprites.push_back(sprite);
 }
 
-Sprite3DCubeMapTest::Sprite3DCubeMapTest() :
-    _textureCube(nullptr),
-    _skyBox(nullptr),
-    _teapot(nullptr)
+Sprite3DCubeMapTest::Sprite3DCubeMapTest() : _textureCube(nullptr), _skyBox(nullptr), _teapot(nullptr)
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
@@ -2087,11 +2043,11 @@ std::string Sprite3DCubeMapTest::subtitle() const
 void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
 {
     Size visibleSize = Director::getInstance()->getVisibleSize();
-    _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 10, 1000);
+    _camera          = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 10, 1000);
     _camera->setPosition3D(Vec3(0.f, 0.f, 50.f));
     _camera->setCameraFlag(CameraFlag::USER1);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(Sprite3DCubeMapTest::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -2101,21 +2057,20 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
 
     // create the second texture for cylinder
     _textureCube = TextureCube::create("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg",
-        "Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
-        "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
+                                       "Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
+                                       "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
 
     _textureCube->retain();
 
-    //set texture parameters
+    // set texture parameters
     Texture2D::TexParams tRepeatParams;
-    tRepeatParams.magFilter = backend::SamplerFilter::LINEAR;
-    tRepeatParams.minFilter = backend::SamplerFilter::LINEAR;
+    tRepeatParams.magFilter    = backend::SamplerFilter::LINEAR;
+    tRepeatParams.minFilter    = backend::SamplerFilter::LINEAR;
     tRepeatParams.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
     tRepeatParams.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
     _textureCube->setTexParameters(tRepeatParams);
 
-
-    auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material");
+    auto mat   = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material");
     auto state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
     _teapot->setMaterial(mat);
 
@@ -2143,37 +2098,34 @@ void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
     addChild(_camera);
     setCameraMask(2);
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-        [this](EventCustom*)
-    {
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom*) {
         CC_SAFE_RELEASE(_textureCube);
         _textureCube = TextureCube::create("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg",
-            "Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
-            "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
+                                           "Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
+                                           "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
 
         _textureCube->retain();
-        //set texture parameters
+        // set texture parameters
         Texture2D::TexParams tRepeatParams;
-        tRepeatParams.magFilter     = backend::SamplerFilter::LINEAR;
-        tRepeatParams.minFilter     = backend::SamplerFilter::LINEAR;
-        tRepeatParams.sAddressMode  = backend::SamplerAddressMode::CLAMP_TO_EDGE;
-        tRepeatParams.tAddressMode  = backend::SamplerAddressMode::CLAMP_TO_EDGE;
+        tRepeatParams.magFilter    = backend::SamplerFilter::LINEAR;
+        tRepeatParams.minFilter    = backend::SamplerFilter::LINEAR;
+        tRepeatParams.sAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
+        tRepeatParams.tAddressMode = backend::SamplerAddressMode::CLAMP_TO_EDGE;
         _textureCube->setTexParameters(tRepeatParams);
 
-        auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material");
+        auto mat   = Sprite3DMaterial::createWithFilename("Sprite3DTest/CubeMap.material");
         auto state = mat->getTechniqueByIndex(0)->getPassByIndex(0)->getProgramState();
         _teapot->setMaterial(mat);
         _skyBox->setTexture(_textureCube);
         // pass the texture sampler to our custom shader
         auto cubeTexLoc = state->getUniformLocation("u_cubeTex");
         state->setTexture(cubeTexLoc, 0, _textureCube->getBackendTexture());
-    }
-    );
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, 1);
 #endif
 }
 
-void Sprite3DCubeMapTest::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event  *event)
+void Sprite3DCubeMapTest::onTouchesMoved(const std::vector<Touch*>& touches, cocos2d::Event* event)
 {
     if (touches.size())
     {
@@ -2191,7 +2143,7 @@ Issue9767::Issue9767()
 {
     _shaderType = Issue9767::ShaderType::SHADER_TEX;
 
-    auto s = Director::getInstance()->getWinSize();
+    auto s      = Director::getInstance()->getWinSize();
     auto sprite = Sprite3D::create("Sprite3DTest/boss1.obj");
     sprite->setScale(3.f);
     sprite->setTexture("Sprite3DTest/boss.png");
@@ -2201,32 +2153,31 @@ Issue9767::Issue9767()
 
     TTFConfig ttfConfig("fonts/arial.ttf", 15);
     auto label1 = Label::createWithTTF(ttfConfig, "switch shader");
-    auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(Issue9767::menuCallback_SwitchShader, this));
+    auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(Issue9767::menuCallback_SwitchShader, this));
 
-    item1->setPosition(Vec2(s.width * 0.9f - item1->getContentSize().width * 0.5f, s.height * 0.5f - item1->getContentSize().height));
+    item1->setPosition(
+        Vec2(s.width * 0.9f - item1->getContentSize().width * 0.5f, s.height * 0.5f - item1->getContentSize().height));
 
     auto pMenu1 = Menu::create(item1, nullptr);
     pMenu1->setPosition(Vec2(0.0f, 0.0f));
     addChild(pMenu1);
 }
 
-Issue9767::~Issue9767()
-{
-}
+Issue9767::~Issue9767() {}
 
 void Issue9767::menuCallback_SwitchShader(cocos2d::Ref* sender)
 {
     CC_SAFE_RELEASE_NULL(_programState);
     if (_shaderType == Issue9767::ShaderType::SHADER_TEX)
     {
-        _shaderType = Issue9767::ShaderType::SHADER_COLOR;
-        auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_3D);
+        _shaderType   = Issue9767::ShaderType::SHADER_COLOR;
+        auto program  = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_3D);
         _programState = new backend::ProgramState(program);
     }
     else
     {
-        _shaderType = Issue9767::ShaderType::SHADER_TEX;
-        auto program = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_3D);
+        _shaderType   = Issue9767::ShaderType::SHADER_TEX;
+        auto program  = backend::Program::getBuiltinProgram(backend::ProgramType::POSITION_TEXTURE_3D);
         _programState = new backend::ProgramState(program);
     }
     _sprite->setProgramState(_programState);
@@ -2244,8 +2195,8 @@ std::string Issue9767::subtitle() const
 
 Sprite3DClippingTest::Sprite3DClippingTest()
 {
-    auto size = Director::getInstance()->getWinSize();
-    auto stencil = Sprite::create("Images/close.png");
+    auto size         = Director::getInstance()->getWinSize();
+    auto stencil      = Sprite::create("Images/close.png");
     auto clipSprite3D = ClippingNode::create();
     clipSprite3D->setStencil(stencil);
     this->addChild(clipSprite3D);
@@ -2254,22 +2205,19 @@ Sprite3DClippingTest::Sprite3DClippingTest()
     auto sprite3D = Sprite3D::create("Sprite3DTest/orc.c3b");
     sprite3D->setScale(1.0f);
     sprite3D->setRotation3D(Vec3(0.0f, 180.0f, 0.0f));
-    clipSprite3D->addChild(sprite3D);//5
+    clipSprite3D->addChild(sprite3D);  // 5
 
     clipSprite3D->setPosition(Vec2(size.width / 2, size.height / 2));
 
     auto seq = Sequence::create(ScaleTo::create(2.f, 3), ScaleTo::create(2.f, 0.5f), NULL);
     sprite3D->runAction(RepeatForever::create(seq));
     auto animation = Animation3D::create("Sprite3DTest/orc.c3b");
-    auto animate = Animate3D::create(animation);
+    auto animate   = Animate3D::create(animation);
     sprite3D->runAction(RepeatForever::create(animate));
     sprite3D->setForce2DQueue(true);
 }
 
-Sprite3DClippingTest::~Sprite3DClippingTest()
-{
-
-}
+Sprite3DClippingTest::~Sprite3DClippingTest() {}
 
 std::string Sprite3DClippingTest::title() const
 {
@@ -2286,7 +2234,7 @@ Animate3DCallbackTest::Animate3DCallbackTest()
     FileUtils::getInstance()->addSearchPath("Particle3D/materials");
     FileUtils::getInstance()->addSearchPath("Particle3D/scripts");
 
-    auto s = Director::getInstance()->getWinSize();
+    auto s    = Director::getInstance()->getWinSize();
     _sprite3d = Sprite3D::create("Sprite3DTest/ReskinGirl.c3b");
     _sprite3d->setPosition(Vec2(s.width / 2.0f, s.height / 3.0f));
     _sprite3d->setScale(3.0f);
@@ -2312,27 +2260,24 @@ Animate3DCallbackTest::Animate3DCallbackTest()
         ValueMap valuemap0;
         animate->setKeyFrameUserInfo(275, valuemap0);
 
-        auto listener = EventListenerCustom::create(Animate3DDisplayedNotification, [&](EventCustom* event)
-        {
+        auto listener = EventListenerCustom::create(Animate3DDisplayedNotification, [&](EventCustom* event) {
             auto info = (Animate3D::Animate3DDisplayedEventInfo*)event->getUserData();
             auto node = getChildByTag(100);
             if (node)
             {
-                auto mat = _sprite3d->getNodeToWorldTransform() * _sprite3d->getSkeleton()->getBoneByName("Bip01 R Hand")->getWorldMat();
+                auto mat = _sprite3d->getNodeToWorldTransform() *
+                           _sprite3d->getSkeleton()->getBoneByName("Bip01 R Hand")->getWorldMat();
                 node->setPosition3D(Vec3(mat.m[12] + 100, mat.m[13], mat.m[14]));
                 ((PUParticleSystem3D*)node)->startParticleSystem();
             }
 
-
             cocos2d::log("frame %d", info->frame);
         });
         Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(listener, -1);
     }
 }
 
-Animate3DCallbackTest::~Animate3DCallbackTest()
-{
-}
+Animate3DCallbackTest::~Animate3DCallbackTest() {}
 
 std::string Animate3DCallbackTest::title() const
 {
@@ -2344,7 +2289,6 @@ std::string Animate3DCallbackTest::subtitle() const
     return "";
 }
 
-
 Sprite3DVertexColorTest::Sprite3DVertexColorTest()
 {
     auto s = Director::getInstance()->getWinSize();
@@ -2359,21 +2303,18 @@ Sprite3DVertexColorTest::Sprite3DVertexColorTest()
 
     this->addChild(sprite);
 
-    //setup camera
+    // setup camera
     auto camera = Camera::createPerspective(40, s.width / s.height, 0.01f, 1000.f);
     camera->setCameraFlag(CameraFlag::USER1);
     camera->setPosition3D(Vec3(0.0f, 0.0f, 10.f));
     camera->lookAt(Vec3(0.f, 0.f, 0.f));
     addChild(camera);
-    
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND,
-                                                            [=](EventCustom*)
-                                                            {
-                                                                auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/VertexColor.material");
-                                                                sprite->setMaterial(mat);
-                                                            }
-                                                            );
+    _backToForegroundListener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [=](EventCustom*) {
+        auto mat = Sprite3DMaterial::createWithFilename("Sprite3DTest/VertexColor.material");
+        sprite->setMaterial(mat);
+    });
     Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, 1);
 #endif
 }
@@ -2398,35 +2339,35 @@ std::string Sprite3DVertexColorTest::subtitle() const
 CameraBackgroundClearTest::CameraBackgroundClearTest()
 {
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
-    auto label1 = Label::createWithTTF(ttfConfig,"Clear Mode");
-    auto item1 = MenuItemLabel::create(label1,CC_CALLBACK_1(CameraBackgroundClearTest::switch_CameraClearMode,this) );
-    
-    item1->setPosition( Vec2(VisibleRect::left().x+50, VisibleRect::bottom().y+item1->getContentSize().height*4 ) );
-    
+    auto label1 = Label::createWithTTF(ttfConfig, "Clear Mode");
+    auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(CameraBackgroundClearTest::switch_CameraClearMode, this));
+
+    item1->setPosition(Vec2(VisibleRect::left().x + 50, VisibleRect::bottom().y + item1->getContentSize().height * 4));
+
     auto pMenu1 = Menu::create(item1, nullptr);
-    pMenu1->setPosition(Vec2(0.0f,0.0f));
+    pMenu1->setPosition(Vec2(0.0f, 0.0f));
     this->addChild(pMenu1, 10);
-    
-    //setup camera
-    auto s = Director::getInstance()->getWinSize();
+
+    // setup camera
+    auto s  = Director::getInstance()->getWinSize();
     _camera = Camera::createPerspective(40, s.width / s.height, 0.01f, 1000.f);
     _camera->setCameraFlag(CameraFlag::USER1);
     _camera->setPosition3D(Vec3(0.f, 30.f, 100.f));
     _camera->lookAt(Vec3(0.f, 0.f, 0.f));
     addChild(_camera);
-    
+
     auto sprite = Sprite3D::create("Sprite3DTest/orc.c3b");
     addChild(sprite);
     sprite->setCameraMask(2);
-    
+
     _label = Label::createWithTTF(ttfConfig, "Depth Clear Brush");
     addChild(_label);
-    _label->setPosition(s.width / 2.f , VisibleRect::top().y * 0.8f);
+    _label->setPosition(s.width / 2.f, VisibleRect::top().y * 0.8f);
 }
 
 void CameraBackgroundClearTest::switch_CameraClearMode(cocos2d::Ref* sender)
 {
-    auto brush = _camera->getBackgroundBrush();
+    auto brush                            = _camera->getBackgroundBrush();
     CameraBackgroundBrush::BrushType type = CameraBackgroundBrush::BrushType::NONE;
     if (!brush)
     {
@@ -2436,7 +2377,7 @@ void CameraBackgroundClearTest::switch_CameraClearMode(cocos2d::Ref* sender)
     {
         type = brush->getBrushType();
     }
-    
+
     if (type == CameraBackgroundBrush::BrushType::NONE)
     {
         _camera->setBackgroundBrush(CameraBackgroundBrush::createDepthBrush(1.f));
@@ -2451,7 +2392,9 @@ void CameraBackgroundClearTest::switch_CameraClearMode(cocos2d::Ref* sender)
     }
     else if (type == CameraBackgroundBrush::BrushType::COLOR)
     {
-        _camera->setBackgroundBrush(CameraBackgroundBrush::createSkyboxBrush("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg","Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg","Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg"));
+        _camera->setBackgroundBrush(CameraBackgroundBrush::createSkyboxBrush(
+            "Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg", "Sprite3DTest/skybox/top.jpg",
+            "Sprite3DTest/skybox/bottom.jpg", "Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg"));
         _label->setString("Skybox Clear Brush");
     }
     else if (type == CameraBackgroundBrush::BrushType::SKYBOX)
@@ -2508,7 +2451,7 @@ void MotionStreak3DTest::update(float delta)
     static float t = 0;
     t += delta;
     float angle = t * M_PI;
-    float r = 20.f;
+    float r     = 20.f;
 
     _sprite->setPosition3D(Vec3(r * cosf(angle), 0, r * sinf(angle)));
     _streak->setPosition3D(_sprite->getPosition3D());
@@ -2542,7 +2485,7 @@ Sprite3DNormalMappingTest::Sprite3DNormalMappingTest()
         addChild(sprite);
     }
 
-    //setup camera
+    // setup camera
     auto camera = Camera::createPerspective(60.0, s.width / s.height, 1.0f, 1000.f);
     camera->setCameraFlag(CameraFlag::USER1);
     camera->setPosition3D(Vec3(0.f, 0.f, 100.f));
@@ -2552,34 +2495,33 @@ Sprite3DNormalMappingTest::Sprite3DNormalMappingTest()
     PointLight* light = PointLight::create(Vec3(0.0, 0.0, 0.0), Color3B(255, 255, 255), 1000);
     light->setTag(100);
     addChild(light);
-    
+
     scheduleUpdate();
 }
 
 void Sprite3DNormalMappingTest::update(float dt)
 {
-    static float angle = 0.0f;
+    static float angle     = 0.0f;
     static bool reverseDir = false;
-    static float radius = 100.0f;
-    
+    static float radius    = 100.0f;
+
     auto light = static_cast<PointLight*>(getChildByTag(100));
     light->setPosition3D(Vec3(radius * cos(angle), 0.0f, radius * sin(angle)));
-    if (reverseDir){
+    if (reverseDir)
+    {
         angle -= 0.01f;
         if (angle < 0.0)
             reverseDir = false;
     }
-    else{
+    else
+    {
         angle += 0.01f;
         if (3.14159 < angle)
             reverseDir = true;
     }
 }
 
-Sprite3DNormalMappingTest::~Sprite3DNormalMappingTest()
-{
-
-}
+Sprite3DNormalMappingTest::~Sprite3DNormalMappingTest() {}
 
 std::string Sprite3DNormalMappingTest::title() const
 {
@@ -2591,9 +2533,6 @@ std::string Sprite3DNormalMappingTest::subtitle() const
     return "";
 }
 
-
-
-
 Sprite3DPropertyTest::Sprite3DPropertyTest()
 {
     auto s = Director::getInstance()->getWinSize();
@@ -2613,24 +2552,24 @@ Sprite3DPropertyTest::Sprite3DPropertyTest()
 
     setCameraMask(2);
 
-    //auto listener = EventListenerTouchAllAtOnce::create();
+    // auto listener = EventListenerTouchAllAtOnce::create();
     ////listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DReskinTest::onTouchesEnded, this);
     //_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     TTFConfig ttfConfig("fonts/arial.ttf", 20);
 
     auto label1 = Label::createWithTTF(ttfConfig, "Print Mesh Name");
-    auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(Sprite3DPropertyTest::printMeshName, this));
+    auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(Sprite3DPropertyTest::printMeshName, this));
     auto label2 = Label::createWithTTF(ttfConfig, "Remove Used Texture");
-    auto item2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Sprite3DPropertyTest::removeUsedTexture, this));
+    auto item2  = MenuItemLabel::create(label2, CC_CALLBACK_1(Sprite3DPropertyTest::removeUsedTexture, this));
     auto label3 = Label::createWithTTF(ttfConfig, "Reset");
-    auto item3 = MenuItemLabel::create(label3, CC_CALLBACK_1(Sprite3DPropertyTest::resetTexture, this));
+    auto item3  = MenuItemLabel::create(label3, CC_CALLBACK_1(Sprite3DPropertyTest::resetTexture, this));
 
     item1->setPosition(Vec2(VisibleRect::left().x + 100, VisibleRect::bottom().y + item1->getContentSize().height * 4));
     item2->setPosition(Vec2(VisibleRect::left().x + 100, VisibleRect::bottom().y + item1->getContentSize().height * 5));
     item3->setPosition(Vec2(VisibleRect::left().x + 100, VisibleRect::bottom().y + item1->getContentSize().height * 6));
 
-    auto pMenu1 = Menu::create(item1, item2, item3,nullptr);
+    auto pMenu1 = Menu::create(item1, item2, item3, nullptr);
     pMenu1->setPosition(Vec2(0.0f, 0.0f));
     this->addChild(pMenu1, 10);
 
@@ -2645,17 +2584,14 @@ std::string Sprite3DPropertyTest::subtitle() const
     return "";
 }
 
-void Sprite3DPropertyTest::update(float delta)
-{
-
-}
+void Sprite3DPropertyTest::update(float delta) {}
 void Sprite3DPropertyTest::printMeshName(cocos2d::Ref* sender)
 {
     CCLOG("MeshName Begin");
-    Vector<Mesh*> meshes =_sprite->getMeshes();
-    for(Mesh* mesh : meshes)
+    Vector<Mesh*> meshes = _sprite->getMeshes();
+    for (Mesh* mesh : meshes)
     {
-        log("MeshName: %s ", mesh->getName().c_str());
+        log("MeshName: %s ", mesh->getName().data());
     }
     CCLOG("MeshName End");
 }
@@ -2682,12 +2618,12 @@ void Sprite3DPropertyTest::refreshSpriteRender()
     Vector<Mesh*> meshes = _sprite->getMeshes();
     for (Mesh* mesh : meshes)
     {
-        std::string file = mesh->getTextureFileName();
+        std::string file    = mesh->getTextureFileName();
         Texture2D* cacheTex = Director::getInstance()->getTextureCache()->getTextureForKey(file);
         if (cacheTex == nullptr)
         {
-            unsigned char data[] = { 255, 0, 0, 255 };//1*1 red picture
-            Image * image = new Image();
+            unsigned char data[] = {255, 0, 0, 255};  // 1*1 red picture
+            Image* image         = new Image();
             image->initWithRawData(data, sizeof(data), 1, 1, sizeof(unsigned char));
             cacheTex = Director::getInstance()->getTextureCache()->addImage(image, "/dummyTexture");
             image->release();
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
index 3b9aa700dc06..8d9011e90973 100644
--- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
+++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,15 +28,16 @@
 #include "renderer/backend/ProgramState.h"
 #include <string>
 
-namespace cocos2d {
-    class Animate3D;
-    class Sprite3D;
-    class Delay;
-    class Ray;
-    class DrawNode3D;
-    class GLProgramState;
-    class MotionStreak3D;
-}
+namespace cocos2d
+{
+class Animate3D;
+class Sprite3D;
+class Delay;
+class Ray;
+class DrawNode3D;
+class GLProgramState;
+class MotionStreak3D;
+}  // namespace cocos2d
 
 DEFINE_TEST_SUITE(Sprite3DTests);
 
@@ -45,7 +46,7 @@ class Sprite3DTestDemo : public TestCase
 public:
     // overrides
     virtual std::string title() const override;
-    
+
     virtual ~Sprite3DTestDemo();
 };
 
@@ -74,7 +75,7 @@ class Sprite3DBasicTest : public Sprite3DTestDemo
     Sprite3DBasicTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 };
@@ -87,14 +88,14 @@ class Sprite3DUVAnimationTest : public Sprite3DTestDemo
     virtual ~Sprite3DUVAnimationTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     void cylinderUpdate(float dt);
-    
+
     float _cylinder_texture_offset;
     float _shining_duration;
-    cocos2d::backend::ProgramState * _state = nullptr;
-    
+    cocos2d::backend::ProgramState* _state = nullptr;
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
@@ -105,9 +106,9 @@ class Sprite3DFakeShadowTest : public Sprite3DTestDemo
 public:
     enum State
     {
-        State_None = 0,
-        State_Idle = 0x01,
-        State_Move = 0x02,
+        State_None   = 0,
+        State_Idle   = 0x01,
+        State_Move   = 0x02,
         State_Rotate = 0x04
     };
     CREATE_FUNC(Sprite3DFakeShadowTest);
@@ -115,22 +116,23 @@ class Sprite3DFakeShadowTest : public Sprite3DTestDemo
     virtual ~Sprite3DFakeShadowTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    void Move(cocos2d::Ref* sender,int value);
+    void Move(cocos2d::Ref* sender, int value);
     void updateCamera(float fDelta);
     void move3D(float elapsedTime);
     void updateState(float elapsedTime);
-    bool isState(unsigned int state,unsigned int bit) const;
-    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
-    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    bool isState(unsigned int state, unsigned int bit) const;
+    void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+    void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 private:
-    cocos2d::Camera * _camera;
+    cocos2d::Camera* _camera;
     cocos2d::Vec3 _targetPos;
-    unsigned int   _curState;
-    cocos2d::Sprite3D * _plane;
-    cocos2d::Sprite3D * _orc;
-    cocos2d::backend::ProgramState *_state = nullptr;
-    
+    unsigned int _curState;
+    cocos2d::Sprite3D* _plane;
+    cocos2d::Sprite3D* _orc;
+    cocos2d::backend::ProgramState* _state = nullptr;
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
@@ -145,8 +147,9 @@ class Sprite3DLightMapTest : public Sprite3DTestDemo
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 private:
-    cocos2d::Camera * _camera;
+    cocos2d::Camera* _camera;
 };
 
 class Sprite3DBasicToonShaderTest : public Sprite3DTestDemo
@@ -157,14 +160,13 @@ class Sprite3DBasicToonShaderTest : public Sprite3DTestDemo
     virtual ~Sprite3DBasicToonShaderTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
-    cocos2d::backend::ProgramState * _state;
-    
+    cocos2d::backend::ProgramState* _state;
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
-
 };
 
 class Sprite3DHitTest : public Sprite3DTestDemo
@@ -184,14 +186,14 @@ class Sprite3DEffectTest : public Sprite3DTestDemo
     virtual ~Sprite3DEffectTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
 protected:
     std::vector<cocos2d::Sprite3D*> _sprites;
-    
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
@@ -205,13 +207,13 @@ class AsyncLoadSprite3DTest : public Sprite3DTestDemo
     virtual ~AsyncLoadSprite3DTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void menuCallback_asyncLoadSprite(cocos2d::Ref* sender);
-    
+
     void asyncLoad_Callback(cocos2d::Sprite3D* sprite, void* param);
-    
+
 protected:
-    std::vector<std::string> _paths; //model paths to be loaded
+    std::vector<std::string> _paths;  // model paths to be loaded
 };
 
 class Sprite3DWithSkinTest : public Sprite3DTestDemo
@@ -221,13 +223,14 @@ class Sprite3DWithSkinTest : public Sprite3DTestDemo
     Sprite3DWithSkinTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
     void switchAnimationQualityCallback(cocos2d::Ref* sender);
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
     std::string getAnimationQualityMessage() const;
+
 private:
     std::vector<cocos2d::Sprite3D*> _sprits;
     int _animateQuality;
@@ -242,14 +245,14 @@ class Sprite3DWithSkinOutlineTest : public Sprite3DTestDemo
     virtual ~Sprite3DWithSkinOutlineTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
 protected:
     std::vector<cocos2d::Sprite3D*> _sprites;
-    
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
 #endif
@@ -263,14 +266,14 @@ class Animate3DTest : public Sprite3DTestDemo
     ~Animate3DTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
     virtual void update(float dt) override;
-    
+
 protected:
     void addSprite3D();
-    
+
     enum class State
     {
         SWIMMING,
@@ -278,20 +281,20 @@ class Animate3DTest : public Sprite3DTestDemo
         HURT,
         HURT_TO_SWIMMING,
     };
-    
+
     void reachEndCallBack();
-    
+
     void renewCallBack();
-    
+
     cocos2d::Sprite3D* _sprite;
-    
+
     cocos2d::Action* _swim;
     cocos2d::Animate3D* _hurt;
 
     float _elapseTransTime;
-    
-    State   _state;
-    
+
+    State _state;
+
     cocos2d::MoveTo* _moveAction;
 };
 
@@ -302,11 +305,11 @@ class AttachmentTest : public Sprite3DTestDemo
     AttachmentTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
 protected:
     bool _hasWeapon;
     cocos2d::Sprite3D* _sprite;
@@ -321,11 +324,12 @@ class Sprite3DReskinTest : public Sprite3DTestDemo
     virtual std::string subtitle() const override;
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
     void menuCallback_reSkin(cocos2d::Ref* sender);
+
 protected:
     void applyCurSkin();
-    
+
     enum class SkinType
     {
         UPPER_BODY = 0,
@@ -337,9 +341,9 @@ class Sprite3DReskinTest : public Sprite3DTestDemo
         GLASSES,
         MAX_TYPE,
     };
-    
-    std::vector<std::string> _skins[(int)SkinType::MAX_TYPE]; //all skins
-    int                      _curSkin[(int)SkinType::MAX_TYPE]; //current skin index
+
+    std::vector<std::string> _skins[(int)SkinType::MAX_TYPE];  // all skins
+    int _curSkin[(int)SkinType::MAX_TYPE];                     // current skin index
     cocos2d::Sprite3D* _sprite;
 };
 
@@ -360,21 +364,25 @@ class Sprite3DWithOBBPerformanceTest : public Sprite3DTestDemo
     void delOBBCallback(cocos2d::Ref* sender);
     void addOBBWithCount(float value);
     void delOBBWithCount(float value);
+
 protected:
-    cocos2d::Sprite3D*        _sprite;
-    std::vector<cocos2d::OBB>          _obb;
-    cocos2d::DrawNode3D*               _drawOBB;
-    cocos2d::Label*                    _labelCubeCount;
-    cocos2d::MoveTo*                   _moveAction;
-    cocos2d::OBB                       _obbt;
-    cocos2d::OBB                       _obbtOri; //tortoise origin obb
-    cocos2d::DrawNode3D*               _drawDebug;
-    bool                      _hasCollider;
-    std::set<int>             _intersetList;
+    cocos2d::Sprite3D* _sprite;
+    std::vector<cocos2d::OBB> _obb;
+    cocos2d::DrawNode3D* _drawOBB;
+    cocos2d::Label* _labelCubeCount;
+    cocos2d::MoveTo* _moveAction;
+    cocos2d::OBB _obbt;
+    cocos2d::OBB _obbtOri;  // tortoise origin obb
+    cocos2d::DrawNode3D* _drawDebug;
+    bool _hasCollider;
+    std::set<int> _intersetList;
     void initDrawBox();
     void reachEndCallBack();
-    
-    void unproject(const cocos2d::Mat4& viewProjection, const cocos2d::Size* viewport, cocos2d::Vec3* src, cocos2d::Vec3* dst);
+
+    void unproject(const cocos2d::Mat4& viewProjection,
+                   const cocos2d::Size* viewport,
+                   cocos2d::Vec3* src,
+                   cocos2d::Vec3* dst);
     void calculateRayByLocationInView(cocos2d::Ray* ray, const cocos2d::Vec2& location);
 };
 
@@ -385,9 +393,9 @@ class Sprite3DMirrorTest : public Sprite3DTestDemo
     Sprite3DMirrorTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
-    
+
 protected:
     bool _hasWeapon;
     cocos2d::Sprite3D* _sprite;
@@ -401,15 +409,15 @@ class QuaternionTest : public Sprite3DTestDemo
     QuaternionTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
     virtual void update(float delta) override;
-    
+
 protected:
     cocos2d::Sprite3D* _sprite;
-    float              _arcSpeed;
-    float              _radius;
-    float              _accAngle;
+    float _arcSpeed;
+    float _radius;
+    float _accAngle;
 };
 
 // 3d + 2d use case
@@ -420,23 +428,23 @@ class UseCaseSprite3D : public Sprite3DTestDemo
     UseCaseSprite3D();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual void update(float delta) override;
-    
+
     void menuCallback_Message(cocos2d::Ref* sender);
-    
+
 protected:
-    
     void switchCase();
-    
-    enum class USECASE{
+
+    enum class USECASE
+    {
         _3D_WITH_2D,
         _UI_3D_UI,
         MAX_CASE_NUM,
     };
-    cocos2d::Label*      _label;
-    int                  _caseIdx; // use case index
-    std::string          _useCaseTitles[(int)USECASE::MAX_CASE_NUM];
+    cocos2d::Label* _label;
+    int _caseIdx;  // use case index
+    std::string _useCaseTitles[(int)USECASE::MAX_CASE_NUM];
 };
 
 // node animation test, cocos2d-x supports both skeletal animation and node animation
@@ -447,8 +455,9 @@ class NodeAnimationTest : public Sprite3DTestDemo
     NodeAnimationTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void addNewSpriteWithCoords(cocos2d::Vec2 p);
+
 protected:
     std::vector<cocos2d::Sprite3D*> _sprites;
     int _vectorIndex;
@@ -458,7 +467,7 @@ namespace cocos2d
 {
 class TextureCube;
 class Skybox;
-}
+}  // namespace cocos2d
 
 class Sprite3DCubeMapTest : public Sprite3DTestDemo
 {
@@ -471,13 +480,13 @@ class Sprite3DCubeMapTest : public Sprite3DTestDemo
 
     void addNewSpriteWithCoords(cocos2d::Vec2);
 
-    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event  *event);
+    void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 
 protected:
     cocos2d::TextureCube* _textureCube;
     cocos2d::Skybox* _skyBox;
     cocos2d::Sprite3D* _teapot;
-    cocos2d::Camera *_camera;
+    cocos2d::Camera* _camera;
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::EventListenerCustom* _backToForegroundListener;
@@ -492,18 +501,19 @@ class Issue9767 : public Sprite3DTestDemo
         SHADER_TEX,
         SHADER_COLOR,
     };
+
 public:
     CREATE_FUNC(Issue9767);
     Issue9767();
     ~Issue9767();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void menuCallback_SwitchShader(cocos2d::Ref* sender);
-    
+
 protected:
-    ShaderType          _shaderType;
-    cocos2d::Sprite3D*  _sprite;
+    ShaderType _shaderType;
+    cocos2d::Sprite3D* _sprite;
 };
 
 /// Clipping Sprite3D
@@ -525,7 +535,7 @@ class Animate3DCallbackTest : public Sprite3DTestDemo
     ~Animate3DCallbackTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
 protected:
     cocos2d::Sprite3D* _sprite3d;
 };
@@ -537,8 +547,9 @@ class CameraBackgroundClearTest : public Sprite3DTestDemo
     CameraBackgroundClearTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     void switch_CameraClearMode(cocos2d::Ref* sender);
+
 protected:
     cocos2d::Camera* _camera;
     cocos2d::Label* _label;
@@ -551,8 +562,9 @@ class Sprite3DVertexColorTest : public Sprite3DTestDemo
     Sprite3DVertexColorTest();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
+
     virtual ~Sprite3DVertexColorTest();
+
 protected:
     cocos2d::Sprite3D* _sprite;
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
@@ -568,7 +580,7 @@ class MotionStreak3DTest : public Sprite3DTestDemo
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void update(float delta) override;
-    
+
 protected:
     cocos2d::Sprite3D* _sprite;
     cocos2d::MotionStreak3D* _streak;
@@ -600,6 +612,7 @@ class Sprite3DPropertyTest : public Sprite3DTestDemo
     void resetTexture(cocos2d::Ref* sender);
 
     void refreshSpriteRender();
+
 protected:
     cocos2d::Sprite3D* _sprite;
     cocos2d::Texture2D* _meshTex;
diff --git a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.cpp b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.cpp
index f4fe6db3328d..7013c6d961e6 100644
--- a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.cpp
+++ b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.cpp
@@ -2,19 +2,19 @@
  Copyright (c) 2012 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -49,7 +49,7 @@ SpriteFrameCachePixelFormatTest::SpriteFrameCachePixelFormatTest()
     infoLabel->setAlignment(cocos2d::TextHAlignment::CENTER);
     infoLabel->setPosition(screenSize.width * 0.5f, screenSize.height * 0.7f);
     addChild(infoLabel);
-    
+
     // load atlas definition with specified PixelFormat and check that it matches to expected format
     loadSpriteFrames("Images/sprite_frames_test/test_A8.plist", backend::PixelFormat::A8);
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA8888.plist", backend::PixelFormat::RGBA8);
@@ -59,38 +59,41 @@ SpriteFrameCachePixelFormatTest::SpriteFrameCachePixelFormatTest()
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA4444.plist", backend::PixelFormat::RGBA4);
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA5551.plist", backend::PixelFormat::RGB5A1);
 
-    if (Configuration::getInstance()->supportsPVRTC()) {
+    if (Configuration::getInstance()->supportsPVRTC())
+    {
         loadSpriteFrames("Images/sprite_frames_test/test_PVRTC2.plist", backend::PixelFormat::PVRTC2A);
         loadSpriteFrames("Images/sprite_frames_test/test_PVRTC4.plist", backend::PixelFormat::PVRTC4A);
         loadSpriteFrames("Images/sprite_frames_test/test_PVRTC2_NOALPHA.plist", backend::PixelFormat::PVRTC2);
     }
-    
+
     // test loading atlases without PixelFormat specified
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGB5A1);
     loadSpriteFrames("Images/sprite_frames_test/test_NoFormat.plist", backend::PixelFormat::RGB5A1);
-    
+
     // restore default alpha pixel format
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
 }
 
-void SpriteFrameCachePixelFormatTest::loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat)
+void SpriteFrameCachePixelFormatTest::loadSpriteFrames(std::string_view file,
+                                                       cocos2d::backend::PixelFormat expectedFormat)
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(file);
-    SpriteFrame *spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png");
-    Texture2D *texture = spriteFrame->getTexture();
-    const ssize_t bitsPerKB = 8 * 1024;
-    const double memorySize = 1.0 * texture->getBitsPerPixelForFormat() * texture->getContentSizeInPixels().width * texture->getContentSizeInPixels().height / bitsPerKB;
+    SpriteFrame* spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png");
+    Texture2D* texture       = spriteFrame->getTexture();
+    const ssize_t bitsPerKB  = 8 * 1024;
+    const double memorySize  = 1.0 * texture->getBitsPerPixelForFormat() * texture->getContentSizeInPixels().width *
+                              texture->getContentSizeInPixels().height / bitsPerKB;
 #ifndef CC_USE_METAL
     CC_ASSERT(texture->getPixelFormat() == expectedFormat);
 #endif
-    const std::string textureInfo = StringUtils::format("%s: %.2f KB\r\n", texture->getStringForFormat(), memorySize);
-    infoLabel->setString(infoLabel->getString() + textureInfo);
-    
+    const std::string textureInfo = StringUtils::format("%s%s: %.2f KB\r\n", infoLabel->getString().data(),
+                                                        texture->getStringForFormat(), memorySize);
+    infoLabel->setString(textureInfo);
+
     SpriteFrameCache::getInstance()->removeSpriteFramesFromFile(file);
     Director::getInstance()->getTextureCache()->removeTexture(texture);
 }
 
-
 SpriteFrameCacheLoadMultipleTimes::SpriteFrameCacheLoadMultipleTimes()
 {
     const Size screenSize = Director::getInstance()->getWinSize();
@@ -100,21 +103,20 @@ SpriteFrameCacheLoadMultipleTimes::SpriteFrameCacheLoadMultipleTimes()
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA8888.plist", backend::PixelFormat::RGBA8);
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA8888.plist", backend::PixelFormat::RGBA8);
     loadSpriteFrames("Images/sprite_frames_test/test_RGBA8888.plist", backend::PixelFormat::RGBA8);
-
 }
 
-void SpriteFrameCacheLoadMultipleTimes::loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat)
+void SpriteFrameCacheLoadMultipleTimes::loadSpriteFrames(std::string_view file,
+                                                         cocos2d::backend::PixelFormat expectedFormat)
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(file);
-    SpriteFrame *spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png");
-    Texture2D *texture = spriteFrame->getTexture();
+    SpriteFrame* spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png");
+    Texture2D* texture       = spriteFrame->getTexture();
     CC_ASSERT(texture->getPixelFormat() == expectedFormat);
 
     SpriteFrameCache::getInstance()->removeSpriteFrameByName("sprite_frames_test/grossini.png");
     Director::getInstance()->getTextureCache()->removeTexture(texture);
 }
 
-
 SpriteFrameCacheFullCheck::SpriteFrameCacheFullCheck()
 {
     const Size screenSize = Director::getInstance()->getWinSize();
@@ -122,7 +124,7 @@ SpriteFrameCacheFullCheck::SpriteFrameCacheFullCheck()
     loadSpriteFrames("Images/test_polygon.plist", backend::PixelFormat::RGBA8);
 }
 
-void SpriteFrameCacheFullCheck::loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat)
+void SpriteFrameCacheFullCheck::loadSpriteFrames(std::string_view file, cocos2d::backend::PixelFormat expectedFormat)
 {
     auto cache = SpriteFrameCache::getInstance();
 
@@ -148,7 +150,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
 
     uint32_t getFormat() override { return FORMAT; }
 
-    void load(const std::string& filePath, SpriteFrameCache& cache) override
+    void load(std::string_view filePath, SpriteFrameCache& cache) override
     {
         CCASSERT(!filePath.empty(), "atlas filename should not be nullptr");
 
@@ -156,7 +158,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         if (fullPath.empty())
         {
             // return if plist file doesn't exist
-            CCLOG("GenericJsonArraySpriteSheetLoader: can not find %s", filePath.c_str());
+            CCLOG("GenericJsonArraySpriteSheetLoader: can not find %s", filePath.data());
             return;
         }
 
@@ -199,7 +201,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         addSpriteFramesWithJson(jDoc, texturePath, filePath, cache);
     }
 
-    void load(const std::string& filePath, Texture2D* texture, SpriteFrameCache& cache) override
+    void load(std::string_view filePath, Texture2D* texture, SpriteFrameCache& cache) override
     {
         const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
         rapidjson::Document jDoc;
@@ -209,7 +211,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         addSpriteFramesWithJson(jDoc, texture, filePath, cache);
     }
 
-    void load(const std::string& filePath, const std::string& textureFileName, SpriteFrameCache& cache) override
+    void load(std::string_view filePath, std::string_view textureFileName, SpriteFrameCache& cache) override
     {
         CCASSERT(!textureFileName.empty(), "texture name should not be null");
         const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
@@ -232,7 +234,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         addSpriteFramesWithJson(jDoc, texture, "by#addSpriteFramesWithFileContent()", cache);
     }
 
-    void reload(const std::string& filePath, SpriteFrameCache& cache) override
+    void reload(std::string_view filePath, SpriteFrameCache& cache) override
     {
         const auto fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
         rapidjson::Document doc;
@@ -285,7 +287,10 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
     }
 
 protected:
-    void addSpriteFramesWithJson(const rapidjson::Document& doc, const std::string& texturePath, const std::string& atlasPath, SpriteFrameCache& cache)
+    void addSpriteFramesWithJson(const rapidjson::Document& doc,
+                                 std::string_view texturePath,
+                                 std::string_view atlasPath,
+                                 SpriteFrameCache& cache)
     {
         std::string pixelFormatName;
         auto&& metaItr = doc.FindMember("meta");
@@ -298,7 +303,7 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
             }
         }
 
-        Texture2D* texture = nullptr;
+        Texture2D* texture                                                        = nullptr;
         static std::unordered_map<std::string, backend::PixelFormat> pixelFormats = {
             {"RGBA8888", backend::PixelFormat::RGBA8},
             {"RGBA4444", backend::PixelFormat::RGBA4},
@@ -311,13 +316,12 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
             {"AI88", backend::PixelFormat::LA8},
             {"ALPHA_INTENSITY", backend::PixelFormat::LA8},
             //{"BGRA8888", backend::PixelFormat::BGRA8888}, no Image conversion RGBA -> BGRA
-            {"RGB888", backend::PixelFormat::RGB8}
-        };
+            {"RGB888", backend::PixelFormat::RGB8}};
 
         const auto pixelFormatIt = pixelFormats.find(pixelFormatName);
         if (pixelFormatIt != pixelFormats.end())
         {
-            const backend::PixelFormat pixelFormat = (*pixelFormatIt).second;
+            const backend::PixelFormat pixelFormat        = (*pixelFormatIt).second;
             const backend::PixelFormat currentPixelFormat = Texture2D::getDefaultAlphaPixelFormat();
             Texture2D::setDefaultAlphaPixelFormat(pixelFormat);
             texture = Director::getInstance()->getTextureCache()->addImage(texturePath);
@@ -338,18 +342,21 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         }
     }
 
-    void addSpriteFramesWithJson(const rapidjson::Document& doc, Texture2D* texture, const std::string& atlasPath, SpriteFrameCache& cache)
+    void addSpriteFramesWithJson(const rapidjson::Document& doc,
+                                 Texture2D* texture,
+                                 std::string_view atlasPath,
+                                 SpriteFrameCache& cache)
     {
         auto&& framesItr = doc.FindMember("frames");
         if (framesItr == doc.MemberEnd())
             return;
 
         const auto spriteSheet = std::make_shared<SpriteSheet>();
-        spriteSheet->format = getFormat();
-        spriteSheet->path = atlasPath;
+        spriteSheet->format    = getFormat();
+        spriteSheet->path      = atlasPath;
 
         const auto textureFileName = Director::getInstance()->getTextureCache()->getTextureFilePath(texture);
-        Image* image = nullptr;
+        Image* image               = nullptr;
         NinePatchImageParser parser;
 
         for (auto&& frameItr : framesItr->value.GetArray())
@@ -360,39 +367,38 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
             }
 
             const auto spriteFrameName = frameItr["filename"].GetString();
-            auto* spriteFrame = cache.findFrame(spriteFrameName);
+            auto* spriteFrame          = cache.findFrame(spriteFrameName);
             if (spriteFrame)
             {
                 continue;
             }
 
-            const auto frameX = frameItr["frame"]["x"].GetFloat();
-            const auto frameY = frameItr["frame"]["y"].GetFloat();
-            const auto frameW = frameItr["frame"]["w"].GetFloat();
-            const auto frameH = frameItr["frame"]["h"].GetFloat();
+            const auto frameX      = frameItr["frame"]["x"].GetFloat();
+            const auto frameY      = frameItr["frame"]["y"].GetFloat();
+            const auto frameW      = frameItr["frame"]["w"].GetFloat();
+            const auto frameH      = frameItr["frame"]["h"].GetFloat();
             const auto textureRect = Rect(frameX, frameY, frameW, frameH);
 
-            const auto originalWidth = frameItr["sourceSize"]["w"].GetInt();
+            const auto originalWidth  = frameItr["sourceSize"]["w"].GetInt();
             const auto originalHeight = frameItr["sourceSize"]["w"].GetInt();
-            const auto originalSize = Size(originalWidth, originalHeight);
+            const auto originalSize   = Size(originalWidth, originalHeight);
 
-            const auto trimmedWidth = frameItr["spriteSourceSize"]["w"].GetInt();
+            const auto trimmedWidth  = frameItr["spriteSourceSize"]["w"].GetInt();
             const auto trimmedHeight = frameItr["spriteSourceSize"]["h"].GetInt();
-            const auto trimmedSize = Size(trimmedWidth, trimmedHeight);
+            const auto trimmedSize   = Size(trimmedWidth, trimmedHeight);
 
             const auto textureRotated = frameItr["rotated"].GetBool();
 
             // create frame
-            spriteFrame = SpriteFrame::createWithTexture(texture,
-                Rect(textureRect.origin.x, textureRect.origin.y, trimmedSize.width, trimmedSize.height),
-                textureRotated,
-                Vec2(),
-                originalSize);
+            spriteFrame = SpriteFrame::createWithTexture(
+                texture, Rect(textureRect.origin.x, textureRect.origin.y, trimmedSize.width, trimmedSize.height),
+                textureRotated, Vec2(), originalSize);
 
             const auto flag = NinePatchImageParser::isNinePatchImage(spriteFrameName);
             if (flag)
             {
-                if (image == nullptr) {
+                if (image == nullptr)
+                {
                     image = new Image();
                     image->initWithImageFile(textureFileName);
                 }
@@ -409,15 +415,18 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
         CC_SAFE_DELETE(image);
     }
 
-    void reloadSpriteFramesWithDictionary(const rapidjson::Document& doc, Texture2D* texture, const std::string& atlasPath, SpriteFrameCache& cache)
+    void reloadSpriteFramesWithDictionary(const rapidjson::Document& doc,
+                                          Texture2D* texture,
+                                          std::string_view atlasPath,
+                                          SpriteFrameCache& cache)
     {
         auto&& framesItr = doc.FindMember("frames");
         if (framesItr == doc.MemberEnd())
             return;
 
         const auto spriteSheet = std::make_shared<SpriteSheet>();
-        spriteSheet->format = getFormat();
-        spriteSheet->path = atlasPath;
+        spriteSheet->format    = getFormat();
+        spriteSheet->path      = atlasPath;
 
         for (auto&& frameItr : framesItr->value.GetArray())
         {
@@ -427,34 +436,32 @@ class GenericJsonArraySpriteSheetLoader : public SpriteSheetLoader
             }
 
             const auto spriteFrameName = frameItr["filename"].GetString();
-            auto* spriteFrame = cache.findFrame(spriteFrameName);
+            auto* spriteFrame          = cache.findFrame(spriteFrameName);
             if (spriteFrame)
             {
                 continue;
             }
 
-            const auto frameX = frameItr["frame"]["x"].GetFloat();
-            const auto frameY = frameItr["frame"]["y"].GetFloat();
-            const auto frameW = frameItr["frame"]["w"].GetFloat();
-            const auto frameH = frameItr["frame"]["h"].GetFloat();
+            const auto frameX      = frameItr["frame"]["x"].GetFloat();
+            const auto frameY      = frameItr["frame"]["y"].GetFloat();
+            const auto frameW      = frameItr["frame"]["w"].GetFloat();
+            const auto frameH      = frameItr["frame"]["h"].GetFloat();
             const auto textureRect = Rect(frameX, frameY, frameW, frameH);
 
-            const auto originalWidth = frameItr["sourceSize"]["w"].GetInt();
+            const auto originalWidth  = frameItr["sourceSize"]["w"].GetInt();
             const auto originalHeight = frameItr["sourceSize"]["w"].GetInt();
-            const auto originalSize = Size(originalWidth, originalHeight);
+            const auto originalSize   = Size(originalWidth, originalHeight);
 
-            const auto trimmedWidth = frameItr["spriteSourceSize"]["w"].GetInt();
+            const auto trimmedWidth  = frameItr["spriteSourceSize"]["w"].GetInt();
             const auto trimmedHeight = frameItr["spriteSourceSize"]["h"].GetInt();
-            const auto trimmedSize = Size(trimmedWidth, trimmedHeight);
+            const auto trimmedSize   = Size(trimmedWidth, trimmedHeight);
 
             const auto textureRotated = frameItr["rotated"].GetBool();
 
             // create frame
-            spriteFrame = SpriteFrame::createWithTexture(texture,
-                Rect(textureRect.origin.x, textureRect.origin.y, trimmedSize.width, trimmedSize.height),
-                textureRotated,
-                Vec2(),
-                originalSize);
+            spriteFrame = SpriteFrame::createWithTexture(
+                texture, Rect(textureRect.origin.x, textureRect.origin.y, trimmedSize.width, trimmedSize.height),
+                textureRotated, Vec2(), originalSize);
 
             // add sprite frame
             cache.insertFrame(spriteSheet, spriteFrameName, spriteFrame);
@@ -475,7 +482,7 @@ SpriteFrameCacheJsonAtlasTest::SpriteFrameCacheJsonAtlasTest()
     infoLabel->setPosition(screenSize.width * 0.5f, screenSize.height * 0.7f);
     addChild(infoLabel);
 
-    loadSpriteFrames("Images/sprite_frames_test/test_RGB8888_generic.json", backend::PixelFormat::RGBA8);
+    loadSpriteFrames("Images/sprite_frames_test/test_RGB8888_generic.json"sv, backend::PixelFormat::RGBA8);
 }
 
 SpriteFrameCacheJsonAtlasTest::~SpriteFrameCacheJsonAtlasTest()
@@ -484,18 +491,22 @@ SpriteFrameCacheJsonAtlasTest::~SpriteFrameCacheJsonAtlasTest()
     cache->deregisterSpriteSheetLoader(GenericJsonArraySpriteSheetLoader::FORMAT);
 }
 
-void SpriteFrameCacheJsonAtlasTest::loadSpriteFrames(const std::string& file, cocos2d::backend::PixelFormat expectedFormat)
+void SpriteFrameCacheJsonAtlasTest::loadSpriteFrames(std::string_view file,
+                                                     cocos2d::backend::PixelFormat expectedFormat)
 {
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile(file, GenericJsonArraySpriteSheetLoader::FORMAT);
-    SpriteFrame* spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png");
-    Texture2D* texture = spriteFrame->getTexture();
+    SpriteFrame* spriteFrame =
+        SpriteFrameCache::getInstance()->getSpriteFrameByName("sprite_frames_test/grossini.png"sv);
+    Texture2D* texture      = spriteFrame->getTexture();
     const ssize_t bitsPerKB = 8 * 1024;
-    const double memorySize = 1.0 * texture->getBitsPerPixelForFormat() * texture->getContentSizeInPixels().width * texture->getContentSizeInPixels().height / bitsPerKB;
+    const double memorySize = 1.0 * texture->getBitsPerPixelForFormat() * texture->getContentSizeInPixels().width *
+                              texture->getContentSizeInPixels().height / bitsPerKB;
 #ifndef CC_USE_METAL
     CC_ASSERT(texture->getPixelFormat() == expectedFormat);
 #endif
-    const std::string textureInfo = StringUtils::format("%s: %.2f KB\r\n", texture->getStringForFormat(), memorySize);
-    infoLabel->setString(infoLabel->getString() + textureInfo);
+    const std::string textureInfo = StringUtils::format("%s%s: %.2f KB\r\n", infoLabel->getString().data(),
+                                                        texture->getStringForFormat(), memorySize);
+    infoLabel->setString(textureInfo);
 
     SpriteFrameCache::getInstance()->removeSpriteFramesFromFile(file);
     Director::getInstance()->getTextureCache()->removeTexture(texture);
diff --git a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h
index 9a2a6ab44e09..6d8562dc2e34 100644
--- a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h
+++ b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,17 +34,17 @@ class SpriteFrameCachePixelFormatTest : public TestCase
 {
 public:
     CREATE_FUNC(SpriteFrameCachePixelFormatTest);
-    
+
     virtual std::string title() const override { return "Pixel formats test"; }
     virtual std::string subtitle() const override { return "It shouldn't crash"; }
-    
+
     SpriteFrameCachePixelFormatTest();
-    
+
 private:
-    void loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat);
-    
+    void loadSpriteFrames(std::string_view file, cocos2d::backend::PixelFormat expectedFormat);
+
 private:
-    cocos2d::Label *infoLabel;
+    cocos2d::Label* infoLabel;
 };
 
 class SpriteFrameCacheLoadMultipleTimes : public TestCase
@@ -58,12 +58,10 @@ class SpriteFrameCacheLoadMultipleTimes : public TestCase
     SpriteFrameCacheLoadMultipleTimes();
 
 private:
-    void loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat);
-
+    void loadSpriteFrames(std::string_view file, cocos2d::backend::PixelFormat expectedFormat);
 };
 
-
-class SpriteFrameCacheFullCheck: public TestCase
+class SpriteFrameCacheFullCheck : public TestCase
 {
 public:
     CREATE_FUNC(SpriteFrameCacheFullCheck);
@@ -74,11 +72,9 @@ class SpriteFrameCacheFullCheck: public TestCase
     SpriteFrameCacheFullCheck();
 
 private:
-    void loadSpriteFrames(const std::string &file, cocos2d::backend::PixelFormat expectedFormat);
-
+    void loadSpriteFrames(std::string_view file, cocos2d::backend::PixelFormat expectedFormat);
 };
 
-
 class SpriteFrameCacheJsonAtlasTest : public TestCase
 {
 public:
@@ -91,7 +87,7 @@ class SpriteFrameCacheJsonAtlasTest : public TestCase
     ~SpriteFrameCacheJsonAtlasTest() override;
 
 private:
-    void loadSpriteFrames(const std::string& file, cocos2d::backend::PixelFormat expectedFormat);
+    void loadSpriteFrames(std::string_view file, cocos2d::backend::PixelFormat expectedFormat);
 
     cocos2d::Label* infoLabel;
 };
diff --git a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp
index 3bc3c9413fd1..0947969e2fc9 100644
--- a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp
+++ b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -46,7 +46,7 @@ SpritePolygonTest::SpritePolygonTest()
 
 SpritePolygonTestCase::SpritePolygonTestCase()
 {
-    _isDebugDraw = true;
+    _isDebugDraw     = true;
     _isNeedDebugMenu = true;
 }
 
@@ -58,7 +58,7 @@ SpritePolygonTestCase::~SpritePolygonTestCase()
 void SpritePolygonTestCase::onEnter()
 {
     TestCase::onEnter();
-    Director::getInstance()->setClearColor(Color4F(102.0f/255.0f, 184.0f/255.0f, 204.0f/255.0f, 1.0f));
+    Director::getInstance()->setClearColor(Color4F(102.0f / 255.0f, 184.0f / 255.0f, 204.0f / 255.0f, 1.0f));
 }
 
 void SpritePolygonTestCase::onExit()
@@ -69,21 +69,24 @@ void SpritePolygonTestCase::onExit()
 
 bool SpritePolygonTestCase::init()
 {
-    if(TestCase::init())
+    if (TestCase::init())
     {
         if (_isNeedDebugMenu)
         {
             TTFConfig ttfConfig("fonts/arial.ttf", 10);
-            auto label = Label::createWithTTF(ttfConfig,"DebugDraw OFF");
-            auto menuItem = MenuItemLabel::create(label, [=](Ref *ref){
-                if (_isDebugDraw){
+            auto label    = Label::createWithTTF(ttfConfig, "DebugDraw OFF");
+            auto menuItem = MenuItemLabel::create(label, [=](Ref* ref) {
+                if (_isDebugDraw)
+                {
                     _isDebugDraw = false;
                     label->setString("DebugDraw ON");
                     for (int i = 0; i < _drawNodes.size(); i++)
                     {
                         _drawNodes.at(i)->setVisible(false);
                     }
-                }else{
+                }
+                else
+                {
                     _isDebugDraw = true;
                     label->setString("DebugDraw OFF");
                     for (int i = 0; i < _drawNodes.size(); i++)
@@ -93,11 +96,11 @@ bool SpritePolygonTestCase::init()
                     }
                 }
             });
-            
+
             auto menu = Menu::create(menuItem, nullptr);
             menu->setPosition(Vec2::ZERO);
             menuItem->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-            menuItem->setPosition( VisibleRect::leftBottom() + Vec2(0.0f, VisibleRect::leftTop().y/4));
+            menuItem->setPosition(VisibleRect::leftBottom() + Vec2(0.0f, VisibleRect::leftTop().y / 4));
             this->addChild(menu, 9999);
         }
         return true;
@@ -107,39 +110,42 @@ bool SpritePolygonTestCase::init()
 
 void SpritePolygonTestCase::updateDrawNode()
 {
-    if (_isDebugDraw && _drawNodes.size() > 0) {
+    if (_isDebugDraw && _drawNodes.size() > 0)
+    {
         for (int i = 0; i < _drawNodes.size(); i++)
         {
-                auto drawnode = _drawNodes.at(i);
-                auto sp = (Sprite*)drawnode->getParent();
-                if(!sp) return;
-                const auto& polygoninfo = sp->getPolygonInfo();
-                drawnode->clear();
-                const auto count = polygoninfo.triangles.indexCount/3;
-                const auto indices = polygoninfo.triangles.indices;
-                const auto verts = polygoninfo.triangles.verts;
-                for(ssize_t i = 0; i < count; i++)
-                {
-                    //draw 3 lines
-                    Vec3 from = verts[indices[i*3]].vertices;
-                    Vec3 to = verts[indices[i*3+1]].vertices;
-                    drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x,to.y), Color4F::BLUE);
-                    
-                    from = verts[indices[i*3+1]].vertices;
-                    to = verts[indices[i*3+2]].vertices;
-                    drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x,to.y), Color4F::GREEN);
-                    
-                    from = verts[indices[i*3+2]].vertices;
-                    to = verts[indices[i*3]].vertices;
-                    drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x,to.y), Color4F::RED);
-                }
+            auto drawnode = _drawNodes.at(i);
+            auto sp       = (Sprite*)drawnode->getParent();
+            if (!sp)
+                return;
+            const auto& polygoninfo = sp->getPolygonInfo();
+            drawnode->clear();
+            const auto count   = polygoninfo.triangles.indexCount / 3;
+            const auto indices = polygoninfo.triangles.indices;
+            const auto verts   = polygoninfo.triangles.verts;
+            for (ssize_t i = 0; i < count; i++)
+            {
+                // draw 3 lines
+                Vec3 from = verts[indices[i * 3]].vertices;
+                Vec3 to   = verts[indices[i * 3 + 1]].vertices;
+                drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x, to.y), Color4F::BLUE);
+
+                from = verts[indices[i * 3 + 1]].vertices;
+                to   = verts[indices[i * 3 + 2]].vertices;
+                drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x, to.y), Color4F::GREEN);
+
+                from = verts[indices[i * 3 + 2]].vertices;
+                to   = verts[indices[i * 3]].vertices;
+                drawnode->drawLine(Vec2(from.x, from.y), Vec2(to.x, to.y), Color4F::RED);
+            }
         }
     }
 }
 
 bool SpritePolygonTestDemo::init()
 {
-    if (SpritePolygonTestCase::init()) {
+    if (SpritePolygonTestCase::init())
+    {
         _polygonSprite = nullptr;
         initSprites();
         initTouches();
@@ -150,13 +156,12 @@ bool SpritePolygonTestDemo::init()
 
 void SpritePolygonTestDemo::initTouches()
 {
-    if(_polygonSprite) {
-        auto touchListener = EventListenerTouchOneByOne::create();
-        touchListener->onTouchBegan = [&](Touch* touch, Event* event){
-            return true;
-        };
-        touchListener->onTouchMoved = [&](Touch* touch, Event* event){
-            auto pos = touch->getDelta();
+    if (_polygonSprite)
+    {
+        auto touchListener          = EventListenerTouchOneByOne::create();
+        touchListener->onTouchBegan = [&](Touch* touch, Event* event) { return true; };
+        touchListener->onTouchMoved = [&](Touch* touch, Event* event) {
+            auto pos       = touch->getDelta();
             float newScale = clampf(_polygonSprite->getScale() + pos.x * 0.01f, 0.1f, 2.f);
             _polygonSprite->setScale(newScale);
             _normalSprite->setScale(newScale);
@@ -168,84 +173,84 @@ void SpritePolygonTestDemo::initTouches()
 
 SpritePolygonTest1::SpritePolygonTest1()
 {
-    _title = "SpritePolygon Creation";
+    _title    = "SpritePolygon Creation";
     _subtitle = "Sprite::create(AutoPolygon::generatePolygon(filename))";
 }
 
 void SpritePolygonTest1::initSprites()
 {
-    auto s = Director::getInstance()->getWinSize();
-    auto offset = Vec2(0.15*s.width,0);
+    auto s        = Director::getInstance()->getWinSize();
+    auto offset   = Vec2(0.15 * s.width, 0);
     auto filename = s_pathGrossini;
-    
-    //Sprite
-    auto pinfo = AutoPolygon::generatePolygon(filename);
+
+    // Sprite
+    auto pinfo     = AutoPolygon::generatePolygon(filename);
     _polygonSprite = Sprite::create(pinfo);
     _polygonSprite->setTag(101);
     addChild(_polygonSprite);
-    _polygonSprite->setPosition(Vec2(s)/2 + offset);
+    _polygonSprite->setPosition(Vec2(s) / 2 + offset);
 
     _normalSprite = Sprite::create(filename);
     _normalSprite->setTag(100);
     addChild(_normalSprite);
-    _normalSprite->setPosition(Vec2(s)/2 - offset);
+    _normalSprite->setPosition(Vec2(s) / 2 - offset);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     spDrawNode->setTag(_normalSprite->getTag());
     spDrawNode->clear();
     _normalSprite->addChild(spDrawNode);
     _drawNodes.pushBack(spDrawNode);
-    
+
     auto sppDrawNode = DrawNode::create();
     sppDrawNode->setTag(_polygonSprite->getTag());
     sppDrawNode->clear();
     _polygonSprite->addChild(sppDrawNode);
     _drawNodes.pushBack(sppDrawNode);
-    
-    //Label
+
+    // Label
     TTFConfig ttfConfig("fonts/arial.ttf", 8);
     std::string temp = "Sprite:\nPixels drawn: ";
-    auto spSize = _normalSprite->getContentSize();
-    auto spArea = Label::createWithTTF(ttfConfig, temp+Value((int)spSize.width*(int)spSize.height).asString());
+    auto spSize      = _normalSprite->getContentSize();
+    auto spArea      = Label::createWithTTF(ttfConfig, temp + Value((int)spSize.width * (int)spSize.height).asString());
     _normalSprite->addChild(spArea);
-    spArea->setAnchorPoint(Vec2(0,1));
-    
-    temp = "SpritePolygon:\nPixels drawn: ";
-    auto vertCount = "\nverts:"+Value((int)pinfo.getVertCount()).asString();
-    auto sppArea = Label::createWithTTF(ttfConfig, temp+Value((int)pinfo.getArea()).asString()+vertCount);
+    spArea->setAnchorPoint(Vec2(0, 1));
+
+    temp           = "SpritePolygon:\nPixels drawn: ";
+    auto vertCount = "\nverts:" + Value((int)pinfo.getVertCount()).asString();
+    auto sppArea   = Label::createWithTTF(ttfConfig, temp + Value((int)pinfo.getArea()).asString() + vertCount);
     _polygonSprite->addChild(sppArea);
-    sppArea->setAnchorPoint(Vec2(0,1));
-    
+    sppArea->setAnchorPoint(Vec2(0, 1));
+
     updateDrawNode();
 }
 
 SpritePolygonTest2::SpritePolygonTest2()
 {
-    _title = "SpritePolygon Creation with a rect";
+    _title    = "SpritePolygon Creation with a rect";
     _subtitle = "Sprite::create(AutoPolygon::generatePolygon(filename, rect))";
 }
 
 void SpritePolygonTest2::initSprites()
 {
-    auto s = Director::getInstance()->getWinSize();
-    auto offset = Vec2(0.15*s.width,0);
+    auto s        = Director::getInstance()->getWinSize();
+    auto offset   = Vec2(0.15 * s.width, 0);
     auto filename = s_pathGrossini;
-    Rect head = Rect(30,25,25,25);
-    
-    //Sprite
-    auto pinfo = AutoPolygon::generatePolygon(filename, head);
+    Rect head     = Rect(30, 25, 25, 25);
+
+    // Sprite
+    auto pinfo     = AutoPolygon::generatePolygon(filename, head);
     _polygonSprite = Sprite::create(pinfo);
     _polygonSprite->setTag(101);
     addChild(_polygonSprite);
-    _polygonSprite->setPosition(Vec2(s)/2 + offset);
-    
-    _normalSprite = Sprite::create(filename,head);
+    _polygonSprite->setPosition(Vec2(s) / 2 + offset);
+
+    _normalSprite = Sprite::create(filename, head);
     _normalSprite->setTag(100);
     addChild(_normalSprite);
-    _normalSprite->setPosition(Vec2(s)/2 - offset);
+    _normalSprite->setPosition(Vec2(s) / 2 - offset);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     _drawNodes.pushBack(spDrawNode);
     spDrawNode->setTag(_normalSprite->getTag());
@@ -257,27 +262,27 @@ void SpritePolygonTest2::initSprites()
     sppDrawNode->setTag(_polygonSprite->getTag());
     sppDrawNode->clear();
     _polygonSprite->addChild(sppDrawNode);
-    
-    //Label
+
+    // Label
     TTFConfig ttfConfig("fonts/arial.ttf", 8);
     std::string temp = "Sprite:\nPixels drawn: ";
-    auto spSize = _normalSprite->getContentSize();
-    auto spArea = Label::createWithTTF(ttfConfig, temp+Value((int)spSize.width*(int)spSize.height).asString());
+    auto spSize      = _normalSprite->getContentSize();
+    auto spArea      = Label::createWithTTF(ttfConfig, temp + Value((int)spSize.width * (int)spSize.height).asString());
     _normalSprite->addChild(spArea);
-    spArea->setAnchorPoint(Vec2(0,1));
-    
-    temp = "SpritePolygon:\nPixels drawn: ";
-    auto vertCount = "\nverts:"+Value((int)pinfo.getVertCount()).asString();
-    auto sppArea = Label::createWithTTF(ttfConfig, temp+Value((int)pinfo.getArea()).asString()+vertCount);
+    spArea->setAnchorPoint(Vec2(0, 1));
+
+    temp           = "SpritePolygon:\nPixels drawn: ";
+    auto vertCount = "\nverts:" + Value((int)pinfo.getVertCount()).asString();
+    auto sppArea   = Label::createWithTTF(ttfConfig, temp + Value((int)pinfo.getArea()).asString() + vertCount);
     _polygonSprite->addChild(sppArea);
-    sppArea->setAnchorPoint(Vec2(0,1));
-    
+    sppArea->setAnchorPoint(Vec2(0, 1));
+
     updateDrawNode();
 }
 
 bool SpritePolygonTestSlider::init()
 {
-    if(SpritePolygonTestCase::init())
+    if (SpritePolygonTestCase::init())
     {
         initSliders();
         initSprites();
@@ -288,139 +293,132 @@ bool SpritePolygonTestSlider::init()
 
 void SpritePolygonTestSlider::initSliders()
 {
-    auto vsize =Director::getInstance()->getVisibleSize();
+    auto vsize                  = Director::getInstance()->getVisibleSize();
     cocos2d::ui::Slider* slider = cocos2d::ui::Slider::create();
     slider->loadBarTexture("cocosui/sliderTrack.png");
     slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
     slider->loadProgressBarTexture("cocosui/sliderProgress.png");
-    slider->setPosition(Vec2(vsize.width/2, vsize.height/4));
+    slider->setPosition(Vec2(vsize.width / 2, vsize.height / 4));
 
     auto ttfConfig = TTFConfig("fonts/arial.ttf", 8);
-    _epsilonLabel = Label::createWithTTF(ttfConfig, "Epsilon: 2.0");
+    _epsilonLabel  = Label::createWithTTF(ttfConfig, "Epsilon: 2.0");
     addChild(_epsilonLabel);
-    _epsilonLabel->setPosition(Vec2(vsize.width/2, vsize.height/4 + 15));
+    _epsilonLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 4 + 15));
     addChild(slider);
 
     slider->addEventListener(CC_CALLBACK_2(SpritePolygonTestSlider::changeEpsilon, this));
-    slider->setPercent((int)(sqrtf(1.0f/19.0f)*100));
-
+    slider->setPercent((int)(sqrtf(1.0f / 19.0f) * 100));
 }
 
 void SpritePolygonTestSlider::makeSprites(const std::string* list, const int count, const float y)
 {
     auto vsize = Director::getInstance()->getVisibleSize();
-    for(int i = 0; i < count; i++)
+    for (int i = 0; i < count; i++)
     {
-        float offset = (vsize.width/(count+1)) * (i+1);
-        auto sp = makeSprite(list[i], Vec2(offset, y));
+        float offset = (vsize.width / (count + 1)) * (i + 1);
+        auto sp      = makeSprite(list[i], Vec2(offset, y));
         addChild(sp);
     }
 }
 
-void SpritePolygonTestSlider::changeEpsilon(cocos2d::Ref *pSender, cocos2d::ui::Slider::EventType type)
+void SpritePolygonTestSlider::changeEpsilon(cocos2d::Ref* pSender, cocos2d::ui::Slider::EventType type)
 {
     if (type == cocos2d::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
         cocos2d::ui::Slider* slider = dynamic_cast<cocos2d::ui::Slider*>(pSender);
-        float epsilon = powf(slider->getPercent()/100.0,2)*19.0f + 1.0f;
-        for(auto child : _children)
+        float epsilon               = powf(slider->getPercent() / 100.0, 2) * 19.0f + 1.0f;
+        for (auto child : _children)
         {
-            if(child->getName().size())
+            if (child->getName().size())
             {
-                Sprite *sp = (Sprite*)child;
-                auto file = sp->getName();
+                Sprite* sp = (Sprite*)child;
+                auto file  = sp->getName();
                 auto pinfo = AutoPolygon::generatePolygon(file, Rect::ZERO, epsilon);
                 sp->setPolygonInfo(pinfo);
                 updateLabel(sp, pinfo);
             }
         }
-        _epsilonLabel->setString("Epsilon: "+ Value(epsilon).asString());
+        _epsilonLabel->setString("Epsilon: " + Value(epsilon).asString());
         updateDrawNode();
     }
 }
 
-void SpritePolygonTestSlider::updateLabel(const cocos2d::Sprite *sp, const PolygonInfo &pinfo)
+void SpritePolygonTestSlider::updateLabel(const cocos2d::Sprite* sp, const PolygonInfo& pinfo)
 {
-    Label *label = (Label*)(sp->getChildByName(sp->getName()));
+    Label* label  = (Label*)(sp->getChildByName(sp->getName()));
     auto filename = sp->getName();
-    auto size = pinfo.getRect().size/Director::getInstance()->getContentScaleFactor();
-    label->setString(filename+"\nVerts: "+Value((int)pinfo.getVertCount()).asString()+ "\nPixels: "+Value((int)(pinfo.getArea()/(size.width*size.height)*100)).asString()+"%");
+    auto size     = pinfo.getRect().size / Director::getInstance()->getContentScaleFactor();
+    label->setString((std::string)filename + "\nVerts: " + Value((int)pinfo.getVertCount()).asString() +
+                     "\nPixels: " + Value((int)(pinfo.getArea() / (size.width * size.height) * 100)).asString() + "%");
 }
 
-Sprite* SpritePolygonTestSlider::makeSprite(const std::string &filename, const Vec2 &pos)
+Sprite* SpritePolygonTestSlider::makeSprite(std::string_view filename, const Vec2& pos)
 {
-    //Sprite
-    auto quadSize = Sprite::create(filename)->getContentSize();
+    // Sprite
+    auto quadSize    = Sprite::create(filename)->getContentSize();
     int originalSize = quadSize.width * quadSize.height;
-    auto pinfo = AutoPolygon::generatePolygon(filename);
-    auto ret = Sprite::create(pinfo);
+    auto pinfo       = AutoPolygon::generatePolygon(filename);
+    auto ret         = Sprite::create(pinfo);
     ret->setName(filename);
     ret->setTag(_tagIndex);
     _tagIndex++;
     ret->setPosition(pos);
-    
-    //DrawNode
+
+    // DrawNode
     auto drawNode = DrawNode::create();
     _drawNodes.pushBack(drawNode);
     drawNode->setTag(ret->getTag());
     drawNode->clear();
     ret->addChild(drawNode);
- 
-    //Label
+
+    // Label
     auto ttfConfig = TTFConfig("fonts/arial.ttf", 8);
-    auto spArea = Label::createWithTTF(ttfConfig, filename+"\nVerts: "+Value((int)pinfo.getVertCount()).asString()+ "\nPixels: "+Value((int)(pinfo.getArea()/originalSize*100)).asString()+"%");
+    auto spArea    = Label::createWithTTF(
+           ttfConfig, (std::string)filename + "\nVerts: " + Value((int)pinfo.getVertCount()).asString() +
+                          "\nPixels: " + Value((int)(pinfo.getArea() / originalSize * 100)).asString() + "%");
     ret->addChild(spArea);
-    spArea->setAnchorPoint(Vec2(0.0f,1.0f));
+    spArea->setAnchorPoint(Vec2(0.0f, 1.0f));
     spArea->setName(filename);
     ret->setAnchorPoint(Vec2(0.5f, 0.0f));
-    
+
     updateDrawNode();
-    
+
     return ret;
 }
 
 SpritePolygonTest3::SpritePolygonTest3()
 {
-    _title = "Optimization Value (default:2.0)";
+    _title    = "Optimization Value (default:2.0)";
     _subtitle = "";
     _tagIndex = 100;
 }
 
 void SpritePolygonTest3::initSprites()
 {
-    auto vsize =Director::getInstance()->getVisibleSize();
-    std::string list[] = {
-        "Images/arrows.png",
-        "Images/CyanTriangle.png",
-        s_pathB2,
-        "Images/elephant1_Diffuse.png"
-    };
-    int count = sizeof(list)/sizeof(list[0]);
-    makeSprites(list, count, vsize.height/2);
+    auto vsize         = Director::getInstance()->getVisibleSize();
+    std::string list[] = {"Images/arrows.png", "Images/CyanTriangle.png", s_pathB2, "Images/elephant1_Diffuse.png"};
+    int count          = sizeof(list) / sizeof(list[0]);
+    makeSprites(list, count, vsize.height / 2);
 }
 
 SpritePolygonTest4::SpritePolygonTest4()
 {
-    _title = "Optimization Value (default:2.0)";
+    _title    = "Optimization Value (default:2.0)";
     _subtitle = "";
     _tagIndex = 100;
 }
 
 void SpritePolygonTest4::initSprites()
 {
-    auto vsize =Director::getInstance()->getVisibleSize();
-    int count = 3;
-    std::string list[] = {
-        s_pathGrossini,
-        "Images/grossinis_sister1.png",
-        "Images/grossinis_sister2.png"
-    };
-    makeSprites(list, count, vsize.height/5*2);
+    auto vsize         = Director::getInstance()->getVisibleSize();
+    int count          = 3;
+    std::string list[] = {s_pathGrossini, "Images/grossinis_sister1.png", "Images/grossinis_sister2.png"};
+    makeSprites(list, count, vsize.height / 5 * 2);
 }
 
 SpritePolygonTest5::SpritePolygonTest5()
 {
-    _title = "SpritePolygon Actions";
+    _title    = "SpritePolygon Actions";
     _subtitle = "Touch screen to add sprite with random action.";
     _tagIndex = 100;
 }
@@ -440,11 +438,9 @@ bool SpritePolygonTest5::init()
 
 void SpritePolygonTest5::initTouch()
 {
-    auto touchListener = EventListenerTouchOneByOne::create();
-    touchListener->onTouchBegan = [&](Touch* touch, Event* event){
-        return true;
-    };
-    touchListener->onTouchEnded = [&](Touch* touch, Event* event){
+    auto touchListener          = EventListenerTouchOneByOne::create();
+    touchListener->onTouchBegan = [&](Touch* touch, Event* event) { return true; };
+    touchListener->onTouchEnded = [&](Touch* touch, Event* event) {
         auto pos = touch->getLocation();
         addSpritePolygon(pos);
     };
@@ -454,11 +450,12 @@ void SpritePolygonTest5::initTouch()
 void SpritePolygonTest5::loadDefaultSprites()
 {
     auto s = Director::getInstance()->getVisibleSize();
-    
+
     const int DEFAULT_SPRITEPOLYGON_COUNT = 8;
     Sprite* sprites[DEFAULT_SPRITEPOLYGON_COUNT];
 
-    for (int i = 0; i < DEFAULT_SPRITEPOLYGON_COUNT; i++) {
+    for (int i = 0; i < DEFAULT_SPRITEPOLYGON_COUNT; i++)
+    {
         sprites[i] = Sprite::create(_polygonInfo);
         sprites[i]->setTag(_tagIndex);
         _tagIndex++;
@@ -473,12 +470,12 @@ void SpritePolygonTest5::loadDefaultSprites()
     sprites[0]->setColor(Color3B::RED);
     sprites[1]->setOpacity(100);
     sprites[2]->setTexture(Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister1.png"));
-    sprites[3]->setTextureRect(Rect(0.0f,0.0f,100.0f,30.0f));
+    sprites[3]->setTextureRect(Rect(0.0f, 0.0f, 100.0f, 30.0f));
     sprites[4]->setScale(0.5f, 2.0f);
     sprites[5]->setFlippedY(true);
     sprites[6]->setSkewX(60);
     sprites[7]->setRotation(90);
-    
+
     updateDrawNode();
 }
 
@@ -494,20 +491,20 @@ void SpritePolygonTest5::addSpritePolygon(const Vec2& pos)
     drawNode->setTag(sprite->getTag());
     drawNode->clear();
     sprite->addChild(drawNode);
-    
+
     ActionInterval* action;
     float random = CCRANDOM_0_1();
-    if( random < 0.20 )
+    if (random < 0.20)
         action = ScaleBy::create(3, 2);
-    else if(random < 0.40)
+    else if (random < 0.40)
         action = RotateBy::create(3, 360);
-    else if( random < 0.60)
+    else if (random < 0.60)
         action = Blink::create(1, 3);
-    else if( random < 0.8 )
+    else if (random < 0.8)
         action = TintBy::create(2, 0, -255, -255);
     else
         action = FadeOut::create(2);
-    auto seq = Sequence::create( action, action->reverse(), nullptr );
+    auto seq = Sequence::create(action, action->reverse(), nullptr);
     sprite->runAction(RepeatForever::create(seq));
 }
 
@@ -521,26 +518,27 @@ SpritePolygonPerformance::SpritePolygonPerformance()
     TTFConfig ttfConfig("fonts/arial.ttf", 10);
     _perfLabel = Label::createWithTTF(ttfConfig, "performance test");
     addChild(_perfLabel);
-    _perfLabel->setPosition(Director::getInstance()->getVisibleSize().width/2, 80);
-    
-    _spriteCount = _vertCount = _triCount = _pixelCount = _continuousLowDt =0;
-    auto size = Director::getInstance()->getVisibleSize();
-    _elapsedTime = 0;
-    _posX = _leftX = size.width*0.15;
-    _rightX = size.width*0.85;
-    _posY = size.height/2;
-    prevDt = 0.016f;
-    goRight = true;
-    ended = false;
+    _perfLabel->setPosition(Director::getInstance()->getVisibleSize().width / 2, 80);
+
+    _spriteCount = _vertCount = _triCount = _pixelCount = _continuousLowDt = 0;
+    auto size                                                              = Director::getInstance()->getVisibleSize();
+    _elapsedTime                                                           = 0;
+    _posX = _leftX        = size.width * 0.15;
+    _rightX               = size.width * 0.85;
+    _posY                 = size.height / 2;
+    prevDt                = 0.016f;
+    goRight               = true;
+    ended                 = false;
     _continuousHighDtTime = 0.0;
-    _waitingTime = 0.0;
-    
+    _waitingTime          = 0.0;
+
     _isNeedDebugMenu = false;
 }
 
 bool SpritePolygonPerformance::init()
 {
-    if (SpritePolygonTestCase::init()) {
+    if (SpritePolygonTestCase::init())
+    {
         initIncrementStats();
         scheduleUpdate();
         return true;
@@ -550,73 +548,82 @@ bool SpritePolygonPerformance::init()
 
 void SpritePolygonPerformance::updateLabel()
 {
-    std::string temp = "Nodes: " + Value(_spriteCount).asString() + " Triangles: " + Value(_triCount).asString() + "\nPixels: " + Value(_pixelCount).asString() + " Vertices: " + Value(_vertCount).asString();
-    if(!ended)
-    _perfLabel->setString("Nodes: " + Value(_spriteCount).asString() + "   Triangles: " + Value(_triCount).asString() + "\nPixels: " + Value(_pixelCount).asString() + "   Vertices: " + Value(_vertCount).asString());
+    std::string temp = "Nodes: " + Value(_spriteCount).asString() + " Triangles: " + Value(_triCount).asString() +
+                       "\nPixels: " + Value(_pixelCount).asString() + " Vertices: " + Value(_vertCount).asString();
+    if (!ended)
+        _perfLabel->setString(
+            "Nodes: " + Value(_spriteCount).asString() + "   Triangles: " + Value(_triCount).asString() +
+            "\nPixels: " + Value(_pixelCount).asString() + "   Vertices: " + Value(_vertCount).asString());
 }
 
-Node *SpritePolygonPerformance::makeSprite()
+Node* SpritePolygonPerformance::makeSprite()
 {
     return nullptr;
 }
 
 void SpritePolygonPerformance::update(float dt)
 {
-    dt = dt*0.3 + prevDt*0.7;
+    dt     = dt * 0.3 + prevDt * 0.7;
     prevDt = dt;
     _elapsedTime += dt;
-    int loops = (0.025-dt)*1000;
-    if(dt < 0.025 && loops>0)
+    int loops = (0.025 - dt) * 1000;
+    if (dt < 0.025 && loops > 0)
     {
-        _continuousHighDtTime = clampf(_continuousHighDtTime-dt*2, 0.0, 1.0);
-        _waitingTime = clampf(_waitingTime-dt, 0.0, 5.0);
+        _continuousHighDtTime = clampf(_continuousHighDtTime - dt * 2, 0.0, 1.0);
+        _waitingTime          = clampf(_waitingTime - dt, 0.0, 5.0);
         _continuousLowDt++;
     }
     else
     {
-        _continuousHighDtTime+=dt;
+        _continuousHighDtTime += dt;
         _continuousLowDt = 0;
     }
-    if (_continuousLowDt >= 5 && loops > 0) {
-        for(int i = 0; i < loops; i++)
+    if (_continuousLowDt >= 5 && loops > 0)
+    {
+        for (int i = 0; i < loops; i++)
         {
-            if(_posX >= _rightX)
+            if (_posX >= _rightX)
             {
                 goRight = false;
             }
-            else if(_posX <= _leftX)
+            else if (_posX <= _leftX)
             {
                 goRight = true;
             }
             auto s = makeSprite();
             addChild(s);
             s->setPosition(_posX, _posY);
-            if(goRight)
+            if (goRight)
                 _posX++;
             else
                 _posX--;
-            
+
             incrementStats();
         }
         updateLabel();
     }
 
-    //if we have 10 continuous low dt, then we will start to create more sprites
-    else if(_continuousHighDtTime >= .5 || _waitingTime > 3.0){
+    // if we have 10 continuous low dt, then we will start to create more sprites
+    else if (_continuousHighDtTime >= .5 || _waitingTime > 3.0)
+    {
         // its now 1 seconds with high DT time, time to end
         ended = true;
         unscheduleUpdate();
-        _perfLabel->setString("Test ended in " + Value(_elapsedTime).asString() + " seconds\nNodes: " + Value(_spriteCount).asString() + "   Triangles: " + Value(_triCount).asString() + "\nPixels: " + Value(_pixelCount).asString() + "   Vertices: " + Value(_vertCount).asString());
+        _perfLabel->setString(
+            "Test ended in " + Value(_elapsedTime).asString() + " seconds\nNodes: " + Value(_spriteCount).asString() +
+            "   Triangles: " + Value(_triCount).asString() + "\nPixels: " + Value(_pixelCount).asString() +
+            "   Vertices: " + Value(_vertCount).asString());
         _subtitleLabel->setString("Test ended");
     }
-    else{
+    else
+    {
         _waitingTime += dt;
     }
 }
 
 void SpritePolygonPerformance::incrementStats()
 {
-    _spriteCount ++;
+    _spriteCount++;
     _vertCount += _incVert;
     _triCount += _incTri;
     _pixelCount += _incPix;
@@ -624,43 +631,43 @@ void SpritePolygonPerformance::incrementStats()
 
 void SpritePolygonPerformanceTestDynamic::initIncrementStats()
 {
-    _pinfo = AutoPolygon::generatePolygon(s_pathGrossini);
+    _pinfo   = AutoPolygon::generatePolygon(s_pathGrossini);
     _incVert = _pinfo.getVertCount();
-    _incTri = _pinfo.getTrianglesCount();
-    _incPix = _pinfo.getArea();
+    _incTri  = _pinfo.getTrianglesCount();
+    _incPix  = _pinfo.getArea();
 }
 
 SpritePolygonPerformanceTestDynamic::SpritePolygonPerformanceTestDynamic()
 {
-    _title = "Dynamic SpritePolygon Performance";
+    _title    = "Dynamic SpritePolygon Performance";
     _subtitle = "Test running, please wait until it ends";
 }
 
 Sprite* SpritePolygonPerformanceTestDynamic::makeSprite()
 {
     auto ret = Sprite::create(_pinfo);
-    ret->runAction(RepeatForever::create(RotateBy::create(1.0f,360.0f)));
+    ret->runAction(RepeatForever::create(RotateBy::create(1.0f, 360.0f)));
     return ret;
 }
 
 SpritePerformanceTestDynamic::SpritePerformanceTestDynamic()
 {
-    _title = "Dynamic Sprite Performance";
+    _title    = "Dynamic Sprite Performance";
     _subtitle = "Test running, please wait until it ends";
 }
 
 void SpritePerformanceTestDynamic::initIncrementStats()
 {
-    auto t = Sprite::create(s_pathGrossini);
+    auto t   = Sprite::create(s_pathGrossini);
     _incVert = 4;
-    _incTri = 2;
-    _incPix = t->getContentSize().width * t->getContentSize().height;
+    _incTri  = 2;
+    _incPix  = t->getContentSize().width * t->getContentSize().height;
 }
 
 Sprite* SpritePerformanceTestDynamic::makeSprite()
 {
-    auto ret =  Sprite::create(s_pathGrossini);
-    ret->runAction(RepeatForever::create(RotateBy::create(1.0f,360.0f)));
+    auto ret = Sprite::create(s_pathGrossini);
+    ret->runAction(RepeatForever::create(RotateBy::create(1.0f, 360.0f)));
     return ret;
 }
 
@@ -669,19 +676,19 @@ Sprite* SpritePerformanceTestDynamic::makeSprite()
 //
 SpritePolygonTestNoCrash::SpritePolygonTestNoCrash()
 {
-    _title = "SpritePolygon ";
+    _title    = "SpritePolygon ";
     _subtitle = "AutoPolygon: should not crash";
 }
 
 void SpritePolygonTestNoCrash::initSprites()
 {
-    auto s = Director::getInstance()->getWinSize();
-    auto pinfo = AutoPolygon::generatePolygon("Images/sprite_polygon_crash.png", Rect::ZERO, 0.5);
+    auto s      = Director::getInstance()->getWinSize();
+    auto pinfo  = AutoPolygon::generatePolygon("Images/sprite_polygon_crash.png", Rect::ZERO, 0.5);
     auto sprite = Sprite::create(pinfo);
     addChild(sprite);
-    sprite->setPosition(s.width/2, s.height/2);
+    sprite->setPosition(s.width / 2, s.height / 2);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     spDrawNode->setTag(sprite->getTag());
     spDrawNode->clear();
@@ -696,21 +703,21 @@ void SpritePolygonTestNoCrash::initSprites()
 //
 SpritePolygonTestTPIsland::SpritePolygonTestTPIsland()
 {
-    _title = "SpritePolygon ";
+    _title    = "SpritePolygon ";
     _subtitle = "TexturePacker: Sprite with island";
 }
 
 void SpritePolygonTestTPIsland::initSprites()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("Images/test_polygon.plist");
 
     auto sprite = Sprite::createWithSpriteFrame(cache->getSpriteFrameByName("island_polygon.png"));
     addChild(sprite);
-    sprite->setPosition(s.width/2, s.height/2);
+    sprite->setPosition(s.width / 2, s.height / 2);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     spDrawNode->setTag(sprite->getTag());
     spDrawNode->clear();
@@ -725,7 +732,7 @@ void SpritePolygonTestTPIsland::initSprites()
 //
 SpritePolygonTestAutoPolyIsland::SpritePolygonTestAutoPolyIsland()
 {
-    _title = "SpritePolygon";
+    _title    = "SpritePolygon";
     _subtitle = "AutoPolygon: Sprite with island";
 }
 
@@ -733,12 +740,12 @@ void SpritePolygonTestAutoPolyIsland::initSprites()
 {
     auto s = Director::getInstance()->getWinSize();
 
-    auto pinfo = AutoPolygon::generatePolygon("Images/island_polygon.png", Rect::ZERO, 1);
+    auto pinfo  = AutoPolygon::generatePolygon("Images/island_polygon.png", Rect::ZERO, 1);
     auto sprite = Sprite::create(pinfo);
     addChild(sprite);
-    sprite->setPosition(s.width/2, s.height/2);
+    sprite->setPosition(s.width / 2, s.height / 2);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     spDrawNode->setTag(sprite->getTag());
     spDrawNode->clear();
@@ -753,7 +760,7 @@ void SpritePolygonTestAutoPolyIsland::initSprites()
 //
 SpritePolygonTestFrameAnim::SpritePolygonTestFrameAnim()
 {
-    _title = "SpritePolygon";
+    _title    = "SpritePolygon";
     _subtitle = "SpriteFrame animation";
 }
 
@@ -761,48 +768,44 @@ void SpritePolygonTestFrameAnim::initSprites()
 {
     auto screen = Director::getInstance()->getWinSize();
 
-    auto rotate = RotateBy::create(10, 360);
-    auto action = RepeatForever::create(rotate);
+    auto rotate   = RotateBy::create(10, 360);
+    auto action   = RepeatForever::create(rotate);
     char str[100] = {0};
 
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini_dance_poly.plist");
 
-    Sprite *sprite;
-    for(int i=0;i<10;i++)
+    Sprite* sprite;
+    for (int i = 0; i < 10; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png", i+1);
+        sprintf(str, "grossini_dance_%02d.png", i + 1);
         sprite = Sprite::createWithSpriteFrameName(str);
 
-        sprite->setPosition(Vec2(screen.width/6*(i%5+1), screen.height*2/3 - screen.height*(i/5)/3));
+        sprite->setPosition(Vec2(screen.width / 6 * (i % 5 + 1), screen.height * 2 / 3 - screen.height * (i / 5) / 3));
 
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.1f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.1f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 10);
 
-        sprite->runAction( action->clone() );
+        sprite->runAction(action->clone());
         addChild(sprite, i);
 
-        //DrawNode
+        // DrawNode
         auto spDrawNode = DrawNode::create();
         spDrawNode->clear();
         sprite->addChild(spDrawNode);
         _drawNodes.pushBack(spDrawNode);
     }
 
-
-
-
     Vector<SpriteFrame*> animFrames(5);
-    for(int i = 9; i < 14; i++)
+    for (int i = 9; i < 14; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png", i+1);
+        sprintf(str, "grossini_dance_%02d.png", i + 1);
         animFrames.pushBack(cache->getSpriteFrameByName(str));
     }
     auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
     sprite->runAction(RepeatForever::create(Animate::create(animation)));
-    
 
     updateDrawNode();
 }
@@ -812,29 +815,29 @@ void SpritePolygonTestFrameAnim::initSprites()
 //
 Issue14017Test::Issue14017Test()
 {
-    _title = "Issue 14017";
+    _title    = "Issue 14017";
     _subtitle = "Autopolygon around the banana";
 }
 
 void Issue14017Test::initSprites()
 {
-    auto s = Director::getInstance()->getWinSize();
-    auto offset = Vec2(0.15*s.width,0);
+    auto s        = Director::getInstance()->getWinSize();
+    auto offset   = Vec2(0.15 * s.width, 0);
     auto filename = "Images/bug14017.png";
 
-    //Sprite
-    auto pinfo = AutoPolygon::generatePolygon(filename);
+    // Sprite
+    auto pinfo     = AutoPolygon::generatePolygon(filename);
     _polygonSprite = Sprite::create(pinfo);
     _polygonSprite->setTag(101);
     addChild(_polygonSprite);
-    _polygonSprite->setPosition(Vec2(s)/2 + offset);
+    _polygonSprite->setPosition(Vec2(s) / 2 + offset);
 
     _normalSprite = Sprite::create(filename);
     _normalSprite->setTag(100);
     addChild(_normalSprite);
-    _normalSprite->setPosition(Vec2(s)/2 - offset);
+    _normalSprite->setPosition(Vec2(s) / 2 - offset);
 
-    //DrawNode
+    // DrawNode
     auto spDrawNode = DrawNode::create();
     spDrawNode->setTag(_normalSprite->getTag());
     spDrawNode->clear();
@@ -847,19 +850,19 @@ void Issue14017Test::initSprites()
     _polygonSprite->addChild(sppDrawNode);
     _drawNodes.pushBack(sppDrawNode);
 
-    //Label
+    // Label
     TTFConfig ttfConfig("fonts/arial.ttf", 8);
     std::string temp = "Sprite:\nPixels drawn: ";
-    auto spSize = _normalSprite->getContentSize();
-    auto spArea = Label::createWithTTF(ttfConfig, temp+Value((int)spSize.width*(int)spSize.height).asString());
+    auto spSize      = _normalSprite->getContentSize();
+    auto spArea      = Label::createWithTTF(ttfConfig, temp + Value((int)spSize.width * (int)spSize.height).asString());
     _normalSprite->addChild(spArea);
-    spArea->setAnchorPoint(Vec2(0,1));
+    spArea->setAnchorPoint(Vec2(0, 1));
 
-    temp = "SpritePolygon:\nPixels drawn: ";
-    auto vertCount = "\nverts:"+Value((int)pinfo.getVertCount()).asString();
-    auto sppArea = Label::createWithTTF(ttfConfig, temp+Value((int)pinfo.getArea()).asString()+vertCount);
+    temp           = "SpritePolygon:\nPixels drawn: ";
+    auto vertCount = "\nverts:" + Value((int)pinfo.getVertCount()).asString();
+    auto sppArea   = Label::createWithTTF(ttfConfig, temp + Value((int)pinfo.getArea()).asString() + vertCount);
     _polygonSprite->addChild(sppArea);
-    sppArea->setAnchorPoint(Vec2(0,1));
+    sppArea->setAnchorPoint(Vec2(0, 1));
 
     updateDrawNode();
 }
diff --git a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.h b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.h
index 3f786ef7c756..6e47a5b3960d 100644
--- a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.h
+++ b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,8 +24,8 @@
 
 #ifndef __cocos2d_tests__SpritePolygonTest__
 
-#include "../BaseTest.h"
-#include "ui/CocosGUI.h"
+#    include "../BaseTest.h"
+#    include "ui/CocosGUI.h"
 
 DEFINE_TEST_SUITE(SpritePolygonTest);
 
@@ -36,12 +36,12 @@ class SpritePolygonTestCase : public TestCase
     std::string _subtitle;
     bool _isDebugDraw;
     bool _isNeedDebugMenu;
-    cocos2d::Vector<cocos2d::DrawNode* > _drawNodes;
-    virtual std::string title() const override {return _title;};
-    virtual std::string subtitle() const override {return _subtitle;};
+    cocos2d::Vector<cocos2d::DrawNode*> _drawNodes;
+    virtual std::string title() const override { return _title; };
+    virtual std::string subtitle() const override { return _subtitle; };
     virtual bool init() override;
-    virtual void onEnter()override;
-    virtual void onExit()override;
+    virtual void onEnter() override;
+    virtual void onExit() override;
     SpritePolygonTestCase();
     ~SpritePolygonTestCase();
     void updateDrawNode();
@@ -76,15 +76,15 @@ class SpritePolygonTest2 : public SpritePolygonTestDemo
 class SpritePolygonTestSlider : public SpritePolygonTestCase
 {
 protected:
-    cocos2d::Label *_epsilonLabel;
+    cocos2d::Label* _epsilonLabel;
     int _tagIndex;
-    cocos2d::Sprite* makeSprite(const std::string& filename, const cocos2d::Vec2& pos);
+    cocos2d::Sprite* makeSprite(std::string_view filename, const cocos2d::Vec2& pos);
     virtual bool init() override;
     void initSliders();
     virtual void initSprites(){};
     void makeSprites(const std::string* list, const int count, const float y);
-    void changeEpsilon(Ref *pSender, cocos2d::ui::Slider::EventType type);
-    void updateLabel(const cocos2d::Sprite* sp, const cocos2d::PolygonInfo &pinfo);
+    void changeEpsilon(Ref* pSender, cocos2d::ui::Slider::EventType type);
+    void updateLabel(const cocos2d::Sprite* sp, const cocos2d::PolygonInfo& pinfo);
 };
 
 class SpritePolygonTest3 : public SpritePolygonTestSlider
@@ -108,12 +108,14 @@ class SpritePolygonTest5 : public SpritePolygonTestCase
 public:
     CREATE_FUNC(SpritePolygonTest5);
     SpritePolygonTest5();
+
 protected:
     virtual bool init() override;
     void initTouch();
     void loadDefaultSprites();
     void addSpritePolygon(const cocos2d::Vec2& pos);
-    void update(float dt)override;
+    void update(float dt) override;
+
 private:
     cocos2d::PolygonInfo _polygonInfo;
     int _tagIndex;
@@ -124,13 +126,14 @@ class SpritePolygonPerformance : public SpritePolygonTestCase
 public:
     CREATE_FUNC(SpritePolygonPerformance);
     SpritePolygonPerformance();
+
 protected:
     int _spriteCount;
     int _vertCount;
     int _triCount;
     int _pixelCount;
     float _elapsedTime;
-    cocos2d::Label * _perfLabel;
+    cocos2d::Label* _perfLabel;
     int _continuousLowDt;
     float _continuousHighDtTime;
     float _waitingTime;
@@ -141,15 +144,15 @@ class SpritePolygonPerformance : public SpritePolygonTestCase
     int _rightX;
     bool goRight;
     bool ended;
-    
+
     float prevDt;
-    
+
     unsigned int _incVert;
     unsigned int _incTri;
     unsigned int _incPix;
 
     void updateLabel();
-    virtual void update(float dt)override;
+    virtual void update(float dt) override;
     virtual bool init() override;
     virtual Node* makeSprite();
     void incrementStats();
@@ -161,6 +164,7 @@ class SpritePolygonPerformanceTestDynamic : public SpritePolygonPerformance
 public:
     CREATE_FUNC(SpritePolygonPerformanceTestDynamic);
     SpritePolygonPerformanceTestDynamic();
+
 protected:
     cocos2d::Sprite* makeSprite() override;
     cocos2d::PolygonInfo _pinfo;
@@ -172,6 +176,7 @@ class SpritePerformanceTestDynamic : public SpritePolygonPerformance
 public:
     CREATE_FUNC(SpritePerformanceTestDynamic);
     SpritePerformanceTestDynamic();
+
 protected:
     virtual cocos2d::Sprite* makeSprite() override;
     virtual void initIncrementStats() override;
diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp
index c7e56ad0d0d6..62bbad581cf5 100644
--- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp
+++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp
@@ -34,17 +34,17 @@
 
 USING_NS_CC;
 
-enum 
+enum
 {
-    kTagTileMap = 1,
+    kTagTileMap         = 1,
     kTagSpriteBatchNode = 1,
-    kTagNode = 2,
-    kTagAnimation1 = 1,
+    kTagNode            = 2,
+    kTagAnimation1      = 1,
     kTagSpriteLeft,
     kTagSpriteRight,
 };
 
-enum 
+enum
 {
     kTagSprite1,
     kTagSprite2,
@@ -89,8 +89,8 @@ SpriteTests::SpriteTests()
     ADD_TEST_CASE(SpriteBatchNodeColorOpacity);
     ADD_TEST_CASE(SpriteZOrder);
     ADD_TEST_CASE(SpriteBatchNodeZOrder);
-//    ADD_TEST_CASE(SpriteZVertex); // TODO shouldn't call OpenGL API directly
-//    ADD_TEST_CASE(SpriteBatchNodeZVertex);
+    //    ADD_TEST_CASE(SpriteZVertex); // TODO shouldn't call OpenGL API directly
+    //    ADD_TEST_CASE(SpriteBatchNodeZVertex);
     ADD_TEST_CASE(SpriteAliased);
     ADD_TEST_CASE(SpriteBatchNodeAliased);
     ADD_TEST_CASE(SpriteNewTexture);
@@ -146,52 +146,51 @@ SpriteTests::SpriteTests()
 
 Sprite1::Sprite1()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(Sprite1::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) );
+    addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 }
 
 void Sprite1::addNewSpriteWithCoords(Vec2 p)
 {
     int idx = (int)(CCRANDOM_0_1() * 1400.0f / 100.0f);
-    int x = (idx%5) * 85;
-    int y = (idx/5) * 121;
-    
-    
-    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(x,y,85,121) );
-    addChild( sprite );
-    
-    sprite->setPosition( Vec2( p.x, p.y) );
-    
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
+
+    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(x, y, 85, 121));
+    addChild(sprite);
+
+    sprite->setPosition(Vec2(p.x, p.y));
+
     ActionInterval* action;
     float random = CCRANDOM_0_1();
-    
-    if( random < 0.20 )
+
+    if (random < 0.20)
         action = ScaleBy::create(3, 2);
-    else if(random < 0.40)
+    else if (random < 0.40)
         action = RotateBy::create(3, 360);
-    else if( random < 0.60)
+    else if (random < 0.60)
         action = Blink::create(1, 3);
-    else if( random < 0.8 )
+    else if (random < 0.8)
         action = TintBy::create(2, 0, -255, -255);
-    else 
+    else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create( action, action_back, nullptr );
-    
-    sprite->runAction( RepeatForever::create(seq) );
+    auto seq         = Sequence::create(action, action_back, nullptr);
+
+    sprite->runAction(RepeatForever::create(seq));
 }
 
 void Sprite1::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for (auto touch: touches)
+    for (auto touch : touches)
     {
         auto location = touch->getLocation();
-    
-        addNewSpriteWithCoords( location );
+
+        addNewSpriteWithCoords(location);
     }
 }
 
@@ -213,60 +212,58 @@ std::string Sprite1::subtitle() const
 
 SpriteBatchNode1::SpriteBatchNode1()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(SpriteBatchNode1::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     auto BatchNode = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 50);
     addChild(BatchNode, 0, kTagSpriteBatchNode);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) );
+    addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
 }
 
 void SpriteBatchNode1::addNewSpriteWithCoords(Vec2 p)
 {
-    auto BatchNode = static_cast<SpriteBatchNode*>( getChildByTag(kTagSpriteBatchNode) );
-    
+    auto BatchNode = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
+
     int idx = CCRANDOM_0_1() * 1400 / 100;
-    int x = (idx%5) * 85;
-    int y = (idx/5) * 121;
-    
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
 
-    auto sprite = Sprite::createWithTexture(BatchNode->getTexture(), Rect(x,y,85,121));
+    auto sprite = Sprite::createWithTexture(BatchNode->getTexture(), Rect(x, y, 85, 121));
     BatchNode->addChild(sprite);
 
-    sprite->setPosition( Vec2( p.x, p.y) );
+    sprite->setPosition(Vec2(p.x, p.y));
 
     ActionInterval* action;
     float random = CCRANDOM_0_1();
-    
-    if( random < 0.20 )
+
+    if (random < 0.20)
         action = ScaleBy::create(3, 2);
-    else if(random < 0.40)
+    else if (random < 0.40)
         action = RotateBy::create(3, 360);
-    else if( random < 0.60)
+    else if (random < 0.60)
         action = Blink::create(1, 3);
-    else if( random < 0.8 )
+    else if (random < 0.8)
         action = TintBy::create(2, 0, -255, -255);
-    else 
+    else
         action = FadeOut::create(2);
 
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
-    
-    sprite->runAction( RepeatForever::create(seq));
+    auto seq         = Sequence::create(action, action_back, nullptr);
+
+    sprite->runAction(RepeatForever::create(seq));
 }
 
 void SpriteBatchNode1::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    for (auto &touch: touches)
+    for (auto& touch : touches)
     {
         auto location = touch->getLocation();
-            
-        addNewSpriteWithCoords( location );
-    }
 
+        addNewSpriteWithCoords(location);
+    }
 }
 
 std::string SpriteBatchNode1::title() const
@@ -279,7 +276,6 @@ std::string SpriteBatchNode1::subtitle() const
     return "SpriteBatchNode: Tap screen to add more sprites";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteColorOpacity
@@ -288,47 +284,47 @@ std::string SpriteBatchNode1::subtitle() const
 
 SpriteColorOpacity::SpriteColorOpacity()
 {
-    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*0, 121*1, 85, 121));
-    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    auto sprite3 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*2, 121*1, 85, 121));
-    auto sprite4 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*3, 121*1, 85, 121));
-    
-    auto sprite5 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*0, 121*1, 85, 121));
-    auto sprite6 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    auto sprite7 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*2, 121*1, 85, 121));
-    auto sprite8 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*3, 121*1, 85, 121));
-    
+    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 0, 121 * 1, 85, 121));
+    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    auto sprite3 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 2, 121 * 1, 85, 121));
+    auto sprite4 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 3, 121 * 1, 85, 121));
+
+    auto sprite5 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 0, 121 * 1, 85, 121));
+    auto sprite6 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    auto sprite7 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 2, 121 * 1, 85, 121));
+    auto sprite8 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 3, 121 * 1, 85, 121));
+
     auto s = Director::getInstance()->getWinSize();
-    sprite1->setPosition( Vec2( (s.width/5)*1, (s.height/3)*1) );
-    sprite2->setPosition( Vec2( (s.width/5)*2, (s.height/3)*1) );
-    sprite3->setPosition( Vec2( (s.width/5)*3, (s.height/3)*1) );
-    sprite4->setPosition( Vec2( (s.width/5)*4, (s.height/3)*1) );
-    sprite5->setPosition( Vec2( (s.width/5)*1, (s.height/3)*2) );
-    sprite6->setPosition( Vec2( (s.width/5)*2, (s.height/3)*2) );
-    sprite7->setPosition( Vec2( (s.width/5)*3, (s.height/3)*2) );
-    sprite8->setPosition( Vec2( (s.width/5)*4, (s.height/3)*2) );
-    
-    auto action = FadeIn::create(2);
+    sprite1->setPosition(Vec2((s.width / 5) * 1, (s.height / 3) * 1));
+    sprite2->setPosition(Vec2((s.width / 5) * 2, (s.height / 3) * 1));
+    sprite3->setPosition(Vec2((s.width / 5) * 3, (s.height / 3) * 1));
+    sprite4->setPosition(Vec2((s.width / 5) * 4, (s.height / 3) * 1));
+    sprite5->setPosition(Vec2((s.width / 5) * 1, (s.height / 3) * 2));
+    sprite6->setPosition(Vec2((s.width / 5) * 2, (s.height / 3) * 2));
+    sprite7->setPosition(Vec2((s.width / 5) * 3, (s.height / 3) * 2));
+    sprite8->setPosition(Vec2((s.width / 5) * 4, (s.height / 3) * 2));
+
+    auto action      = FadeIn::create(2);
     auto action_back = action->reverse();
-    auto fade = RepeatForever::create( Sequence::create( action, action_back, nullptr) );
-    
-    auto tintred = TintBy::create(2, 0, -255, -255);
+    auto fade        = RepeatForever::create(Sequence::create(action, action_back, nullptr));
+
+    auto tintred      = TintBy::create(2, 0, -255, -255);
     auto tintred_back = tintred->reverse();
-    auto red = RepeatForever::create( Sequence::create( tintred, tintred_back, nullptr) );
-    
-    auto tintgreen = TintBy::create(2, -255, 0, -255);
+    auto red          = RepeatForever::create(Sequence::create(tintred, tintred_back, nullptr));
+
+    auto tintgreen      = TintBy::create(2, -255, 0, -255);
     auto tintgreen_back = tintgreen->reverse();
-    auto green = RepeatForever::create( Sequence::create( tintgreen, tintgreen_back, nullptr) );
-    
-    auto tintblue = TintBy::create(2, -255, -255, 0);
+    auto green          = RepeatForever::create(Sequence::create(tintgreen, tintgreen_back, nullptr));
+
+    auto tintblue      = TintBy::create(2, -255, -255, 0);
     auto tintblue_back = tintblue->reverse();
-    auto blue = RepeatForever::create( Sequence::create( tintblue, tintblue_back, nullptr) );
-    
+    auto blue          = RepeatForever::create(Sequence::create(tintblue, tintblue_back, nullptr));
+
     sprite5->runAction(red);
     sprite6->runAction(green);
     sprite7->runAction(blue);
     sprite8->runAction(fade);
-    
+
     // late add: test dirtyColor and dirtyPosition
     addChild(sprite1, 0, kTagSprite1);
     addChild(sprite2, 0, kTagSprite2);
@@ -338,20 +334,20 @@ SpriteColorOpacity::SpriteColorOpacity()
     addChild(sprite6, 0, kTagSprite6);
     addChild(sprite7, 0, kTagSprite7);
     addChild(sprite8, 0, kTagSprite8);
-    
-    schedule( CC_CALLBACK_1(SpriteColorOpacity::removeAndAddSprite, this), 2, "remove_add_key" );
+
+    schedule(CC_CALLBACK_1(SpriteColorOpacity::removeAndAddSprite, this), 2, "remove_add_key");
 }
 
 // this function test if remove and add works as expected:
 //   color array and vertex array should be reindexed
 void SpriteColorOpacity::removeAndAddSprite(float dt)
 {
-    auto sprite = static_cast<Sprite*>( getChildByTag(kTagSprite5) );
+    auto sprite = static_cast<Sprite*>(getChildByTag(kTagSprite5));
     sprite->retain();
-    
+
     removeChild(sprite, false);
     addChild(sprite, 0, kTagSprite5);
-    
+
     sprite->release();
 }
 
@@ -376,51 +372,49 @@ SpriteBatchNodeColorOpacity::SpriteBatchNodeColorOpacity()
     // small capacity. Testing resizing.
     // Don't use capacity=1 in your real game. It is expensive to resize the capacity
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 1);
-    addChild(batch, 0, kTagSpriteBatchNode);        
-    
-    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85*0, 121*1, 85, 121));
-    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    auto sprite3 = Sprite::createWithTexture(batch->getTexture(), Rect(85*2, 121*1, 85, 121));
-    auto sprite4 = Sprite::createWithTexture(batch->getTexture(), Rect(85*3, 121*1, 85, 121));
-    
-    auto sprite5 = Sprite::createWithTexture(batch->getTexture(), Rect(85*0, 121*1, 85, 121));
-    auto sprite6 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    auto sprite7 = Sprite::createWithTexture(batch->getTexture(), Rect(85*2, 121*1, 85, 121));
-    auto sprite8 = Sprite::createWithTexture(batch->getTexture(), Rect(85*3, 121*1, 85, 121));
-    
-    
+    addChild(batch, 0, kTagSpriteBatchNode);
+
+    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 0, 121 * 1, 85, 121));
+    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    auto sprite3 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 2, 121 * 1, 85, 121));
+    auto sprite4 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 3, 121 * 1, 85, 121));
+
+    auto sprite5 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 0, 121 * 1, 85, 121));
+    auto sprite6 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    auto sprite7 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 2, 121 * 1, 85, 121));
+    auto sprite8 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 3, 121 * 1, 85, 121));
+
     auto s = Director::getInstance()->getWinSize();
-    sprite1->setPosition( Vec2( (s.width/5)*1, (s.height/3)*1) );
-    sprite2->setPosition( Vec2( (s.width/5)*2, (s.height/3)*1) );
-    sprite3->setPosition( Vec2( (s.width/5)*3, (s.height/3)*1) );
-    sprite4->setPosition( Vec2( (s.width/5)*4, (s.height/3)*1) );
-    sprite5->setPosition( Vec2( (s.width/5)*1, (s.height/3)*2) );
-    sprite6->setPosition( Vec2( (s.width/5)*2, (s.height/3)*2) );
-    sprite7->setPosition( Vec2( (s.width/5)*3, (s.height/3)*2) );
-    sprite8->setPosition( Vec2( (s.width/5)*4, (s.height/3)*2) );
-
-    auto action = FadeIn::create(2);
+    sprite1->setPosition(Vec2((s.width / 5) * 1, (s.height / 3) * 1));
+    sprite2->setPosition(Vec2((s.width / 5) * 2, (s.height / 3) * 1));
+    sprite3->setPosition(Vec2((s.width / 5) * 3, (s.height / 3) * 1));
+    sprite4->setPosition(Vec2((s.width / 5) * 4, (s.height / 3) * 1));
+    sprite5->setPosition(Vec2((s.width / 5) * 1, (s.height / 3) * 2));
+    sprite6->setPosition(Vec2((s.width / 5) * 2, (s.height / 3) * 2));
+    sprite7->setPosition(Vec2((s.width / 5) * 3, (s.height / 3) * 2));
+    sprite8->setPosition(Vec2((s.width / 5) * 4, (s.height / 3) * 2));
+
+    auto action      = FadeIn::create(2);
     auto action_back = action->reverse();
-    auto fade = RepeatForever::create( Sequence::create( action, action_back,nullptr) );
+    auto fade        = RepeatForever::create(Sequence::create(action, action_back, nullptr));
 
-    auto tintred = TintBy::create(2, 0, -255, -255);
+    auto tintred      = TintBy::create(2, 0, -255, -255);
     auto tintred_back = tintred->reverse();
-    auto red = RepeatForever::create( Sequence::create( tintred, tintred_back,nullptr) );
+    auto red          = RepeatForever::create(Sequence::create(tintred, tintred_back, nullptr));
 
-    auto tintgreen = TintBy::create(2, -255, 0, -255);
+    auto tintgreen      = TintBy::create(2, -255, 0, -255);
     auto tintgreen_back = tintgreen->reverse();
-    auto green = RepeatForever::create( Sequence::create( tintgreen, tintgreen_back,nullptr) );
+    auto green          = RepeatForever::create(Sequence::create(tintgreen, tintgreen_back, nullptr));
 
-    auto tintblue = TintBy::create(2, -255, -255, 0);
+    auto tintblue      = TintBy::create(2, -255, -255, 0);
     auto tintblue_back = tintblue->reverse();
-    auto blue = RepeatForever::create( Sequence::create( tintblue, tintblue_back,nullptr) );
-    
-    
+    auto blue          = RepeatForever::create(Sequence::create(tintblue, tintblue_back, nullptr));
+
     sprite5->runAction(red);
     sprite6->runAction(green);
     sprite7->runAction(blue);
     sprite8->runAction(fade);
-    
+
     // late add: test dirtyColor and dirtyPosition
     batch->addChild(sprite1, 0, kTagSprite1);
     batch->addChild(sprite2, 0, kTagSprite2);
@@ -430,23 +424,22 @@ SpriteBatchNodeColorOpacity::SpriteBatchNodeColorOpacity()
     batch->addChild(sprite6, 0, kTagSprite6);
     batch->addChild(sprite7, 0, kTagSprite7);
     batch->addChild(sprite8, 0, kTagSprite8);
-    
-    
-    schedule( CC_CALLBACK_1(SpriteBatchNodeColorOpacity::removeAndAddSprite, this), 2, "remove_add_key");
+
+    schedule(CC_CALLBACK_1(SpriteBatchNodeColorOpacity::removeAndAddSprite, this), 2, "remove_add_key");
 }
 
 // this function test if remove and add works as expected:
 //   color array and vertex array should be reindexed
 void SpriteBatchNodeColorOpacity::removeAndAddSprite(float dt)
 {
-    auto batch= static_cast<SpriteBatchNode*>( getChildByTag(kTagSpriteBatchNode) );
-    auto sprite = static_cast<Sprite*>( batch->getChildByTag(kTagSprite5) );
-    
+    auto batch  = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
+    auto sprite = static_cast<Sprite*>(batch->getChildByTag(kTagSprite5));
+
     sprite->retain();
 
     batch->removeChild(sprite, false);
     batch->addChild(sprite, 0, kTagSprite5);
-    
+
     sprite->release();
 }
 
@@ -460,7 +453,6 @@ std::string SpriteBatchNodeColorOpacity::subtitle() const
     return "Color & Opacity";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteZOrder
@@ -470,48 +462,47 @@ std::string SpriteBatchNodeColorOpacity::subtitle() const
 SpriteZOrder::SpriteZOrder()
 {
     _dir = 1;
-            
+
     auto s = Director::getInstance()->getWinSize();
-    
-    float step = s.width/11;
-    for(int i=0;i<5;i++) 
+
+    float step = s.width / 11;
+    for (int i = 0; i < 5; i++)
     {
-        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*0, 121*1, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
+        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 0, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
         addChild(sprite, i);
     }
-    
-    for(int i=5;i<10;i++) 
+
+    for (int i = 5; i < 10; i++)
     {
-        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*0, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
-        addChild(sprite, 14-i);
+        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 0, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        addChild(sprite, 14 - i);
     }
-    
-    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*3, 121*0, 85, 121));
+
+    auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 3, 121 * 0, 85, 121));
     addChild(sprite, -1, kTagSprite1);
-    sprite->setPosition( Vec2(s.width/2, s.height/2 - 20) );
-    sprite->setScaleX( 6 );
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2 - 20));
+    sprite->setScaleX(6);
     sprite->setColor(Color3B::RED);
-    
-    schedule( CC_CALLBACK_1(SpriteZOrder::reorderSprite, this), 1, "reorder_key");
+
+    schedule(CC_CALLBACK_1(SpriteZOrder::reorderSprite, this), 1, "reorder_key");
 }
 
 void SpriteZOrder::reorderSprite(float dt)
 {
-    auto sprite = static_cast<Sprite*>( getChildByTag(kTagSprite1) );
-    
+    auto sprite = static_cast<Sprite*>(getChildByTag(kTagSprite1));
+
     int z = sprite->getLocalZOrder();
-    
-    if( z < -1 )
+
+    if (z < -1)
         _dir = 1;
-    if( z > 10 )
+    if (z > 10)
         _dir = -1;
-    
+
     z += _dir * 3;
-    
+
     reorderChild(sprite, z);
-    
 }
 
 std::string SpriteZOrder::title() const
@@ -533,50 +524,50 @@ std::string SpriteZOrder::subtitle() const
 SpriteBatchNodeZOrder::SpriteBatchNodeZOrder()
 {
     _dir = 1;
-    
+
     // small capacity. Testing resizing.
     // Don't use capacity=1 in your real game. It is expensive to resize the capacity
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 1);
-    addChild(batch, 0, kTagSpriteBatchNode);        
-    
+    addChild(batch, 0, kTagSpriteBatchNode);
+
     auto s = Director::getInstance()->getWinSize();
 
-    float step = s.width/11;
-    for(int i=0;i<5;i++) 
+    float step = s.width / 11;
+    for (int i = 0; i < 5; i++)
     {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*0, 121*1, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 0, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
         batch->addChild(sprite, i);
     }
-    
-    for(int i=5;i<10;i++) 
+
+    for (int i = 5; i < 10; i++)
     {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*0, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
-        batch->addChild(sprite, 14-i);
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 0, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        batch->addChild(sprite, 14 - i);
     }
-    
-    auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*3, 121*0, 85, 121));
+
+    auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 3, 121 * 0, 85, 121));
     batch->addChild(sprite, -1, kTagSprite1);
-    sprite->setPosition( Vec2(s.width/2, s.height/2 - 20) );
-    sprite->setScaleX( 6 );
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2 - 20));
+    sprite->setScaleX(6);
     sprite->setColor(Color3B::RED);
-    
-    schedule( CC_CALLBACK_1(SpriteBatchNodeZOrder::reorderSprite, this), 1, "reorder_key");
+
+    schedule(CC_CALLBACK_1(SpriteBatchNodeZOrder::reorderSprite, this), 1, "reorder_key");
 }
 
 void SpriteBatchNodeZOrder::reorderSprite(float dt)
 {
-    auto batch= static_cast<SpriteBatchNode*>( getChildByTag( kTagSpriteBatchNode ));
+    auto batch  = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
     auto sprite = static_cast<Sprite*>(batch->getChildByTag(kTagSprite1));
-    
+
     int z = sprite->getLocalZOrder();
-    
-    if( z < -1 )
+
+    if (z < -1)
         _dir = 1;
-    if( z > 10 )
+    if (z > 10)
         _dir = -1;
-    
+
     z += _dir * 3;
 
     batch->reorderChild(sprite, z);
@@ -592,7 +583,6 @@ std::string SpriteBatchNodeZOrder::subtitle() const
     return "Z order";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeReorder
@@ -603,40 +593,42 @@ SpriteBatchNodeReorder::SpriteBatchNodeReorder()
 {
     Vector<Sprite*> a;
     auto asmtest = SpriteBatchNode::create("animations/ghosts.png");
-    
-    for(int i=0; i<10; i++)
+
+    for (int i = 0; i < 10; i++)
     {
         auto s1 = Sprite::createWithTexture(asmtest->getTexture(), Rect(0.0f, 0.0f, 50.0f, 50.0f));
         a.pushBack(s1);
         asmtest->addChild(s1, 10);
     }
-    
-    for(int i=0; i<10; i++)
+
+    for (int i = 0; i < 10; i++)
     {
-        if(i!=5)
+        if (i != 5)
         {
-            asmtest->reorderChild( static_cast<Node*>(a.at(i)), 9 );
+            asmtest->reorderChild(static_cast<Node*>(a.at(i)), 9);
         }
     }
-    
+
     ssize_t CC_UNUSED prev = -1;
-    
+
     auto& children = asmtest->getChildren();
 
-    for(const auto &obj : children) {
+    for (const auto& obj : children)
+    {
         auto child = static_cast<Sprite*>(obj);
 
         ssize_t currentIndex = child->getAtlasIndex();
-        CCASSERT( prev == currentIndex-1, "Child order failed");
+        CCASSERT(prev == currentIndex - 1, "Child order failed");
         ////----CCLOG("children %x - atlasIndex:%d", child, currentIndex);
         prev = currentIndex;
     }
-    
-    prev = -1;
+
+    prev              = -1;
     auto& descendants = asmtest->getDescendants();
-    for(const auto &sprite : descendants) {
+    for (const auto& sprite : descendants)
+    {
         ssize_t currentIndex = sprite->getAtlasIndex();
-        CCASSERT( prev == currentIndex-1, "Child order failed");
+        CCASSERT(prev == currentIndex - 1, "Child order failed");
         ////----CCLOG("descendant %x - atlasIndex:%d", child, currentIndex);
         prev = currentIndex;
     }
@@ -661,15 +653,14 @@ std::string SpriteBatchNodeReorder::subtitle() const
 SpriteBatchNodeReorderIssue744::SpriteBatchNodeReorderIssue744()
 {
     auto s = Director::getInstance()->getWinSize();
-    
 
     // Testing issue #744
     // http://code.google.com/p/cocos2d-iphone/issues/detail?id=744
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 15);
-    addChild(batch, 0, kTagSpriteBatchNode);        
+    addChild(batch, 0, kTagSpriteBatchNode);
 
-    auto sprite = Sprite::createWithTexture(batch->getTexture(),Rect(0, 0, 85, 121));
-    sprite->setPosition( Vec2(s.width/2, s.height/2) );
+    auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(0, 0, 85, 121));
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
     batch->addChild(sprite, 3);
     batch->reorderChild(sprite, 1);
 }
@@ -692,25 +683,25 @@ std::string SpriteBatchNodeReorderIssue744::subtitle() const
 
 Sprite* SpriteBatchNodeReorderIssue766::makeSpriteZ(int aZ)
 {
-    Rect rcw(128,0,64,64);
-    rcw = CC_RECT_PIXELS_TO_POINTS(rcw);
+    Rect rcw(128, 0, 64, 64);
+    rcw         = CC_RECT_PIXELS_TO_POINTS(rcw);
     auto sprite = Sprite::createWithTexture(batchNode->getTexture(), rcw);
     sprite->setScale(CC_CONTENT_SCALE_FACTOR());
-    batchNode->addChild(sprite, aZ+1, 0);
+    batchNode->addChild(sprite, aZ + 1, 0);
 
-    //children
-    Rect rc1(0,0,64,64);
-    rc1 = CC_RECT_PIXELS_TO_POINTS(rc1);
+    // children
+    Rect rc1(0, 0, 64, 64);
+    rc1               = CC_RECT_PIXELS_TO_POINTS(rc1);
     auto spriteShadow = Sprite::createWithTexture(batchNode->getTexture(), rc1);
     spriteShadow->setOpacity(128);
     sprite->setScale(CC_CONTENT_SCALE_FACTOR());
     sprite->addChild(spriteShadow, aZ, 3);
 
-    Rect rc2(64,0,64,64);
-    rc2 = CC_RECT_PIXELS_TO_POINTS(rc2);
+    Rect rc2(64, 0, 64, 64);
+    rc2            = CC_RECT_PIXELS_TO_POINTS(rc2);
     auto spriteTop = Sprite::createWithTexture(batchNode->getTexture(), rc2);
     sprite->setScale(CC_CONTENT_SCALE_FACTOR());
-    sprite->addChild(spriteTop, aZ+2, 3);
+    sprite->addChild(spriteTop, aZ + 2, 3);
 
     return sprite;
 }
@@ -729,13 +720,13 @@ SpriteBatchNodeReorderIssue766::SpriteBatchNodeReorderIssue766()
     addChild(batchNode, 1, 0);
 
     sprite1 = makeSpriteZ(2);
-    sprite1->setPosition(Vec2(200.0f,160.0f));
+    sprite1->setPosition(Vec2(200.0f, 160.0f));
 
     sprite2 = makeSpriteZ(3);
-    sprite2->setPosition(Vec2(264.0f,160.0f));
+    sprite2->setPosition(Vec2(264.0f, 160.0f));
 
     sprite3 = makeSpriteZ(4);
-    sprite3->setPosition(Vec2(328.0f,160.0f));
+    sprite3->setPosition(Vec2(328.0f, 160.0f));
 
     schedule(CC_CALLBACK_1(SpriteBatchNodeReorderIssue766::reorderSprite, this), 2, "issue_766_key");
 }
@@ -757,10 +748,10 @@ std::string SpriteBatchNodeReorderIssue766::subtitle() const
 //------------------------------------------------------------------
 SpriteBatchNodeReorderIssue767::SpriteBatchNodeReorderIssue767()
 {
-    auto s = Director::getInstance()->getWinSize();        
+    auto s = Director::getInstance()->getWinSize();
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/ghosts.plist", "animations/ghosts.png");
-    Node *aParent;
+    Node* aParent;
     Sprite *l1, *l2a, *l2b, *l3a1, *l3a2, *l3b1, *l3b2;
 
     //
@@ -771,46 +762,44 @@ SpriteBatchNodeReorderIssue767::SpriteBatchNodeReorderIssue767()
 
     // parent
     l1 = Sprite::createWithSpriteFrameName("father.gif");
-    l1->setPosition(Vec2( s.width/2, s.height/2));
+    l1->setPosition(Vec2(s.width / 2, s.height / 2));
     aParent->addChild(l1, 0, kTagSprite2);
     auto l1Size = l1->getContentSize();
 
     // child left
     l2a = Sprite::createWithSpriteFrameName("sister1.gif");
-    l2a->setPosition(Vec2( -25 + l1Size.width/2, 0 + l1Size.height/2));
+    l2a->setPosition(Vec2(-25 + l1Size.width / 2, 0 + l1Size.height / 2));
     l1->addChild(l2a, -1, kTagSpriteLeft);
-    auto l2aSize = l2a->getContentSize();        
-
+    auto l2aSize = l2a->getContentSize();
 
     // child right
     l2b = Sprite::createWithSpriteFrameName("sister2.gif");
-    l2b->setPosition(Vec2( +25 + l1Size.width/2, 0 + l1Size.height/2));
+    l2b->setPosition(Vec2(+25 + l1Size.width / 2, 0 + l1Size.height / 2));
     l1->addChild(l2b, 1, kTagSpriteRight);
     auto l2bSize = l2a->getContentSize();
 
-
     // child left bottom
     l3a1 = Sprite::createWithSpriteFrameName("child1.gif");
     l3a1->setScale(0.65f);
-    l3a1->setPosition(Vec2(0+l2aSize.width/2,-50+l2aSize.height/2));
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, -50 + l2aSize.height / 2));
     l2a->addChild(l3a1, -1);
 
     // child left top
     l3a2 = Sprite::createWithSpriteFrameName("child1.gif");
     l3a2->setScale(0.65f);
-    l3a2->setPosition(Vec2(0+l2aSize.width/2,+50+l2aSize.height/2));
+    l3a2->setPosition(Vec2(0 + l2aSize.width / 2, +50 + l2aSize.height / 2));
     l2a->addChild(l3a2, 1);
 
     // child right bottom
     l3b1 = Sprite::createWithSpriteFrameName("child1.gif");
     l3b1->setScale(0.65f);
-    l3b1->setPosition(Vec2(0+l2bSize.width/2,-50+l2bSize.height/2));
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, -50 + l2bSize.height / 2));
     l2b->addChild(l3b1, -1);
 
     // child right top
     l3b2 = Sprite::createWithSpriteFrameName("child1.gif");
     l3b2->setScale(0.65f);
-    l3b2->setPosition(Vec2(0+l2bSize.width/2,+50+l2bSize.height/2));
+    l3b2->setPosition(Vec2(0 + l2bSize.width / 2, +50 + l2bSize.height / 2));
     l2b->addChild(l3b2, 1);
 
     schedule(CC_CALLBACK_1(SpriteBatchNodeReorderIssue767::reorderSprites, this), 1, "issue_767_key");
@@ -828,14 +817,14 @@ std::string SpriteBatchNodeReorderIssue767::subtitle() const
 
 void SpriteBatchNodeReorderIssue767::reorderSprites(float dt)
 {
-    auto spritebatch = static_cast<SpriteBatchNode*>( getChildByTag(kTagSprite1) );
-    auto father = static_cast<Sprite*>( spritebatch->getChildByTag(kTagSprite2) );
-    auto left = static_cast<Sprite*>( father->getChildByTag(kTagSpriteLeft) );
-    auto right = static_cast<Sprite*>( father->getChildByTag(kTagSpriteRight) );
+    auto spritebatch = static_cast<SpriteBatchNode*>(getChildByTag(kTagSprite1));
+    auto father      = static_cast<Sprite*>(spritebatch->getChildByTag(kTagSprite2));
+    auto left        = static_cast<Sprite*>(father->getChildByTag(kTagSpriteLeft));
+    auto right       = static_cast<Sprite*>(father->getChildByTag(kTagSpriteRight));
 
     int newZLeft = 1;
 
-    if( left->getLocalZOrder() == 1 )
+    if (left->getLocalZOrder() == 1)
         newZLeft = -1;
 
     father->reorderChild(left, newZLeft);
@@ -851,7 +840,7 @@ void SpriteBatchNodeReorderIssue767::reorderSprites(float dt)
 void SpriteZVertex::onEnter()
 {
     SpriteTestDemo::onEnter();
-    
+
     Director::getInstance()->setProjection(Director::Projection::_3D);
 }
 
@@ -875,51 +864,51 @@ SpriteZVertex::SpriteZVertex()
     //
     // Configure shader to mimic glAlphaTest
     //
-//    auto alphaTestShader = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
-//    GLint alphaValueLocation = glGetUniformLocation(alphaTestShader->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
-//
-//    // set alpha test value
-//    // NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
-//    if (getGLProgram())
-//    {
-//        getGLProgram()->setUniformLocationWith1f(alphaValueLocation, 0.0f);
-//    }
-
-    
-    _dir = 1;
+    //    auto alphaTestShader =
+    //    GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST); GLint
+    //    alphaValueLocation = glGetUniformLocation(alphaTestShader->getProgram(),
+    //    GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
+    //
+    //    // set alpha test value
+    //    // NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
+    //    if (getGLProgram())
+    //    {
+    //        getGLProgram()->setUniformLocationWith1f(alphaValueLocation, 0.0f);
+    //    }
+
+    _dir  = 1;
     _time = 0;
 
-    auto s = Director::getInstance()->getWinSize();
-    float step = s.width/12;
-    
+    auto s     = Director::getInstance()->getWinSize();
+    float step = s.width / 12;
+
     auto node = Node::create();
     // camera uses the center of the image as the pivoting point
-    node->setContentSize( Size(s.width,s.height) );
-    node->setAnchorPoint( Vec2::ANCHOR_MIDDLE);
-    node->setPosition( Vec2(s.width/2, s.height/2));
+    node->setContentSize(Size(s.width, s.height));
+    node->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+    node->setPosition(Vec2(s.width / 2, s.height / 2));
 
     addChild(node, 0);
 
-    for(int i=0;i<5;i++) 
+    for (int i = 0; i < 5; i++)
     {
-        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*0, 121*1, 85, 121));
-        sprite->setPosition( Vec2((i+1)*step, s.height/2) );
-        sprite->setPositionZ( 10 + i*40 );
-//        sprite->setGLProgram(alphaTestShader);
+        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 0, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        sprite->setPositionZ(10 + i * 40);
+        //        sprite->setGLProgram(alphaTestShader);
         node->addChild(sprite, 0);
-        
     }
-    
-    for(int i=5;i<11;i++) 
+
+    for (int i = 5; i < 11; i++)
     {
-        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*0, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
-        sprite->setPositionZ( 10 + (10-i)*40 );
-//        sprite->setGLProgram(alphaTestShader);
+        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 0, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        sprite->setPositionZ(10 + (10 - i) * 40);
+        //        sprite->setGLProgram(alphaTestShader);
         node->addChild(sprite, 0);
     }
 
-    node->runAction( OrbitCamera::create(10, 1, 0, 0, 360, 0, 0) );
+    node->runAction(OrbitCamera::create(10, 1, 0, 0, 360, 0, 0));
 }
 
 std::string SpriteZVertex::title() const
@@ -965,47 +954,49 @@ SpriteBatchNodeZVertex::SpriteBatchNodeZVertex()
     //
     // Configure shader to mimic glAlphaTest
     //
-//    auto alphaTestShader = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST);
-//    GLint alphaValueLocation = glGetUniformLocation(alphaTestShader->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
+    //    auto alphaTestShader =
+    //    GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST); GLint
+    //    alphaValueLocation = glGetUniformLocation(alphaTestShader->getProgram(),
+    //    GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
 
     // set alpha test value
     // NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
-//    if (getGLProgram())
-//    {
-//        getGLProgram()->setUniformLocationWith1f(alphaValueLocation, 0.0f);
-//    }
+    //    if (getGLProgram())
+    //    {
+    //        getGLProgram()->setUniformLocationWith1f(alphaValueLocation, 0.0f);
+    //    }
+
+    auto s     = Director::getInstance()->getWinSize();
+    float step = s.width / 12;
 
-    auto s = Director::getInstance()->getWinSize();
-    float step = s.width/12;
-    
     // small capacity. Testing resizing.
     // Don't use capacity=1 in your real game. It is expensive to resize the capacity
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 1);
     // camera uses the center of the image as the pivoting point
-    batch->setContentSize( Size(s.width,s.height));
-    batch->setAnchorPoint( Vec2::ANCHOR_MIDDLE);
-    batch->setPosition( Vec2(s.width/2, s.height/2));
-    
-//    batch->setGLProgram(alphaTestShader);
-    addChild(batch, 0, kTagSpriteBatchNode);        
-    
-    for(int i=0;i<5;i++) 
+    batch->setContentSize(Size(s.width, s.height));
+    batch->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+    batch->setPosition(Vec2(s.width / 2, s.height / 2));
+
+    //    batch->setGLProgram(alphaTestShader);
+    addChild(batch, 0, kTagSpriteBatchNode);
+
+    for (int i = 0; i < 5; i++)
     {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*0, 121*1, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
-        sprite->setPositionZ(  10 + i*40 );
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 0, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        sprite->setPositionZ(10 + i * 40);
         batch->addChild(sprite, 0);
-        
     }
-    
-    for(int i=5;i<11;i++) {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*0, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
-        sprite->setPositionZ(  10 + (10-i)*40 );
+
+    for (int i = 5; i < 11; i++)
+    {
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 0, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
+        sprite->setPositionZ(10 + (10 - i) * 40);
         batch->addChild(sprite, 0);
     }
-    
-    batch->runAction(OrbitCamera::create(10, 1, 0, 0, 360, 0, 0) );
+
+    batch->runAction(OrbitCamera::create(10, 1, 0, 0, 360, 0, 0));
 }
 
 std::string SpriteBatchNodeZVertex::title() const
@@ -1027,39 +1018,38 @@ std::string SpriteBatchNodeZVertex::subtitle() const
 SpriteAnchorPoint::SpriteAnchorPoint()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    
+
     auto rotate = RotateBy::create(10, 360);
     auto action = RepeatForever::create(rotate);
-    
-    for(int i=0;i<3;i++) 
+
+    for (int i = 0; i < 3; i++)
     {
-        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*i, 121*1, 85, 121) );
-        sprite->setPosition( Vec2( s.width/4*(i+1), s.height/2) );
-        
+        auto sprite = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * i, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 10);
-        
-        switch(i) 
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
-        point->setPosition( sprite->getPosition() );
 
-        sprite->runAction( action->clone() );
+        point->setPosition(sprite->getPosition());
+
+        sprite->runAction(action->clone());
         addChild(sprite, i);
-    }        
+    }
 }
 
 std::string SpriteAnchorPoint::title() const
@@ -1082,39 +1072,38 @@ SpriteBatchNodeAnchorPoint::SpriteBatchNodeAnchorPoint()
     // small capacity. Testing resizing.
     // Don't use capacity=1 in your real game. It is expensive to resize the capacity
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 1);
-    addChild(batch, 0, kTagSpriteBatchNode);        
-    
+    addChild(batch, 0, kTagSpriteBatchNode);
+
     auto s = Director::getInstance()->getWinSize();
-    
-    
+
     auto rotate = RotateBy::create(10, 360);
     auto action = RepeatForever::create(rotate);
-    for(int i=0;i<3;i++) 
+    for (int i = 0; i < 3; i++)
     {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*i, 121*1, 85, 121));
-        sprite->setPosition( Vec2( s.width/4*(i+1), s.height/2) );
-        
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * i, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 1);
 
-        switch(i) 
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
 
-        point->setPosition( sprite->getPosition() );
+        point->setPosition(sprite->getPosition());
 
-        sprite->runAction( action->clone() );
+        sprite->runAction(action->clone());
         batch->addChild(sprite, i);
     }
 }
@@ -1139,40 +1128,39 @@ void SpriteAnchorPointFromFile::onEnter()
 {
     SpriteTestDemo::onEnter();
     auto screen = Director::getInstance()->getWinSize();
-    
-    auto rotate = RotateBy::create(10, 360);
-    auto action = RepeatForever::create(rotate);
+
+    auto rotate   = RotateBy::create(10, 360);
+    auto action   = RepeatForever::create(rotate);
     char str[100] = {0};
 
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini_anchors.plist");
 
-    Sprite *sprite;
-    for(int i=0;i<10;i++)
+    Sprite* sprite;
+    for (int i = 0; i < 10; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png", i+1);
+        sprintf(str, "grossini_dance_%02d.png", i + 1);
         sprite = Sprite::createWithSpriteFrameName(str);
 
-        sprite->setPosition(Vec2(screen.width/6*(i%5+1), screen.height*2/3 - screen.height*(i/5)/3));
-        
+        sprite->setPosition(Vec2(screen.width / 6 * (i % 5 + 1), screen.height * 2 / 3 - screen.height * (i / 5) / 3));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.1f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.1f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 10);
-        
-        sprite->runAction( action->clone() );
+
+        sprite->runAction(action->clone());
         addChild(sprite, i);
     }
-    
+
     Vector<SpriteFrame*> animFrames(5);
-    for(int i = 9; i < 14; i++)
+    for (int i = 9; i < 14; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png", i+1);
+        sprintf(str, "grossini_dance_%02d.png", i + 1);
         animFrames.pushBack(cache->getSpriteFrameByName(str));
     }
     auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
     sprite->runAction(RepeatForever::create(Animate::create(animation)));
-
 }
 
 void SpriteAnchorPointFromFile::onExit()
@@ -1203,39 +1191,38 @@ Sprite6::Sprite6()
     // Don't use capacity=1 in your real game. It is expensive to resize the capacity
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 1);
     addChild(batch, 0, kTagSpriteBatchNode);
-    batch->setIgnoreAnchorPointForPosition( true );
+    batch->setIgnoreAnchorPointForPosition(true);
 
     auto s = Director::getInstance()->getWinSize();
 
-    batch->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-    batch->setContentSize( Size(s.width, s.height) );
-    
-    
+    batch->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+    batch->setContentSize(Size(s.width, s.height));
+
     // SpriteBatchNode actions
     auto rotate = RotateBy::create(5, 360);
     auto action = RepeatForever::create(rotate);
 
     // SpriteBatchNode actions
-    auto rotate_back = rotate->reverse();
-    auto rotate_seq = Sequence::create(rotate, rotate_back, nullptr);
+    auto rotate_back    = rotate->reverse();
+    auto rotate_seq     = Sequence::create(rotate, rotate_back, nullptr);
     auto rotate_forever = RepeatForever::create(rotate_seq);
-    
-    auto scale = ScaleBy::create(5, 1.5f);
-    auto scale_back = scale->reverse();
-    auto scale_seq = Sequence::create( scale, scale_back, nullptr);
+
+    auto scale         = ScaleBy::create(5, 1.5f);
+    auto scale_back    = scale->reverse();
+    auto scale_seq     = Sequence::create(scale, scale_back, nullptr);
     auto scale_forever = RepeatForever::create(scale_seq);
 
-    float step = s.width/4;
+    float step = s.width / 4;
 
-    for(int i=0;i<3;i++) 
+    for (int i = 0; i < 3; i++)
     {
-        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85*i, 121*1, 85, 121));
-        sprite->setPosition( Vec2( (i+1)*step, s.height/2) );
+        auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(85 * i, 121 * 1, 85, 121));
+        sprite->setPosition(Vec2((i + 1) * step, s.height / 2));
 
-        sprite->runAction( action->clone());
+        sprite->runAction(action->clone());
         batch->addChild(sprite, i);
     }
-    
+
     batch->runAction(scale_forever);
     batch->runAction(rotate_forever);
 }
@@ -1253,26 +1240,26 @@ std::string Sprite6::title() const
 SpriteFlip::SpriteFlip()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    sprite1->setPosition( Vec2( s.width/2 - 100, s.height/2 ) );
+
+    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    sprite1->setPosition(Vec2(s.width / 2 - 100, s.height / 2));
     addChild(sprite1, 0, kTagSprite1);
-    
-    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    sprite2->setPosition( Vec2( s.width/2 + 100, s.height/2 ) );
+
+    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    sprite2->setPosition(Vec2(s.width / 2 + 100, s.height / 2));
     addChild(sprite2, 0, kTagSprite2);
-    
-    schedule( CC_CALLBACK_1(SpriteFlip::flipSprites,this), 1, "sprite_flip_key");
+
+    schedule(CC_CALLBACK_1(SpriteFlip::flipSprites, this), 1, "sprite_flip_key");
 }
 
 void SpriteFlip::flipSprites(float dt)
 {
     auto sprite1 = static_cast<Sprite*>(getChildByTag(kTagSprite1));
     auto sprite2 = static_cast<Sprite*>(getChildByTag(kTagSprite2));
-    
+
     bool x = sprite1->isFlippedX();
     bool y = sprite2->isFlippedY();
-    
+
     CCLOG("Pre: %g", sprite1->getContentSize().height);
     sprite1->setFlippedX(!x);
     sprite2->setFlippedY(!y);
@@ -1289,7 +1276,6 @@ std::string SpriteFlip::subtitle() const
     return "Flip X & Y";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeFlip
@@ -1299,29 +1285,29 @@ SpriteBatchNodeFlip::SpriteBatchNodeFlip()
 {
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 10);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    sprite1->setPosition( Vec2( s.width/2 - 100, s.height/2 ) );
+
+    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    sprite1->setPosition(Vec2(s.width / 2 - 100, s.height / 2));
     batch->addChild(sprite1, 0, kTagSprite1);
-    
-    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    sprite2->setPosition( Vec2( s.width/2 + 100, s.height/2 ) );
+
+    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    sprite2->setPosition(Vec2(s.width / 2 + 100, s.height / 2));
     batch->addChild(sprite2, 0, kTagSprite2);
-    
+
     schedule(CC_CALLBACK_1(SpriteBatchNodeFlip::flipSprites, this), 1, "flip_sprites_key");
 }
 
 void SpriteBatchNodeFlip::flipSprites(float dt)
 {
-    auto batch= static_cast<SpriteBatchNode*>(getChildByTag( kTagSpriteBatchNode ));
+    auto batch   = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
     auto sprite1 = static_cast<Sprite*>(batch->getChildByTag(kTagSprite1));
     auto sprite2 = static_cast<Sprite*>(batch->getChildByTag(kTagSprite2));
-    
+
     bool x = sprite1->isFlippedX();
     bool y = sprite2->isFlippedY();
-    
+
     CCLOG("Pre: %g", sprite1->getContentSize().height);
     sprite1->setFlippedX(!x);
     sprite2->setFlippedY(!y);
@@ -1338,7 +1324,6 @@ std::string SpriteBatchNodeFlip::subtitle() const
     return "Flip X & Y";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteAliased
@@ -1348,44 +1333,43 @@ std::string SpriteBatchNodeFlip::subtitle() const
 SpriteAliased::SpriteAliased()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    sprite1->setPosition( Vec2( s.width/2 - 100, s.height/2 ) );
+
+    auto sprite1 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    sprite1->setPosition(Vec2(s.width / 2 - 100, s.height / 2));
     addChild(sprite1, 0, kTagSprite1);
-    
-    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85*1, 121*1, 85, 121));
-    sprite2->setPosition( Vec2( s.width/2 + 100, s.height/2 ) );
+
+    auto sprite2 = Sprite::create("Images/grossini_dance_atlas.png", Rect(85 * 1, 121 * 1, 85, 121));
+    sprite2->setPosition(Vec2(s.width / 2 + 100, s.height / 2));
     addChild(sprite2, 0, kTagSprite2);
-    
-    auto scale = ScaleBy::create(2, 5);
+
+    auto scale      = ScaleBy::create(2, 5);
     auto scale_back = scale->reverse();
-    auto seq = Sequence::create( scale, scale_back, nullptr);
-    auto repeat = RepeatForever::create(seq);
-    
+    auto seq        = Sequence::create(scale, scale_back, nullptr);
+    auto repeat     = RepeatForever::create(seq);
+
     auto repeat2 = repeat->clone();
-    
+
     sprite1->runAction(repeat);
     sprite2->runAction(repeat2);
-    
 }
 
 void SpriteAliased::onEnter()
 {
     SpriteTestDemo::onEnter();
-    
+
     //
     // IMPORTANT:
     // This change will affect every sprite that uses the same texture
     // So sprite1 and sprite2 will be affected by this change
     //
-    auto sprite = static_cast<Sprite*>( getChildByTag(kTagSprite1) );
+    auto sprite = static_cast<Sprite*>(getChildByTag(kTagSprite1));
     sprite->getTexture()->setAliasTexParameters();
 }
 
 void SpriteAliased::onExit()
 {
     // restore the tex parameter to AntiAliased.
-    auto sprite = static_cast<Sprite*>( getChildByTag(kTagSprite1) );
+    auto sprite = static_cast<Sprite*>(getChildByTag(kTagSprite1));
     sprite->getTexture()->setAntiAliasTexParameters();
     SpriteTestDemo::onExit();
 }
@@ -1400,7 +1384,6 @@ std::string SpriteAliased::subtitle() const
     return "AliasTexParameters()";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeAliased
@@ -1411,39 +1394,38 @@ SpriteBatchNodeAliased::SpriteBatchNodeAliased()
 {
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 10);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     auto s = Director::getInstance()->getWinSize();
 
-    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    sprite1->setPosition( Vec2( s.width/2 - 100, s.height/2 ) );
+    auto sprite1 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    sprite1->setPosition(Vec2(s.width / 2 - 100, s.height / 2));
     batch->addChild(sprite1, 0, kTagSprite1);
-    
-    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85*1, 121*1, 85, 121));
-    sprite2->setPosition( Vec2( s.width/2 + 100, s.height/2 ) );
+
+    auto sprite2 = Sprite::createWithTexture(batch->getTexture(), Rect(85 * 1, 121 * 1, 85, 121));
+    sprite2->setPosition(Vec2(s.width / 2 + 100, s.height / 2));
     batch->addChild(sprite2, 0, kTagSprite2);
-    
-    auto scale = ScaleBy::create(2, 5);
+
+    auto scale      = ScaleBy::create(2, 5);
     auto scale_back = scale->reverse();
-    auto seq = Sequence::create( scale, scale_back, nullptr);
-    auto repeat = RepeatForever::create(seq);
-    
+    auto seq        = Sequence::create(scale, scale_back, nullptr);
+    auto repeat     = RepeatForever::create(seq);
+
     auto repeat2 = repeat->clone();
-    
+
     sprite1->runAction(repeat);
     sprite2->runAction(repeat2);
-        
 }
 void SpriteBatchNodeAliased::onEnter()
 {
     SpriteTestDemo::onEnter();
-    auto batch = static_cast<SpriteBatchNode*>( getChildByTag(kTagSpriteBatchNode) );
+    auto batch = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
     batch->getTexture()->setAliasTexParameters();
 }
 
 void SpriteBatchNodeAliased::onExit()
 {
     // restore the tex parameter to AntiAliased.
-    auto batch = static_cast<SpriteBatchNode*>( getChildByTag(kTagSpriteBatchNode) );
+    auto batch = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
     batch->getTexture()->setAntiAliasTexParameters();
     SpriteTestDemo::onExit();
 }
@@ -1458,7 +1440,6 @@ std::string SpriteBatchNodeAliased::subtitle() const
     return "AliasTexParameters()";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteNewTexture
@@ -1467,10 +1448,10 @@ std::string SpriteBatchNodeAliased::subtitle() const
 
 SpriteNewTexture::SpriteNewTexture()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(SpriteNewTexture::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto node = Node::create();
     addChild(node, 0, kTagSpriteBatchNode);
 
@@ -1478,10 +1459,10 @@ SpriteNewTexture::SpriteNewTexture()
     _texture1->retain();
     _texture2 = Director::getInstance()->getTextureCache()->addImage("Images/grossini_dance_atlas-mono.png");
     _texture2->retain();
-    
+
     _usingTexture1 = true;
 
-    for(int i=0;i<30;i++)
+    for (int i = 0; i < 30; i++)
         addNewSprite();
 }
 
@@ -1495,60 +1476,61 @@ void SpriteNewTexture::addNewSprite()
 {
     auto s = Director::getInstance()->getWinSize();
 
-    auto p = Vec2( CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
+    auto p = Vec2(CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
 
     int idx = CCRANDOM_0_1() * 1400 / 100;
-    int x = (idx%5) * 85;
-    int y = (idx/5) * 121;
-    
-    
-    auto node = getChildByTag( kTagSpriteBatchNode );
-    auto sprite = Sprite::createWithTexture(_texture1, Rect(x,y,85,121));
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
+
+    auto node   = getChildByTag(kTagSpriteBatchNode);
+    auto sprite = Sprite::createWithTexture(_texture1, Rect(x, y, 85, 121));
     node->addChild(sprite);
-    
-    sprite->setPosition( Vec2( p.x, p.y) );
-    
+
+    sprite->setPosition(Vec2(p.x, p.y));
+
     ActionInterval* action;
     float random = CCRANDOM_0_1();
-    
-    if( random < 0.20 )
+
+    if (random < 0.20)
         action = ScaleBy::create(3, 2);
-    else if(random < 0.40)
+    else if (random < 0.40)
         action = RotateBy::create(3, 360);
-    else if( random < 0.60)
+    else if (random < 0.60)
         action = Blink::create(1, 3);
-    else if( random < 0.8 )
+    else if (random < 0.8)
         action = TintBy::create(2, 0, -255, -255);
-    else 
+    else
         action = FadeOut::create(2);
 
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
-    
-    sprite->runAction( RepeatForever::create(seq) );
+    auto seq         = Sequence::create(action, action_back, nullptr);
+
+    sprite->runAction(RepeatForever::create(seq));
 }
 
 void SpriteNewTexture::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
 
-    auto node = getChildByTag( kTagSpriteBatchNode );
+    auto node = getChildByTag(kTagSpriteBatchNode);
 
     auto& children = node->getChildren();
     Sprite* sprite;
 
-    if( _usingTexture1 )                          //--> win32 : Let's it make just simple sentence
+    if (_usingTexture1)  //--> win32 : Let's it make just simple sentence
     {
-        for(const auto &obj : children) {
-            sprite = static_cast<Sprite*>( obj );
+        for (const auto& obj : children)
+        {
+            sprite = static_cast<Sprite*>(obj);
             sprite->setTexture(_texture2);
         }
 
         _usingTexture1 = false;
-    } 
-    else 
+    }
+    else
     {
-        for(const auto &obj : children) {
-            sprite = static_cast<Sprite*>( obj );
+        for (const auto& obj : children)
+        {
+            sprite = static_cast<Sprite*>(obj);
             sprite->setTexture(_texture1);
         }
 
@@ -1566,7 +1548,6 @@ std::string SpriteNewTexture::subtitle() const
     return "setTexture() (tap / touch the screen)";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeNewTexture
@@ -1575,18 +1556,19 @@ std::string SpriteNewTexture::subtitle() const
 
 SpriteBatchNodeNewTexture::SpriteBatchNodeNewTexture()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(SpriteBatchNodeNewTexture::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
+
     auto batch = SpriteBatchNode::create("Images/grossini_dance_atlas.png", 50);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
-    _texture1 = batch->getTexture(); _texture1->retain();
+
+    _texture1 = batch->getTexture();
+    _texture1->retain();
     _texture2 = Director::getInstance()->getTextureCache()->addImage("Images/grossini_dance_atlas-mono.png");
     _texture2->retain();
-    
-    for(int i=0;i<30;i++)
+
+    for (int i = 0; i < 30; i++)
         addNewSprite();
 }
 
@@ -1599,48 +1581,47 @@ SpriteBatchNodeNewTexture::~SpriteBatchNodeNewTexture()
 void SpriteBatchNodeNewTexture::addNewSprite()
 {
     auto s = Director::getInstance()->getWinSize();
-    
-    auto p = Vec2( CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
-    
-    auto batch = static_cast<SpriteBatchNode*>( getChildByTag( kTagSpriteBatchNode ) );
-    
+
+    auto p = Vec2(CCRANDOM_0_1() * s.width, CCRANDOM_0_1() * s.height);
+
+    auto batch = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
+
     int idx = CCRANDOM_0_1() * 1400 / 100;
-    int x = (idx%5) * 85;
-    int y = (idx/5) * 121;
-    
-    
-    auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(x,y,85,121));
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
+
+    auto sprite = Sprite::createWithTexture(batch->getTexture(), Rect(x, y, 85, 121));
     batch->addChild(sprite);
-    
-    sprite->setPosition( Vec2( p.x, p.y) );
-    
+
+    sprite->setPosition(Vec2(p.x, p.y));
+
     ActionInterval* action;
     float random = CCRANDOM_0_1();
-    
-    if( random < 0.20 )
+
+    if (random < 0.20)
         action = ScaleBy::create(3, 2);
-    else if(random < 0.40)
+    else if (random < 0.40)
         action = RotateBy::create(3, 360);
-    else if( random < 0.60)
+    else if (random < 0.60)
         action = Blink::create(1, 3);
-    else if( random < 0.8 )
+    else if (random < 0.8)
         action = TintBy::create(2, 0, -255, -255);
-    else 
+    else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
-    
-    sprite->runAction( RepeatForever::create(seq) );
+    auto seq         = Sequence::create(action, action_back, nullptr);
+
+    sprite->runAction(RepeatForever::create(seq));
 }
 
 void SpriteBatchNodeNewTexture::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    auto batch = static_cast<SpriteBatchNode*>( getChildByTag( kTagSpriteBatchNode) );
-    
-    if( batch->getTexture() == _texture1 )
+    auto batch = static_cast<SpriteBatchNode*>(getChildByTag(kTagSpriteBatchNode));
+
+    if (batch->getTexture() == _texture1)
         batch->setTexture(_texture2);
     else
-        batch->setTexture(_texture1);    
+        batch->setTexture(_texture1);
 }
 
 std::string SpriteBatchNodeNewTexture::title() const
@@ -1653,7 +1634,6 @@ std::string SpriteBatchNodeNewTexture::subtitle() const
     return "setTexture() (tap / touch the screen)";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteFrameTest
@@ -1677,7 +1657,7 @@ void SpriteFrameTest::onEnter()
     // Animation using Sprite BatchNode
     //
     _sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    _sprite1->setPosition( Vec2( s.width/2-80, s.height/2) );
+    _sprite1->setPosition(Vec2(s.width / 2 - 80, s.height / 2));
 
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     spritebatch->addChild(_sprite1);
@@ -1686,15 +1666,15 @@ void SpriteFrameTest::onEnter()
     Vector<SpriteFrame*> animFrames(15);
 
     char str[100] = {0};
-    for(int i = 1; i < 15; i++) 
+    for (int i = 1; i < 15; i++)
     {
         sprintf(str, "grossini_dance_%02d.png", i);
-        auto frame = cache->getSpriteFrameByName( str );
+        auto frame = cache->getSpriteFrameByName(str);
         animFrames.pushBack(frame);
     }
 
     auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-    _sprite1->runAction( RepeatForever::create( Animate::create(animation) ) );
+    _sprite1->runAction(RepeatForever::create(Animate::create(animation)));
 
     // to test issue #732, uncomment the following line
     _sprite1->setFlippedX(false);
@@ -1704,21 +1684,20 @@ void SpriteFrameTest::onEnter()
     // Animation using standard Sprite
     //
     _sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    _sprite2->setPosition( Vec2( s.width/2 + 80, s.height/2) );
+    _sprite2->setPosition(Vec2(s.width / 2 + 80, s.height / 2));
     addChild(_sprite2);
 
-
     Vector<SpriteFrame*> moreFrames(20);
-    for(int i = 1; i < 15; i++) 
+    for (int i = 1; i < 15; i++)
     {
-        sprintf(str, "grossini_dance_gray_%02d.png",i);
+        sprintf(str, "grossini_dance_gray_%02d.png", i);
         auto frame = cache->getSpriteFrameByName(str);
         moreFrames.pushBack(frame);
     }
 
-
-    for( int i = 1; i < 5; i++) {
-        sprintf(str, "grossini_blue_%02d.png",i);
+    for (int i = 1; i < 5; i++)
+    {
+        sprintf(str, "grossini_blue_%02d.png", i);
         auto frame = cache->getSpriteFrameByName(str);
         moreFrames.pushBack(frame);
     }
@@ -1727,9 +1706,7 @@ void SpriteFrameTest::onEnter()
     moreFrames.pushBack(animFrames);
     auto animMixed = Animation::createWithSpriteFrames(moreFrames, 0.3f);
 
-
-    _sprite2->runAction(RepeatForever::create( Animate::create(animMixed) ) );
-
+    _sprite2->runAction(RepeatForever::create(Animate::create(animMixed)));
 
     // to test issue #732, uncomment the following line
     _sprite2->setFlippedX(false);
@@ -1770,32 +1747,33 @@ void SpriteFrameTest::flipSprites(float dt)
 
     bool fx = false;
     bool fy = false;
-    int  i  = _counter % 4;
+    int i   = _counter % 4;
 
-    switch ( i ) {
-        case 0:
-            fx = false;
-            fy = false;
-            break;
-        case 1:
-            fx = true;
-            fy = false;
-            break;
-        case 2:
-            fx = false;
-            fy = true;
-            break;
-        case 3:
-            fx = true;
-            fy = true;
-            break;
+    switch (i)
+    {
+    case 0:
+        fx = false;
+        fy = false;
+        break;
+    case 1:
+        fx = true;
+        fy = false;
+        break;
+    case 2:
+        fx = false;
+        fy = true;
+        break;
+    case 3:
+        fx = true;
+        fy = true;
+        break;
     }
 
     _sprite1->setFlippedX(fx);
     _sprite1->setFlippedY(fy);
     _sprite2->setFlippedX(fx);
     _sprite2->setFlippedY(fy);
-    //NSLog(@"flipX:%d, flipY:%d", fx, fy);
+    // NSLog(@"flipX:%d, flipY:%d", fx, fy);
 }
 
 //------------------------------------------------------------------
@@ -1824,12 +1802,14 @@ void SpriteFrameAliasNameTest::onEnter()
     // A SpriteBatchNode can reference one and only one texture (one .png file)
     // Sprites that are contained in that texture can be instantiated as Sprites and then added to the SpriteBatchNode
     // All Sprites added to a SpriteBatchNode are drawn in one OpenGL ES draw call
-    // If the Sprites are not added to a SpriteBatchNode then an OpenGL ES draw call will be needed for each one, which is less efficient
+    // If the Sprites are not added to a SpriteBatchNode then an OpenGL ES draw call will be needed for each one, which
+    // is less efficient
     //
-    // When you animate a sprite, Animation changes the frame of the sprite using setDisplayFrame: (this is why the animation must be in the same texture)
-    // When setDisplayFrame: is used in the Animation it changes the frame to one specified by the SpriteFrames that were added to the animation,
-    // but texture id is still the same and so the sprite is still a child of the SpriteBatchNode, 
-    // and therefore all the animation sprites are also drawn as part of the SpriteBatchNode
+    // When you animate a sprite, Animation changes the frame of the sprite using setDisplayFrame: (this is why the
+    // animation must be in the same texture) When setDisplayFrame: is used in the Animation it changes the frame to one
+    // specified by the SpriteFrames that were added to the animation, but texture id is still the same and so the
+    // sprite is still a child of the SpriteBatchNode, and therefore all the animation sprites are also drawn as part of
+    // the SpriteBatchNode
     //
 
     auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
@@ -1841,7 +1821,7 @@ void SpriteFrameAliasNameTest::onEnter()
 
     Vector<SpriteFrame*> animFrames(15);
     char str[100] = {0};
-    for(int i = 1; i < 15; i++)
+    for (int i = 1; i < 15; i++)
     {
         // Obtain frames by alias name
         sprintf(str, "dance_%02d", i);
@@ -1879,61 +1859,61 @@ std::string SpriteFrameAliasNameTest::subtitle() const
 //------------------------------------------------------------------
 void SpriteFramesFromFileContent::onEnter()
 {
-	SpriteTestDemo::onEnter();
-	auto s = Director::getInstance()->getWinSize();
+    SpriteTestDemo::onEnter();
+    auto s = Director::getInstance()->getWinSize();
 
     Data plist_content = FileUtils::getInstance()->getDataFromFile(sheetName() + ".plist");
     Data image_content = FileUtils::getInstance()->getDataFromFile(sheetName() + ".png");
 
-	Image* image = new Image();
-	image->initWithImageData((const uint8_t*)image_content.getBytes(), image_content.getSize());
-	Texture2D* texture = new Texture2D();
-	texture->initWithImage(image);
-	texture->autorelease();
-    
-	CC_SAFE_RELEASE(image);
+    Image* image = new Image();
+    image->initWithImageData((const uint8_t*)image_content.getBytes(), image_content.getSize());
+    Texture2D* texture = new Texture2D();
+    texture->initWithImage(image);
+    texture->autorelease();
 
-	auto cache = SpriteFrameCache::getInstance();
-	cache->addSpriteFramesWithFileContent(plist_content, texture);
+    CC_SAFE_RELEASE(image);
 
-	//
-	// Animation using Sprite BatchNode
-	//
-	Sprite * sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-	sprite->setPosition( Vec2( s.width/2, s.height/2) );
-	addChild(sprite);
+    auto cache = SpriteFrameCache::getInstance();
+    cache->addSpriteFramesWithFileContent(plist_content, texture);
 
-	Vector<SpriteFrame*> animFrames(15);
+    //
+    // Animation using Sprite BatchNode
+    //
+    Sprite* sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
+    sprite->setPosition(Vec2(s.width / 2, s.height / 2));
+    addChild(sprite);
+
+    Vector<SpriteFrame*> animFrames(15);
 
-	char str[100] = {0};
-	for(int i = 1; i < 15; i++) 
-	{
-		sprintf(str, "grossini_dance_%02d.png", i);
-		auto frame = cache->getSpriteFrameByName( str );
-		animFrames.pushBack(frame);
-	}
+    char str[100] = {0};
+    for (int i = 1; i < 15; i++)
+    {
+        sprintf(str, "grossini_dance_%02d.png", i);
+        auto frame = cache->getSpriteFrameByName(str);
+        animFrames.pushBack(frame);
+    }
 
-	auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-	sprite->runAction( RepeatForever::create( Animate::create(animation) ) );
+    auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
+    sprite->runAction(RepeatForever::create(Animate::create(animation)));
 }
 
 void SpriteFramesFromFileContent::onExit()
 {
-	SpriteTestDemo::onExit();
+    SpriteTestDemo::onExit();
 
-	std::string plist_content = FileUtils::getInstance()->getStringFromFile("animations/grossini.plist");
+    std::string plist_content = FileUtils::getInstance()->getStringFromFile("animations/grossini.plist");
 
-	SpriteFrameCache::getInstance()->removeSpriteFramesFromFileContent(plist_content);
+    SpriteFrameCache::getInstance()->removeSpriteFramesFromFileContent(plist_content);
 }
 
 std::string SpriteFramesFromFileContent::title() const
 {
-	return "SpriteFrameCache load form file content";
+    return "SpriteFrameCache load form file content";
 }
 
 std::string SpriteFramesFromFileContent::subtitle() const
 {
-	return "SpriteFrameCache load from plist file content";
+    return "SpriteFrameCache load from plist file content";
 }
 
 std::string SpriteFramesFromFileContent::sheetName() const
@@ -1966,58 +1946,56 @@ void SpriteOffsetAnchorRotation::onEnter()
 {
     SpriteTestDemo::onEnter();
 
-    auto s = Director::getInstance()->getWinSize();        
+    auto s     = Director::getInstance()->getWinSize();
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
 
-    for(int i=0;i<3;i++) 
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite batch
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2( s.width/4*(i+1), s.height/2));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
 
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 1);
 
-        switch(i) 
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
-        point->setPosition( sprite->getPosition() );
-        
+
+        point->setPosition(sprite->getPosition());
+
         Vector<SpriteFrame*> animFrames(14);
         char str[100] = {0};
-        for(int i = 0; i < 14; i++) 
+        for (int i = 0; i < 14; i++)
         {
-            sprintf(str, "grossini_dance_%02d.png",(i+1));
+            sprintf(str, "grossini_dance_%02d.png", (i + 1));
             auto frame = cache->getSpriteFrameByName(str);
             animFrames.pushBack(frame);
         }
 
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-        sprite->runAction(RepeatForever::create( Animate::create(animation) ) );            
-        sprite->runAction(RepeatForever::create(RotateBy::create(10, 360) ) );
+        sprite->runAction(RepeatForever::create(Animate::create(animation)));
+        sprite->runAction(RepeatForever::create(RotateBy::create(10, 360)));
 
         addChild(sprite, 0);
-
-    }        
+    }
 }
 
-
 void SpriteOffsetAnchorRotation::onExit()
 {
     SpriteTestDemo::onExit();
@@ -2044,61 +2022,60 @@ std::string SpriteOffsetAnchorRotation::subtitle() const
 
 SpriteBatchNodeOffsetAnchorRotation::SpriteBatchNodeOffsetAnchorRotation()
 {
-    auto s = Director::getInstance()->getWinSize(); 
-    
+    auto s = Director::getInstance()->getWinSize();
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
-    
-    for(int i=0;i<3;i++) 
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite BatchNode
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition( Vec2( s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 200);
-        
-        switch(i) 
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
-        point->setPosition( sprite->getPosition() );
-        
+
+        point->setPosition(sprite->getPosition());
+
         Vector<SpriteFrame*> animFrames(14);
         char str[100] = {0};
-        for(int k = 0; k < 14; k++) 
+        for (int k = 0; k < 14; k++)
         {
-            sprintf(str, "grossini_dance_%02d.png",(k+1));
+            sprintf(str, "grossini_dance_%02d.png", (k + 1));
             auto frame = cache->getSpriteFrameByName(str);
             animFrames.pushBack(frame);
         }
 
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-        sprite->runAction(RepeatForever::create( Animate::create(animation) ));
-        sprite->runAction(RepeatForever::create(RotateBy::create(10, 360) ));
-        
+        sprite->runAction(RepeatForever::create(Animate::create(animation)));
+        sprite->runAction(RepeatForever::create(RotateBy::create(10, 360)));
+
         spritebatch->addChild(sprite, i);
-    }        
+    }
 }
 
-
 void SpriteBatchNodeOffsetAnchorRotation::onExit()
 {
     SpriteTestDemo::onExit();
@@ -2123,62 +2100,61 @@ std::string SpriteBatchNodeOffsetAnchorRotation::subtitle() const
 //
 //------------------------------------------------------------------
 
-
 SpriteOffsetAnchorScale::SpriteOffsetAnchorScale()
 {
-    auto s = Director::getInstance()->getWinSize();   
-    
+    auto s = Director::getInstance()->getWinSize();
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
-    for(int i=0;i<3;i++) 
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite BatchNode
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition( Vec2( s.width/4*(i+1), s.height/2) );
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
-        switch(i) 
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
-        point->setPosition( sprite->getPosition() );
-        
+
+        point->setPosition(sprite->getPosition());
+
         Vector<SpriteFrame*> animFrames(14);
         char str[100] = {0};
-        for(int i = 0; i < 14; i++) 
+        for (int i = 0; i < 14; i++)
         {
-            sprintf(str, "grossini_dance_%02d.png",(i+1));
+            sprintf(str, "grossini_dance_%02d.png", (i + 1));
             auto frame = cache->getSpriteFrameByName(str);
             animFrames.pushBack(frame);
         }
 
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-        sprite->runAction(RepeatForever::create( Animate::create(animation) ));            
-        
-        auto scale = ScaleBy::create(2, 2);
+        sprite->runAction(RepeatForever::create(Animate::create(animation)));
+
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_scale));
-        
+
         addChild(sprite, 0);
-    }        
+    }
 }
 
 void SpriteOffsetAnchorScale::onExit()
@@ -2206,61 +2182,62 @@ std::string SpriteOffsetAnchorScale::subtitle() const
 //------------------------------------------------------------------
 SpriteBatchNodeOffsetAnchorScale::SpriteBatchNodeOffsetAnchorScale()
 {
-    auto s = Director::getInstance()->getWinSize(); 
-    
+    auto s = Director::getInstance()->getWinSize();
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritesheet = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritesheet);
-    
-    for(int i=0;i<3;i++) 
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite BatchNode
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition( Vec2( s.width/4*(i+1), s.height/2) );
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        point->setScale( 0.25f );
-        point->setPosition( sprite->getPosition() );
+        point->setScale(0.25f);
+        point->setPosition(sprite->getPosition());
         addChild(point, 200);
-        
-        switch(i) {
-            case 0:
-                sprite->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-                break;
-            case 1:
-                sprite->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-                break;
-            case 2:
-                sprite->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-                break;
+
+        switch (i)
+        {
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
-        point->setPosition( sprite->getPosition() );
-        
+
+        point->setPosition(sprite->getPosition());
+
         Vector<SpriteFrame*> animFrames(14);
         char str[100] = {0};
-        for(int k = 0; k < 14; k++) 
+        for (int k = 0; k < 14; k++)
         {
-            sprintf(str, "grossini_dance_%02d.png",(k+1));
+            sprintf(str, "grossini_dance_%02d.png", (k + 1));
             auto frame = cache->getSpriteFrameByName(str);
             animFrames.pushBack(frame);
         }
 
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
-        sprite->runAction(RepeatForever::create( Animate::create(animation) ) );
+        sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
-        auto scale = ScaleBy::create(2, 2);
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
-        sprite->runAction(RepeatForever::create(seq_scale) );
-        
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
+        sprite->runAction(RepeatForever::create(seq_scale));
+
         spritesheet->addChild(sprite, i);
-    }        
+    }
 }
 
 void SpriteBatchNodeOffsetAnchorScale::onExit()
@@ -2281,7 +2258,6 @@ std::string SpriteBatchNodeOffsetAnchorScale::subtitle() const
     return "offset + anchor + scale";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteAnimationSplit
@@ -2291,25 +2267,24 @@ std::string SpriteBatchNodeOffsetAnchorScale::subtitle() const
 SpriteAnimationSplit::SpriteAnimationSplit()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto texture = Director::getInstance()->getTextureCache()->addImage("animations/dragon_animation.png");
-    
+
     // manually add frames to the frame cache
-    auto frame0 = SpriteFrame::createWithTexture(texture, Rect(132*0, 132*0, 132, 132));
-    auto frame1 = SpriteFrame::createWithTexture(texture, Rect(132*1, 132*0, 132, 132));
-    auto frame2 = SpriteFrame::createWithTexture(texture, Rect(132*2, 132*0, 132, 132));
-    auto frame3 = SpriteFrame::createWithTexture(texture, Rect(132*3, 132*0, 132, 132));
-    auto frame4 = SpriteFrame::createWithTexture(texture, Rect(132*0, 132*1, 132, 132));
-    auto frame5 = SpriteFrame::createWithTexture(texture, Rect(132*1, 132*1, 132, 132));
-    
-    
+    auto frame0 = SpriteFrame::createWithTexture(texture, Rect(132 * 0, 132 * 0, 132, 132));
+    auto frame1 = SpriteFrame::createWithTexture(texture, Rect(132 * 1, 132 * 0, 132, 132));
+    auto frame2 = SpriteFrame::createWithTexture(texture, Rect(132 * 2, 132 * 0, 132, 132));
+    auto frame3 = SpriteFrame::createWithTexture(texture, Rect(132 * 3, 132 * 0, 132, 132));
+    auto frame4 = SpriteFrame::createWithTexture(texture, Rect(132 * 0, 132 * 1, 132, 132));
+    auto frame5 = SpriteFrame::createWithTexture(texture, Rect(132 * 1, 132 * 1, 132, 132));
+
     //
     // Animation using Sprite BatchNode
     //
     auto sprite = Sprite::createWithSpriteFrame(frame0);
-    sprite->setPosition( Vec2( s.width/2-80, s.height/2) );
+    sprite->setPosition(Vec2(s.width / 2 - 80, s.height / 2));
     addChild(sprite);
-            
+
     Vector<SpriteFrame*> animFrames(6);
     animFrames.pushBack(frame0);
     animFrames.pushBack(frame1);
@@ -2317,16 +2292,12 @@ SpriteAnimationSplit::SpriteAnimationSplit()
     animFrames.pushBack(frame3);
     animFrames.pushBack(frame4);
     animFrames.pushBack(frame5);
-            
+
     auto animation = Animation::createWithSpriteFrames(animFrames, 0.2f);
-    auto animate = Animate::create(animation);
-	auto seq = Sequence::create(animate,
-								  FlipX::create(true),
-								  animate->clone(),
-								  FlipX::create(false),
-								  nullptr);
-    
-    sprite->runAction(RepeatForever::create( seq ) );
+    auto animate   = Animate::create(animation);
+    auto seq       = Sequence::create(animate, FlipX::create(true), animate->clone(), FlipX::create(false), nullptr);
+
+    sprite->runAction(RepeatForever::create(seq));
 }
 
 void SpriteAnimationSplit::onExit()
@@ -2352,72 +2323,72 @@ SpriteHybrid::SpriteHybrid()
     // parents
     auto parent1 = Node::create();
     auto parent2 = SpriteBatchNode::create("animations/grossini.png", 50);
-    
+
     addChild(parent1, 0, kTagNode);
     addChild(parent2, 0, kTagSpriteBatchNode);
-    
-    
+
     // IMPORTANT:
     // The sprite frames will be cached AND RETAINED, and they won't be released unless you call
     //     SpriteFrameCache::getInstance()->removeUnusedSpriteFrames);
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
-    
-    
+
     // create 250 sprites
     // only show 80% of them
-    for(int i = 0; i < 250; i++) 
+    for (int i = 0; i < 250; i++)
     {
         int spriteIdx = CCRANDOM_0_1() * 14;
-        char str[25] = {0};
-        sprintf(str, "grossini_dance_%02d.png", (spriteIdx+1));
-        auto frame = SpriteFrameCache::getInstance()->getSpriteFrameByName(str);
+        char str[25]  = {0};
+        sprintf(str, "grossini_dance_%02d.png", (spriteIdx + 1));
+        auto frame  = SpriteFrameCache::getInstance()->getSpriteFrameByName(str);
         auto sprite = Sprite::createWithSpriteFrame(frame);
         parent1->addChild(sprite, i, i);
-        
-        float x=-1000;
-        float y=-1000;
-        if( CCRANDOM_0_1() < 0.2f ) 
+
+        float x = -1000;
+        float y = -1000;
+        if (CCRANDOM_0_1() < 0.2f)
         {
             x = CCRANDOM_0_1() * s.width;
             y = CCRANDOM_0_1() * s.height;
         }
-        sprite->setPosition( Vec2(x,y) );
-            
+        sprite->setPosition(Vec2(x, y));
+
         auto action = RotateBy::create(4, 360);
-        sprite->runAction( RepeatForever::create(action) );
+        sprite->runAction(RepeatForever::create(action));
     }
-    
+
     _usingSpriteBatchNode = false;
-    
+
     schedule(CC_CALLBACK_1(SpriteHybrid::reparentSprite, this), 2, "reparent_sprite_key");
 }
 
 void SpriteHybrid::reparentSprite(float dt)
 {
     auto p1 = getChildByTag(kTagNode);
-    auto p2 = getChildByTag( kTagSpriteBatchNode );
-    
+    auto p2 = getChildByTag(kTagSpriteBatchNode);
+
     Vector<Node*> retArray(250);
 
-    if( _usingSpriteBatchNode )
+    if (_usingSpriteBatchNode)
         std::swap(p1, p2);
 
     ////----CCLOG("New parent is: %x", p2);
-    
+
     auto& p1Children = p1->getChildren();
-    for(const auto &node : p1Children) {
+    for (const auto& node : p1Children)
+    {
         retArray.pushBack(node);
     }
 
-    int i=0;
+    int i = 0;
     p1->removeAllChildrenWithCleanup(false);
 
-    for(const auto &node : retArray) {
+    for (const auto& node : retArray)
+    {
         p2->addChild(node, i, i);
         i++;
     }
 
-    _usingSpriteBatchNode = ! _usingSpriteBatchNode;
+    _usingSpriteBatchNode = !_usingSpriteBatchNode;
 }
 
 void SpriteHybrid::onExit()
@@ -2440,54 +2411,53 @@ std::string SpriteHybrid::title() const
 SpriteBatchNodeChildren::SpriteBatchNodeChildren()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     // parents
     auto batch = SpriteBatchNode::create("animations/grossini.png", 50);
-    
+
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
-    
+
     auto sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2( s.width/3, s.height/2));
-    
+    sprite1->setPosition(Vec2(s.width / 3, s.height / 2));
+
     auto sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(50.0f,50.0f));
-    
+    sprite2->setPosition(Vec2(50.0f, 50.0f));
+
     auto sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-50.0f,-50.0f));
-    
+    sprite3->setPosition(Vec2(-50.0f, -50.0f));
+
     batch->addChild(sprite1);
     sprite1->addChild(sprite2);
     sprite1->addChild(sprite3);
-    
+
     // BEGIN NEW CODE
     Vector<SpriteFrame*> animFrames(14);
     char str[100] = {0};
-    for(int i = 1; i < 15; i++) 
+    for (int i = 1; i < 15; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png",i);
+        sprintf(str, "grossini_dance_%02d.png", i);
         auto frame = SpriteFrameCache::getInstance()->getSpriteFrameByName(str);
         animFrames.pushBack(frame);
     }
-    
+
     auto animation = Animation::createWithSpriteFrames(animFrames, 0.2f);
-    sprite1->runAction(RepeatForever::create( Animate::create(animation) ) );
+    sprite1->runAction(RepeatForever::create(Animate::create(animation)));
     // END NEW CODE
-    
-    auto action = MoveBy::create(2, Vec2(200.0f,0.0f));
-    auto action_back = action->reverse();
-    auto action_rot = RotateBy::create(2.0f, 360.0f);
-    auto action_s = ScaleBy::create(2.0f, 2.0f);
+
+    auto action        = MoveBy::create(2, Vec2(200.0f, 0.0f));
+    auto action_back   = action->reverse();
+    auto action_rot    = RotateBy::create(2.0f, 360.0f);
+    auto action_s      = ScaleBy::create(2.0f, 2.0f);
     auto action_s_back = action_s->reverse();
-    
+
     auto seq2 = action_rot->reverse();
-    sprite2->runAction( RepeatForever::create(seq2) );
-    
-    sprite1->runAction( RepeatForever::create(action_rot));
-    sprite1->runAction( RepeatForever::create(Sequence::create(action, action_back,nullptr)) );
-    sprite1->runAction( RepeatForever::create(Sequence::create(action_s, action_s_back,nullptr)) );
+    sprite2->runAction(RepeatForever::create(seq2));
 
+    sprite1->runAction(RepeatForever::create(action_rot));
+    sprite1->runAction(RepeatForever::create(Sequence::create(action, action_back, nullptr)));
+    sprite1->runAction(RepeatForever::create(Sequence::create(action_s, action_s_back, nullptr)));
 }
 
 void SpriteBatchNodeChildren::onExit()
@@ -2509,61 +2479,60 @@ std::string SpriteBatchNodeChildren::title() const
 SpriteBatchNodeChildrenZ::SpriteBatchNodeChildrenZ()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     // parents
     SpriteBatchNode* batch;
-    Sprite* sprite1, *sprite2, *sprite3;
+    Sprite *sprite1, *sprite2, *sprite3;
 
-    
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
-    
+
     // test 1
     batch = SpriteBatchNode::create("animations/grossini.png", 50);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2( s.width/3, s.height/2));
-    
+    sprite1->setPosition(Vec2(s.width / 3, s.height / 2));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     batch->addChild(sprite1);
     sprite1->addChild(sprite2, 2);
     sprite1->addChild(sprite3, -2);
-    
+
     // test 2
     batch = SpriteBatchNode::create("animations/grossini.png", 50);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2( 2*s.width/3, s.height/2));
-    
+    sprite1->setPosition(Vec2(2 * s.width / 3, s.height / 2));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     batch->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, 2);
-    
+
     // test 3
     batch = SpriteBatchNode::create("animations/grossini.png", 50);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2( s.width/2 - 90, s.height/4));
-    
+    sprite1->setPosition(Vec2(s.width / 2 - 90, s.height / 4));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2( s.width/2 - 60,s.height/4));
-    
+    sprite2->setPosition(Vec2(s.width / 2 - 60, s.height / 4));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2( s.width/2 - 30, s.height/4));
-    
+    sprite3->setPosition(Vec2(s.width / 2 - 30, s.height / 4));
+
     batch->addChild(sprite1, 10);
     batch->addChild(sprite2, -10);
     batch->addChild(sprite3, -5);
@@ -2571,16 +2540,16 @@ SpriteBatchNodeChildrenZ::SpriteBatchNodeChildrenZ()
     // test 4
     batch = SpriteBatchNode::create("animations/grossini.png", 50);
     addChild(batch, 0, kTagSpriteBatchNode);
-    
+
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2( s.width/2 +30, s.height/4));
-    
+    sprite1->setPosition(Vec2(s.width / 2 + 30, s.height / 4));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2( s.width/2 +60,s.height/4));
-    
+    sprite2->setPosition(Vec2(s.width / 2 + 60, s.height / 4));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2( s.width/2 +90, s.height/4));
-    
+    sprite3->setPosition(Vec2(s.width / 2 + 90, s.height / 4));
+
     batch->addChild(sprite1, -10);
     batch->addChild(sprite2, -5);
     batch->addChild(sprite3, -2);
@@ -2609,53 +2578,51 @@ SpriteChildrenVisibility::SpriteChildrenVisibility()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-    Node *aParent;
-    Sprite* sprite1, *sprite2, *sprite3;
+    Node* aParent;
+    Sprite *sprite1, *sprite2, *sprite3;
     //
     // SpriteBatchNode
     //
     // parents
     aParent = SpriteBatchNode::create("animations/grossini.png", 50);
-    aParent->setPosition( Vec2(s.width/3, s.height/2) );
+    aParent->setPosition(Vec2(s.width / 3, s.height / 2));
     addChild(aParent, 0);
-    
-    
-    
+
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2(0.0f,0.0f));
-    
+    sprite1->setPosition(Vec2(0.0f, 0.0f));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, 2);
-    
+
     sprite1->runAction(Blink::create(5.0f, 10.0f));
-    
+
     //
     // Sprite
     //
     aParent = Node::create();
-    aParent->setPosition( Vec2(2*s.width/3, s.height/2) );
+    aParent->setPosition(Vec2(2 * s.width / 3, s.height / 2));
     addChild(aParent, 0);
 
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2(0.0f,0.0f));
-            
+    sprite1->setPosition(Vec2(0.0f, 0.0f));
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, 2);
-    
+
     sprite1->runAction(Blink::create(5.0f, 10.0f));
 }
 
@@ -2681,24 +2648,24 @@ SpriteChildrenVisibilityIssue665::SpriteChildrenVisibilityIssue665()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-    Node *aParent;
+    Node* aParent;
     Sprite *sprite1, *sprite2, *sprite3;
     //
     // SpriteBatchNode
     //
     // parents
     aParent = SpriteBatchNode::create("animations/grossini.png", 50);
-    aParent->setPosition(Vec2(s.width/3, s.height/2));
+    aParent->setPosition(Vec2(s.width / 3, s.height / 2));
     addChild(aParent, 0);
 
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2(0.0f,0.0f));
+    sprite1->setPosition(Vec2(0.0f, 0.0f));
 
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
 
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
 
     // test issue #665
     sprite1->setVisible(false);
@@ -2711,17 +2678,17 @@ SpriteChildrenVisibilityIssue665::SpriteChildrenVisibilityIssue665()
     // Sprite
     //
     aParent = Node::create();
-    aParent->setPosition(Vec2(2*s.width/3, s.height/2));
+    aParent->setPosition(Vec2(2 * s.width / 3, s.height / 2));
     addChild(aParent, 0);
 
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-    sprite1->setPosition(Vec2(0.0f,0.0f));
+    sprite1->setPosition(Vec2(0.0f, 0.0f));
 
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
 
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
 
     // test issue #665
     sprite1->setVisible(false);
@@ -2754,98 +2721,93 @@ std::string SpriteChildrenVisibilityIssue665::subtitle() const
 SpriteChildrenAnchorPoint::SpriteChildrenAnchorPoint()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
-    
-    Node *aParent;
-    Sprite* sprite1, *sprite2, *sprite3, *sprite4, *point;
+
+    Node* aParent;
+    Sprite *sprite1, *sprite2, *sprite3, *sprite4, *point;
     //
     // SpriteBatchNode
     //
     // parents
-    
+
     aParent = Node::create();
     addChild(aParent, 0);
-    
+
     // anchor (0,0)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/4,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
+    sprite1->setPosition(Vec2(s.width / 4, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
 
-    
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
 
-    
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
     addChild(point, 10);
-    
-    
+
     // anchor (0.5, 0.5)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/2,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-    
+    sprite1->setPosition(Vec2(s.width / 2, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
 
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
 
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );        
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
 
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
-    addChild(point, 10);        
-    
-    
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
+    addChild(point, 10);
+
     // anchor (1,1)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/2+s.width/4,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
+    sprite1->setPosition(Vec2(s.width / 2 + s.width / 4, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
 
-    
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );        
-    
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
-    addChild(point, 10);        
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
+    addChild(point, 10);
 }
 
 void SpriteChildrenAnchorPoint::onExit()
@@ -2872,95 +2834,93 @@ std::string SpriteChildrenAnchorPoint::subtitle() const
 SpriteBatchNodeChildrenAnchorPoint::SpriteBatchNodeChildrenAnchorPoint()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
-    
-    Node *aParent;
-    Sprite* sprite1, *sprite2, *sprite3, *sprite4, *point;
+
+    Node* aParent;
+    Sprite *sprite1, *sprite2, *sprite3, *sprite4, *point;
     //
     // SpriteBatchNode
     //
     // parents
-    
+
     aParent = SpriteBatchNode::create("animations/grossini.png", 50);
     addChild(aParent, 0);
-    
+
     // anchor (0,0)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/4,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_BOTTOM_LEFT );
-    
+    sprite1->setPosition(Vec2(s.width / 4, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );
-    
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
     addChild(point, 10);
-    
-    
+
     // anchor (0.5, 0.5)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/2,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_MIDDLE );
-    
+    sprite1->setPosition(Vec2(s.width / 2, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );        
-    
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
-    addChild(point, 10);        
-    
-    
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
+    addChild(point, 10);
+
     // anchor (1,1)
     sprite1 = Sprite::createWithSpriteFrameName("grossini_dance_08.png");
-    sprite1->setPosition(Vec2(s.width/2+s.width/4,s.height/2));
-    sprite1->setAnchorPoint( Vec2::ANCHOR_TOP_RIGHT );
-    
+    sprite1->setPosition(Vec2(s.width / 2 + s.width / 4, s.height / 2));
+    sprite1->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+
     sprite2 = Sprite::createWithSpriteFrameName("grossini_dance_02.png");
-    sprite2->setPosition(Vec2(20.0f,30.0f));
-    
+    sprite2->setPosition(Vec2(20.0f, 30.0f));
+
     sprite3 = Sprite::createWithSpriteFrameName("grossini_dance_03.png");
-    sprite3->setPosition(Vec2(-20.0f,30.0f));
-    
+    sprite3->setPosition(Vec2(-20.0f, 30.0f));
+
     sprite4 = Sprite::createWithSpriteFrameName("grossini_dance_04.png");
-    sprite4->setPosition(Vec2(0.0f,0.0f));
-    sprite4->setScale( 0.5f );        
-    
+    sprite4->setPosition(Vec2(0.0f, 0.0f));
+    sprite4->setScale(0.5f);
+
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2, -2);
     sprite1->addChild(sprite3, -2);
     sprite1->addChild(sprite4, 3);
-    
+
     point = Sprite::create("Images/r1.png");
-    point->setScale( 0.25f );
-    point->setPosition( sprite1->getPosition() );
-    addChild(point, 10);        
+    point->setScale(0.25f);
+    point->setPosition(sprite1->getPosition());
+    addChild(point, 10);
 }
 
 void SpriteBatchNodeChildrenAnchorPoint::onExit()
@@ -2979,7 +2939,6 @@ std::string SpriteBatchNodeChildrenAnchorPoint::subtitle() const
     return "children + anchor point";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeChildrenScale
@@ -2987,93 +2946,89 @@ std::string SpriteBatchNodeChildrenAnchorPoint::subtitle() const
 //------------------------------------------------------------------
 SpriteBatchNodeChildrenScale::SpriteBatchNodeChildrenScale()
 {
-    auto s = Director::getInstance()->getWinSize();        
-    
+    auto s = Director::getInstance()->getWinSize();
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
 
-    Node *aParent;
-    Sprite* sprite1, *sprite2;
+    Node* aParent;
+    Sprite *sprite1, *sprite2;
     auto rot = RotateBy::create(10, 360);
     auto seq = RepeatForever::create(rot);
-    
+
     //
     // Children + Scale using Sprite
     // Test 1
     //
     aParent = Node::create();
     sprite1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
-    sprite1->setPosition( Vec2( s.width/4, s.height/4) );
-    sprite1->setScaleX( -0.5f );
-    sprite1->setScaleY( 2.0f );
+    sprite1->setPosition(Vec2(s.width / 4, s.height / 4));
+    sprite1->setScaleX(-0.5f);
+    sprite1->setScaleY(2.0f);
     sprite1->runAction(seq);
-    
-    
+
     sprite2 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
-    sprite2->setPosition( Vec2( 50,0) );
-    
+    sprite2->setPosition(Vec2(50, 0));
+
     addChild(aParent);
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2);
 
-    
     //
     // Children + Scale using SpriteBatchNode
     // Test 2
     //
-    
+
     aParent = SpriteBatchNode::create("animations/grossini_family.png");
     sprite1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
-    sprite1->setPosition( Vec2( 3*s.width/4, s.height/4) );
-    sprite1->setScaleX( -0.5f );
-    sprite1->setScaleY( 2.0f );
-    sprite1->runAction( seq->clone() );
-    
+    sprite1->setPosition(Vec2(3 * s.width / 4, s.height / 4));
+    sprite1->setScaleX(-0.5f);
+    sprite1->setScaleY(2.0f);
+    sprite1->runAction(seq->clone());
+
     sprite2 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
-    sprite2->setPosition( Vec2( 50,0) );
-    
+    sprite2->setPosition(Vec2(50, 0));
+
     addChild(aParent);
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2);
 
-    
     //
     // Children + Scale using Sprite
     // Test 3
     //
-    
+
     aParent = Node::create();
     sprite1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
-    sprite1->setPosition( Vec2( s.width/4, 2*s.height/3) );
-    sprite1->setScaleX( 1.5f );
-    sprite1->setScaleY( -0.5f );
-    sprite1->runAction( seq->clone() );
-    
+    sprite1->setPosition(Vec2(s.width / 4, 2 * s.height / 3));
+    sprite1->setScaleX(1.5f);
+    sprite1->setScaleY(-0.5f);
+    sprite1->runAction(seq->clone());
+
     sprite2 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
-    sprite2->setPosition( Vec2( 50,0) );
-    
+    sprite2->setPosition(Vec2(50, 0));
+
     addChild(aParent);
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2);
-    
+
     //
     // Children + Scale using Sprite
     // Test 4
     //
-    
+
     aParent = SpriteBatchNode::create("animations/grossini_family.png");
     sprite1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
-    sprite1->setPosition( Vec2( 3*s.width/4, 2*s.height/3) );
-    sprite1->setScaleX( 1.5f );
-    sprite1->setScaleY( -0.5f);
-    sprite1->runAction( seq->clone() );
-    
+    sprite1->setPosition(Vec2(3 * s.width / 4, 2 * s.height / 3));
+    sprite1->setScaleX(1.5f);
+    sprite1->setScaleY(-0.5f);
+    sprite1->runAction(seq->clone());
+
     sprite2 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
-    sprite2->setPosition( Vec2( 50,0) );
-    
+    sprite2->setPosition(Vec2(50, 0));
+
     addChild(aParent);
     aParent->addChild(sprite1);
     sprite1->addChild(sprite2);
-    
 }
 
 std::string SpriteBatchNodeChildrenScale::title() const
@@ -3093,72 +3048,70 @@ std::string SpriteBatchNodeChildrenScale::subtitle() const
 //------------------------------------------------------------------
 SpriteChildrenChildren::SpriteChildrenChildren()
 {
-    auto s = Director::getInstance()->getWinSize();        
-    
+    auto s = Director::getInstance()->getWinSize();
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/ghosts.plist");
-    
-    Node *aParent;
+
+    Node* aParent;
     Sprite *l1, *l2a, *l2b, *l3a1, *l3a2, *l3b1, *l3b2;
     auto rot = RotateBy::create(10, 360);
     auto seq = RepeatForever::create(rot);
-    
-    auto rot_back = rot->reverse();
+
+    auto rot_back    = rot->reverse();
     auto rot_back_fe = RepeatForever::create(rot_back);
-    
+
     //
     // SpriteBatchNode: 3 levels of children
     //
-    
+
     aParent = Node::create();
     addChild(aParent);
-    
+
     // parent
     l1 = Sprite::createWithSpriteFrameName("father.gif");
-    l1->setPosition( Vec2( s.width/2, s.height/2) );
-    l1->runAction( seq->clone() );
+    l1->setPosition(Vec2(s.width / 2, s.height / 2));
+    l1->runAction(seq->clone());
     aParent->addChild(l1);
     auto l1Size = l1->getContentSize();
-    
+
     // child left
     l2a = Sprite::createWithSpriteFrameName("sister1.gif");
-    l2a->setPosition( Vec2( -50 + l1Size.width/2, 0 + l1Size.height/2) );
-    l2a->runAction( rot_back_fe->clone() );
+    l2a->setPosition(Vec2(-50 + l1Size.width / 2, 0 + l1Size.height / 2));
+    l2a->runAction(rot_back_fe->clone());
     l1->addChild(l2a);
-    auto l2aSize = l2a->getContentSize();        
-    
-    
+    auto l2aSize = l2a->getContentSize();
+
     // child right
     l2b = Sprite::createWithSpriteFrameName("sister2.gif");
-    l2b->setPosition( Vec2( +50 + l1Size.width/2, 0 + l1Size.height/2) );
-    l2b->runAction( rot_back_fe->clone() );
+    l2b->setPosition(Vec2(+50 + l1Size.width / 2, 0 + l1Size.height / 2));
+    l2b->runAction(rot_back_fe->clone());
     l1->addChild(l2b);
-    auto l2bSize = l2a->getContentSize();        
-    
-    
+    auto l2bSize = l2a->getContentSize();
+
     // child left bottom
     l3a1 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3a1->setScale( 0.45f );
-    l3a1->setPosition( Vec2(0+l2aSize.width/2,-100+l2aSize.height/2) );
+    l3a1->setScale(0.45f);
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, -100 + l2aSize.height / 2));
     l2a->addChild(l3a1);
-    
+
     // child left top
     l3a2 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3a2->setScale( 0.45f );
-    l3a1->setPosition( Vec2(0+l2aSize.width/2,+100+l2aSize.height/2) );
+    l3a2->setScale(0.45f);
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, +100 + l2aSize.height / 2));
     l2a->addChild(l3a2);
-    
+
     // child right bottom
     l3b1 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3b1->setScale( 0.45f);
-    l3b1->setFlippedY( true );
-    l3b1->setPosition( Vec2(0+l2bSize.width/2,-100+l2bSize.height/2) );
+    l3b1->setScale(0.45f);
+    l3b1->setFlippedY(true);
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, -100 + l2bSize.height / 2));
     l2b->addChild(l3b1);
-    
+
     // child right top
     l3b2 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3b2->setScale( 0.45f );
-    l3b2->setFlippedY( true );
-    l3b1->setPosition( Vec2(0+l2bSize.width/2,+100+l2bSize.height/2) );
+    l3b2->setScale(0.45f);
+    l3b2->setFlippedY(true);
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, +100 + l2bSize.height / 2));
     l2b->addChild(l3b2);
 }
 
@@ -3172,7 +3125,6 @@ std::string SpriteChildrenChildren::subtitle() const
     return "multiple levels of children";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteBatchNodeChildrenChildren
@@ -3181,76 +3133,73 @@ std::string SpriteChildrenChildren::subtitle() const
 
 SpriteBatchNodeChildrenChildren::SpriteBatchNodeChildrenChildren()
 {
-    auto s = Director::getInstance()->getWinSize();        
-    
+    auto s = Director::getInstance()->getWinSize();
+
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/ghosts.plist");
-    
-    SpriteBatchNode *aParent;
+
+    SpriteBatchNode* aParent;
     Sprite *l1, *l2a, *l2b, *l3a1, *l3a2, *l3b1, *l3b2;
     auto rot = RotateBy::create(10, 360);
     auto seq = RepeatForever::create(rot);
-    
-    auto rot_back = rot->reverse();
+
+    auto rot_back    = rot->reverse();
     auto rot_back_fe = RepeatForever::create(rot_back);
-    
+
     //
     // SpriteBatchNode: 3 levels of children
     //
-    
+
     aParent = SpriteBatchNode::create("animations/ghosts.png");
-    //TODO: minggo
-//    aParent->getTexture()->generateMipmap();
+    // TODO: minggo
+    //    aParent->getTexture()->generateMipmap();
     addChild(aParent);
-    
+
     // parent
     l1 = Sprite::createWithSpriteFrameName("father.gif");
-    l1->setPosition( Vec2( s.width/2, s.height/2) );
-    l1->runAction( seq->clone() );
+    l1->setPosition(Vec2(s.width / 2, s.height / 2));
+    l1->runAction(seq->clone());
     aParent->addChild(l1);
     auto l1Size = l1->getContentSize();
 
     // child left
     l2a = Sprite::createWithSpriteFrameName("sister1.gif");
-    l2a->setPosition( Vec2( -50 + l1Size.width/2, 0 + l1Size.height/2) );
-    l2a->runAction( rot_back_fe->clone() );
+    l2a->setPosition(Vec2(-50 + l1Size.width / 2, 0 + l1Size.height / 2));
+    l2a->runAction(rot_back_fe->clone());
     l1->addChild(l2a);
-    auto l2aSize = l2a->getContentSize();        
-
+    auto l2aSize = l2a->getContentSize();
 
     // child right
     l2b = Sprite::createWithSpriteFrameName("sister2.gif");
-    l2b->setPosition( Vec2( +50 + l1Size.width/2, 0 + l1Size.height/2) );
-    l2b->runAction( rot_back_fe->clone() );
+    l2b->setPosition(Vec2(+50 + l1Size.width / 2, 0 + l1Size.height / 2));
+    l2b->runAction(rot_back_fe->clone());
     l1->addChild(l2b);
-    auto l2bSize = l2a->getContentSize();        
+    auto l2bSize = l2a->getContentSize();
 
-    
     // child left bottom
     l3a1 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3a1->setScale( 0.45f );
-    l3a1->setPosition( Vec2(0+l2aSize.width/2,-100+l2aSize.height/2) );
+    l3a1->setScale(0.45f);
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, -100 + l2aSize.height / 2));
     l2a->addChild(l3a1);
-    
+
     // child left top
     l3a2 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3a2->setScale( 0.45f );
-    l3a1->setPosition( Vec2(0+l2aSize.width/2,+100+l2aSize.height/2) );
+    l3a2->setScale(0.45f);
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, +100 + l2aSize.height / 2));
     l2a->addChild(l3a2);
-    
+
     // child right bottom
     l3b1 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3b1->setScale( 0.45f );
-    l3b1->setFlippedY( true );
-    l3b1->setPosition( Vec2(0+l2bSize.width/2,-100+l2bSize.height/2) );
+    l3b1->setScale(0.45f);
+    l3b1->setFlippedY(true);
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, -100 + l2bSize.height / 2));
     l2b->addChild(l3b1);
 
     // child right top
     l3b2 = Sprite::createWithSpriteFrameName("child1.gif");
-    l3b2->setScale( 0.45f );
-    l3b2->setFlippedY( true );
-    l3b1->setPosition( Vec2(0+l2bSize.width/2,+100+l2bSize.height/2) );
+    l3b2->setScale(0.45f);
+    l3b2->setFlippedY(true);
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, +100 + l2bSize.height / 2));
     l2b->addChild(l3b2);
-    
 }
 
 std::string SpriteBatchNodeChildrenChildren::title() const
@@ -3280,17 +3229,18 @@ SpriteBatchNodeSkewNegativeScaleChildren::SpriteBatchNodeSkewNegativeScaleChildr
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
 
-    for(int i=0;i<2;i++) {
+    for (int i = 0; i < 2; i++)
+    {
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2( s.width/4*(i+1), s.height/2));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
 
         // Skew
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
-        if(i == 1)
+        if (i == 1)
         {
             sprite->setScale(-1.0f);
         }
@@ -3339,17 +3289,18 @@ SpriteSkewNegativeScaleChildren::SpriteSkewNegativeScaleChildren()
     auto parent = Node::create();
     addChild(parent);
 
-    for(int i=0;i<2;i++) {
+    for (int i = 0; i < 2; i++)
+    {
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2( s.width/4*(i+1), s.height/2));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
 
         // Skew
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
-        if(i == 1)
+        if (i == 1)
         {
             sprite->setScale(-1.0f);
         }
@@ -3396,21 +3347,21 @@ SpriteNilTexture::SpriteNilTexture()
     auto s = Director::getInstance()->getWinSize();
 
     Sprite* sprite = nullptr;
-    
+
     // TEST: If no texture is given, then Opacity + Color should work.
 
     sprite = Sprite::create();
-    sprite->setTextureRect( Rect(0, 0, 300,300) );
+    sprite->setTextureRect(Rect(0, 0, 300, 300));
     sprite->setColor(Color3B::RED);
     sprite->setOpacity(128);
-    sprite->setPosition(Vec2(3*s.width/4, s.height/2));
+    sprite->setPosition(Vec2(3 * s.width / 4, s.height / 2));
     addChild(sprite, 100);
 
     sprite = Sprite::create();
-    sprite->setTextureRect(Rect(0.0f, 0.0f, 300.0f,300.0f));
+    sprite->setTextureRect(Rect(0.0f, 0.0f, 300.0f, 300.0f));
     sprite->setColor(Color3B::BLUE);
     sprite->setOpacity(128);
-    sprite->setPosition(Vec2(1*s.width/4, s.height/2));
+    sprite->setPosition(Vec2(1 * s.width / 4, s.height / 2));
     addChild(sprite, 100);
 }
 
@@ -3429,7 +3380,7 @@ class MySprite1 : public Sprite
 public:
     CREATE_FUNC(MySprite1);
     MySprite1() {}
-    static MySprite1* createWithSpriteFrameName(const std::string& spriteFrameName)
+    static MySprite1* createWithSpriteFrameName(std::string_view spriteFrameName)
     {
         auto sprite = MySprite1::create();
         sprite->setSpriteFrame(spriteFrameName);
@@ -3442,10 +3393,10 @@ class MySprite2 : public Sprite
 public:
     CREATE_FUNC(MySprite2);
     MySprite2() {}
-    static MySprite2* create(const std::string& name)
+    static MySprite2* create(std::string_view name)
     {
         auto sprite = MySprite2::create();
-        sprite ->setTexture(name);
+        sprite->setTexture(name);
         return sprite;
     }
 };
@@ -3463,15 +3414,15 @@ SpriteSubclass::SpriteSubclass()
     auto aParent = SpriteBatchNode::create("animations/ghosts.png");
 
     // MySprite1
-    MySprite1 *sprite = MySprite1::createWithSpriteFrameName("father.gif");
-    sprite->setPosition(Vec2( s.width/4*1, s.height/2));
+    MySprite1* sprite = MySprite1::createWithSpriteFrameName("father.gif");
+    sprite->setPosition(Vec2(s.width / 4 * 1, s.height / 2));
     aParent->addChild(sprite);
     addChild(aParent);
 
     // MySprite2
-    MySprite2 *sprite2 = MySprite2::create("Images/grossini.png");
+    MySprite2* sprite2 = MySprite2::create("Images/grossini.png");
     addChild(sprite2);
-    sprite2->setPosition(Vec2(s.width/4*3, s.height/2));
+    sprite2->setPosition(Vec2(s.width / 4 * 3, s.height / 2));
 }
 
 std::string SpriteSubclass::title() const
@@ -3501,9 +3452,9 @@ AnimationCacheTest::AnimationCacheTest()
     //
     Vector<SpriteFrame*> animFrames(15);
     char str[100] = {0};
-    for(int i = 1; i < 15; i++)
+    for (int i = 1; i < 15; i++)
     {
-        sprintf(str, "grossini_dance_%02d.png",i);
+        sprintf(str, "grossini_dance_%02d.png", i);
         auto frame = frameCache->getSpriteFrameByName(str);
         animFrames.pushBack(frame);
     }
@@ -3518,9 +3469,9 @@ AnimationCacheTest::AnimationCacheTest()
     //
     animFrames.clear();
 
-    for(int i = 1; i < 15; i++)
+    for (int i = 1; i < 15; i++)
     {
-        sprintf(str, "grossini_dance_gray_%02d.png",i);
+        sprintf(str, "grossini_dance_gray_%02d.png", i);
         auto frame = frameCache->getSpriteFrameByName(str);
         animFrames.pushBack(frame);
     }
@@ -3535,9 +3486,9 @@ AnimationCacheTest::AnimationCacheTest()
     //
     animFrames.clear();
 
-    for(int i = 1; i < 4; i++)
+    for (int i = 1; i < 4; i++)
     {
-        sprintf(str, "grossini_blue_%02d.png",i);
+        sprintf(str, "grossini_blue_%02d.png", i);
         auto frame = frameCache->getSpriteFrameByName(str);
         animFrames.pushBack(frame);
     }
@@ -3547,7 +3498,6 @@ AnimationCacheTest::AnimationCacheTest()
     // Add an animation to the Cache
     AnimationCache::getInstance()->addAnimation(animation, "dance_blue");
 
-
     auto animCache = AnimationCache::getInstance();
 
     auto normal = animCache->getAnimation("dance");
@@ -3565,11 +3515,11 @@ AnimationCacheTest::AnimationCacheTest()
 
     // create an sprite without texture
     auto grossini = Sprite::create();
-    auto frame = frameCache->getSpriteFrameByName("grossini_dance_01.png");
+    auto frame    = frameCache->getSpriteFrameByName("grossini_dance_01.png");
     grossini->setSpriteFrame(frame);
 
     auto winSize = Director::getInstance()->getWinSize();
-    grossini->setPosition(Vec2(winSize.width/2, winSize.height/2));
+    grossini->setPosition(Vec2(winSize.width / 2, winSize.height / 2));
     addChild(grossini);
 
     // run the animation
@@ -3596,7 +3546,6 @@ std::string AnimationCacheTest::subtitle() const
 
 // AnimationCacheFile
 
-
 AnimationCacheFile::AnimationCacheFile()
 {
     auto frameCache = SpriteFrameCache::getInstance();
@@ -3604,7 +3553,6 @@ AnimationCacheFile::AnimationCacheFile()
     frameCache->addSpriteFramesWithFile("animations/grossini_gray.plist");
     frameCache->addSpriteFramesWithFile("animations/grossini_blue.plist");
 
-
     // Purge previously loaded animation
     AnimationCache::destroyInstance();
 
@@ -3613,7 +3561,6 @@ AnimationCacheFile::AnimationCacheFile()
     // Add an animation to the Cache
     animCache->addAnimationsWithFile("animations/animations.plist");
 
-
     auto normal = animCache->getAnimation("dance_1");
     normal->setRestoreOriginalFrame(true);
     auto dance_grey = animCache->getAnimation("dance_2");
@@ -3635,11 +3582,10 @@ AnimationCacheFile::AnimationCacheFile()
 
     auto winSize = Director::getInstance()->getWinSize();
 
-    grossini->setPosition(Vec2(winSize.width/2, winSize.height/2));
+    grossini->setPosition(Vec2(winSize.width / 2, winSize.height / 2));
 
     addChild(grossini);
 
-
     // run the animation
     grossini->runAction(seq);
 }
@@ -3676,11 +3622,11 @@ SpriteBatchBug1217::SpriteBatchBug1217()
     s2->setColor(Color3B(0, 255, 0));
     s3->setColor(Color3B(0, 0, 255));
 
-    s1->setPosition(Vec2(20.0f,200.0f));
-    s2->setPosition(Vec2(100.0f,0.0f));
-    s3->setPosition(Vec2(100.0f,0.0f));
+    s1->setPosition(Vec2(20.0f, 200.0f));
+    s2->setPosition(Vec2(100.0f, 0.0f));
+    s3->setPosition(Vec2(100.0f, 0.0f));
 
-    bn->setPosition(Vec2(0.0f,0.0f));
+    bn->setPosition(Vec2(0.0f, 0.0f));
 
     //!!!!!
     s1->addChild(s2);
@@ -3702,11 +3648,11 @@ std::string SpriteBatchBug1217::subtitle() const
 
 //
 // SpriteOffsetAnchorSkew
-// 
+//
 SpriteOffsetAnchorSkew::SpriteOffsetAnchorSkew()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
@@ -3742,7 +3688,7 @@ SpriteOffsetAnchorSkew::SpriteOffsetAnchorSkew()
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", j + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -3751,9 +3697,9 @@ SpriteOffsetAnchorSkew::SpriteOffsetAnchorSkew()
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
@@ -3782,15 +3728,15 @@ std::string SpriteOffsetAnchorSkew::subtitle() const
 
 //
 // SpriteBatchNodeOffsetAnchorSkew
-// 
+//
 SpriteBatchNodeOffsetAnchorSkew::SpriteBatchNodeOffsetAnchorSkew()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
 
@@ -3816,16 +3762,16 @@ SpriteBatchNodeOffsetAnchorSkew::SpriteBatchNodeOffsetAnchorSkew()
             sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT );
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
             break;
         }
 
         point->setPosition(sprite->getPosition());
-        
+
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", j + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -3834,9 +3780,9 @@ SpriteBatchNodeOffsetAnchorSkew::SpriteBatchNodeOffsetAnchorSkew()
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
@@ -3869,7 +3815,7 @@ std::string SpriteBatchNodeOffsetAnchorSkew::subtitle() const
 SpriteOffsetAnchorSkewScale::SpriteOffsetAnchorSkewScale()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
@@ -3896,7 +3842,7 @@ SpriteOffsetAnchorSkewScale::SpriteOffsetAnchorSkewScale()
             sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT );
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
             break;
         }
 
@@ -3905,7 +3851,7 @@ SpriteOffsetAnchorSkewScale::SpriteOffsetAnchorSkewScale()
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", j + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -3915,18 +3861,18 @@ SpriteOffsetAnchorSkewScale::SpriteOffsetAnchorSkewScale()
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
         // Skew
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
 
         // Scale
-        auto scale = ScaleBy::create(2, 2);
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_scale));
 
         addChild(sprite, 0);
@@ -3955,11 +3901,11 @@ std::string SpriteOffsetAnchorSkewScale::subtitle() const
 SpriteBatchNodeOffsetAnchorSkewScale::SpriteBatchNodeOffsetAnchorSkewScale()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
 
@@ -3985,16 +3931,16 @@ SpriteBatchNodeOffsetAnchorSkewScale::SpriteBatchNodeOffsetAnchorSkewScale()
             sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT );
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
             break;
         }
 
-        point->setPosition(sprite->getPosition());        
+        point->setPosition(sprite->getPosition());
 
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", j + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -4004,18 +3950,18 @@ SpriteBatchNodeOffsetAnchorSkewScale::SpriteBatchNodeOffsetAnchorSkewScale()
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
         // skew
-        auto skewX = SkewBy::create(2, 45, 0);
+        auto skewX      = SkewBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = SkewBy::create(2, 0, 45);
+        auto skewY      = SkewBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
 
-        // scale 
-        auto scale = ScaleBy::create(2, 2);
+        // scale
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_scale));
 
         spritebatch->addChild(sprite, i);
@@ -4039,14 +3985,13 @@ std::string SpriteBatchNodeOffsetAnchorSkewScale::subtitle() const
     return "anchor + skew + scale";
 }
 
-
 //
 // SpriteOffsetAnchorFlip
-// 
+//
 SpriteOffsetAnchorFlip::SpriteOffsetAnchorFlip()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
@@ -4073,7 +4018,7 @@ SpriteOffsetAnchorFlip::SpriteOffsetAnchorFlip()
             sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT );
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
             break;
         }
 
@@ -4082,7 +4027,7 @@ SpriteOffsetAnchorFlip::SpriteOffsetAnchorFlip()
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", i + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -4091,10 +4036,10 @@ SpriteOffsetAnchorFlip::SpriteOffsetAnchorFlip()
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
-        auto flip = FlipY::create(true);
+        auto flip      = FlipY::create(true);
         auto flip_back = FlipY::create(false);
-        auto delay = DelayTime::create(1);
-        auto seq = Sequence::create(delay, flip, delay->clone(), flip_back, nullptr);
+        auto delay     = DelayTime::create(1);
+        auto seq       = Sequence::create(delay, flip, delay->clone(), flip_back, nullptr);
         sprite->runAction(RepeatForever::create(seq));
 
         addChild(sprite, 0);
@@ -4120,16 +4065,16 @@ std::string SpriteOffsetAnchorFlip::subtitle() const
 
 //
 // SpriteBatchNodeOffsetAnchorFlip
-// 
+//
 
 SpriteBatchNodeOffsetAnchorFlip::SpriteBatchNodeOffsetAnchorFlip()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
 
@@ -4155,16 +4100,16 @@ SpriteBatchNodeOffsetAnchorFlip::SpriteBatchNodeOffsetAnchorFlip()
             sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             break;
         case 2:
-            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT );
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
             break;
         }
 
-        point->setPosition(sprite->getPosition());        
+        point->setPosition(sprite->getPosition());
 
         Vector<SpriteFrame*> animFrames(14);
         char tmp[50];
         for (int j = 0; j < 14; j++)
-        {            
+        {
             sprintf(tmp, "grossini_dance_%02d.png", i + 1);
             auto frame = cache->getSpriteFrameByName(tmp);
             animFrames.pushBack(frame);
@@ -4173,10 +4118,10 @@ SpriteBatchNodeOffsetAnchorFlip::SpriteBatchNodeOffsetAnchorFlip()
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
 
-        auto flip = FlipY::create(true);
+        auto flip      = FlipY::create(true);
         auto flip_back = FlipY::create(false);
-        auto delay = DelayTime::create(1);
-        auto seq = Sequence::create(delay, flip, delay->clone(), flip_back, nullptr);
+        auto delay     = DelayTime::create(1);
+        auto seq       = Sequence::create(delay, flip, delay->clone(), flip_back, nullptr);
         sprite->runAction(RepeatForever::create(seq));
 
         spritebatch->addChild(sprite, i);
@@ -4200,7 +4145,6 @@ std::string SpriteBatchNodeOffsetAnchorFlip::subtitle() const
     return "issue #1078: offset + anchor + flip";
 }
 
-
 /// NodeSort
 
 NodeSort::NodeSort()
@@ -4246,20 +4190,22 @@ void NodeSort::reorderSprite(float dt)
     unschedule("reorder_sprite_key");
 
     log("Before reorder--");
-    
+
     auto& children = _node->getChildren();
-    
-    for(const auto &child : children) {
-        log("tag %i z %i",(int)child->getTag(),(int)child->getLocalZOrder());
+
+    for (const auto& child : children)
+    {
+        log("tag %i z %i", (int)child->getTag(), (int)child->getLocalZOrder());
     }
-    //z-4
-    _node->reorderChild( _node->getChildren().at(0), -6);
+    // z-4
+    _node->reorderChild(_node->getChildren().at(0), -6);
 
     _node->sortAllChildren();
-    
+
     log("After reorder--");
-    for(const auto &child : children) {
-        log("tag %i z %i",(int)child->getTag(),(int)child->getLocalZOrder());
+    for (const auto& child : children)
+    {
+        log("tag %i z %i", (int)child->getTag(), (int)child->getLocalZOrder());
     }
 }
 
@@ -4269,27 +4215,26 @@ SpriteBatchNodeReorderSameIndex::SpriteBatchNodeReorderSameIndex()
     _batchNode = SpriteBatchNode::create("Images/piece.png", 15);
     addChild(_batchNode, 1, 0);
 
-    _sprite1 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f,0.0f,64.0f,64.0f));
-    _sprite1->setPosition(Vec2(100.0f,160.0f));
+    _sprite1 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f, 0.0f, 64.0f, 64.0f));
+    _sprite1->setPosition(Vec2(100.0f, 160.0f));
     _batchNode->addChild(_sprite1, 3, 1);
 
-    _sprite2= Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f,0.0f,64.0f,64.0f));
-    _sprite2->setPosition(Vec2(164.0f,160.0f));
+    _sprite2 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f, 0.0f, 64.0f, 64.0f));
+    _sprite2->setPosition(Vec2(164.0f, 160.0f));
     _batchNode->addChild(_sprite2, 4, 2);
 
-    _sprite3 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f,0.0f,64.0f,64.0f));
-    _sprite3->setPosition(Vec2(228.0f,160.0f));
+    _sprite3 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f, 0.0f, 64.0f, 64.0f));
+    _sprite3->setPosition(Vec2(228.0f, 160.0f));
     _batchNode->addChild(_sprite3, 4, 3);
 
-    _sprite4 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f,0.0f,64.0f,64.0f));
-    _sprite4->setPosition(Vec2(292.0f,160.0f));
+    _sprite4 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f, 0.0f, 64.0f, 64.0f));
+    _sprite4->setPosition(Vec2(292.0f, 160.0f));
     _batchNode->addChild(_sprite4, 5, 4);
 
-    _sprite5 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f,0.0f,64.0f,64.0f));
-    _sprite5->setPosition(Vec2(356.0f,160.0f));
+    _sprite5 = Sprite::createWithTexture(_batchNode->getTexture(), Rect(128.0f, 0.0f, 64.0f, 64.0f));
+    _sprite5->setPosition(Vec2(356.0f, 160.0f));
     _batchNode->addChild(_sprite5, 6, 5);
 
-
     scheduleOnce(CC_CALLBACK_1(SpriteBatchNodeReorderSameIndex::reorderSprite, this), 2, "reorder_sprite_key");
 }
 
@@ -4311,8 +4256,9 @@ void SpriteBatchNodeReorderSameIndex::reorderSprite(float dt)
 
     _batchNode->sortAllChildren();
 
-    for(const auto &sprite : _batchNode->getDescendants()) {
-        log("tag %i", sprite->getTag() );
+    for (const auto& sprite : _batchNode->getDescendants())
+    {
+        log("tag %i", sprite->getTag());
     }
 }
 
@@ -4323,7 +4269,7 @@ SpriteBatchNodeReorderOneChild::SpriteBatchNodeReorderOneChild()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/ghosts.plist");
 
-    SpriteBatchNode *aParent;
+    SpriteBatchNode* aParent;
     Sprite *l1, *l2a, *l2b, *l3a1, *l3a2, *l3b1, *l3b2;
 
     //
@@ -4338,37 +4284,35 @@ SpriteBatchNodeReorderOneChild::SpriteBatchNodeReorderOneChild()
 
     // parent
     l1 = Sprite::createWithSpriteFrameName("father.gif");
-    l1->setPosition(Vec2( s.width/2, s.height/2));
+    l1->setPosition(Vec2(s.width / 2, s.height / 2));
 
     aParent->addChild(l1);
     auto l1Size = l1->getContentSize();
 
     // child left
     l2a = Sprite::createWithSpriteFrameName("sister1.gif");
-    l2a->setPosition(Vec2( -10 + l1Size.width/2, 0 + l1Size.height/2));
+    l2a->setPosition(Vec2(-10 + l1Size.width / 2, 0 + l1Size.height / 2));
 
     l1->addChild(l2a, 1);
     auto l2aSize = l2a->getContentSize();
 
-
     // child right
     l2b = Sprite::createWithSpriteFrameName("sister2.gif");
-    l2b->setPosition(Vec2( +50 + l1Size.width/2, 0 + l1Size.height/2));
+    l2b->setPosition(Vec2(+50 + l1Size.width / 2, 0 + l1Size.height / 2));
 
     l1->addChild(l2b, 2);
     auto l2bSize = l2a->getContentSize();
 
-
     // child left bottom
     l3a1 = Sprite::createWithSpriteFrameName("child1.gif");
     l3a1->setScale(0.45f);
-    l3a1->setPosition(Vec2(0+l2aSize.width/2,-50+l2aSize.height/2));
+    l3a1->setPosition(Vec2(0 + l2aSize.width / 2, -50 + l2aSize.height / 2));
     l2a->addChild(l3a1, 1);
 
     // child left top
     l3a2 = Sprite::createWithSpriteFrameName("child1.gif");
     l3a2->setScale(0.45f);
-    l3a2->setPosition(Vec2(0+l2aSize.width/2,+50+l2aSize.height/2));
+    l3a2->setPosition(Vec2(0 + l2aSize.width / 2, +50 + l2aSize.height / 2));
     l2a->addChild(l3a2, 2);
 
     _reorderSprite = l2a;
@@ -4377,14 +4321,14 @@ SpriteBatchNodeReorderOneChild::SpriteBatchNodeReorderOneChild()
     l3b1 = Sprite::createWithSpriteFrameName("child1.gif");
     l3b1->setScale(0.45f);
     l3b1->setFlippedY(true);
-    l3b1->setPosition(Vec2(0+l2bSize.width/2,-50+l2bSize.height/2));
+    l3b1->setPosition(Vec2(0 + l2bSize.width / 2, -50 + l2bSize.height / 2));
     l2b->addChild(l3b1);
 
     // child right top
     l3b2 = Sprite::createWithSpriteFrameName("child1.gif");
     l3b2->setScale(0.45f);
     l3b2->setFlippedY(true);
-    l3b2->setPosition(Vec2(0+l2bSize.width/2,+50+l2bSize.height/2));
+    l3b2->setPosition(Vec2(0 + l2bSize.width / 2, +50 + l2bSize.height / 2));
     l2b->addChild(l3b2);
 
     scheduleOnce(CC_CALLBACK_1(SpriteBatchNodeReorderOneChild::reorderSprite, this), 2.0f, "reorder_sprite_key");
@@ -4395,8 +4339,8 @@ void SpriteBatchNodeReorderOneChild::reorderSprite(float dt)
     _reorderSprite->getParent()->reorderChild(_reorderSprite, -1);
 
     _batchNode->sortAllChildren();
-    //CCSprite* child;
-    //CCARRAY_FOREACH(batchNode.descendants,child) NSLog(@"tag %i",child.tag);
+    // CCSprite* child;
+    // CCARRAY_FOREACH(batchNode.descendants,child) NSLog(@"tag %i",child.tag);
 }
 
 std::string SpriteBatchNodeReorderOneChild::title() const
@@ -4410,59 +4354,59 @@ std::string SpriteBatchNodeReorderOneChild::title() const
 SpriteOffsetAnchorRotationalSkew::SpriteOffsetAnchorRotationalSkew()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
-    for(int i=0;i<3;i++)
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite batch
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-                            
+
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
-        switch(i)
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-                break;
-            case 1:
-                sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-                break;
-            case 2:
-                sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
+
         point->setPosition(sprite->getPosition());
-        
+
         Vector<SpriteFrame*> animFrames(14);
-        for(int i = 0; i < 14; i++)
+        for (int i = 0; i < 14; i++)
         {
             char pngName[30];
-            snprintf(pngName, 30, "grossini_dance_%02d.png", (i+1));
+            snprintf(pngName, 30, "grossini_dance_%02d.png", (i + 1));
             auto frame = cache->getSpriteFrameByName(pngName);
             animFrames.pushBack(frame);
         }
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
-        
-        auto skewX = RotateBy::create(2, 45, 0);
+
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
-        
+
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
-        
+
         addChild(sprite, 0);
     }
 }
@@ -4490,62 +4434,62 @@ std::string SpriteOffsetAnchorRotationalSkew::subtitle() const
 SpriteBatchNodeOffsetAnchorRotationalSkew::SpriteBatchNodeOffsetAnchorRotationalSkew()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
-    
-    for(int i=0;i<3;i++)
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite batch
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        
+
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
-        switch(i)
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-                break;
-            case 1:
-                sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-                break;
-            case 2:
-                sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
+
         point->setPosition(sprite->getPosition());
-        
+
         Vector<SpriteFrame*> animFrames(14);
-        for(int j = 0; j < 14; j++)
+        for (int j = 0; j < 14; j++)
         {
             char pngName[30];
-            snprintf(pngName, 30, "grossini_dance_%02d.png", (j+1));
+            snprintf(pngName, 30, "grossini_dance_%02d.png", (j + 1));
             auto frame = cache->getSpriteFrameByName(pngName);
             animFrames.pushBack(frame);
         }
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
-        
-        auto skewX = RotateBy::create(2, 45, 0);
+
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
-        
+
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
-        
+
         spritebatch->addChild(sprite, 0);
     }
 }
@@ -4573,66 +4517,66 @@ std::string SpriteBatchNodeOffsetAnchorRotationalSkew::subtitle() const
 SpriteOffsetAnchorRotationalSkewScale::SpriteOffsetAnchorRotationalSkewScale()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
-    for(int i=0;i<3;i++)
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite batch
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        
+
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
-        switch(i)
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-                break;
-            case 1:
-                sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-                break;
-            case 2:
-                sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
+
         point->setPosition(sprite->getPosition());
-        
+
         Vector<SpriteFrame*> animFrames(14);
-        for(int j = 0; j < 14; j++)
+        for (int j = 0; j < 14; j++)
         {
             char pngName[30];
-            snprintf(pngName, 30, "grossini_dance_%02d.png", (j+1));
+            snprintf(pngName, 30, "grossini_dance_%02d.png", (j + 1));
             auto frame = cache->getSpriteFrameByName(pngName);
             animFrames.pushBack(frame);
         }
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
-        
+
         // Skew
-        auto skewX = RotateBy::create(2, 45, 0);
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
-        
+
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
-        
+
         // Scale
-        auto scale = ScaleBy::create(2, 2);
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_scale));
-        
+
         addChild(sprite, 0);
     }
 }
@@ -4658,69 +4602,69 @@ std::string SpriteOffsetAnchorRotationalSkewScale::subtitle() const
 SpriteBatchNodeOffsetAnchorRotationalSkewScale::SpriteBatchNodeOffsetAnchorRotationalSkewScale()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto spritebatch = SpriteBatchNode::create("animations/grossini.png");
     addChild(spritebatch);
-    
-    for(int i=0;i<3;i++)
+
+    for (int i = 0; i < 3; i++)
     {
         //
         // Animation using Sprite batch
         //
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        
+
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
-        switch(i)
+
+        switch (i)
         {
-            case 0:
-                sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-                break;
-            case 1:
-                sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-                break;
-            case 2:
-                sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
-                break;
+        case 0:
+            sprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+            break;
+        case 1:
+            sprite->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
+            break;
+        case 2:
+            sprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+            break;
         }
-        
+
         point->setPosition(sprite->getPosition());
-        
+
         Vector<SpriteFrame*> animFrames(14);
-        for(int j = 0; j < 14; j++)
+        for (int j = 0; j < 14; j++)
         {
             char pngName[30];
-            snprintf(pngName, 30, "grossini_dance_%02d.png", (j+1));
+            snprintf(pngName, 30, "grossini_dance_%02d.png", (j + 1));
             auto frame = cache->getSpriteFrameByName(pngName);
             animFrames.pushBack(frame);
         }
         auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f);
         sprite->runAction(RepeatForever::create(Animate::create(animation)));
-        
+
         // Skew
-        auto skewX = RotateBy::create(2, 45, 0);
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
-        
+
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
-        
+
         // Scale
-        auto scale = ScaleBy::create(2, 2);
+        auto scale      = ScaleBy::create(2, 2);
         auto scale_back = scale->reverse();
-        auto seq_scale = Sequence::create(scale, scale_back, nullptr);
+        auto seq_scale  = Sequence::create(scale, scale_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_scale));
-        
+
         spritebatch->addChild(sprite, 0);
     }
 }
@@ -4748,46 +4692,46 @@ std::string SpriteBatchNodeOffsetAnchorRotationalSkewScale::subtitle() const
 SpriteRotationalSkewNegativeScaleChildren::SpriteRotationalSkewNegativeScaleChildren()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto parent = Node::create();
     addChild(parent);
-    
-    for(int i=0;i<2;i++)
+
+    for (int i = 0; i < 2; i++)
     {
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
-        
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
+
         auto point = Sprite::create("Images/r1.png");
-        
+
         point->setScale(0.25f);
         point->setPosition(sprite->getPosition());
         addChild(point, 1);
-        
+
         // Skew
-        auto skewX = RotateBy::create(2, 45, 0);
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
-        
+
         if (1 == 1)
         {
             sprite->setScale(-1.0f);
         }
-        
+
         auto seq_skew = Sequence::create(skewX, skewX_back, skewY, skewY_back, nullptr);
         sprite->runAction(RepeatForever::create(seq_skew));
-        
+
         auto child1 = Sprite::create("Images/grossini_dance_01.png");
-        child1->setPosition(Vec2(sprite->getContentSize().width/2.0f, sprite->getContentSize().height/2.0f));
-        
+        child1->setPosition(Vec2(sprite->getContentSize().width / 2.0f, sprite->getContentSize().height / 2.0f));
+
         sprite->addChild(child1);
-        
+
         child1->setScale(0.8f);
-        
+
         parent->addChild(sprite, 0);
     }
 }
@@ -4815,18 +4759,18 @@ std::string SpriteRotationalSkewNegativeScaleChildren::subtitle() const
 SpriteBatchNodeRotationalSkewNegativeScaleChildren::SpriteBatchNodeRotationalSkewNegativeScaleChildren()
 {
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto cache = SpriteFrameCache::getInstance();
     cache->addSpriteFramesWithFile("animations/grossini.plist");
     cache->addSpriteFramesWithFile("animations/grossini_gray.plist", "animations/grossini_gray.png");
-    
+
     auto parent = SpriteBatchNode::create("animations/grossini.png");
     addChild(parent);
-    
-    for(int i=0;i<2;i++)
+
+    for (int i = 0; i < 2; i++)
     {
         auto sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png");
-        sprite->setPosition(Vec2(s.width/4*(i+1), s.height/2));
+        sprite->setPosition(Vec2(s.width / 4 * (i + 1), s.height / 2));
 
         auto point = Sprite::create("Images/r1.png");
 
@@ -4835,9 +4779,9 @@ SpriteBatchNodeRotationalSkewNegativeScaleChildren::SpriteBatchNodeRotationalSke
         addChild(point, 1);
 
         // Skew
-        auto skewX = RotateBy::create(2, 45, 0);
+        auto skewX      = RotateBy::create(2, 45, 0);
         auto skewX_back = skewX->reverse();
-        auto skewY = RotateBy::create(2, 0, 45);
+        auto skewY      = RotateBy::create(2, 0, 45);
         auto skewY_back = skewY->reverse();
 
         if (1 == 1)
@@ -4849,7 +4793,7 @@ SpriteBatchNodeRotationalSkewNegativeScaleChildren::SpriteBatchNodeRotationalSke
         sprite->runAction(RepeatForever::create(seq_skew));
 
         auto child1 = Sprite::create("Images/grossini_dance_01.png");
-        child1->setPosition(Vec2(sprite->getContentSize().width/2.0f, sprite->getContentSize().height/2.0f));
+        child1->setPosition(Vec2(sprite->getContentSize().width / 2.0f, sprite->getContentSize().height / 2.0f));
 
         sprite->addChild(child1);
 
@@ -4859,10 +4803,7 @@ SpriteBatchNodeRotationalSkewNegativeScaleChildren::SpriteBatchNodeRotationalSke
     }
 }
 
-SpriteBatchNodeRotationalSkewNegativeScaleChildren::~SpriteBatchNodeRotationalSkewNegativeScaleChildren()
-{
-    
-}
+SpriteBatchNodeRotationalSkewNegativeScaleChildren::~SpriteBatchNodeRotationalSkewNegativeScaleChildren() {}
 
 std::string SpriteBatchNodeRotationalSkewNegativeScaleChildren::title() const
 {
@@ -4874,7 +4815,6 @@ std::string SpriteBatchNodeRotationalSkewNegativeScaleChildren::subtitle() const
     return "rot skew + negative scale with children";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteCullTest1
@@ -4883,18 +4823,18 @@ std::string SpriteBatchNodeRotationalSkewNegativeScaleChildren::subtitle() const
 
 SpriteCullTest1::SpriteCullTest1()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s        = Director::getInstance()->getWinSize();
     auto grossini = Sprite::create("Images/grossini.png");
 
-    grossini->setPosition(s.width/2, s.height/2);
+    grossini->setPosition(s.width / 2, s.height / 2);
 
-    auto right = MoveBy::create(3, Vec2(s.width*2,0.0f));
+    auto right = MoveBy::create(3, Vec2(s.width * 2, 0.0f));
     auto back1 = right->reverse();
-    auto left = MoveBy::create(3, Vec2(-s.width*2,0.0f));
+    auto left  = MoveBy::create(3, Vec2(-s.width * 2, 0.0f));
     auto back2 = left->reverse();
-    auto up = MoveBy::create(3, Vec2(0.0f,s.height*2));
+    auto up    = MoveBy::create(3, Vec2(0.0f, s.height * 2));
     auto back3 = up->reverse();
-    auto down = MoveBy::create(3, Vec2(0.0f,-s.height*2));
+    auto down  = MoveBy::create(3, Vec2(0.0f, -s.height * 2));
     auto back4 = down->reverse();
 
     auto seq = Sequence::create(right, back1, left, back2, up, back3, down, back4, nullptr);
@@ -4902,7 +4842,6 @@ SpriteCullTest1::SpriteCullTest1()
     this->addChild(grossini);
 }
 
-
 std::string SpriteCullTest1::title() const
 {
     return "Testing Culling: No Scale, No Rotation";
@@ -4913,7 +4852,6 @@ std::string SpriteCullTest1::subtitle() const
     return "Look at the GL calls";
 }
 
-
 //------------------------------------------------------------------
 //
 // SpriteCullTest2
@@ -4922,28 +4860,27 @@ std::string SpriteCullTest1::subtitle() const
 
 SpriteCullTest2::SpriteCullTest2()
 {
-    Size s = Director::getInstance()->getWinSize();
+    Size s        = Director::getInstance()->getWinSize();
     auto grossini = Sprite::create("Images/grossini.png");
 
-    grossini->setPosition(s.width/2, s.height/2);
+    grossini->setPosition(s.width / 2, s.height / 2);
 
-    auto right = MoveBy::create(3, Vec2(s.width*2,0.0f));
+    auto right = MoveBy::create(3, Vec2(s.width * 2, 0.0f));
     auto back1 = right->reverse();
-    auto left = MoveBy::create(3, Vec2(-s.width*2,0.0f));
+    auto left  = MoveBy::create(3, Vec2(-s.width * 2, 0.0f));
     auto back2 = left->reverse();
-    auto up = MoveBy::create(3, Vec2(0.0f,s.height*2));
+    auto up    = MoveBy::create(3, Vec2(0.0f, s.height * 2));
     auto back3 = up->reverse();
-    auto down = MoveBy::create(3, Vec2(0.0f,-s.height*2));
+    auto down  = MoveBy::create(3, Vec2(0.0f, -s.height * 2));
     auto back4 = down->reverse();
 
     grossini->setScale(0.1f);
-    
+
     auto seq = Sequence::create(right, back1, left, back2, up, back3, down, back4, nullptr);
     grossini->runAction(seq);
     this->addChild(grossini);
 }
 
-
 std::string SpriteCullTest2::title() const
 {
     return "Testing Culling: Scale, No Rotation";
@@ -4962,35 +4899,37 @@ std::string SpriteCullTest2::subtitle() const
 Sprite3DRotationTest::Sprite3DRotationTest()
 {
     Size s = Director::getInstance()->getWinSize();
-    
-    //Create reference sprite that's rotating based on there anchor point
+
+    // Create reference sprite that's rotating based on there anchor point
     auto s1 = Sprite::create("Images/grossini.png");
-    s1->setPosition(s.width/4, s.height/4 * 3);
+    s1->setPosition(s.width / 4, s.height / 4 * 3);
     s1->setAnchorPoint(Vec2(0.0f, 0.0f));
     s1->runAction(RepeatForever::create(RotateBy::create(6.0f, 360.0f)));
     addChild(s1);
-    
+
     auto s2 = Sprite::create("Images/grossini.png");
-    s2->setPosition(s.width/4 * 3, s.height/4 * 3);
+    s2->setPosition(s.width / 4 * 3, s.height / 4 * 3);
     s2->runAction(RepeatForever::create(RotateBy::create(6.0f, 360.0f)));
     addChild(s2);
-    
+
     sprite1 = Sprite::create("Images/grossini.png");
-    sprite1->setPosition(s.width/4, s.height/4);
-    sprite1->setAnchorPoint(Vec2(0.0f,0.0f));
-    
+    sprite1->setPosition(s.width / 4, s.height / 4);
+    sprite1->setAnchorPoint(Vec2(0.0f, 0.0f));
+
     addChild(sprite1);
-    
+
     sprite2 = Sprite::create("Images/grossini.png");
-    sprite2->setPosition(s.width/4 * 3, s.height/4);
-    
+    sprite2->setPosition(s.width / 4 * 3, s.height / 4);
+
     addChild(sprite2);
-    
-    schedule([&](float dt) {
-        rotation.y += 1;
-        sprite1->setRotation3D(rotation);
-        sprite2->setRotation3D(rotation);
-    }, "update_key");
+
+    schedule(
+        [&](float dt) {
+            rotation.y += 1;
+            sprite1->setRotation3D(rotation);
+            sprite2->setRotation3D(rotation);
+        },
+        "update_key");
 }
 
 //------------------------------------------------------------------
@@ -5005,27 +4944,26 @@ SpriteGetSpriteFrameTest::SpriteGetSpriteFrameTest()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s1 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s1);
     s1->getTexture()->setAliasTexParameters();
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setContentSize(s1->getContentSize()*2);
+    s1->setContentSize(s1->getContentSize() * 2);
     s1->setSpriteFrame(s1->getSpriteFrame());
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s2 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s2);
-    s2->setPosition(s.width*2/4, s.height/2);
+    s2->setPosition(s.width * 2 / 4, s.height / 2);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s3);
-    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128,0,64,128)));
-    s3->setPosition(s.width/2+s.width/3, s.height/2);
+    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128, 0, 64, 128)));
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     s3->setSpriteFrame(s3->getSpriteFrame());
 }
@@ -5042,35 +4980,36 @@ SpriteSlice9Test1::SpriteSlice9Test1()
 
     Size s = Director::getInstance()->getWinSize();
 
-    for (int i=2; i>0; --i)
+    for (int i = 2; i > 0; --i)
     {
         auto s1 = Sprite::create("Images/grossinis_sister1.png");
         addChild(s1);
-        s1->setPosition(s.width*1/4, s.height*i/3);
+        s1->setPosition(s.width * 1 / 4, s.height * i / 3);
         s1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
         s1->setContentSize(Size(s1->getContentSize().width, 200.0f));
         auto action1 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s1->runAction(action1);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s2 = Sprite::create("Images/grossinis_sister1.png");
         addChild(s2);
-        s2->setPosition(s.width*2/4, s.height*i/3);
+        s2->setPosition(s.width * 2 / 4, s.height * i / 3);
         s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s2->setContentSize(Size(s2->getContentSize().width, 200.0f));
         auto action2 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s2->runAction(action2);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s3 = Sprite::create("Images/grossinis_sister1.png");
         addChild(s3);
-        s3->setPosition(s.width*3/4, s.height*i/3);
+        s3->setPosition(s.width * 3 / 4, s.height * i / 3);
         s3->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
         s3->setContentSize(Size(s3->getContentSize().width, 200.0f));
         auto action3 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s3->runAction(action3);
 
-        if (i==2) {
+        if (i == 2)
+        {
             s3->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
             s2->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
             s1->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
@@ -5079,7 +5018,7 @@ SpriteSlice9Test1::SpriteSlice9Test1()
         // "anchor points"
         auto point = Sprite::create("Images/r1.png");
         point->setScale(0.25f);
-        point->setPosition( s1->getPosition() );
+        point->setPosition(s1->getPosition());
         addChild(point, 10);
 
         auto point2 = Sprite::create("Images/r1.png");
@@ -5106,36 +5045,37 @@ SpriteSlice9Test2::SpriteSlice9Test2()
 
     Size s = Director::getInstance()->getWinSize();
 
-    for (int i=2; i>0; i--)
+    for (int i = 2; i > 0; i--)
     {
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s1 = Sprite::createWithSpriteFrameName("grossini.png");
         addChild(s1);
-        s1->setPosition(s.width*1/4, s.height*i/3);
+        s1->setPosition(s.width * 1 / 4, s.height * i / 3);
         s1->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
         s1->setContentSize(Size(80.0f, s1->getContentSize().height));
         auto action1 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s1->runAction(action1);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s2 = Sprite::createWithSpriteFrameName("grossini.png");
         addChild(s2);
-        s2->setPosition(s.width*2/4, s.height*i/3);
+        s2->setPosition(s.width * 2 / 4, s.height * i / 3);
         s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s2->setContentSize(Size(80.0f, s2->getContentSize().height));
         auto action2 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s2->runAction(action2);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s3 = Sprite::createWithSpriteFrameName("grossini.png");
         addChild(s3);
-        s3->setPosition(s.width*3/4, s.height*i/3);
+        s3->setPosition(s.width * 3 / 4, s.height * i / 3);
         s3->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
         s3->setContentSize(Size(80.0f, s3->getContentSize().height));
         auto action3 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s3->runAction(action3);
 
-        if (i==2) {
+        if (i == 2)
+        {
             s3->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
             s2->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
             s1->setCenterRectNormalized(Rect(0.4f, 0.4f, 0.2f, 0.2f));
@@ -5144,7 +5084,7 @@ SpriteSlice9Test2::SpriteSlice9Test2()
         // "anchor points"
         auto point = Sprite::create("Images/r1.png");
         point->setScale(0.25f);
-        point->setPosition( s1->getPosition() );
+        point->setPosition(s1->getPosition());
         addChild(point, 10);
 
         auto point2 = Sprite::create("Images/r1.png");
@@ -5168,48 +5108,47 @@ SpriteSlice9Test3::SpriteSlice9Test3()
 {
     Size s = Director::getInstance()->getWinSize();
 
-
-    for (int i=2; i>0; --i)
+    for (int i = 2; i > 0; --i)
     {
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s1 = Sprite::create("ccb/scale-9-demo.png");
         addChild(s1);
-        s1->setPosition(s.width*1/4, s.height*i/3);
+        s1->setPosition(s.width * 1 / 4, s.height * i / 3);
         s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s1->setContentSize(s1->getContentSize());
         auto action1 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s1->runAction(action1);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s2 = Sprite::create("ccb/scale-9-demo.png");
         addChild(s2);
-        s2->setPosition(s.width*2/4, s.height*i/3);
+        s2->setPosition(s.width * 2 / 4, s.height * i / 3);
         s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s2->setContentSize(s2->getContentSize() * 2);
         auto action2 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s2->runAction(action2);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s3 = Sprite::create("ccb/scale-9-demo.png");
         addChild(s3);
-        s3->setPosition(s.width*3/4, s.height*i/3);
+        s3->setPosition(s.width * 3 / 4, s.height * i / 3);
         s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s3->setContentSize(s3->getContentSize() * 3);
         auto action3 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s3->runAction(action3);
 
         // enable slice 9, only in the first row
-        if (i==2) {
+        if (i == 2)
+        {
             s1->setCenterRectNormalized(Rect(0.4, 0.4, 0.2, 0.2));
             s2->setCenterRectNormalized(Rect(0.4, 0.4, 0.2, 0.2));
             s3->setCenterRectNormalized(Rect(0.4, 0.4, 0.2, 0.2));
         }
 
-
         // "anchor points"
         auto point = Sprite::create("Images/r1.png");
         point->setScale(0.25f);
-        point->setPosition( s1->getPosition() );
+        point->setPosition(s1->getPosition());
         addChild(point, 10);
 
         auto point2 = Sprite::create("Images/r1.png");
@@ -5233,38 +5172,38 @@ SpriteSlice9Test4::SpriteSlice9Test4()
 {
     Size s = Director::getInstance()->getWinSize();
 
-
-    for (int i=2; i>0; --i)
+    for (int i = 2; i > 0; --i)
     {
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s1 = Sprite::create("ccs-res/cocosui/button.png");
         addChild(s1);
-        s1->setPosition(s.width*1/4, s.height*i/3);
+        s1->setPosition(s.width * 1 / 4, s.height * i / 3);
         s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s1->setContentSize(s1->getContentSize() * 2);
         auto action1 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s1->runAction(action1);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s2 = Sprite::create("ccs-res/cocosui/button.png");
         addChild(s2);
-        s2->setPosition(s.width*2/4, s.height*i/3);
+        s2->setPosition(s.width * 2 / 4, s.height * i / 3);
         s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s2->setContentSize(s2->getContentSize() * 3);
         auto action2 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s2->runAction(action2);
 
-        //Create reference sprite that's rotating based on there anchor point
+        // Create reference sprite that's rotating based on there anchor point
         auto s3 = Sprite::create("ccs-res/cocosui/button.png");
         addChild(s3);
-        s3->setPosition(s.width*3/4, s.height*i/3);
+        s3->setPosition(s.width * 3 / 4, s.height * i / 3);
         s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         s3->setContentSize(s3->getContentSize() * 4);
         auto action3 = RepeatForever::create(RotateBy::create(5.0f, 360.0f));
         s3->runAction(action3);
 
         // enable slice 9, only in the first row
-        if (i==2) {
+        if (i == 2)
+        {
             s1->setCenterRect(CC_RECT_PIXELS_TO_POINTS(Rect(6, 14, 2, 4)));
             s2->setCenterRect(CC_RECT_PIXELS_TO_POINTS(Rect(6, 14, 2, 4)));
             s3->setCenterRect(CC_RECT_PIXELS_TO_POINTS(Rect(6, 14, 2, 4)));
@@ -5273,7 +5212,7 @@ SpriteSlice9Test4::SpriteSlice9Test4()
         // "anchor points"
         auto point = Sprite::create("Images/r1.png");
         point->setScale(0.1f);
-        point->setPosition( s1->getPosition() );
+        point->setPosition(s1->getPosition());
         addChild(point, 10);
 
         auto point2 = Sprite::create("Images/r1.png");
@@ -5300,36 +5239,35 @@ SpriteSlice9Test5::SpriteSlice9Test5()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s1 = Sprite::create("Images/grossinis_heads.png");
     addChild(s1);
     s1->getTexture()->setAliasTexParameters();
-    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0,0,64,128)));
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0, 0, 64, 128)));
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setContentSize(Size(s.width/3, s.height));
-    s1->setCenterRectNormalized(Rect(0,0,1,1));
+    s1->setContentSize(Size(s.width / 3, s.height));
+    s1->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[0] = s1;
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s2 = Sprite::create("Images/grossinis_heads.png");
     addChild(s2);
-    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64,0,64,128)));
-    s2->setPosition(s.width*2/4, s.height/2);
+    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64, 0, 64, 128)));
+    s2->setPosition(s.width * 2 / 4, s.height / 2);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setContentSize(Size(s.width/3, s.height));
-    s2->setCenterRectNormalized(Rect(0,0,1,1));
+    s2->setContentSize(Size(s.width / 3, s.height));
+    s2->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[1] = s2;
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::create("Images/grossinis_heads.png");
     addChild(s3);
-    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128,0,64,128)));
-    s3->setPosition(s.width/2+s.width/3, s.height/2);
+    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128, 0, 64, 128)));
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s3->setContentSize(Size(s.width/3, s.height));
-    s3->setCenterRectNormalized(Rect(0,0,1,1));
+    s3->setContentSize(Size(s.width / 3, s.height));
+    s3->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[2] = s3;
 
     scheduleUpdate();
@@ -5344,19 +5282,23 @@ void SpriteSlice9Test5::update(float dt)
     float angle = _elapsed;
 
     // cap the value between 0 and 0.8
-    float x = ((cos(angle) + sin(angle*3)) + 2) / 5.0f;
+    float x  = ((cos(angle) + sin(angle * 3)) + 2) / 5.0f;
     float y1 = (sin(angle) + 1) / 2.5;
-    float y2 = (sin(angle+M_PI_2) + 1) / 2.5;
-    float y = y1;
-    for (int i=0; i<3; ++i) {
-        if (i==1) {
+    float y2 = (sin(angle + M_PI_2) + 1) / 2.5;
+    float y  = y1;
+    for (int i = 0; i < 3; ++i)
+    {
+        if (i == 1)
+        {
             x = 0.8 - x;
             y = y2;
-        } else if (i==2) {
+        }
+        else if (i == 2)
+        {
             y = 0.8 - y;
         }
 
-        Rect rect(x,y,0.2, 0.2);
+        Rect rect(x, y, 0.2, 0.2);
         _sprites[i]->setCenterRectNormalized(rect);
     }
 }
@@ -5373,36 +5315,35 @@ SpriteSlice9Test6::SpriteSlice9Test6()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s1 = Sprite::create("Images/grossinis_heads.png");
     addChild(s1);
     s1->getTexture()->setAliasTexParameters();
-    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0,0,64,128)));
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0, 0, 64, 128)));
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setContentSize(Size(s.width/3, s.height));
-    s1->setCenterRectNormalized(Rect(0,0,1,1));
+    s1->setContentSize(Size(s.width / 3, s.height));
+    s1->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[0] = s1;
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s2 = Sprite::create("Images/grossinis_heads.png");
     addChild(s2);
-    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64,0,64,128)));
-    s2->setPosition(s.width*2/4, s.height/2);
+    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64, 0, 64, 128)));
+    s2->setPosition(s.width * 2 / 4, s.height / 2);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setContentSize(Size(s.width/3, s.height));
-    s2->setCenterRectNormalized(Rect(0,0,1,1));
+    s2->setContentSize(Size(s.width / 3, s.height));
+    s2->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[1] = s2;
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::create("Images/grossinis_heads.png");
     addChild(s3);
-    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128,0,64,128)));
-    s3->setPosition(s.width/2+s.width/3, s.height/2);
+    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128, 0, 64, 128)));
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s3->setContentSize(Size(s.width/3, s.height));
-    s3->setCenterRectNormalized(Rect(0,0,1,1));
+    s3->setContentSize(Size(s.width / 3, s.height));
+    s3->setCenterRectNormalized(Rect(0, 0, 1, 1));
     _sprites[2] = s3;
 
     scheduleUpdate();
@@ -5417,19 +5358,23 @@ void SpriteSlice9Test6::update(float dt)
     float angle = _elapsed;
 
     // cap the value between 0 and 1
-    float x = ((cos(angle*2) - sin(angle/2)) + 2) / 4;
+    float x  = ((cos(angle * 2) - sin(angle / 2)) + 2) / 4;
     float y1 = (sin(angle) + 1) / 2;
-    float y2 = (sin(angle+M_PI_2) + 1) / 2;
-    float y = y1;
-    for (int i=0; i<3; ++i) {
-        if (i==1) {
+    float y2 = (sin(angle + M_PI_2) + 1) / 2;
+    float y  = y1;
+    for (int i = 0; i < 3; ++i)
+    {
+        if (i == 1)
+        {
             x = 1 - x;
             y = y2;
-        } else if (i==2) {
+        }
+        else if (i == 2)
+        {
             y = 1 - y;
         }
 
-        Rect rect((1-x)/2, (1-y)/2, x, y);
+        Rect rect((1 - x) / 2, (1 - y) / 2, x, y);
         _sprites[i]->setCenterRectNormalized(rect);
     }
 }
@@ -5446,34 +5391,33 @@ SpriteSlice9Test7::SpriteSlice9Test7()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s1 = Sprite::create("Images/grossinis_heads.png");
     addChild(s1);
     s1->getTexture()->setAliasTexParameters();
-    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0,0,64,128)));
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(0, 0, 64, 128)));
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setContentSize(Size(s.width/3, s.height));
-    s1->setCenterRectNormalized(Rect(0,0,0.5,0.5));
+    s1->setContentSize(Size(s.width / 3, s.height));
+    s1->setCenterRectNormalized(Rect(0, 0, 0.5, 0.5));
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s2 = Sprite::create("Images/grossinis_heads.png");
     addChild(s2);
-    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64,0,64,128)));
-    s2->setPosition(s.width*2/4, s.height/2);
+    s2->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(64, 0, 64, 128)));
+    s2->setPosition(s.width * 2 / 4, s.height / 2);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setContentSize(Size(s.width/3, s.height));
-    s2->setCenterRectNormalized(Rect(0.25,0.25,0.5,0.5));
+    s2->setContentSize(Size(s.width / 3, s.height));
+    s2->setCenterRectNormalized(Rect(0.25, 0.25, 0.5, 0.5));
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::create("Images/grossinis_heads.png");
     addChild(s3);
-    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128,0,64,128)));
-    s3->setPosition(s.width/2+s.width/3, s.height/2);
+    s3->setTextureRect(CC_RECT_PIXELS_TO_POINTS(Rect(128, 0, 64, 128)));
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s3->setContentSize(Size(s.width/3, s.height));
-    s3->setCenterRectNormalized(Rect(0.5,0.5,0.5,0.5));
+    s3->setContentSize(Size(s.width / 3, s.height));
+    s3->setCenterRectNormalized(Rect(0.5, 0.5, 0.5, 0.5));
 }
 
 //------------------------------------------------------------------
@@ -5488,64 +5432,63 @@ SpriteSlice9Test8::SpriteSlice9Test8()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
     //
     // flip BEFORE contentSize
     //
     auto s1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
     addChild(s1);
-    s1->setPosition(s.width/2-s.width/3, s.height*2/3);
+    s1->setPosition(s.width / 2 - s.width / 3, s.height * 2 / 3);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s1->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s1->setFlippedX(true);
-    s1->setContentSize(s1->getContentSize()*2);
+    s1->setContentSize(s1->getContentSize() * 2);
 
     auto s2 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s2);
-    s2->setPosition(s.width*2/4, s.height*2/3);
+    s2->setPosition(s.width * 2 / 4, s.height * 2 / 3);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s2->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s2->setFlippedX(true);
     s2->setFlippedY(true);
-    s2->setContentSize(s2->getContentSize()*2);
+    s2->setContentSize(s2->getContentSize() * 2);
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
     addChild(s3);
-    s3->setPosition(s.width/2+s.width/3, s.height*2/3);
+    s3->setPosition(s.width / 2 + s.width / 3, s.height * 2 / 3);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s3->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s3->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s3->setFlippedY(true);
-    s3->setContentSize(s3->getContentSize()*2);
+    s3->setContentSize(s3->getContentSize() * 2);
 
     //
     // flip AFTER contentSize
     //
     auto s4 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
     addChild(s4);
-    s4->setPosition(s.width/2-s.width/3, s.height*1/3);
+    s4->setPosition(s.width / 2 - s.width / 3, s.height * 1 / 3);
     s4->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s4->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s4->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s4->setFlippedX(true);
-    s4->setContentSize(s4->getContentSize()*2);
+    s4->setContentSize(s4->getContentSize() * 2);
 
     auto s5 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s5);
-    s5->setPosition(s.width*2/4, s.height*1/3);
+    s5->setPosition(s.width * 2 / 4, s.height * 1 / 3);
     s5->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s5->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s5->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s5->setFlippedX(true);
     s5->setFlippedY(true);
-    s5->setContentSize(s5->getContentSize()*2);
+    s5->setContentSize(s5->getContentSize() * 2);
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s6 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
     addChild(s6);
-    s6->setPosition(s.width/2+s.width/3, s.height*1/3);
+    s6->setPosition(s.width / 2 + s.width / 3, s.height * 1 / 3);
     s6->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s6->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
+    s6->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
     s6->setFlippedY(true);
-    s6->setContentSize(s6->getContentSize()*2);
+    s6->setContentSize(s6->getContentSize() * 2);
 }
 
 //------------------------------------------------------------------
@@ -5560,58 +5503,56 @@ SpriteSlice9Test9::SpriteSlice9Test9()
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini_family.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("animations/grossini.plist");
 
-
     // flipped BEFORE content size
     auto s1 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
     addChild(s1);
-    s1->setPosition(s.width/2-s.width/3, s.height*2/3);
+    s1->setPosition(s.width / 2 - s.width / 3, s.height * 2 / 3);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setCenterRectNormalized(Rect(2/3.f, 2/3.f, 1/3.f, 1/3.f));
+    s1->setCenterRectNormalized(Rect(2 / 3.f, 2 / 3.f, 1 / 3.f, 1 / 3.f));
     s1->setFlippedX(true);
-    s1->setContentSize(s1->getContentSize()*2);
+    s1->setContentSize(s1->getContentSize() * 2);
 
     auto s2 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s2);
-    s2->setPosition(s.width*2/4, s.height*2/3);
+    s2->setPosition(s.width * 2 / 4, s.height * 2 / 3);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 2/3.f, 2/3.f));
+    s2->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 2 / 3.f, 2 / 3.f));
     s2->setFlippedX(true);
     s2->setFlippedY(true);
-    s2->setContentSize(s2->getContentSize()*2);
+    s2->setContentSize(s2->getContentSize() * 2);
 
     auto s3 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
     addChild(s3);
-    s3->setPosition(s.width/2+s.width/3, s.height*2/3);
+    s3->setPosition(s.width / 2 + s.width / 3, s.height * 2 / 3);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     s3->setCenterRectNormalized(Rect(0.1f, 0.1f, 0.8f, 0.8f));
     s3->setFlippedY(true);
-    s3->setContentSize(s3->getContentSize()*2);
-
+    s3->setContentSize(s3->getContentSize() * 2);
 
     // flipped AFTER content size
     auto s4 = Sprite::createWithSpriteFrameName("grossinis_sister1.png");
     addChild(s4);
-    s4->setPosition(s.width/2-s.width/3, s.height*1/3);
+    s4->setPosition(s.width / 2 - s.width / 3, s.height * 1 / 3);
     s4->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s4->setCenterRectNormalized(Rect(2/3.f, 2/3.f, 1/3.f, 1/3.f));
-    s4->setContentSize(s4->getContentSize()*2);
+    s4->setCenterRectNormalized(Rect(2 / 3.f, 2 / 3.f, 1 / 3.f, 1 / 3.f));
+    s4->setContentSize(s4->getContentSize() * 2);
     s4->setFlippedX(true);
 
     auto s5 = Sprite::createWithSpriteFrameName("grossini.png");
     addChild(s5);
-    s5->setPosition(s.width*2/4, s.height*1/3);
+    s5->setPosition(s.width * 2 / 4, s.height * 1 / 3);
     s5->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s5->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 2/3.f, 2/3.f));
-    s5->setContentSize(s5->getContentSize()*2);
+    s5->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 2 / 3.f, 2 / 3.f));
+    s5->setContentSize(s5->getContentSize() * 2);
     s5->setFlippedX(true);
     s5->setFlippedY(true);
 
     auto s6 = Sprite::createWithSpriteFrameName("grossinis_sister2.png");
     addChild(s6);
-    s6->setPosition(s.width/2+s.width/3, s.height*1/3);
+    s6->setPosition(s.width / 2 + s.width / 3, s.height * 1 / 3);
     s6->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     s6->setCenterRectNormalized(Rect(0.1f, 0.1f, 0.8f, 0.8f));
-    s6->setContentSize(s6->getContentSize()*2);
+    s6->setContentSize(s6->getContentSize() * 2);
     s6->setFlippedY(true);
 }
 
@@ -5626,29 +5567,28 @@ SpriteSlice9Test10::SpriteSlice9Test10()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/blocks9ss.plist");
 
-
     auto s1 = Sprite::createWithSpriteFrameName("blocks9ss/blocks9r.png");
     addChild(s1);
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s1->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
-    s1->setContentSize(s1->getContentSize()*1.5);
+    s1->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
+    s1->setContentSize(s1->getContentSize() * 1.5);
     s1->setFlippedX(true);
 
     auto s2 = Sprite::createWithSpriteFrameName("blocks9ss/blocks9r.png");
     addChild(s2);
-    s2->setPosition(s.width*2/4, s.height/2);
+    s2->setPosition(s.width * 2 / 4, s.height / 2);
     s2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s2->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
-    s2->setContentSize(s2->getContentSize()*1.5);
+    s2->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
+    s2->setContentSize(s2->getContentSize() * 1.5);
 
-    //Create reference sprite that's rotating based on there anchor point
+    // Create reference sprite that's rotating based on there anchor point
     auto s3 = Sprite::createWithSpriteFrameName("blocks9ss/blocks9r.png");
     addChild(s3);
-    s3->setPosition(s.width/2+s.width/3, s.height/2);
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2);
     s3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    s3->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
-    s3->setContentSize(s3->getContentSize()*1.5);
+    s3->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
+    s3->setContentSize(s3->getContentSize() * 1.5);
     s3->setFlippedY(true);
 }
 
@@ -5657,18 +5597,16 @@ SpriteSlice9Test10::SpriteSlice9Test10()
 // Issue 17119
 //
 //------------------------------------------------------------------
-Issue17119::Issue17119()
-: _accum(0)
+Issue17119::Issue17119() : _accum(0)
 {
     Size s = Director::getInstance()->getVisibleSize();
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/issue_17119.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/blocks9ss.plist");
 
-
     auto s1 = Sprite::createWithSpriteFrameName("issue_17119/firstPic.png");
     addChild(s1);
-    s1->setPosition(s.width/2-s.width/3, s.height/2);
+    s1->setPosition(s.width / 2 - s.width / 3, s.height / 2);
     s1->setScale(0.25f);
     auto p1 = Sprite::create("Images/r1.png");
     p1->setScale(0.25f);
@@ -5677,9 +5615,9 @@ Issue17119::Issue17119()
 
     auto s2 = Sprite::createWithSpriteFrameName("blocks9ss/blocks9r.png");
     addChild(s2);
-    s2->setPosition(s.width/2, s.height/2);
-    s2->setCenterRectNormalized(Rect(1/3.f, 1/3.f, 1/3.f, 1/3.f));
-    s2->setContentSize(s2->getContentSize()*1.5);
+    s2->setPosition(s.width / 2, s.height / 2);
+    s2->setCenterRectNormalized(Rect(1 / 3.f, 1 / 3.f, 1 / 3.f, 1 / 3.f));
+    s2->setContentSize(s2->getContentSize() * 1.5);
     auto p2 = Sprite::create("Images/r1.png");
     p2->setScale(0.25f);
     p2->setPosition(s2->getPosition());
@@ -5687,8 +5625,8 @@ Issue17119::Issue17119()
 
     auto s3 = Sprite::create("Images/grossini.png");
     addChild(s3);
-    s3->setPosition(s.width/2+s.width/3, s.height/2+s.height/3);
-    s3->setContentSize(s3->getContentSize()*1.5);
+    s3->setPosition(s.width / 2 + s.width / 3, s.height / 2 + s.height / 3);
+    s3->setContentSize(s3->getContentSize() * 1.5);
     auto p3 = Sprite::create("Images/r1.png");
     p3->setScale(0.25f);
     p3->setPosition(s3->getPosition());
@@ -5696,8 +5634,8 @@ Issue17119::Issue17119()
 
     auto s4 = Sprite::create("Images/grossini.png");
     addChild(s4);
-    s4->setPosition(s.width/2+s.width/3, s.height/2-s.height/3);
-    s4->setContentSize(s2->getContentSize()*1.5);
+    s4->setPosition(s.width / 2 + s.width / 3, s.height / 2 - s.height / 3);
+    s4->setContentSize(s2->getContentSize() * 1.5);
     s4->setStretchEnabled(false);
     auto p4 = Sprite::create("Images/r1.png");
     p4->setScale(0.25f);
@@ -5714,8 +5652,9 @@ Issue17119::Issue17119()
 void Issue17119::update(float dt)
 {
     _accum += dt;
-    if (_accum > 0.5) {
-        _accum = 0;
+    if (_accum > 0.5)
+    {
+        _accum       = 0;
         auto flipped = _s1->isFlippedX();
         _s1->setFlippedX(!flipped);
         _s2->setFlippedX(!flipped);
@@ -5723,5 +5662,3 @@ void Issue17119::update(float dt)
         _s4->setFlippedX(!flipped);
     }
 }
-
-
diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h
index f2bad2751eec..cf161a6b2b65 100644
--- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h
+++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h
@@ -35,7 +35,7 @@ DEFINE_TEST_SUITE(SpriteTests);
 class SpriteTestDemo : public TestCase
 {
 protected:
-    std::string    _title;
+    std::string _title;
 
 public:
 };
@@ -52,7 +52,7 @@ class Sprite1 : public SpriteTestDemo
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
 };
 
-class SpriteBatchNode1: public SpriteTestDemo
+class SpriteBatchNode1 : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNode1);
@@ -71,7 +71,6 @@ class SpriteColorOpacity : public SpriteTestDemo
     void removeAndAddSprite(float dt);
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-
 };
 
 class SpriteBatchNodeColorOpacity : public SpriteTestDemo
@@ -99,7 +98,7 @@ class SpriteZOrder : public SpriteTestDemo
     int _dir;
 };
 
-class SpriteBatchNodeZOrder: public SpriteTestDemo
+class SpriteBatchNodeZOrder : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeZOrder);
@@ -123,7 +122,7 @@ class SpriteBatchNodeReorder : public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteBatchNodeReorderIssue744: public SpriteTestDemo
+class SpriteBatchNodeReorderIssue744 : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeReorderIssue744);
@@ -148,7 +147,7 @@ class SpriteBatchNodeReorderIssue766 : public SpriteTestDemo
     cocos2d::SpriteBatchNode* batchNode;
     cocos2d::Sprite* sprite1;
     cocos2d::Sprite* sprite2;
-    cocos2d::Sprite* sprite3;    
+    cocos2d::Sprite* sprite3;
 };
 
 class SpriteBatchNodeReorderIssue767 : public SpriteTestDemo
@@ -162,7 +161,7 @@ class SpriteBatchNodeReorderIssue767 : public SpriteTestDemo
     void reorderSprites(float dt);
 };
 
-class SpriteZVertex: public SpriteTestDemo
+class SpriteZVertex : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteZVertex);
@@ -178,7 +177,7 @@ class SpriteZVertex: public SpriteTestDemo
     float _time;
 };
 
-class SpriteBatchNodeZVertex: public SpriteTestDemo
+class SpriteBatchNodeZVertex : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeZVertex);
@@ -218,7 +217,7 @@ class SpriteAnchorPointFromFile : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteAnchorPointFromFile);
-    
+
     virtual void onEnter() override;
     virtual void onExit() override;
     virtual std::string title() const override;
@@ -306,11 +305,11 @@ class SpriteBatchNodeNewTexture : public SpriteTestDemo
     virtual std::string subtitle() const override;
 
 protected:
-    cocos2d::Texture2D*    _texture1;
-    cocos2d::Texture2D*    _texture2;
+    cocos2d::Texture2D* _texture1;
+    cocos2d::Texture2D* _texture2;
 };
 
-class SpriteFrameTest: public SpriteTestDemo
+class SpriteFrameTest : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteFrameTest);
@@ -321,11 +320,11 @@ class SpriteFrameTest: public SpriteTestDemo
 
     void startIn05Secs(float dt);
     void flipSprites(float dt);
+
 private:
-    
     cocos2d::Sprite* _sprite1;
     cocos2d::Sprite* _sprite2;
-    int      _counter;
+    int _counter;
 };
 
 class SpriteFrameAliasNameTest : public SpriteTestDemo
@@ -359,7 +358,7 @@ class SpritePolygonFromFileContent : public SpriteFramesFromFileContent
     virtual std::string sheetName() const override;
 };
 
-class SpriteOffsetAnchorRotation: public SpriteTestDemo
+class SpriteOffsetAnchorRotation : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteOffsetAnchorRotation);
@@ -370,7 +369,7 @@ class SpriteOffsetAnchorRotation: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteBatchNodeOffsetAnchorRotation: public SpriteTestDemo
+class SpriteBatchNodeOffsetAnchorRotation : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeOffsetAnchorRotation);
@@ -380,7 +379,7 @@ class SpriteBatchNodeOffsetAnchorRotation: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteOffsetAnchorScale: public SpriteTestDemo
+class SpriteOffsetAnchorScale : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteOffsetAnchorScale);
@@ -390,7 +389,7 @@ class SpriteOffsetAnchorScale: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteBatchNodeOffsetAnchorScale: public SpriteTestDemo
+class SpriteBatchNodeOffsetAnchorScale : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeOffsetAnchorScale);
@@ -509,7 +508,7 @@ class SpriteAnimationSplit : public SpriteTestDemo
     virtual std::string title() const override;
 };
 
-class SpriteHybrid: public SpriteTestDemo
+class SpriteHybrid : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteHybrid);
@@ -520,10 +519,10 @@ class SpriteHybrid: public SpriteTestDemo
     virtual void onExit() override;
 
 protected:
-    bool     _usingSpriteBatchNode;
+    bool _usingSpriteBatchNode;
 };
 
-class SpriteBatchNodeChildren: public SpriteTestDemo
+class SpriteBatchNodeChildren : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeChildren);
@@ -541,7 +540,7 @@ class SpriteBatchNodeChildrenZ : public SpriteTestDemo
     virtual std::string title() const override;
 };
 
-class SpriteChildrenVisibility: public SpriteTestDemo
+class SpriteChildrenVisibility : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteChildrenVisibility);
@@ -560,7 +559,7 @@ class SpriteChildrenVisibilityIssue665 : public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteChildrenAnchorPoint: public SpriteTestDemo
+class SpriteChildrenAnchorPoint : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteChildrenAnchorPoint);
@@ -570,7 +569,7 @@ class SpriteChildrenAnchorPoint: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteBatchNodeChildrenAnchorPoint: public SpriteTestDemo
+class SpriteBatchNodeChildrenAnchorPoint : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeChildrenAnchorPoint);
@@ -580,7 +579,7 @@ class SpriteBatchNodeChildrenAnchorPoint: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteBatchNodeChildrenScale: public SpriteTestDemo
+class SpriteBatchNodeChildrenScale : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeChildrenScale);
@@ -589,7 +588,7 @@ class SpriteBatchNodeChildrenScale: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteChildrenChildren: public SpriteTestDemo
+class SpriteChildrenChildren : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteChildrenChildren);
@@ -598,8 +597,7 @@ class SpriteChildrenChildren: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-
-class SpriteBatchNodeChildrenChildren: public SpriteTestDemo
+class SpriteBatchNodeChildrenChildren : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteBatchNodeChildrenChildren);
@@ -608,7 +606,7 @@ class SpriteBatchNodeChildrenChildren: public SpriteTestDemo
     virtual std::string subtitle() const override;
 };
 
-class SpriteNilTexture: public SpriteTestDemo
+class SpriteNilTexture : public SpriteTestDemo
 {
 public:
     CREATE_FUNC(SpriteNilTexture);
@@ -660,7 +658,7 @@ class SpriteBatchNodeReorderSameIndex : public SpriteTestDemo
 public:
     CREATE_FUNC(SpriteBatchNodeReorderSameIndex);
     SpriteBatchNodeReorderSameIndex();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void reorderSprite(float dt);
@@ -681,6 +679,7 @@ class SpriteBatchNodeReorderOneChild : public SpriteTestDemo
     SpriteBatchNodeReorderOneChild();
     void reorderSprite(float dt);
     virtual std::string title() const override;
+
 private:
     cocos2d::SpriteBatchNode* _batchNode;
     cocos2d::Sprite* _reorderSprite;
@@ -780,11 +779,11 @@ class Sprite3DRotationTest : public SpriteTestDemo
     Sprite3DRotationTest();
     virtual std::string title() const override { return "3D Rotation Test"; };
     virtual std::string subtitle() const override { return "Rotation should based on the anchor point"; };
-    
+
 protected:
     cocos2d::Sprite* sprite1;
     cocos2d::Sprite* sprite2;
-    
+
     cocos2d::Vec3 rotation;
 };
 
@@ -881,7 +880,6 @@ class SpriteSlice9Test9 : public SpriteTestDemo
     virtual std::string subtitle() const override { return "Flipped sprites #2"; }
 };
 
-
 class SpriteSlice9Test10 : public SpriteTestDemo
 {
 public:
@@ -891,7 +889,6 @@ class SpriteSlice9Test10 : public SpriteTestDemo
     virtual std::string subtitle() const override { return "Rotated Sprites"; }
 };
 
-
 class SpriteGetSpriteFrameTest : public SpriteTestDemo
 {
 public:
@@ -910,6 +907,7 @@ class Issue17119 : public SpriteTestDemo
     virtual std::string subtitle() const override { return "flipping should work ok"; }
 
     virtual void update(float dt) override;
+
 protected:
     float _accum;
     cocos2d::Sprite* _s1;
diff --git a/tests/cpp-tests/Classes/TerrainTest/TerrainTest.cpp b/tests/cpp-tests/Classes/TerrainTest/TerrainTest.cpp
index c2227ce4fdff..07d866715044 100644
--- a/tests/cpp-tests/Classes/TerrainTest/TerrainTest.cpp
+++ b/tests/cpp-tests/Classes/TerrainTest/TerrainTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,104 +40,106 @@ TerrainSimple::TerrainSimple()
 {
     Size visibleSize = Director::getInstance()->getVisibleSize();
 
-    //use custom camera
-    _camera = Camera::createPerspective(60,visibleSize.width/visibleSize.height,0.1f,800);
+    // use custom camera
+    _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 800);
     _camera->setCameraFlag(CameraFlag::USER1);
-    _camera->setPosition3D(Vec3(-1,1.6f,4));
+    _camera->setPosition3D(Vec3(-1, 1.6f, 4));
     addChild(_camera);
 
-    Terrain::DetailMap r("TerrainTest/dirt.jpg"),g("TerrainTest/Grass2.jpg"),b("TerrainTest/road.jpg"),a("TerrainTest/GreenSkin.jpg");
+    Terrain::DetailMap r("TerrainTest/dirt.jpg"), g("TerrainTest/Grass2.jpg"), b("TerrainTest/road.jpg"),
+        a("TerrainTest/GreenSkin.jpg");
 
-    Terrain::TerrainData data("TerrainTest/heightmap16.jpg","TerrainTest/alphamap.png",r,g,b,a);
+    Terrain::TerrainData data("TerrainTest/heightmap16.jpg", "TerrainTest/alphamap.png", r, g, b, a);
 
-    _terrain = Terrain::create(data,Terrain::CrackFixedType::SKIRT);
-    _terrain->setLODDistance(3.2f,6.4f,9.6f);
+    _terrain = Terrain::create(data, Terrain::CrackFixedType::SKIRT);
+    _terrain->setLODDistance(3.2f, 6.4f, 9.6f);
     _terrain->setMaxDetailMapAmount(4);
     addChild(_terrain);
     _terrain->setCameraMask(2);
     _terrain->setDrawWire(false);
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(TerrainSimple::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-//     add Particle3D for test blend
+    //     add Particle3D for test blend
     auto rootps = PUParticleSystem3D::create("Particle3D/scripts/mp_torch.pu");
     rootps->setCameraMask((unsigned short)CameraFlag::USER1);
     rootps->startParticleSystem();
-    
+
     this->addChild(rootps, 0, 0);
 }
 
-std::string TerrainSimple::title() const 
+std::string TerrainSimple::title() const
 {
     return "Terrain with skirt";
 }
 
-std::string TerrainSimple::subtitle() const 
+std::string TerrainSimple::subtitle() const
 {
     return "Drag to walkThru";
 }
 
 void TerrainSimple::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    float delta = Director::getInstance()->getDeltaTime();
-    auto touch = touches[0];
-    auto location = touch->getLocation();
+    float delta           = Director::getInstance()->getDeltaTime();
+    auto touch            = touches[0];
+    auto location         = touch->getLocation();
     auto PreviousLocation = touch->getPreviousLocation();
-    Point newPos = PreviousLocation - location;
+    Point newPos          = PreviousLocation - location;
 
     Vec3 cameraDir;
     Vec3 cameraRightDir;
     _camera->getNodeToWorldTransform().getForwardVector(&cameraDir);
     cameraDir.normalize();
-    cameraDir.y=0;
+    cameraDir.y = 0;
     _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
     cameraRightDir.normalize();
-    cameraRightDir.y=0;
-    Vec3 cameraPos=  _camera->getPosition3D();
-    cameraPos+=cameraDir*newPos.y*0.5*delta;  
-    cameraPos+=cameraRightDir*newPos.x*0.5*delta;
-    _camera->setPosition3D(cameraPos);   
+    cameraRightDir.y = 0;
+    Vec3 cameraPos   = _camera->getPosition3D();
+    cameraPos += cameraDir * newPos.y * 0.5 * delta;
+    cameraPos += cameraRightDir * newPos.x * 0.5 * delta;
+    _camera->setPosition3D(cameraPos);
 }
 
-
-std::string TerrainWalkThru::title() const 
+std::string TerrainWalkThru::title() const
 {
     return "Player walk around in terrain";
 }
 
-std::string TerrainWalkThru::subtitle() const 
+std::string TerrainWalkThru::subtitle() const
 {
     return "touch to move";
 }
 
 TerrainWalkThru::TerrainWalkThru()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(TerrainWalkThru::onTouchesBegan, this);
     listener->onTouchesEnded = CC_CALLBACK_2(TerrainWalkThru::onTouchesEnd, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
     Size visibleSize = Director::getInstance()->getVisibleSize();
 
-    //use custom camera
-    _camera = Camera::createPerspective(60,visibleSize.width/visibleSize.height,0.1f,200);
+    // use custom camera
+    _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 200);
     _camera->setCameraFlag(CameraFlag::USER1);
     addChild(_camera);
 
-    Terrain::DetailMap r("TerrainTest/dirt.jpg"),g("TerrainTest/Grass2.jpg",10),b("TerrainTest/road.jpg"),a("TerrainTest/GreenSkin.jpg",20);
+    Terrain::DetailMap r("TerrainTest/dirt.jpg"), g("TerrainTest/Grass2.jpg", 10), b("TerrainTest/road.jpg"),
+        a("TerrainTest/GreenSkin.jpg", 20);
 
-    Terrain::TerrainData data("TerrainTest/heightmap16.jpg","TerrainTest/alphamap.png",r,g,b,a,Size(32,32),40.0f,2);
-    _terrain = Terrain::create(data,Terrain::CrackFixedType::SKIRT);
+    Terrain::TerrainData data("TerrainTest/heightmap16.jpg", "TerrainTest/alphamap.png", r, g, b, a, Size(32, 32),
+                              40.0f, 2);
+    _terrain = Terrain::create(data, Terrain::CrackFixedType::SKIRT);
     _terrain->setMaxDetailMapAmount(4);
     _terrain->setCameraMask(2);
     _terrain->setDrawWire(false);
 
     _terrain->setSkirtHeightRatio(3);
-    _terrain->setLODDistance(64,128,192);
-    _player = Player::create("Sprite3DTest/girl.c3b",_camera,_terrain);
+    _terrain->setLODDistance(64, 128, 192);
+    _player = Player::create("Sprite3DTest/girl.c3b", _camera, _terrain);
     _player->setCameraMask(2);
     _player->setScale(0.08f);
-    _player->setPositionY(_terrain->getHeight(_player->getPositionX(),_player->getPositionZ())+PLAYER_HEIGHT);
+    _player->setPositionY(_terrain->getHeight(_player->getPositionX(), _player->getPositionZ()) + PLAYER_HEIGHT);
 
     // add Particle3D for test blend
     auto rootps = PUParticleSystem3D::create("Particle3D/scripts/mp_torch.pu");
@@ -145,39 +147,36 @@ TerrainWalkThru::TerrainWalkThru()
     rootps->setScale(30.0f);
     rootps->startParticleSystem();
     _player->addChild(rootps);
-    
+
     // add BillBoard for test blend
     auto billboard = BillBoard::create("Images/btn-play-normal.png");
-    billboard->setPosition3D(Vec3(0,180,0));
+    billboard->setPosition3D(Vec3(0, 180, 0));
     billboard->setCameraMask((unsigned short)CameraFlag::USER1);
     _player->addChild(billboard);
 
-    auto animation = Animation3D::create("Sprite3DTest/girl.c3b","Take 001");
+    auto animation = Animation3D::create("Sprite3DTest/girl.c3b", "Take 001");
     if (animation)
     {
         auto animate = Animate3D::create(animation);
         _player->runAction(RepeatForever::create(animate));
     }
 
-    _camera->setPosition3D(_player->getPosition3D()+camera_offset);
-    _camera->setRotation3D(Vec3(-45,0,0));
+    _camera->setPosition3D(_player->getPosition3D() + camera_offset);
+    _camera->setRotation3D(Vec3(-45, 0, 0));
 
     addChild(_player);
     addChild(_terrain);
 }
 
-
-void TerrainWalkThru::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
-{
-}
+void TerrainWalkThru::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) {}
 
 void TerrainWalkThru::onTouchesEnd(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    auto touch = touches[0];
+    auto touch    = touches[0];
     auto location = touch->getLocationInView();
-    if(_camera)
+    if (_camera)
     {
-        if(_player)
+        if (_player)
         {
             Vec3 nearP(location.x, location.y, 0.0f), farP(location.x, location.y, 1.0f);
 
@@ -186,77 +185,75 @@ void TerrainWalkThru::onTouchesEnd(const std::vector<cocos2d::Touch*>& touches,
             _camera->unproject(size, &farP, &farP);
             Vec3 dir = farP - nearP;
             dir.normalize();
-            Vec3 collisionPoint(-999,-999,-999);
+            Vec3 collisionPoint(-999, -999, -999);
             bool isInTerrain = _terrain->getIntersectionPoint(Ray(nearP, dir), collisionPoint);
-            if (!isInTerrain) 
+            if (!isInTerrain)
             {
-            _player->idle();
-            return;
+                _player->idle();
+                return;
             }
-            dir = collisionPoint - _player->getPosition3D();
+            dir   = collisionPoint - _player->getPosition3D();
             dir.y = 0;
             dir.normalize();
-            _player->_headingAngle =  -1*acos(dir.dot(Vec3(0,0,-1)));
-            dir.cross(dir,Vec3(0,0,-1),&_player->_headingAxis);
-            _player->_targetPos=collisionPoint;
+            _player->_headingAngle = -1 * acos(dir.dot(Vec3(0, 0, -1)));
+            dir.cross(dir, Vec3(0, 0, -1), &_player->_headingAxis);
+            _player->_targetPos = collisionPoint;
             _player->forward();
         }
     }
 }
 
-
 bool Player::isDone() const
 {
     return false;
 }
 
-
 void Player::update(float dt)
 {
-    auto player = (Sprite3D *)this;
+    auto player = (Sprite3D*)this;
     switch (_playerState)
     {
     case PLAYER_STATE_IDLE:
         break;
     case PLAYER_STATE_FORWARD:
-        {
-            Vec3 curPos=  player->getPosition3D();
-            Vec3 newFaceDir = _targetPos - curPos;
-            newFaceDir.y = 0.0f;
-            newFaceDir.normalize();
-            Vec3 offset = newFaceDir * 25.0f * dt;
-            curPos+=offset;
-            player->setPosition3D(curPos);
-        }
-        break;
+    {
+        Vec3 curPos     = player->getPosition3D();
+        Vec3 newFaceDir = _targetPos - curPos;
+        newFaceDir.y    = 0.0f;
+        newFaceDir.normalize();
+        Vec3 offset = newFaceDir * 25.0f * dt;
+        curPos += offset;
+        player->setPosition3D(curPos);
+    }
+    break;
     case PLAYER_STATE_BACKWARD:
-        {
-            Vec3 forward_vec;
-            player->getNodeToWorldTransform().getForwardVector(&forward_vec);
-            forward_vec.normalize();
-            player->setPosition3D(player->getPosition3D()-forward_vec*15*dt);
-        }
-        break;
+    {
+        Vec3 forward_vec;
+        player->getNodeToWorldTransform().getForwardVector(&forward_vec);
+        forward_vec.normalize();
+        player->setPosition3D(player->getPosition3D() - forward_vec * 15 * dt);
+    }
+    break;
     case PLAYER_STATE_LEFT:
-        {
-            player->setRotation3D(player->getRotation3D()+Vec3(0,25*dt,0));
-        }
-        break;
+    {
+        player->setRotation3D(player->getRotation3D() + Vec3(0, 25 * dt, 0));
+    }
+    break;
     case PLAYER_STATE_RIGHT:
-        {
-            player->setRotation3D(player->getRotation3D()+Vec3(0,-25*dt,0));
-        }
-        break;
+    {
+        player->setRotation3D(player->getRotation3D() + Vec3(0, -25 * dt, 0));
+    }
+    break;
     default:
         break;
     }
     // transform player position to world coord
-    auto playerPos = player->getPosition3D();
+    auto playerPos      = player->getPosition3D();
     auto playerModelMat = player->getParent()->getNodeToWorldTransform();
     playerModelMat.transformPoint(&playerPos);
     Vec3 Normal;
-    float player_h = _terrain->getHeight(playerPos.x, playerPos.z,&Normal);
-    if (Normal.isZero())//check the player whether is out of the terrain
+    float player_h = _terrain->getHeight(playerPos.x, playerPos.z, &Normal);
+    if (Normal.isZero())  // check the player whether is out of the terrain
     {
         player_h = playerPos.y;
     }
@@ -266,14 +263,14 @@ void Player::update(float dt)
     }
     player->setPositionY(player_h);
     Quaternion q2;
-    q2.createFromAxisAngle(Vec3(0,1,0),(float)-M_PI,&q2);
- 
+    q2.createFromAxisAngle(Vec3(0, 1, 0), (float)-M_PI, &q2);
+
     Quaternion headingQ;
-    headingQ.createFromAxisAngle(_headingAxis,_headingAngle,&headingQ);
-    player->setRotationQuat(headingQ*q2);
-    auto vec_offset =Vec4(camera_offset.x,camera_offset.y,camera_offset.z,1);
-    vec_offset = player->getNodeToWorldTransform()*vec_offset;
-     _cam->setPosition3D(player->getPosition3D() + camera_offset);
+    headingQ.createFromAxisAngle(_headingAxis, _headingAngle, &headingQ);
+    player->setRotationQuat(headingQ * q2);
+    auto vec_offset = Vec4(camera_offset.x, camera_offset.y, camera_offset.z, 1);
+    vec_offset      = player->getNodeToWorldTransform() * vec_offset;
+    _cam->setPosition3D(player->getPosition3D() + camera_offset);
     updateState();
 }
 
@@ -292,7 +289,6 @@ void Player::idle()
     _playerState = PLAYER_STATE_IDLE;
 }
 
-
 void Player::forward()
 {
     _playerState = PLAYER_STATE_FORWARD;
@@ -305,35 +301,35 @@ void Player::backward()
 
 void Player::updateState()
 {
-    auto player = (Sprite3D * )this;
+    auto player = (Sprite3D*)this;
     switch (_playerState)
     {
     case PLAYER_STATE_FORWARD:
+    {
+        Vec2 player_pos = Vec2(player->getPositionX(), player->getPositionZ());
+        Vec2 targetPos  = Vec2(_targetPos.x, _targetPos.z);
+        auto dist       = player_pos.distance(targetPos);
+        if (dist < 1)
         {
-            Vec2 player_pos =Vec2(player->getPositionX(),player->getPositionZ());
-            Vec2 targetPos = Vec2(_targetPos.x,_targetPos.z);
-            auto dist = player_pos.distance(targetPos);
-            if(dist<1)
-            {
-                _playerState = PLAYER_STATE_IDLE;
-            }
+            _playerState = PLAYER_STATE_IDLE;
         }
-        break;
+    }
+    break;
     default:
         break;
     }
 }
 
-Player * Player::create(const char * file,Camera * cam,Terrain * terrain)
+Player* Player::create(const char* file, Camera* cam, Terrain* terrain)
 {
     //
     auto sprite = new Player();
     if (sprite->initWithFile(file))
     {
         sprite->_headingAngle = 0;
-        sprite->_playerState = PLAYER_STATE_IDLE;
-        sprite->_cam = cam;
-        sprite->_terrain = terrain;
+        sprite->_playerState  = PLAYER_STATE_IDLE;
+        sprite->_cam          = cam;
+        sprite->_terrain      = terrain;
         sprite->autorelease();
         sprite->scheduleUpdate();
         return sprite;
@@ -345,28 +341,28 @@ Player * Player::create(const char * file,Camera * cam,Terrain * terrain)
 TerrainWithLightMap::TerrainWithLightMap()
 {
     Size visibleSize = Director::getInstance()->getVisibleSize();
-    
-    //use custom camera
-    _camera = Camera::createPerspective(60,visibleSize.width/visibleSize.height,0.1f,800);
+
+    // use custom camera
+    _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1f, 800);
     _camera->setCameraFlag(CameraFlag::USER1);
-    _camera->setPosition3D(Vec3(-1,1.6f,4));
+    _camera->setPosition3D(Vec3(-1, 1.6f, 4));
     addChild(_camera);
-    
-    Terrain::DetailMap r("TerrainTest/dirt.jpg"),g("TerrainTest/Grass2.jpg"),b("TerrainTest/road.jpg"),a("TerrainTest/GreenSkin.jpg");
-    
-    Terrain::TerrainData data("TerrainTest/heightmap16.jpg","TerrainTest/alphamap.png",r,g,b,a);
-    
-    _terrain = Terrain::create(data,Terrain::CrackFixedType::SKIRT);
-    _terrain->setLODDistance(3.2f,6.4f,9.6f);
+
+    Terrain::DetailMap r("TerrainTest/dirt.jpg"), g("TerrainTest/Grass2.jpg"), b("TerrainTest/road.jpg"),
+        a("TerrainTest/GreenSkin.jpg");
+
+    Terrain::TerrainData data("TerrainTest/heightmap16.jpg", "TerrainTest/alphamap.png", r, g, b, a);
+
+    _terrain = Terrain::create(data, Terrain::CrackFixedType::SKIRT);
+    _terrain->setLODDistance(3.2f, 6.4f, 9.6f);
     _terrain->setMaxDetailMapAmount(4);
     addChild(_terrain);
     _terrain->setCameraMask(2);
     _terrain->setDrawWire(false);
     _terrain->setLightMap("TerrainTest/Lightmap.png");
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(TerrainWithLightMap::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
 }
 std::string TerrainWithLightMap::title() const
 {
@@ -378,22 +374,22 @@ std::string TerrainWithLightMap::subtitle() const
 }
 void TerrainWithLightMap::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    float delta = Director::getInstance()->getDeltaTime();
-    auto touch = touches[0];
-    auto location = touch->getLocation();
+    float delta           = Director::getInstance()->getDeltaTime();
+    auto touch            = touches[0];
+    auto location         = touch->getLocation();
     auto PreviousLocation = touch->getPreviousLocation();
-    Point newPos = PreviousLocation - location;
-    
+    Point newPos          = PreviousLocation - location;
+
     Vec3 cameraDir;
     Vec3 cameraRightDir;
     _camera->getNodeToWorldTransform().getForwardVector(&cameraDir);
     cameraDir.normalize();
-    cameraDir.y=0;
+    cameraDir.y = 0;
     _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir);
     cameraRightDir.normalize();
-    cameraRightDir.y=0;
-    Vec3 cameraPos=  _camera->getPosition3D();
-    cameraPos+=cameraDir*newPos.y*0.5*delta;
-    cameraPos+=cameraRightDir*newPos.x*0.5*delta;
+    cameraRightDir.y = 0;
+    Vec3 cameraPos   = _camera->getPosition3D();
+    cameraPos += cameraDir * newPos.y * 0.5 * delta;
+    cameraPos += cameraRightDir * newPos.x * 0.5 * delta;
     _camera->setPosition3D(cameraPos);
 }
diff --git a/tests/cpp-tests/Classes/TerrainTest/TerrainTest.h b/tests/cpp-tests/Classes/TerrainTest/TerrainTest.h
index 1830ef6edcdf..66c48106634d 100644
--- a/tests/cpp-tests/Classes/TerrainTest/TerrainTest.h
+++ b/tests/cpp-tests/Classes/TerrainTest/TerrainTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,19 +24,19 @@
 
 #ifndef TERRAIN_TESH_H
 
-#include "../BaseTest.h"
+#    include "../BaseTest.h"
 
-#include "3d/CCSprite3D.h"
-#include "3d/CCTerrain.h"
-#include "2d/CCCamera.h"
-#include "2d/CCAction.h"
+#    include "3d/CCSprite3D.h"
+#    include "3d/CCTerrain.h"
+#    include "2d/CCCamera.h"
+#    include "2d/CCAction.h"
 
 DEFINE_TEST_SUITE(TerrainTests);
 
 class TerrainTestDemo : public TestCase
 {
 protected:
-    std::string    _title;
+    std::string _title;
 };
 
 class TerrainSimple : public TerrainTestDemo
@@ -48,20 +48,21 @@ class TerrainSimple : public TerrainTestDemo
     virtual std::string subtitle() const override;
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     cocos2d::Terrain* _terrain;
+
 protected:
     cocos2d::Camera* _camera;
 };
 
-#define PLAYER_STATE_LEFT 0 
-#define PLAYER_STATE_RIGHT 1
-#define PLAYER_STATE_IDLE 2
-#define PLAYER_STATE_FORWARD 3
-#define PLAYER_STATE_BACKWARD 4
+#    define PLAYER_STATE_LEFT 0
+#    define PLAYER_STATE_RIGHT 1
+#    define PLAYER_STATE_IDLE 2
+#    define PLAYER_STATE_FORWARD 3
+#    define PLAYER_STATE_BACKWARD 4
 
 class Player : public cocos2d::Sprite3D
 {
 public:
-    static Player * create(const char * file, cocos2d::Camera*  cam, cocos2d::Terrain* terrain);
+    static Player* create(const char* file, cocos2d::Camera* cam, cocos2d::Terrain* terrain);
     virtual bool isDone() const;
     virtual void update(float dt);
 
@@ -74,13 +75,13 @@ class Player : public cocos2d::Sprite3D
     void updateState();
     float _headingAngle;
     cocos2d::Vec3 _headingAxis;
+
 private:
     cocos2d::Terrain* _terrain;
-    cocos2d::Camera*  _cam;
+    cocos2d::Camera* _cam;
     int _playerState;
 };
 
-
 class TerrainWalkThru : public TerrainTestDemo
 {
 public:
@@ -90,10 +91,11 @@ class TerrainWalkThru : public TerrainTestDemo
     virtual std::string subtitle() const override;
     void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onTouchesEnd(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
+
 protected:
-    cocos2d::Camera*  _camera;
+    cocos2d::Camera* _camera;
     cocos2d::Terrain* _terrain;
-    Player * _player;
+    Player* _player;
 };
 
 class TerrainWithLightMap : public TerrainTestDemo
@@ -104,10 +106,10 @@ class TerrainWithLightMap : public TerrainTestDemo
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
 protected:
     cocos2d::Terrain* _terrain;
     cocos2d::Camera* _camera;
 };
 
-#endif // !TERRAIN_TESH_H
+#endif  // !TERRAIN_TESH_H
diff --git a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp
index f5a6c5c6380b..6947334c43b6 100644
--- a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp
+++ b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,8 +26,8 @@
 
 USING_NS_CC;
 
-#define FONT_NAME                       "fonts/Thonburi.ttf"
-#define FONT_SIZE                       36
+#define FONT_NAME "fonts/Thonburi.ttf"
+#define FONT_SIZE 36
 
 TextInputTests::TextInputTests()
 {
@@ -37,11 +37,11 @@ TextInputTests::TextInputTests()
     ADD_TEST_CASE(TextFieldTTSetCursorFromPoint);
 }
 
-static Rect getRect(Node * node)
+static Rect getRect(Node* node)
 {
     Rect rc;
     rc.origin = node->getPosition();
-    rc.size = node->getContentSize();
+    rc.size   = node->getContentSize();
     rc.origin.x -= rc.size.width / 2;
     rc.origin.y -= rc.size.height / 2;
     return rc;
@@ -56,11 +56,10 @@ std::string KeyboardNotificationLayer::title() const
 // implement KeyboardNotificationLayer
 //////////////////////////////////////////////////////////////////////////
 
-KeyboardNotificationLayer::KeyboardNotificationLayer()
-: _trackNode(0)
+KeyboardNotificationLayer::KeyboardNotificationLayer() : _trackNode(0)
 {
     // Register Touch Event
-    auto listener = EventListenerTouchOneByOne::create();
+    auto listener          = EventListenerTouchOneByOne::create();
     listener->onTouchBegan = CC_CALLBACK_2(KeyboardNotificationLayer::onTouchBegan, this);
     listener->onTouchEnded = CC_CALLBACK_2(KeyboardNotificationLayer::onTouchEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
@@ -68,20 +67,20 @@ KeyboardNotificationLayer::KeyboardNotificationLayer()
 
 void KeyboardNotificationLayer::keyboardWillShow(IMEKeyboardNotificationInfo& info)
 {
-    CCLOG("TextInputTest:keyboardWillShowAt(origin:%f,%f, size:%f,%f)",
-        info.end.origin.x, info.end.origin.y, info.end.size.width, info.end.size.height);
+    CCLOG("TextInputTest:keyboardWillShowAt(origin:%f,%f, size:%f,%f)", info.end.origin.x, info.end.origin.y,
+          info.end.size.width, info.end.size.height);
 
-    if (! _trackNode)
+    if (!_trackNode)
     {
         return;
     }
 
     auto rectTracked = getRect(_trackNode);
-    CCLOG("TextInputTest:trackingNodeAt(origin:%f,%f, size:%f,%f)",
-        rectTracked.origin.x, rectTracked.origin.y, rectTracked.size.width, rectTracked.size.height);
+    CCLOG("TextInputTest:trackingNodeAt(origin:%f,%f, size:%f,%f)", rectTracked.origin.x, rectTracked.origin.y,
+          rectTracked.size.width, rectTracked.size.height);
 
     // if the keyboard area doesn't intersect with the tracking node area, nothing need to do.
-    if (! rectTracked.intersectsRect(info.end))
+    if (!rectTracked.intersectsRect(info.end))
     {
         return;
     }
@@ -92,13 +91,13 @@ void KeyboardNotificationLayer::keyboardWillShow(IMEKeyboardNotificationInfo& in
 
     // move all the children node of KeyboardNotificationLayer
     auto& children = getChildren();
-    Node * node = 0;
-    ssize_t count = children.size();
+    Node* node     = 0;
+    ssize_t count  = children.size();
     Vec2 pos;
     for (int i = 0; i < count; ++i)
     {
         node = children.at(i);
-        pos = node->getPosition();
+        pos  = node->getPosition();
         pos.y += adjustVert;
         node->setPosition(pos);
     }
@@ -106,25 +105,24 @@ void KeyboardNotificationLayer::keyboardWillShow(IMEKeyboardNotificationInfo& in
 
 // Layer function
 
-bool KeyboardNotificationLayer::onTouchBegan(Touch  *touch, Event  *event)
+bool KeyboardNotificationLayer::onTouchBegan(Touch* touch, Event* event)
 {
     CCLOG("++++++++++++++++++++++++++++++++++++++++++++");
-    _beginPos = touch->getLocation();    
+    _beginPos = touch->getLocation();
     return true;
 }
 
-void KeyboardNotificationLayer::onTouchEnded(Touch  *touch, Event  *event)
+void KeyboardNotificationLayer::onTouchEnded(Touch* touch, Event* event)
 {
-    if (! _trackNode)
+    if (!_trackNode)
     {
         return;
     }
-    
-    auto endPos = touch->getLocation();    
+
+    auto endPos = touch->getLocation();
 
     float delta = 5.0f;
-    if (std::abs(endPos.x - _beginPos.x) > delta
-        || std::abs(endPos.y - _beginPos.y) > delta)
+    if (std::abs(endPos.x - _beginPos.x) > delta || std::abs(endPos.y - _beginPos.y) > delta)
     {
         // not click
         _beginPos.x = _beginPos.y = -1;
@@ -134,7 +132,8 @@ void KeyboardNotificationLayer::onTouchEnded(Touch  *touch, Event  *event)
     // decide the trackNode is clicked.
     Rect rect;
     rect.size = _trackNode->getContentSize();
-    auto clicked = isScreenPointInRect(endPos, Camera::getVisitingCamera(), _trackNode->getWorldToNodeTransform(), rect, nullptr);
+    auto clicked =
+        isScreenPointInRect(endPos, Camera::getVisitingCamera(), _trackNode->getWorldToNodeTransform(), rect, nullptr);
     this->onClickTrackNode(clicked, endPos);
     CCLOG("----------------------------------");
 }
@@ -172,19 +171,17 @@ void TextFieldTTFDefaultTest::onEnter()
     // add TextFieldTTF
     auto s = Director::getInstance()->getWinSize();
 
-    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>",
-        FONT_NAME,
-        FONT_SIZE);
+    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>", FONT_NAME, FONT_SIZE);
     addChild(pTextField);
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)    
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     // on android, TextFieldTTF cannot auto adjust its position when soft-keyboard pop up
     // so we had to set a higher position to make it visible
-    pTextField->setPosition(Vec2(s.width / 2, s.height/2 + 50));
+    pTextField->setPosition(Vec2(s.width / 2, s.height / 2 + 50));
 #else
     pTextField->setPosition(Vec2(s.width / 2, s.height / 2));
 #endif
-    
+
     _trackNode = pTextField;
 }
 
@@ -220,29 +217,22 @@ void TextFieldTTFActionTest::onEnter()
 
     _charLimit = 12;
 
-    _textFieldAction = RepeatForever::create(
-        Sequence::create(
-            FadeOut::create(0.25),
-            FadeIn::create(0.25),
-            nullptr
-        ));
+    _textFieldAction = RepeatForever::create(Sequence::create(FadeOut::create(0.25), FadeIn::create(0.25), nullptr));
     _textFieldAction->retain();
     _action = false;
 
     // add TextFieldTTF
     auto s = Director::getInstance()->getWinSize();
 
-    _textField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>",
-        FONT_NAME,
-        FONT_SIZE);
+    _textField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>", FONT_NAME, FONT_SIZE);
     addChild(_textField);
 
     _textField->setDelegate(this);
-    
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)    
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     // on android, TextFieldTTF cannot auto adjust its position when soft-keyboard pop up
     // so we had to set a higher position
-    _textField->setPosition(Vec2(s.width / 2, s.height/2 + 50));
+    _textField->setPosition(Vec2(s.width / 2, s.height / 2 + 50));
 #else
     _textField->setPosition(Vec2(s.width / 2, s.height / 2));
 #endif
@@ -257,9 +247,9 @@ void TextFieldTTFActionTest::onExit()
 }
 
 // TextFieldDelegate protocol
-bool TextFieldTTFActionTest::onTextFieldAttachWithIME(TextFieldTTF * sender)
+bool TextFieldTTFActionTest::onTextFieldAttachWithIME(TextFieldTTF* sender)
 {
-    if (! _action)
+    if (!_action)
     {
         _textField->runAction(_textFieldAction);
         _action = true;
@@ -267,7 +257,7 @@ bool TextFieldTTFActionTest::onTextFieldAttachWithIME(TextFieldTTF * sender)
     return false;
 }
 
-bool TextFieldTTFActionTest::onTextFieldDetachWithIME(TextFieldTTF * sender)
+bool TextFieldTTFActionTest::onTextFieldDetachWithIME(TextFieldTTF* sender)
 {
     if (_action)
     {
@@ -278,14 +268,14 @@ bool TextFieldTTFActionTest::onTextFieldDetachWithIME(TextFieldTTF * sender)
     return false;
 }
 
-bool TextFieldTTFActionTest::onTextFieldInsertText(TextFieldTTF * sender, const char * text, size_t nLen)
+bool TextFieldTTFActionTest::onTextFieldInsertText(TextFieldTTF* sender, const char* text, size_t nLen)
 {
     // if insert enter, treat as default to detach with ime
     if ('\n' == *text)
     {
         return false;
     }
-    
+
     // if the textfield's char count more than _charLimit, doesn't insert text anymore.
     if (sender->getCharCount() >= _charLimit)
     {
@@ -305,69 +295,59 @@ bool TextFieldTTFActionTest::onTextFieldInsertText(TextFieldTTF * sender, const
         endPos.x += sender->getContentSize().width / 2;
     }
     auto inputTextSize = label->getContentSize();
-    Vec2 beginPos(endPos.x, Director::getInstance()->getWinSize().height - inputTextSize.height * 2); 
+    Vec2 beginPos(endPos.x, Director::getInstance()->getWinSize().height - inputTextSize.height * 2);
 
     float duration = 0.5;
     label->setPosition(beginPos);
     label->setScale(8);
 
     auto seq = Sequence::create(
-        Spawn::create(
-            MoveTo::create(duration, endPos),
-            ScaleTo::create(duration, 1),
-            FadeOut::create(duration),
-            nullptr),
-        CallFuncN::create(CC_CALLBACK_1(TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction, this)),
-        nullptr);
+        Spawn::create(MoveTo::create(duration, endPos), ScaleTo::create(duration, 1), FadeOut::create(duration),
+                      nullptr),
+        CallFuncN::create(CC_CALLBACK_1(TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction, this)), nullptr);
     label->runAction(seq);
     return false;
 }
 
-bool TextFieldTTFActionTest::onTextFieldDeleteBackward(TextFieldTTF * sender, const char * delText, size_t nLen)
+bool TextFieldTTFActionTest::onTextFieldDeleteBackward(TextFieldTTF* sender, const char* delText, size_t nLen)
 {
     // create a delete text sprite and do some action
     auto label = Label::createWithSystemFont(delText, FONT_NAME, FONT_SIZE);
     this->addChild(label);
 
     // move the sprite to fly out
-    auto beginPos = sender->getPosition();
+    auto beginPos      = sender->getPosition();
     auto textfieldSize = sender->getContentSize();
-    auto labelSize = label->getContentSize();
+    auto labelSize     = label->getContentSize();
     beginPos.x += (textfieldSize.width - labelSize.width) / 2.0f;
-    
+
     auto winSize = Director::getInstance()->getWinSize();
-    Vec2 endPos(- winSize.width / 4.0f, winSize.height * (0.5 + (float)rand() / (2.0f * RAND_MAX)));
+    Vec2 endPos(-winSize.width / 4.0f, winSize.height * (0.5 + (float)rand() / (2.0f * RAND_MAX)));
 
-    float duration = 1;
+    float duration       = 1;
     float rotateDuration = 0.2f;
-    int repeatTime = 5; 
+    int repeatTime       = 5;
     label->setPosition(beginPos);
 
     auto seq = Sequence::create(
-        Spawn::create(
-            MoveTo::create(duration, endPos),
-            Repeat::create(
-                RotateBy::create(rotateDuration, (rand()%2) ? 360 : -360),
-                repeatTime),
-            FadeOut::create(duration),
-        nullptr),
-        CallFuncN::create(CC_CALLBACK_1(TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction, this)),
-        nullptr);
+        Spawn::create(MoveTo::create(duration, endPos),
+                      Repeat::create(RotateBy::create(rotateDuration, (rand() % 2) ? 360 : -360), repeatTime),
+                      FadeOut::create(duration), nullptr),
+        CallFuncN::create(CC_CALLBACK_1(TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction, this)), nullptr);
     label->runAction(seq);
     return false;
 }
 
-bool TextFieldTTFActionTest::onDraw(TextFieldTTF * sender)
+bool TextFieldTTFActionTest::onDraw(TextFieldTTF* sender)
 {
     return false;
 }
 
-void TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction(Node * node)
+void TextFieldTTFActionTest::callbackRemoveNodeWhenDidAction(Node* node)
 {
     this->removeChild(node, true);
 }
 
-
 //////////////////////////////////////////////////////////////////////////
 // implement TextFieldTTFSecureTextEntryTest
 //////////////////////////////////////////////////////////////////////////
@@ -380,24 +360,22 @@ std::string TextFieldTTFSecureTextEntryTest::subtitle() const
 void TextFieldTTFSecureTextEntryTest::onEnter()
 {
     KeyboardNotificationLayer::onEnter();
-    
+
     // add TextFieldTTF
     auto s = Director::getInstance()->getWinSize();
-    
-    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>",
-                                                             FONT_NAME,
-                                                             FONT_SIZE);
+
+    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>", FONT_NAME, FONT_SIZE);
     addChild(pTextField);
-    
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     // on android, TextFieldTTF cannot auto adjust its position when soft-keyboard pop up
     // so we had to set a higher position to make it visible
-    pTextField->setPosition(Vec2(s.width / 2, s.height/2 + 50));
+    pTextField->setPosition(Vec2(s.width / 2, s.height / 2 + 50));
 #else
     pTextField->setPosition(Vec2(s.width / 2, s.height / 2));
 #endif
     pTextField->setSecureTextEntry(true);
-    
+
     _trackNode = pTextField;
 }
 
@@ -437,9 +415,7 @@ void TextFieldTTSetCursorFromPoint::onEnter()
     // add TextFieldTTF
     auto s = Director::getInstance()->getWinSize();
 
-    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>",
-        FONT_NAME,
-        FONT_SIZE);
+    auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>", FONT_NAME, FONT_SIZE);
     addChild(pTextField);
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
diff --git a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h
index 050cd75ac40c..318e52e41d23 100644
--- a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h
+++ b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,14 +42,14 @@ class KeyboardNotificationLayer : public TestCase, public cocos2d::IMEDelegate
     virtual std::string title() const override;
     virtual void onClickTrackNode(bool bClicked, const cocos2d::Vec2& touchPos) = 0;
 
-    virtual void keyboardWillShow(cocos2d::IMEKeyboardNotificationInfo& info)override;
+    virtual void keyboardWillShow(cocos2d::IMEKeyboardNotificationInfo& info) override;
 
     bool onTouchBegan(cocos2d::Touch* touch, cocos2d::Event* event);
     void onTouchEnded(cocos2d::Touch* touch, cocos2d::Event* event);
 
 protected:
-    cocos2d::Node*  _trackNode;
-    cocos2d::Vec2  _beginPos;
+    cocos2d::Node* _trackNode;
+    cocos2d::Vec2 _beginPos;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -74,14 +74,14 @@ class TextFieldTTFDefaultTest : public KeyboardNotificationLayer
 
 class TextFieldTTFActionTest : public KeyboardNotificationLayer, public cocos2d::TextFieldDelegate
 {
-    cocos2d::TextFieldTTF*    _textField;
-    cocos2d::Action*          _textFieldAction;
-    bool                _action;
-    size_t              _charLimit;       // the textfield max char limit
+    cocos2d::TextFieldTTF* _textField;
+    cocos2d::Action* _textFieldAction;
+    bool _action;
+    size_t _charLimit;  // the textfield max char limit
 
 public:
     CREATE_FUNC(TextFieldTTFActionTest);
-    void callbackRemoveNodeWhenDidAction(Node * node);
+    void callbackRemoveNodeWhenDidAction(Node* node);
 
     // KeyboardNotificationLayer
     virtual std::string subtitle() const override;
@@ -92,11 +92,11 @@ class TextFieldTTFActionTest : public KeyboardNotificationLayer, public cocos2d:
     virtual void onExit() override;
 
     // TextFieldDelegate
-    virtual bool onTextFieldAttachWithIME(cocos2d::TextFieldTTF*  sender) override;
-    virtual bool onTextFieldDetachWithIME(cocos2d::TextFieldTTF*  sender) override;
-    virtual bool onTextFieldInsertText(cocos2d::TextFieldTTF*  sender, const char * text, size_t nLen) override;
-    virtual bool onTextFieldDeleteBackward(cocos2d::TextFieldTTF*  sender, const char * delText, size_t nLen) override;
-    virtual bool onDraw(cocos2d::TextFieldTTF*  sender);
+    virtual bool onTextFieldAttachWithIME(cocos2d::TextFieldTTF* sender) override;
+    virtual bool onTextFieldDetachWithIME(cocos2d::TextFieldTTF* sender) override;
+    virtual bool onTextFieldInsertText(cocos2d::TextFieldTTF* sender, const char* text, size_t nLen) override;
+    virtual bool onTextFieldDeleteBackward(cocos2d::TextFieldTTF* sender, const char* delText, size_t nLen) override;
+    virtual bool onDraw(cocos2d::TextFieldTTF* sender);
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -107,7 +107,7 @@ class TextFieldTTFSecureTextEntryTest : public TextFieldTTFDefaultTest
 {
 public:
     CREATE_FUNC(TextFieldTTFSecureTextEntryTest);
-    
+
     virtual std::string subtitle() const override;
     // Layer
     virtual void onEnter() override;
@@ -128,4 +128,4 @@ class TextFieldTTSetCursorFromPoint : public KeyboardNotificationLayer
     // Layer
     virtual void onEnter() override;
 };
-#endif    // __TEXT_INPUT_TEST_H__
+#endif  // __TEXT_INPUT_TEST_H__
diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp
index 166bb652988d..114d979102f0 100644
--- a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp
+++ b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp
@@ -30,8 +30,9 @@
 
 USING_NS_CC;
 
-enum {
-    kTagLabel = 1,
+enum
+{
+    kTagLabel   = 1,
     kTagSprite1 = 2,
     kTagSprite2 = 3,
 };
@@ -82,9 +83,9 @@ Texture2DTests::Texture2DTests()
     ADD_TEST_CASE(TexturePVRI8v3);
     ADD_TEST_CASE(TexturePVRAI88);
     ADD_TEST_CASE(TexturePVRAI88v3);
-    
+
     ADD_TEST_CASE(TexturePVRv3Premult);
-    
+
     ADD_TEST_CASE(TexturePVRBadEncoding);
     ADD_TEST_CASE(TextureWEBPNoAlpha)
     ADD_TEST_CASE(TexturePixelFormat);
@@ -121,7 +122,7 @@ void TextureDemo::onEnter()
 {
     TestCase::onEnter();
 
-    auto col = LayerColor::create(Color4B(128,128,128,255));
+    auto col = LayerColor::create(Color4B(128, 128, 128, 255));
     addChild(col, -10);
 
     auto textureCache = Director::getInstance()->getTextureCache();
@@ -145,7 +146,7 @@ void TextureASTC::onEnter()
 {
     TextureDemo::onEnter();
 
-    auto& s = getContentSize();
+    auto& s     = getContentSize();
     _background = LayerColor::create(Color4B(15, 19, 42, 255), s.width, s.height);
     _background->setIgnoreAnchorPointForPosition(false);
     _background->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
@@ -184,7 +185,7 @@ std::string TextureASTC::title() const
 
 TextureETC1Alpha::TextureETC1Alpha()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(TextureETC1Alpha::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
@@ -195,7 +196,7 @@ bool TextureETC1Alpha::init()
         return false;
 
     auto& canvasSize = getContentSize();
-    _background = LayerColor::create(Color4B(15, 19, 42, 255), canvasSize.width, canvasSize.height);
+    _background      = LayerColor::create(Color4B(15, 19, 42, 255), canvasSize.width, canvasSize.height);
     _background->setIgnoreAnchorPointForPosition(false);
     _background->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
 
@@ -209,7 +210,7 @@ bool TextureETC1Alpha::init()
 
 void TextureETC1Alpha::addNewSpriteWithCoords(Vec2 p)
 {
-    auto sprite = Sprite::create("Images/grossini_dance_08.png");
+    auto sprite           = Sprite::create("Images/grossini_dance_08.png");
     Texture2D* etcTexture = _director->getTextureCache()->addImage("Images/etc1-alpha.pkm");
     sprite->setTexture(etcTexture);
     sprite->setTextureRect(Rect(Vec2::ZERO, etcTexture->getContentSize()));
@@ -232,7 +233,7 @@ void TextureETC1Alpha::addNewSpriteWithCoords(Vec2 p)
     else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
+    auto seq         = Sequence::create(action, action_back, nullptr);
 
     sprite->runAction(RepeatForever::create(seq));
 }
@@ -265,7 +266,7 @@ std::string TextureETC1Alpha::subtitle() const
 
 TextureETC2::TextureETC2()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(TextureETC2::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
@@ -276,7 +277,7 @@ bool TextureETC2::init()
         return false;
 
     auto& canvasSize = getContentSize();
-    _background = LayerColor::create(Color4B(15, 19, 42, 255), canvasSize.width, canvasSize.height);
+    _background      = LayerColor::create(Color4B(15, 19, 42, 255), canvasSize.width, canvasSize.height);
     _background->setIgnoreAnchorPointForPosition(false);
     _background->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
 
@@ -290,7 +291,7 @@ bool TextureETC2::init()
 
 void TextureETC2::addNewSpriteWithCoords()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s       = Director::getInstance()->getWinSize();
     auto sprite4 = Sprite::create("Images/etc2_rgb.pkm");
     sprite4->setPosition(Vec2(s.width * 0.3, s.height * 0.5));
     _background->addChild(sprite4);
@@ -302,9 +303,9 @@ void TextureETC2::addNewSpriteWithCoords()
 
 void TextureETC2::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
 {
-    //for (auto touch : touches)
+    // for (auto touch : touches)
     //{
-    //    auto location = touch->getLocation();
+    //     auto location = touch->getLocation();
 
     //    addNewSpriteWithCoords();
     //}
@@ -320,7 +321,6 @@ std::string TextureETC2::subtitle() const
     return "";
 }
 
-
 //------------------------------------------------------------------
 //
 // TextureBMP
@@ -329,7 +329,7 @@ std::string TextureETC2::subtitle() const
 
 TextureBMP::TextureBMP()
 {
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesEnded = CC_CALLBACK_2(TextureBMP::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
@@ -340,9 +340,8 @@ TextureBMP::TextureBMP()
 void TextureBMP::addNewSpriteWithCoords(Vec2 p)
 {
     int idx = (int)(CCRANDOM_0_1() * 1400.0f / 100.0f);
-    int x = (idx % 5) * 85;
-    int y = (idx / 5) * 121;
-
+    int x   = (idx % 5) * 85;
+    int y   = (idx / 5) * 121;
 
     auto sprite = Sprite::create("Images/x-studio_64.bmp");
     addChild(sprite);
@@ -363,7 +362,7 @@ void TextureBMP::addNewSpriteWithCoords(Vec2 p)
     else
         action = FadeOut::create(2);
     auto action_back = action->reverse();
-    auto seq = Sequence::create(action, action_back, nullptr);
+    auto seq         = Sequence::create(action, action_back, nullptr);
 
     sprite->runAction(RepeatForever::create(seq));
 }
@@ -398,9 +397,9 @@ void TextureTGA::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("TileMaps/levelmap.tga");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     this->addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -417,31 +416,31 @@ std::string TextureTGA::title() const
 //------------------------------------------------------------------
 void TexturePNG::onEnter()
 {
-    TextureDemo::onEnter();    
+    TextureDemo::onEnter();
 
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image.png");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
-    
+
     // Test PNG files with different pixel formats
     // grayscale without alpha
     auto i8 = Sprite::create("Images/test_image_i8.png");
-    i8->setPosition(s.width/4.0f, s.height/4.0f);
+    i8->setPosition(s.width / 4.0f, s.height / 4.0f);
     addChild(i8);
-    
+
     // grayscale with alpha
     auto ai88 = Sprite::create("Images/test_image_ai88.png");
     ai88->setPosition(s.width / 4.0f, s.height * 3.0f / 4.0f);
     addChild(ai88);
-    
+
     // rgb without alpha
     auto rgb888 = Sprite::create("Images/test_image_rgb888.png");
     rgb888->setPosition(s.width * 3.0f / 4.0f, s.height / 4.0f);
     addChild(rgb888);
-    
+
     // rgba with alpha
     auto rgba8888 = Sprite::create("Images/test_image_rgba8888.png");
     rgba8888->setPosition(s.width * 3.0f / 4.0f, s.height * 3.0f / 4.0f);
@@ -467,9 +466,9 @@ void TextureJPEG::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image.jpeg");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -488,13 +487,14 @@ void TextureWEBP::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image.webp");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
     Texture2D* texture = Director::getInstance()->getTextureCache()->getTextureForKey("Images/test_image.webp");
-    log("pixel format:%d, premultiplied alpha:%d\n", static_cast<int>(texture->getPixelFormat()), texture->hasPremultipliedAlpha());
+    log("pixel format:%d, premultiplied alpha:%d\n", static_cast<int>(texture->getPixelFormat()),
+        texture->hasPremultipliedAlpha());
 }
 
 std::string TextureWEBP::title() const
@@ -511,13 +511,15 @@ void TextureWEBPNoAlpha::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_no_alpha.webp");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
-    Texture2D* texture = Director::getInstance()->getTextureCache()->getTextureForKey("Images/test_image_no_alpha.webp");
-    log("pixel format:%d, premultiplied alpha:%d\n", static_cast<int>(texture->getPixelFormat()), texture->hasPremultipliedAlpha());
+    Texture2D* texture =
+        Director::getInstance()->getTextureCache()->getTextureForKey("Images/test_image_no_alpha.webp");
+    log("pixel format:%d, premultiplied alpha:%d\n", static_cast<int>(texture->getPixelFormat()),
+        texture->hasPremultipliedAlpha());
 }
 
 std::string TextureWEBPNoAlpha::title() const
@@ -537,30 +539,27 @@ void TextureMipMap::onEnter()
 
     auto texture0 = Director::getInstance()->getTextureCache()->addImage("Images/grossini_dance_atlas.png");
     texture0->generateMipmap();
-    Texture2D::TexParams texParams = {
-        backend::SamplerFilter::LINEAR_MIPMAP_LINEAR,
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE };
+    Texture2D::TexParams texParams = {backend::SamplerFilter::LINEAR_MIPMAP_LINEAR, backend::SamplerFilter::LINEAR,
+                                      backend::SamplerAddressMode::CLAMP_TO_EDGE,
+                                      backend::SamplerAddressMode::CLAMP_TO_EDGE};
     texture0->setTexParameters(texParams);
 
     auto texture1 = Director::getInstance()->getTextureCache()->addImage("Images/grossini_dance_atlas_nomipmap.png");
 
     auto img0 = Sprite::createWithTexture(texture0);
     img0->setTextureRect(Rect(85, 121, 85, 121));
-    img0->setPosition(Vec2( s.width/3.0f, s.height/2.0f));
+    img0->setPosition(Vec2(s.width / 3.0f, s.height / 2.0f));
     addChild(img0);
 
     auto img1 = Sprite::createWithTexture(texture1);
     img1->setTextureRect(Rect(85, 121, 85, 121));
-    img1->setPosition(Vec2( 2*s.width/3.0f, s.height/2.0f));
+    img1->setPosition(Vec2(2 * s.width / 3.0f, s.height / 2.0f));
     addChild(img1);
-    
-    
-    auto scale1 = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
+
+    auto scale1  = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
     auto sc_back = scale1->reverse();
-    
-    auto scale2 = scale1->clone();
+
+    auto scale2   = scale1->clone();
     auto sc_back2 = scale2->reverse();
 
     img0->runAction(RepeatForever::create(Sequence::create(scale1, sc_back, nullptr)));
@@ -591,32 +590,30 @@ void TexturePVRMipMap::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto imgMipMap = Sprite::create("Images/logo-mipmap.pvr");
-    if( imgMipMap )
+    if (imgMipMap)
     {
-        imgMipMap->setPosition(Vec2( s.width/2.0f-100, s.height/2.0f));
+        imgMipMap->setPosition(Vec2(s.width / 2.0f - 100, s.height / 2.0f));
         addChild(imgMipMap);
 
         // support mipmap filtering
-        Texture2D::TexParams texParams = {
-            backend::SamplerFilter::LINEAR_MIPMAP_LINEAR,
-            backend::SamplerFilter::LINEAR,
-            backend::SamplerAddressMode::CLAMP_TO_EDGE,
-            backend::SamplerAddressMode::CLAMP_TO_EDGE };
+        Texture2D::TexParams texParams = {backend::SamplerFilter::LINEAR_MIPMAP_LINEAR, backend::SamplerFilter::LINEAR,
+                                          backend::SamplerAddressMode::CLAMP_TO_EDGE,
+                                          backend::SamplerAddressMode::CLAMP_TO_EDGE};
         imgMipMap->getTexture()->setTexParameters(texParams);
     }
 
     auto img = Sprite::create("Images/logo-nomipmap.pvr");
-    if( img )
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f+100, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f + 100, s.height / 2.0f));
         addChild(img);
 
-        auto scale1 = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
+        auto scale1  = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
         auto sc_back = scale1->reverse();
 
-        auto scale2 = scale1->clone();
+        auto scale2   = scale1->clone();
         auto sc_back2 = scale2->reverse();
-        
+
         imgMipMap->runAction(RepeatForever::create(Sequence::create(scale1, sc_back, nullptr)));
         img->runAction(RepeatForever::create(Sequence::create(scale2, sc_back2, nullptr)));
     }
@@ -641,29 +638,27 @@ void TexturePVRMipMap2::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto imgMipMap = Sprite::create("Images/test_image_rgba4444_mipmap.pvr");
-    imgMipMap->setPosition(Vec2( s.width/2.0f-100, s.height/2.0f));
+    imgMipMap->setPosition(Vec2(s.width / 2.0f - 100, s.height / 2.0f));
     addChild(imgMipMap);
-    
+
     // support mipmap filtering
-    Texture2D::TexParams texParams = {
-        backend::SamplerFilter::LINEAR_MIPMAP_LINEAR,
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE };
+    Texture2D::TexParams texParams = {backend::SamplerFilter::LINEAR_MIPMAP_LINEAR, backend::SamplerFilter::LINEAR,
+                                      backend::SamplerAddressMode::CLAMP_TO_EDGE,
+                                      backend::SamplerAddressMode::CLAMP_TO_EDGE};
     imgMipMap->getTexture()->setTexParameters(texParams);
 
     auto img = Sprite::create("Images/test_image.png");
-    img->setPosition(Vec2( s.width/2.0f+100, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f + 100, s.height / 2.0f));
     addChild(img);
-    
-    auto scale1 = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
+
+    auto scale1  = EaseOut::create(ScaleBy::create(4, 0.01f), 3);
     auto sc_back = scale1->reverse();
 
-    auto scale2 = scale1->clone();
+    auto scale2   = scale1->clone();
     auto sc_back2 = scale2->reverse();
-    
+
     imgMipMap->runAction(RepeatForever::create(Sequence::create(scale1, sc_back, nullptr)));
     img->runAction(RepeatForever::create(Sequence::create(scale2, sc_back2, nullptr)));
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -692,10 +687,10 @@ void TexturePVR2BPP::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image_pvrtc2bpp.pvr");
-    
-    if( img )
+
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -717,12 +712,12 @@ void TexturePVRTest::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image.pvr");
-    
-    if( img )
+
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
@@ -730,7 +725,6 @@ void TexturePVRTest::onEnter()
         log("This test is not supported.");
     }
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
-
 }
 
 std::string TexturePVRTest::title() const
@@ -751,10 +745,10 @@ void TexturePVR4BPP::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image_pvrtc4bpp.pvr");
-    
-    if( img )
+
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
@@ -782,7 +776,7 @@ void TexturePVRRGBA8888::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image_rgba8888.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -803,11 +797,11 @@ void TexturePVRBGRA8888::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_bgra8888.pvr");
-    if( img )
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
@@ -832,9 +826,9 @@ std::string TexturePVRBGRA8888::title() const
 void TexturePVRRGBA5551::onEnter()
 {
     TextureDemo::onEnter();
-    auto s = Director::getInstance()->getWinSize();
+    auto s   = Director::getInstance()->getWinSize();
     auto img = Sprite::create("Images/test_image_rgba5551.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -855,9 +849,9 @@ void TexturePVRRGBA4444::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgba4444.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -885,7 +879,7 @@ void TexturePVRRGBA4444GZ::onEnter()
 #else
     auto img = Sprite::create("Images/test_image_rgba4444.pvr.gz");
 #endif
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -913,8 +907,8 @@ void TexturePVRRGBA4444CCZ::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image_rgba4444.pvr.ccz");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
-    addChild(img);    
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
+    addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -939,9 +933,9 @@ void TexturePVRRGB565::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgb565.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -962,12 +956,11 @@ void TexturePVRRGB888::onEnter()
     auto img = Sprite::create("Images/test_image_rgb888.pvr");
     if (img != nullptr)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
 
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
-
 }
 std::string TexturePVRRGB888::title() const
 {
@@ -985,12 +978,11 @@ void TexturePVRA8::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_a8.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
-
 }
 
 std::string TexturePVRA8::title() const
@@ -1011,7 +1003,7 @@ void TexturePVRI8::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image_i8.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -1032,9 +1024,9 @@ void TexturePVRAI88::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_ai88.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -1049,15 +1041,15 @@ void TexturePVR2BPPv3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_pvrtc2bpp_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1076,15 +1068,15 @@ void TexturePVRII2BPPv3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_pvrtcii2bpp_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1103,19 +1095,19 @@ void TexturePVR4BPPv3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_pvrtc4bpp_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
     {
         log("This test is not supported");
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1138,19 +1130,19 @@ void TexturePVRII4BPPv3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_pvrtcii4bpp_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
     {
         log("This test is not supported");
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1169,15 +1161,15 @@ void TexturePVRRGBA8888v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgba8888_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1196,19 +1188,19 @@ void TexturePVRBGRA8888v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_bgra8888_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     else
     {
         log("BGRA images are not supported");
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1227,15 +1219,15 @@ void TexturePVRRGBA5551v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgba5551_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1254,15 +1246,15 @@ void TexturePVRRGBA4444v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgba4444_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1281,15 +1273,15 @@ void TexturePVRRGB565v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgb565_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1308,15 +1300,15 @@ void TexturePVRRGB888v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_rgb888_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1335,15 +1327,15 @@ void TexturePVRA8v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_a8_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1362,15 +1354,15 @@ void TexturePVRI8v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_i8_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1389,15 +1381,15 @@ void TexturePVRAI88v3::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/test_image_ai88_v3.pvr");
-    
+
     if (img)
     {
-        img->setPosition(Vec2(s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
-    
+
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
 
@@ -1424,9 +1416,9 @@ void TexturePVRBadEncoding::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/test_image-bad_encoding.pvr");
-    if( img )
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
 }
@@ -1450,9 +1442,9 @@ void TexturePVRNonSquare::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/grossini_128x256_mipmap.pvr");
-    img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+    img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
     addChild(img);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
 }
@@ -1478,9 +1470,9 @@ void TexturePVRNPOT4444::onEnter()
     auto s = Director::getInstance()->getWinSize();
 
     auto img = Sprite::create("Images/grossini_pvr_rgba4444.pvr");
-    if ( img )
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -1505,11 +1497,11 @@ void TexturePVRNPOT8888::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     auto img = Sprite::create("Images/grossini_pvr_rgba8888.pvr");
-    if( img )
+    if (img)
     {
-        img->setPosition(Vec2( s.width/2.0f, s.height/2.0f));
+        img->setPosition(Vec2(s.width / 2.0f, s.height / 2.0f));
         addChild(img);
     }
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -1534,35 +1526,35 @@ void TextureAlias::onEnter()
 {
     TextureDemo::onEnter();
     auto s = Director::getInstance()->getWinSize();
-    
+
     //
     // Sprite 1: GL_LINEAR
     //
     // Default filter is GL_LINEAR
-    
+
     auto sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2( s.width/3.0f, s.height/2.0f));
+    sprite->setPosition(Vec2(s.width / 3.0f, s.height / 2.0f));
     addChild(sprite);
-    
+
     // this is the default filtering
     sprite->getTexture()->setAntiAliasTexParameters();
-    
+
     //
     // Sprite 1: GL_NEAREST
-    //    
-    
+    //
+
     auto sprite2 = Sprite::create("Images/grossinis_sister2.png");
-    sprite2->setPosition(Vec2( 2*s.width/3.0f, s.height/2.0f));
+    sprite2->setPosition(Vec2(2 * s.width / 3.0f, s.height / 2.0f));
     addChild(sprite2);
-    
+
     // Use Nearest in this one
     sprite2->getTexture()->setAliasTexParameters();
-        
+
     // scale them to show
-    auto sc = ScaleBy::create(3, 8.0f);
-    auto sc_back = sc->reverse();
+    auto sc           = ScaleBy::create(3, 8.0f);
+    auto sc_back      = sc->reverse();
     auto scaleforever = RepeatForever::create(Sequence::create(sc, sc_back, nullptr));
-    auto scaleToo = scaleforever->clone();
+    auto scaleToo     = scaleforever->clone();
 
     sprite2->runAction(scaleforever);
     sprite->runAction(scaleToo);
@@ -1594,75 +1586,75 @@ void TexturePixelFormat::onEnter()
     // 3- 16-bit RGB5A1
     // 4- 16-bit RGB565
     TextureDemo::onEnter();
-        
+
     auto s = Director::getInstance()->getWinSize();
 
-    auto background = LayerColor::create(Color4B(128,128,128,255), s.width, s.height);
+    auto background = LayerColor::create(Color4B(128, 128, 128, 255), s.width, s.height);
     addChild(background, -1);
-    
+
     // RGBA 8888 image (32-bit)
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     auto sprite1 = Sprite::create("Images/test-rgba1.png");
-    sprite1->setPosition(Vec2(1*s.width/7, s.height/2+32));
+    sprite1->setPosition(Vec2(1 * s.width / 7, s.height / 2 + 32));
     addChild(sprite1, 0);
 
-    // remove texture from texture manager    
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite1->getTexture());
 
     // RGBA 4444 image (16-bit)
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA4);
     auto sprite2 = Sprite::create("Images/test-rgba1.png");
-    sprite2->setPosition(Vec2(2*s.width/7, s.height/2-32));
+    sprite2->setPosition(Vec2(2 * s.width / 7, s.height / 2 - 32));
     addChild(sprite2, 0);
 
-    // remove texture from texture manager    
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite2->getTexture());
 
     // RGB5A1 image (16-bit)
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGB5A1);
     auto sprite3 = Sprite::create("Images/test-rgba1.png");
-    sprite3->setPosition(Vec2(3*s.width/7, s.height/2+32));
+    sprite3->setPosition(Vec2(3 * s.width / 7, s.height / 2 + 32));
     addChild(sprite3, 0);
 
-    // remove texture from texture manager    
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite3->getTexture());
 
     // RGB888 image
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGB8);
     auto sprite4 = Sprite::create("Images/test-rgba1.png");
-    sprite4->setPosition(Vec2(4*s.width/7, s.height/2-32));
+    sprite4->setPosition(Vec2(4 * s.width / 7, s.height / 2 - 32));
     addChild(sprite4, 0);
 
-    // remove texture from texture manager    
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite4->getTexture());
 
     // RGB565 image (16-bit)
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGB565);
     auto sprite5 = Sprite::create("Images/test-rgba1.png");
-    sprite5->setPosition(Vec2(5*s.width/7, s.height/2+32));
+    sprite5->setPosition(Vec2(5 * s.width / 7, s.height / 2 + 32));
     addChild(sprite5, 0);
 
-    // remove texture from texture manager    
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite5->getTexture());
 
     // A8 image (8-bit)
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::A8);
     auto sprite6 = Sprite::create("Images/test-rgba1.png");
-    sprite6->setPosition(Vec2(6*s.width/7, s.height/2-32));
+    sprite6->setPosition(Vec2(6 * s.width / 7, s.height / 2 - 32));
     addChild(sprite6, 0);
-    
-    // remove texture from texture manager    
+
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite6->getTexture());
 
-    auto fadeout = FadeOut::create(2);
-    auto fadein  = FadeIn::create(2);
-    auto seq = Sequence::create(DelayTime::create(2), fadeout, fadein, nullptr);
-    auto seq_4ever = RepeatForever::create(seq);
+    auto fadeout    = FadeOut::create(2);
+    auto fadein     = FadeIn::create(2);
+    auto seq        = Sequence::create(DelayTime::create(2), fadeout, fadein, nullptr);
+    auto seq_4ever  = RepeatForever::create(seq);
     auto seq_4ever2 = seq_4ever->clone();
     auto seq_4ever3 = seq_4ever->clone();
     auto seq_4ever4 = seq_4ever->clone();
     auto seq_4ever5 = seq_4ever->clone();
-    
+
     sprite1->runAction(seq_4ever);
     sprite2->runAction(seq_4ever2);
     sprite3->runAction(seq_4ever3);
@@ -1693,29 +1685,29 @@ void TextureBlend::onEnter()
 {
     TextureDemo::onEnter();
 
-    for( int i=0;i < 15;i++ )
+    for (int i = 0; i < 15; i++)
     {
         // BOTTOM sprites have alpha pre-multiplied
         // they use by default BlendFactor::ONE, BlendFactor::ONE_MINUS_SRC_ALPHA
         auto cloud = Sprite::create("Images/test_blend.png");
-        addChild(cloud, i+1, 100+i);
-        cloud->setPosition(Vec2(50+25*i, 80));
-        cloud->setBlendFunc( BlendFunc::ALPHA_PREMULTIPLIED );
+        addChild(cloud, i + 1, 100 + i);
+        cloud->setPosition(Vec2(50 + 25 * i, 80));
+        cloud->setBlendFunc(BlendFunc::ALPHA_PREMULTIPLIED);
 
         // CENTER sprites have also alpha pre-multiplied
         // they use by default BlendFactor::SRC_ALPHA, BlendFactor::ONE_MINUS_SRC_ALPHA
         cloud = Sprite::create("Images/test_blend.png");
-        addChild(cloud, i+1, 200+i);
-        cloud->setPosition(Vec2(50+25*i, 160));
-        BlendFunc blendFunc2 = { backend::BlendFactor::ONE_MINUS_DST_COLOR, backend::BlendFactor::ZERO };
+        addChild(cloud, i + 1, 200 + i);
+        cloud->setPosition(Vec2(50 + 25 * i, 160));
+        BlendFunc blendFunc2 = {backend::BlendFactor::ONE_MINUS_DST_COLOR, backend::BlendFactor::ZERO};
         cloud->setBlendFunc(blendFunc2);
 
         // UPPER sprites are using custom blending function
         // You can set any blend function to your sprites
         cloud = Sprite::create("Images/test_blend.png");
-        addChild(cloud, i+1, 200+i);
-        cloud->setPosition(Vec2(50+25*i, 320-80));
-        BlendFunc blendFunc3 = { backend::BlendFactor::SRC_ALPHA, backend::BlendFactor::ONE };
+        addChild(cloud, i + 1, 200 + i);
+        cloud->setPosition(Vec2(50 + 25 * i, 320 - 80));
+        BlendFunc blendFunc3 = {backend::BlendFactor::SRC_ALPHA, backend::BlendFactor::ONE};
         cloud->setBlendFunc(blendFunc3);  // additive blending
     }
 }
@@ -1730,7 +1722,6 @@ std::string TextureBlend::subtitle() const
     return "Testing 3 different blending modes";
 }
 
-
 //------------------------------------------------------------------
 //
 // TextureAsync
@@ -1746,12 +1737,12 @@ void TextureAsync::onEnter()
     auto size = Director::getInstance()->getWinSize();
 
     auto label = Label::createWithTTF("Loading...", "fonts/Marker Felt.ttf", 32);
-    label->setPosition(Vec2( size.width/2, size.height/2));
+    label->setPosition(Vec2(size.width / 2, size.height / 2));
     addChild(label, 10);
 
-    auto scale = ScaleBy::create(0.3f, 2);
+    auto scale      = ScaleBy::create(0.3f, 2);
     auto scale_back = scale->reverse();
-    auto seq = Sequence::create(scale, scale_back, nullptr);
+    auto seq        = Sequence::create(scale, scale_back, nullptr);
     label->runAction(RepeatForever::create(seq));
 
     scheduleOnce(CC_SCHEDULE_SELECTOR(TextureAsync::loadImages), 1.0f);
@@ -1767,8 +1758,10 @@ TextureAsync::~TextureAsync()
 void TextureAsync::loadImages(float dt)
 {
     auto textureCache = Director::getInstance()->getTextureCache();
-    for( int i=0;i < 8;i++) {
-        for( int j=0;j < 8; j++) {
+    for (int i = 0; i < 8; i++)
+    {
+        for (int j = 0; j < 8; j++)
+        {
             char szSpriteName[100] = {0};
             sprintf(szSpriteName, "Images/sprites_test/sprite-%d-%d.png", i, j);
             textureCache->addImageAsync(szSpriteName, CC_CALLBACK_1(TextureAsync::imageLoaded, this));
@@ -1782,24 +1775,23 @@ void TextureAsync::loadImages(float dt)
     textureCache->addImageAsync("Images/grossini_dance_atlas.png", CC_CALLBACK_1(TextureAsync::imageLoaded, this));
 }
 
-
 void TextureAsync::imageLoaded(Texture2D* texture)
 {
     auto director = Director::getInstance();
 
-    //CCASSERT( [NSThread currentThread] == [director runningThread], @"FAIL. Callback should be on cocos2d thread");
+    // CCASSERT( [NSThread currentThread] == [director runningThread], @"FAIL. Callback should be on cocos2d thread");
 
     // IMPORTANT: The order on the callback is not guaranteed. Don't depend on the callback
 
     // This test just creates a sprite based on the Texture
 
     auto sprite = Sprite::createWithTexture(texture);
-    sprite->setAnchorPoint(Vec2(0,0));
+    sprite->setAnchorPoint(Vec2(0, 0));
     addChild(sprite, -1);
 
     auto size = director->getWinSize();
-    int i = _imageOffset * 32;
-    sprite->setPosition(Vec2( i % (int)size.width, (i / (int)size.width) * 32 ));
+    int i     = _imageOffset * 32;
+    sprite->setPosition(Vec2(i % (int)size.width, (i / (int)size.width) * 32));
 
     _imageOffset++;
 
@@ -1816,7 +1808,6 @@ std::string TextureAsync::subtitle() const
     return "Textures should load while an animation is being run";
 }
 
-
 //------------------------------------------------------------------
 //
 // TextureGlClamp
@@ -1830,21 +1821,18 @@ void TextureGlClamp::onEnter()
 
     // The .png image MUST be power of 2 in order to create a continue effect.
     // eg: 32x64, 512x128, 256x1024, 64x64, etc..
-    auto sprite = Sprite::create("Images/pattern1.png", Rect(0,0,512,256));
+    auto sprite = Sprite::create("Images/pattern1.png", Rect(0, 0, 512, 256));
     addChild(sprite, -1, kTagSprite1);
-    sprite->setPosition(Vec2(size.width/2,size.height/2));
-    Texture2D::TexParams texParams(
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE,
-        backend::SamplerAddressMode::CLAMP_TO_EDGE
-    );
+    sprite->setPosition(Vec2(size.width / 2, size.height / 2));
+    Texture2D::TexParams texParams(backend::SamplerFilter::LINEAR, backend::SamplerFilter::LINEAR,
+                                   backend::SamplerAddressMode::CLAMP_TO_EDGE,
+                                   backend::SamplerAddressMode::CLAMP_TO_EDGE);
     sprite->getTexture()->setTexParameters(texParams);
     auto rotate = RotateBy::create(4, 360);
     sprite->runAction(rotate);
-    auto scale = ScaleBy::create(2, 0.04f);
+    auto scale     = ScaleBy::create(2, 0.04f);
     auto scaleBack = scale->reverse();
-    auto seq = Sequence::create(scale, scaleBack, nullptr);
+    auto seq       = Sequence::create(scale, scaleBack, nullptr);
     sprite->runAction(seq);
 }
 
@@ -1868,25 +1856,21 @@ void TextureGlRepeat::onEnter()
     TextureDemo::onEnter();
 
     auto size = Director::getInstance()->getWinSize();
-    
+
     // The .png image MUST be power of 2 in order to create a continue effect.
     // eg: 32x64, 512x128, 256x1024, 64x64, etc..
     auto sprite = Sprite::create("Images/pattern1.png", Rect(0, 0, 4096, 4096));
     addChild(sprite, -1, kTagSprite1);
-    sprite->setPosition(Vec2(size.width/2,size.height/2));
-    Texture2D::TexParams descriptor = { 
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerFilter::LINEAR,
-        backend::SamplerAddressMode::REPEAT,
-        backend::SamplerAddressMode::REPEAT
-    };
+    sprite->setPosition(Vec2(size.width / 2, size.height / 2));
+    Texture2D::TexParams descriptor = {backend::SamplerFilter::LINEAR, backend::SamplerFilter::LINEAR,
+                                       backend::SamplerAddressMode::REPEAT, backend::SamplerAddressMode::REPEAT};
     sprite->getTexture()->setTexParameters(descriptor);
-    
+
     auto rotate = RotateBy::create(4, 360);
     sprite->runAction(rotate);
-    auto scale = ScaleBy::create(2, 0.04f);
+    auto scale     = ScaleBy::create(2, 0.04f);
     auto scaleBack = scale->reverse();
-    auto seq = Sequence::create(scale, scaleBack, nullptr);
+    auto seq       = Sequence::create(scale, scaleBack, nullptr);
     sprite->runAction(seq);
 }
 
@@ -1908,35 +1892,35 @@ TextureGlRepeat::~TextureGlRepeat()
 void TextureSizeTest::onEnter()
 {
     TextureDemo::onEnter();
-    Sprite *sprite = nullptr;
-    
+    Sprite* sprite = nullptr;
+
     log("Loading 512x512 image...");
     sprite = Sprite::create("Images/texture512x512.png");
-    if( sprite )
+    if (sprite)
         log("OK");
     else
         log("Error");
 
     log("Loading 1024x1024 image...");
     sprite = Sprite::create("Images/texture1024x1024.png");
-    if( sprite )
+    if (sprite)
         log("OK");
     else
         log("Error");
-//     @todo
-//     log("Loading 2048x2048 image...");
-//     sprite = Sprite::create("Images/texture2048x2048.png");
-//     if( sprite )
-//         log("OK");
-//     else
-//         log("Error");
-//     
-//     log("Loading 4096x4096 image...");
-//     sprite = Sprite::create("Images/texture4096x4096.png");
-//     if( sprite )
-//         log("OK");
-//     else
-//         log("Error");
+    //     @todo
+    //     log("Loading 2048x2048 image...");
+    //     sprite = Sprite::create("Images/texture2048x2048.png");
+    //     if( sprite )
+    //         log("OK");
+    //     else
+    //         log("Error");
+    //
+    //     log("Loading 4096x4096 image...");
+    //     sprite = Sprite::create("Images/texture4096x4096.png");
+    //     if( sprite )
+    //         log("OK");
+    //     else
+    //         log("Error");
 }
 
 std::string TextureSizeTest::title() const
@@ -1959,35 +1943,35 @@ void TextureCache1::onEnter()
     TextureDemo::onEnter();
 
     auto s = Director::getInstance()->getWinSize();
-    
-    Sprite *sprite;
+
+    Sprite* sprite;
 
     sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2(s.width/5*1, s.height/2));
+    sprite->setPosition(Vec2(s.width / 5 * 1, s.height / 2));
     sprite->getTexture()->setAliasTexParameters();
     sprite->setScale(2);
     addChild(sprite);
 
     Director::getInstance()->getTextureCache()->removeTexture(sprite->getTexture());
-    
+
     sprite = Sprite::create("Images/grossinis_sister1.png");
-    sprite->setPosition(Vec2(s.width/5*2, s.height/2));
+    sprite->setPosition(Vec2(s.width / 5 * 2, s.height / 2));
     sprite->getTexture()->setAntiAliasTexParameters();
     sprite->setScale(2);
     addChild(sprite);
 
     // 2nd set of sprites
-    
+
     sprite = Sprite::create("Images/grossinis_sister2.png");
-    sprite->setPosition(Vec2(s.width/5*3, s.height/2));
+    sprite->setPosition(Vec2(s.width / 5 * 3, s.height / 2));
     sprite->getTexture()->setAliasTexParameters();
     sprite->setScale(2);
     addChild(sprite);
-    
+
     Director::getInstance()->getTextureCache()->removeTextureForKey("Images/grossinis_sister2.png");
 
     sprite = Sprite::create("Images/grossinis_sister2.png");
-    sprite->setPosition(Vec2(s.width/5*4, s.height/2));
+    sprite->setPosition(Vec2(s.width / 5 * 4, s.height / 2));
     sprite->getTexture()->setAntiAliasTexParameters();
     sprite->setScale(2);
     addChild(sprite);
@@ -2008,9 +1992,9 @@ void TextureDrawAtPoint::onEnter()
 {
     TextureDemo::onEnter();
 
-    _tex1 = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister1.png");
+    _tex1  = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister1.png");
     _Tex2F = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister2.png");
-    
+
     _tex1->retain();
     _Tex2F->retain();
 }
@@ -2031,14 +2015,14 @@ std::string TextureDrawAtPoint::subtitle() const
     return "draws 2 textures using drawAtPoint";
 }
 
-void TextureDrawAtPoint::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void TextureDrawAtPoint::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     TextureDemo::draw(renderer, transform, flags);
-    
+
     onDraw(transform, flags);
 }
 
-void TextureDrawAtPoint::onDraw(const Mat4 &transform, uint32_t flags)
+void TextureDrawAtPoint::onDraw(const Mat4& transform, uint32_t flags)
 {
     Director* director = Director::getInstance();
     CCASSERT(nullptr != director, "Director is null when setting matrix stack");
@@ -2046,10 +2030,10 @@ void TextureDrawAtPoint::onDraw(const Mat4 &transform, uint32_t flags)
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
 
     auto s = Director::getInstance()->getWinSize();
-    
-    _tex1->drawAtPoint(Vec2(s.width/2-50, s.height/2 - 50), _globalZOrder);
-    _Tex2F->drawAtPoint(Vec2(s.width/2+50, s.height/2 - 50), _globalZOrder);
-    
+
+    _tex1->drawAtPoint(Vec2(s.width / 2 - 50, s.height / 2 - 50), _globalZOrder);
+    _Tex2F->drawAtPoint(Vec2(s.width / 2 + 50, s.height / 2 - 50), _globalZOrder);
+
     director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
 }
 
@@ -2058,7 +2042,7 @@ void TextureDrawAtPoint::onDraw(const Mat4 &transform, uint32_t flags)
 void TextureDrawInRect::onEnter()
 {
     TextureDemo::onEnter();
-    _tex1 = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister1.png");
+    _tex1  = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister1.png");
     _Tex2F = Director::getInstance()->getTextureCache()->addImage("Images/grossinis_sister2.png");
 
     _tex1->retain();
@@ -2071,27 +2055,28 @@ TextureDrawInRect::~TextureDrawInRect()
     _Tex2F->release();
 }
 
-void TextureDrawInRect::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void TextureDrawInRect::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     TextureDemo::draw(renderer, transform, flags);
     onDraw(transform, flags);
 }
 
-void TextureDrawInRect::onDraw(const Mat4 &transform, uint32_t flags)
+void TextureDrawInRect::onDraw(const Mat4& transform, uint32_t flags)
 {
     Director* director = Director::getInstance();
     CCASSERT(nullptr != director, "Director is null when setting matrix stack");
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto rect1 = Rect( s.width/2 - 80, 20, _tex1->getContentSize().width * 0.5f, _tex1->getContentSize().height *2 );
-    auto rect2 = Rect( s.width/2 + 80, s.height/2, _tex1->getContentSize().width * 2, _tex1->getContentSize().height * 0.5f );
-    
+
+    auto rect1 = Rect(s.width / 2 - 80, 20, _tex1->getContentSize().width * 0.5f, _tex1->getContentSize().height * 2);
+    auto rect2 =
+        Rect(s.width / 2 + 80, s.height / 2, _tex1->getContentSize().width * 2, _tex1->getContentSize().height * 0.5f);
+
     _tex1->drawInRect(rect1, _globalZOrder);
     _Tex2F->drawInRect(rect2, _globalZOrder);
-    
+
     director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
 }
 
@@ -2114,42 +2099,43 @@ void TextureMemoryAlloc::onEnter()
 {
     TextureDemo::onEnter();
     _background = nullptr;
-    
+
     MenuItemFont::setFontSize(24);
-    
+
     auto item1 = MenuItemFont::create("PNG", CC_CALLBACK_1(TextureMemoryAlloc::updateImage, this));
     item1->setTag(0);
-    
+
     auto item2 = MenuItemFont::create("RGBA8", CC_CALLBACK_1(TextureMemoryAlloc::updateImage, this));
     item2->setTag(1);
-    
+
     auto item3 = MenuItemFont::create("RGB8", CC_CALLBACK_1(TextureMemoryAlloc::updateImage, this));
     item3->setTag(2);
-    
+
     auto item4 = MenuItemFont::create("RGBA4", CC_CALLBACK_1(TextureMemoryAlloc::updateImage, this));
     item4->setTag(3);
-    
+
     auto item5 = MenuItemFont::create("A8", CC_CALLBACK_1(TextureMemoryAlloc::updateImage, this));
     item5->setTag(4);
-    
+
     auto menu = Menu::create(item1, item2, item3, item4, item5, nullptr);
     menu->alignItemsHorizontally();
-    
+
     addChild(menu);
-    
-    auto warmup = MenuItemFont::create("warm up texture", CC_CALLBACK_1(TextureMemoryAlloc::changeBackgroundVisible, this));
-    
+
+    auto warmup =
+        MenuItemFont::create("warm up texture", CC_CALLBACK_1(TextureMemoryAlloc::changeBackgroundVisible, this));
+
     auto menu2 = Menu::create(warmup, nullptr);
 
     menu2->alignItemsHorizontally();
-    
+
     addChild(menu2);
     auto s = Director::getInstance()->getWinSize();
-    
-    menu2->setPosition(Vec2(s.width/2, s.height/4));
+
+    menu2->setPosition(Vec2(s.width / 2, s.height / 4));
 }
 
-void TextureMemoryAlloc::changeBackgroundVisible(cocos2d::Ref *sender)
+void TextureMemoryAlloc::changeBackgroundVisible(cocos2d::Ref* sender)
 {
     if (_background)
     {
@@ -2157,43 +2143,43 @@ void TextureMemoryAlloc::changeBackgroundVisible(cocos2d::Ref *sender)
     }
 }
 
-void TextureMemoryAlloc::updateImage(cocos2d::Ref *sender)
+void TextureMemoryAlloc::updateImage(cocos2d::Ref* sender)
 {
     if (_background)
     {
         _background->removeFromParentAndCleanup(true);
     }
-    
+
     Director::getInstance()->getTextureCache()->removeUnusedTextures();
-	
+
     int tag = ((Node*)sender)->getTag();
-	std::string file;
-	switch (tag) 
+    std::string file;
+    switch (tag)
     {
-		case 0:
-			file = "Images/test_image.png";
-			break;
-        case 1:
-            file = "Images/test_image_rgba8888.pvr";
-            break;
-        case 2:
-            file = "Images/test_image_rgb888.pvr";
-            break;
-        case 3:
-            file = "Images/test_image_rgba4444.pvr";
-            break;
-        case 4:
-            file = "Images/test_image_a8.pvr";
-            break;
-	}
+    case 0:
+        file = "Images/test_image.png";
+        break;
+    case 1:
+        file = "Images/test_image_rgba8888.pvr";
+        break;
+    case 2:
+        file = "Images/test_image_rgb888.pvr";
+        break;
+    case 3:
+        file = "Images/test_image_rgba4444.pvr";
+        break;
+    case 4:
+        file = "Images/test_image_a8.pvr";
+        break;
+    }
 
     _background = Sprite::create(file.c_str());
     addChild(_background, -10);
-	
+
     _background->setVisible(false);
-    
+
     auto s = Director::getInstance()->getWinSize();
-    _background->setPosition(Vec2(s.width/2, s.height/2));
+    _background->setPosition(Vec2(s.width / 2, s.height / 2));
 }
 
 std::string TextureMemoryAlloc::title() const
@@ -2210,29 +2196,28 @@ std::string TextureMemoryAlloc::subtitle() const
 TexturePVRv3Premult::TexturePVRv3Premult()
 {
     auto size = Director::getInstance()->getWinSize();
-        
-    auto background = LayerColor::create(Color4B(128,128,128,255), size.width, size.height);
+
+    auto background = LayerColor::create(Color4B(128, 128, 128, 255), size.width, size.height);
     addChild(background, -1);
-    
-    
+
     // PVR premultiplied
     auto pvr1 = Sprite::create("Images/grossinis_sister1-testalpha_premult.pvr");
     addChild(pvr1, 0);
-    pvr1->setPosition(Vec2(size.width/4*1, size.height/2));
+    pvr1->setPosition(Vec2(size.width / 4 * 1, size.height / 2));
     transformSprite(pvr1);
-    
+
     // PVR non-premultiplied
     auto pvr2 = Sprite::create("Images/grossinis_sister1-testalpha_nopremult.pvr");
     addChild(pvr2, 0);
-    pvr2->setPosition(Vec2(size.width/4*2, size.height/2));
+    pvr2->setPosition(Vec2(size.width / 4 * 2, size.height / 2));
     transformSprite(pvr2);
-    
+
     // PNG
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     Director::getInstance()->getTextureCache()->removeTextureForKey("Images/grossinis_sister1-testalpha.png");
     auto png = Sprite::create("Images/grossinis_sister1-testalpha.png");
     addChild(png, 0);
-    png->setPosition(Vec2(size.width/4*3, size.height/2));
+    png->setPosition(Vec2(size.width / 4 * 3, size.height / 2));
     transformSprite(png);
 }
 
@@ -2246,24 +2231,24 @@ std::string TexturePVRv3Premult::subtitle() const
     return "All images should look exactly the same";
 }
 
-void TexturePVRv3Premult::transformSprite(cocos2d::Sprite *sprite)
+void TexturePVRv3Premult::transformSprite(cocos2d::Sprite* sprite)
 {
-    auto fade = FadeOut::create(2);
-    auto dl = DelayTime::create(2);
+    auto fade   = FadeOut::create(2);
+    auto dl     = DelayTime::create(2);
     auto fadein = fade->reverse();
-    auto seq = Sequence::create(fade, fadein, dl, nullptr);
+    auto seq    = Sequence::create(fade, fadein, dl, nullptr);
     auto repeat = RepeatForever::create(seq);
     sprite->runAction(repeat);
 }
 
-//Implement of S3TC Dxt1
+// Implement of S3TC Dxt1
 TextureS3TCDxt1::TextureS3TCDxt1()
 {
     auto sprite = Sprite::create("Images/test_256x256_s3tc_dxt1_mipmaps.dds");
-    //auto sprite = Sprite::create("Images/water_2_dxt1.dds");
+    // auto sprite = Sprite::create("Images/water_2_dxt1.dds");
     auto size = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
-    
+
     addChild(sprite);
 }
 std::string TextureS3TCDxt1::title() const
@@ -2275,14 +2260,14 @@ std::string TextureS3TCDxt1::subtitle() const
     return "S3TC dxt1 decode,one bit for Alpha";
 }
 
-//Implement of S3TC Dxt3
+// Implement of S3TC Dxt3
 TextureS3TCDxt3::TextureS3TCDxt3()
 {
     auto sprite = Sprite::create("Images/test_256x256_s3tc_dxt3_mipmaps.dds");
-    //auto sprite = Sprite::create("Images/water_2_dxt3.dds");
+    // auto sprite = Sprite::create("Images/water_2_dxt3.dds");
     auto size = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
-    
+
     addChild(sprite);
 }
 std::string TextureS3TCDxt3::title() const
@@ -2294,14 +2279,14 @@ std::string TextureS3TCDxt3::subtitle() const
     return "S3TC dxt3 decode";
 }
 
-//Implement of S3TC Dxt5
+// Implement of S3TC Dxt5
 TextureS3TCDxt5::TextureS3TCDxt5()
 {
     auto sprite = Sprite::create("Images/test_256x256_s3tc_dxt5_mipmaps.dds");
-    //auto sprite = Sprite::create("Images/water_2_dxt5.dds");
+    // auto sprite = Sprite::create("Images/water_2_dxt5.dds");
     auto size = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
-    
+
     addChild(sprite);
 }
 std::string TextureS3TCDxt5::title() const
@@ -2310,16 +2295,16 @@ std::string TextureS3TCDxt5::title() const
 }
 std::string TextureS3TCDxt5::subtitle() const
 {
-    return "S3TC dxt5 decode";    
+    return "S3TC dxt5 decode";
 }
 
-//Implement of S3TC with no mipmaps
+// Implement of S3TC with no mipmaps
 TextureS3TCWithNoMipmaps::TextureS3TCWithNoMipmaps()
 {
     auto sprite = Sprite::create("Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds");
-    auto size = Director::getInstance()->getWinSize();
+    auto size   = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
-    
+
     addChild(sprite);
 }
 std::string TextureS3TCWithNoMipmaps::title() const
@@ -2327,11 +2312,11 @@ std::string TextureS3TCWithNoMipmaps::title() const
     return "S3TC with no mipmaps";
 }
 
-//Implement of ATITC
+// Implement of ATITC
 TextureATITCRGB::TextureATITCRGB()
 {
     auto sprite = Sprite::create("Images/test_256x256_ATC_RGB_mipmaps.ktx");
-    
+
     auto size = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
 
@@ -2349,10 +2334,10 @@ std::string TextureATITCRGB::subtitle() const
 TextureATITCExplicit::TextureATITCExplicit()
 {
     auto sprite = Sprite::create("Images/test_256x256_ATC_RGBA_Explicit_mipmaps.ktx");
-    
+
     auto size = Director::getInstance()->getWinSize();
     sprite->setPosition(Vec2(size.width / 2, size.height / 2));
-    
+
     addChild(sprite);
 }
 std::string TextureATITCExplicit::title() const
@@ -2367,9 +2352,9 @@ std::string TextureATITCExplicit::subtitle() const
 TextureATITCInterpolated::TextureATITCInterpolated()
 {
     auto sprite = Sprite::create("Images/test_256x256_ATC_RGBA_Interpolated_mipmaps.ktx");
-    
+
     auto size = Director::getInstance()->getWinSize();
-    sprite->setPosition(Vec2(size.width / 2, size.height /2));
+    sprite->setPosition(Vec2(size.width / 2, size.height / 2));
 
     addChild(sprite);
 }
@@ -2388,31 +2373,31 @@ static void addImageToDemo(TextureDemo& demo, float x, float y, const char* path
     auto sprite = Sprite::create(path);
     sprite->setPosition(Vec2(x, y));
     demo.addChild(sprite, 0);
-    
-    //remove texture from texture manager
+
+    // remove texture from texture manager
     Director::getInstance()->getTextureCache()->removeTexture(sprite->getTexture());
 }
 
-//TextureConvertRGB888
+// TextureConvertRGB888
 void TextureConvertRGB888::onEnter()
 {
     TextureDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto background = LayerColor::create(Color4B(255,0,0,255), s.width, s.height);
+
+    auto background = LayerColor::create(Color4B(255, 0, 0, 255), s.width, s.height);
     addChild(background, -1);
-    
+
     const char* img = "Images/test_image_rgb888.png";
-    addImageToDemo(*this, 1*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA8);
-    addImageToDemo(*this, 2*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB8);
-    addImageToDemo(*this, 3*s.width/9, s.height/2+32, img, backend::PixelFormat::RGB565);
-    addImageToDemo(*this, 4*s.width/9, s.height/2-32, img, backend::PixelFormat::A8);
-    addImageToDemo(*this, 5*s.width/9, s.height/2+32, img, backend::PixelFormat::L8);
-    addImageToDemo(*this, 6*s.width/9, s.height/2-32, img, backend::PixelFormat::LA8);
-    addImageToDemo(*this, 7*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA4);
-    addImageToDemo(*this, 8*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB5A1);
-    
+    addImageToDemo(*this, 1 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA8);
+    addImageToDemo(*this, 2 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB8);
+    addImageToDemo(*this, 3 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGB565);
+    addImageToDemo(*this, 4 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::A8);
+    addImageToDemo(*this, 5 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::L8);
+    addImageToDemo(*this, 6 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::LA8);
+    addImageToDemo(*this, 7 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA4);
+    addImageToDemo(*this, 8 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB5A1);
+
     // restore default
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -2427,26 +2412,26 @@ std::string TextureConvertRGB888::subtitle() const
 {
     return "RGBA8888,RGB888,RGB565,A8,I8,AI88,RGBA4444,RGB5A1";
 }
-//TextureConvertRGBA8888
+// TextureConvertRGBA8888
 void TextureConvertRGBA8888::onEnter()
 {
     TextureDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto background = LayerColor::create(Color4B(255,0,0,255), s.width, s.height);
+
+    auto background = LayerColor::create(Color4B(255, 0, 0, 255), s.width, s.height);
     addChild(background, -1);
-    
+
     const char* img = "Images/test_image_rgba8888.png";
-    addImageToDemo(*this, 1*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA8);
-    addImageToDemo(*this, 2*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB8);
-    addImageToDemo(*this, 3*s.width/9, s.height/2+32, img, backend::PixelFormat::RGB565);
-    addImageToDemo(*this, 4*s.width/9, s.height/2-32, img, backend::PixelFormat::A8);
-    addImageToDemo(*this, 5*s.width/9, s.height/2+32, img, backend::PixelFormat::L8);
-    addImageToDemo(*this, 6*s.width/9, s.height/2-32, img, backend::PixelFormat::LA8);
-    addImageToDemo(*this, 7*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA4);
-    addImageToDemo(*this, 8*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB5A1);
-    
+    addImageToDemo(*this, 1 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA8);
+    addImageToDemo(*this, 2 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB8);
+    addImageToDemo(*this, 3 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGB565);
+    addImageToDemo(*this, 4 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::A8);
+    addImageToDemo(*this, 5 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::L8);
+    addImageToDemo(*this, 6 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::LA8);
+    addImageToDemo(*this, 7 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA4);
+    addImageToDemo(*this, 8 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB5A1);
+
     // restore default
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -2461,26 +2446,26 @@ std::string TextureConvertRGBA8888::subtitle() const
 {
     return "RGBA8888,RGB888,RGB565,A8,I8,AI88,RGBA4444,RGB5A1";
 }
-//TextureConvertL8
+// TextureConvertL8
 void TextureConvertL8::onEnter()
 {
     TextureDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto background = LayerColor::create(Color4B(255,0,0,255), s.width, s.height);
+
+    auto background = LayerColor::create(Color4B(255, 0, 0, 255), s.width, s.height);
     addChild(background, -1);
-    
+
     const char* img = "Images/test_image_i8.png";
-    addImageToDemo(*this, 1*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA8);
-    addImageToDemo(*this, 2*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB8);
-    addImageToDemo(*this, 3*s.width/9, s.height/2+32, img, backend::PixelFormat::RGB565);
-    addImageToDemo(*this, 4*s.width/9, s.height/2-32, img, backend::PixelFormat::A8);
-    addImageToDemo(*this, 5*s.width/9, s.height/2+32, img, backend::PixelFormat::L8);
-    addImageToDemo(*this, 6*s.width/9, s.height/2-32, img, backend::PixelFormat::LA8);
-    addImageToDemo(*this, 7*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA4);
-    addImageToDemo(*this, 8*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB5A1);
-    
+    addImageToDemo(*this, 1 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA8);
+    addImageToDemo(*this, 2 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB8);
+    addImageToDemo(*this, 3 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGB565);
+    addImageToDemo(*this, 4 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::A8);
+    addImageToDemo(*this, 5 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::L8);
+    addImageToDemo(*this, 6 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::LA8);
+    addImageToDemo(*this, 7 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA4);
+    addImageToDemo(*this, 8 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB5A1);
+
     // restore default
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
@@ -2495,26 +2480,26 @@ std::string TextureConvertL8::subtitle() const
 {
     return "RGBA8888,RGB888,RGB565,A8,I8,AI88,RGBA4444,RGB5A1";
 }
-//TextureConvertLA8
+// TextureConvertLA8
 void TextureConvertLA8::onEnter()
 {
     TextureDemo::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
-    
-    auto background = LayerColor::create(Color4B(255,0,0,255), s.width, s.height);
+
+    auto background = LayerColor::create(Color4B(255, 0, 0, 255), s.width, s.height);
     addChild(background, -1);
-    
+
     const char* img = "Images/test_image_ai88.png";
-    addImageToDemo(*this, 1*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA8);
-    addImageToDemo(*this, 2*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB8);
-    addImageToDemo(*this, 3*s.width/9, s.height/2+32, img, backend::PixelFormat::RGB565);
-    addImageToDemo(*this, 4*s.width/9, s.height/2-32, img, backend::PixelFormat::A8);
-    addImageToDemo(*this, 5*s.width/9, s.height/2+32, img, backend::PixelFormat::L8);
-    addImageToDemo(*this, 6*s.width/9, s.height/2-32, img, backend::PixelFormat::LA8);
-    addImageToDemo(*this, 7*s.width/9, s.height/2+32, img, backend::PixelFormat::RGBA4);
-    addImageToDemo(*this, 8*s.width/9, s.height/2-32, img, backend::PixelFormat::RGB5A1);
-    
+    addImageToDemo(*this, 1 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA8);
+    addImageToDemo(*this, 2 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB8);
+    addImageToDemo(*this, 3 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGB565);
+    addImageToDemo(*this, 4 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::A8);
+    addImageToDemo(*this, 5 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::L8);
+    addImageToDemo(*this, 6 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::LA8);
+    addImageToDemo(*this, 7 * s.width / 9, s.height / 2 + 32, img, backend::PixelFormat::RGBA4);
+    addImageToDemo(*this, 8 * s.width / 9, s.height / 2 - 32, img, backend::PixelFormat::RGB5A1);
+
     // restore default
     Texture2D::setDefaultAlphaPixelFormat(backend::PixelFormat::RGBA8);
     log("%s\n", Director::getInstance()->getTextureCache()->getCachedTextureInfo().c_str());
diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h
index 42f65e3ce372..1d85c2061a65 100644
--- a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h
+++ b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h
@@ -45,7 +45,6 @@ class TextureASTC : public TextureDemo
     virtual std::string title() const override;
     virtual void onEnter() override;
 
-
     cocos2d::Node* _background;
 };
 
@@ -465,6 +464,7 @@ class TextureAsync : public TextureDemo
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
+
 private:
     int _imageOffset;
 };
@@ -516,10 +516,11 @@ class TextureDrawAtPoint : public TextureDemo
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
+
 protected:
     void onDraw(const cocos2d::Mat4& transform, uint32_t flags);
 
-    cocos2d::Texture2D* _tex1, *_Tex2F;
+    cocos2d::Texture2D *_tex1, *_Tex2F;
 };
 
 class TextureDrawInRect : public TextureDemo
@@ -531,10 +532,11 @@ class TextureDrawInRect : public TextureDemo
     virtual std::string subtitle() const override;
     virtual void onEnter() override;
     virtual void draw(cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t flags) override;
+
 protected:
     void onDraw(const cocos2d::Mat4& transform, uint32_t flags);
 
-    cocos2d::Texture2D* _tex1, *_Tex2F;
+    cocos2d::Texture2D *_tex1, *_Tex2F;
 };
 
 class TextureMemoryAlloc : public TextureDemo
@@ -546,6 +548,7 @@ class TextureMemoryAlloc : public TextureDemo
     virtual std::string subtitle() const override;
     void updateImage(cocos2d::Ref* sender);
     void changeBackgroundVisible(cocos2d::Ref* sender);
+
 private:
     cocos2d::Sprite* _background;
 };
@@ -555,11 +558,11 @@ class TexturePVRv3Premult : public TextureDemo
 public:
     CREATE_FUNC(TexturePVRv3Premult);
     TexturePVRv3Premult();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    
-    void transformSprite(cocos2d::Sprite *sprite);
+
+    void transformSprite(cocos2d::Sprite* sprite);
 };
 
 // S3TC Dxt1 texture format test
@@ -568,7 +571,7 @@ class TextureS3TCDxt1 : public TextureDemo
 public:
     CREATE_FUNC(TextureS3TCDxt1);
     TextureS3TCDxt1();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -579,7 +582,7 @@ class TextureS3TCDxt3 : public TextureDemo
 public:
     CREATE_FUNC(TextureS3TCDxt3);
     TextureS3TCDxt3();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
@@ -590,19 +593,18 @@ class TextureS3TCDxt5 : public TextureDemo
 public:
     CREATE_FUNC(TextureS3TCDxt5);
     TextureS3TCDxt5();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
 
-
 // S3TC texture with no mipmaps test
 class TextureS3TCWithNoMipmaps : public TextureDemo
 {
 public:
     CREATE_FUNC(TextureS3TCWithNoMipmaps);
     TextureS3TCWithNoMipmaps();
-    
+
     virtual std::string title() const override;
 };
 
@@ -612,34 +614,33 @@ class TextureATITCRGB : public TextureDemo
 public:
     CREATE_FUNC(TextureATITCRGB);
     TextureATITCRGB();
-    
+
     virtual std::string title() const override;
-    virtual std::string subtitle() const override;    
+    virtual std::string subtitle() const override;
 };
 
-//ATITC RGBA Explicit texture format test
+// ATITC RGBA Explicit texture format test
 class TextureATITCExplicit : public TextureDemo
 {
 public:
     CREATE_FUNC(TextureATITCExplicit);
     TextureATITCExplicit();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
 
-//ATITC RGBA Interpolated texture format test
+// ATITC RGBA Interpolated texture format test
 class TextureATITCInterpolated : public TextureDemo
 {
 public:
     CREATE_FUNC(TextureATITCInterpolated);
     TextureATITCInterpolated();
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 };
 
-
 // RGB888 texture convert test
 class TextureConvertRGB888 : public TextureDemo
 {
@@ -680,4 +681,4 @@ class TextureConvertLA8 : public TextureDemo
     virtual std::string subtitle() const override;
 };
 
-#endif // __TEXTURE2D_TEST_H__
+#endif  // __TEXTURE2D_TEST_H__
diff --git a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp
index f4e8290031dc..b8704aea7087 100644
--- a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp
+++ b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,9 +32,7 @@ TextureCacheTests::TextureCacheTests()
     ADD_TEST_CASE(TextureCacheUnbindTest);
 }
 
-TextureCacheTest::TextureCacheTest()
-: _numberOfSprites(20)
-, _numberOfLoadedSprites(0)
+TextureCacheTest::TextureCacheTest() : _numberOfSprites(20), _numberOfLoadedSprites(0)
 {
     auto size = Director::getInstance()->getWinSize();
 
@@ -48,33 +46,53 @@ TextureCacheTest::TextureCacheTest()
     this->addChild(_labelPercent);
 
     // load textures
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/HelloWorld.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_01.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_02.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_03.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_04.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_05.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_06.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_07.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_08.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_09.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_10.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_11.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_12.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_13.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_14.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/background1.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/background2.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/background3.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
-    Director::getInstance()->getTextureCache()->addImageAsync("Images/blocks.png", CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/HelloWorld.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_01.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_02.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_03.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_04.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_05.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_06.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_07.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_08.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_09.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_10.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_11.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_12.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_13.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/grossini_dance_14.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/background1.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/background2.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/background3.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
+    Director::getInstance()->getTextureCache()->addImageAsync("Images/blocks.png",
+                                                              CC_CALLBACK_1(TextureCacheTest::loadingCallBack, this));
 }
 
-void TextureCacheTest::loadingCallBack(cocos2d::Texture2D *texture)
+void TextureCacheTest::loadingCallBack(cocos2d::Texture2D* texture)
 {
     ++_numberOfLoadedSprites;
     char tmp[10];
-    sprintf(tmp,"%%%d", (int)(((float)_numberOfLoadedSprites / _numberOfSprites) * 100));
+    sprintf(tmp, "%%%d", (int)(((float)_numberOfLoadedSprites / _numberOfSprites) * 100));
     _labelPercent->setString(tmp);
 
     if (_numberOfLoadedSprites == _numberOfSprites)
@@ -94,15 +112,15 @@ void TextureCacheTest::addSprite()
     auto bg = Sprite::create("Images/HelloWorld.png");
     bg->setPosition(Vec2(size.width / 2, size.height / 2));
 
-    auto s1 = Sprite::create("Images/grossini.png");
-    auto s2 = Sprite::create("Images/grossini_dance_01.png");
-    auto s3 = Sprite::create("Images/grossini_dance_02.png");
-    auto s4 = Sprite::create("Images/grossini_dance_03.png");
-    auto s5 = Sprite::create("Images/grossini_dance_04.png");
-    auto s6 = Sprite::create("Images/grossini_dance_05.png");
-    auto s7 = Sprite::create("Images/grossini_dance_06.png");
-    auto s8 = Sprite::create("Images/grossini_dance_07.png");
-    auto s9 = Sprite::create("Images/grossini_dance_08.png");
+    auto s1  = Sprite::create("Images/grossini.png");
+    auto s2  = Sprite::create("Images/grossini_dance_01.png");
+    auto s3  = Sprite::create("Images/grossini_dance_02.png");
+    auto s4  = Sprite::create("Images/grossini_dance_03.png");
+    auto s5  = Sprite::create("Images/grossini_dance_04.png");
+    auto s6  = Sprite::create("Images/grossini_dance_05.png");
+    auto s7  = Sprite::create("Images/grossini_dance_06.png");
+    auto s8  = Sprite::create("Images/grossini_dance_07.png");
+    auto s9  = Sprite::create("Images/grossini_dance_08.png");
     auto s10 = Sprite::create("Images/grossini_dance_09.png");
     auto s11 = Sprite::create("Images/grossini_dance_10.png");
     auto s12 = Sprite::create("Images/grossini_dance_11.png");
@@ -135,7 +153,7 @@ void TextureCacheTest::addSprite()
     s15->setPosition(Vec2(70, 270));
 
     this->addChild(bg);
-   
+
     this->addChild(s1);
     this->addChild(s2);
     this->addChild(s3);
@@ -157,47 +175,39 @@ TextureCacheUnbindTest::TextureCacheUnbindTest()
 {
     auto size = Director::getInstance()->getWinSize();
 
-    Label* nothing =
-      Label::createWithTTF
-      ("There should be\nnothing below", "fonts/arial.ttf", 15);
+    Label* nothing = Label::createWithTTF("There should be\nnothing below", "fonts/arial.ttf", 15);
     nothing->setPosition(Vec2(size.width / 4, 5 * size.height / 6));
     this->addChild(nothing);
-    
-    Label* something =
-      Label::createWithTTF
-      ("There should be\na white square below", "fonts/arial.ttf", 15);
+
+    Label* something = Label::createWithTTF("There should be\na white square below", "fonts/arial.ttf", 15);
     something->setPosition(Vec2(3 * size.width / 4, 5 * size.height / 6));
     this->addChild(something);
 
     auto cache = Director::getInstance()->getTextureCache();
-    
+
     cache->removeTextureForKey("Images/texture2048x2048.png");
 
-    cache->addImageAsync
-      ("Images/texture2048x2048.png",
-       CC_CALLBACK_1(TextureCacheUnbindTest::textureLoadedA, this),
-       "A");
-    cache->addImageAsync
-      ("Images/texture2048x2048.png",
-       CC_CALLBACK_1(TextureCacheUnbindTest::textureLoadedB, this),
-       "B");
+    cache->addImageAsync("Images/texture2048x2048.png", CC_CALLBACK_1(TextureCacheUnbindTest::textureLoadedA, this),
+                         "A");
+    cache->addImageAsync("Images/texture2048x2048.png", CC_CALLBACK_1(TextureCacheUnbindTest::textureLoadedB, this),
+                         "B");
     cache->unbindImageAsync("A");
 }
 
 void TextureCacheUnbindTest::textureLoadedA(Texture2D* texture)
 {
-  auto size = Director::getInstance()->getWinSize();
-  auto s = Sprite::create("Images/texture2048x2048.png");
-  s->setScale(0.15);
-  s->setPosition(size.width / 4, size.height / 2);
-  this->addChild(s);
+    auto size = Director::getInstance()->getWinSize();
+    auto s    = Sprite::create("Images/texture2048x2048.png");
+    s->setScale(0.15);
+    s->setPosition(size.width / 4, size.height / 2);
+    this->addChild(s);
 }
 
 void TextureCacheUnbindTest::textureLoadedB(Texture2D* texture)
 {
-  auto size = Director::getInstance()->getWinSize();
-  auto s = Sprite::create("Images/texture2048x2048.png");
-  s->setScale(0.15);
-  s->setPosition(3 * size.width / 4, size.height / 2);
-  this->addChild(s);
+    auto size = Director::getInstance()->getWinSize();
+    auto s    = Sprite::create("Images/texture2048x2048.png");
+    s->setScale(0.15);
+    s->setPosition(3 * size.width / 4, size.height / 2);
+    this->addChild(s);
 }
diff --git a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h
index 338c41ddba0f..bf079b107842 100644
--- a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h
+++ b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,7 +25,6 @@
 #ifndef _TEXTURECACHE_TEST_H_
 #define _TEXTURECACHE_TEST_H_
 
-
 #include "cocos2d.h"
 #include "../BaseTest.h"
 
@@ -39,12 +38,13 @@ class TextureCacheTest : public TestCase
     TextureCacheTest();
 
     void addSprite();
-    void loadingCallBack(cocos2d::Texture2D *texture);
+    void loadingCallBack(cocos2d::Texture2D* texture);
 
     virtual float getDuration() const override { return 3.5f; }
+
 private:
-    cocos2d::Label *_labelLoading;
-    cocos2d::Label *_labelPercent;
+    cocos2d::Label* _labelLoading;
+    cocos2d::Label* _labelPercent;
     int _numberOfSprites;
     int _numberOfLoadedSprites;
 };
@@ -61,4 +61,4 @@ class TextureCacheUnbindTest : public TestCase
     void textureLoadedB(cocos2d::Texture2D* texture);
 };
 
-#endif // _TEXTURECACHE_TEST_H_
+#endif  // _TEXTURECACHE_TEST_H_
diff --git a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
index accb2ff76c50..8f60518a61e6 100644
--- a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
+++ b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,21 +40,23 @@ std::string TextureAtlasEncryptionDemo::title() const
 void TextureAtlasEncryptionDemo::onEnter()
 {
     TestCase::onEnter();
-    
+
     auto s = Director::getInstance()->getWinSize();
 
     // Load the non-encrypted atlas
-    SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/nonencryptedAtlas.plist", "Images/nonencryptedAtlas.pvr.ccz");
-    
+    SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/nonencryptedAtlas.plist",
+                                                             "Images/nonencryptedAtlas.pvr.ccz");
+
     // Create a sprite from the non-encrypted atlas
     auto nonencryptedSprite = Sprite::createWithSpriteFrameName("Icon.png");
     nonencryptedSprite->setPosition(Vec2(s.width * 0.25f, s.height * 0.5f));
     this->addChild(nonencryptedSprite);
-    
+
     auto nonencryptedSpriteLabel = Label::createWithTTF("non-encrypted", "fonts/arial.ttf", 28);
-    nonencryptedSpriteLabel->setPosition(Vec2(s.width * 0.25f, nonencryptedSprite->getBoundingBox().getMinY() - nonencryptedSprite->getContentSize().height/2));
+    nonencryptedSpriteLabel->setPosition(Vec2(s.width * 0.25f, nonencryptedSprite->getBoundingBox().getMinY() -
+                                                                   nonencryptedSprite->getContentSize().height / 2));
     this->addChild(nonencryptedSpriteLabel, 1);
-    
+
     // Load the encrypted atlas
     // 1) Set the encryption keys or step 2 will fail
     // In this case the encryption key 0xaaaaaaaabbbbbbbbccccccccdddddddd is
@@ -63,7 +65,7 @@ void TextureAtlasEncryptionDemo::onEnter()
     ZipUtils::setPvrEncryptionKeyPart(1, 0xbbbbbbbb);
     ZipUtils::setPvrEncryptionKeyPart(2, 0xcccccccc);
     ZipUtils::setPvrEncryptionKeyPart(3, 0xdddddddd);
-    
+
     // Alternatively, you can call the function that accepts the key in a single
     // function call.
     // This is slightly less secure because the entire key is more easily
@@ -71,14 +73,16 @@ void TextureAtlasEncryptionDemo::onEnter()
     // ZipUtils::ccSetPvrEncryptionKey(0xaaaaaaaa, 0xbbbbbbbb, 0xcccccccc, 0xdddddddd);
 
     // 2) Load the encrypted atlas
-    SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/encryptedAtlas.plist", "Images/encryptedAtlas.pvr.ccz");
-    
+    SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/encryptedAtlas.plist",
+                                                             "Images/encryptedAtlas.pvr.ccz");
+
     // 3) Create a sprite from the encrypted atlas
     auto encryptedSprite = Sprite::createWithSpriteFrameName("powered.png");
     encryptedSprite->setPosition(Vec2(s.width * 0.75f, s.height * 0.5f));
     this->addChild(encryptedSprite);
-    
+
     auto encryptedSpriteLabel = Label::createWithTTF("encrypted", "fonts/arial.ttf", 28);
-    encryptedSpriteLabel->setPosition(Vec2(s.width * 0.75f, encryptedSprite->getBoundingBox().getMinY() - encryptedSpriteLabel->getContentSize().height/2));
+    encryptedSpriteLabel->setPosition(Vec2(s.width * 0.75f, encryptedSprite->getBoundingBox().getMinY() -
+                                                                encryptedSpriteLabel->getContentSize().height / 2));
     this->addChild(encryptedSpriteLabel, 1);
 }
diff --git a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
index 20c868ca5da3..2856fae34ad0 100644
--- a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
+++ b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,7 +40,7 @@ class TextureAtlasEncryptionDemo : public TestCase
     virtual void onEnter() override;
 
 protected:
-    std::string    _title;
+    std::string _title;
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp
index 4cf393973f8e..f2e522b63421 100644
--- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp
+++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -77,14 +77,12 @@ TileDemoNew::TileDemoNew()
     Director::getInstance()->getRenderer()->setDepthTest(true);
     Director::getInstance()->getRenderer()->setDepthWrite(true);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesMoved = CC_CALLBACK_2(TileDemoNew::onTouchesMoved, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
-TileDemoNew::~TileDemoNew()
-{
-}
+TileDemoNew::~TileDemoNew() {}
 
 std::string TileDemoNew::title() const
 {
@@ -103,12 +101,12 @@ void TileDemoNew::onExit()
     Director::getInstance()->getRenderer()->setDepthWrite(false);
 }
 
-void TileDemoNew::onTouchesMoved(const std::vector<Touch*>& touches, Event  *event)
+void TileDemoNew::onTouchesMoved(const std::vector<Touch*>& touches, Event* event)
 {
     auto touch = touches[0];
 
-    auto diff = touch->getDelta();
-    auto node = getChildByTag(kTagTileMap);
+    auto diff       = touch->getDelta();
+    auto node       = getChildByTag(kTagTileMap);
     auto currentPos = node->getPosition();
     node->setPosition(currentPos + diff);
 }
@@ -120,22 +118,22 @@ void TileDemoNew::onTouchesMoved(const std::vector<Touch*>& touches, Event  *eve
 //------------------------------------------------------------------
 TileMapTestNew::TileMapTestNew()
 {
-    auto map = TileMapAtlas::create(s_TilesPng,  s_LevelMapTga, 16, 16);
+    auto map = TileMapAtlas::create(s_TilesPng, s_LevelMapTga, 16, 16);
     // Convert it to "alias" (GL_LINEAR filtering)
     map->getTexture()->setAntiAliasTexParameters();
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
     // If you are not going to use the Map, you can free it now
     // NEW since v0.7
     map->releaseMap();
-    
+
     addChild(map, 0, kTagTileMap);
-    
-    map->setAnchorPoint( Vec2(0.0f, 0.5f) );
 
-    auto scale = ScaleBy::create(4, 0.8f);
+    map->setAnchorPoint(Vec2(0.0f, 0.5f));
+
+    auto scale     = ScaleBy::create(4, 0.8f);
     auto scaleBack = scale->reverse();
 
     auto seq = Sequence::create(scale, scaleBack, nullptr);
@@ -158,19 +156,19 @@ TileMapEditTestNew::TileMapEditTestNew()
     auto map = TileMapAtlas::create(s_TilesPng, s_LevelMapTga, 16, 16);
     // Create an Aliased Atlas
     map->getTexture()->setAliasTexParameters();
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     // If you are not going to use the Map, you can free it now
     // [tilemap releaseMap);
     // And if you are going to use, it you can access the data with:
     schedule(CC_SCHEDULE_SELECTOR(TileMapEditTestNew::updateMap), 0.2f);
-    
+
     addChild(map, 0, kTagTileMap);
-    
-    map->setAnchorPoint( Vec2(0, 0) );
-    map->setPosition( Vec2(-20,-200) );
+
+    map->setAnchorPoint(Vec2(0, 0));
+    map->setPosition(Vec2(-20, -200));
 }
 
 void TileMapEditTestNew::updateMap(float dt)
@@ -179,8 +177,8 @@ void TileMapEditTestNew::updateMap(float dt)
     //   The only limitation is that you cannot change an empty, or assign an empty tile to a tile
     //   The value 0 not rendered so don't assign or change a tile with value 0
 
-    auto tilemap = (TileMapAtlas*) getChildByTag(kTagTileMap);
-    
+    auto tilemap = (TileMapAtlas*)getChildByTag(kTagTileMap);
+
     //
     // For example you can iterate over all the tiles
     // using this code, but try to avoid the iteration
@@ -193,16 +191,16 @@ void TileMapEditTestNew::updateMap(float dt)
     //            }
     //        }
     //    }
-    
+
     // NEW since v0.7
-    Color3B c = tilemap->getTileAt(Vec2(13,21));        
+    Color3B c = tilemap->getTileAt(Vec2(13, 21));
     c.r++;
     c.r %= 50;
-    if( c.r==0)
-        c.r=1;
-    
+    if (c.r == 0)
+        c.r = 1;
+
     // NEW since v0.7
-    tilemap->setTile(c, Vec2(13,21) );             
+    tilemap->setTile(c, Vec2(13, 21));
 }
 
 std::string TileMapEditTestNew::title() const
@@ -222,25 +220,25 @@ TMXOrthoTestNew::TMXOrthoTestNew()
     //
     // it should not flicker. No artifacts should appear
     //
-    //auto color = LayerColor::create( Color4B(64,64,64,255) );
-    //addChild(color, -1);
+    // auto color = LayerColor::create( Color4B(64,64,64,255) );
+    // addChild(color, -1);
 
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx");
 
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
-    auto scale = ScaleBy::create(10, 0.1f);
-    auto back = scale->reverse();
-    auto seq = Sequence::create(scale, back, nullptr);
+    auto scale  = ScaleBy::create(10, 0.1f);
+    auto back   = scale->reverse();
+    auto seq    = Sequence::create(scale, back, nullptr);
     auto repeat = RepeatForever::create(seq);
     map->runAction(repeat);
 
-//    float x, y, z;
-//    map->getCamera()->getEye(&x, &y, &z);
-//    map->getCamera()->setEye(x-200, y, z+300);    
+    //    float x, y, z;
+    //    map->getCamera()->getEye(&x, &y, &z);
+    //    map->getCamera()->setEye(x-200, y, z+300);
 }
 
 void TMXOrthoTestNew::onEnter()
@@ -272,9 +270,9 @@ TMXOrthoTest2New::TMXOrthoTest2New()
     addChild(map, 0, kTagTileMap);
 
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
-    map->runAction( ScaleBy::create(2, 0.5f) ) ;
+    map->runAction(ScaleBy::create(2, 0.5f));
 }
 
 std::string TMXOrthoTest2New::title() const
@@ -291,12 +289,12 @@ TMXOrthoTest3New::TMXOrthoTest3New()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test3.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     map->setScale(0.2f);
-    map->setAnchorPoint( Vec2(0.5f, 0.5f) );
+    map->setAnchorPoint(Vec2(0.5f, 0.5f));
 }
 
 std::string TMXOrthoTest3New::title() const
@@ -313,41 +311,40 @@ TMXOrthoTest4New::TMXOrthoTest4New()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test4.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s1 = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s1.width,s1.height);
-    
+    CCLOG("ContentSize: %f, %f", s1.width, s1.height);
+
     map->setAnchorPoint(Vec2(0.0f, 0.0f));
 
     auto layer = map->getLayer("Layer 0");
-    auto s = layer->getLayerSize();
-    
+    auto s     = layer->getLayerSize();
+
     Sprite* sprite;
-    sprite = layer->getTileAt(Vec2(0.0f,0.0f));
+    sprite = layer->getTileAt(Vec2(0.0f, 0.0f));
     sprite->setScale(2);
-    sprite = layer->getTileAt(Vec2(s.width-1,0.0f));
+    sprite = layer->getTileAt(Vec2(s.width - 1, 0.0f));
     sprite->setScale(2);
-    sprite = layer->getTileAt(Vec2(0.0f,s.height-1));
+    sprite = layer->getTileAt(Vec2(0.0f, s.height - 1));
     sprite->setScale(2);
-    sprite = layer->getTileAt(Vec2(s.width-1,s.height-1));
+    sprite = layer->getTileAt(Vec2(s.width - 1, s.height - 1));
     sprite->setScale(2);
 
-    schedule( CC_SCHEDULE_SELECTOR(TMXOrthoTest4New::removeSprite), 2 );
-
+    schedule(CC_SCHEDULE_SELECTOR(TMXOrthoTest4New::removeSprite), 2);
 }
 
 void TMXOrthoTest4New::removeSprite(float dt)
 {
     unschedule(CC_SCHEDULE_SELECTOR(TMXOrthoTest4New::removeSprite));
 
-    auto map = static_cast<cocos2d::FastTMXTiledMap*>( getChildByTag(kTagTileMap) );
+    auto map   = static_cast<cocos2d::FastTMXTiledMap*>(getChildByTag(kTagTileMap));
     auto layer = map->getLayer("Layer 0");
-    auto s = layer->getLayerSize();
+    auto s     = layer->getLayerSize();
 
-    auto sprite = layer->getTileAt( Vec2(s.width-1,0.0f) );
-    auto sprite2 = layer->getTileAt(Vec2(s.width-1, s.height-1));
+    auto sprite  = layer->getTileAt(Vec2(s.width - 1, 0.0f));
+    auto sprite2 = layer->getTileAt(Vec2(s.width - 1, s.height - 1));
     layer->removeChild(sprite, true);
-    auto sprite3 = layer->getTileAt(Vec2(2.0f, s.height-1));
+    auto sprite3 = layer->getTileAt(Vec2(2.0f, s.height - 1));
     layer->removeChild(sprite3, true);
     layer->removeChild(sprite2, true);
 }
@@ -372,55 +369,53 @@ enum
 TMXReadWriteTestNew::TMXReadWriteTestNew()
 {
     _gid = 0;
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
-    
     auto layer = map->getLayer("Layer 0");
 
-    map->setScale( 1 );
-
-    auto tile0 = layer->getTileAt(Vec2(1,63));
-    auto tile1 = layer->getTileAt(Vec2(2,63));
-    auto tile2 = layer->getTileAt(Vec2(3,62));//Vec2(1,62));
-    auto tile3 = layer->getTileAt(Vec2(2,62));
-    tile0->setAnchorPoint( Vec2(0.5f, 0.5f) );
-    tile1->setAnchorPoint( Vec2(0.5f, 0.5f) );
-    tile2->setAnchorPoint( Vec2(0.5f, 0.5f) );
-    tile3->setAnchorPoint( Vec2(0.5f, 0.5f) );
-
-    auto move = MoveBy::create(0.5f, Vec2(0.0f,160.0f));
-    auto rotate = RotateBy::create(2, 360);
-    auto scale = ScaleBy::create(2, 5);
-    auto opacity = FadeOut::create(2);
-    auto fadein = FadeIn::create(2);
+    map->setScale(1);
+
+    auto tile0 = layer->getTileAt(Vec2(1, 63));
+    auto tile1 = layer->getTileAt(Vec2(2, 63));
+    auto tile2 = layer->getTileAt(Vec2(3, 62));  // Vec2(1,62));
+    auto tile3 = layer->getTileAt(Vec2(2, 62));
+    tile0->setAnchorPoint(Vec2(0.5f, 0.5f));
+    tile1->setAnchorPoint(Vec2(0.5f, 0.5f));
+    tile2->setAnchorPoint(Vec2(0.5f, 0.5f));
+    tile3->setAnchorPoint(Vec2(0.5f, 0.5f));
+
+    auto move      = MoveBy::create(0.5f, Vec2(0.0f, 160.0f));
+    auto rotate    = RotateBy::create(2, 360);
+    auto scale     = ScaleBy::create(2, 5);
+    auto opacity   = FadeOut::create(2);
+    auto fadein    = FadeIn::create(2);
     auto scaleback = ScaleTo::create(1, 1);
-    auto finish = CallFuncN::create(CC_CALLBACK_1(TMXReadWriteTestNew::removeSprite, this));
-    auto seq0 = Sequence::create(move, rotate, scale, opacity, fadein, scaleback, finish, nullptr);
-    auto seq1 = seq0->clone();
-    auto seq2 = seq0->clone();
-    auto seq3 = seq0->clone();
-    
+    auto finish    = CallFuncN::create(CC_CALLBACK_1(TMXReadWriteTestNew::removeSprite, this));
+    auto seq0      = Sequence::create(move, rotate, scale, opacity, fadein, scaleback, finish, nullptr);
+    auto seq1      = seq0->clone();
+    auto seq2      = seq0->clone();
+    auto seq3      = seq0->clone();
+
     tile0->runAction(seq0);
     tile1->runAction(seq1);
     tile2->runAction(seq2);
     tile3->runAction(seq3);
-    
-    
-    _gid = layer->getTileGIDAt(Vec2(0,63));
+
+    _gid = layer->getTileGIDAt(Vec2(0, 63));
     ////----CCLOG("Tile GID at:(0,63) is: %d", _gid);
 
-    schedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::updateCol), 2.0f); 
+    schedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::updateCol), 2.0f);
     schedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::repaintWithGID), 2.05f);
-    schedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::removeTiles), 1.0f); 
+    schedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::removeTiles), 1.0f);
 
     ////----CCLOG("++++atlas quantity: %d", layer->textureAtlas()->getTotalQuads());
     ////----CCLOG("++++children: %d", layer->getChildren()->count() );
-    
+
     _gid2 = 0;
 }
 
@@ -432,43 +427,42 @@ void TMXReadWriteTestNew::removeSprite(Node* sender)
     if (p)
     {
         p->removeChild((Node*)sender, true);
-    }    
-    
+    }
+
     //////----CCLOG("atlas quantity: %d", p->textureAtlas()->totalQuads());
 }
 
 void TMXReadWriteTestNew::updateCol(float dt)
-{    
-    auto map = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
+{
+    auto map   = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
     auto layer = (cocos2d::FastTMXLayer*)map->getChildByTag(0);
 
     ////----CCLOG("++++atlas quantity: %d", layer->textureAtlas()->getTotalQuads());
     ////----CCLOG("++++children: %d", layer->getChildren()->count() );
- 
 
     auto s = layer->getLayerSize();
 
-    for( int y=0; y< s.height; y++ ) 
+    for (int y = 0; y < s.height; y++)
     {
         layer->setTileGID(_gid2, Vec2((float)3, (float)y));
     }
-    
+
     _gid2 = (_gid2 + 1) % 80;
 }
 
 void TMXReadWriteTestNew::repaintWithGID(float dt)
 {
-//    unschedule:_cmd);
-    
-    auto map = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
+    //    unschedule:_cmd);
+
+    auto map   = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
     auto layer = (cocos2d::FastTMXLayer*)map->getChildByTag(0);
-    
+
     auto s = layer->getLayerSize();
-    for( int x=0; x<s.width;x++) 
+    for (int x = 0; x < s.width; x++)
     {
-        int y = (int)s.height-1;
-        unsigned int tmpgid = layer->getTileGIDAt( Vec2((float)x, (float)y) );
-        layer->setTileGID(tmpgid+1, Vec2((float)x, (float)y));
+        int y               = (int)s.height - 1;
+        unsigned int tmpgid = layer->getTileGIDAt(Vec2((float)x, (float)y));
+        layer->setTileGID(tmpgid + 1, Vec2((float)x, (float)y));
     }
 }
 
@@ -476,18 +470,16 @@ void TMXReadWriteTestNew::removeTiles(float dt)
 {
     unschedule(CC_SCHEDULE_SELECTOR(TMXReadWriteTestNew::removeTiles));
 
-    auto map = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
+    auto map   = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
     auto layer = (cocos2d::FastTMXLayer*)map->getChildByTag(0);
-    auto s = layer->getLayerSize();
+    auto s     = layer->getLayerSize();
 
-    for( int y=0; y< s.height; y++ ) 
+    for (int y = 0; y < s.height; y++)
     {
-        layer->removeTileAt( Vec2(5.0, (float)y) );
+        layer->removeTileAt(Vec2(5.0, (float)y));
     }
 }
 
-
-
 std::string TMXReadWriteTestNew::title() const
 {
     return "TMX Read/Write test";
@@ -500,14 +492,14 @@ std::string TMXReadWriteTestNew::title() const
 //------------------------------------------------------------------
 TMXHexTestNew::TMXHexTestNew()
 {
-    auto color = LayerColor::create( Color4B(64,64,64,255) );
+    auto color = LayerColor::create(Color4B(64, 64, 64, 255));
     addChild(color, -1);
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/hexa-test.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 }
 
 std::string TMXHexTestNew::title() const
@@ -522,16 +514,16 @@ std::string TMXHexTestNew::title() const
 //------------------------------------------------------------------
 TMXIsoTestNew::TMXIsoTestNew()
 {
-    auto color = LayerColor::create( Color4B(64,64,64,255) );
+    auto color = LayerColor::create(Color4B(64, 64, 64, 255));
     addChild(color, -1);
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test.tmx");
-    addChild(map, 0, kTagTileMap);        
-    
+    addChild(map, 0, kTagTileMap);
+
     // move map to the center of the screen
     auto ms = map->getMapSize();
     auto ts = map->getTileSize();
-    map->runAction( MoveTo::create(1.0f, Vec2( -ms.width * ts.width/2, -ms.height * ts.height/2 )) ); 
+    map->runAction(MoveTo::create(1.0f, Vec2(-ms.width * ts.width / 2, -ms.height * ts.height / 2)));
 }
 
 std::string TMXIsoTestNew::title() const
@@ -546,15 +538,15 @@ std::string TMXIsoTestNew::title() const
 //------------------------------------------------------------------
 TMXIsoTest1New::TMXIsoTest1New()
 {
-    auto color = LayerColor::create( Color4B(64,64,64,255) );
+    auto color = LayerColor::create(Color4B(64, 64, 64, 255));
     addChild(color, -1);
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test1.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     map->setAnchorPoint(Vec2(0.5f, 0.5f));
 }
 
@@ -570,19 +562,19 @@ std::string TMXIsoTest1New::title() const
 //------------------------------------------------------------------
 TMXIsoTest2New::TMXIsoTest2New()
 {
-    auto color = LayerColor::create( Color4B(64,64,64,255) );
+    auto color = LayerColor::create(Color4B(64, 64, 64, 255));
     addChild(color, -1);
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test2.tmx");
-    addChild(map, 0, kTagTileMap);    
-    
+    addChild(map, 0, kTagTileMap);
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     // move map to the center of the screen
     auto ms = map->getMapSize();
     auto ts = map->getTileSize();
-    map->runAction( MoveTo::create(1.0f, Vec2( -ms.width * ts.width/2, -ms.height * ts.height/2 ) ));
+    map->runAction(MoveTo::create(1.0f, Vec2(-ms.width * ts.width / 2, -ms.height * ts.height / 2)));
 }
 
 std::string TMXIsoTest2New::title() const
@@ -597,30 +589,29 @@ std::string TMXIsoTest2New::title() const
 //------------------------------------------------------------------
 TMXUncompressedTestNew::TMXUncompressedTestNew()
 {
-    auto color = LayerColor::create( Color4B(64,64,64,255) );
+    auto color = LayerColor::create(Color4B(64, 64, 64, 255));
     addChild(color, -1);
-    
+
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test2-uncompressed.tmx");
-    addChild(map, 0, kTagTileMap);    
-    
+    addChild(map, 0, kTagTileMap);
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     // move map to the center of the screen
     auto ms = map->getMapSize();
     auto ts = map->getTileSize();
-    map->runAction(MoveTo::create(1.0f, Vec2( -ms.width * ts.width/2, -ms.height * ts.height/2 ) ));
- 
-      //unsupported
-//    // testing release map
-//    TMXLayer* layer;
-//    
-//    auto& children = map->getChildren();
-//    for(const auto &node : children) {
-//        layer= static_cast<TMXLayer*>(node);
-//        layer->releaseMap();
-//    }
+    map->runAction(MoveTo::create(1.0f, Vec2(-ms.width * ts.width / 2, -ms.height * ts.height / 2)));
 
+    // unsupported
+    //    // testing release map
+    //    TMXLayer* layer;
+    //
+    //    auto& children = map->getChildren();
+    //    for(const auto &node : children) {
+    //        layer= static_cast<TMXLayer*>(node);
+    //        layer->releaseMap();
+    //    }
 }
 
 std::string TMXUncompressedTestNew::title() const
@@ -637,9 +628,9 @@ TMXTilesetTestNew::TMXTilesetTestNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 }
 
 std::string TMXTilesetTestNew::title() const
@@ -656,31 +647,31 @@ TMXOrthoObjectsTestNew::TMXOrthoObjectsTestNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/ortho-objects.tmx");
     addChild(map, -1, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
-    auto group = map->getObjectGroup("Object Group 1");
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
+    auto group    = map->getObjectGroup("Object Group 1");
     auto& objects = group->getObjects();
 
     Value objectsVal = Value(objects);
     CCLOG("%s", objectsVal.getDescription().c_str());
-    
+
     auto drawNode = DrawNode::create();
     Color4F color(1.0, 1.0, 1.0, 1.0);
     for (auto& obj : objects)
     {
         ValueMap& dict = obj.asValueMap();
-        
-        float x = dict["x"].asFloat();
-        float y = dict["y"].asFloat();
-        float width = dict["width"].asFloat();
+
+        float x      = dict["x"].asFloat();
+        float y      = dict["y"].asFloat();
+        float width  = dict["width"].asFloat();
         float height = dict["height"].asFloat();
-        
+
         drawNode->drawLine(Vec2(x, y), Vec2(x + width, y), color);
         drawNode->drawLine(Vec2(x + width, y), Vec2(x + width, y + height), color);
-        drawNode->drawLine(Vec2(x + width,y + height), Vec2(x,y + height), color);
-        drawNode->drawLine(Vec2(x,y + height), Vec2(x,y), color);
+        drawNode->drawLine(Vec2(x + width, y + height), Vec2(x, y + height), color);
+        drawNode->drawLine(Vec2(x, y + height), Vec2(x, y), color);
     }
     map->addChild(drawNode);
 }
@@ -695,7 +686,6 @@ std::string TMXOrthoObjectsTestNew::subtitle() const
     return "You should see a white box around the 3 platforms";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXIsoObjectsTestNew
@@ -706,32 +696,32 @@ TMXIsoObjectsTestNew::TMXIsoObjectsTestNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test-objectgroup.tmx");
     addChild(map, -1, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
     auto group = map->getObjectGroup("Object Group 1");
 
     auto& objects = group->getObjects();
-    
+
     Value objectsVal = Value(objects);
     CCLOG("%s", objectsVal.getDescription().c_str());
-    
+
     auto drawNode = DrawNode::create();
     Color4F color(1.0, 1.0, 1.0, 1.0);
     for (auto& obj : objects)
     {
         ValueMap& dict = obj.asValueMap();
-        
-        float x = dict["x"].asFloat();
-        float y = dict["y"].asFloat();
-        float width = dict["width"].asFloat();
+
+        float x      = dict["x"].asFloat();
+        float y      = dict["y"].asFloat();
+        float width  = dict["width"].asFloat();
         float height = dict["height"].asFloat();
-        
+
         drawNode->drawLine(Vec2(x, y), Vec2(x + width, y), color);
         drawNode->drawLine(Vec2(x + width, y), Vec2(x + width, y + height), color);
-        drawNode->drawLine(Vec2(x + width,y + height), Vec2(x,y + height), color);
-        drawNode->drawLine(Vec2(x,y + height), Vec2(x,y), color);
+        drawNode->drawLine(Vec2(x + width, y + height), Vec2(x, y + height), color);
+        drawNode->drawLine(Vec2(x, y + height), Vec2(x, y), color);
     }
     map->addChild(drawNode, 10);
 }
@@ -746,7 +736,6 @@ std::string TMXIsoObjectsTestNew::subtitle() const
     return "You need to parse them manually. See bug #810";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXResizeTestNew
@@ -757,21 +746,21 @@ TMXResizeTestNew::TMXResizeTestNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 
     cocos2d::FastTMXLayer* layer;
     layer = map->getLayer("Layer 0");
 
     auto ls = layer->getLayerSize();
-    for (unsigned int y = 0; y < ls.height; y++) 
+    for (unsigned int y = 0; y < ls.height; y++)
     {
-        for (unsigned int x = 0; x < ls.width; x++) 
+        for (unsigned int x = 0; x < ls.width; x++)
         {
-            layer->setTileGID(1, Vec2((float)x, (float)y ) );
+            layer->setTileGID(1, Vec2((float)x, (float)y));
         }
-    }        
+    }
 }
 
 std::string TMXResizeTestNew::title() const
@@ -784,7 +773,6 @@ std::string TMXResizeTestNew::subtitle() const
     return "Should not crash. Testing issue #740";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXIsoZorderNew
@@ -797,23 +785,22 @@ TMXIsoZorderNew::TMXIsoZorderNew()
     addChild(map, 0, kTagTileMap);
 
     auto s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    map->setPosition(Vec2(-s.width/2,0.0f));
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+    map->setPosition(Vec2(-s.width / 2, 0.0f));
+
     _tamara = Sprite::create(s_pathSister1);
-    map->addChild(_tamara, (int)map->getChildren().size() );
+    map->addChild(_tamara, (int)map->getChildren().size());
     _tamara->retain();
     int mapWidth = map->getMapSize().width * map->getTileSize().width;
-    _tamara->setPosition(CC_POINT_PIXELS_TO_POINTS(Vec2( mapWidth/2.0f,0.0f)));
-    _tamara->setAnchorPoint(Vec2(0.5f,0.0f));
+    _tamara->setPosition(CC_POINT_PIXELS_TO_POINTS(Vec2(mapWidth / 2.0f, 0.0f)));
+    _tamara->setAnchorPoint(Vec2(0.5f, 0.0f));
 
-    
-    auto move = MoveBy::create(10, Vec2(300.0f,250.0f));
+    auto move = MoveBy::create(10, Vec2(300.0f, 250.0f));
     auto back = move->reverse();
-    auto seq = Sequence::create(move, back,nullptr);
-    _tamara->runAction( RepeatForever::create(seq) );
-    
-    schedule( CC_SCHEDULE_SELECTOR(TMXIsoZorderNew::repositionSprite) );
+    auto seq  = Sequence::create(move, back, nullptr);
+    _tamara->runAction(RepeatForever::create(seq));
+
+    schedule(CC_SCHEDULE_SELECTOR(TMXIsoZorderNew::repositionSprite));
 }
 
 TMXIsoZorderNew::~TMXIsoZorderNew()
@@ -829,19 +816,19 @@ void TMXIsoZorderNew::onExit()
 
 void TMXIsoZorderNew::repositionSprite(float dt)
 {
-    auto p = _tamara->getPosition();
-    p = CC_POINT_POINTS_TO_PIXELS(p);
+    auto p   = _tamara->getPosition();
+    p        = CC_POINT_POINTS_TO_PIXELS(p);
     auto map = getChildByTag(kTagTileMap);
-    
+
     // there are only 4 layers. (grass and 3 trees layers)
     // if tamara < 48, z=4
     // if tamara < 96, z=3
     // if tamara < 144,z=2
-    
+
     int newZ = 4 - (p.y / 48);
-    newZ = std::max(newZ,0);
-    
-    map->reorderChild(_tamara, newZ);    
+    newZ     = std::max(newZ, 0);
+
+    map->reorderChild(_tamara, newZ);
 }
 
 std::string TMXIsoZorderNew::title() const
@@ -854,7 +841,6 @@ std::string TMXIsoZorderNew::subtitle() const
     return "Sprite should hide behind the trees";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXOrthoZorderNew
@@ -864,22 +850,21 @@ TMXOrthoZorderNew::TMXOrthoZorderNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test-zorder.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     _tamara = Sprite::create(s_pathSister1);
-    map->addChild(_tamara,  (int)map->getChildren().size());
+    map->addChild(_tamara, (int)map->getChildren().size());
     _tamara->retain();
-    _tamara->setAnchorPoint(Vec2(0.5f,0.0f));
+    _tamara->setAnchorPoint(Vec2(0.5f, 0.0f));
 
-    
-    auto move = MoveBy::create(10, Vec2(400.0f,450.0f));
+    auto move = MoveBy::create(10, Vec2(400.0f, 450.0f));
     auto back = move->reverse();
-    auto seq = Sequence::create(move, back,nullptr);
-    _tamara->runAction( RepeatForever::create(seq));
-    
-    schedule( CC_SCHEDULE_SELECTOR(TMXOrthoZorderNew::repositionSprite));
+    auto seq  = Sequence::create(move, back, nullptr);
+    _tamara->runAction(RepeatForever::create(seq));
+
+    schedule(CC_SCHEDULE_SELECTOR(TMXOrthoZorderNew::repositionSprite));
 }
 
 TMXOrthoZorderNew::~TMXOrthoZorderNew()
@@ -889,18 +874,18 @@ TMXOrthoZorderNew::~TMXOrthoZorderNew()
 
 void TMXOrthoZorderNew::repositionSprite(float dt)
 {
-    auto p = _tamara->getPosition();
-    p = CC_POINT_POINTS_TO_PIXELS(p);
+    auto p   = _tamara->getPosition();
+    p        = CC_POINT_POINTS_TO_PIXELS(p);
     auto map = getChildByTag(kTagTileMap);
-    
+
     // there are only 4 layers. (grass and 3 trees layers)
     // if tamara < 81, z=4
     // if tamara < 162, z=3
     // if tamara < 243,z=2
 
     // -10: customization for this particular sample
-    int newZ = 4 - ( (p.y-10) / 81);
-    newZ = std::max(newZ,0);
+    int newZ = 4 - ((p.y - 10) / 81);
+    newZ     = std::max(newZ, 0);
 
     map->reorderChild(_tamara, newZ);
 }
@@ -915,7 +900,6 @@ std::string TMXOrthoZorderNew::subtitle() const
     return "Sprite should hide behind the trees";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXIsoVertexZNew
@@ -925,24 +909,23 @@ TMXIsoVertexZNew::TMXIsoVertexZNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test-vertexz.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     auto s = map->getContentSize();
-    map->setPosition( Vec2(-s.width/2,0.0f) );
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    map->setPosition(Vec2(-s.width / 2, 0.0f));
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     // because I'm lazy, I'm reusing a tile as an sprite, but since this method uses vertexZ, you
     // can use any Sprite and it will work OK.
     auto layer = map->getLayer("Trees");
-    _tamara = layer->getTileAt( Vec2(29.0f,29.0f) );
+    _tamara    = layer->getTileAt(Vec2(29.0f, 29.0f));
     _tamara->retain();
-    
-    auto move = MoveBy::create(10, Vec2(300,250) * (1/CC_CONTENT_SCALE_FACTOR()));
+
+    auto move = MoveBy::create(10, Vec2(300, 250) * (1 / CC_CONTENT_SCALE_FACTOR()));
     auto back = move->reverse();
-    auto seq = Sequence::create(move, back,nullptr);
-    _tamara->runAction( RepeatForever::create(seq) );
-    
-    schedule( CC_SCHEDULE_SELECTOR(TMXIsoVertexZNew::repositionSprite));
-    
+    auto seq  = Sequence::create(move, back, nullptr);
+    _tamara->runAction(RepeatForever::create(seq));
+
+    schedule(CC_SCHEDULE_SELECTOR(TMXIsoVertexZNew::repositionSprite));
 }
 
 TMXIsoVertexZNew::~TMXIsoVertexZNew()
@@ -954,16 +937,16 @@ void TMXIsoVertexZNew::repositionSprite(float dt)
 {
     // tile height is 64x32
     // map size: 30x30
-    auto p = _tamara->getPosition();
-    p = CC_POINT_POINTS_TO_PIXELS(p);
-    float newZ = -(p.y+32) /16;
-    _tamara->setPositionZ( newZ );
+    auto p     = _tamara->getPosition();
+    p          = CC_POINT_POINTS_TO_PIXELS(p);
+    float newZ = -(p.y + 32) / 16;
+    _tamara->setPositionZ(newZ);
 }
 
 void TMXIsoVertexZNew::onEnter()
 {
     TileDemoNew::onEnter();
-    
+
     // TIP: 2d projection should be used
     Director::getInstance()->setProjection(Director::Projection::_2D);
     Director::getInstance()->getRenderer()->setDepthTest(true);
@@ -972,7 +955,7 @@ void TMXIsoVertexZNew::onEnter()
 
 void TMXIsoVertexZNew::onExit()
 {
-    // At exit use any other projection. 
+    // At exit use any other projection.
     Director::getInstance()->setProjection(Director::Projection::DEFAULT);
     Director::getInstance()->getRenderer()->setDepthTest(false);
     Director::getInstance()->getRenderer()->setDepthWrite(false);
@@ -989,7 +972,6 @@ std::string TMXIsoVertexZNew::subtitle() const
     return "Doesn't support yet";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXOrthoVertexZNew
@@ -999,24 +981,23 @@ TMXOrthoVertexZNew::TMXOrthoVertexZNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
-    
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
+
     // because I'm lazy, I'm reusing a tile as an sprite, but since this method uses vertexZ, you
     // can use any Sprite and it will work OK.
     auto layer = map->getLayer("trees");
-    _tamara = layer->getTileAt(Vec2(0,11));
+    _tamara    = layer->getTileAt(Vec2(0, 11));
     CCLOG("%p vertexZ: %f", _tamara, _tamara->getPositionZ());
     _tamara->retain();
 
-    auto move = MoveBy::create(10, Vec2(400,450) * (1/CC_CONTENT_SCALE_FACTOR()));
+    auto move = MoveBy::create(10, Vec2(400, 450) * (1 / CC_CONTENT_SCALE_FACTOR()));
     auto back = move->reverse();
-    auto seq = Sequence::create(move, back,nullptr);
-    _tamara->runAction( RepeatForever::create(seq));
-    
+    auto seq  = Sequence::create(move, back, nullptr);
+    _tamara->runAction(RepeatForever::create(seq));
+
     schedule(CC_SCHEDULE_SELECTOR(TMXOrthoVertexZNew::repositionSprite));
-    
 }
 
 TMXOrthoVertexZNew::~TMXOrthoVertexZNew()
@@ -1029,14 +1010,14 @@ void TMXOrthoVertexZNew::repositionSprite(float dt)
     // tile height is 101x81
     // map size: 12x12
     auto p = _tamara->getPosition();
-    p = CC_POINT_POINTS_TO_PIXELS(p);
-    _tamara->setPositionZ( -( (p.y+81) /81) );
+    p      = CC_POINT_POINTS_TO_PIXELS(p);
+    _tamara->setPositionZ(-((p.y + 81) / 81));
 }
 
 void TMXOrthoVertexZNew::onEnter()
 {
     TileDemoNew::onEnter();
-    
+
     // TIP: 2d projection should be used
     Director::getInstance()->setProjection(Director::Projection::_2D);
     Director::getInstance()->getRenderer()->setDepthTest(true);
@@ -1045,7 +1026,7 @@ void TMXOrthoVertexZNew::onEnter()
 
 void TMXOrthoVertexZNew::onExit()
 {
-    // At exit use any other projection. 
+    // At exit use any other projection.
     Director::getInstance()->setProjection(Director::Projection::DEFAULT);
     Director::getInstance()->getRenderer()->setDepthTest(false);
     Director::getInstance()->getRenderer()->setDepthWrite(false);
@@ -1062,7 +1043,6 @@ std::string TMXOrthoVertexZNew::subtitle() const
     return "Doesn't support yet";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXIsoMoveLayerNew
@@ -1072,11 +1052,11 @@ TMXIsoMoveLayerNew::TMXIsoMoveLayerNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/iso-test-movelayer.tmx");
     addChild(map, 0, kTagTileMap);
-    
-    map->setPosition(Vec2(-700.0f,-50.0f));
+
+    map->setPosition(Vec2(-700.0f, -50.0f));
 
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 }
 
 std::string TMXIsoMoveLayerNew::title() const
@@ -1089,7 +1069,6 @@ std::string TMXIsoMoveLayerNew::subtitle() const
     return "Trees should be horizontally aligned";
 }
 
-
 //------------------------------------------------------------------
 //
 // TMXOrthoMoveLayerNew
@@ -1101,7 +1080,7 @@ TMXOrthoMoveLayerNew::TMXOrthoMoveLayerNew()
     addChild(map, 0, kTagTileMap);
 
     Size CC_UNUSED s = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s.width,s.height);
+    CCLOG("ContentSize: %f, %f", s.width, s.height);
 }
 
 std::string TMXOrthoMoveLayerNew::title() const
@@ -1123,10 +1102,11 @@ std::string TMXOrthoMoveLayerNew::subtitle() const
 TMXTilePropertyTestNew::TMXTilePropertyTestNew()
 {
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/ortho-tile-property.tmx");
-    addChild(map ,0 ,kTagTileMap);
+    addChild(map, 0, kTagTileMap);
 
-    for(int i=1;i<=20;i++){
-        for(const auto& value : map->getPropertiesForGID(i).asValueMap())
+    for (int i = 1; i <= 20; i++)
+    {
+        for (const auto& value : map->getPropertiesForGID(i).asValueMap())
         {
             log("GID:%i, Properties:%s, %s", i, value.first.c_str(), value.second.asString().c_str());
         }
@@ -1155,7 +1135,7 @@ TMXOrthoFlipTestNew::TMXOrthoFlipTestNew()
     addChild(map, 0, kTagTileMap);
 
     Size CC_UNUSED s = map->getContentSize();
-    log("ContentSize: %f, %f", s.width,s.height);
+    log("ContentSize: %f, %f", s.width, s.height);
 
     auto action = ScaleBy::create(2, 0.5f);
     map->runAction(action);
@@ -1178,7 +1158,7 @@ TMXOrthoFlipRunTimeTestNew::TMXOrthoFlipRunTimeTestNew()
     addChild(map, 0, kTagTileMap);
 
     auto s = map->getContentSize();
-    log("ContentSize: %f, %f", s.width,s.height);
+    log("ContentSize: %f, %f", s.width, s.height);
 
     auto action = ScaleBy::create(2, 0.5f);
     map->runAction(action);
@@ -1198,39 +1178,37 @@ std::string TMXOrthoFlipRunTimeTestNew::subtitle() const
 
 void TMXOrthoFlipRunTimeTestNew::flipIt(float dt)
 {
-    auto map = (cocos2d::FastTMXTiledMap*) getChildByTag(kTagTileMap);
+    auto map   = (cocos2d::FastTMXTiledMap*)getChildByTag(kTagTileMap);
     auto layer = map->getLayer("Layer 0");
 
-    //blue diamond 
-    auto tileCoord = Vec2(1,10);
+    // blue diamond
+    auto tileCoord = Vec2(1, 10);
     int flags;
     unsigned int GID = layer->getTileGIDAt(tileCoord, (TMXTileFlags*)&flags);
     // Vertical
-    if( flags & kTMXTileVerticalFlag )
+    if (flags & kTMXTileVerticalFlag)
         flags &= ~kTMXTileVerticalFlag;
     else
         flags |= kTMXTileVerticalFlag;
-    layer->setTileGID(GID ,tileCoord, (TMXTileFlags)flags);
+    layer->setTileGID(GID, tileCoord, (TMXTileFlags)flags);
 
-
-    tileCoord = Vec2(1,8);    
-    GID = layer->getTileGIDAt(tileCoord, (TMXTileFlags*)&flags);
+    tileCoord = Vec2(1, 8);
+    GID       = layer->getTileGIDAt(tileCoord, (TMXTileFlags*)&flags);
     // Vertical
-    if( flags & kTMXTileVerticalFlag )
+    if (flags & kTMXTileVerticalFlag)
         flags &= ~kTMXTileVerticalFlag;
     else
-        flags |= kTMXTileVerticalFlag;    
-    layer->setTileGID(GID ,tileCoord, (TMXTileFlags)flags);
-
+        flags |= kTMXTileVerticalFlag;
+    layer->setTileGID(GID, tileCoord, (TMXTileFlags)flags);
 
-    tileCoord = Vec2(2,8);
-    GID = layer->getTileGIDAt(tileCoord, (TMXTileFlags*)&flags);
+    tileCoord = Vec2(2, 8);
+    GID       = layer->getTileGIDAt(tileCoord, (TMXTileFlags*)&flags);
     // Horizontal
-    if( flags & kTMXTileHorizontalFlag )
+    if (flags & kTMXTileHorizontalFlag)
         flags &= ~kTMXTileHorizontalFlag;
     else
-        flags |= kTMXTileHorizontalFlag;    
-    layer->setTileGID(GID, tileCoord, (TMXTileFlags)flags);    
+        flags |= kTMXTileHorizontalFlag;
+    layer->setTileGID(GID, tileCoord, (TMXTileFlags)flags);
 }
 //------------------------------------------------------------------
 //
@@ -1240,17 +1218,17 @@ void TMXOrthoFlipRunTimeTestNew::flipIt(float dt)
 
 TMXOrthoFromXMLTestNew::TMXOrthoFromXMLTestNew()
 {
-    std::string resources = "TileMaps";        // partial paths are OK as resource paths.
-    std::string file = resources + "/orthogonal-test1.tmx";
+    std::string resources = "TileMaps";  // partial paths are OK as resource paths.
+    std::string file      = resources + "/orthogonal-test1.tmx";
 
-    auto fileUtils = FileUtils::getInstance();
+    auto fileUtils  = FileUtils::getInstance();
     std::string str = fileUtils->getStringFromFile(fileUtils->fullPathForFilename(file.c_str()));
 
-    auto map = cocos2d::FastTMXTiledMap::createWithXML(str ,resources.c_str());
+    auto map = cocos2d::FastTMXTiledMap::createWithXML(str, resources.c_str());
     addChild(map, 0, kTagTileMap);
 
     auto s = map->getContentSize();
-    log("ContentSize: %f, %f", s.width,s.height);
+    log("ContentSize: %f, %f", s.width, s.height);
 
     auto action = ScaleBy::create(2, 0.5f);
     map->runAction(action);
@@ -1274,14 +1252,15 @@ TMXOrthoXMLFormatTestNew::TMXOrthoXMLFormatTestNew()
     // 3. firstgid in tsx is ignored, tile property in tsx loaded correctly.
     auto map = cocos2d::FastTMXTiledMap::create("TileMaps/xml-test.tmx");
     addChild(map, 0, kTagTileMap);
-    
+
     auto s = map->getContentSize();
-    log("ContentSize: %f, %f", s.width,s.height);
-    
-    for(int i=24;i<=26;i++){
+    log("ContentSize: %f, %f", s.width, s.height);
+
+    for (int i = 24; i <= 26; i++)
+    {
         log("GID:%i, Properties:%s", i, map->getPropertiesForGID(i).asValueMap()["name"].asString().c_str());
     }
-    
+
     auto action = ScaleBy::create(2, 0.5f);
     map->runAction(action);
 }
@@ -1302,11 +1281,11 @@ TMXBug987New::TMXBug987New()
     addChild(map, 0, kTagTileMap);
 
     Size CC_UNUSED s1 = map->getContentSize();
-    CCLOG("ContentSize: %f, %f", s1.width,s1.height);
+    CCLOG("ContentSize: %f, %f", s1.width, s1.height);
 
     map->setAnchorPoint(Vec2(0.0f, 0.0f));
     auto layer = map->getLayer("Tile Layer 1");
-    layer->setTileGID(3, Vec2(2,2));
+    layer->setTileGID(3, Vec2(2, 2));
 }
 
 std::string TMXBug987New::title() const
@@ -1356,24 +1335,24 @@ TMXGIDObjectsTestNew::TMXGIDObjectsTestNew()
     CCLOG("Contentsize: %f, %f", s.width, s.height);
 
     CCLOG("----> Iterating over all the group objects");
-    
+
     auto drawNode = DrawNode::create();
     Color4F color(1.0, 1.0, 1.0, 1.0);
-    auto group = map->getObjectGroup("Object Layer 1");
+    auto group   = map->getObjectGroup("Object Layer 1");
     auto objects = group->getObjects();
     for (auto& obj : objects)
     {
         ValueMap& dict = obj.asValueMap();
-        
-        float x = dict["x"].asFloat();
-        float y = dict["y"].asFloat();
-        float width = dict["width"].asFloat();
+
+        float x      = dict["x"].asFloat();
+        float y      = dict["y"].asFloat();
+        float width  = dict["width"].asFloat();
         float height = dict["height"].asFloat();
-        
+
         drawNode->drawLine(Vec2(x, y), Vec2(x + width, y), color);
         drawNode->drawLine(Vec2(x + width, y), Vec2(x + width, y + height), color);
-        drawNode->drawLine(Vec2(x + width,y + height), Vec2(x,y + height), color);
-        drawNode->drawLine(Vec2(x,y + height), Vec2(x,y), color);
+        drawNode->drawLine(Vec2(x + width, y + height), Vec2(x, y + height), color);
+        drawNode->drawLine(Vec2(x, y + height), Vec2(x, y), color);
     }
     map->addChild(drawNode, 10);
 }
@@ -1399,7 +1378,7 @@ TileAnimTestNew::TileAnimTestNew()
     map = FastTMXTiledMap::create("TileMaps/tile_animation_test.tmx");
     addChild(map, 0, kTagTileMap);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(TileAnimTestNew::onTouchBegan, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 
diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h
index c27459e7537b..e605da119c2d 100644
--- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h
+++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -54,7 +54,7 @@ class TileMapEditTestNew : public TileDemoNew
 {
 public:
     CREATE_FUNC(TileMapEditTestNew);
-    TileMapEditTestNew ();
+    TileMapEditTestNew();
     virtual std::string title() const override;
 
     void updateMap(float dt);
@@ -100,6 +100,7 @@ class TMXReadWriteTestNew : public TileDemoNew
 {
     unsigned int _gid;
     unsigned int _gid2;
+
 public:
     CREATE_FUNC(TMXReadWriteTestNew);
     TMXReadWriteTestNew();
@@ -191,13 +192,14 @@ class TMXResizeTestNew : public TileDemoNew
 
 class TMXIsoZorderNew : public TileDemoNew
 {
-    cocos2d::Sprite*    _tamara;
+    cocos2d::Sprite* _tamara;
+
 public:
     CREATE_FUNC(TMXIsoZorderNew);
     TMXIsoZorderNew();
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
-    virtual void onExit()override;
+    virtual void onExit() override;
 
     ~TMXIsoZorderNew();
     void repositionSprite(float dt);
@@ -205,7 +207,8 @@ class TMXIsoZorderNew : public TileDemoNew
 
 class TMXOrthoZorderNew : public TileDemoNew
 {
-    cocos2d::Sprite*    _tamara;
+    cocos2d::Sprite* _tamara;
+
 public:
     CREATE_FUNC(TMXOrthoZorderNew);
     TMXOrthoZorderNew();
@@ -218,7 +221,8 @@ class TMXOrthoZorderNew : public TileDemoNew
 
 class TMXIsoVertexZNew : public TileDemoNew
 {
-    cocos2d::Sprite*    _tamara;
+    cocos2d::Sprite* _tamara;
+
 public:
     CREATE_FUNC(TMXIsoVertexZNew);
     TMXIsoVertexZNew();
@@ -233,7 +237,8 @@ class TMXIsoVertexZNew : public TileDemoNew
 
 class TMXOrthoVertexZNew : public TileDemoNew
 {
-    cocos2d::Sprite*    _tamara;
+    cocos2d::Sprite* _tamara;
+
 public:
     CREATE_FUNC(TMXOrthoVertexZNew);
     TMXOrthoVertexZNew();
@@ -331,7 +336,7 @@ class TMXGIDObjectsTestNew : public TileDemoNew
     CREATE_FUNC(TMXGIDObjectsTestNew);
     TMXGIDObjectsTestNew();
     virtual std::string title() const override;
-    virtual std::string subtitle() const override;   
+    virtual std::string subtitle() const override;
 };
 
 class TileAnimTestNew : public TileDemoNew
diff --git a/tests/cpp-tests/Classes/TouchesTest/Ball.cpp b/tests/cpp-tests/Classes/TouchesTest/Ball.cpp
index 36c6490c239c..0b1db9ea3d27 100644
--- a/tests/cpp-tests/Classes/TouchesTest/Ball.cpp
+++ b/tests/cpp-tests/Classes/TouchesTest/Ball.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,13 +28,9 @@
 
 USING_NS_CC;
 
-Ball::Ball()
-{
-}
+Ball::Ball() {}
 
-Ball::~Ball()
-{
-}
+Ball::~Ball() {}
 
 float Ball::radius()
 {
@@ -53,13 +49,13 @@ Ball* Ball::ballWithTexture(Texture2D* aTexture)
 void Ball::move(float delta)
 {
     this->setPosition(getPosition() + _velocity * delta);
-    
-    if (getPosition().x > VisibleRect::right().x - radius()) 
+
+    if (getPosition().x > VisibleRect::right().x - radius())
     {
         setPosition(VisibleRect::right().x - radius(), getPosition().y);
         _velocity.x *= -1;
-    } 
-    else if (getPosition().x < VisibleRect::left().x + radius()) 
+    }
+    else if (getPosition().x < VisibleRect::left().x + radius())
     {
         setPosition(VisibleRect::left().x + radius(), getPosition().y);
         _velocity.x *= -1;
@@ -71,40 +67,41 @@ void Ball::collideWithPaddle(Paddle* paddle)
     auto paddleRect = paddle->getRect();
     paddleRect.origin.x += paddle->getPosition().x;
     paddleRect.origin.y += paddle->getPosition().y;
-    
+
     float lowY  = paddleRect.getMinY();
     float midY  = paddleRect.getMidY();
     float highY = paddleRect.getMaxY();
-    
+
     float leftX  = paddleRect.getMinX();
     float rightX = paddleRect.getMaxX();
-    
-    if (getPosition().x > leftX && getPosition().x < rightX) {
-    
-        bool hit = false;
-        float angleOffset = 0.0f; 
-        
-        if (getPosition().y > midY && getPosition().y <= highY + radius()) 
+
+    if (getPosition().x > leftX && getPosition().x < rightX)
+    {
+
+        bool hit          = false;
+        float angleOffset = 0.0f;
+
+        if (getPosition().y > midY && getPosition().y <= highY + radius())
         {
             setPosition(getPosition().x, highY + radius());
-            hit = true;
+            hit         = true;
             angleOffset = (float)M_PI / 2;
         }
-        else if (getPosition().y < midY && getPosition().y >= lowY - radius()) 
+        else if (getPosition().y < midY && getPosition().y >= lowY - radius())
         {
             setPosition(getPosition().x, lowY - radius());
-            hit = true;
+            hit         = true;
             angleOffset = -(float)M_PI / 2;
         }
-        
-        if (hit) 
+
+        if (hit)
         {
             float hitAngle = (paddle->getPosition() - getPosition()).getAngle() + angleOffset;
-            
+
             float scalarVelocity = _velocity.getLength() * 1.05f;
-            float velocityAngle = -_velocity.getAngle() + 0.5f * hitAngle;
-            
+            float velocityAngle  = -_velocity.getAngle() + 0.5f * hitAngle;
+
             _velocity = Vec2::forAngle(velocityAngle) * scalarVelocity;
         }
-    }    
-} 
+    }
+}
diff --git a/tests/cpp-tests/Classes/TouchesTest/Ball.h b/tests/cpp-tests/Classes/TouchesTest/Ball.h
index 0135e4a0edeb..cccfdb47109a 100644
--- a/tests/cpp-tests/Classes/TouchesTest/Ball.h
+++ b/tests/cpp-tests/Classes/TouchesTest/Ball.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,20 +32,20 @@ class Paddle;
 class Ball : public cocos2d::Sprite
 {
     cocos2d::Vec2 _velocity;
+
 public:
     Ball();
     virtual ~Ball();
 
     float radius();
-    //BOOL initWithTexture(cocos2d::Texture2D* aTexture);
-    //virtual void setTexture(cocos2d::Texture2D* newTexture);
+    // BOOL initWithTexture(cocos2d::Texture2D* aTexture);
+    // virtual void setTexture(cocos2d::Texture2D* newTexture);
     void move(float delta);
     void collideWithPaddle(Paddle* paddle);
 
-
 public:
-    void setVelocity(cocos2d::Vec2 velocity){_velocity = velocity;}
-    cocos2d::Vec2 getVelocity(){return _velocity;}
+    void setVelocity(cocos2d::Vec2 velocity) { _velocity = velocity; }
+    cocos2d::Vec2 getVelocity() { return _velocity; }
 
 public:
     static Ball* ballWithTexture(cocos2d::Texture2D* aTexture);
diff --git a/tests/cpp-tests/Classes/TouchesTest/Paddle.cpp b/tests/cpp-tests/Classes/TouchesTest/Paddle.cpp
index 23cb639621f5..6e7db8b8baf2 100644
--- a/tests/cpp-tests/Classes/TouchesTest/Paddle.cpp
+++ b/tests/cpp-tests/Classes/TouchesTest/Paddle.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,13 +26,9 @@
 
 USING_NS_CC;
 
-Paddle::Paddle()
-{
-}
+Paddle::Paddle() {}
 
-Paddle::~Paddle()
-{
-}
+Paddle::~Paddle() {}
 
 Rect Paddle::getRect()
 {
@@ -51,35 +47,35 @@ Paddle* Paddle::createWithTexture(Texture2D* aTexture)
 
 bool Paddle::initWithTexture(Texture2D* aTexture)
 {
-    if( Sprite::initWithTexture(aTexture) )
+    if (Sprite::initWithTexture(aTexture))
     {
         _state = kPaddleStateUngrabbed;
     }
-    
+
     return true;
 }
 
 void Paddle::onEnter()
 {
     Sprite::onEnter();
-    
+
     // Register Touch Event
     auto listener = EventListenerTouchOneByOne::create();
     listener->setSwallowTouches(true);
-    
+
     listener->onTouchBegan = CC_CALLBACK_2(Paddle::onTouchBegan, this);
     listener->onTouchMoved = CC_CALLBACK_2(Paddle::onTouchMoved, this);
     listener->onTouchEnded = CC_CALLBACK_2(Paddle::onTouchEnded, this);
-    
+
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
 void Paddle::onExit()
 {
-//    auto director = Director::getInstance();
-//    director->getTouchDispatcher()->removeDelegate(this);
+    //    auto director = Director::getInstance();
+    //    director->getTouchDispatcher()->removeDelegate(this);
     Sprite::onExit();
-}    
+}
 
 bool Paddle::containsTouchLocation(Touch* touch)
 {
@@ -88,11 +84,14 @@ bool Paddle::containsTouchLocation(Touch* touch)
 
 bool Paddle::onTouchBegan(Touch* touch, Event* event)
 {
-    CCLOG("Paddle::onTouchBegan id = %d, x = %f, y = %f", touch->getID(), touch->getLocation().x, touch->getLocation().y);
-    
-    if (_state != kPaddleStateUngrabbed) return false;
-    if ( !containsTouchLocation(touch) ) return false;
-    
+    CCLOG("Paddle::onTouchBegan id = %d, x = %f, y = %f", touch->getID(), touch->getLocation().x,
+          touch->getLocation().y);
+
+    if (_state != kPaddleStateUngrabbed)
+        return false;
+    if (!containsTouchLocation(touch))
+        return false;
+
     _state = kPaddleStateGrabbed;
     CCLOG("return true");
     return true;
@@ -106,14 +105,15 @@ void Paddle::onTouchMoved(Touch* touch, Event* event)
     // Actually, it would be even more complicated since in the Cocos dispatcher
     // you get Sets instead of 1 UITouch, so you'd need to loop through the set
     // in each touchXXX method.
-    
-    CCLOG("Paddle::onTouchMoved id = %d, x = %f, y = %f", touch->getID(), touch->getLocation().x, touch->getLocation().y);
-    
-    CCASSERT(_state == kPaddleStateGrabbed, "Paddle - Unexpected state!");    
-    
+
+    CCLOG("Paddle::onTouchMoved id = %d, x = %f, y = %f", touch->getID(), touch->getLocation().x,
+          touch->getLocation().y);
+
+    CCASSERT(_state == kPaddleStateGrabbed, "Paddle - Unexpected state!");
+
     auto touchPoint = touch->getLocation();
-    
-    setPosition( Vec2(touchPoint.x, getPosition().y) );
+
+    setPosition(Vec2(touchPoint.x, getPosition().y));
 }
 
 Paddle* Paddle::clone() const
@@ -127,7 +127,7 @@ Paddle* Paddle::clone() const
 
 void Paddle::onTouchEnded(Touch* touch, Event* event)
 {
-    CCASSERT(_state == kPaddleStateGrabbed, "Paddle - Unexpected state!");    
-    
+    CCASSERT(_state == kPaddleStateGrabbed, "Paddle - Unexpected state!");
+
     _state = kPaddleStateUngrabbed;
-} 
+}
diff --git a/tests/cpp-tests/Classes/TouchesTest/Paddle.h b/tests/cpp-tests/Classes/TouchesTest/Paddle.h
index 1248925428c6..588c9b1ce68c 100644
--- a/tests/cpp-tests/Classes/TouchesTest/Paddle.h
+++ b/tests/cpp-tests/Classes/TouchesTest/Paddle.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,16 +27,15 @@
 
 #include "cocos2d.h"
 
-
-typedef enum tagPaddleState 
+typedef enum tagPaddleState
 {
     kPaddleStateGrabbed,
     kPaddleStateUngrabbed
-} PaddleState; 
+} PaddleState;
 
 class Paddle : public cocos2d::Sprite, public cocos2d::Clonable
 {
-    PaddleState        _state;
+    PaddleState _state;
 
 public:
     Paddle();
diff --git a/tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp
index 37208c0584c0..4e260fd56c9a 100644
--- a/tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp
+++ b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,16 +29,16 @@
 
 USING_NS_CC;
 
-enum tagPlayer 
+enum tagPlayer
 {
     kHighPlayer,
     kLowPlayer
-} PlayerTouches;    
+} PlayerTouches;
 
-#define kStatusBarHeight 0.0f //20.0f
+#define kStatusBarHeight 0.0f  // 20.0f
 //#define k1UpperLimit (480.0f - kStatusBarHeight)
 
-enum 
+enum
 {
     kSpriteTag
 };
@@ -73,54 +73,54 @@ bool PongScene::init()
 PongLayer::PongLayer()
 {
     _ballStartingVelocity = Vec2(20.0f, -100.0f);
-    
-    _ball = Ball::ballWithTexture( Director::getInstance()->getTextureCache()->addImage(s_Ball) );
-    _ball->setPosition( VisibleRect::center() );
-    _ball->setVelocity( _ballStartingVelocity );
-    addChild( _ball );
-    
+
+    _ball = Ball::ballWithTexture(Director::getInstance()->getTextureCache()->addImage(s_Ball));
+    _ball->setPosition(VisibleRect::center());
+    _ball->setVelocity(_ballStartingVelocity);
+    addChild(_ball);
+
     auto paddleTexture = Director::getInstance()->getTextureCache()->addImage(s_Paddle);
-    
+
     Vector<Paddle*> paddlesM(4);
-    
-    float paddleStep =(VisibleRect::getVisibleRect().size.height - kStatusBarHeight - 30 - 3*paddleTexture->getPixelsHigh())/3 + paddleTexture->getPixelsHigh();
+
+    float paddleStep =
+        (VisibleRect::getVisibleRect().size.height - kStatusBarHeight - 30 - 3 * paddleTexture->getPixelsHigh()) / 3 +
+        paddleTexture->getPixelsHigh();
     float nextPaddlePos = VisibleRect::bottom().y + 15;
-    Paddle* paddle = Paddle::createWithTexture(paddleTexture);
-    paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos));
-	paddlesM.pushBack( paddle );
-    
-    paddle = Paddle::createWithTexture( paddleTexture );
-    paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
-    paddlesM.pushBack( paddle );
-
-    paddle = Paddle::createWithTexture( paddleTexture );
-    paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
-    paddlesM.pushBack( paddle );
-
-    paddle = Paddle::createWithTexture( paddleTexture );
-    paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
-    paddlesM.pushBack( paddle );
-    
+    Paddle* paddle      = Paddle::createWithTexture(paddleTexture);
+    paddle->setPosition(Vec2(VisibleRect::center().x, nextPaddlePos));
+    paddlesM.pushBack(paddle);
+
+    paddle = Paddle::createWithTexture(paddleTexture);
+    paddle->setPosition(Vec2(VisibleRect::center().x, nextPaddlePos += paddleStep));
+    paddlesM.pushBack(paddle);
+
+    paddle = Paddle::createWithTexture(paddleTexture);
+    paddle->setPosition(Vec2(VisibleRect::center().x, nextPaddlePos += paddleStep));
+    paddlesM.pushBack(paddle);
+
+    paddle = Paddle::createWithTexture(paddleTexture);
+    paddle->setPosition(Vec2(VisibleRect::center().x, nextPaddlePos += paddleStep));
+    paddlesM.pushBack(paddle);
+
     _paddles = paddlesM;
-    
+
     for (auto& paddle : _paddles)
     {
         addChild(paddle);
     }
 
-    schedule( CC_SCHEDULE_SELECTOR(PongLayer::doStep) );
+    schedule(CC_SCHEDULE_SELECTOR(PongLayer::doStep));
 }
 
-PongLayer::~PongLayer()
-{
-}
+PongLayer::~PongLayer() {}
 
 void PongLayer::resetAndScoreBallForPlayer(int player)
 {
     _ballStartingVelocity = _ballStartingVelocity * -1.1f;
-    _ball->setVelocity( _ballStartingVelocity );
-    _ball->setPosition( VisibleRect::center() );
-    
+    _ball->setVelocity(_ballStartingVelocity);
+    _ball->setPosition(VisibleRect::center());
+
     // TODO -- scoring
 }
 
@@ -130,36 +130,37 @@ void PongLayer::doStep(float delta)
 
     for (auto& paddle : _paddles)
     {
-        _ball->collideWithPaddle( paddle );
+        _ball->collideWithPaddle(paddle);
     }
 
     if (_ball->getPosition().y > VisibleRect::top().y - kStatusBarHeight + _ball->radius())
-        resetAndScoreBallForPlayer( kLowPlayer );
-    else if (_ball->getPosition().y < VisibleRect::bottom().y-_ball->radius())
-        resetAndScoreBallForPlayer( kHighPlayer );
+        resetAndScoreBallForPlayer(kLowPlayer);
+    else if (_ball->getPosition().y < VisibleRect::bottom().y - _ball->radius())
+        resetAndScoreBallForPlayer(kHighPlayer);
 }
 
-const char * _Info_Formatter = "Current force value : %0.02f, maximum possible force : %0.02f";
-char formatBuffer[256] = {0, };
+const char* _Info_Formatter = "Current force value : %0.02f, maximum possible force : %0.02f";
+char formatBuffer[256]      = {
+    0,
+};
 
 ForceTouchTest::ForceTouchTest()
 {
     auto s = Director::getInstance()->getWinSize();
 
-    _infoLabel = Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Current force value : 0.00, maximum possible force : 0.00");
+    _infoLabel =
+        Label::createWithTTF(TTFConfig("fonts/arial.ttf"), "Current force value : 0.00, maximum possible force : 0.00");
     _infoLabel->setPosition(s.width / 2, s.height / 2);
     addChild(_infoLabel);
 
-    auto listener = EventListenerTouchAllAtOnce::create();
+    auto listener            = EventListenerTouchAllAtOnce::create();
     listener->onTouchesBegan = CC_CALLBACK_2(ForceTouchTest::onTouchesBegan, this);
     listener->onTouchesMoved = CC_CALLBACK_2(ForceTouchTest::onTouchesMoved, this);
     listener->onTouchesEnded = CC_CALLBACK_2(ForceTouchTest::onTouchesEnded, this);
     _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
-ForceTouchTest::~ForceTouchTest()
-{
-}
+ForceTouchTest::~ForceTouchTest() {}
 
 std::string ForceTouchTest::title() const
 {
@@ -170,17 +171,15 @@ std::string ForceTouchTest::subtitle() const
 {
     return std::string("Touch with force to see info label changes\nOnly work on iPhone6s / iPhone6s Plus");
 }
-    
-void ForceTouchTest::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
-{
-}
+
+void ForceTouchTest::onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event) {}
 
 void ForceTouchTest::onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event)
 {
-    for(auto& t : touches)
+    for (auto& t : touches)
     {
         float currentForce = t->getCurrentForce();
-        float maxForce = t->getMaxForce();
+        float maxForce     = t->getMaxForce();
         sprintf(formatBuffer, _Info_Formatter, currentForce, maxForce);
         _infoLabel->setString(std::string(formatBuffer));
     }
diff --git a/tests/cpp-tests/Classes/TouchesTest/TouchesTest.h b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.h
index 92c418f84bc8..4da6ac247408 100644
--- a/tests/cpp-tests/Classes/TouchesTest/TouchesTest.h
+++ b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,14 +27,13 @@
 
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(TouchesTests);
 
 class PongScene : public TestCase
 {
 public:
     CREATE_FUNC(PongScene);
-    
+
     virtual bool init() override;
 };
 
@@ -43,9 +42,10 @@ class Paddle;
 class PongLayer : public cocos2d::Layer
 {
 private:
-    Ball*       _ball;
-    cocos2d::Vector<Paddle*>    _paddles;
-    cocos2d::Vec2     _ballStartingVelocity; 
+    Ball* _ball;
+    cocos2d::Vector<Paddle*> _paddles;
+    cocos2d::Vec2 _ballStartingVelocity;
+
 public:
     CREATE_FUNC(PongLayer);
     PongLayer();
@@ -59,19 +59,19 @@ class ForceTouchTest : public TestCase
 {
 public:
     CREATE_FUNC(ForceTouchTest);
-    
+
     virtual std::string title() const override;
     virtual std::string subtitle() const override;
 
     void onTouchesBegan(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onTouchesMoved(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
     void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
+
 protected:
     ForceTouchTest();
     virtual ~ForceTouchTest();
 
-    cocos2d::Label * _infoLabel;
+    cocos2d::Label* _infoLabel;
 };
 
 #endif
diff --git a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp
index 93d0b3c1addb..2fdb5e335fc4 100644
--- a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp
+++ b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp
@@ -31,16 +31,13 @@ USING_NS_CC;
 
 #define TRANSITION_DURATION (1.2f)
 
-class FadeWhiteTransition : public TransitionFade 
+class FadeWhiteTransition : public TransitionFade
 {
 public:
-    static TransitionScene* create(float t, Scene* s)
-    {
-        return TransitionFade::create(t, s, Color3B::WHITE); 
-    }
+    static TransitionScene* create(float t, Scene* s) { return TransitionFade::create(t, s, Color3B::WHITE); }
 };
 
-class FlipXLeftOver : public TransitionFlipX 
+class FlipXLeftOver : public TransitionFlipX
 {
 public:
     static TransitionScene* create(float t, Scene* s)
@@ -49,7 +46,7 @@ class FlipXLeftOver : public TransitionFlipX
     }
 };
 
-class FlipXRightOver : public TransitionFlipX 
+class FlipXRightOver : public TransitionFlipX
 {
 public:
     static TransitionScene* create(float t, Scene* s)
@@ -58,34 +55,34 @@ class FlipXRightOver : public TransitionFlipX
     }
 };
 
-class FlipYUpOver : public TransitionFlipY 
+class FlipYUpOver : public TransitionFlipY
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionFlipY::create(t, s, TransitionScene::Orientation::UP_OVER); 
+        return TransitionFlipY::create(t, s, TransitionScene::Orientation::UP_OVER);
     }
 };
 
-class FlipYDownOver : public TransitionFlipY 
+class FlipYDownOver : public TransitionFlipY
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionFlipY::create(t, s, TransitionScene::Orientation::DOWN_OVER); 
+        return TransitionFlipY::create(t, s, TransitionScene::Orientation::DOWN_OVER);
     }
 };
 
-class FlipAngularLeftOver : public TransitionFlipAngular 
+class FlipAngularLeftOver : public TransitionFlipAngular
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionFlipAngular::create(t, s, TransitionScene::Orientation::LEFT_OVER); 
+        return TransitionFlipAngular::create(t, s, TransitionScene::Orientation::LEFT_OVER);
     }
 };
 
-class FlipAngularRightOver : public TransitionFlipAngular 
+class FlipAngularRightOver : public TransitionFlipAngular
 {
 public:
     static TransitionScene* create(float t, Scene* s)
@@ -94,16 +91,16 @@ class FlipAngularRightOver : public TransitionFlipAngular
     }
 };
 
-class ZoomFlipXLeftOver : public TransitionZoomFlipX 
+class ZoomFlipXLeftOver : public TransitionZoomFlipX
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionZoomFlipX::create(t, s, TransitionScene::Orientation::LEFT_OVER); 
+        return TransitionZoomFlipX::create(t, s, TransitionScene::Orientation::LEFT_OVER);
     }
 };
 
-class ZoomFlipXRightOver : public TransitionZoomFlipX 
+class ZoomFlipXRightOver : public TransitionZoomFlipX
 {
 public:
     static TransitionScene* create(float t, Scene* s)
@@ -112,35 +109,34 @@ class ZoomFlipXRightOver : public TransitionZoomFlipX
     }
 };
 
-class ZoomFlipYUpOver : public TransitionZoomFlipY 
+class ZoomFlipYUpOver : public TransitionZoomFlipY
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionZoomFlipY::create(t, s, TransitionScene::Orientation::UP_OVER); 
-
+        return TransitionZoomFlipY::create(t, s, TransitionScene::Orientation::UP_OVER);
     }
 };
 
-class ZoomFlipYDownOver : public TransitionZoomFlipY 
+class ZoomFlipYDownOver : public TransitionZoomFlipY
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionZoomFlipY::create(t, s, TransitionScene::Orientation::DOWN_OVER); 
+        return TransitionZoomFlipY::create(t, s, TransitionScene::Orientation::DOWN_OVER);
     }
 };
 
-class ZoomFlipAngularLeftOver : public TransitionZoomFlipAngular 
+class ZoomFlipAngularLeftOver : public TransitionZoomFlipAngular
 {
 public:
     static TransitionScene* create(float t, Scene* s)
     {
-        return TransitionZoomFlipAngular::create(t, s, TransitionScene::Orientation::LEFT_OVER); 
+        return TransitionZoomFlipAngular::create(t, s, TransitionScene::Orientation::LEFT_OVER);
     }
 };
 
-class ZoomFlipAngularRightOver : public TransitionZoomFlipAngular 
+class ZoomFlipAngularRightOver : public TransitionZoomFlipAngular
 {
 public:
     static TransitionScene* create(float t, Scene* s)
@@ -152,30 +148,25 @@ class ZoomFlipAngularRightOver : public TransitionZoomFlipAngular
 class PageTransitionForward : public TransitionPageTurn
 {
 public:
-    static TransitionScene* create(float t, Scene* s)
-    {
-        return TransitionPageTurn::create(t, s, false);
-    }
+    static TransitionScene* create(float t, Scene* s) { return TransitionPageTurn::create(t, s, false); }
 };
 
 class PageTransitionBackward : public TransitionPageTurn
 {
 public:
-    static TransitionScene* create(float t, Scene* s)
-    {
-        return TransitionPageTurn::create(t, s, true);
-    }
+    static TransitionScene* create(float t, Scene* s) { return TransitionPageTurn::create(t, s, true); }
 };
 
 #define STRINGIFY(x) #x
 
-#define TRANS(__className__) {                                      \
-    [](float t, Scene* s){ return __className__::create(t,s);},     \
-        STRINGIFY(__className__),                                   \
+#define TRANS(__className__)                                                                     \
+    {                                                                                            \
+        [](float t, Scene* s) { return __className__::create(t, s); }, STRINGIFY(__className__), \
     }
-struct _transitions {
+struct _transitions
+{
     std::function<TransitionScene*(float t, Scene* s)> function;
-    const char * name;
+    const char* name;
 } transitions[] = {
     TRANS(TransitionJumpZoom),
     TRANS(TransitionProgressRadialCCW),
@@ -236,7 +227,7 @@ TransitionsTests::TransitionsTests()
 
     for (auto& test : transitions)
     {
-        addTestCase(test.name, [sceneIndex](){
+        addTestCase(test.name, [sceneIndex]() {
             auto scene = TransitionsTest::create();
             // fix bug #486, without setDepthTest(false), FlipX,Y will flickers
             Director::getInstance()->getRenderer()->setDepthTest(false);
@@ -257,7 +248,7 @@ TransitionsTests::TransitionsTests()
     }
 }
 
-TestLayer1* TestLayer1::create(const std::string& transitionName)
+TestLayer1* TestLayer1::create(std::string_view transitionName)
 {
     auto layer = new TestLayer1(transitionName);
     if (layer->init())
@@ -273,40 +264,34 @@ TestLayer1* TestLayer1::create(const std::string& transitionName)
     return layer;
 }
 
-TestLayer1::TestLayer1(const std::string& transitionName)
+TestLayer1::TestLayer1(std::string_view transitionName)
 {
-    float x,y;
+    float x, y;
 
     auto size = Director::getInstance()->getWinSize();
-    x = size.width;
-    y = size.height;
+    x         = size.width;
+    y         = size.height;
 
     auto bg1 = Sprite::create(s_back1);
-    bg1->setPosition( Vec2(size.width/2, size.height/2) );
+    bg1->setPosition(Vec2(size.width / 2, size.height / 2));
     addChild(bg1, -1);
 
     auto title = Label::createWithTTF(transitionName, "fonts/Thonburi.ttf", 32);
     addChild(title);
-    title->setColor( Color3B(255,32,32) );
-    title->setPosition( Vec2(x/2, y-100) );
+    title->setColor(Color3B(255, 32, 32));
+    title->setPosition(Vec2(x / 2, y - 100));
 
     auto label = Label::createWithTTF("SCENE 1", "fonts/Marker Felt.ttf", 38);
-    label->setColor( Color3B(16,16,255));
-    label->setPosition( Vec2(x/2,y/2));    
-    addChild( label);
+    label->setColor(Color3B(16, 16, 255));
+    label->setPosition(Vec2(x / 2, y / 2));
+    addChild(label);
 
-    schedule( CC_SCHEDULE_SELECTOR(TestLayer1::step), 1.0f); 
+    schedule(CC_SCHEDULE_SELECTOR(TestLayer1::step), 1.0f);
 }
 
-TestLayer1::~TestLayer1()
-{
+TestLayer1::~TestLayer1() {}
 
-}
-
-void TestLayer1::step(float dt)
-{
-
-}
+void TestLayer1::step(float dt) {}
 
 void TestLayer1::onEnter()
 {
@@ -333,7 +318,7 @@ void TestLayer1::onExit()
     log("Scene 1 onExit");
 }
 
-TestLayer2* TestLayer2::create(const std::string& transitionName)
+TestLayer2* TestLayer2::create(std::string_view transitionName)
 {
     auto layer = new TestLayer2(transitionName);
     if (layer->init())
@@ -349,40 +334,34 @@ TestLayer2* TestLayer2::create(const std::string& transitionName)
     return layer;
 }
 
-TestLayer2::TestLayer2(const std::string& transitionName)
+TestLayer2::TestLayer2(std::string_view transitionName)
 {
-    float x,y;
+    float x, y;
 
     auto size = Director::getInstance()->getWinSize();
-    x = size.width;
-    y = size.height;
+    x         = size.width;
+    y         = size.height;
 
     auto bg1 = Sprite::create(s_back2);
-    bg1->setPosition( Vec2(size.width/2, size.height/2) );
+    bg1->setPosition(Vec2(size.width / 2, size.height / 2));
     addChild(bg1, -1);
 
     auto title = Label::createWithTTF(transitionName, "fonts/Thonburi.ttf", 32);
     addChild(title);
-    title->setColor( Color3B(255,32,32) );
-    title->setPosition( Vec2(x/2, y-100) );
+    title->setColor(Color3B(255, 32, 32));
+    title->setPosition(Vec2(x / 2, y - 100));
 
     auto label = Label::createWithTTF("SCENE 2", "fonts/Marker Felt.ttf", 38);
-    label->setColor( Color3B(16,16,255));
-    label->setPosition( Vec2(x/2,y/2));    
-    addChild( label);
+    label->setColor(Color3B(16, 16, 255));
+    label->setPosition(Vec2(x / 2, y / 2));
+    addChild(label);
 
     schedule(CC_SCHEDULE_SELECTOR(TestLayer2::step), 1.0f);
 }
 
-TestLayer2::~TestLayer2()
-{
+TestLayer2::~TestLayer2() {}
 
-}
-
-void TestLayer2::step(float dt)
-{
-
-}
+void TestLayer2::step(float dt) {}
 
 void TestLayer2::onEnter()
 {
diff --git a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h
index 7799786cb002..2a24107e5ad9 100644
--- a/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h
+++ b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h
@@ -29,7 +29,6 @@
 
 #include "../BaseTest.h"
 
-
 DEFINE_TEST_SUITE(TransitionsTests);
 
 class TransitionsTest : public TestCase
@@ -41,9 +40,9 @@ class TransitionsTest : public TestCase
 class TestLayer1 : public cocos2d::Layer
 {
 public:
-    static TestLayer1* create(const std::string& transitionName);
+    static TestLayer1* create(std::string_view transitionName);
 
-    TestLayer1(const std::string& transitionName);
+    TestLayer1(std::string_view transitionName);
     ~TestLayer1();
 
     void step(float dt);
@@ -57,9 +56,9 @@ class TestLayer1 : public cocos2d::Layer
 class TestLayer2 : public cocos2d::Layer
 {
 public:
-    static TestLayer2* create(const std::string& transitionName);
+    static TestLayer2* create(std::string_view transitionName);
 
-    TestLayer2(const std::string& transitionName);
+    TestLayer2(std::string_view transitionName);
     ~TestLayer2();
 
     void step(float dt);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
index 00335eedc8bf..927d0d3d0f41 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,51 +44,54 @@
 #include "UITabControlTest/UITabControlTest.h"
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
-#include "UIVideoPlayerTest/UIVideoPlayerTest.h"
-#include "UIWebViewTest/UIWebViewTest.h"
+#    include "UIVideoPlayerTest/UIVideoPlayerTest.h"
+#    include "UIWebViewTest/UIWebViewTest.h"
 #endif
 #include "UIScale9SpriteTest.h"
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-#include "UIEditBoxTest.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#    include "UIEditBoxTest.h"
 #endif
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) 
-#include "UIWebViewTest/UIWebViewTest.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#    include "UIWebViewTest/UIWebViewTest.h"
 #endif
 
-
 GUIDynamicCreateTests::GUIDynamicCreateTests()
 {
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
-    addTest("VideoPlayer Test", [](){ return new VideoPlayerTests; });
+    addTest("VideoPlayer Test", []() { return new VideoPlayerTests; });
 #endif
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-    addTest("WebView Test", [](){ return new WebViewTests; });
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && \
+        !defined(CC_TARGET_OS_TVOS) ||                                                      \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+    addTest("WebView Test", []() { return new WebViewTests; });
 #endif
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
-    addTest("EditBox Test", [](){ return new UIEditBoxTests; });
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || \
+    (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+    addTest("EditBox Test", []() { return new UIEditBoxTests; });
 #endif
-    addTest("Focus Test", [](){ return new UIFocusTests; });
-    addTest("Scale9Sprite Test", [](){ return new UIScale9SpriteTests; });
-    addTest("Button Test", [](){ return new UIButtonTests; });
-    addTest("CheckBox Test", [](){ return new UICheckBoxTests; });
-    addTest("RadioButton Test", [](){ return new UIRadioButtonTests; });
-    addTest("Slider Test", [](){ return new UISliderTests; });
-   
-    addTest("ImageView Test", [](){ return new UIImageViewTests; });
-    addTest("LoadingBar Test", [](){ return new UILoadingBarTests; });
-    addTest("TextAtlas Test", [](){ return new UITextAtlasTests; });
-    
-    addTest("Text Test", [](){ return new UITextTests; });
-    addTest("TextBMFont Test", [](){ return new UITextBMFontTests; });
-    addTest("TextField Test", [](){ return new UITextFieldTests; });
-    addTest("Layout Test", [](){ return new UILayoutTests; });
-    
-    addTest("ScrollView Test", [](){ return new UIScrollViewTests; });
-    addTest("PageView Test", [](){ return new UIPageViewTests; });
-    addTest("ListView Test", [](){ return new UIListViewTests; });
+    addTest("Focus Test", []() { return new UIFocusTests; });
+    addTest("Scale9Sprite Test", []() { return new UIScale9SpriteTests; });
+    addTest("Button Test", []() { return new UIButtonTests; });
+    addTest("CheckBox Test", []() { return new UICheckBoxTests; });
+    addTest("RadioButton Test", []() { return new UIRadioButtonTests; });
+    addTest("Slider Test", []() { return new UISliderTests; });
+
+    addTest("ImageView Test", []() { return new UIImageViewTests; });
+    addTest("LoadingBar Test", []() { return new UILoadingBarTests; });
+    addTest("TextAtlas Test", []() { return new UITextAtlasTests; });
+
+    addTest("Text Test", []() { return new UITextTests; });
+    addTest("TextBMFont Test", []() { return new UITextBMFontTests; });
+    addTest("TextField Test", []() { return new UITextFieldTests; });
+    addTest("Layout Test", []() { return new UILayoutTests; });
+
+    addTest("ScrollView Test", []() { return new UIScrollViewTests; });
+    addTest("PageView Test", []() { return new UIPageViewTests; });
+    addTest("ListView Test", []() { return new UIListViewTests; });
 
-    addTest("WidgetAddNode Test", [](){ return new UIWidgetAddNodeTests; });
-    addTest("RichText Test", [](){ return new UIRichTextTests; });
+    addTest("WidgetAddNode Test", []() { return new UIWidgetAddNodeTests; });
+    addTest("RichText Test", []() { return new UIRichTextTests; });
 
-    addTest("TabControl Test", [](){return new UITabControlTests; });
+    addTest("TabControl Test", []() { return new UITabControlTests; });
 }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h
index b88b6797081c..48b3f3e97d1c 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
index d1fc43e221c4..56391e7d371b 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -51,15 +51,9 @@ UIButtonTests::UIButtonTests()
 }
 
 // UIButtonTest
-UIButtonTest::UIButtonTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTest::UIButtonTest() : _displayValueLabel(nullptr) {}
 
-UIButtonTest::~UIButtonTest()
-{
-}
+UIButtonTest::~UIButtonTest() {}
 
 bool UIButtonTest::init()
 {
@@ -68,23 +62,22 @@ bool UIButtonTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Button","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Button", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
         // Create the button
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         CCLOG("content size should be greater than 0:  width = %f, height = %f", button->getContentSize().width,
               button->getContentSize().height);
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
@@ -96,8 +89,8 @@ bool UIButtonTest::init()
         // Create the imageview
         ImageView* imageView = ImageView::create();
 
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f + 50+ button->getContentSize().width/2,
-                                    widgetSize.height / 2.0f));
+        imageView->setPosition(
+            Vec2(widgetSize.width / 2.0f + 50 + button->getContentSize().width / 2, widgetSize.height / 2.0f));
         imageView->setTag(12);
 
         _uiLayer->addChild(imageView);
@@ -106,8 +99,9 @@ bool UIButtonTest::init()
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UIButtonTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UIButtonTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0.0f, 0.0f));
         this->addChild(pMenu1, 10);
@@ -117,38 +111,39 @@ bool UIButtonTest::init()
     return false;
 }
 
-void UIButtonTest::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTest::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
-        {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            ImageView* imageView = (ImageView*)_uiLayer->getChildByTag(12);
-            imageView->setVisible(false);
-            imageView->loadTexture("cocosui/ccicon.png");
-            imageView->setOpacity(0);
-            imageView->setVisible(true);
-            imageView->runAction(Sequence::create(FadeIn::create(0.5),DelayTime::create(1.0),FadeOut::create(0.5), nullptr));
-            Button *btn = (Button*)pSender;
-            btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
-        }
-            break;
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        ImageView* imageView = (ImageView*)_uiLayer->getChildByTag(12);
+        imageView->setVisible(false);
+        imageView->loadTexture("cocosui/ccicon.png");
+        imageView->setOpacity(0);
+        imageView->setVisible(true);
+        imageView->runAction(
+            Sequence::create(FadeIn::create(0.5), DelayTime::create(1.0), FadeOut::create(0.5), nullptr));
+        Button* btn = (Button*)pSender;
+        btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
@@ -162,18 +157,10 @@ void UIButtonTest::printWidgetResources(cocos2d::Ref* sender)
     CCLOG("disabledFileName  Name : %s, Type: %d", disabledFileName.file.c_str(), disabledFileName.type);
 }
 
-
 // UIButtonTest_Scale9
-UIButtonTest_Scale9::UIButtonTest_Scale9()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTest_Scale9::UIButtonTest_Scale9() : _displayValueLabel(nullptr) {}
 
-UIButtonTest_Scale9::~UIButtonTest_Scale9()
-{
-
-}
+UIButtonTest_Scale9::~UIButtonTest_Scale9() {}
 
 bool UIButtonTest_Scale9::init()
 {
@@ -188,10 +175,10 @@ bool UIButtonTest_Scale9::init()
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Button scale9 render", "fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Button scale9 render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the button
@@ -200,21 +187,21 @@ bool UIButtonTest_Scale9::init()
         button->setScale9Enabled(true);
         button->setContentSize(Size(150.0f, 70.0f));
         button->setPosition(Vec2(-button->getContentSize().width - 10, widgetSize.height / 2.0f));
-        auto moveBy = MoveBy::create(1.0f, Vec2(widgetSize.width/2, 0.0f));
+        auto moveBy        = MoveBy::create(1.0f, Vec2(widgetSize.width / 2, 0.0f));
         auto moveByReverse = moveBy->reverse()->clone();
-        button->runAction(RepeatForever::create(
-                                Sequence::create(moveBy,moveByReverse, NULL)));
+        button->runAction(RepeatForever::create(Sequence::create(moveBy, moveByReverse, NULL)));
         button->setPressedActionEnabled(true);
         button->addTouchEventListener(CC_CALLBACK_2(UIButtonTest_Scale9::touchEvent, this));
         _uiLayer->addChild(button);
 
         // Create the imageview
         Button* button2 = Button::create();
-        button2->setPosition(Vec2(widgetSize.width / 2.0f + button->getContentSize().width + 20, widgetSize.height / 2.0f));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2.0f + button->getContentSize().width + 20, widgetSize.height / 2.0f));
         button2->setName("normal");
         _uiLayer->addChild(button2);
 
-        Sprite *sprite = Sprite::create("cocosui/animationbuttonnormal.png");
+        Sprite* sprite = Sprite::create("cocosui/animationbuttonnormal.png");
         button2->addChild(sprite);
 
         return true;
@@ -222,48 +209,41 @@ bool UIButtonTest_Scale9::init()
     return false;
 }
 
-void UIButtonTest_Scale9::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTest_Scale9::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
-        {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            Button *btn = (Button*)_uiLayer->getChildByName("normal");
-            btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
-            btn->loadTexturePressed("cocosui/animationbuttonpressed.png");
-            btn->runAction(Sequence::create(FadeIn::create(0.5),DelayTime::create(1.0),FadeOut::create(0.5), nullptr));
-        }
-            break;
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        Button* btn = (Button*)_uiLayer->getChildByName("normal");
+        btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
+        btn->loadTexturePressed("cocosui/animationbuttonpressed.png");
+        btn->runAction(Sequence::create(FadeIn::create(0.5), DelayTime::create(1.0), FadeOut::create(0.5), nullptr));
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
 // UIButtonTest_Scale9_State_Change
-UIButtonTest_Scale9_State_Change::UIButtonTest_Scale9_State_Change()
-    : _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTest_Scale9_State_Change::UIButtonTest_Scale9_State_Change() : _displayValueLabel(nullptr) {}
 
-UIButtonTest_Scale9_State_Change::~UIButtonTest_Scale9_State_Change()
-{
-
-}
+UIButtonTest_Scale9_State_Change::~UIButtonTest_Scale9_State_Change() {}
 
 bool UIButtonTest_Scale9_State_Change::init()
 {
@@ -280,8 +260,8 @@ bool UIButtonTest_Scale9_State_Change::init()
         // Add the alert
         Text* alert = Text::create("Button scale9 render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the button
@@ -311,7 +291,7 @@ bool UIButtonTest_Scale9_State_Change::init()
     return false;
 }
 
-void UIButtonTest_Scale9_State_Change::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTest_Scale9_State_Change::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -326,7 +306,7 @@ void UIButtonTest_Scale9_State_Change::touchEvent(Ref *pSender, Widget::TouchEve
     case Widget::TouchEventType::ENDED:
     {
         _displayValueLabel->setString(StringUtils::format("Touch Up"));
-        Button *btn = (Button*)pSender;
+        Button* btn = (Button*)pSender;
         if (btn->isScale9Enabled())
         {
             btn->setScale9Enabled(false);
@@ -334,7 +314,7 @@ void UIButtonTest_Scale9_State_Change::touchEvent(Ref *pSender, Widget::TouchEve
         else
             btn->setScale9Enabled(true);
     }
-        break;
+    break;
 
     case Widget::TouchEventType::CANCELED:
         _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
@@ -346,14 +326,9 @@ void UIButtonTest_Scale9_State_Change::touchEvent(Ref *pSender, Widget::TouchEve
 }
 
 // UIButtonTest_PressAction
-UIButtonTest_PressedAction::UIButtonTest_PressedAction()
-: _displayValueLabel(nullptr)
-{
-}
+UIButtonTest_PressedAction::UIButtonTest_PressedAction() : _displayValueLabel(nullptr) {}
 
-UIButtonTest_PressedAction::~UIButtonTest_PressedAction()
-{
-}
+UIButtonTest_PressedAction::~UIButtonTest_PressedAction() {}
 
 bool UIButtonTest_PressedAction::init()
 {
@@ -362,7 +337,7 @@ bool UIButtonTest_PressedAction::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
@@ -371,8 +346,8 @@ bool UIButtonTest_PressedAction::init()
         Text* alert = Text::create("Button Pressed Action", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
@@ -387,7 +362,7 @@ bool UIButtonTest_PressedAction::init()
         _uiLayer->addChild(button);
 
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button2->setPosition(button->getPosition() + Vec2(100.0f,0.0f));
+        button2->setPosition(button->getPosition() + Vec2(100.0f, 0.0f));
         button2->setName("button2");
         _uiLayer->addChild(button2);
 
@@ -396,48 +371,42 @@ bool UIButtonTest_PressedAction::init()
     return false;
 }
 
-void UIButtonTest_PressedAction::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTest_PressedAction::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
-        {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            Button* btn = (Button*)_uiLayer->getChildByName("button");
-            btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        Button* btn = (Button*)_uiLayer->getChildByName("button");
+        btn->loadTextureNormal("cocosui/animationbuttonnormal.png");
 
-            Button* btn2 = (Button*)_uiLayer->getChildByName("button2");
-            btn2->setAnchorPoint(Vec2(0,0.5));
-        }
-            break;
+        Button* btn2 = (Button*)_uiLayer->getChildByName("button2");
+        btn2->setAnchorPoint(Vec2(0, 0.5));
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
 // UIButtonTest_Title
-UIButtonTest_Title::UIButtonTest_Title()
-: _displayValueLabel(nullptr)
-{
+UIButtonTest_Title::UIButtonTest_Title() : _displayValueLabel(nullptr) {}
 
-}
-
-UIButtonTest_Title::~UIButtonTest_Title()
-{
-}
+UIButtonTest_Title::~UIButtonTest_Title() {}
 
 bool UIButtonTest_Title::init()
 {
@@ -454,8 +423,8 @@ bool UIButtonTest_Title::init()
         // Add the alert
         Text* alert = Text::create("Button with title, title should be flipped!", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
@@ -470,12 +439,11 @@ bool UIButtonTest_Title::init()
         button->setFlippedX(true);
         auto label = button->getTitleRenderer();
         label->setScale(4.0);
-        button->runAction(RepeatForever::create(Sequence::create(ScaleTo::create(1.0f, 1.2f),
-                                                                 ScaleTo::create(1.0f, 1.0f),nullptr)));
+        button->runAction(
+            RepeatForever::create(Sequence::create(ScaleTo::create(1.0f, 1.2f), ScaleTo::create(1.0f, 1.0f), nullptr)));
 
-
-        TextBMFont *text = TextBMFont::create("BMFont", "cocosui/bitmapFontTest2.fnt");
-        text->setPosition(button->getPosition() + Vec2(button->getContentSize().width/2 + 50,0.0f));
+        TextBMFont* text = TextBMFont::create("BMFont", "cocosui/bitmapFontTest2.fnt");
+        text->setPosition(button->getPosition() + Vec2(button->getContentSize().width / 2 + 50, 0.0f));
         text->setColor(Color3B::YELLOW);
         text->setOpacity(50);
         text->setName("text");
@@ -483,9 +451,9 @@ bool UIButtonTest_Title::init()
         auto button2 = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         button2->setTitleFontName("fonts/helvetica-32.fnt");
         button2->setTitleText("BMFont");
-        //the change of font size will take no effect.
+        // the change of font size will take no effect.
         button2->setTitleFontSize(30);
-        button2->setPosition(Vec2(button->getPosition() + Vec2(50.0f,-80.0f)));
+        button2->setPosition(Vec2(button->getPosition() + Vec2(50.0f, -80.0f)));
         this->addChild(button2);
 
         _uiLayer->addChild(text);
@@ -495,53 +463,47 @@ bool UIButtonTest_Title::init()
     return false;
 }
 
-
-void UIButtonTest_Title::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTest_Title::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        TextBMFont* text = (TextBMFont*)_uiLayer->getChildByName("text");
+        text->setFntFile("cocosui/bitmapFontTest2.fnt");
+        if (text->getString() == "BMFont")
+        {
+            text->setString("Hello");
+        }
+        else
         {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            TextBMFont *text = (TextBMFont*)_uiLayer->getChildByName("text");
-            text->setFntFile("cocosui/bitmapFontTest2.fnt");
-            if (text->getString() == "BMFont") {
-                text->setString("Hello");
-            }
-            else{
-                text->setString("BMFont");
-            }
+            text->setString("BMFont");
         }
-            break;
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
-
 // UIButtonTest_RemoveSelf
-UIButtonTestRemoveSelf::UIButtonTestRemoveSelf()
-: _displayValueLabel(nullptr)
-{
+UIButtonTestRemoveSelf::UIButtonTestRemoveSelf() : _displayValueLabel(nullptr) {}
 
-}
-
-UIButtonTestRemoveSelf::~UIButtonTestRemoveSelf()
-{
-}
+UIButtonTestRemoveSelf::~UIButtonTestRemoveSelf() {}
 
 bool UIButtonTestRemoveSelf::init()
 {
@@ -550,84 +512,76 @@ bool UIButtonTestRemoveSelf::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Remove Self in the Button's Callback shouldn't cause crash!","fonts/Marker Felt.ttf",10);
+        Text* alert =
+            Text::create("Remove Self in the Button's Callback shouldn't cause crash!", "fonts/Marker Felt.ttf", 10);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.75f));
 
         _uiLayer->addChild(alert);
 
-        Layout *layout = Layout::create();
+        Layout* layout = Layout::create();
         layout->setContentSize(widgetSize * 0.6f);
         layout->setBackGroundColor(Color3B::GREEN);
         layout->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
         layout->setBackGroundColorOpacity(100);
-        layout->setPosition(Size(widgetSize.width/2, widgetSize.height/2));
+        layout->setPosition(Size(widgetSize.width / 2, widgetSize.height / 2));
         layout->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
         layout->setTag(12);
         _uiLayer->addChild(layout);
 
         // Create the button
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         //        button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent));
         button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestRemoveSelf::touchEvent, this));
         layout->addChild(button);
 
-
-
         return true;
     }
     return false;
 }
 
-void UIButtonTestRemoveSelf::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTestRemoveSelf::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
-        {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            auto layout = _uiLayer->getChildByTag(12);
-            layout->removeFromParentAndCleanup(true);
-        }
-            break;
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        auto layout = _uiLayer->getChildByTag(12);
+        layout->removeFromParentAndCleanup(true);
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
 // UIButtonTestSwitchScale9
-UIButtonTestSwitchScale9::UIButtonTestSwitchScale9()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTestSwitchScale9::UIButtonTestSwitchScale9() : _displayValueLabel(nullptr) {}
 
-UIButtonTestSwitchScale9::~UIButtonTestSwitchScale9()
-{
-}
+UIButtonTestSwitchScale9::~UIButtonTestSwitchScale9() {}
 
 bool UIButtonTestSwitchScale9::init()
 {
@@ -636,15 +590,13 @@ bool UIButtonTestSwitchScale9::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestSwitchScale9::touchEvent, this));
         button->setTitleText("Button Title");
@@ -652,54 +604,45 @@ bool UIButtonTestSwitchScale9::init()
 
         _uiLayer->addChild(button);
 
-
-
         return true;
     }
     return false;
 }
 
-void UIButtonTestSwitchScale9::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIButtonTestSwitchScale9::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
-        case Widget::TouchEventType::BEGAN:
-            _displayValueLabel->setString(StringUtils::format("Touch Down"));
-            break;
+    case Widget::TouchEventType::BEGAN:
+        _displayValueLabel->setString(StringUtils::format("Touch Down"));
+        break;
 
-        case Widget::TouchEventType::MOVED:
-            _displayValueLabel->setString(StringUtils::format("Touch Move"));
-            break;
+    case Widget::TouchEventType::MOVED:
+        _displayValueLabel->setString(StringUtils::format("Touch Move"));
+        break;
 
-        case Widget::TouchEventType::ENDED:
-        {
-            _displayValueLabel->setString(StringUtils::format("Touch Up"));
-            auto btn = ((Button*)pSender);
-            btn->setScale9Enabled(!btn->isScale9Enabled());
-            btn->setContentSize(Size(200.0f,100.0f));
-        }
-            break;
+    case Widget::TouchEventType::ENDED:
+    {
+        _displayValueLabel->setString(StringUtils::format("Touch Up"));
+        auto btn = ((Button*)pSender);
+        btn->setScale9Enabled(!btn->isScale9Enabled());
+        btn->setContentSize(Size(200.0f, 100.0f));
+    }
+    break;
 
-        case Widget::TouchEventType::CANCELED:
-            _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
-            break;
+    case Widget::TouchEventType::CANCELED:
+        _displayValueLabel->setString(StringUtils::format("Touch Cancelled"));
+        break;
 
-        default:
-            break;
+    default:
+        break;
     }
 }
 
-
 // UIButtonTestZoomScale
-UIButtonTestZoomScale::UIButtonTestZoomScale()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTestZoomScale::UIButtonTestZoomScale() : _displayValueLabel(nullptr) {}
 
-UIButtonTestZoomScale::~UIButtonTestZoomScale()
-{
-}
+UIButtonTestZoomScale::~UIButtonTestZoomScale() {}
 
 bool UIButtonTestZoomScale::init()
 {
@@ -708,21 +651,17 @@ bool UIButtonTestZoomScale::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Zoom Scale: -0.5", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Zoom Scale: -0.5", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20));
         button->setPressedActionEnabled(true);
-        button->addClickEventListener([=](Ref* sender){
-            CCLOG("Button clicked, position = (%f, %f)", button->getPosition().x,
-                  button->getPosition().y);
-
+        button->addClickEventListener([=](Ref* sender) {
+            CCLOG("Button clicked, position = (%f, %f)", button->getPosition().x, button->getPosition().y);
         });
         button->setName("button");
         _uiLayer->addChild(button);
@@ -732,22 +671,22 @@ bool UIButtonTestZoomScale::init()
         slider->loadBarTexture("cocosui/sliderTrack.png");
         slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
         slider->loadProgressBarTexture("cocosui/sliderProgress.png");
-        slider->setPosition(Vec2(widgetSize.width / 2.0f , widgetSize.height / 2.0f - 20));
+        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 20));
         slider->addEventListener(CC_CALLBACK_2(UIButtonTestZoomScale::sliderEvent, this));
-        slider->setPercent(button->getZoomScale()*100);
+        slider->setPercent(button->getZoomScale() * 100);
         _uiLayer->addChild(slider);
         return true;
     }
     return false;
 }
 
-void UIButtonTestZoomScale::sliderEvent(Ref *pSender, Slider::EventType type)
+void UIButtonTestZoomScale::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
-        Slider* slider = dynamic_cast<Slider*>(pSender);
-        int percent = slider->getPercent();
-        Button* btn = (Button*)_uiLayer->getChildByName("button");
+        Slider* slider  = dynamic_cast<Slider*>(pSender);
+        int percent     = slider->getPercent();
+        Button* btn     = (Button*)_uiLayer->getChildByName("button");
         float zoomScale = percent * 0.01;
         btn->setZoomScale(zoomScale);
         _displayValueLabel->setString(StringUtils::format("Zoom Scale: %f", zoomScale));
@@ -755,15 +694,9 @@ void UIButtonTestZoomScale::sliderEvent(Ref *pSender, Slider::EventType type)
 }
 
 // UIButtonTextOnly
-UIButtonTextOnly::UIButtonTextOnly()
-: _displayValueLabel(nullptr)
-{
+UIButtonTextOnly::UIButtonTextOnly() : _displayValueLabel(nullptr) {}
 
-}
-
-UIButtonTextOnly::~UIButtonTextOnly()
-{
-}
+UIButtonTextOnly::~UIButtonTextOnly() {}
 
 bool UIButtonTextOnly::init()
 {
@@ -772,12 +705,11 @@ bool UIButtonTextOnly::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Text Only Button", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Text Only Button", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
         auto button = Button::create();
         button->setPositionNormalized(Vec2(0.5f, 0.5f));
@@ -787,9 +719,7 @@ bool UIButtonTextOnly::init()
               button->getContentSize().height);
         button->setZoomScale(0.3f);
         button->setPressedActionEnabled(true);
-        button->addClickEventListener([](Ref* sender) {
-            CCLOG("clicked!");
-        });
+        button->addClickEventListener([](Ref* sender) { CCLOG("clicked!"); });
         _uiLayer->addChild(button);
 
         return true;
@@ -798,15 +728,9 @@ bool UIButtonTextOnly::init()
 }
 
 // UIButtonIgnoreContentSizeTest
-UIButtonIgnoreContentSizeTest::UIButtonIgnoreContentSizeTest()
-: _displayValueLabel(nullptr)
-{
+UIButtonIgnoreContentSizeTest::UIButtonIgnoreContentSizeTest() : _displayValueLabel(nullptr) {}
 
-}
-
-UIButtonIgnoreContentSizeTest::~UIButtonIgnoreContentSizeTest()
-{
-}
+UIButtonIgnoreContentSizeTest::~UIButtonIgnoreContentSizeTest() {}
 
 bool UIButtonIgnoreContentSizeTest::init()
 {
@@ -815,17 +739,15 @@ bool UIButtonIgnoreContentSizeTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Button IgnoreContent Size Test", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Button IgnoreContent Size Test", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
-        auto button = Button::create("cocosui/animationbuttonnormal.png",
-                                     "cocosui/animationbuttonpressed.png");
+        auto button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->ignoreContentAdaptWithSize(false);
-        button->setContentSize(Size(200.0f,100.0f));
+        button->setContentSize(Size(200.0f, 100.0f));
         button->setPositionNormalized(Vec2(0.3f, 0.5f));
         button->setTitleText("PLAY GAME");
         button->setZoomScale(0.3f);
@@ -837,10 +759,9 @@ bool UIButtonIgnoreContentSizeTest::init()
         _uiLayer->addChild(button);
 
         // Create the button
-        auto button2 = Button::create("cocosui/animationbuttonnormal.png",
-                                     "cocosui/animationbuttonpressed.png");
+        auto button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->ignoreContentAdaptWithSize(false);
-        button2->setContentSize(Size(200.0f,100.0f));
+        button2->setContentSize(Size(200.0f, 100.0f));
         button2->setPositionNormalized(Vec2(0.8f, 0.5f));
         button2->setTitleText("PLAY GAME");
         button2->setZoomScale(0.3f);
@@ -856,17 +777,10 @@ bool UIButtonIgnoreContentSizeTest::init()
     return false;
 }
 
-
 // UIButtonTitleEffectTest
-UIButtonTitleEffectTest::UIButtonTitleEffectTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonTitleEffectTest::UIButtonTitleEffectTest() : _displayValueLabel(nullptr) {}
 
-UIButtonTitleEffectTest::~UIButtonTitleEffectTest()
-{
-}
+UIButtonTitleEffectTest::~UIButtonTitleEffectTest() {}
 
 bool UIButtonTitleEffectTest::init()
 {
@@ -875,31 +789,27 @@ bool UIButtonTitleEffectTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Button Title Effect", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Button Title Effect", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
-        auto button = Button::create("cocosui/animationbuttonnormal.png",
-                                     "cocosui/animationbuttonpressed.png");
+        auto button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPositionNormalized(Vec2(0.3f, 0.5f));
         button->setTitleText("PLAY GAME");
         button->setTitleFontName("fonts/Marker Felt.ttf");
         button->setZoomScale(0.3f);
         button->setScale(2.0f);
         button->setPressedActionEnabled(true);
-        Label *title = button->getTitleRenderer();
+        Label* title = button->getTitleRenderer();
         button->setTitleColor(Color3B::RED);
-        title->enableShadow(Color4B::BLACK,Size(2,-2));
-
+        title->enableShadow(Color4B::BLACK, Size(2, -2));
 
         _uiLayer->addChild(button);
 
         // Create the button
-        auto button2 = Button::create("cocosui/animationbuttonnormal.png",
-                                      "cocosui/animationbuttonpressed.png");
+        auto button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setPositionNormalized(Vec2(0.8f, 0.5f));
         button2->setTitleText("PLAY GAME");
         auto title2 = button2->getTitleRenderer();
@@ -911,15 +821,9 @@ bool UIButtonTitleEffectTest::init()
     return false;
 }
 // UIButtonFlipTest
-UIButtonFlipTest::UIButtonFlipTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonFlipTest::UIButtonFlipTest() : _displayValueLabel(nullptr) {}
 
-UIButtonFlipTest::~UIButtonFlipTest()
-{
-}
+UIButtonFlipTest::~UIButtonFlipTest() {}
 
 bool UIButtonFlipTest::init()
 {
@@ -928,14 +832,12 @@ bool UIButtonFlipTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Button X Flipped", "fonts/Marker Felt.ttf",20);
+        _displayValueLabel = Text::create("Button X Flipped", "fonts/Marker Felt.ttf", 20);
         _displayValueLabel->setPositionNormalized(Vec2(0.3f, 0.7f));
         _uiLayer->addChild(_displayValueLabel);
 
-
         // Create the button
-        auto button = Button::create("cocosui/animationbuttonnormal.png",
-                                     "cocosui/animationbuttonpressed.png");
+        auto button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPositionNormalized(Vec2(0.3f, 0.5f));
         button->setTitleText("PLAY GAME");
         button->setTitleFontName("fonts/Marker Felt.ttf");
@@ -944,12 +846,10 @@ bool UIButtonFlipTest::init()
         button->setFlippedX(true);
         button->setPressedActionEnabled(true);
 
-
         _uiLayer->addChild(button);
 
         // Create the button
-        auto button2 = Button::create("cocosui/animationbuttonnormal.png",
-                                      "cocosui/animationbuttonpressed.png");
+        auto button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setPositionNormalized(Vec2(0.8f, 0.5f));
         button2->setTitleText("PLAY GAME");
         button2->setFlippedY(true);
@@ -965,15 +865,9 @@ bool UIButtonFlipTest::init()
 }
 
 // UIButtonNormalDefaultTest
-UIButtonNormalDefaultTest::UIButtonNormalDefaultTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonNormalDefaultTest::UIButtonNormalDefaultTest() : _displayValueLabel(nullptr) {}
 
-UIButtonNormalDefaultTest::~UIButtonNormalDefaultTest()
-{
-}
+UIButtonNormalDefaultTest::~UIButtonNormalDefaultTest() {}
 
 bool UIButtonNormalDefaultTest::init()
 {
@@ -982,17 +876,17 @@ bool UIButtonNormalDefaultTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Button should scale when clicked","fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("Button should scale when clicked", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
@@ -1012,25 +906,15 @@ bool UIButtonNormalDefaultTest::init()
         buttonScale9->setPressedActionEnabled(true);
         _uiLayer->addChild(buttonScale9);
 
-
-
-
         return true;
     }
     return false;
 }
 
-
 // UIButtonDisableDefaultTest
-UIButtonDisableDefaultTest::UIButtonDisableDefaultTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UIButtonDisableDefaultTest::UIButtonDisableDefaultTest() : _displayValueLabel(nullptr) {}
 
-UIButtonDisableDefaultTest::~UIButtonDisableDefaultTest()
-{
-}
+UIButtonDisableDefaultTest::~UIButtonDisableDefaultTest() {}
 
 bool UIButtonDisableDefaultTest::init()
 {
@@ -1039,17 +923,17 @@ bool UIButtonDisableDefaultTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Left button will turn normal when clicked","fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("Left button will turn normal when clicked", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
@@ -1060,10 +944,8 @@ bool UIButtonDisableDefaultTest::init()
         button->setPressedActionEnabled(true);
         button->setBright(false);
         button->setScale9Enabled(true);
-        button->setCapInsets(Rect(3,3,5,5));
-        button->addClickEventListener([=](Ref*){
-            button->setBright(true);
-        });
+        button->setCapInsets(Rect(3, 3, 5, 5));
+        button->addClickEventListener([=](Ref*) { button->setBright(true); });
         _uiLayer->addChild(button);
 
         // Create the button
@@ -1077,24 +959,15 @@ bool UIButtonDisableDefaultTest::init()
         buttonScale9->setBright(false);
         _uiLayer->addChild(buttonScale9);
 
-
-
-
         return true;
     }
     return false;
 }
 
 // UIButtonCloneTest
-UIButtonCloneTest::UIButtonCloneTest()
-: _displayValueLabel(nullptr)
-{
+UIButtonCloneTest::UIButtonCloneTest() : _displayValueLabel(nullptr) {}
 
-}
-
-UIButtonCloneTest::~UIButtonCloneTest()
-{
-}
+UIButtonCloneTest::~UIButtonCloneTest() {}
 
 bool UIButtonCloneTest::init()
 {
@@ -1103,59 +976,46 @@ bool UIButtonCloneTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f));
+        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("This test case shouldn't trigger the Assertion!",
-                                   "fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("This test case shouldn't trigger the Assertion!", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
 
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
 
         _uiLayer->addChild(alert);
 
         // Create the button
         Button* button = Button::create("cocosui/animationbuttonnormal.png");
-        button->setPosition(Vec2(widgetSize.width / 2.0f - 80,
-                                 widgetSize.height / 2.0f + 40));
+        button->setPosition(Vec2(widgetSize.width / 2.0f - 80, widgetSize.height / 2.0f + 40));
         _uiLayer->addChild(button);
 
-
-        CCASSERT(button->getTitleRenderer() == nullptr,
-                 "Button title render must be nullptr ");
+        CCASSERT(button->getTitleRenderer() == nullptr, "Button title render must be nullptr ");
 
         auto buttonCopy = (Button*)button->clone();
-        buttonCopy->setPosition(Vec2(widgetSize.width / 2.0f + 80,
-                                     widgetSize.height / 2.0f + 40));
+        buttonCopy->setPosition(Vec2(widgetSize.width / 2.0f + 80, widgetSize.height / 2.0f + 40));
         this->addChild(buttonCopy);
-        
-        
-        
+
         auto buttonScale9Copy = (Button*)button->clone();
         buttonScale9Copy->setPosition(button->getPosition() + Vec2(0.0f, -60.0f));
         buttonScale9Copy->setScale9Enabled(true);
         buttonScale9Copy->setContentSize(button->getContentSize() * 1.5f);
         this->addChild(buttonScale9Copy);
-        
-        
+
         auto buttonScale9Copy2 = (Button*)buttonScale9Copy->clone();
         buttonScale9Copy2->setPosition(buttonCopy->getPosition() + Vec2(0.0f, -60.0f));
         buttonScale9Copy2->setScale9Enabled(true);
         buttonScale9Copy2->setContentSize(buttonCopy->getContentSize() * 1.5f);
         this->addChild(buttonScale9Copy2);
-        
-        
-        CCASSERT(button->getTitleRenderer() == nullptr,
-                 "Original Button title render must be nullptr ");
 
-        CCASSERT(buttonCopy->getTitleRenderer() == nullptr,
-                 "Copied Button title render must be nullptr ");
+        CCASSERT(button->getTitleRenderer() == nullptr, "Original Button title render must be nullptr ");
+
+        CCASSERT(buttonCopy->getTitleRenderer() == nullptr, "Copied Button title render must be nullptr ");
 
         return true;
     }
@@ -1163,40 +1023,33 @@ bool UIButtonCloneTest::init()
 }
 
 // https://github.com/cocos2d/cocos2d-x/issues/12249
-Issue12249::Issue12249()
-: _displayValueLabel(nullptr)
-{
-    
-}
+Issue12249::Issue12249() : _displayValueLabel(nullptr) {}
 
 bool Issue12249::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the button events will be displayed
-        _displayValueLabel = Text::create("Test Issue 12249", "fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Test Issue 12249", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f));
+        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("This test case two buttons should seem to be same!",
-                                   "fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("This test case two buttons should seem to be same!", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 2.0f));
-        
+
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.0f));
+
         _uiLayer->addChild(alert);
-        
+
         // Create the button 1
-        Button* button = nullptr, *button2 = nullptr;
+        Button *button = nullptr, *button2 = nullptr;
         float btnWidth = 100;
-        button = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
+        button         = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button->setScale9Enabled(true);
         button->setContentSize(Size(btnWidth, button->getContentSize().height));
         button->setTitleText("Scale9 Button 1");
@@ -1211,16 +1064,14 @@ bool Issue12249::init()
         button2->setTitleText("Scale9 Button 2");
         button2->setPosition(Vec2(widgetSize.width / 2.0f + btnWidth, widgetSize.height / 2.0f));
         _uiLayer->addChild(button2);
-        
+
         return true;
     }
     return false;
 }
 
 // https://github.com/cocos2d/cocos2d-x/issues/17116
-Issue17116::Issue17116()
-{
-}
+Issue17116::Issue17116() {}
 
 bool Issue17116::init()
 {
@@ -1231,7 +1082,7 @@ bool Issue17116::init()
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/issue_17116.plist");
         auto button = ui::Button::create();
         button->loadTextureNormal("issue_17116/buttons/play-big", ui::Widget::TextureResType::PLIST);
-        button->setPosition(Vec2(visibleSize.width/2, visibleSize.height/2));
+        button->setPosition(Vec2(visibleSize.width / 2, visibleSize.height / 2));
         button->setOpacity(100);
         addChild(button);
         return true;
@@ -1239,36 +1090,32 @@ bool Issue17116::init()
     return false;
 }
 
-UIButtonWithPolygonInfo::UIButtonWithPolygonInfo()
-{
-}
+UIButtonWithPolygonInfo::UIButtonWithPolygonInfo() {}
 
 bool UIButtonWithPolygonInfo::init()
 {
     if (UIScene::init())
     {
         auto visibleSize = Director::getInstance()->getVisibleSize();
-        
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/poly_test_textures.plist");
         auto button = ui::Button::create();
         button->loadTextureNormal("poly_test/wheel_disc_back.png", ui::Widget::TextureResType::PLIST);
-        button->setPosition(Vec2(visibleSize.width/2 - 100, visibleSize.height/2));
+        button->setPosition(Vec2(visibleSize.width / 2 - 100, visibleSize.height / 2));
         button->setScale(0.5);
         button->setScale9Enabled(true);
         addChild(button);
-        
+
         auto buttonCopy = button->clone();
-        button->setPosition(Vec2(visibleSize.width/2 + 100, visibleSize.height/2));
+        button->setPosition(Vec2(visibleSize.width / 2 + 100, visibleSize.height / 2));
         addChild(buttonCopy);
-        
+
         return true;
     }
     return false;
 }
 
-UIButtonScale9ChangeSpriteFrame::UIButtonScale9ChangeSpriteFrame()
-{
-}
+UIButtonScale9ChangeSpriteFrame::UIButtonScale9ChangeSpriteFrame() {}
 
 bool UIButtonScale9ChangeSpriteFrame::init()
 {
@@ -1280,21 +1127,17 @@ bool UIButtonScale9ChangeSpriteFrame::init()
         sprite->setContentSize(Size(96 * 1.5, 96));
         sprite->setNormalizedPosition(Vec2(0.2f, 0.5f));
         this->addChild(sprite);
-        
+
         auto button = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button->setScale9Enabled(true);
         button->setContentSize(Size(100.0f, 50.0f));
         button->setNormalizedPosition(Vec2(0.6f, 0.5f));
         button->setTitleText("Press me");
         addChild(button);
-        
-        button->addClickEventListener([sprite](Ref* button){
-            sprite->loadTexture("Images/blocks9.png");
-        });
 
-        
+        button->addClickEventListener([sprite](Ref* button) { sprite->loadTexture("Images/blocks9.png"); });
+
         return true;
     }
     return false;
 }
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
index 9b89dfe12fec..467821a981ea 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
@@ -42,6 +42,7 @@ class UIButtonTest : public UIScene
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
 
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
     cocos2d::ui::Button* _button;
@@ -74,7 +75,7 @@ class UIButtonTest_Scale9_State_Change : public UIScene
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
 
 protected:
-        cocos2d::ui::Text* _displayValueLabel;
+    cocos2d::ui::Text* _displayValueLabel;
 };
 
 class UIButtonTest_PressedAction : public UIScene
@@ -254,16 +255,16 @@ class Issue12249 : public UIScene
 {
 public:
     CREATE_FUNC(Issue12249);
-    
+
     Issue12249();
-    
+
     virtual bool init() override;
-    
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
 };
 
-class Issue17116: public UIScene
+class Issue17116 : public UIScene
 {
 public:
     CREATE_FUNC(Issue17116);
@@ -273,23 +274,23 @@ class Issue17116: public UIScene
     virtual bool init() override;
 };
 
-class UIButtonWithPolygonInfo: public UIScene
+class UIButtonWithPolygonInfo : public UIScene
 {
 public:
     CREATE_FUNC(UIButtonWithPolygonInfo);
-    
+
     UIButtonWithPolygonInfo();
-    
+
     virtual bool init() override;
 };
 
-class UIButtonScale9ChangeSpriteFrame: public UIScene
+class UIButtonScale9ChangeSpriteFrame : public UIScene
 {
 public:
     CREATE_FUNC(UIButtonScale9ChangeSpriteFrame);
-    
+
     UIButtonScale9ChangeSpriteFrame();
-    
+
     virtual bool init() override;
 };
 
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
index bcc85ec7e0d2..358217a89469 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,150 +35,133 @@ UICheckBoxTests::UICheckBoxTests()
 }
 
 // UICheckBoxTest
-UICheckBoxTest::UICheckBoxTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UICheckBoxTest::UICheckBoxTest() : _displayValueLabel(nullptr) {}
 
-UICheckBoxTest::~UICheckBoxTest()
-{
-}
+UICheckBoxTest::~UICheckBoxTest() {}
 
 bool UICheckBoxTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the checkbox events will be displayed
         _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("CheckBox","fonts/Marker Felt.ttf",30 );
+        Text* alert = Text::create("CheckBox", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
-        _uiLayer->addChild(alert);        
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        _uiLayer->addChild(alert);
+
         // Create the checkbox
-        _checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_normal_press.png",
-                                              "cocosui/check_box_active.png",
-                                              "cocosui/check_box_normal_disable.png",
-                                              "cocosui/check_box_active_disable.png");
+        _checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                     "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
+                                     "cocosui/check_box_active_disable.png");
         _checkBox->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
-        
+
         _checkBox->addEventListener(CC_CALLBACK_2(UICheckBoxTest::selectedEvent, this));
         _uiLayer->addChild(_checkBox);
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UICheckBoxTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UICheckBoxTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0.0f, 0.0f));
         this->addChild(pMenu1, 10);
-        
+
         return true;
     }
     return false;
 }
 
-void UICheckBoxTest::selectedEvent(Ref* pSender,CheckBox::EventType type)
+void UICheckBoxTest::selectedEvent(Ref* pSender, CheckBox::EventType type)
 {
     switch (type)
     {
-        case CheckBox::EventType::SELECTED:
-            _displayValueLabel->setString(StringUtils::format("Selected"));
-            break;
-            
-        case CheckBox::EventType::UNSELECTED:
-            _displayValueLabel->setString(StringUtils::format("Unselected"));
-            break;
-            
-        default:
-            break;
+    case CheckBox::EventType::SELECTED:
+        _displayValueLabel->setString(StringUtils::format("Selected"));
+        break;
+
+    case CheckBox::EventType::UNSELECTED:
+        _displayValueLabel->setString(StringUtils::format("Unselected"));
+        break;
+
+    default:
+        break;
     }
-    
 }
 
 void UICheckBoxTest::printWidgetResources(cocos2d::Ref* sender)
 {
     cocos2d::ResourceData backGroundFileName = _checkBox->getBackNormalFile();
-    CCLOG("backGroundFile  Name : %s, Type: %d", backGroundFileName.file.c_str(),backGroundFileName.type);
+    CCLOG("backGroundFile  Name : %s, Type: %d", backGroundFileName.file.c_str(), backGroundFileName.type);
     cocos2d::ResourceData backGroundSelectedFileName = _checkBox->getBackPressedFile();
-    CCLOG("backGroundSelectedFile  Name : %s, Type: %d", backGroundSelectedFileName.file.c_str(), backGroundSelectedFileName.type);
+    CCLOG("backGroundSelectedFile  Name : %s, Type: %d", backGroundSelectedFileName.file.c_str(),
+          backGroundSelectedFileName.type);
     cocos2d::ResourceData backGroundDisabledFileName = _checkBox->getBackDisabledFile();
-    CCLOG("backGroundDisabledFile  Name : %s, Type: %d", backGroundDisabledFileName.file.c_str(), backGroundDisabledFileName.type);
+    CCLOG("backGroundDisabledFile  Name : %s, Type: %d", backGroundDisabledFileName.file.c_str(),
+          backGroundDisabledFileName.type);
     cocos2d::ResourceData frontCrossFileName = _checkBox->getCrossNormalFile();
     CCLOG("frontCrossFile  Name : %s, Type: %d", frontCrossFileName.file.c_str(), frontCrossFileName.type);
     cocos2d::ResourceData frontCrossDisabledFileName = _checkBox->getCrossDisabledFile();
-    CCLOG("frontCrossDisabledFile  Name : %s, Type: %d", frontCrossDisabledFileName.file.c_str(), frontCrossDisabledFileName.type);
+    CCLOG("frontCrossDisabledFile  Name : %s, Type: %d", frontCrossDisabledFileName.file.c_str(),
+          frontCrossDisabledFileName.type);
 }
 
-
 // UICheckBoxDefaultBehaviorTest
-UICheckBoxDefaultBehaviorTest::UICheckBoxDefaultBehaviorTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UICheckBoxDefaultBehaviorTest::UICheckBoxDefaultBehaviorTest() : _displayValueLabel(nullptr) {}
 
-UICheckBoxDefaultBehaviorTest::~UICheckBoxDefaultBehaviorTest()
-{
-}
+UICheckBoxDefaultBehaviorTest::~UICheckBoxDefaultBehaviorTest() {}
 
 bool UICheckBoxDefaultBehaviorTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the checkbox events will be displayed
         _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("Only left two and the last checkbox can be clicked!","fonts/Marker Felt.ttf",20 );
+        Text* alert = Text::create("Only left two and the last checkbox can be clicked!", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the checkbox
-        CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_active.png");
+        CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_active.png");
         checkBox->setPosition(Vec2(widgetSize.width / 2.0f - 50, widgetSize.height / 2.0f));
-        
+
         _uiLayer->addChild(checkBox);
-        
-        
+
         // Create the checkbox
-        CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_active.png");
+        CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_active.png");
         checkBox2->setPosition(Vec2(widgetSize.width / 2.0f - 150, widgetSize.height / 2.0f));
         checkBox2->ignoreContentAdaptWithSize(false);
         checkBox2->setZoomScale(0.5f);
-        checkBox2->setContentSize(Size(80.0f,80.0f));
+        checkBox2->setContentSize(Size(80.0f, 80.0f));
         checkBox2->setName("bigCheckBox");
         _uiLayer->addChild(checkBox2);
-        
-        
+
         // Create the checkbox
-        CheckBox* checkBoxDisabled = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_active.png");
+        CheckBox* checkBoxDisabled = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_active.png");
         checkBoxDisabled->setPosition(Vec2(widgetSize.width / 2.0f + 20, widgetSize.height / 2.0f));
         checkBoxDisabled->setEnabled(false);
         checkBoxDisabled->setBright(false);
         _uiLayer->addChild(checkBoxDisabled);
-        
-        CheckBox* checkBoxDisabled2 = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_active.png");
+
+        CheckBox* checkBoxDisabled2 = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_active.png");
         checkBoxDisabled2->setPosition(Vec2(widgetSize.width / 2.0f + 70, widgetSize.height / 2.0f));
         checkBoxDisabled2->setBright(false);
         checkBoxDisabled2->setSelected(true);
@@ -188,17 +171,10 @@ bool UICheckBoxDefaultBehaviorTest::init()
     return false;
 }
 
-
 // UICheckBoxCopyTest
-UICheckBoxCopyTest::UICheckBoxCopyTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UICheckBoxCopyTest::UICheckBoxCopyTest() : _displayValueLabel(nullptr) {}
 
-UICheckBoxCopyTest::~UICheckBoxCopyTest()
-{
-}
+UICheckBoxCopyTest::~UICheckBoxCopyTest() {}
 
 bool UICheckBoxCopyTest::init()
 {
@@ -213,24 +189,22 @@ bool UICheckBoxCopyTest::init()
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("Two checkbox are identical.","fonts/Marker Felt.ttf",20 );
+        Text* alert = Text::create("Two checkbox are identical.", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the checkbox
-        CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_active.png");
+        CheckBox* checkBox = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_active.png");
         checkBox->setPosition(Vec2(widgetSize.width / 2.0f - 50, widgetSize.height / 2.0f));
 
         _uiLayer->addChild(checkBox);
 
         auto checkboxCopy = checkBox->clone();
-        checkboxCopy->setPosition(checkBox->getPosition() + Vec2(50.0f,0.0f));
+        checkboxCopy->setPosition(checkBox->getPosition() + Vec2(50.0f, 0.0f));
         _uiLayer->addChild(checkboxCopy);
 
-
         return true;
     }
     return false;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
index 798b145a4560..9973e854ca66 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,9 +39,10 @@ class UICheckBoxTest : public UIScene
     ~UICheckBoxTest();
 
     virtual bool init() override;
-    void selectedEvent(cocos2d::Ref* sender,cocos2d::ui::CheckBox::EventType type);
-    
+    void selectedEvent(cocos2d::Ref* sender, cocos2d::ui::CheckBox::EventType type);
+
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
     cocos2d::ui::CheckBox* _checkBox;
@@ -56,7 +57,7 @@ class UICheckBoxDefaultBehaviorTest : public UIScene
     ~UICheckBoxDefaultBehaviorTest();
 
     virtual bool init() override;
-    
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
 };
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
index 03f53b4acc89..f87603f49c81 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,94 +44,94 @@ bool UIEditBoxTest::init()
 {
     if (UIScene::init())
     {
-        auto glview = Director::getInstance()->getOpenGLView();
+        auto glview        = Director::getInstance()->getOpenGLView();
         auto visibleOrigin = glview->getVisibleOrigin();
-        auto visibleSize = glview->getVisibleSize();
-        
+        auto visibleSize   = glview->getVisibleSize();
+
         auto pBg = Sprite::create("Images/HelloWorld.png");
-        pBg->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/2));
+        pBg->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
         addChild(pBg);
-        
+
         _TTFShowEditReturn = Label::createWithSystemFont("No edit control return!", "Arial", 30);
-        _TTFShowEditReturn->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y + visibleSize.height - 50));
+        _TTFShowEditReturn->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 50));
         addChild(_TTFShowEditReturn);
-        
-        
+
         auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
-        
+
         // top
         std::string pNormalSprite = "extensions/green_edit.png";
-        _editName = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create(pNormalSprite));
-        _editName->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height*3/4));
+        _editName = ui::EditBox::create(editBoxSize + Size(0, 40), ui::Scale9Sprite::create(pNormalSprite));
+        _editName->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height * 3 / 4));
         _editName->setFontColor(Color3B::RED);
         _editName->setPlaceHolder("Name:");
         _editName->setPlaceholderFontColor(Color3B::WHITE);
         _editName->setMaxLength(8);
-        _editName->setFontSize((int)editBoxSize.height/2);
+        _editName->setFontSize((int)editBoxSize.height / 2);
         _editName->setText("v👐👊💝");
         _editName->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
         _editName->setDelegate(this);
         _editName->setVisible(true);
         addChild(_editName);
-       
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+
+        Button* button  = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         auto buttonSize = button->getContentSize();
         button->setTitleText("Single Line");
-        button->setPosition(_editName->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        button->addClickEventListener([=](Ref* ref){
-            _editName->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
-        });
+        button->setPosition(_editName->getPosition() + Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        button->addClickEventListener([=](Ref* ref) { _editName->setInputMode(ui::EditBox::InputMode::SINGLE_LINE); });
         addChild(button);
 
         // middle
-        _editPassword = ui::EditBox::create(Size(editBoxSize.width,
-                                                 editBoxSize.height + 20), "extensions/orange_edit.png");
-        _editPassword->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/2));
+        _editPassword =
+            ui::EditBox::create(Size(editBoxSize.width, editBoxSize.height + 20), "extensions/orange_edit.png");
+        _editPassword->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height / 2));
         _editPassword->setFontColor(Color3B::GREEN);
         _editPassword->setPlaceHolder("Password:");
         _editPassword->setMaxLength(6);
         _editPassword->setInputFlag(ui::EditBox::InputFlag::PASSWORD);
         _editPassword->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
-        _editPassword->setFontSize((int)editBoxSize.height/2);
+        _editPassword->setFontSize((int)editBoxSize.height / 2);
         _editPassword->setDelegate(this);
         _editPassword->setVisible(true);
         addChild(_editPassword);
-       
+
         auto buttonPassword = (ui::Button*)button->clone();
         buttonPassword->setTitleText("Multiline");
-        buttonPassword->setPosition(_editPassword->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        buttonPassword->addClickEventListener([=](Ref* ref){
-            _editPassword->setInputMode(ui::EditBox::InputMode::ANY);
-        });
+        buttonPassword->setPosition(_editPassword->getPosition() +
+                                    Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        buttonPassword->addClickEventListener(
+            [=](Ref* ref) { _editPassword->setInputMode(ui::EditBox::InputMode::ANY); });
         addChild(buttonPassword);
-        
+
         // bottom
         // Add an intermediate Node to test scaling and content size relative to world
         _editEmailParent = Node::create();
-//        _editEmailParent->setScale(0.5);
-        _editEmailParent->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/4));
+        //        _editEmailParent->setScale(0.5);
+        _editEmailParent->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height / 4));
         addChild(_editEmailParent);
-                    
+
         auto bottomButtonSize = Size(editBoxSize.width, editBoxSize.height + 10);
-        _editEmail = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
+        _editEmail            = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
         _editEmail->setPlaceHolder("Email:");
         _editEmail->setInputMode(ui::EditBox::InputMode::EMAIL_ADDRESS);
         _editEmail->setDelegate(this);
         _editEmail->setVisible(true);
         _editEmailParent->addChild(_editEmail);
-        //It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox get the right size
+        // It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox
+        // get the right size
         _editEmail->setFontSize(30);
         _editEmail->setContentSize(bottomButtonSize);
-        
+
         auto buttonEmail = (ui::Button*)button->clone();
         buttonEmail->setTitleText("Multiline");
-        buttonEmail->setPosition(_editEmailParent->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        buttonEmail->addClickEventListener([=](Ref* ref){
-            _editEmail->setInputMode(ui::EditBox::InputMode::ANY);
-        });
+        buttonEmail->setPosition(_editEmailParent->getPosition() +
+                                 Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        buttonEmail->addClickEventListener([=](Ref* ref) { _editEmail->setInputMode(ui::EditBox::InputMode::ANY); });
         addChild(buttonEmail);
-        
+
         return true;
     }
     return false;
@@ -142,21 +142,22 @@ void UIEditBoxTest::editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox)
     log("editBox %p DidBegin !", editBox);
 }
 
-void UIEditBoxTest::editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox, cocos2d::ui::EditBoxDelegate::EditBoxEndAction action)
+void UIEditBoxTest::editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox,
+                                                   cocos2d::ui::EditBoxDelegate::EditBoxEndAction action)
 {
     log("editBox %p DidEnd with action %d!", editBox, action);
 }
 
-void UIEditBoxTest::editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)
+void UIEditBoxTest::editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text)
 {
-    log("editBox %p TextChanged, text: %s ", editBox, text.c_str());
-    editBox->setText(text.c_str());
+    log("editBox %p TextChanged, text: %s ", editBox, text.data());
+    editBox->setText(text.data());
 }
 
 void UIEditBoxTest::editBoxReturn(ui::EditBox* editBox)
 {
-    log("editBox %p was returned !",editBox);
-    
+    log("editBox %p was returned !", editBox);
+
     if (_editName == editBox)
     {
         _TTFShowEditReturn->setString("Name EditBox return !");
@@ -177,93 +178,93 @@ bool UIEditBoxTestToggleVisibility::init()
 {
     if (UIScene::init())
     {
-        auto glview = Director::getInstance()->getOpenGLView();
+        auto glview        = Director::getInstance()->getOpenGLView();
         auto visibleOrigin = glview->getVisibleOrigin();
-        auto visibleSize = glview->getVisibleSize();
-        
+        auto visibleSize   = glview->getVisibleSize();
+
         auto pBg = Sprite::create("Images/HelloWorld.png");
-        pBg->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/2));
+        pBg->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
         addChild(pBg);
-        
+
         _TTFShowEditReturn = Label::createWithSystemFont("No edit control return!", "Arial", 30);
-        _TTFShowEditReturn->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y + visibleSize.height - 50));
+        _TTFShowEditReturn->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height - 50));
         addChild(_TTFShowEditReturn);
-        
-        
+
         auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
-        
+
         // top
         std::string pNormalSprite = "extensions/green_edit.png";
-        _editName = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create(pNormalSprite));
-        _editName->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height*3/4));
+        _editName = ui::EditBox::create(editBoxSize + Size(0, 40), ui::Scale9Sprite::create(pNormalSprite));
+        _editName->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height * 3 / 4));
         _editName->setFontColor(Color3B::RED);
         _editName->setPlaceHolder("Name:");
         _editName->setPlaceholderFontColor(Color3B::WHITE);
         _editName->setMaxLength(8);
-        _editName->setFontSize((int)editBoxSize.height/2);
+        _editName->setFontSize((int)editBoxSize.height / 2);
         _editName->setText("v👐👊💝");
         _editName->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
         _editName->setDelegate(this);
         _editName->setVisible(true);
         addChild(_editName);
-        
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+
+        Button* button  = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         auto buttonSize = button->getContentSize();
         button->setTitleText("Toggle Visibility");
-        button->setPosition(_editName->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        button->addClickEventListener([=](Ref* ref){
-            _editName->setVisible(!_editName->isVisible());
-        });
+        button->setPosition(_editName->getPosition() + Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        button->addClickEventListener([=](Ref* ref) { _editName->setVisible(!_editName->isVisible()); });
         addChild(button);
-        
+
         // middle
         _editPassword = ui::EditBox::create(editBoxSize, "extensions/orange_edit.png");
-        _editPassword->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/2));
+        _editPassword->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height / 2));
         _editPassword->setFontColor(Color3B::GREEN);
         _editPassword->setPlaceHolder("Password:");
         _editPassword->setMaxLength(6);
         _editPassword->setInputFlag(ui::EditBox::InputFlag::PASSWORD);
         _editPassword->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
-        _editPassword->setFontSize((float)editBoxSize.height/2);
+        _editPassword->setFontSize((float)editBoxSize.height / 2);
         _editPassword->setDelegate(this);
         _editPassword->setVisible(true);
         addChild(_editPassword);
-        
+
         auto buttonPassword = (ui::Button*)button->clone();
         buttonPassword->setTitleText("Toggle Visibility");
-        buttonPassword->setPosition(_editPassword->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        buttonPassword->addClickEventListener([=](Ref* ref){
-            _editPassword->setVisible(!_editPassword->isVisible());
-        });
+        buttonPassword->setPosition(_editPassword->getPosition() +
+                                    Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        buttonPassword->addClickEventListener(
+            [=](Ref* ref) { _editPassword->setVisible(!_editPassword->isVisible()); });
         addChild(buttonPassword);
-        
+
         // bottom
         // Add an intermediate Node to test scaling and content size relative to world
         _editEmailParent = Node::create();
         //        _editEmailParent->setScale(0.5);
-        _editEmailParent->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/4));
+        _editEmailParent->setPosition(
+            Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, visibleOrigin.y + visibleSize.height / 4));
         addChild(_editEmailParent);
-        
+
         auto bottomButtonSize = Size(editBoxSize.width, editBoxSize.height + 10);
-        _editEmail = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
+        _editEmail            = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
         _editEmail->setPlaceHolder("Email:");
         _editEmail->setInputMode(ui::EditBox::InputMode::EMAIL_ADDRESS);
         _editEmail->setDelegate(this);
         _editEmail->setVisible(true);
         _editEmailParent->addChild(_editEmail);
-        //It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox get the right size
+        // It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox
+        // get the right size
         _editEmail->setFontSize(30);
         _editEmail->setContentSize(bottomButtonSize);
-        
+
         auto buttonEmail = (ui::Button*)button->clone();
         buttonEmail->setTitleText("Toggle Visibility");
-        buttonEmail->setPosition(_editEmailParent->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0.0f));
-        buttonEmail->addClickEventListener([=](Ref* ref){
-            _editEmail->setVisible(!_editEmail->isVisible());
-        });
+        buttonEmail->setPosition(_editEmailParent->getPosition() +
+                                 Vec2(editBoxSize.width / 2 + buttonSize.width / 2, 0.0f));
+        buttonEmail->addClickEventListener([=](Ref* ref) { _editEmail->setVisible(!_editEmail->isVisible()); });
         addChild(buttonEmail);
-        
+
         return true;
     }
     return false;
@@ -274,15 +275,15 @@ void UIEditBoxTestToggleVisibility::editBoxEditingDidBegin(cocos2d::ui::EditBox*
     log("editBox %p DidBegin !", editBox);
 }
 
-void UIEditBoxTestToggleVisibility::editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)
+void UIEditBoxTestToggleVisibility::editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text)
 {
-    log("editBox %p TextChanged, text: %s ", editBox, text.c_str());
+    log("editBox %p TextChanged, text: %s ", editBox, text.data());
 }
 
 void UIEditBoxTestToggleVisibility::editBoxReturn(ui::EditBox* editBox)
 {
-    log("editBox %p was returned !",editBox);
-    
+    log("editBox %p was returned !", editBox);
+
     if (_editName == editBox)
     {
         _TTFShowEditReturn->setString("Name EditBox return !");
@@ -299,78 +300,84 @@ void UIEditBoxTestToggleVisibility::editBoxReturn(ui::EditBox* editBox)
 
 // UIEditBoxTestTextHorizontalAlignment
 
-bool UIEditBoxTestTextHorizontalAlignment::init() {
-    if (!UIScene::init()) {
-      return false;
+bool UIEditBoxTestTextHorizontalAlignment::init()
+{
+    if (!UIScene::init())
+    {
+        return false;
     }
-  
-    const auto glview = Director::getInstance()->getOpenGLView();
+
+    const auto glview        = Director::getInstance()->getOpenGLView();
     const auto visibleOrigin = glview->getVisibleOrigin();
-    const auto visibleSize = glview->getVisibleSize();
-    const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
-  
-    const auto createEditBox = [this, editBoxSize, visibleOrigin, visibleSize](const std::string& text,
-                                      const TextHAlignment alignment,
-                                      const int position_y) {
-        ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create("extensions/green_edit.png"));
-        editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, (float)position_y));
+    const auto visibleSize   = glview->getVisibleSize();
+    const auto editBoxSize   = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
+
+    const auto createEditBox = [this, editBoxSize, visibleOrigin, visibleSize](
+                                   std::string_view text, const TextHAlignment alignment, const int position_y) {
+        ui::EditBox* editbox =
+            ui::EditBox::create(editBoxSize + Size(0, 40), ui::Scale9Sprite::create("extensions/green_edit.png"));
+        editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2 - 50, (float)position_y));
         editbox->setFontColor(Color3B::RED);
-        editbox->setPlaceHolder(text.c_str());
+        editbox->setPlaceHolder(text.data());
         editbox->setPlaceholderFontColor(Color3B::WHITE);
-        editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
-        editbox->setFontSize((int)editBoxSize.height/2);
-        editbox->setText(text.c_str());
+        editbox->setPlaceholderFontSize((int)editBoxSize.height / 2);
+        editbox->setFontSize((int)editBoxSize.height / 2);
+        editbox->setText(text.data());
         editbox->setTextHorizontalAlignment(alignment);
         editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
         addChild(editbox);
     };
-  
-    createEditBox("horizontal left text", TextHAlignment::LEFT, (int)(visibleOrigin.y+visibleSize.height*3/4));
-    createEditBox("horizontal center text", TextHAlignment::CENTER, (int)(visibleOrigin.y+visibleSize.height/2));
-    createEditBox("horizontal right text", TextHAlignment::RIGHT, (int)(visibleOrigin.y+visibleSize.height/4));
-  
+
+    createEditBox("horizontal left text", TextHAlignment::LEFT, (int)(visibleOrigin.y + visibleSize.height * 3 / 4));
+    createEditBox("horizontal center text", TextHAlignment::CENTER, (int)(visibleOrigin.y + visibleSize.height / 2));
+    createEditBox("horizontal right text", TextHAlignment::RIGHT, (int)(visibleOrigin.y + visibleSize.height / 4));
+
     return true;
 }
 
 // UIEditBoxTestPressedAndDisabled
-bool UIEditBoxTestPressedAndDisabled::init() {
-    if (!UIScene::init()) {
+bool UIEditBoxTestPressedAndDisabled::init()
+{
+    if (!UIScene::init())
+    {
         return false;
     }
 
-    auto glview = Director::getInstance()->getOpenGLView();
-    auto visibleOrigin = glview->getVisibleOrigin();
-    auto visibleSize = glview->getVisibleSize();
+    auto glview            = Director::getInstance()->getOpenGLView();
+    auto visibleOrigin     = glview->getVisibleOrigin();
+    auto visibleSize       = glview->getVisibleSize();
     const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
 
-    ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0,40), "extensions/yellow_edit.png", "extensions/orange_edit.png");
-    editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height*3/4));
+    ui::EditBox* editbox =
+        ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png", "extensions/orange_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height * 3 / 4));
     editbox->setFontColor(Color3B::GREEN);
     editbox->setPlaceHolder("Test Pressed Image");
     editbox->setPlaceholderFontColor(Color3B::WHITE);
-    editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
-    editbox->setFontSize((int)editBoxSize.height/2);
+    editbox->setPlaceholderFontSize((int)editBoxSize.height / 2);
+    editbox->setFontSize((int)editBoxSize.height / 2);
     editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
     addChild(editbox);
 
-    editbox = ui::EditBox::create(editBoxSize + Size(0,40), "extensions/yellow_edit.png", "extensions/orange_edit.png", "extensions/green_edit.png");
-    editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/2));
+    editbox = ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png", "extensions/orange_edit.png",
+                                  "extensions/green_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
     editbox->setFontColor(Color3B::GREEN);
     editbox->setPlaceHolder("Test Disabled Image - green");
     editbox->setPlaceholderFontColor(Color3B::WHITE);
-    editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
-    editbox->setFontSize((int)editBoxSize.height/2);
+    editbox->setPlaceholderFontSize((int)editBoxSize.height / 2);
+    editbox->setFontSize((int)editBoxSize.height / 2);
     editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
     addChild(editbox);
     editbox->setEnabled(false);
 
-    editbox = ui::EditBox::create(editBoxSize + Size(0,40), "extensions/yellow_edit.png");
-    editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/4));
+    editbox = ui::EditBox::create(editBoxSize + Size(0, 40), "extensions/yellow_edit.png");
+    editbox->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 4));
     editbox->setFontColor(Color3B::GREEN);
     editbox->setPlaceHolder("Disabled Gray effect");
     editbox->setPlaceholderFontColor(Color3B::WHITE);
-    editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
-    editbox->setFontSize((int)editBoxSize.height/2);
+    editbox->setPlaceholderFontSize((int)editBoxSize.height / 2);
+    editbox->setFontSize((int)editBoxSize.height / 2);
     editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
     addChild(editbox);
     editbox->setEnabled(false);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h
index 48bc16398578..ad166d8229b2 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,13 +36,13 @@ class UIEditBoxTest : public UIScene, public cocos2d::ui::EditBoxDelegate
     CREATE_FUNC(UIEditBoxTest);
 
     virtual bool init() override;
-    
-    virtual void editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox)override;
-    virtual void editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox, cocos2d::ui::EditBoxDelegate::EditBoxEndAction action)override;
-    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)override;
-    virtual void editBoxReturn(cocos2d::ui::EditBox* editBox)override;
 
-    
+    virtual void editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox) override;
+    virtual void editBoxEditingDidEndWithAction(cocos2d::ui::EditBox* editBox,
+                                                cocos2d::ui::EditBoxDelegate::EditBoxEndAction action) override;
+    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text) override;
+    virtual void editBoxReturn(cocos2d::ui::EditBox* editBox) override;
+
 protected:
     cocos2d::Label* _TTFShowEditReturn;
     cocos2d::ui::EditBox* _editName;
@@ -55,14 +55,13 @@ class UIEditBoxTestToggleVisibility : public UIScene, public cocos2d::ui::EditBo
 {
 public:
     CREATE_FUNC(UIEditBoxTestToggleVisibility);
-    
+
     virtual bool init() override;
-    
-    virtual void editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox)override;
-    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, const std::string& text)override;
-    virtual void editBoxReturn(cocos2d::ui::EditBox* editBox)override;
-    
-    
+
+    virtual void editBoxEditingDidBegin(cocos2d::ui::EditBox* editBox) override;
+    virtual void editBoxTextChanged(cocos2d::ui::EditBox* editBox, std::string_view text) override;
+    virtual void editBoxReturn(cocos2d::ui::EditBox* editBox) override;
+
 protected:
     cocos2d::Label* _TTFShowEditReturn;
     cocos2d::ui::EditBox* _editName;
@@ -75,7 +74,7 @@ class UIEditBoxTestTextHorizontalAlignment : public UIScene
 {
 public:
     CREATE_FUNC(UIEditBoxTestTextHorizontalAlignment);
-    
+
     virtual bool init() override;
 };
 
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp
index 96d3638ce1aa..93fc463b122d 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,10 +44,7 @@ UIFocusTests::UIFocusTests()
     ADD_TEST_CASE(UIFocusTestNestedLayout3);
 }
 
-UIFocusTestBase::UIFocusTestBase()
-{
-
-}
+UIFocusTestBase::UIFocusTestBase() {}
 
 UIFocusTestBase::~UIFocusTestBase()
 {
@@ -56,7 +53,8 @@ UIFocusTestBase::~UIFocusTestBase()
 
 bool UIFocusTestBase::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
 
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
@@ -64,35 +62,34 @@ bool UIFocusTestBase::init()
 
         _dpadMenu = Menu::create();
 
-        auto winSize = Director::getInstance()->getVisibleSize();
+        auto winSize  = Director::getInstance()->getVisibleSize();
         auto leftItem = MenuItemFont::create("Left", CC_CALLBACK_0(UIFocusTestBase::onLeftKeyPressed, this));
-        leftItem->setPosition(Vec2(winSize.width - 100, winSize.height/2));
+        leftItem->setPosition(Vec2(winSize.width - 100, winSize.height / 2));
         _dpadMenu->addChild(leftItem);
 
-
         auto rightItem = MenuItemFont::create("Right", CC_CALLBACK_0(UIFocusTestBase::onRightKeyPressed, this));
-        rightItem->setPosition(Vec2(winSize.width - 30, winSize.height/2));
+        rightItem->setPosition(Vec2(winSize.width - 30, winSize.height / 2));
         _dpadMenu->addChild(rightItem);
 
         auto upItem = MenuItemFont::create("Up", CC_CALLBACK_0(UIFocusTestBase::onUpKeyPressed, this));
-        upItem->setPosition(Vec2(winSize.width - 60, winSize.height/2 + 50));
+        upItem->setPosition(Vec2(winSize.width - 60, winSize.height / 2 + 50));
         _dpadMenu->addChild(upItem);
 
         auto downItem = MenuItemFont::create("Down", CC_CALLBACK_0(UIFocusTestBase::onDownKeyPressed, this));
-        downItem->setPosition(Vec2(winSize.width - 60, winSize.height/2 - 50));
+        downItem->setPosition(Vec2(winSize.width - 60, winSize.height / 2 - 50));
         _dpadMenu->addChild(downItem);
 
         _dpadMenu->setPosition(Vec2::ZERO);
         _uiLayer->addChild(_dpadMenu);
 
-        //call this method to enable Dpad focus navigation
+        // call this method to enable Dpad focus navigation
         Widget::enableDpadNavigation(true);
 
-        _eventListener = EventListenerFocus::create();
+        _eventListener                 = EventListenerFocus::create();
         _eventListener->onFocusChanged = CC_CALLBACK_2(UIFocusTestBase::onFocusChanged, this);
 
         _eventDispatcher->addEventListenerWithFixedPriority(_eventListener, 1);
-        
+
         _toggleButton = Button::create("cocosui/switch-mask.png");
         _toggleButton->setTitleText("Toggle Loop");
         _toggleButton->setPosition(Vec2(60.0f, winSize.height - 50));
@@ -106,14 +103,18 @@ bool UIFocusTestBase::init()
     return false;
 }
 
-void UIFocusTestBase::onImageViewClicked(cocos2d::Ref *ref, Widget::TouchEventType touchType)
+void UIFocusTestBase::onImageViewClicked(cocos2d::Ref* ref, Widget::TouchEventType touchType)
 {
-    if (touchType == Widget::TouchEventType::ENDED) {
-        Widget *w = (Widget*)ref;
-        if (w->isFocusEnabled()) {
+    if (touchType == Widget::TouchEventType::ENDED)
+    {
+        Widget* w = (Widget*)ref;
+        if (w->isFocusEnabled())
+        {
             w->setFocusEnabled(false);
             w->setColor(Color3B::YELLOW);
-        }else{
+        }
+        else
+        {
             w->setFocusEnabled(true);
             w->setColor(Color3B::WHITE);
         }
@@ -122,69 +123,65 @@ void UIFocusTestBase::onImageViewClicked(cocos2d::Ref *ref, Widget::TouchEventTy
 
 void UIFocusTestBase::onLeftKeyPressed()
 {
-    cocos2d::EventKeyboard::KeyCode cocos2dKey =EventKeyboard::KeyCode::KEY_DPAD_LEFT;
+    cocos2d::EventKeyboard::KeyCode cocos2dKey = EventKeyboard::KeyCode::KEY_DPAD_LEFT;
     cocos2d::EventKeyboard event(cocos2dKey, false);
     cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
 }
 
 void UIFocusTestBase::onRightKeyPressed()
 {
-    cocos2d::EventKeyboard::KeyCode cocos2dKey =EventKeyboard::KeyCode::KEY_DPAD_RIGHT;
+    cocos2d::EventKeyboard::KeyCode cocos2dKey = EventKeyboard::KeyCode::KEY_DPAD_RIGHT;
     cocos2d::EventKeyboard event(cocos2dKey, false);
     cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
 }
 
 void UIFocusTestBase::onUpKeyPressed()
 {
-    cocos2d::EventKeyboard::KeyCode cocos2dKey =EventKeyboard::KeyCode::KEY_DPAD_UP;
+    cocos2d::EventKeyboard::KeyCode cocos2dKey = EventKeyboard::KeyCode::KEY_DPAD_UP;
     cocos2d::EventKeyboard event(cocos2dKey, false);
     cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
-
 }
 
 void UIFocusTestBase::onDownKeyPressed()
 {
-    cocos2d::EventKeyboard::KeyCode cocos2dKey =EventKeyboard::KeyCode::KEY_DPAD_DOWN;
+    cocos2d::EventKeyboard::KeyCode cocos2dKey = EventKeyboard::KeyCode::KEY_DPAD_DOWN;
     cocos2d::EventKeyboard event(cocos2dKey, false);
     cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
-
 }
 
-void UIFocusTestBase::onFocusChanged(cocos2d::ui::Widget *widgetLostFocus, cocos2d::ui::Widget *widgetGetFocus)
+void UIFocusTestBase::onFocusChanged(cocos2d::ui::Widget* widgetLostFocus, cocos2d::ui::Widget* widgetGetFocus)
 {
-    if (widgetGetFocus && widgetGetFocus->isFocusEnabled()) {
+    if (widgetGetFocus && widgetGetFocus->isFocusEnabled())
+    {
         widgetGetFocus->setColor(Color3B::RED);
     }
 
-    if (widgetLostFocus && widgetLostFocus->isFocusEnabled()) {
+    if (widgetLostFocus && widgetLostFocus->isFocusEnabled())
+    {
         widgetLostFocus->setColor(Color3B::WHITE);
     }
 
-    if (widgetLostFocus && widgetGetFocus) {
-        CCLOG("on focus change, %d widget get focus, %d widget lose focus", widgetGetFocus->getTag(),  widgetLostFocus->getTag());
+    if (widgetLostFocus && widgetGetFocus)
+    {
+        CCLOG("on focus change, %d widget get focus, %d widget lose focus", widgetGetFocus->getTag(),
+              widgetLostFocus->getTag());
     }
 }
 
+// UIFocusTestHorizontal
+UIFocusTestHorizontal::UIFocusTestHorizontal() {}
 
-//UIFocusTestHorizontal
-UIFocusTestHorizontal::UIFocusTestHorizontal()
-{
-
-}
-
-UIFocusTestHorizontal::~UIFocusTestHorizontal()
-{
-
-}
+UIFocusTestHorizontal::~UIFocusTestHorizontal() {}
 
 bool UIFocusTestHorizontal::init()
 {
-    if (UIFocusTestBase::init()) {
+    if (UIFocusTestBase::init())
+    {
 
         Size winSize = Director::getInstance()->getVisibleSize();
 
         _horizontalLayout = HBox::create();
-        _horizontalLayout->setPosition(Vec2(20.0f, winSize.height/2 + 40));
+        _horizontalLayout->setPosition(Vec2(20.0f, winSize.height / 2 + 40));
         _uiLayer->addChild(_horizontalLayout);
 
         _horizontalLayout->setFocused(true);
@@ -193,8 +190,9 @@ bool UIFocusTestHorizontal::init()
         _firstFocusedWidget = _horizontalLayout;
 
         int count = 3;
-        for (int i=0; i<count; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setTouchEnabled(true);
             w->setTag(i);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestHorizontal::onImageViewClicked, this));
@@ -202,52 +200,47 @@ bool UIFocusTestHorizontal::init()
         }
 
         _loopText = Text::create("loop enabled", "Arial", 20);
-        _loopText->setPosition(Vec2(winSize.width/2, winSize.height - 50));
+        _loopText->setPosition(Vec2(winSize.width / 2, winSize.height - 50));
         _loopText->setColor(Color3B::GREEN);
         this->addChild(_loopText);
 
-        _toggleButton->addTouchEventListener(CC_CALLBACK_2(UIFocusTestHorizontal::toggleFocusLoop,this));
+        _toggleButton->addTouchEventListener(CC_CALLBACK_2(UIFocusTestHorizontal::toggleFocusLoop, this));
 
         return true;
     }
     return false;
 }
 
-
-
-
-void UIFocusTestHorizontal::toggleFocusLoop(cocos2d::Ref * pObjc, Widget::TouchEventType type)
+void UIFocusTestHorizontal::toggleFocusLoop(cocos2d::Ref* pObjc, Widget::TouchEventType type)
 {
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         _horizontalLayout->setLoopFocus(!_horizontalLayout->isLoopFocus());
-        if (_horizontalLayout->isLoopFocus()) {
+        if (_horizontalLayout->isLoopFocus())
+        {
             _loopText->setString("loop enabled");
-        }else{
+        }
+        else
+        {
             _loopText->setString("loop disabled");
         }
     }
 }
 
+// UIFocusTestVertical
+UIFocusTestVertical::UIFocusTestVertical() {}
 
-//UIFocusTestVertical
-UIFocusTestVertical::UIFocusTestVertical()
-{
-
-}
-
-UIFocusTestVertical::~UIFocusTestVertical()
-{
-
-}
+UIFocusTestVertical::~UIFocusTestVertical() {}
 
 bool UIFocusTestVertical::init()
 {
-    if (UIFocusTestBase::init()) {
+    if (UIFocusTestBase::init())
+    {
 
         Size winSize = Director::getInstance()->getVisibleSize();
 
         _verticalLayout = VBox::create();
-        _verticalLayout->setPosition(Vec2(winSize.width/2 - 100, winSize.height - 70));
+        _verticalLayout->setPosition(Vec2(winSize.width / 2 - 100, winSize.height - 70));
         _uiLayer->addChild(_verticalLayout);
         _verticalLayout->setTag(100);
         _verticalLayout->setScale(0.5);
@@ -257,8 +250,9 @@ bool UIFocusTestVertical::init()
         _firstFocusedWidget = _verticalLayout;
 
         int count = 3;
-        for (int i=0; i<count; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setTouchEnabled(true);
             w->setTag(i);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestVertical::onImageViewClicked, this));
@@ -266,10 +260,10 @@ bool UIFocusTestVertical::init()
         }
 
         _loopText = Text::create("loop enabled", "Arial", 20);
-        _loopText->setPosition(Vec2(winSize.width/2, winSize.height - 50));
+        _loopText->setPosition(Vec2(winSize.width / 2, winSize.height - 50));
         _loopText->setColor(Color3B::GREEN);
         this->addChild(_loopText);
-       
+
         _toggleButton->addTouchEventListener(CC_CALLBACK_2(UIFocusTestVertical::toggleFocusLoop, this));
 
         return true;
@@ -277,38 +271,36 @@ bool UIFocusTestVertical::init()
     return false;
 }
 
-
-void UIFocusTestVertical::toggleFocusLoop(cocos2d::Ref * pObjc, Widget::TouchEventType type)
+void UIFocusTestVertical::toggleFocusLoop(cocos2d::Ref* pObjc, Widget::TouchEventType type)
 {
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         _verticalLayout->setLoopFocus(!_verticalLayout->isLoopFocus());
-        if (_verticalLayout->isLoopFocus()) {
+        if (_verticalLayout->isLoopFocus())
+        {
             _loopText->setString("loop enabled");
-        }else{
+        }
+        else
+        {
             _loopText->setString("loop disabled");
         }
     }
 }
 
-//UIFocusTestNestedLayout1
-UIFocusTestNestedLayout1::UIFocusTestNestedLayout1()
-{
-
-}
-
-UIFocusTestNestedLayout1::~UIFocusTestNestedLayout1()
-{
+// UIFocusTestNestedLayout1
+UIFocusTestNestedLayout1::UIFocusTestNestedLayout1() {}
 
-}
+UIFocusTestNestedLayout1::~UIFocusTestNestedLayout1() {}
 
 bool UIFocusTestNestedLayout1::init()
 {
-    if (UIFocusTestBase::init()) {
+    if (UIFocusTestBase::init())
+    {
 
         Size winSize = Director::getInstance()->getVisibleSize();
 
         _verticalLayout = VBox::create();
-        _verticalLayout->setPosition(Vec2(winSize.width/2 - 80, winSize.height - 70));
+        _verticalLayout->setPosition(Vec2(winSize.width / 2 - 80, winSize.height - 70));
         _uiLayer->addChild(_verticalLayout);
         _verticalLayout->setScale(0.5);
 
@@ -318,51 +310,53 @@ bool UIFocusTestNestedLayout1::init()
         _firstFocusedWidget = _verticalLayout;
 
         int count1 = 1;
-        for (int i=0; i<count1; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count1; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setAnchorPoint(Vec2::ZERO);
             w->setTouchEnabled(true);
             w->setScaleX(2.5);
-            w->setTag(i+count1);
+            w->setTag(i + count1);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout1::onImageViewClicked, this));
             _verticalLayout->addChild(w);
         }
 
-        //add HBox into VBox
-        HBox *hbox = HBox::create();
+        // add HBox into VBox
+        HBox* hbox = HBox::create();
         hbox->setScale(0.8f);
         hbox->setTag(101);
         _verticalLayout->addChild(hbox);
 
         int count2 = 2;
-        for (int i=0; i < count2; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
-            w->setAnchorPoint(Vec2(0,1));
+        for (int i = 0; i < count2; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
+            w->setAnchorPoint(Vec2(0, 1));
             w->setScaleY(2.0);
             w->setTouchEnabled(true);
-            w->setTag(i+count1+count2);
+            w->setTag(i + count1 + count2);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout1::onImageViewClicked, this));
             hbox->addChild(w);
         }
 
-        VBox *innerVBox = VBox::create();
+        VBox* innerVBox = VBox::create();
         hbox->addChild(innerVBox);
         innerVBox->setTag(102);
-//        innerVBox->setPassFocusToChild(false);
-//        innerVBox->setFocusEnabled(false);
-
+        //        innerVBox->setPassFocusToChild(false);
+        //        innerVBox->setFocusEnabled(false);
 
         int count3 = 2;
-        for (int i=0; i<count3; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count3; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setTouchEnabled(true);
-            w->setTag(i+count1+count2+count3);
+            w->setTag(i + count1 + count2 + count3);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout1::onImageViewClicked, this));
             innerVBox->addChild(w);
         }
 
         _loopText = Text::create("loop enabled", "Arial", 20);
-        _loopText->setPosition(Vec2(winSize.width/2, winSize.height - 50));
+        _loopText->setPosition(Vec2(winSize.width / 2, winSize.height - 50));
         _loopText->setColor(Color3B::GREEN);
         this->addChild(_loopText);
 
@@ -373,38 +367,36 @@ bool UIFocusTestNestedLayout1::init()
     return false;
 }
 
-
-void UIFocusTestNestedLayout1::toggleFocusLoop(cocos2d::Ref * pObjc, Widget::TouchEventType type)
+void UIFocusTestNestedLayout1::toggleFocusLoop(cocos2d::Ref* pObjc, Widget::TouchEventType type)
 {
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         _verticalLayout->setLoopFocus(!_verticalLayout->isLoopFocus());
-        if (_verticalLayout->isLoopFocus()) {
+        if (_verticalLayout->isLoopFocus())
+        {
             _loopText->setString("loop enabled");
-        }else{
+        }
+        else
+        {
             _loopText->setString("loop disabled");
         }
     }
 }
 
-//UIFocusTestNestedLayout2
-UIFocusTestNestedLayout2::UIFocusTestNestedLayout2()
-{
-
-}
-
-UIFocusTestNestedLayout2::~UIFocusTestNestedLayout2()
-{
+// UIFocusTestNestedLayout2
+UIFocusTestNestedLayout2::UIFocusTestNestedLayout2() {}
 
-}
+UIFocusTestNestedLayout2::~UIFocusTestNestedLayout2() {}
 
 bool UIFocusTestNestedLayout2::init()
 {
-    if (UIFocusTestBase::init()) {
+    if (UIFocusTestBase::init())
+    {
 
         Size winSize = Director::getInstance()->getVisibleSize();
 
         _horizontalLayout = HBox::create();
-        _horizontalLayout->setPosition(Vec2(winSize.width/2 - 200, winSize.height - 70));
+        _horizontalLayout->setPosition(Vec2(winSize.width / 2 - 200, winSize.height - 70));
         _uiLayer->addChild(_horizontalLayout);
         _horizontalLayout->setScale(0.6f);
 
@@ -414,51 +406,53 @@ bool UIFocusTestNestedLayout2::init()
         _firstFocusedWidget = _horizontalLayout;
 
         int count1 = 2;
-        for (int i=0; i<count1; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
-            w->setAnchorPoint(Vec2(0,1));
+        for (int i = 0; i < count1; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
+            w->setAnchorPoint(Vec2(0, 1));
             w->setTouchEnabled(true);
-            w->setTag(i+count1);
+            w->setTag(i + count1);
             w->setScaleY(2.4f);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout2::onImageViewClicked, this));
             _horizontalLayout->addChild(w);
         }
 
-        //add HBox into VBox
-        VBox *vbox = VBox::create();
+        // add HBox into VBox
+        VBox* vbox = VBox::create();
         vbox->setScale(0.8f);
         vbox->setTag(101);
         _horizontalLayout->addChild(vbox);
 
         int count2 = 2;
-        for (int i=0; i < count2; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
-            w->setAnchorPoint(Vec2(0,1));
+        for (int i = 0; i < count2; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
+            w->setAnchorPoint(Vec2(0, 1));
             w->setScaleX(2.0);
             w->setTouchEnabled(true);
-            w->setTag(i+count1+count2);
+            w->setTag(i + count1 + count2);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout2::onImageViewClicked, this));
             vbox->addChild(w);
         }
 
-        HBox *innerHBox = HBox::create();
+        HBox* innerHBox = HBox::create();
         vbox->addChild(innerHBox);
         innerHBox->setTag(102);
         //        innerVBox->setPassFocusToChild(false);
         //        innerVBox->setFocusEnabled(false);
 
-
         int count3 = 2;
-        for (int i=0; i<count3; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count3; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setTouchEnabled(true);
-            w->setTag(i+count1+count2+count3);
+            w->setTag(i + count1 + count2 + count3);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestNestedLayout2::onImageViewClicked, this));
             innerHBox->addChild(w);
         }
 
         _loopText = Text::create("loop enabled", "Arial", 20);
-        _loopText->setPosition(Vec2(winSize.width/2, winSize.height - 50));
+        _loopText->setPosition(Vec2(winSize.width / 2, winSize.height - 50));
         _loopText->setColor(Color3B::GREEN);
         this->addChild(_loopText);
 
@@ -469,33 +463,31 @@ bool UIFocusTestNestedLayout2::init()
     return false;
 }
 
-
-void UIFocusTestNestedLayout2::toggleFocusLoop(cocos2d::Ref * pObjc, Widget::TouchEventType type)
+void UIFocusTestNestedLayout2::toggleFocusLoop(cocos2d::Ref* pObjc, Widget::TouchEventType type)
 {
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         _horizontalLayout->setLoopFocus(!_horizontalLayout->isLoopFocus());
-        if (_horizontalLayout->isLoopFocus()) {
+        if (_horizontalLayout->isLoopFocus())
+        {
             _loopText->setString("loop enabled");
-        }else{
+        }
+        else
+        {
             _loopText->setString("loop disabled");
         }
     }
 }
 
-//UIFocusTestNestedLayout3
-UIFocusTestNestedLayout3::UIFocusTestNestedLayout3()
-{
-
-}
-
-UIFocusTestNestedLayout3::~UIFocusTestNestedLayout3()
-{
+// UIFocusTestNestedLayout3
+UIFocusTestNestedLayout3::UIFocusTestNestedLayout3() {}
 
-}
+UIFocusTestNestedLayout3::~UIFocusTestNestedLayout3() {}
 
 bool UIFocusTestNestedLayout3::init()
 {
-    if (UIFocusTestBase::init()) {
+    if (UIFocusTestBase::init())
+    {
 
         Size winSize = Director::getInstance()->getVisibleSize();
 
@@ -509,60 +501,59 @@ bool UIFocusTestNestedLayout3::init()
         _verticalLayout->setTag(-1000);
         _firstFocusedWidget = _verticalLayout;
 
-
-        HBox *upperHBox = HBox::create();
+        HBox* upperHBox = HBox::create();
         upperHBox->setTag(-200);
         _verticalLayout->addChild(upperHBox);
 
-        LinearLayoutParameter *params = LinearLayoutParameter::create();
-        params->setMargin(Margin(0.0f,0.0f,50.0f,0.0f));
+        LinearLayoutParameter* params = LinearLayoutParameter::create();
+        params->setMargin(Margin(0.0f, 0.0f, 50.0f, 0.0f));
 
-        LinearLayoutParameter *vparams = LinearLayoutParameter::create();
+        LinearLayoutParameter* vparams = LinearLayoutParameter::create();
         vparams->setMargin(Margin(10.0f, 0.0f, 0.0f, 140.0f));
         upperHBox->setLayoutParameter(vparams);
 
         int count = 3;
-        for (int i=0; i<count; ++i) {
-            VBox *firstVbox = VBox::create();
+        for (int i = 0; i < count; ++i)
+        {
+            VBox* firstVbox = VBox::create();
             firstVbox->setScale(0.5);
             firstVbox->setLayoutParameter(params);
-            firstVbox->setTag((i+1) * 100);
+            firstVbox->setTag((i + 1) * 100);
 
             int count1 = 3;
-            for (int j=0; j<count1; ++j) {
-                ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+            for (int j = 0; j < count1; ++j)
+            {
+                ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
                 w->setTouchEnabled(true);
-                w->setTag(j+firstVbox->getTag()+1);
+                w->setTag(j + firstVbox->getTag() + 1);
                 w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestBase::onImageViewClicked, this));
                 firstVbox->addChild(w);
             }
 
             upperHBox->addChild(firstVbox);
-
         }
 
-        HBox *bottomHBox = HBox::create();
+        HBox* bottomHBox = HBox::create();
         bottomHBox->setScale(0.5);
         bottomHBox->setTag(600);
 
         bottomHBox->setLayoutParameter(vparams);
-        count = 3;
-        LinearLayoutParameter *bottomParams = LinearLayoutParameter::create();
+        count                               = 3;
+        LinearLayoutParameter* bottomParams = LinearLayoutParameter::create();
         bottomParams->setMargin(Margin(0.0f, 0.0f, 8.0f, 0.0f));
-        for (int i=0; i < count; ++i) {
-            ImageView *w = ImageView::create("cocosui/scrollviewbg.png");
+        for (int i = 0; i < count; ++i)
+        {
+            ImageView* w = ImageView::create("cocosui/scrollviewbg.png");
             w->setLayoutParameter(bottomParams);
             w->setTouchEnabled(true);
-            w->setTag(i+601);
+            w->setTag(i + 601);
             w->addTouchEventListener(CC_CALLBACK_2(UIFocusTestBase::onImageViewClicked, this));
             bottomHBox->addChild(w);
         }
         _verticalLayout->addChild(bottomHBox);
 
-
-
         _loopText = Text::create("loop enabled", "Arial", 20);
-        _loopText->setPosition(Vec2(winSize.width/2, winSize.height - 50));
+        _loopText->setPosition(Vec2(winSize.width / 2, winSize.height - 50));
         _loopText->setColor(Color3B::GREEN);
         this->addChild(_loopText);
 
@@ -573,14 +564,17 @@ bool UIFocusTestNestedLayout3::init()
     return false;
 }
 
-
-void UIFocusTestNestedLayout3::toggleFocusLoop(cocos2d::Ref * pObjc, Widget::TouchEventType type)
+void UIFocusTestNestedLayout3::toggleFocusLoop(cocos2d::Ref* pObjc, Widget::TouchEventType type)
 {
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         _verticalLayout->setLoopFocus(!_verticalLayout->isLoopFocus());
-        if (_verticalLayout->isLoopFocus()) {
+        if (_verticalLayout->isLoopFocus())
+        {
             _loopText->setString("loop enabled");
-        }else{
+        }
+        else
+        {
             _loopText->setString("loop disabled");
         }
     }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.h
index 19c22fbd903d..4b5c3b1131c3 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -70,7 +70,7 @@ class UIFocusTestHorizontal : public UIFocusTestBase
 
     virtual bool init() override;
 
-    void toggleFocusLoop(cocos2d::Ref*,cocos2d::ui::Widget::TouchEventType);
+    void toggleFocusLoop(cocos2d::Ref*, cocos2d::ui::Widget::TouchEventType);
 
 protected:
     cocos2d::ui::Layout* _horizontalLayout;
@@ -87,7 +87,8 @@ class UIFocusTestVertical : public UIFocusTestBase
 
     virtual bool init() override;
 
-    void toggleFocusLoop(cocos2d::Ref*,cocos2d::ui::Widget::TouchEventType);
+    void toggleFocusLoop(cocos2d::Ref*, cocos2d::ui::Widget::TouchEventType);
+
 protected:
     cocos2d::ui::Layout* _verticalLayout;
     cocos2d::ui::Text* _loopText;
@@ -103,7 +104,8 @@ class UIFocusTestNestedLayout1 : public UIFocusTestBase
 
     virtual bool init() override;
 
-    void toggleFocusLoop(cocos2d::Ref*,cocos2d::ui::Widget::TouchEventType);
+    void toggleFocusLoop(cocos2d::Ref*, cocos2d::ui::Widget::TouchEventType);
+
 protected:
     cocos2d::ui::Layout* _verticalLayout;
     cocos2d::ui::Text* _loopText;
@@ -119,7 +121,8 @@ class UIFocusTestNestedLayout2 : public UIFocusTestBase
 
     virtual bool init() override;
 
-    void toggleFocusLoop(cocos2d::Ref*,cocos2d::ui::Widget::TouchEventType);
+    void toggleFocusLoop(cocos2d::Ref*, cocos2d::ui::Widget::TouchEventType);
+
 protected:
     cocos2d::ui::Layout* _horizontalLayout;
     cocos2d::ui::Text* _loopText;
@@ -135,12 +138,11 @@ class UIFocusTestNestedLayout3 : public UIFocusTestBase
 
     virtual bool init() override;
 
-    void toggleFocusLoop(cocos2d::Ref*,cocos2d::ui::Widget::TouchEventType);
+    void toggleFocusLoop(cocos2d::Ref*, cocos2d::ui::Widget::TouchEventType);
+
 protected:
     cocos2d::ui::Layout* _verticalLayout;
     cocos2d::ui::Text* _loopText;
 };
 
-
-
 #endif /* defined(__cocos2d_tests__UIFocusTest__) */
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
index 1eb2851be7dd..639d193fcef6 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,31 +44,31 @@ bool UIImageViewTest::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         Text* alert = Text::create("ImageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
-        
-        _uiLayer->addChild(alert);        
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+
+        _uiLayer->addChild(alert);
+
         // Create the imageview
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f,
-                                     widgetSize.height / 2.0f));
-        
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
+
         _uiLayer->addChild(imageView);
-        
+
         _image = imageView;
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UIImageViewTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UIImageViewTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0.0f, 0.0f));
         this->addChild(pMenu1, 10);
-        
+
         return true;
     }
     return false;
@@ -87,28 +87,26 @@ bool UIImageViewTest_Scale9::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         Text* alert = Text::create("ImageView scale9 render", "fonts/Marker Felt.ttf", 26);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
-        
-        _uiLayer->addChild(alert);        
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
+
+        _uiLayer->addChild(alert);
+
         // Create the imageview
         ImageView* imageView = ImageView::create("cocosui/buttonHighlighted.png");
         imageView->setScale9Enabled(true);
         imageView->setContentSize(Size(200, 115));
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f - 100,
-                                     widgetSize.height / 2.0f));
-        
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f - 100, widgetSize.height / 2.0f));
+
         _uiLayer->addChild(imageView);
 
         auto imageCopy = imageView->clone();
-        imageCopy->setPosition(Vec2(widgetSize.width / 2.0f + 100,
-                                    widgetSize.height / 2.0f));
+        imageCopy->setPosition(Vec2(widgetSize.width / 2.0f + 100, widgetSize.height / 2.0f));
         _uiLayer->addChild(imageCopy);
-        
+
         return true;
     }
     return false;
@@ -124,8 +122,8 @@ bool UIImageViewTest_Scale9_State_Change::init()
 
         Text* alert = Text::create("Click The Image", "fonts/Marker Felt.ttf", 26);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
 
         _uiLayer->addChild(alert);
 
@@ -134,13 +132,13 @@ bool UIImageViewTest_Scale9_State_Change::init()
         imageView->ignoreContentAdaptWithSize(false);
         imageView->setScale9Enabled(true);
         imageView->setContentSize(Size(100.0f, 100.0f));
-        imageView->setCapInsets(Rect(20.0f,20.0f,20.0f,20.0f));
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f));
+        imageView->setCapInsets(Rect(20.0f, 20.0f, 20.0f, 20.0f));
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
 
         imageView->setTouchEnabled(true);
-        imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){
-            if (type == Widget::TouchEventType::ENDED) {
+        imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
                 if (imageView->isScale9Enabled())
                 {
                     imageView->setScale9Enabled(false);
@@ -157,7 +155,6 @@ bool UIImageViewTest_Scale9_State_Change::init()
     return false;
 }
 
-
 // UIImageViewTest_ContentSize
 
 bool UIImageViewTest_ContentSize::init()
@@ -165,36 +162,33 @@ bool UIImageViewTest_ContentSize::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         Text* alert = Text::create("ImageView ContentSize Change", "fonts/Marker Felt.ttf", 26);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
+
         _uiLayer->addChild(alert);
-        
-        Text *status = Text::create("child ImageView position percent", "fonts/Marker Felt.ttf", 16);
+
+        Text* status = Text::create("child ImageView position percent", "fonts/Marker Felt.ttf", 16);
         status->setColor(Color3B::RED);
-        status->setPosition(Vec2(widgetSize.width/2, widgetSize.height/2 + 80));
-        _uiLayer->addChild(status,20);
-        
+        status->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2 + 80));
+        _uiLayer->addChild(status, 20);
+
         // Create the imageview
         ImageView* imageView = ImageView::create("cocosui/buttonHighlighted.png");
         imageView->setScale9Enabled(true);
         imageView->setContentSize(Size(200.0f, 80.0f));
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f,
-                                    widgetSize.height / 2.0f ));
-       
-        
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
+
         ImageView* imageViewChild = ImageView::create("cocosui/buttonHighlighted.png");
         imageViewChild->setScale9Enabled(true);
         imageViewChild->setSizeType(Widget::SizeType::PERCENT);
         imageViewChild->setPositionType(Widget::PositionType::PERCENT);
         imageViewChild->setSizePercent(Vec2::ANCHOR_MIDDLE);
         imageViewChild->setPositionPercent(Vec2::ANCHOR_MIDDLE);
-        imageViewChild->setPosition(Vec2(widgetSize.width / 2.0f,
-                                    widgetSize.height / 2.0f));
-        
+        imageViewChild->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
+
         ImageView* imageViewChild2 = ImageView::create("cocosui/buttonHighlighted.png");
         imageViewChild2->setScale9Enabled(true);
         imageViewChild2->setSizeType(Widget::SizeType::PERCENT);
@@ -202,31 +196,31 @@ bool UIImageViewTest_ContentSize::init()
         imageViewChild2->setSizePercent(Vec2::ANCHOR_MIDDLE);
         imageViewChild2->setPositionPercent(Vec2::ANCHOR_MIDDLE);
         imageViewChild->addChild(imageViewChild2);
-        
-        
+
         imageView->addChild(imageViewChild);
-        
+
         imageView->setTouchEnabled(true);
-        imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){
-            if (type == Widget::TouchEventType::ENDED) {
-                float width = CCRANDOM_0_1() * 200 + 50;
+        imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
+                float width  = CCRANDOM_0_1() * 200 + 50;
                 float height = CCRANDOM_0_1() * 80 + 30;
                 imageView->setContentSize(Size(width, height));
-                
+
                 imageViewChild->setPositionPercent(Vec2(CCRANDOM_0_1(), CCRANDOM_0_1()));
                 status->setString(StringUtils::format("child ImageView position percent: %f, %f",
-                                                      imageViewChild->getPositionPercent().x, imageViewChild->getPositionPercent().y));
+                                                      imageViewChild->getPositionPercent().x,
+                                                      imageViewChild->getPositionPercent().y));
             }
         });
-        
+
         _uiLayer->addChild(imageView);
-        
+
         return true;
     }
     return false;
 }
 
-
 // UIImageViewFlipTest
 
 bool UIImageViewFlipTest::init()
@@ -235,14 +229,14 @@ bool UIImageViewFlipTest::init()
     {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/blocks9ss.plist");
         Size widgetSize = _widget->getContentSize();
-        
+
         Text* alert = Text::create("ImageView flip test", "fonts/Marker Felt.ttf", 26);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
+
         _uiLayer->addChild(alert);
-        
+
         // Create the imageview
         ImageView* imageView = ImageView::create("blocks9ss/blocks9r.png", Widget::TextureResType::PLIST);
         imageView->setScale9Enabled(true);
@@ -250,35 +244,33 @@ bool UIImageViewFlipTest::init()
         imageView->setFlippedX(true);
         imageView->setScale(0.5);
         imageView->ignoreContentAdaptWithSize(false);
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f,
-                                    widgetSize.height / 2.0f));
-        
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
+
         _uiLayer->addChild(imageView);
-        
+
         auto toggleButton = Button::create();
         toggleButton->setTitleText("Toggle FlipX");
-        toggleButton->setPosition(imageView->getPosition() + Vec2(-50.0f, - imageView->getContentSize().height/2 - 20));
+        toggleButton->setPosition(imageView->getPosition() +
+                                  Vec2(-50.0f, -imageView->getContentSize().height / 2 - 20));
         this->addChild(toggleButton);
-        toggleButton->addClickEventListener([=](Ref*){
-            imageView->setFlippedX(!imageView->isFlippedX());
-        });
-        
+        toggleButton->addClickEventListener([=](Ref*) { imageView->setFlippedX(!imageView->isFlippedX()); });
+
         auto toggleScale9 = Button::create();
         toggleScale9->setTitleText("Toggle Scale9");
-        toggleScale9->setPosition(imageView->getPosition() + Vec2(+50.0f, - imageView->getContentSize().height/2- 20));
+        toggleScale9->setPosition(imageView->getPosition() +
+                                  Vec2(+50.0f, -imageView->getContentSize().height / 2 - 20));
         this->addChild(toggleScale9);
-        toggleScale9->addClickEventListener([=](Ref*){
+        toggleScale9->addClickEventListener([=](Ref*) {
             imageView->setScale9Enabled(!imageView->isScale9Enabled());
-            //after switching scale9, you must call setContentSize to keep the size not change
-             imageView->setContentSize(Size(250, 115));
+            // after switching scale9, you must call setContentSize to keep the size not change
+            imageView->setContentSize(Size(250, 115));
         });
-        
+
         return true;
     }
     return false;
 }
 
-
 // UIImageViewIssue12249Test
 
 bool UIImageViewIssue12249Test::init()
@@ -287,39 +279,35 @@ bool UIImageViewIssue12249Test::init()
     {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/blocks9ss.plist");
         Size widgetSize = _widget->getContentSize();
-        
+
         Text* alert = Text::create("UIImageViewIssue12249Test", "fonts/Marker Felt.ttf", 26);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
+
         _uiLayer->addChild(alert);
-        
+
         // Create the imageview
         ImageView* imageView = ImageView::create("blocks9ss/blocks9r.png", Widget::TextureResType::PLIST);
         imageView->setScale9Enabled(true);
         imageView->setContentSize(Size(250, imageView->getContentSize().height * 2));
         imageView->setFlippedX(true);
         imageView->setScale(0.5);
-        imageView->setPosition(Vec2(widgetSize.width / 2.0f - 80,
-                                    widgetSize.height / 2.0f));
-        
+        imageView->setPosition(Vec2(widgetSize.width / 2.0f - 80, widgetSize.height / 2.0f));
+
         _uiLayer->addChild(imageView);
-        
+
         ImageView* imageView2 = ImageView::create();
         imageView2->setScale9Enabled(true);
         imageView2->loadTexture("blocks9r.png", Widget::TextureResType::PLIST);
         imageView2->setContentSize(Size(250, imageView2->getContentSize().height * 2));
         imageView2->setFlippedX(true);
         imageView2->setScale(0.5);
-        imageView2->setPosition(Vec2(widgetSize.width / 2.0f + 80,
-                                    widgetSize.height / 2.0f));
-        
+        imageView2->setPosition(Vec2(widgetSize.width / 2.0f + 80, widgetSize.height / 2.0f));
+
         _uiLayer->addChild(imageView2);
-        
-        
+
         return true;
     }
     return false;
 }
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
index c135b7954392..15e17eff4d14 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,6 +38,7 @@ class UIImageViewTest : public UIScene
     virtual bool init() override;
 
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::ImageView* _image;
 };
@@ -78,7 +79,7 @@ class UIImageViewIssue12249Test : public UIScene
 {
 public:
     CREATE_FUNC(UIImageViewIssue12249Test);
-    
+
     virtual bool init() override;
 };
 
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
index 27fb408b0abe..a663b6ab82d0 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@ UILayoutTests::UILayoutTests()
     ADD_TEST_CASE(UILayoutTest);
     ADD_TEST_CASE(UILayoutTest_Color);
     ADD_TEST_CASE(UILayoutTest_Gradient);
-    ADD_TEST_CASE(UILayoutTest_BackGroundImage); 
+    ADD_TEST_CASE(UILayoutTest_BackGroundImage);
     ADD_TEST_CASE(UILayoutTest_BackGroundImage_Scale9);
     ADD_TEST_CASE(UILayoutTest_Layout_Linear_Vertical);
     ADD_TEST_CASE(UILayoutTest_Layout_Linear_Horizontal);
@@ -48,94 +48,86 @@ UILayoutTests::UILayoutTests()
 
 // UILayoutTest
 
-UILayoutTest::UILayoutTest()
-{
-}
+UILayoutTest::UILayoutTest() {}
 
-UILayoutTest::~UILayoutTest()
-{
-}
+UILayoutTest::~UILayoutTest() {}
 
 bool UILayoutTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("Layout", "fonts/Marker Felt.ttf", 30 );
+        Text* alert = Text::create("Layout", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+
         _uiLayer->addChild(alert);
-        
-        Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81)) ;
-        
+
+        Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                  layout->getContentSize().height - button->getContentSize().height / 2.0f));
+                                 layout->getContentSize().height - button->getContentSize().height / 2.0f));
         layout->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         layout->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(layout->getContentSize().width - button_scale9->getContentSize().width / 2.0f,
-                                         button_scale9->getContentSize().height / 2.0f));
-        
+                                        button_scale9->getContentSize().height / 2.0f));
+
         layout->addChild(button_scale9);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UILayoutTest_Color
 
-UILayoutTest_Color::UILayoutTest_Color()
-{
-}
+UILayoutTest_Color::UILayoutTest_Color() {}
 
-UILayoutTest_Color::~UILayoutTest_Color()
-{
-}
+UILayoutTest_Color::~UILayoutTest_Color() {}
 
 bool UILayoutTest_Color::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout color render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout with color render
         Layout* layout = Layout::create();
         layout->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
@@ -143,30 +135,30 @@ bool UILayoutTest_Color::init()
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                  layout->getContentSize().height - button->getContentSize().height / 2.0f));
-        
+                                 layout->getContentSize().height - button->getContentSize().height / 2.0f));
+
         layout->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         layout->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(layout->getContentSize().width - button_scale9->getContentSize().width / 2.0f,
-                                         button_scale9->getContentSize().height / 2.0f));
-        
-        layout->addChild(button_scale9);        
-        
+                                        button_scale9->getContentSize().height / 2.0f));
+
+        layout->addChild(button_scale9);
+
         return true;
     }
     return false;
@@ -174,32 +166,28 @@ bool UILayoutTest_Color::init()
 
 // UILayoutTest_Gradient
 
-UILayoutTest_Gradient::UILayoutTest_Gradient()
-{    
-}
+UILayoutTest_Gradient::UILayoutTest_Gradient() {}
 
-UILayoutTest_Gradient::~UILayoutTest_Gradient()
-{
-}
+UILayoutTest_Gradient::~UILayoutTest_Gradient() {}
 
 bool UILayoutTest_Gradient::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout gradient render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout with gradient render
         Layout* layout = Layout::create();
         layout->setBackGroundColorType(Layout::BackGroundColorType::GRADIENT);
@@ -207,30 +195,30 @@ bool UILayoutTest_Gradient::init()
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                  layout->getContentSize().height - button->getContentSize().height / 2.0f));
-        
+                                 layout->getContentSize().height - button->getContentSize().height / 2.0f));
+
         layout->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         layout->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(layout->getContentSize().width - button_scale9->getContentSize().width / 2.0f,
-                                         button_scale9->getContentSize().height / 2.0f));
-        
-        layout->addChild(button_scale9);        
-        
+                                        button_scale9->getContentSize().height / 2.0f));
+
+        layout->addChild(button_scale9);
+
         return true;
     }
     return false;
@@ -238,30 +226,27 @@ bool UILayoutTest_Gradient::init()
 
 // UILayoutTest_BackGroundImage
 
-UILayoutTest_BackGroundImage::UILayoutTest_BackGroundImage()
-{
-}
+UILayoutTest_BackGroundImage::UILayoutTest_BackGroundImage() {}
 
-UILayoutTest_BackGroundImage::~UILayoutTest_BackGroundImage()
-{
-}
+UILayoutTest_BackGroundImage::~UILayoutTest_BackGroundImage() {}
 
 bool UILayoutTest_BackGroundImage::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout background image", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout with background image
         Layout* layout = Layout::create();
         layout->setClippingEnabled(true);
@@ -269,39 +254,41 @@ bool UILayoutTest_BackGroundImage::init()
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                  layout->getContentSize().height - button->getContentSize().height / 2.0f));
+                                 layout->getContentSize().height - button->getContentSize().height / 2.0f));
         layout->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         layout->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(layout->getContentSize().width - button_scale9->getContentSize().width / 2.0f,
-                                         button_scale9->getContentSize().height / 2.0f));
-        
-        layout->addChild(button_scale9);        
+                                        button_scale9->getContentSize().height / 2.0f));
+
+        layout->addChild(button_scale9);
 
         _layout = layout;
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UILayoutTest_BackGroundImage::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1 =
+            MenuItemLabel::create(label1, CC_CALLBACK_1(UILayoutTest_BackGroundImage::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0, 0));
         this->addChild(pMenu1, 10);
-        
+
         return true;
     }
     return false;
@@ -315,30 +302,27 @@ void UILayoutTest_BackGroundImage::printWidgetResources(cocos2d::Ref* sender)
 
 // UILayoutTest_BackGroundImage_Scale9
 
-UILayoutTest_BackGroundImage_Scale9::UILayoutTest_BackGroundImage_Scale9()
-{
-}
+UILayoutTest_BackGroundImage_Scale9::UILayoutTest_BackGroundImage_Scale9() {}
 
-UILayoutTest_BackGroundImage_Scale9::~UILayoutTest_BackGroundImage_Scale9()
-{
-}
+UILayoutTest_BackGroundImage_Scale9::~UILayoutTest_BackGroundImage_Scale9() {}
 
 bool UILayoutTest_BackGroundImage_Scale9::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout background image scale9", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout with background image
         Layout* layout = Layout::create();
         layout->setBackGroundImageScale9Enabled(true);
@@ -346,29 +330,29 @@ bool UILayoutTest_BackGroundImage_Scale9::init()
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                  layout->getContentSize().height - button->getContentSize().height / 2.0f));
-        
+                                 layout->getContentSize().height - button->getContentSize().height / 2.0f));
+
         layout->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
         layout->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(layout->getContentSize().width - button_scale9->getContentSize().width / 2.0f,
-                                         button_scale9->getContentSize().height / 2.0f));
+                                        button_scale9->getContentSize().height / 2.0f));
         layout->addChild(button_scale9);
-        
+
         return true;
     }
     return false;
@@ -376,106 +360,95 @@ bool UILayoutTest_BackGroundImage_Scale9::init()
 
 // UILayoutTest_Layout_Linear_Vertical
 
-UILayoutTest_Layout_Linear_Vertical::UILayoutTest_Layout_Linear_Vertical()
-{
-}
+UILayoutTest_Layout_Linear_Vertical::UILayoutTest_Layout_Linear_Vertical() {}
 
-UILayoutTest_Layout_Linear_Vertical::~UILayoutTest_Layout_Linear_Vertical()
-{
-}
+UILayoutTest_Layout_Linear_Vertical::~UILayoutTest_Layout_Linear_Vertical() {}
 
 bool UILayoutTest_Layout_Linear_Vertical::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout Linear Vertical", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setLayoutType(Layout::Type::VERTICAL);
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button);
-        
+
         LinearLayoutParameter* lp1 = LinearLayoutParameter::create();
         button->setLayoutParameter(lp1);
         lp1->setGravity(LinearLayoutParameter::LinearGravity::CENTER_HORIZONTAL);
         lp1->setMargin(Margin(0.0f, 5.0f, 0.0f, 10.0f));
-        
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         layout->addChild(titleButton);
-        
+
         LinearLayoutParameter* lp2 = LinearLayoutParameter::create();
         titleButton->setLayoutParameter(lp2);
         lp2->setGravity(LinearLayoutParameter::LinearGravity::CENTER_HORIZONTAL);
         lp2->setMargin(Margin(0.0f, 10.0f, 0.0f, 10.0f));
-        
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         layout->addChild(button_scale9);
-        
+
         LinearLayoutParameter* lp3 = LinearLayoutParameter::create();
         button_scale9->setLayoutParameter(lp3);
         lp3->setGravity(LinearLayoutParameter::LinearGravity::CENTER_HORIZONTAL);
         lp3->setMargin(Margin(0.0f, 10.0f, 0.0f, 10.0f));
-        
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UILayoutTest_Layout_Linear_Horizontal
 
-UILayoutTest_Layout_Linear_Horizontal::UILayoutTest_Layout_Linear_Horizontal()
-{
-}
+UILayoutTest_Layout_Linear_Horizontal::UILayoutTest_Layout_Linear_Horizontal() {}
 
-UILayoutTest_Layout_Linear_Horizontal::~UILayoutTest_Layout_Linear_Horizontal()
-{
-}
+UILayoutTest_Layout_Linear_Horizontal::~UILayoutTest_Layout_Linear_Horizontal() {}
 
 bool UILayoutTest_Layout_Linear_Horizontal::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout Linear Horizontal", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setLayoutType(Layout::Type::HORIZONTAL);
@@ -483,73 +456,67 @@ bool UILayoutTest_Layout_Linear_Horizontal::init()
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button);
-        
+
         LinearLayoutParameter* lp1 = LinearLayoutParameter::create();
         button->setLayoutParameter(lp1);
         lp1->setGravity(LinearLayoutParameter::LinearGravity::CENTER_VERTICAL);
         lp1->setMargin(Margin(0.0f, 10.0f, 0.0f, 10.0f));
-        
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         layout->addChild(titleButton);
-        
+
         LinearLayoutParameter* lp2 = LinearLayoutParameter::create();
         titleButton->setLayoutParameter(lp2);
         lp2->setGravity(LinearLayoutParameter::LinearGravity::CENTER_VERTICAL);
         lp2->setMargin(Margin(0.0f, 10.0f, 0.0f, 10.0f));
-        
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
         layout->addChild(button_scale9);
-        
+
         LinearLayoutParameter* lp3 = LinearLayoutParameter::create();
         button_scale9->setLayoutParameter(lp3);
         lp3->setGravity(LinearLayoutParameter::LinearGravity::CENTER_VERTICAL);
         lp3->setMargin(Margin(0.0f, 10.0f, 0.0f, 10.0f));
-        
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UILayoutTest_Layout_Relative_Align_Parent
 
-UILayoutTest_Layout_Relative_Align_Parent::UILayoutTest_Layout_Relative_Align_Parent()
-{
-}
+UILayoutTest_Layout_Relative_Align_Parent::UILayoutTest_Layout_Relative_Align_Parent() {}
 
-UILayoutTest_Layout_Relative_Align_Parent::~UILayoutTest_Layout_Relative_Align_Parent()
-{
-}
+UILayoutTest_Layout_Relative_Align_Parent::~UILayoutTest_Layout_Relative_Align_Parent() {}
 
 bool UILayoutTest_Layout_Relative_Align_Parent::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout Relative Align Parent", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setLayoutType(Layout::Type::RELATIVE);
@@ -558,257 +525,235 @@ bool UILayoutTest_Layout_Relative_Align_Parent::init()
         layout->setBackGroundColor(Color3B::GREEN);
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                (widgetSize.height - backgroundSize.height) / 2.0f +
-                                (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         // top left
-        Button* button_TopLeft = Button::create("cocosui/animationbuttonnormal.png",
-                                                "cocosui/animationbuttonpressed.png");
+        Button* button_TopLeft =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_TopLeft);
-        
+
         RelativeLayoutParameter* rp_TopLeft = RelativeLayoutParameter::create();
         rp_TopLeft->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_TOP_LEFT);
         button_TopLeft->setLayoutParameter(rp_TopLeft);
-        
-        
+
         // top center horizontal
-        Button* button_TopCenter = Button::create("cocosui/animationbuttonnormal.png",
-                                                  "cocosui/animationbuttonpressed.png");
+        Button* button_TopCenter =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_TopCenter);
-        
+
         RelativeLayoutParameter* rp_TopCenter = RelativeLayoutParameter::create();
         rp_TopCenter->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_TOP_CENTER_HORIZONTAL);
         button_TopCenter->setLayoutParameter(rp_TopCenter);
-        
-        
+
         // top right
-        Button* button_TopRight = Button::create("cocosui/animationbuttonnormal.png",
-                                                 "cocosui/animationbuttonpressed.png");
+        Button* button_TopRight =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_TopRight);
-        
+
         RelativeLayoutParameter* rp_TopRight = RelativeLayoutParameter::create();
         rp_TopRight->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_TOP_RIGHT);
         button_TopRight->setLayoutParameter(rp_TopRight);
-        
-        
+
         // left center
-        Button* button_LeftCenter = Button::create("cocosui/animationbuttonnormal.png",
-                                                   "cocosui/animationbuttonpressed.png");
+        Button* button_LeftCenter =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_LeftCenter);
-        
+
         RelativeLayoutParameter* rp_LeftCenter = RelativeLayoutParameter::create();
         rp_LeftCenter->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_LEFT_CENTER_VERTICAL);
         button_LeftCenter->setLayoutParameter(rp_LeftCenter);
-        
-        
+
         // center
-        Button* buttonCenter = Button::create("cocosui/animationbuttonnormal.png",
-                                              "cocosui/animationbuttonpressed.png");
+        Button* buttonCenter =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(buttonCenter);
-        
+
         RelativeLayoutParameter* rpCenter = RelativeLayoutParameter::create();
         rpCenter->setAlign(RelativeLayoutParameter::RelativeAlign::CENTER_IN_PARENT);
         buttonCenter->setLayoutParameter(rpCenter);
-        
-        
+
         // right center
-        Button* button_RightCenter = Button::create("cocosui/animationbuttonnormal.png",
-                                                    "cocosui/animationbuttonpressed.png");
+        Button* button_RightCenter =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_RightCenter);
-        
+
         RelativeLayoutParameter* rp_RightCenter = RelativeLayoutParameter::create();
         rp_RightCenter->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_RIGHT_CENTER_VERTICAL);
         button_RightCenter->setLayoutParameter(rp_RightCenter);
-        
-        
+
         // left bottom
-        Button* button_LeftBottom = Button::create("cocosui/animationbuttonnormal.png",
-                                                   "cocosui/animationbuttonpressed.png");
+        Button* button_LeftBottom =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_LeftBottom);
-        
+
         RelativeLayoutParameter* rp_LeftBottom = RelativeLayoutParameter::create();
         rp_LeftBottom->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_LEFT_BOTTOM);
         button_LeftBottom->setLayoutParameter(rp_LeftBottom);
-        
-        
+
         // bottom center
-        Button* button_BottomCenter = Button::create("cocosui/animationbuttonnormal.png",
-                                                     "cocosui/animationbuttonpressed.png");
+        Button* button_BottomCenter =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_BottomCenter);
-        
+
         RelativeLayoutParameter* rp_BottomCenter = RelativeLayoutParameter::create();
         rp_BottomCenter->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_BOTTOM_CENTER_HORIZONTAL);
         button_BottomCenter->setLayoutParameter(rp_BottomCenter);
-        
-        
+
         // right bottom
-        Button* button_RightBottom = Button::create("cocosui/animationbuttonnormal.png",
-                                                    "cocosui/animationbuttonpressed.png");
+        Button* button_RightBottom =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         layout->addChild(button_RightBottom);
-        
+
         RelativeLayoutParameter* rp_RightBottom = RelativeLayoutParameter::create();
         rp_RightBottom->setAlign(RelativeLayoutParameter::RelativeAlign::PARENT_RIGHT_BOTTOM);
         button_RightBottom->setLayoutParameter(rp_RightBottom);
-        
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UILayoutTest_Layout_Relative_Location
 
-UILayoutTest_Layout_Relative_Location::UILayoutTest_Layout_Relative_Location()
-{
-}
+UILayoutTest_Layout_Relative_Location::UILayoutTest_Layout_Relative_Location() {}
 
-UILayoutTest_Layout_Relative_Location::~UILayoutTest_Layout_Relative_Location()
-{
-}
+UILayoutTest_Layout_Relative_Location::~UILayoutTest_Layout_Relative_Location() {}
 
 bool UILayoutTest_Layout_Relative_Location::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout Relative Location", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setLayoutType(Layout::Type::RELATIVE);
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                (backgroundSize.width - layout->getContentSize().width) / 2.0f,
-                                (widgetSize.height - backgroundSize.height) / 2.0f +
-                                (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                 (widgetSize.height - backgroundSize.height) / 2.0f +
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         // center
         ImageView* imageView_Center = ImageView::create("cocosui/scrollviewbg.png");
         layout->addChild(imageView_Center);
-        
+
         RelativeLayoutParameter* rp_Center = RelativeLayoutParameter::create();
         rp_Center->setRelativeName("rp_Center");
         rp_Center->setAlign(RelativeLayoutParameter::RelativeAlign::CENTER_IN_PARENT);
         imageView_Center->setLayoutParameter(rp_Center);
-        
-        
+
         // above center
         ImageView* imageView_AboveCenter = ImageView::create("cocosui/switch-mask.png");
         layout->addChild(imageView_AboveCenter);
-        
+
         RelativeLayoutParameter* rp_AboveCenter = RelativeLayoutParameter::create();
         rp_AboveCenter->setRelativeToWidgetName("rp_Center");
         rp_AboveCenter->setAlign(RelativeLayoutParameter::RelativeAlign::LOCATION_ABOVE_CENTER);
         imageView_AboveCenter->setLayoutParameter(rp_AboveCenter);
-        
-        
+
         // below center
         ImageView* imageView_BelowCenter = ImageView::create("cocosui/switch-mask.png");
         layout->addChild(imageView_BelowCenter);
-        
+
         RelativeLayoutParameter* rp_BelowCenter = RelativeLayoutParameter::create();
         rp_BelowCenter->setRelativeToWidgetName("rp_Center");
         rp_BelowCenter->setAlign(RelativeLayoutParameter::RelativeAlign::LOCATION_BELOW_CENTER);
         imageView_BelowCenter->setLayoutParameter(rp_BelowCenter);
-        
-        
+
         // left center
         ImageView* imageView_LeftCenter = ImageView::create("cocosui/switch-mask.png");
         layout->addChild(imageView_LeftCenter);
-        
+
         RelativeLayoutParameter* rp_LeftCenter = RelativeLayoutParameter::create();
         rp_LeftCenter->setRelativeToWidgetName("rp_Center");
         rp_LeftCenter->setAlign(RelativeLayoutParameter::RelativeAlign::LOCATION_LEFT_OF_CENTER);
         imageView_LeftCenter->setLayoutParameter(rp_LeftCenter);
-        
-        
-        
+
         // right center
         ImageView* imageView_RightCenter = ImageView::create("cocosui/switch-mask.png");
         layout->addChild(imageView_RightCenter);
-        
+
         RelativeLayoutParameter* rp_RightCenter = RelativeLayoutParameter::create();
         rp_RightCenter->setRelativeToWidgetName("rp_Center");
         rp_RightCenter->setAlign(RelativeLayoutParameter::RelativeAlign::LOCATION_RIGHT_OF_CENTER);
         imageView_RightCenter->setLayoutParameter(rp_RightCenter);
-        
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UILayoutTest_Layout_Relative_Location
 
-UILayoutTest_Layout_Scaled_Widget::UILayoutTest_Layout_Scaled_Widget()
-{
-}
+UILayoutTest_Layout_Scaled_Widget::UILayoutTest_Layout_Scaled_Widget() {}
 
-UILayoutTest_Layout_Scaled_Widget::~UILayoutTest_Layout_Scaled_Widget()
-{
-}
+UILayoutTest_Layout_Scaled_Widget::~UILayoutTest_Layout_Scaled_Widget() {}
 
 bool UILayoutTest_Layout_Scaled_Widget::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("Layout Scaled Widget", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the layout
         Layout* layout = Layout::create();
         layout->setLayoutType(Layout::Type::HORIZONTAL);
         layout->setContentSize(Size(280, 150));
         Size backgroundSize = background->getContentSize();
         layout->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                 (backgroundSize.width - layout->getContentSize().width) / 2.0f,
+                                     (backgroundSize.width - layout->getContentSize().width) / 2.0f,
                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                 (backgroundSize.height - layout->getContentSize().height) / 2.0f));
+                                     (backgroundSize.height - layout->getContentSize().height) / 2.0f));
         _uiLayer->addChild(layout);
-        
+
         ImageView* imageView_Center1 = ImageView::create("cocosui/scrollviewbg.png");
         imageView_Center1->setScale(0.5);
         layout->addChild(imageView_Center1);
-        
+
         ImageView* imageView_Center2 = ImageView::create("cocosui/scrollviewbg.png");
         imageView_Center2->setScale(1.2);
         layout->addChild(imageView_Center2);
-        
+
         ImageView* imageView_Center3 = ImageView::create("cocosui/scrollviewbg.png");
         imageView_Center3->setScale(0.8);
         layout->addChild(imageView_Center3);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
-
 bool UILayoutComponentTest::init()
 {
     if (UIScene::init())
@@ -823,7 +768,7 @@ bool UILayoutComponentTest::init()
 
         Button* button = Button::create("cocosui/animationbuttonnormal.png");
         CCLOG("content size should be greater than 0:  width = %f, height = %f", button->getContentSize().width,
-            button->getContentSize().height);
+              button->getContentSize().height);
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         button->addTouchEventListener(CC_CALLBACK_2(UILayoutComponentTest::touchEvent, this));
         button->setZoomScale(0.4f);
@@ -835,7 +780,7 @@ bool UILayoutComponentTest::init()
     return false;
 }
 
-void UILayoutComponentTest::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UILayoutComponentTest::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -846,16 +791,16 @@ void UILayoutComponentTest::touchEvent(Ref *pSender, Widget::TouchEventType type
         break;
 
     case Widget::TouchEventType::ENDED:
-        {
-            Size widgetSize = _widget->getContentSize();
-            Size layerSize = _baseLayer->getContentSize();
-            if (layerSize.width == widgetSize.width && layerSize.height == widgetSize.height)
-                _baseLayer->setContentSize(Size(200, 200));
-            else
-                _baseLayer->setContentSize(widgetSize);
-            Helper::doLayout(_baseLayer);
-         }
-        break;
+    {
+        Size widgetSize = _widget->getContentSize();
+        Size layerSize  = _baseLayer->getContentSize();
+        if (layerSize.width == widgetSize.width && layerSize.height == widgetSize.height)
+            _baseLayer->setContentSize(Size(200, 200));
+        else
+            _baseLayer->setContentSize(widgetSize);
+        Helper::doLayout(_baseLayer);
+    }
+    break;
 
     case Widget::TouchEventType::CANCELED:
         break;
@@ -869,25 +814,25 @@ bool UILayoutComponent_Berth_Test::init()
 {
     if (UILayoutComponentTest::init())
     {
-        Sprite* leftTopSprite = Sprite::create("cocosui/CloseSelected.png");
+        Sprite* leftTopSprite    = Sprite::create("cocosui/CloseSelected.png");
         LayoutComponent* leftTop = LayoutComponent::bindLayoutComponent(leftTopSprite);
         leftTop->setHorizontalEdge(LayoutComponent::HorizontalEdge::Left);
         leftTop->setVerticalEdge(LayoutComponent::VerticalEdge::Top);
         _baseLayer->addChild(leftTopSprite);
 
-        Sprite* leftBottomSprite = Sprite::create("cocosui/CloseSelected.png");
+        Sprite* leftBottomSprite    = Sprite::create("cocosui/CloseSelected.png");
         LayoutComponent* leftBottom = LayoutComponent::bindLayoutComponent(leftBottomSprite);
         leftBottom->setHorizontalEdge(LayoutComponent::HorizontalEdge::Left);
         leftBottom->setVerticalEdge(LayoutComponent::VerticalEdge::Bottom);
         _baseLayer->addChild(leftBottomSprite);
 
-        Sprite* rightTopSprite = Sprite::create("cocosui/CloseSelected.png");
+        Sprite* rightTopSprite    = Sprite::create("cocosui/CloseSelected.png");
         LayoutComponent* rightTop = LayoutComponent::bindLayoutComponent(rightTopSprite);
         rightTop->setHorizontalEdge(LayoutComponent::HorizontalEdge::Right);
         rightTop->setVerticalEdge(LayoutComponent::VerticalEdge::Top);
         _baseLayer->addChild(rightTopSprite);
 
-        Sprite* rightBottomSprite = Sprite::create("cocosui/CloseSelected.png");
+        Sprite* rightBottomSprite    = Sprite::create("cocosui/CloseSelected.png");
         LayoutComponent* rightBottom = LayoutComponent::bindLayoutComponent(rightBottomSprite);
         rightBottom->setHorizontalEdge(LayoutComponent::HorizontalEdge::Right);
         rightBottom->setVerticalEdge(LayoutComponent::VerticalEdge::Bottom);
@@ -970,19 +915,18 @@ bool UILayoutTest_Issue19890::init()
 
     auto label = Text::create("Issue 19890", "fonts/Marker Felt.ttf", 32);
     label->setAnchorPoint(Vec2(0.5f, -1.0f));
-    label->setPosition(Vec2(widgetSize.width / 2.0f,
-        widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
+    label->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
     _uiLayer->addChild(label);
 
     Text* alert = Text::create("3 panels should be completely visible", "fonts/Marker Felt.ttf", 20);
     alert->setColor(Color3B(159, 168, 176));
-    alert->setPosition(Vec2(widgetSize.width / 2.0f,
-        widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+    alert->setPosition(
+        Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
     _uiLayer->addChild(alert);
 
     Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
 
-    Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
+    Layout* background        = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
     const Size backgroundSize = background->getContentSize();
 
     auto panel = ui::Layout::create();
@@ -992,7 +936,7 @@ bool UILayoutTest_Issue19890::init()
     panel->setPosition(backgroundSize / 2);
     panel->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     panel->setClippingEnabled(true);
-    panel->setContentSize(backgroundSize); // from the left to the screen end
+    panel->setContentSize(backgroundSize);  // from the left to the screen end
     background->addChild(panel);
 
     auto panel2 = ui::Layout::create();
@@ -1002,7 +946,7 @@ bool UILayoutTest_Issue19890::init()
     panel2->setPosition(panel->getContentSize() / 2);
     panel2->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     panel2->setClippingEnabled(true);
-    panel2->setContentSize(panel->getContentSize() / 2); // from the left to the screen end
+    panel2->setContentSize(panel->getContentSize() / 2);  // from the left to the screen end
     panel->addChild(panel2);
 
     auto panel3 = ui::Layout::create();
@@ -1012,7 +956,7 @@ bool UILayoutTest_Issue19890::init()
     panel3->setPosition(panel2->getContentSize() / 2);
     panel3->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     panel3->setClippingEnabled(true);
-    panel3->setContentSize(panel2->getContentSize() / 2); // from the left to the screen end
+    panel3->setContentSize(panel2->getContentSize() / 2);  // from the left to the screen end
     panel2->addChild(panel3);
 
     return true;
@@ -1023,51 +967,53 @@ bool UILayout_Clipping_Test::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("Left & Right must look same", "fonts/Marker Felt.ttf", 30 );
+        Text* alert = Text::create("Left & Right must look same", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+
         _uiLayer->addChild(alert);
-        
+
         Layout* layout1 = Layout::create();
         layout1->setClippingEnabled(true);
-        layout1->setContentSize(Size(widgetSize.width/4, widgetSize.height/3));
+        layout1->setContentSize(Size(widgetSize.width / 4, widgetSize.height / 3));
         layout1->setClippingType(cocos2d::ui::Layout::ClippingType::SCISSOR);
-        layout1->setPosition(Vec2(widgetSize.width / 4.0f, widgetSize.height / 2.0f ));
+        layout1->setPosition(Vec2(widgetSize.width / 4.0f, widgetSize.height / 2.0f));
         layout1->setAnchorPoint(Vec2(0.5, 0.5));
         _uiLayer->addChild(layout1);
-        
+
         Layout* sublayout1 = Layout::create();
         sublayout1->setClippingEnabled(true);
         sublayout1->setBackGroundImage("cocosui/Hello.png");
-        sublayout1->setContentSize(Size(widgetSize.width/6, widgetSize.width/2));
+        sublayout1->setContentSize(Size(widgetSize.width / 6, widgetSize.width / 2));
         sublayout1->setClippingType(cocos2d::ui::Layout::ClippingType::STENCIL);
-        sublayout1->setPosition(Vec2(widgetSize.width / 8.0f + widgetSize.width / 16.0f, widgetSize.height / 6.0f ));
+        sublayout1->setPosition(Vec2(widgetSize.width / 8.0f + widgetSize.width / 16.0f, widgetSize.height / 6.0f));
         sublayout1->setAnchorPoint(Vec2(0.5, 0.5));
-        sublayout1->runAction(RepeatForever::create(Sequence::createWithTwoActions(MoveBy::create(2, Vec2(-widgetSize.width/8, 0)), MoveBy::create(2, Vec2(widgetSize.width/8, 0)))));
+        sublayout1->runAction(RepeatForever::create(Sequence::createWithTwoActions(
+            MoveBy::create(2, Vec2(-widgetSize.width / 8, 0)), MoveBy::create(2, Vec2(widgetSize.width / 8, 0)))));
         layout1->addChild(sublayout1);
-        
+
         Layout* layout2 = Layout::create();
         layout2->setClippingEnabled(true);
-        layout2->setContentSize(Size(widgetSize.width/4, widgetSize.height/3));
+        layout2->setContentSize(Size(widgetSize.width / 4, widgetSize.height / 3));
         layout2->setClippingType(cocos2d::ui::Layout::ClippingType::SCISSOR);
-        layout2->setPosition(Vec2(widgetSize.width *3.0f / 4.0f, widgetSize.height / 2.0f ));
+        layout2->setPosition(Vec2(widgetSize.width * 3.0f / 4.0f, widgetSize.height / 2.0f));
         layout2->setAnchorPoint(Vec2(0.5, 0.5));
         _uiLayer->addChild(layout2);
-        
+
         Layout* sublayout2 = Layout::create();
         sublayout2->setClippingEnabled(true);
         sublayout2->setBackGroundImage("cocosui/Hello.png");
-        sublayout2->setContentSize(Size(widgetSize.width/6, widgetSize.width/2));
+        sublayout2->setContentSize(Size(widgetSize.width / 6, widgetSize.width / 2));
         sublayout2->setClippingType(cocos2d::ui::Layout::ClippingType::SCISSOR);
-        sublayout2->setPosition(Vec2(widgetSize.width / 8.0f + widgetSize.width / 16.0f, widgetSize.height / 6.0f ));
+        sublayout2->setPosition(Vec2(widgetSize.width / 8.0f + widgetSize.width / 16.0f, widgetSize.height / 6.0f));
         sublayout2->setAnchorPoint(Vec2(0.5, 0.5));
-        sublayout2->runAction(RepeatForever::create(Sequence::createWithTwoActions(MoveBy::create(2, Vec2(-widgetSize.width/8, 0)), MoveBy::create(2, Vec2(widgetSize.width/8, 0)))));
+        sublayout2->runAction(RepeatForever::create(Sequence::createWithTwoActions(
+            MoveBy::create(2, Vec2(-widgetSize.width / 8, 0)), MoveBy::create(2, Vec2(widgetSize.width / 8, 0)))));
         layout2->addChild(sublayout2);
-        
+
         return true;
     }
     return false;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
index 47389837d10d..077dc1e6738e 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,7 +36,7 @@ class UILayoutTest : public UIScene
     UILayoutTest();
     ~UILayoutTest();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest);
 };
 
@@ -46,7 +46,7 @@ class UILayoutTest_Color : public UIScene
     UILayoutTest_Color();
     ~UILayoutTest_Color();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Color);
 };
 
@@ -56,7 +56,7 @@ class UILayoutTest_Gradient : public UIScene
     UILayoutTest_Gradient();
     ~UILayoutTest_Gradient();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Gradient);
 };
 
@@ -66,10 +66,11 @@ class UILayoutTest_BackGroundImage : public UIScene
     UILayoutTest_BackGroundImage();
     ~UILayoutTest_BackGroundImage();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_BackGroundImage);
 
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::Layout* _layout;
 };
@@ -80,7 +81,7 @@ class UILayoutTest_BackGroundImage_Scale9 : public UIScene
     UILayoutTest_BackGroundImage_Scale9();
     ~UILayoutTest_BackGroundImage_Scale9();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_BackGroundImage_Scale9);
 };
 
@@ -90,7 +91,7 @@ class UILayoutTest_Layout_Linear_Vertical : public UIScene
     UILayoutTest_Layout_Linear_Vertical();
     ~UILayoutTest_Layout_Linear_Vertical();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Layout_Linear_Vertical);
 };
 
@@ -100,7 +101,7 @@ class UILayoutTest_Layout_Linear_Horizontal : public UIScene
     UILayoutTest_Layout_Linear_Horizontal();
     ~UILayoutTest_Layout_Linear_Horizontal();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Layout_Linear_Horizontal);
 };
 
@@ -110,7 +111,7 @@ class UILayoutTest_Layout_Relative_Align_Parent : public UIScene
     UILayoutTest_Layout_Relative_Align_Parent();
     ~UILayoutTest_Layout_Relative_Align_Parent();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Layout_Relative_Align_Parent);
 };
 
@@ -120,7 +121,7 @@ class UILayoutTest_Layout_Relative_Location : public UIScene
     UILayoutTest_Layout_Relative_Location();
     ~UILayoutTest_Layout_Relative_Location();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Layout_Relative_Location);
 };
 
@@ -130,7 +131,7 @@ class UILayoutTest_Layout_Scaled_Widget : public UIScene
     UILayoutTest_Layout_Scaled_Widget();
     ~UILayoutTest_Layout_Scaled_Widget();
     virtual bool init() override;
-    
+
     CREATE_FUNC(UILayoutTest_Layout_Scaled_Widget);
 };
 
@@ -141,9 +142,9 @@ class UILayoutComponentTest : public UIScene
 
     virtual bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
+
 protected:
     cocos2d::LayerColor* _baseLayer;
-    
 };
 
 class UILayoutComponent_Berth_Test : public UILayoutComponentTest
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
index 02ea37b7eff3..b6286f3a43d2 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,48 +45,43 @@ UIListViewTests::UIListViewTests()
 
 // UIListViewTest_Vertical
 
-UIListViewTest_Vertical::UIListViewTest_Vertical()
-{
-}
+UIListViewTest_Vertical::UIListViewTest_Vertical() {}
 
-UIListViewTest_Vertical::~UIListViewTest_Vertical()
-{
-}
+UIListViewTest_Vertical::~UIListViewTest_Vertical() {}
 
 bool UIListViewTest_Vertical::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
-        _displayValueLabel = Text::create("There are 50 items, but we only create 5 templates", "fonts/Marker Felt.ttf", 20);
+
+        _displayValueLabel =
+            Text::create("There are 50 items, but we only create 5 templates", "fonts/Marker Felt.ttf", 20);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f + 30));
+        _displayValueLabel->setPosition(
+            Vec2(widgetSize.width / 2.0f,
+                 widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f + 30));
         _uiLayer->addChild(_displayValueLabel);
-        
-        
+
         Text* alert = Text::create("ListView vertical", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
-        Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
+
+        Layout* background  = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
         Size backgroundSize = background->getContentSize();
-        
-        
+
         // create list view ex data
-       
+
         for (int i = 0; i < _totalCount; ++i)
         {
             std::string ccstr = StringUtils::format("listview_item_%d", i);
             _array.push_back(ccstr);
         }
-        
-        
+
         // Create the list view ex
         _listView = ListView::create();
         // set list view ex direction
@@ -96,43 +91,45 @@ bool UIListViewTest_Vertical::init()
         _listView->setGlobalZOrder(200);
         _listView->setBackGroundImageScale9Enabled(true);
         _listView->setContentSize(Size(240.0f, 130.0f));
-		_listView->setPosition(Vec2((widgetSize - _listView->getContentSize()) / 2.0f));
-        _listView->addEventListener((ui::ListView::ccListViewCallback)CC_CALLBACK_2(UIListViewTest_Vertical::selectedItemEvent, this));
-        _listView->addEventListener((ui::ListView::ccScrollViewCallback)CC_CALLBACK_2(UIListViewTest_Vertical::selectedItemEventScrollView,this));
-		_listView->setScrollBarPositionFromCorner(Vec2(7, 7));
+        _listView->setPosition(Vec2((widgetSize - _listView->getContentSize()) / 2.0f));
+        _listView->addEventListener(
+            (ui::ListView::ccListViewCallback)CC_CALLBACK_2(UIListViewTest_Vertical::selectedItemEvent, this));
+        _listView->addEventListener((ui::ListView::ccScrollViewCallback)CC_CALLBACK_2(
+            UIListViewTest_Vertical::selectedItemEventScrollView, this));
+        _listView->setScrollBarPositionFromCorner(Vec2(7, 7));
         _uiLayer->addChild(_listView);
-        
-        
+
         // create model
         Button* default_button = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
         default_button->setName("Title Button");
-        
+
         Layout* default_item = Layout::create();
         default_item->setTouchEnabled(true);
         default_item->setContentSize(default_button->getContentSize());
-		default_button->setPosition(Vec2(default_item->getContentSize() / 2.0f));
+        default_button->setPosition(Vec2(default_item->getContentSize() / 2.0f));
         default_item->addChild(default_button);
-        
+
         auto clippingNode = ClippingNode::create();
-        auto sprite = Sprite::create("cocosui/clippingHead.jpg");
+        auto sprite       = Sprite::create("cocosui/clippingHead.jpg");
         clippingNode->addChild(sprite);
         auto stencil = Sprite::create("cocosui/clippingStencil.jpg");
         clippingNode->setStencil(stencil);
         auto custom_item_contentSize = default_item->getContentSize();
-        clippingNode->setPosition(sprite->getContentSize().width/2,
-                                  custom_item_contentSize.height/2);
+        clippingNode->setPosition(sprite->getContentSize().width / 2, custom_item_contentSize.height / 2);
         clippingNode->setScale(0.5);
         default_item->addChild(clippingNode);
-        
+
         // set model
         _listView->setItemModel(default_item);
-        
+
         // set all items layout gravity
         _listView->setGravity(ListView::Gravity::CENTER_VERTICAL);
-        
-        //initial the data
-        for (int i = 0; i < _totalCount; ++i) {
-            if (i < _spawnCount) {
+
+        // initial the data
+        for (int i = 0; i < _totalCount; ++i)
+        {
+            if (i < _spawnCount)
+            {
                 Widget* item = default_item->clone();
                 item->setTag(i);
                 Button* btn = (Button*)item->getChildByName("Title Button");
@@ -140,21 +137,20 @@ bool UIListViewTest_Vertical::init()
                 _listView->pushBackCustomItem(item);
             }
         }
-        
+
         // set items margin
         float spacing = 4;
         _listView->setItemsMargin(spacing);
-        _itemTemplateHeight = default_item->getContentSize().height;
+        _itemTemplateHeight    = default_item->getContentSize().height;
         this->_reuseItemOffset = (_itemTemplateHeight + spacing) * _spawnCount;
 
-        //update listview data
+        // update listview data
         this->scheduleUpdate();
-        
+
         _listView->forceDoLayout();
         float totalHeight = _itemTemplateHeight * _totalCount + (_totalCount - 1) * spacing;
         _listView->setInnerContainerSize(Size(_listView->getInnerContainerSize().width, totalHeight));
         _listView->jumpToTop();
-        
 
         // Show the indexes of items on each boundary.
         {
@@ -172,18 +168,18 @@ bool UIListViewTest_Vertical::init()
             _indexLabels[2]->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
             _indexLabels[2]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, -position));
             _uiLayer->addChild(_indexLabels[2]);
-            
+
             // Callback
             _listView->ScrollView::addEventListener([this](Ref* ref, ScrollView::EventType eventType) {
                 ListView* listView = dynamic_cast<ListView*>(ref);
-                if(listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
+                if (listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
                 {
                     return;
                 }
                 auto bottom = listView->getBottommostItemInCurrentView();
                 auto center = listView->getCenterItemInCurrentView();
-                auto top = listView->getTopmostItemInCurrentView();
-                
+                auto top    = listView->getTopmostItemInCurrentView();
+
                 _indexLabels[0]->setString(StringUtils::format("Top index=%zd", listView->getIndex(top)));
                 _indexLabels[1]->setString(StringUtils::format("Center\nindex=%zd", listView->getIndex(center)));
                 _indexLabels[2]->setString(StringUtils::format("Bottom index=%zd", listView->getIndex(bottom)));
@@ -192,22 +188,22 @@ bool UIListViewTest_Vertical::init()
 
         return true;
     }
-    
+
     return false;
 }
 
-float UIListViewTest_Vertical::getItemPositionYInView(cocos2d::ui::Widget *item) const
+float UIListViewTest_Vertical::getItemPositionYInView(cocos2d::ui::Widget* item) const
 {
     auto worldPos = item->getParent()->convertToWorldSpaceAR(item->getPosition());
-    auto viewPos = this->_listView->convertToNodeSpaceAR(worldPos);
+    auto viewPos  = this->_listView->convertToNodeSpaceAR(worldPos);
     return viewPos.y;
 }
 
 void UIListViewTest_Vertical::updateItem(int itemID, int templateID)
 {
     auto itemTemplate = _listView->getItems().at(templateID);
-    Button* btn = (Button*)itemTemplate->getChildByName("Title Button");
-    //If you have  the item ID and templateID, you could fill in the data here
+    Button* btn       = (Button*)itemTemplate->getChildByName("Title Button");
+    // If you have  the item ID and templateID, you could fill in the data here
     itemTemplate->setTag(itemID);
     btn->setTitleText(_array.at(itemID));
 }
@@ -215,33 +211,38 @@ void UIListViewTest_Vertical::updateItem(int itemID, int templateID)
 void UIListViewTest_Vertical::update(float dt)
 {
     this->_updateTimer += dt;
-    if (this->_updateTimer < this->_updateInterval) {
+    if (this->_updateTimer < this->_updateInterval)
+    {
         return;
     }
 
     float totalHeight = _itemTemplateHeight * _totalCount + (_totalCount - 1) * 4;
 
     auto listViewHeight = _listView->getContentSize().height;
-    
+
     this->_updateTimer = 0;
-    auto isDown = this->_listView->getInnerContainerPosition().y < this->_lastContentPosY;
-    auto items = _listView->getItems();
-    
-    for (int i = 0; i < _spawnCount && i < _totalCount; ++i) {
-        auto item = items.at(i);
+    auto isDown        = this->_listView->getInnerContainerPosition().y < this->_lastContentPosY;
+    auto items         = _listView->getItems();
+
+    for (int i = 0; i < _spawnCount && i < _totalCount; ++i)
+    {
+        auto item    = items.at(i);
         auto itemPos = this->getItemPositionYInView(item);
-        if (isDown) {
-            if (itemPos < -_bufferZone && item->getPosition().y + _reuseItemOffset < totalHeight) {
+        if (isDown)
+        {
+            if (itemPos < -_bufferZone && item->getPosition().y + _reuseItemOffset < totalHeight)
+            {
                 int itemID = item->getTag() - (int)items.size();
                 item->setPositionY(item->getPositionY() + _reuseItemOffset);
                 CCLOG("itemPos = %f, itemID = %d, templateID = %d", itemPos, itemID, i);
                 this->updateItem(itemID, i);
             }
         }
-        else {
-            if (itemPos > _bufferZone + listViewHeight &&
-                item->getPosition().y - _reuseItemOffset >= 0) {
-                
+        else
+        {
+            if (itemPos > _bufferZone + listViewHeight && item->getPosition().y - _reuseItemOffset >= 0)
+            {
+
                 item->setPositionY(item->getPositionY() - _reuseItemOffset);
                 int itemID = item->getTag() + (int)items.size();
                 CCLOG("itemPos = %f, itemID = %d, templateID = %d", itemPos, itemID, i);
@@ -249,97 +250,88 @@ void UIListViewTest_Vertical::update(float dt)
             }
         }
     }
-    //update ListView Items
+    // update ListView Items
     this->_lastContentPosY = this->_listView->getInnerContainer()->getPosition().y;
 }
 
-void UIListViewTest_Vertical::selectedItemEvent(Ref *pSender, ListView::EventType type)
+void UIListViewTest_Vertical::selectedItemEvent(Ref* pSender, ListView::EventType type)
 {
     switch (type)
     {
-        case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_START:
-        {
-            ListView* listView = static_cast<ListView*>(pSender);
-            auto item = listView->getItem(listView->getCurSelectedIndex());
-            log("select child start index = %d", item->getTag());
-            break;
-        }
-        case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
-        {
-            ListView* listView = static_cast<ListView*>(pSender);
-            auto item = listView->getItem(listView->getCurSelectedIndex());
-            log("select child end index = %d", item->getTag());
-            break;
-        }
-        default:
-            break;
+    case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_START:
+    {
+        ListView* listView = static_cast<ListView*>(pSender);
+        auto item          = listView->getItem(listView->getCurSelectedIndex());
+        log("select child start index = %d", item->getTag());
+        break;
+    }
+    case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
+    {
+        ListView* listView = static_cast<ListView*>(pSender);
+        auto item          = listView->getItem(listView->getCurSelectedIndex());
+        log("select child end index = %d", item->getTag());
+        break;
+    }
+    default:
+        break;
     }
 }
 
 void UIListViewTest_Vertical::selectedItemEventScrollView(Ref* pSender, ui::ScrollView::EventType type)
 {
-    switch (type) {
-        case ui::ScrollView::EventType::SCROLL_TO_BOTTOM:
-            CCLOG("SCROLL_TO_BOTTOM");
-            break;
-        case ui::ScrollView::EventType::SCROLL_TO_TOP:
-            CCLOG("SCROLL_TO_TOP");
-            break;
-        default:
-            break;
+    switch (type)
+    {
+    case ui::ScrollView::EventType::SCROLL_TO_BOTTOM:
+        CCLOG("SCROLL_TO_BOTTOM");
+        break;
+    case ui::ScrollView::EventType::SCROLL_TO_TOP:
+        CCLOG("SCROLL_TO_TOP");
+        break;
+    default:
+        break;
     }
 }
 
-
 // UIListViewTest_Horizontal
 
-UIListViewTest_Horizontal::UIListViewTest_Horizontal()
-{
-}
+UIListViewTest_Horizontal::UIListViewTest_Horizontal() {}
 
-UIListViewTest_Horizontal::~UIListViewTest_Horizontal()
-{
-}
+UIListViewTest_Horizontal::~UIListViewTest_Horizontal() {}
 
 bool UIListViewTest_Horizontal::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
-        _displayValueLabel = Text::create("There are 50 items, but we only create 5 templates",
-                                          "fonts/Marker Felt.ttf",
-                                          20);
-        
+
+        _displayValueLabel =
+            Text::create("There are 50 items, but we only create 5 templates", "fonts/Marker Felt.ttf", 20);
+
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f
-                                             + _displayValueLabel->getContentSize().height * 2 + 20));
-        
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 2 + 20));
+
         _uiLayer->addChild(_displayValueLabel);
-        
-        
+
         Text* alert = Text::create("ListView horizontal", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
-        Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
+
+        Layout* background  = static_cast<Layout*>(root->getChildByName("background_Panel"));
         Size backgroundSize = background->getContentSize();
-        
-        
+
         // create listview  data
-        //The data is usually fetch from the server
+        // The data is usually fetch from the server
         for (int i = 0; i < _totalCount; ++i)
         {
             std::string ccstr = StringUtils::format("listview_item_%d", i);
             _array.push_back(ccstr);
         }
-        
-        
+
         // Create the list view ex
         _listView = ListView::create();
         // set list view ex direction
@@ -350,35 +342,36 @@ bool UIListViewTest_Horizontal::init()
         _listView->setBackGroundImageScale9Enabled(true);
         _listView->setContentSize(Size(240.0f, 130.0f));
         _listView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                    (backgroundSize.width - _listView->getContentSize().width) / 2.0f,
+                                        (backgroundSize.width - _listView->getContentSize().width) / 2.0f,
                                     (widgetSize.height - backgroundSize.height) / 2.0f +
-                                    (backgroundSize.height - _listView->getContentSize().height) / 2.0f));
-        _listView->addEventListener((ui::ListView::ccListViewCallback)CC_CALLBACK_2(UIListViewTest_Horizontal::selectedItemEvent, this));
-		_listView->setScrollBarPositionFromCorner(Vec2(7, 7));
+                                        (backgroundSize.height - _listView->getContentSize().height) / 2.0f));
+        _listView->addEventListener(
+            (ui::ListView::ccListViewCallback)CC_CALLBACK_2(UIListViewTest_Horizontal::selectedItemEvent, this));
+        _listView->setScrollBarPositionFromCorner(Vec2(7, 7));
         _uiLayer->addChild(_listView);
-        
-        
+
         // create model
-        Button* default_button = Button::create("cocosui/backtotoppressed.png",
-                                                "cocosui/backtotopnormal.png");
+        Button* default_button = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
         default_button->setName("Title Button");
-        
-        Layout *default_item = Layout::create();
+
+        Layout* default_item = Layout::create();
         default_item->setTouchEnabled(true);
         default_item->setContentSize(default_button->getContentSize());
-        default_button->setPosition(Vec2(default_item->getContentSize().width / 2.0f,
-                                         default_item->getContentSize().height / 2.0f));
+        default_button->setPosition(
+            Vec2(default_item->getContentSize().width / 2.0f, default_item->getContentSize().height / 2.0f));
         default_item->addChild(default_button);
-        
+
         // set model
         _listView->setItemModel(default_item);
-        
+
         // set all items layout gravity
         _listView->setGravity(ListView::Gravity::CENTER_VERTICAL);
-        
-        //initial the data
-        for (int i = 0; i < _totalCount; ++i) {
-            if (i < _spawnCount) {
+
+        // initial the data
+        for (int i = 0; i < _totalCount; ++i)
+        {
+            if (i < _spawnCount)
+            {
                 Widget* item = default_item->clone();
                 item->setTag(i);
                 Button* btn = (Button*)item->getChildByName("Title Button");
@@ -386,38 +379,38 @@ bool UIListViewTest_Horizontal::init()
                 _listView->pushBackCustomItem(item);
             }
         }
-      
+
         // set items margin
         float spacing = 4;
         _listView->setItemsMargin(spacing);
-        _itemTemplateWidth = default_item->getContentSize().width;
+        _itemTemplateWidth     = default_item->getContentSize().width;
         this->_reuseItemOffset = (_itemTemplateWidth + spacing) * _spawnCount;
-        
+
         _listView->forceDoLayout();
         float totalWidth = _itemTemplateWidth * _totalCount + (_totalCount - 1) * 4;
         _listView->getInnerContainer()->setContentSize(Size(totalWidth, _listView->getInnerContainerSize().height));
-        
-        //update listview data
+
+        // update listview data
         this->scheduleUpdate();
-        
+
         return true;
     }
-    
+
     return false;
 }
 
-float UIListViewTest_Horizontal::getItemPositionXInView(cocos2d::ui::Widget *item) const
+float UIListViewTest_Horizontal::getItemPositionXInView(cocos2d::ui::Widget* item) const
 {
     auto worldPos = item->getParent()->convertToWorldSpaceAR(item->getPosition());
-    auto viewPos = this->_listView->convertToNodeSpaceAR(worldPos);
+    auto viewPos  = this->_listView->convertToNodeSpaceAR(worldPos);
     return viewPos.x;
 }
 
 void UIListViewTest_Horizontal::updateItem(int itemID, int templateID)
 {
     auto itemTemplate = _listView->getItems().at(templateID);
-    Button* btn = (Button*)itemTemplate->getChildByName("Title Button");
-    //If you have  the item ID and templateID, you could fill in the data here
+    Button* btn       = (Button*)itemTemplate->getChildByName("Title Button");
+    // If you have  the item ID and templateID, you could fill in the data here
     itemTemplate->setTag(itemID);
     btn->setTitleText(_array.at(itemID));
 }
@@ -425,30 +418,36 @@ void UIListViewTest_Horizontal::updateItem(int itemID, int templateID)
 void UIListViewTest_Horizontal::update(float dt)
 {
     this->_updateTimer += dt;
-    if (this->_updateTimer < this->_updateInterval) {
+    if (this->_updateTimer < this->_updateInterval)
+    {
         return;
     }
     float totalWidth = _itemTemplateWidth * _totalCount + (_totalCount - 1) * 4;
-    
+
     this->_updateTimer = 0;
-    auto isRight = this->_listView->getInnerContainer()->getPosition().x < this->_lastContentPosX;
-    auto items = _listView->getItems();
-    
-    for (int i = 0; i < _spawnCount && i < _totalCount; ++i) {
-        auto item = items.at(i);
+    auto isRight       = this->_listView->getInnerContainer()->getPosition().x < this->_lastContentPosX;
+    auto items         = _listView->getItems();
+
+    for (int i = 0; i < _spawnCount && i < _totalCount; ++i)
+    {
+        auto item    = items.at(i);
         auto itemPos = this->getItemPositionXInView(item);
-        if (isRight) {
-            if (itemPos < -_bufferZone && item->getPosition().x + _reuseItemOffset < totalWidth) {
+        if (isRight)
+        {
+            if (itemPos < -_bufferZone && item->getPosition().x + _reuseItemOffset < totalWidth)
+            {
                 int itemID = item->getTag() + (int)items.size();
                 item->setPositionX(item->getPositionX() + _reuseItemOffset);
                 CCLOG("itemPos = %f, itemID = %d, templateID = %d", itemPos, itemID, i);
                 this->updateItem(itemID, i);
             }
         }
-        else {
+        else
+        {
             if (itemPos > _bufferZone + _listView->getContentSize().width &&
-                item->getPosition().x - _reuseItemOffset >= 0) {
-                
+                item->getPosition().x - _reuseItemOffset >= 0)
+            {
+
                 item->setPositionX(item->getPositionX() - _reuseItemOffset);
                 int itemID = item->getTag() - (int)items.size();
                 CCLOG("itemPos = %f, itemID = %d, templateID = %d", itemPos, itemID, i);
@@ -456,30 +455,30 @@ void UIListViewTest_Horizontal::update(float dt)
             }
         }
     }
-    //update ListView Items
+    // update ListView Items
     this->_lastContentPosX = this->_listView->getInnerContainer()->getPosition().x;
 }
 
-void UIListViewTest_Horizontal::selectedItemEvent(Ref *pSender, ListView::EventType type)
+void UIListViewTest_Horizontal::selectedItemEvent(Ref* pSender, ListView::EventType type)
 {
     switch (type)
     {
-        case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_START:
-        {
-            ListView* listView = static_cast<ListView*>(pSender);
-            auto item = listView->getItem(listView->getCurSelectedIndex());
-            log("select child start index = %d", item->getTag());
-            break;
-        }
-        case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
-        {
-            ListView* listView = static_cast<ListView*>(pSender);
-            auto item = listView->getItem(listView->getCurSelectedIndex());
-            log("select child end index = %d", item->getTag());
-            break;
-        }
-        default:
-            break;
+    case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_START:
+    {
+        ListView* listView = static_cast<ListView*>(pSender);
+        auto item          = listView->getItem(listView->getCurSelectedIndex());
+        log("select child start index = %d", item->getTag());
+        break;
+    }
+    case cocos2d::ui::ListView::EventType::ON_SELECTED_ITEM_END:
+    {
+        ListView* listView = static_cast<ListView*>(pSender);
+        auto item          = listView->getItem(listView->getCurSelectedIndex());
+        log("select child end index = %d", item->getTag());
+        break;
+    }
+    default:
+        break;
     }
 }
 
@@ -488,27 +487,26 @@ bool Issue12692::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         auto label = Text::create("Issue 12692", "fonts/Marker Felt.ttf", 32);
         label->setName("Text Title");
         label->setAnchorPoint(Vec2(0.5f, -1.0f));
-        label->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
+        label->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
         _uiLayer->addChild(label);
-        
-        
+
         Text* alert = Text::create("ListView in ListView enable Scissor Clipping", "fonts/Marker Felt.ttf", 20);
         alert->setName("Text Alert");
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
-        Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
+
+        Layout* background  = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
         Size backgroundSize = background->getContentSize();
-        
+
         // Create the list view ex
         ListView* listView = ListView::create();
         // set list view ex direction
@@ -518,15 +516,15 @@ bool Issue12692::init()
         listView->setBackGroundImageScale9Enabled(true);
         listView->setContentSize(Size(240.0f, 130.0f));
         listView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                   (backgroundSize.width - listView->getContentSize().width) / 2.0f,
+                                       (backgroundSize.width - listView->getContentSize().width) / 2.0f,
                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                   (backgroundSize.height - listView->getContentSize().height) / 2.0f));
+                                       (backgroundSize.height - listView->getContentSize().height) / 2.0f));
         listView->setScrollBarPositionFromCorner(Vec2(7, 7));
         listView->setClippingEnabled(true);
         listView->setClippingType(ui::Layout::ClippingType::SCISSOR);
         listView->setName("listview1");
         _uiLayer->addChild(listView);
-        
+
         auto list2 = ListView::create();
         list2->setDirection(ui::ScrollView::Direction::VERTICAL);
         list2->setBounceEnabled(true);
@@ -537,18 +535,18 @@ bool Issue12692::init()
         list2->setClippingType(ui::Layout::ClippingType::SCISSOR);
         list2->setName("listview2");
         listView->insertCustomItem(list2, 0);
-        
+
         {
             Button* default_button = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
             default_button->setName("Title Button");
-            
+
             Layout* default_item = Layout::create();
             default_item->setTouchEnabled(true);
             default_item->setContentSize(default_button->getContentSize());
-            default_button->setPosition(Vec2(default_item->getContentSize().width / 2.0f,
-                                             default_item->getContentSize().height / 2.0f));
+            default_button->setPosition(
+                Vec2(default_item->getContentSize().width / 2.0f, default_item->getContentSize().height / 2.0f));
             default_item->addChild(default_button);
-            
+
             // set model
             listView->setItemModel(default_item);
             listView->pushBackDefaultItem();
@@ -558,14 +556,14 @@ bool Issue12692::init()
         {
             Button* default_button = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
             default_button->setName("Title Button 2");
-            
+
             Layout* default_item = Layout::create();
             default_item->setTouchEnabled(true);
             default_item->setContentSize(default_button->getContentSize());
-            default_button->setPosition(Vec2(default_item->getContentSize().width / 2.0f,
-                                             default_item->getContentSize().height / 2.0f));
+            default_button->setPosition(
+                Vec2(default_item->getContentSize().width / 2.0f, default_item->getContentSize().height / 2.0f));
             default_item->addChild(default_button);
-            
+
             // set model
             list2->setItemModel(default_item);
             list2->pushBackDefaultItem();
@@ -574,34 +572,33 @@ bool Issue12692::init()
         }
         return true;
     }
-    
+
     return false;
 }
 
-
 bool Issue8316::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         auto label = Text::create("Issue 8316", "fonts/Marker Felt.ttf", 32);
         label->setAnchorPoint(Vec2(0.5f, -1.0f));
-        label->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
+        label->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + label->getContentSize().height * 1.5f));
         _uiLayer->addChild(label);
-        
+
         Text* alert = Text::create("Can not scroll list view", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
-        Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
+
+        Layout* background  = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
         Size backgroundSize = background->getContentSize();
-        
+
         // Create the list view ex
         ListView* listView = ListView::create();
         // set list view ex direction
@@ -612,59 +609,57 @@ bool Issue8316::init()
         listView->setBackGroundImageScale9Enabled(true);
         listView->setContentSize(Size(240.0f, 130.0f));
         listView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                   (backgroundSize.width - listView->getContentSize().width) / 2.0f,
+                                       (backgroundSize.width - listView->getContentSize().width) / 2.0f,
                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                   (backgroundSize.height - listView->getContentSize().height) / 2.0f));
+                                       (backgroundSize.height - listView->getContentSize().height) / 2.0f));
         listView->setScrollBarPositionFromCorner(Vec2(7, 7));
         listView->setClippingEnabled(true);
         listView->setClippingType(ui::Layout::ClippingType::SCISSOR);
         listView->setName("listview1");
-        
+
         {
             Button* default_button = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
             default_button->setName("Title Button");
-            
+
             Layout* default_item = Layout::create();
             default_item->setTouchEnabled(true);
             default_item->setContentSize(default_button->getContentSize());
-            default_button->setPosition(Vec2(default_item->getContentSize().width / 2.0f,
-                                             default_item->getContentSize().height / 2.0f));
+            default_button->setPosition(
+                Vec2(default_item->getContentSize().width / 2.0f, default_item->getContentSize().height / 2.0f));
             default_item->addChild(default_button);
-            
+
             // set model
             listView->setItemModel(default_item);
             listView->pushBackDefaultItem();
             listView->pushBackDefaultItem();
             listView->pushBackDefaultItem();
         }
-        
+
         _uiLayer->addChild(listView);
-        
-      
+
         return true;
     }
-    
+
     return false;
 }
 
-
 // UIListViewTest_ScrollToItem
 bool UIListViewTest_ScrollToItem::init()
 {
-    if(!UIScene::init())
+    if (!UIScene::init())
     {
         return false;
     }
-    
+
     Size layerSize = _uiLayer->getContentSize();
-    
+
     static int NUMBER_OF_ITEMS = 31;
-    _nextIndex = 0;
-    _titleLabel = Text::create("Scroll to item", "fonts/Marker Felt.ttf", 32);
+    _nextIndex                 = 0;
+    _titleLabel                = Text::create("Scroll to item", "fonts/Marker Felt.ttf", 32);
     _titleLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     _titleLabel->setPosition(Vec2(layerSize / 2) + Vec2(0.0f, _titleLabel->getContentSize().height * 3.15f));
     _uiLayer->addChild(_titleLabel, 3);
-    
+
     // Create the list view
     _listView = ListView::create();
     _listView->setDirection(getListViewDirection());
@@ -677,12 +672,12 @@ bool UIListViewTest_ScrollToItem::init()
     _listView->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     _listView->setPosition(layerSize / 2);
     _uiLayer->addChild(_listView);
-    
+
     // Guide line for center align
     {
         DrawNode* pNode = DrawNode::create();
-        Vec2 center = layerSize / 2;
-        if(getListViewDirection() == ScrollView::Direction::HORIZONTAL)
+        Vec2 center     = layerSize / 2;
+        if (getListViewDirection() == ScrollView::Direction::HORIZONTAL)
         {
             float halfY = 110;
             pNode->drawLine(Vec2(center.x, center.y - halfY), Vec2(center.x, center.y + halfY), Color4F(0, 0, 0, 1));
@@ -695,7 +690,7 @@ bool UIListViewTest_ScrollToItem::init()
         pNode->setLineWidth(2);
         _uiLayer->addChild(pNode);
     }
-    
+
     // Button
     auto pButton = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
     pButton->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
@@ -708,7 +703,7 @@ bool UIListViewTest_ScrollToItem::init()
         pButton->setTitleText(StringUtils::format("Go to '%d'", _nextIndex));
     });
     _uiLayer->addChild(pButton);
-    
+
     // Add list items
     static const Size BUTTON_SIZE(50, 40);
     for (int i = 0; i < NUMBER_OF_ITEMS; ++i)
@@ -722,23 +717,21 @@ bool UIListViewTest_ScrollToItem::init()
     return true;
 }
 
-
-
 // UIListViewTest_Magnetic
 bool UIListViewTest_Magnetic::init()
 {
-    if(!UIScene::init())
+    if (!UIScene::init())
     {
         return false;
     }
-    
+
     Size layerSize = _uiLayer->getContentSize();
-    
+
     _titleLabel = Text::create("Magnetic scroll", "fonts/Marker Felt.ttf", 32);
     _titleLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     _titleLabel->setPosition(Vec2(layerSize / 2) + Vec2(0.0f, _titleLabel->getContentSize().height * 3.15f));
     _uiLayer->addChild(_titleLabel, 3);
-    
+
     // Create the list view
     _listView = ListView::create();
     _listView->setDirection(getListViewDirection());
@@ -751,12 +744,12 @@ bool UIListViewTest_Magnetic::init()
     _listView->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
     _listView->setPosition(layerSize / 2);
     _uiLayer->addChild(_listView);
-    
+
     // Guide line for center align
     {
         DrawNode* pNode = DrawNode::create();
-        Vec2 center = layerSize / 2;
-        if(getListViewDirection() == ScrollView::Direction::HORIZONTAL)
+        Vec2 center     = layerSize / 2;
+        if (getListViewDirection() == ScrollView::Direction::HORIZONTAL)
         {
             float halfY = 110;
             pNode->drawLine(Vec2(center.x, center.y - halfY), Vec2(center.x, center.y + halfY), Color4F(0, 0, 0, 1));
@@ -769,10 +762,10 @@ bool UIListViewTest_Magnetic::init()
         pNode->setLineWidth(2);
         _uiLayer->addChild(pNode);
     }
-    
+
     // Show the indexes of items on each boundary.
     {
-        for(int i = 0; i < 5; ++i)
+        for (int i = 0; i < 5; ++i)
         {
             _indexLabels[i] = Text::create(" ", "fonts/Marker Felt.ttf", 12);
             _indexLabels[i]->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
@@ -780,24 +773,24 @@ bool UIListViewTest_Magnetic::init()
         }
         float deltaX = 145, deltaY = 90;
         _indexLabels[0]->setPosition(_uiLayer->getContentSize() / 2 + Size(-deltaX, 0.0f));   // left
-        _indexLabels[1]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, 0.0f));   // right
-        _indexLabels[2]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, deltaY));   // top
+        _indexLabels[1]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, 0.0f));    // right
+        _indexLabels[2]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, deltaY));    // top
         _indexLabels[3]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, -deltaY));   // bottom
         _indexLabels[4]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, deltaY));  // center
-        
+
         // Callback
         _listView->ScrollView::addEventListener([this](Ref* ref, ScrollView::EventType eventType) {
             ListView* listView = dynamic_cast<ListView*>(ref);
-            if(listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
+            if (listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
             {
                 return;
             }
-            auto left = listView->getLeftmostItemInCurrentView();
-            auto right = listView->getRightmostItemInCurrentView();
-            auto top = listView->getTopmostItemInCurrentView();
+            auto left   = listView->getLeftmostItemInCurrentView();
+            auto right  = listView->getRightmostItemInCurrentView();
+            auto top    = listView->getTopmostItemInCurrentView();
             auto bottom = listView->getBottommostItemInCurrentView();
             auto center = listView->getCenterItemInCurrentView();
-            
+
             _indexLabels[0]->setString(StringUtils::format("Left\nindex=%zd", listView->getIndex(left)));
             _indexLabels[1]->setString(StringUtils::format("RIght\nindex=%zd", listView->getIndex(right)));
             _indexLabels[2]->setString(StringUtils::format("Top index=%zd", listView->getIndex(top)));
@@ -805,11 +798,11 @@ bool UIListViewTest_Magnetic::init()
             _indexLabels[4]->setString(StringUtils::format("Center\nindex=%zd", listView->getIndex(center)));
         });
     }
-    
+
     // Initial magnetic type
     _listView->setMagneticType(ListView::MagneticType::NONE);
     _titleLabel->setString("MagneticType - NONE");
-    
+
     // Magnetic change button
     auto pButton = Button::create("cocosui/backtotoppressed.png", "cocosui/backtotopnormal.png");
     pButton->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
@@ -818,50 +811,50 @@ bool UIListViewTest_Magnetic::init()
     pButton->setTitleText("Next Magnetic");
     pButton->addClickEventListener([this](Ref*) {
         ListView::MagneticType eCurrentType = _listView->getMagneticType();
-        ListView::MagneticType eNextType = ListView::MagneticType::NONE;
+        ListView::MagneticType eNextType    = ListView::MagneticType::NONE;
         std::string sString;
-        if(eCurrentType == ListView::MagneticType::NONE)
+        if (eCurrentType == ListView::MagneticType::NONE)
         {
             eNextType = ListView::MagneticType::CENTER;
-            sString = "CENTER";
+            sString   = "CENTER";
         }
-        else if(eCurrentType == ListView::MagneticType::CENTER)
+        else if (eCurrentType == ListView::MagneticType::CENTER)
         {
             eNextType = ListView::MagneticType::BOTH_END;
-            sString = "BOTH_END";
+            sString   = "BOTH_END";
         }
-        else if(eCurrentType == ListView::MagneticType::BOTH_END)
+        else if (eCurrentType == ListView::MagneticType::BOTH_END)
         {
-            if(getListViewDirection() == ScrollView::Direction::HORIZONTAL)
+            if (getListViewDirection() == ScrollView::Direction::HORIZONTAL)
             {
                 eNextType = ListView::MagneticType::LEFT;
-                sString = "LEFT";
+                sString   = "LEFT";
             }
             else
             {
                 eNextType = ListView::MagneticType::TOP;
-                sString = "TOP";
+                sString   = "TOP";
             }
         }
-        else if(eCurrentType == ListView::MagneticType::LEFT)
+        else if (eCurrentType == ListView::MagneticType::LEFT)
         {
             eNextType = ListView::MagneticType::RIGHT;
-            sString = "RIGHT";
+            sString   = "RIGHT";
         }
-        else if(eCurrentType == ListView::MagneticType::RIGHT)
+        else if (eCurrentType == ListView::MagneticType::RIGHT)
         {
             eNextType = ListView::MagneticType::NONE;
-            sString = "NONE";
+            sString   = "NONE";
         }
-        else if(eCurrentType == ListView::MagneticType::TOP)
+        else if (eCurrentType == ListView::MagneticType::TOP)
         {
             eNextType = ListView::MagneticType::BOTTOM;
-            sString = "BOTTOM";
+            sString   = "BOTTOM";
         }
-        else if(eCurrentType == ListView::MagneticType::BOTTOM)
+        else if (eCurrentType == ListView::MagneticType::BOTTOM)
         {
             eNextType = ListView::MagneticType::NONE;
-            sString = "NONE";
+            sString   = "NONE";
         }
         _listView->setMagneticType(eNextType);
         _titleLabel->setString(StringUtils::format("MagneticType - %s", sString.c_str()));
@@ -881,12 +874,10 @@ bool UIListViewTest_Magnetic::init()
     return true;
 }
 
-
-
 // UIListViewTest_Padding
 bool UIListViewTest_Padding::init()
 {
-    if(!UIScene::init())
+    if (!UIScene::init())
     {
         return false;
     }
@@ -912,12 +903,11 @@ bool UIListViewTest_Padding::init()
     _listView->setPosition(layerSize / 2);
     _uiLayer->addChild(_listView);
 
-
     // Guide line for center align
     {
         DrawNode* pNode = DrawNode::create();
-        Vec2 center = layerSize / 2;
-        if(getListViewDirection() == ScrollView::Direction::HORIZONTAL)
+        Vec2 center     = layerSize / 2;
+        if (getListViewDirection() == ScrollView::Direction::HORIZONTAL)
         {
             float halfY = 110;
             pNode->drawLine(Vec2(center.x, center.y - halfY), Vec2(center.x, center.y + halfY), Color4F(0, 0, 0, 1));
@@ -952,10 +942,14 @@ bool UIListViewTest_Padding::init()
             _uiLayer->addChild(slider);
 
             std::string str;
-            if (i == 0) str = "Left";
-            else if (i == 1) str = "Top";
-            else if (i == 2) str = "Right";
-            else if (i == 3) str = "Bottom";
+            if (i == 0)
+                str = "Left";
+            else if (i == 1)
+                str = "Top";
+            else if (i == 2)
+                str = "Right";
+            else if (i == 3)
+                str = "Bottom";
 
             // Show title of slider
             {
@@ -970,15 +964,15 @@ bool UIListViewTest_Padding::init()
                 text->setAnchorPoint(Vec2::ANCHOR_MIDDLE_LEFT);
                 text->setPosition(Vec2(layerSize.width - 65, 200.0f - (40 * i)));
                 _uiLayer->addChild(text);
-                
+
                 _paddingLabels[i] = text;
             }
         }
     }
-    
+
     // Show the indexes of items on each boundary.
     {
-        for(int i = 0; i < 5; ++i)
+        for (int i = 0; i < 5; ++i)
         {
             _indexLabels[i] = Text::create(" ", "fonts/Marker Felt.ttf", 12);
             _indexLabels[i]->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
@@ -986,21 +980,21 @@ bool UIListViewTest_Padding::init()
         }
         float deltaX = 145, deltaY = 90;
         _indexLabels[0]->setPosition(_uiLayer->getContentSize() / 2 + Size(-deltaX, 0.0f));   // left
-        _indexLabels[1]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, 0.0f));   // right
-        _indexLabels[2]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, deltaY));   // top
+        _indexLabels[1]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, 0.0f));    // right
+        _indexLabels[2]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, deltaY));    // top
         _indexLabels[3]->setPosition(_uiLayer->getContentSize() / 2 + Size(0.0f, -deltaY));   // bottom
         _indexLabels[4]->setPosition(_uiLayer->getContentSize() / 2 + Size(deltaX, deltaY));  // center
 
         // Callback
         _listView->ScrollView::addEventListener([this](Ref* ref, ScrollView::EventType eventType) {
             ListView* listView = dynamic_cast<ListView*>(ref);
-            if(listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
+            if (listView == nullptr || eventType != ScrollView::EventType::CONTAINER_MOVED)
             {
                 return;
             }
-            auto left = listView->getLeftmostItemInCurrentView();
-            auto right = listView->getRightmostItemInCurrentView();
-            auto top = listView->getTopmostItemInCurrentView();
+            auto left   = listView->getLeftmostItemInCurrentView();
+            auto right  = listView->getRightmostItemInCurrentView();
+            auto top    = listView->getTopmostItemInCurrentView();
             auto bottom = listView->getBottommostItemInCurrentView();
             auto center = listView->getCenterItemInCurrentView();
 
@@ -1025,7 +1019,7 @@ bool UIListViewTest_Padding::init()
     return true;
 }
 
-void UIListViewTest_Padding::sliderEvent(Ref *pSender, Slider::EventType type)
+void UIListViewTest_Padding::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
index 179486f99622..4c84455ec89d 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -43,11 +43,11 @@ class UIListViewTest_Vertical : public UIScene
     void selectedItemEvent(cocos2d::Ref* sender, cocos2d::ui::ListView::EventType type);
     void selectedItemEventScrollView(cocos2d::Ref* sender, cocos2d::ui::ScrollView::EventType type);
     virtual void update(float dt) override;
-    
+
 protected:
     float getItemPositionYInView(cocos2d::ui::Widget* item) const;
     void updateItem(int itemID, int templateID);
-    
+
     cocos2d::ui::Text* _displayValueLabel = nullptr;
     // How many items we actually spawn, these items will be reused.
     // Should > listview.width / templateWidth + 2.
@@ -56,15 +56,15 @@ class UIListViewTest_Vertical : public UIScene
     int _totalCount = 50;
     // when item is away from bufferSzone, we relocate it.
     // Should be larger than List item width.
-    float _bufferZone = 45.f;
+    float _bufferZone         = 45.f;
     float _itemTemplateHeight = 0.f;
     // Could tweak this value to adjust ListView data update rate.
     float _updateInterval = (1.0f / 24);
-    float _updateTimer = 0.f;
+    float _updateTimer    = 0.f;
     // Use this value to detect if we are scrolling left or right
-    float _lastContentPosY = 0.f;
-    float _reuseItemOffset = 0.f;
-    cocos2d::ui::ListView* _listView =nullptr;
+    float _lastContentPosY           = 0.f;
+    float _reuseItemOffset           = 0.f;
+    cocos2d::ui::ListView* _listView = nullptr;
     std::vector<std::string> _array;
     cocos2d::ui::Text* _indexLabels[3] = {nullptr};
 };
@@ -80,10 +80,11 @@ class UIListViewTest_Horizontal : public UIScene
     virtual bool init() override;
     void selectedItemEvent(cocos2d::Ref* sender, cocos2d::ui::ListView::EventType type);
     virtual void update(float dt) override;
+
 protected:
     float getItemPositionXInView(cocos2d::ui::Widget* item) const;
     void updateItem(int itemID, int templateID);
-    
+
     cocos2d::ui::Text* _displayValueLabel = nullptr;
     // How many items we actually spawn, these items will be reused.
     // Should > listview.width / templateWidth + 2.
@@ -91,15 +92,15 @@ class UIListViewTest_Horizontal : public UIScene
     // How many items we need for the ListView. Usually this is a big number.
     int _totalCount = 50;
     // when item is away from bufferSzone, we relocate it.
-    float _bufferZone = 140.f;
+    float _bufferZone        = 140.f;
     float _itemTemplateWidth = 0.f;
     // Could tweak this value to adjust ListView data update rate.
-    float _updateInterval = 1.0f / 24;
-    float _updateTimer = 0.f;
-    float _lastContentPosX = 0.f;
-    float _reuseItemOffset = 0.f;
+    float _updateInterval            = 1.0f / 24;
+    float _updateTimer               = 0.f;
+    float _lastContentPosX           = 0.f;
+    float _reuseItemOffset           = 0.f;
     cocos2d::ui::ListView* _listView = nullptr;
-    
+
     std::vector<std::string> _array;
 };
 
@@ -107,7 +108,7 @@ class Issue12692 : public UIScene
 {
 public:
     CREATE_FUNC(Issue12692);
-    
+
     virtual bool init() override;
 };
 
@@ -115,18 +116,17 @@ class Issue8316 : public UIScene
 {
 public:
     CREATE_FUNC(Issue8316);
-    
+
     virtual bool init() override;
 };
 
-
 // Test for scroll to item
 class UIListViewTest_ScrollToItem : public UIScene
 {
 protected:
     virtual bool init() override;
     virtual cocos2d::ui::ScrollView::Direction getListViewDirection() const = 0;
-    
+
     cocos2d::ui::ListView* _listView;
     cocos2d::ui::Text* _titleLabel;
     int _nextIndex;
@@ -152,18 +152,16 @@ class UIListViewTest_ScrollToItemHorizontal : public UIListViewTest_ScrollToItem
     }
 };
 
-
 // Test for magnetic scroll
 class UIListViewTest_Magnetic : public UIScene
 {
 protected:
     virtual bool init() override;
     virtual cocos2d::ui::ScrollView::Direction getListViewDirection() const = 0;
-    
+
     cocos2d::ui::ListView* _listView;
     cocos2d::ui::Text* _titleLabel;
     cocos2d::ui::Text* _indexLabels[5];
-    
 };
 
 class UIListViewTest_MagneticVertical : public UIListViewTest_Magnetic
@@ -186,7 +184,6 @@ class UIListViewTest_MagneticHorizontal : public UIListViewTest_Magnetic
     }
 };
 
-
 // Test for setting padding
 class UIListViewTest_Padding : public UIScene
 {
@@ -194,13 +191,12 @@ class UIListViewTest_Padding : public UIScene
     virtual bool init() override;
     virtual cocos2d::ui::ScrollView::Direction getListViewDirection() const = 0;
 
-    void sliderEvent(cocos2d::Ref *pSender, cocos2d::ui::Slider::EventType type);
+    void sliderEvent(cocos2d::Ref* pSender, cocos2d::ui::Slider::EventType type);
 
     cocos2d::ui::ListView* _listView;
     cocos2d::ui::Text* _titleLabel;
     cocos2d::ui::Text* _indexLabels[5];
     cocos2d::ui::Text* _paddingLabels[4];
-
 };
 
 class UIListViewTest_PaddingVertical : public UIListViewTest_Padding
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
index 6d3919ece07c..5f85f82f6eb1 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,11 +41,7 @@ UILoadingBarTests::UILoadingBarTests()
 
 // UILoadingBarTest_Left
 
-UILoadingBarTest_Left::UILoadingBarTest_Left()
-: _count(0)
-{
-    
-}
+UILoadingBarTest_Left::UILoadingBarTest_Left() : _count(0) {}
 
 UILoadingBarTest_Left::~UILoadingBarTest_Left()
 {
@@ -57,36 +53,32 @@ bool UILoadingBarTest_Left::init()
     if (UIScene::init())
     {
         scheduleUpdate();
-        
+
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("Test LoadingBar Change Direction",
-                                   "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Test LoadingBar Change Direction", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/sliderProgress.png");
         loadingBar->setTag(0);
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                      widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
 
         auto loadingBarCopy = (LoadingBar*)loadingBar->clone();
         loadingBarCopy->setTag(1);
-        loadingBarCopy->setPosition(loadingBar->getPosition()
-                                    + Vec2(0, -40));
+        loadingBarCopy->setPosition(loadingBar->getPosition() + Vec2(0, -40));
         loadingBarCopy->setDirection(LoadingBar::Direction::RIGHT);
 
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
         button->setTitleText("Click to change direction!");
 
-        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type)
-        {
+        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type) {
             if (type == Widget::TouchEventType::ENDED)
             {
                 if (loadingBar->getDirection() == LoadingBar::Direction::LEFT)
@@ -101,20 +93,21 @@ bool UILoadingBarTest_Left::init()
                 }
             }
         });
-         _uiLayer->addChild(loadingBar,1);
-        _uiLayer->addChild(loadingBarCopy,2);
+        _uiLayer->addChild(loadingBar, 1);
+        _uiLayer->addChild(loadingBarCopy, 2);
         _uiLayer->addChild(button);
 
         _loadingBar = loadingBar;
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UILoadingBarTest_Left::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UILoadingBarTest_Left::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0, 0));
         this->addChild(pMenu1, 10);
-        
+
         return true;
     }
     return false;
@@ -127,7 +120,7 @@ void UILoadingBarTest_Left::update(float delta)
     {
         _count = 0;
     }
-    LoadingBar* loadingBar = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
+    LoadingBar* loadingBar     = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
     LoadingBar* loadingBarCopy = static_cast<LoadingBar*>(_uiLayer->getChildByTag(1));
     loadingBar->setPercent(_count);
     loadingBarCopy->setPercent(_count);
@@ -141,11 +134,7 @@ void UILoadingBarTest_Left::printWidgetResources(cocos2d::Ref* sender)
 
 // UILoadingBarTest_Right
 
-UILoadingBarTest_Right::UILoadingBarTest_Right()
-: _count(0)
-{
-    
-}
+UILoadingBarTest_Right::UILoadingBarTest_Right() : _count(0) {}
 
 UILoadingBarTest_Right::~UILoadingBarTest_Right()
 {
@@ -157,25 +146,26 @@ bool UILoadingBarTest_Right::init()
     if (UIScene::init())
     {
         scheduleUpdate();
-        
+
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text *alert = Text::create("LoadingBar right", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("LoadingBar right", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/sliderProgress.png");
         loadingBar->setTag(0);
         loadingBar->setDirection(LoadingBar::Direction::RIGHT);
-        
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                      widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
-        
+
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+
         _uiLayer->addChild(loadingBar);
-        
+
         return true;
     }
     return false;
@@ -194,11 +184,7 @@ void UILoadingBarTest_Right::update(float delta)
 
 // UILoadingBarTest_Left_Scale9
 
-UILoadingBarTest_Left_Scale9::UILoadingBarTest_Left_Scale9()
-: _count(0)
-{
-    
-}
+UILoadingBarTest_Left_Scale9::UILoadingBarTest_Left_Scale9() : _count(0) {}
 
 UILoadingBarTest_Left_Scale9::~UILoadingBarTest_Left_Scale9()
 {
@@ -210,27 +196,28 @@ bool UILoadingBarTest_Left_Scale9::init()
     if (UIScene::init())
     {
         scheduleUpdate();
-        
+
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create("LoadingBar left scale9 render", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
         _uiLayer->addChild(alert);
-        
+
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/slider_bar_active_9patch.png");
         loadingBar->setTag(0);
         loadingBar->setScale9Enabled(true);
         loadingBar->setCapInsets(Rect(0, 0, 0, 0));
         loadingBar->setContentSize(Size(300, 13));
-        
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                      widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
-        
+
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+
         _uiLayer->addChild(loadingBar);
-        
+
         return true;
     }
     return false;
@@ -249,11 +236,7 @@ void UILoadingBarTest_Left_Scale9::update(float delta)
 
 // UILoadingBarTest_Right_Scale9
 
-UILoadingBarTest_Right_Scale9::UILoadingBarTest_Right_Scale9()
-: _count(0)
-{
-    
-}
+UILoadingBarTest_Right_Scale9::UILoadingBarTest_Right_Scale9() : _count(0) {}
 
 UILoadingBarTest_Right_Scale9::~UILoadingBarTest_Right_Scale9()
 {
@@ -265,15 +248,16 @@ bool UILoadingBarTest_Right_Scale9::init()
     if (UIScene::init())
     {
         scheduleUpdate();
-        
+
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text *alert = Text::create("LoadingBar right scale9 render", "fonts/Marker Felt.ttf", 20);
+        Text* alert = Text::create("LoadingBar right scale9 render", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
         _uiLayer->addChild(alert);
-        
+
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/slider_bar_active_9patch.png");
         loadingBar->setTag(0);
@@ -281,12 +265,12 @@ bool UILoadingBarTest_Right_Scale9::init()
         loadingBar->setCapInsets(Rect(0, 0, 0, 0));
         loadingBar->setContentSize(Size(300, 13));
         loadingBar->setDirection(LoadingBar::Direction::RIGHT);
-        
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                      widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
-        
+
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+
         _uiLayer->addChild(loadingBar);
-        
+
         return true;
     }
     return false;
@@ -305,16 +289,9 @@ void UILoadingBarTest_Right_Scale9::update(float delta)
 
 // UILoadingBarTest_Scale9_State_Change
 
-UILoadingBarTest_Scale9_State_Change::UILoadingBarTest_Scale9_State_Change()
-    : _count(0)
-{
+UILoadingBarTest_Scale9_State_Change::UILoadingBarTest_Scale9_State_Change() : _count(0) {}
 
-}
-
-UILoadingBarTest_Scale9_State_Change::~UILoadingBarTest_Scale9_State_Change()
-{
-
-}
+UILoadingBarTest_Scale9_State_Change::~UILoadingBarTest_Scale9_State_Change() {}
 
 bool UILoadingBarTest_Scale9_State_Change::init()
 {
@@ -323,24 +300,26 @@ bool UILoadingBarTest_Scale9_State_Change::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("LoadingBar right scale9 render", "fonts/Marker Felt.ttf", 20);
+        Text* alert = Text::create("LoadingBar right scale9 render", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
         _uiLayer->addChild(alert);
 
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/sliderThumb.png");
         loadingBar->setTag(0);
         loadingBar->ignoreContentAdaptWithSize(false);
-        //loadingBar->setScale9Enabled(true);
+        // loadingBar->setScale9Enabled(true);
         loadingBar->setCapInsets(Rect(0, 0, 0, 0));
         loadingBar->setContentSize(Size(200, 80));
         loadingBar->setDirection(LoadingBar::Direction::LEFT);
         loadingBar->setPercent(100);
 
         loadingBar->setTouchEnabled(true);
-        loadingBar->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){
-            if (type == Widget::TouchEventType::ENDED) {
+        loadingBar->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
                 if (loadingBar->isScale9Enabled())
                 {
                     loadingBar->setScale9Enabled(false);
@@ -350,8 +329,8 @@ bool UILoadingBarTest_Scale9_State_Change::init()
             }
         });
 
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
 
         _uiLayer->addChild(loadingBar);
 
@@ -360,60 +339,50 @@ bool UILoadingBarTest_Scale9_State_Change::init()
     return false;
 }
 
-
 // UILoadingBarReloadTexture
 
-UILoadingBarReloadTexture::UILoadingBarReloadTexture()
-: _count(0)
-{
-    
-}
+UILoadingBarReloadTexture::UILoadingBarReloadTexture() : _count(0) {}
 
-UILoadingBarReloadTexture::~UILoadingBarReloadTexture()
-{
-    
-}
+UILoadingBarReloadTexture::~UILoadingBarReloadTexture() {}
 
 bool UILoadingBarReloadTexture::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text *alert = Text::create("Click button to Toggle Scale9 and switch Texture.", "fonts/Marker Felt.ttf", 20);
+        Text* alert = Text::create("Click button to Toggle Scale9 and switch Texture.", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
         _uiLayer->addChild(alert);
-        
+
         LoadingBar* loadingBar = LoadingBar::create("cocosui/slider_bar_active_9patch.png");
         loadingBar->setTag(0);
         loadingBar->ignoreContentAdaptWithSize(false);
-//        loadingBar->setScale9Enabled(true);
+        //        loadingBar->setScale9Enabled(true);
         loadingBar->setCapInsets(Rect(0, 0, 0, 0));
         loadingBar->setContentSize(Size(300, 13));
         loadingBar->setName("texture0");
         loadingBar->setDirection(LoadingBar::Direction::RIGHT);
         loadingBar->setPercent(70);
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                     widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
-        
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+
         _uiLayer->addChild(loadingBar);
-        
-        auto buttonScale9 = Button::create("cocosui/animationbuttonnormal.png",
-                                           "cocosui/animationbuttonpressed.png");
+
+        auto buttonScale9 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         buttonScale9->setTitleText("ToggleScale9");
-        buttonScale9->addClickEventListener([=](Ref*){
-            loadingBar->setScale9Enabled(!loadingBar->isScale9Enabled());
-        });
-        buttonScale9->setPosition(loadingBar->getPosition() + Vec2(-50,50));
+        buttonScale9->addClickEventListener(
+            [=](Ref*) { loadingBar->setScale9Enabled(!loadingBar->isScale9Enabled()); });
+        buttonScale9->setPosition(loadingBar->getPosition() + Vec2(-50, 50));
         _uiLayer->addChild(buttonScale9);
-        
-        auto buttonChangeTexture = Button::create("cocosui/animationbuttonnormal.png",
-                                                  "cocosui/animationbuttonpressed.png");
+
+        auto buttonChangeTexture =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         buttonChangeTexture->setTitleText("ChangeTexture");
-        buttonChangeTexture->addClickEventListener([=](Ref*){
+        buttonChangeTexture->addClickEventListener([=](Ref*) {
             auto name = loadingBar->getName();
             if (name == "texture0")
             {
@@ -426,9 +395,9 @@ bool UILoadingBarReloadTexture::init()
                 loadingBar->setName("texture0");
             }
         });
-        buttonChangeTexture->setPosition(loadingBar->getPosition() + Vec2(50,50));
+        buttonChangeTexture->setPosition(loadingBar->getPosition() + Vec2(50, 50));
         _uiLayer->addChild(buttonChangeTexture);
-        
+
         this->scheduleUpdate();
         return true;
     }
@@ -446,14 +415,9 @@ void UILoadingBarReloadTexture::update(float delta)
     loadingBar->setPercent(_count);
 }
 
-
 // UILoadingBarIssue12249
 
-UILoadingBarIssue12249::UILoadingBarIssue12249()
-: _count(0)
-{
-    
-}
+UILoadingBarIssue12249::UILoadingBarIssue12249() : _count(0) {}
 
 UILoadingBarIssue12249::~UILoadingBarIssue12249()
 {
@@ -465,59 +429,55 @@ bool UILoadingBarIssue12249::init()
     if (UIScene::init())
     {
         scheduleUpdate();
-        
+
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("Test LoadingBar Change Direction",
-                                   "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Test LoadingBar Change Direction", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/sliderProgress.png");
         loadingBar->setScale9Enabled(true);
         loadingBar->setContentSize(Size(200, loadingBar->getContentSize().height * 1.5));
         loadingBar->setTag(0);
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-                                     widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
-        
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+
         LoadingBar* loadingBarCopy = LoadingBar::create();
         loadingBarCopy->setScale9Enabled(true);
         loadingBarCopy->loadTexture("cocosui/sliderProgress.png");
         loadingBarCopy->setContentSize(Size(200, loadingBarCopy->getContentSize().height * 1.5));
         loadingBarCopy->setTag(1);
-        loadingBarCopy->setPosition(loadingBar->getPosition()
-                                    + Vec2(0, -40));
+        loadingBarCopy->setPosition(loadingBar->getPosition() + Vec2(0, -40));
         loadingBarCopy->setDirection(LoadingBar::Direction::RIGHT);
-        
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-                                        "cocosui/animationbuttonpressed.png");
+
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
         button->setTitleText("Click to change direction!");
-        
-        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type)
-                                      {
-                                          if (type == Widget::TouchEventType::ENDED)
-                                          {
-                                              if (loadingBar->getDirection() == LoadingBar::Direction::LEFT)
-                                              {
-                                                  loadingBar->setDirection(LoadingBar::Direction::RIGHT);
-                                                  loadingBarCopy->setDirection(LoadingBar::Direction::LEFT);
-                                              }
-                                              else
-                                              {
-                                                  loadingBar->setDirection(LoadingBar::Direction::LEFT);
-                                                  loadingBarCopy->setDirection(LoadingBar::Direction::RIGHT);
-                                              }
-                                          }
-                                      });
-        _uiLayer->addChild(loadingBar,1);
-        _uiLayer->addChild(loadingBarCopy,2);
+
+        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
+                if (loadingBar->getDirection() == LoadingBar::Direction::LEFT)
+                {
+                    loadingBar->setDirection(LoadingBar::Direction::RIGHT);
+                    loadingBarCopy->setDirection(LoadingBar::Direction::LEFT);
+                }
+                else
+                {
+                    loadingBar->setDirection(LoadingBar::Direction::LEFT);
+                    loadingBarCopy->setDirection(LoadingBar::Direction::RIGHT);
+                }
+            }
+        });
+        _uiLayer->addChild(loadingBar, 1);
+        _uiLayer->addChild(loadingBarCopy, 2);
         _uiLayer->addChild(button);
-        
+
         return true;
     }
     return false;
@@ -530,7 +490,7 @@ void UILoadingBarIssue12249::update(float delta)
     {
         _count = 0;
     }
-    LoadingBar* loadingBar = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
+    LoadingBar* loadingBar     = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
     LoadingBar* loadingBarCopy = static_cast<LoadingBar*>(_uiLayer->getChildByTag(1));
     loadingBar->setPercent(_count);
     loadingBarCopy->setPercent(_count);
@@ -538,53 +498,45 @@ void UILoadingBarIssue12249::update(float delta)
 
 // UILoadingBarTest_Direction
 
-UILoadingBarTest_Direction::UILoadingBarTest_Direction()
-    : _count(0)
-{
-
-}
+UILoadingBarTest_Direction::UILoadingBarTest_Direction() : _count(0) {}
 
 UILoadingBarTest_Direction::~UILoadingBarTest_Direction()
 {
-    //unscheduleUpdate();
+    // unscheduleUpdate();
 }
 
 bool UILoadingBarTest_Direction::init()
 {
     if (UIScene::init())
     {
-        //scheduleUpdate();
+        // scheduleUpdate();
 
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text* alert = Text::create("Test LoadingBar Change Direction",
-            "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Test LoadingBar Change Direction", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the loading bar
         LoadingBar* loadingBar = LoadingBar::create("cocosui/sliderProgress.png");
         loadingBar->setTag(0);
         loadingBar->setPercent(80);
-        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+        loadingBar->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
 
         auto loadingBarCopy = (LoadingBar*)loadingBar->clone();
         loadingBarCopy->setTag(1);
-        loadingBarCopy->setPosition(loadingBar->getPosition()
-            + Vec2(0, -40));
+        loadingBarCopy->setPosition(loadingBar->getPosition() + Vec2(0, -40));
         loadingBarCopy->setDirection(LoadingBar::Direction::RIGHT);
 
-        Button* button = Button::create("cocosui/animationbuttonnormal.png",
-            "cocosui/animationbuttonpressed.png");
+        Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
         button->setTitleText("Click to change direction!");
 
-        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type)
-        {
+        button->addTouchEventListener([=](Ref*, Widget::TouchEventType type) {
             if (type == Widget::TouchEventType::ENDED)
             {
                 if (loadingBar->getDirection() == LoadingBar::Direction::LEFT)
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
index 98fc67de39c0..41e282292cf7 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,9 +38,9 @@ class UILoadingBarTest_Left : public UIScene
     UILoadingBarTest_Left();
     ~UILoadingBarTest_Left();
     virtual bool init() override;
-    void update(float delta)override;
+    void update(float delta) override;
     void printWidgetResources(cocos2d::Ref* sender);
-    
+
 protected:
     int _count;
     cocos2d::ui::LoadingBar* _loadingBar;
@@ -54,8 +54,8 @@ class UILoadingBarTest_Right : public UIScene
     UILoadingBarTest_Right();
     ~UILoadingBarTest_Right();
     virtual bool init() override;
-    void update(float delta)override;
-    
+    void update(float delta) override;
+
 protected:
     int _count;
 };
@@ -68,8 +68,8 @@ class UILoadingBarTest_Left_Scale9 : public UIScene
     UILoadingBarTest_Left_Scale9();
     ~UILoadingBarTest_Left_Scale9();
     virtual bool init() override;
-    void update(float delta)override;
-    
+    void update(float delta) override;
+
 protected:
     int _count;
 };
@@ -82,8 +82,8 @@ class UILoadingBarTest_Right_Scale9 : public UIScene
     UILoadingBarTest_Right_Scale9();
     ~UILoadingBarTest_Right_Scale9();
     virtual bool init() override;
-    void update(float delta)override;
-    
+    void update(float delta) override;
+
 protected:
     int _count;
 };
@@ -110,22 +110,21 @@ class UILoadingBarReloadTexture : public UIScene
     ~UILoadingBarReloadTexture();
     void update(float dt) override;
     virtual bool init() override;
-    
+
 protected:
     int _count;
-    
 };
 
 class UILoadingBarIssue12249 : public UIScene
 {
 public:
     CREATE_FUNC(UILoadingBarIssue12249);
-    
+
     UILoadingBarIssue12249();
     ~UILoadingBarIssue12249();
     virtual bool init() override;
-    void update(float delta)override;
-    
+    void update(float delta) override;
+
 protected:
     int _count;
 };
@@ -138,6 +137,7 @@ class UILoadingBarTest_Direction : public UIScene
     UILoadingBarTest_Direction();
     ~UILoadingBarTest_Direction();
     virtual bool init() override;
+
 protected:
     int _count;
     cocos2d::ui::LoadingBar* _loadingBar;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
index 1513af426504..107961b35298 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,40 +42,34 @@ UIPageViewTests::UIPageViewTests()
 }
 
 // UIPageViewTest
-UIPageViewTest::UIPageViewTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewTest::UIPageViewTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewTest::~UIPageViewTest()
-{
-}
+UIPageViewTest::~UIPageViewTest() {}
 
 bool UIPageViewTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f +
-                                              _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         Size size(240, 130);
         PageView* pageView = PageView::create();
@@ -86,140 +80,136 @@ bool UIPageViewTest::init()
         pageView->removeAllItems();
         pageView->setIndicatorEnabled(true);
         pageView->setGlobalZOrder(200);
-        
+
         int pageCount = 4;
         for (int i = 0; i < pageCount; ++i)
         {
             Layout* layout = Layout::create();
             layout->setContentSize(size);
-            
+
             ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
             imageView->setScale9Enabled(true);
             imageView->setContentSize(size);
             imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(imageView);
-            
-            Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
+
+            Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
             label->setColor(Color3B(192, 192, 192));
             label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(label);
-            
+
             pageView->insertCustomItem(layout, i);
         }
-        
+
         pageView->removeItem(0);
         pageView->scrollToItem(pageCount - 2);
-        
+
         cocos2d::log("TODO in %s %s %d", __FILE__, __FUNCTION__, __LINE__);
-        
+
         pageView->setIndicatorIndexNodesOpacity(255);
-        
+
         _uiLayer->addChild(pageView);
-        
+
         return true;
     }
     return false;
 }
 
-void UIPageViewTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
-        case PageView::EventType::TURNING:
-        {
-            PageView* pageView = dynamic_cast<PageView*>(pSender);
-            
-            _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
-        }
-            break;
-            
-        default:
-            break;
+    case PageView::EventType::TURNING:
+    {
+        PageView* pageView = dynamic_cast<PageView*>(pSender);
+
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
     }
-}
+    break;
 
+    default:
+        break;
+    }
+}
 
 // UIPageViewButtonTest
-UIPageViewButtonTest::UIPageViewButtonTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewButtonTest::UIPageViewButtonTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewButtonTest::~UIPageViewButtonTest()
-{
-}
+UIPageViewButtonTest::~UIPageViewButtonTest() {}
 
 bool UIPageViewButtonTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the drag panel events will be displayed
         _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView with Buttons", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setContentSize(Size(240.0f, 130.0f));
         Size backgroundSize = background->getContentSize();
         pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                   (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
+                                       (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                   (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
-        
+                                       (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
+
         pageView->removeAllItems();
-        
+
         int pageCount = 4;
         for (int i = 0; i < pageCount; ++i)
         {
             HBox* outerBox = HBox::create();
             outerBox->setContentSize(Size(240.0f, 130.0f));
 
-            for (int k = 0; k < 2; ++k) {
+            for (int k = 0; k < 2; ++k)
+            {
                 VBox* innerBox = VBox::create();
-                
-                for (int j = 0; j < 3; j++) {
-                    Button *btn = Button::create("cocosui/animationbuttonnormal.png",
-                                                 "cocosui/animationbuttonpressed.png");
+
+                for (int j = 0; j < 3; j++)
+                {
+                    Button* btn =
+                        Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
                     btn->setName(StringUtils::format("button %d", j));
-                    btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewButtonTest::onButtonClicked, this));
-                    
+                    btn->addTouchEventListener(CC_CALLBACK_2(UIPageViewButtonTest::onButtonClicked, this));
+
                     innerBox->addChild(btn);
                 }
-                
-                LinearLayoutParameter *parameter = LinearLayoutParameter::create();
-                parameter->setMargin(Margin(0.0f,0.0f,100.0f,0.0f));
+
+                LinearLayoutParameter* parameter = LinearLayoutParameter::create();
+                parameter->setMargin(Margin(0.0f, 0.0f, 100.0f, 0.0f));
                 innerBox->setLayoutParameter(parameter);
-                
-                outerBox->addChild(innerBox);
 
+                outerBox->addChild(innerBox);
             }
-            
+
             pageView->insertCustomItem(outerBox, i);
         }
-        
+
         pageView->removeItem(0);
-        
-        pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewButtonTest::pageViewEvent, this));
-        
+
+        pageView->addEventListener(
+            (PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewButtonTest::pageViewEvent, this));
+
         _uiLayer->addChild(pageView);
-        
+
         return true;
     }
     return false;
@@ -227,115 +217,111 @@ bool UIPageViewButtonTest::init()
 
 void UIPageViewButtonTest::onButtonClicked(Ref* sender, Widget::TouchEventType type)
 {
-    if(type == Widget::TouchEventType::ENDED) {
-        log("button %s clicked", static_cast<Button*>(sender)->getName().c_str());
+    if (type == Widget::TouchEventType::ENDED)
+    {
+        log("button %s clicked", static_cast<Button*>(sender)->getName().data());
     }
 }
 
-
-void UIPageViewButtonTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewButtonTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
-        case PageView::EventType::TURNING:
-        {
-            PageView* pageView = dynamic_cast<PageView*>(pSender);
-            
-            _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
-        }
-            break;
-            
-        default:
-            break;
+    case PageView::EventType::TURNING:
+    {
+        PageView* pageView = dynamic_cast<PageView*>(pSender);
+
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
     }
-}
+    break;
 
+    default:
+        break;
+    }
+}
 
 // UIPageViewTouchPropagationTest
-UIPageViewTouchPropagationTest::UIPageViewTouchPropagationTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewTouchPropagationTest::UIPageViewTouchPropagationTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewTouchPropagationTest::~UIPageViewTouchPropagationTest()
-{
-}
+UIPageViewTouchPropagationTest::~UIPageViewTouchPropagationTest() {}
 
 bool UIPageViewTouchPropagationTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView Touch Propagation", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setContentSize(Size(240.0f, 130.0f));
-        pageView->setAnchorPoint(Vec2(0.5f,0.5f));
+        pageView->setAnchorPoint(Vec2(0.5f, 0.5f));
         Size backgroundSize = background->getContentSize();
-        pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f));
+        pageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         pageView->setBackGroundColor(Color3B::GREEN);
         pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
-        
+
         int pageCount = 4;
         for (int i = 0; i < pageCount; ++i)
         {
             HBox* outerBox = HBox::create();
             outerBox->setContentSize(Size(240.0f, 130.0f));
-            
-            for (int k = 0; k < 2; ++k) {
+
+            for (int k = 0; k < 2; ++k)
+            {
                 VBox* innerBox = VBox::create();
-                
-                for (int j = 0; j < 3; j++) {
-                    Button *btn = Button::create("cocosui/animationbuttonnormal.png",
-                                                 "cocosui/animationbuttonpressed.png");
+
+                for (int j = 0; j < 3; j++)
+                {
+                    Button* btn =
+                        Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
                     btn->setName(StringUtils::format("button %d", j));
-                    btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewTouchPropagationTest::onButtonClicked, this));
-                    
+                    btn->addTouchEventListener(CC_CALLBACK_2(UIPageViewTouchPropagationTest::onButtonClicked, this));
+
                     innerBox->addChild(btn);
                 }
-                
-                LinearLayoutParameter *parameter = LinearLayoutParameter::create();
-                parameter->setMargin(Margin(0.0f,0.0f,100.0f,0.0f));
+
+                LinearLayoutParameter* parameter = LinearLayoutParameter::create();
+                parameter->setMargin(Margin(0.0f, 0.0f, 100.0f, 0.0f));
                 innerBox->setLayoutParameter(parameter);
-                
+
                 outerBox->addChild(innerBox);
-                
             }
-            
+
             pageView->insertCustomItem(outerBox, i);
         }
-        
-        pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewTouchPropagationTest::pageViewEvent, this));
+
+        pageView->addEventListener(
+            (PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewTouchPropagationTest::pageViewEvent, this));
         pageView->setName("pageView");
-        pageView->addTouchEventListener([](Ref* sender, Widget::TouchEventType type){
+        pageView->addTouchEventListener([](Ref* sender, Widget::TouchEventType type) {
             if (type == Widget::TouchEventType::BEGAN)
             {
                 CCLOG("page view touch began");
             }
-            else if(type == Widget::TouchEventType::MOVED)
+            else if (type == Widget::TouchEventType::MOVED)
             {
                 CCLOG("page view touch moved");
             }
-            else if(type == Widget::TouchEventType::ENDED)
+            else if (type == Widget::TouchEventType::ENDED)
             {
                 CCLOG("page view touch ended");
             }
@@ -345,50 +331,46 @@ bool UIPageViewTouchPropagationTest::init()
             }
         });
         _uiLayer->addChild(pageView);
-        
-        Text *propagationText = Text::create("Allow Propagation", "Arial", 10);
-        propagationText->setAnchorPoint(Vec2(0.0f,0.5f));
+
+        Text* propagationText = Text::create("Allow Propagation", "Arial", 10);
+        propagationText->setAnchorPoint(Vec2(0.0f, 0.5f));
         propagationText->setTextColor(Color4B::RED);
         propagationText->setPosition(Vec2(0.0f, pageView->getPosition().y + 50));
         _uiLayer->addChild(propagationText);
-        
-        Text *swallowTouchText = Text::create("Swallow Touches", "Arial", 10);
-        swallowTouchText->setAnchorPoint(Vec2(0.f,0.5f));
+
+        Text* swallowTouchText = Text::create("Swallow Touches", "Arial", 10);
+        swallowTouchText->setAnchorPoint(Vec2(0.f, 0.5f));
         swallowTouchText->setTextColor(Color4B::RED);
         swallowTouchText->setPosition(Vec2(0.0f, pageView->getPosition().y));
         _uiLayer->addChild(swallowTouchText);
-        
+
         // Create the checkbox
-        CheckBox* checkBox1 = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_normal_press.png",
-                                              "cocosui/check_box_active.png",
-                                              "cocosui/check_box_normal_disable.png",
-                                              "cocosui/check_box_active_disable.png");
-        checkBox1->setPosition(propagationText->getPosition() + Vec2(propagationText->getContentSize().width/2, -20.0f));
-        
+        CheckBox* checkBox1 = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                               "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
+                                               "cocosui/check_box_active_disable.png");
+        checkBox1->setPosition(propagationText->getPosition() +
+                               Vec2(propagationText->getContentSize().width / 2, -20.0f));
+
         checkBox1->setName("propagation");
         _uiLayer->addChild(checkBox1);
-        
-        
+
         // Create the checkbox
-        CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png",
-                                              "cocosui/check_box_normal_press.png",
-                                              "cocosui/check_box_active.png",
-                                              "cocosui/check_box_normal_disable.png",
-                                              "cocosui/check_box_active_disable.png");
-        checkBox2->setPosition(swallowTouchText->getPosition() + Vec2(swallowTouchText->getContentSize().width/2, -20.0f));
+        CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                                               "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
+                                               "cocosui/check_box_active_disable.png");
+        checkBox2->setPosition(swallowTouchText->getPosition() +
+                               Vec2(swallowTouchText->getContentSize().width / 2, -20.0f));
 
         checkBox2->setName("swallow");
         _uiLayer->addChild(checkBox2);
 
-        
-        auto eventListener = EventListenerTouchOneByOne::create();
-        eventListener->onTouchBegan = [](Touch* touch, Event* event) -> bool{
+        auto eventListener          = EventListenerTouchOneByOne::create();
+        eventListener->onTouchBegan = [](Touch* touch, Event* event) -> bool {
             CCLOG("layout receives touches");
             return true;
         };
         _eventDispatcher->addEventListenerWithSceneGraphPriority(eventListener, this);
-        
+
         return true;
     }
     return false;
@@ -396,99 +378,95 @@ bool UIPageViewTouchPropagationTest::init()
 
 void UIPageViewTouchPropagationTest::onButtonClicked(Ref* pSender, Widget::TouchEventType type)
 {
-    Button *btn = (Button*)pSender;
-    CheckBox *ck1 = (CheckBox*)_uiLayer->getChildByName("propagation");
-    CheckBox *ck2 = (CheckBox*)_uiLayer->getChildByName("swallow");
+    Button* btn   = (Button*)pSender;
+    CheckBox* ck1 = (CheckBox*)_uiLayer->getChildByName("propagation");
+    CheckBox* ck2 = (CheckBox*)_uiLayer->getChildByName("swallow");
     auto pageView = (PageView*)_uiLayer->getChildByName("pageView");
-    
+
     if (type == Widget::TouchEventType::BEGAN)
     {
         if (ck1->isSelected())
         {
             btn->setPropagateTouchEvents(true);
             pageView->setPropagateTouchEvents(true);
-            
-        }else
+        }
+        else
         {
             btn->setPropagateTouchEvents(false);
             pageView->setPropagateTouchEvents(false);
         }
-        
+
         if (ck2->isSelected())
         {
             btn->setSwallowTouches(true);
             pageView->setSwallowTouches(true);
-        }else
+        }
+        else
         {
             btn->setSwallowTouches(false);
             pageView->setSwallowTouches(false);
         }
     }
-    if (type == Widget::TouchEventType::ENDED) {
+    if (type == Widget::TouchEventType::ENDED)
+    {
         CCLOG("button clicked");
     }
 }
 
-
-void UIPageViewTouchPropagationTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewTouchPropagationTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
-        case PageView::EventType::TURNING:
-        {
-            PageView* pageView = dynamic_cast<PageView*>(pSender);
-            
-            _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
-        }
-            break;
-            
-        default:
-            break;
+    case PageView::EventType::TURNING:
+    {
+        PageView* pageView = dynamic_cast<PageView*>(pSender);
+
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
+    }
+    break;
+
+    default:
+        break;
     }
 }
 
 // UIPageViewDynamicAddAndRemoveTest
-UIPageViewDynamicAddAndRemoveTest::UIPageViewDynamicAddAndRemoveTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewDynamicAddAndRemoveTest::UIPageViewDynamicAddAndRemoveTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewDynamicAddAndRemoveTest::~UIPageViewDynamicAddAndRemoveTest()
-{
-}
+UIPageViewDynamicAddAndRemoveTest::~UIPageViewDynamicAddAndRemoveTest() {}
 
 bool UIPageViewDynamicAddAndRemoveTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("Click Buttons on the Left", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView Dynamic Modification", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setDirection(ui::PageView::Direction::VERTICAL);
         pageView->setContentSize(Size(240.0f, 130.0f));
-        pageView->setAnchorPoint(Vec2(0.5f,0.5f));
+        pageView->setAnchorPoint(Vec2(0.5f, 0.5f));
         Size backgroundSize = background->getContentSize();
-        pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f));
+        pageView->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         pageView->setBackGroundColor(Color3B::GREEN);
         pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
         pageView->setIndicatorEnabled(true);
@@ -499,150 +477,141 @@ bool UIPageViewDynamicAddAndRemoveTest::init()
         {
             HBox* outerBox = HBox::create();
             outerBox->setContentSize(Size(240.0f, 130.0f));
-            
+
             for (int k = 0; k < 2; ++k)
             {
                 VBox* innerBox = VBox::create();
-                
+
                 for (int j = 0; j < 3; j++)
                 {
-                    Button *btn = Button::create("cocosui/animationbuttonnormal.png",
-                                                 "cocosui/animationbuttonpressed.png");
+                    Button* btn =
+                        Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
                     btn->setName(StringUtils::format("button %d", j));
-                    
+
                     innerBox->addChild(btn);
                 }
-                
-                LinearLayoutParameter *parameter = LinearLayoutParameter::create();
-                parameter->setMargin(Margin(0.0f,0.0f,100.0f,0.0f));
+
+                LinearLayoutParameter* parameter = LinearLayoutParameter::create();
+                parameter->setMargin(Margin(0.0f, 0.0f, 100.0f, 0.0f));
                 innerBox->setLayoutParameter(parameter);
-                
+
                 outerBox->addChild(innerBox);
-                
             }
-            
+
             pageView->insertCustomItem(outerBox, i);
         }
-        
-        pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewDynamicAddAndRemoveTest::pageViewEvent, this));
+
+        pageView->addEventListener(
+            (PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewDynamicAddAndRemoveTest::pageViewEvent, this));
         pageView->setName("pageView");
         _uiLayer->addChild(pageView);
-        
-        //add buttons
+
+        // add buttons
         auto button = Button::create();
-        button->setPositionNormalized(Vec2(0.12f,0.7f));
+        button->setPositionNormalized(Vec2(0.12f, 0.7f));
         button->setTitleText("Add A Page");
         button->setZoomScale(0.3f);
         button->setPressedActionEnabled(true);
         button->setTitleColor(Color3B::RED);
-        button->addClickEventListener([=](Ref* sender)
-        {
+        button->addClickEventListener([=](Ref* sender) {
             HBox* outerBox = HBox::create();
             outerBox->setContentSize(Size(240.0f, 130.0f));
-            
+
             for (int k = 0; k < 2; ++k)
             {
                 VBox* innerBox = VBox::create();
                 for (int j = 0; j < 3; j++)
                 {
-                    Button *btn = Button::create("cocosui/animationbuttonnormal.png",
-                                                 "cocosui/animationbuttonpressed.png");
+                    Button* btn =
+                        Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
                     btn->setName(StringUtils::format("button %d", j));
                     innerBox->addChild(btn);
                 }
-                
-                LinearLayoutParameter *parameter = LinearLayoutParameter::create();
-                parameter->setMargin(Margin(0.0f,0.0f,100.0f,0.0f));
+
+                LinearLayoutParameter* parameter = LinearLayoutParameter::create();
+                parameter->setMargin(Margin(0.0f, 0.0f, 100.0f, 0.0f));
                 innerBox->setLayoutParameter(parameter);
                 outerBox->addChild(innerBox);
             }
-            
+
             pageView->pushBackCustomItem(outerBox);
-            _displayValueLabel->setString(StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
+            _displayValueLabel->setString(
+                StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
             CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
         });
         _uiLayer->addChild(button);
-        
+
         auto button2 = Button::create();
-        button2->setPositionNormalized(Vec2(0.12f,0.5f));
+        button2->setPositionNormalized(Vec2(0.12f, 0.5f));
         button2->setTitleText("Remove A Page");
         button2->setZoomScale(0.3f);
         button2->setPressedActionEnabled(true);
         button2->setTitleColor(Color3B::RED);
-        button2->addClickEventListener([=](Ref* sender)
-        {
+        button2->addClickEventListener([=](Ref* sender) {
             if (pageView->getItems().size() > 0)
             {
-                pageView->removeItem(pageView->getItems().size()-1);
+                pageView->removeItem(pageView->getItems().size() - 1);
             }
             else
             {
                 CCLOG("There is no page to remove!");
             }
-            _displayValueLabel->setString(StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
+            _displayValueLabel->setString(
+                StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
             CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
-
         });
         _uiLayer->addChild(button2);
-        
+
         auto button3 = Button::create();
-        button3->setPositionNormalized(Vec2(0.12f,0.3f));
+        button3->setPositionNormalized(Vec2(0.12f, 0.3f));
         button3->setTitleText("Remove All Pages");
         button3->setZoomScale(0.3f);
         button3->setPressedActionEnabled(true);
         button3->setTitleColor(Color3B::RED);
-        button3->addClickEventListener([=](Ref* sender)
-        {
+        button3->addClickEventListener([=](Ref* sender) {
             pageView->removeAllItems();
-            _displayValueLabel->setString(StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
+            _displayValueLabel->setString(
+                StringUtils::format("page count = %d", static_cast<int32_t>(pageView->getItems().size())));
             CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
-
         });
         _uiLayer->addChild(button3);
 
         auto button4 = (ui::Button*)button3->clone();
         button4->setTitleText("Scroll to Page4");
         button4->setPositionNormalized(Vec2(0.85f, 0.5f));
-        button4->addClickEventListener([=](Ref* sender){
+        button4->addClickEventListener([=](Ref* sender) {
             pageView->scrollToItem(3);
             CCLOG("current page index = %zd", pageView->getCurrentPageIndex());
         });
         _uiLayer->addChild(button4);
-        
+
         return true;
     }
     return false;
 }
 
-
-void UIPageViewDynamicAddAndRemoveTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewDynamicAddAndRemoveTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
-        case PageView::EventType::TURNING:
-        {
-            PageView* pageView = dynamic_cast<PageView*>(pSender);
-            
-            _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>((pageView->getCurrentPageIndex() + 1))));
-        }
-            break;
-            
-        default:
-            break;
+    case PageView::EventType::TURNING:
+    {
+        PageView* pageView = dynamic_cast<PageView*>(pSender);
+
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>((pageView->getCurrentPageIndex() + 1))));
     }
-}
+    break;
 
+    default:
+        break;
+    }
+}
 
 // UIPageViewJumpToPageTest
-UIPageViewJumpToPageTest::UIPageViewJumpToPageTest()
-: _displayValueLabel(nullptr)
-{
+UIPageViewJumpToPageTest::UIPageViewJumpToPageTest() : _displayValueLabel(nullptr) {}
 
-}
-
-UIPageViewJumpToPageTest::~UIPageViewJumpToPageTest()
-{
-}
+UIPageViewJumpToPageTest::~UIPageViewJumpToPageTest() {}
 
 bool UIPageViewJumpToPageTest::init()
 {
@@ -653,15 +622,15 @@ bool UIPageViewJumpToPageTest::init()
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("setCurrentPageIndex API Test", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f +
-                                              _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
 
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
@@ -673,9 +642,9 @@ bool UIPageViewJumpToPageTest::init()
         pageView->setContentSize(Size(240.0f, 130.0f));
         Size backgroundSize = background->getContentSize();
         pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                  (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
-                                  (widgetSize.height - backgroundSize.height) / 2.0f +
-                                  (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
+                                       (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
+                                   (widgetSize.height - backgroundSize.height) / 2.0f +
+                                       (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
         pageView->setIndicatorEnabled(true);
         pageView->removeAllItems();
 
@@ -691,7 +660,7 @@ bool UIPageViewJumpToPageTest::init()
             imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(imageView);
 
-            Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
+            Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
             label->setColor(Color3B(192, 192, 192));
             label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(label);
@@ -701,41 +670,31 @@ bool UIPageViewJumpToPageTest::init()
 
         pageView->setCurrentPageIndex(1);
 
-        //add buttons to jump to specific page
+        // add buttons to jump to specific page
         auto button1 = ui::Button::create();
         button1->setPositionNormalized(Vec2(0.1f, 0.75f));
         button1->setTitleText("Jump to Page1");
-        CCLOG("button1 content Size = %f, %f", button1->getContentSize().width,
-              button1->getContentSize().height);
-        button1->addClickEventListener([=](Ref*){
-            pageView->setCurrentPageIndex(0);
-        });
+        CCLOG("button1 content Size = %f, %f", button1->getContentSize().width, button1->getContentSize().height);
+        button1->addClickEventListener([=](Ref*) { pageView->setCurrentPageIndex(0); });
         _uiLayer->addChild(button1);
 
         auto button2 = static_cast<ui::Button*>(button1->clone());
         button2->setTitleText("Jump to Page2");
         button2->setPositionNormalized(Vec2(0.1f, 0.65f));
-        CCLOG("button2 content Size = %f, %f", button2->getContentSize().width,
-              button2->getContentSize().height);
-        button2->addClickEventListener([=](Ref*){
-            pageView->setCurrentPageIndex(1);
-        });
+        CCLOG("button2 content Size = %f, %f", button2->getContentSize().width, button2->getContentSize().height);
+        button2->addClickEventListener([=](Ref*) { pageView->setCurrentPageIndex(1); });
         _uiLayer->addChild(button2);
 
         auto button3 = static_cast<ui::Button*>(button2->clone());
         button3->setTitleText("Jump to Page3");
         button3->setPositionNormalized(Vec2(0.9f, 0.75f));
-        button3->addClickEventListener([=](Ref*){
-            pageView->setCurrentPageIndex(2);
-        });
+        button3->addClickEventListener([=](Ref*) { pageView->setCurrentPageIndex(2); });
         _uiLayer->addChild(button3);
 
         auto button4 = static_cast<ui::Button*>(button2->clone());
         button4->setTitleText("Jump to Page4");
         button4->setPositionNormalized(Vec2(0.9f, 0.65f));
-        button4->addClickEventListener([=](Ref*){
-            pageView->setCurrentPageIndex(3);
-        });
+        button4->addClickEventListener([=](Ref*) { pageView->setCurrentPageIndex(3); });
         _uiLayer->addChild(button4);
         _uiLayer->addChild(pageView);
 
@@ -745,40 +704,34 @@ bool UIPageViewJumpToPageTest::init()
 }
 
 // UIPageViewVerticalTest
-UIPageViewVerticalTest::UIPageViewVerticalTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewVerticalTest::UIPageViewVerticalTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewVerticalTest::~UIPageViewVerticalTest()
-{
-}
+UIPageViewVerticalTest::~UIPageViewVerticalTest() {}
 
 bool UIPageViewVerticalTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("Move by Vertical direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setIndicatorEnabled(true);
@@ -787,137 +740,127 @@ bool UIPageViewVerticalTest::init()
         Size backgroundSize = background->getContentSize();
         pageView->setPosition((widgetSize - pageView->getContentSize()) / 2.0f);
         pageView->removeAllItems();
-        
+
         int pageCount = 4;
         for (int i = 0; i < pageCount; ++i)
         {
             Layout* layout = Layout::create();
             layout->setContentSize(Size(240.0f, 130.0f));
-            
+
             ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
             imageView->setScale9Enabled(true);
             imageView->setContentSize(Size(240.0f, 130.0f));
             imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(imageView);
-            
-            Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
+
+            Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
             label->setColor(Color3B(192, 192, 192));
             label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(label);
-            
+
             pageView->insertCustomItem(layout, i);
         }
-        
-        pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewVerticalTest::pageViewEvent, this));
-        
+
+        pageView->addEventListener(
+            (PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewVerticalTest::pageViewEvent, this));
+
         _uiLayer->addChild(pageView);
-        
+
         return true;
     }
     return false;
 }
 
-void UIPageViewVerticalTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewVerticalTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
-        case PageView::EventType::TURNING:
-        {
-            PageView* pageView = dynamic_cast<PageView*>(pSender);
-            
-            _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
-        }
-            break;
-            
-        default:
-            break;
+    case PageView::EventType::TURNING:
+    {
+        PageView* pageView = dynamic_cast<PageView*>(pSender);
+
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
+    }
+    break;
+
+    default:
+        break;
     }
 }
 
 // UIPageViewDisableTouchTest
-UIPageViewDisableTouchTest::UIPageViewDisableTouchTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewDisableTouchTest::UIPageViewDisableTouchTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewDisableTouchTest::~UIPageViewDisableTouchTest()
-{
-}
+UIPageViewDisableTouchTest::~UIPageViewDisableTouchTest() {}
 
 bool UIPageViewDisableTouchTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("PageView disable touch", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setContentSize(Size(240.0f, 130.0f));
         Size backgroundSize = background->getContentSize();
         pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                   (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
+                                       (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                   (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
+                                       (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
         pageView->setDirection(ui::PageView::Direction::VERTICAL);
         pageView->setTouchEnabled(false);
         pageView->removeAllItems();
-        
+
         int pageCount = 4;
         for (int i = 0; i < pageCount; ++i)
         {
             Layout* layout = Layout::create();
             layout->setContentSize(Size(240.0f, 130.0f));
-            
+
             ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
             imageView->setScale9Enabled(true);
             imageView->setContentSize(Size(240.0f, 130.0f));
             imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(imageView);
-            
-            Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
+
+            Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
             label->setColor(Color3B(192, 192, 192));
             label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(label);
-            
+
             pageView->insertCustomItem(layout, i);
         }
-        
+
         _uiLayer->addChild(pageView);
-        
+
         return true;
     }
     return false;
 }
 
 // UIPageViewTest
-UIPageViewChildSizeTest::UIPageViewChildSizeTest()
-    : _displayValueLabel(nullptr)
-{
+UIPageViewChildSizeTest::UIPageViewChildSizeTest() : _displayValueLabel(nullptr) {}
 
-}
-
-UIPageViewChildSizeTest::~UIPageViewChildSizeTest()
-{
-}
+UIPageViewChildSizeTest::~UIPageViewChildSizeTest() {}
 
 bool UIPageViewChildSizeTest::init()
 {
@@ -928,15 +871,15 @@ bool UIPageViewChildSizeTest::init()
         // Add a label in which the dragpanel events will be displayed
         _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f +
-            _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
 
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
@@ -967,7 +910,8 @@ bool UIPageViewChildSizeTest::init()
             pageView->insertCustomItem(imageView, i);
         }
 
-        pageView->addEventListener((PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewChildSizeTest::pageViewEvent, this));
+        pageView->addEventListener(
+            (PageView::ccPageViewCallback)CC_CALLBACK_2(UIPageViewChildSizeTest::pageViewEvent, this));
 
         _uiLayer->addChild(pageView);
 
@@ -976,7 +920,7 @@ bool UIPageViewChildSizeTest::init()
     return false;
 }
 
-void UIPageViewChildSizeTest::pageViewEvent(Ref *pSender, PageView::EventType type)
+void UIPageViewChildSizeTest::pageViewEvent(Ref* pSender, PageView::EventType type)
 {
     switch (type)
     {
@@ -984,7 +928,8 @@ void UIPageViewChildSizeTest::pageViewEvent(Ref *pSender, PageView::EventType ty
     {
         PageView* pageView = dynamic_cast<PageView*>(pSender);
 
-        _displayValueLabel->setString(StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
+        _displayValueLabel->setString(
+            StringUtils::format("page = %d", static_cast<int32_t>(pageView->getCurrentPageIndex() + 1)));
     }
     break;
 
@@ -994,51 +939,46 @@ void UIPageViewChildSizeTest::pageViewEvent(Ref *pSender, PageView::EventType ty
 }
 
 // UIPageViewIndicatorTest
-UIPageViewIndicatorTest::UIPageViewIndicatorTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIPageViewIndicatorTest::UIPageViewIndicatorTest() : _displayValueLabel(nullptr) {}
 
-UIPageViewIndicatorTest::~UIPageViewIndicatorTest()
-{
-}
+UIPageViewIndicatorTest::~UIPageViewIndicatorTest() {}
 
 bool UIPageViewIndicatorTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
-        _displayValueLabel = Text::create("PageView indicator custom texture\nscale : 0.5, index color: RED", "fonts/Marker Felt.ttf", 16);
+        _displayValueLabel = Text::create("PageView indicator custom texture\nscale : 0.5, index color: RED",
+                                          "fonts/Marker Felt.ttf", 16);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f +
-                                             _displayValueLabel->getContentSize().height));
+        _displayValueLabel->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the black background
         Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the page view
         PageView* pageView = PageView::create();
         pageView->setContentSize(Size(240.0f, 130.0f));
         Size backgroundSize = background->getContentSize();
         pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                   (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
+                                       (backgroundSize.width - pageView->getContentSize().width) / 2.0f,
                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                   (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
+                                       (backgroundSize.height - pageView->getContentSize().height) / 2.0f));
         pageView->setDirection(ui::PageView::Direction::VERTICAL);
         pageView->removeAllItems();
-        
+
         pageView->setIndicatorEnabled(true);
         pageView->setIndicatorSpaceBetweenIndexNodes(5);
         pageView->setIndicatorIndexNodesScale(0.5);
@@ -1050,27 +990,24 @@ bool UIPageViewIndicatorTest::init()
         {
             Layout* layout = Layout::create();
             layout->setContentSize(Size(240.0f, 130.0f));
-            
+
             ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png");
             imageView->setScale9Enabled(true);
             imageView->setContentSize(Size(240.0f, 130.0f));
             imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(imageView);
-            
-            Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30);
+
+            Text* label = Text::create(StringUtils::format("page %d", (i + 1)), "fonts/Marker Felt.ttf", 30);
             label->setColor(Color3B(192, 192, 192));
             label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f));
             layout->addChild(label);
-            
+
             pageView->insertCustomItem(layout, i);
         }
-        
+
         _uiLayer->addChild(pageView);
-    
-        
+
         return true;
     }
     return false;
 }
-
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
index 83f8b66e1fcb..ce4c06042368 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,7 +42,6 @@ class UIPageViewTest : public UIScene
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -54,11 +53,11 @@ class UIPageViewButtonTest : public UIScene
     UIPageViewButtonTest();
     ~UIPageViewButtonTest();
     virtual bool init() override;
-    
+
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
     void onButtonClicked(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -70,12 +69,11 @@ class UIPageViewTouchPropagationTest : public UIScene
     UIPageViewTouchPropagationTest();
     ~UIPageViewTouchPropagationTest();
     virtual bool init() override;
-    
+
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
     void onButtonClicked(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
 
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -87,12 +85,11 @@ class UIPageViewDynamicAddAndRemoveTest : public UIScene
     UIPageViewDynamicAddAndRemoveTest();
     ~UIPageViewDynamicAddAndRemoveTest();
     virtual bool init() override;
-    
+
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
     void onButtonClicked(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -106,7 +103,6 @@ class UIPageViewJumpToPageTest : public UIScene
     virtual bool init() override;
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -114,15 +110,14 @@ class UIPageViewVerticalTest : public UIScene
 {
 public:
     CREATE_FUNC(UIPageViewVerticalTest);
-    
+
     UIPageViewVerticalTest();
     ~UIPageViewVerticalTest();
     virtual bool init() override;
-    
+
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -130,13 +125,12 @@ class UIPageViewDisableTouchTest : public UIScene
 {
 public:
     CREATE_FUNC(UIPageViewDisableTouchTest);
-    
+
     UIPageViewDisableTouchTest();
     ~UIPageViewDisableTouchTest();
     virtual bool init() override;
-        
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -152,7 +146,6 @@ class UIPageViewChildSizeTest : public UIScene
     void pageViewEvent(cocos2d::Ref* sender, cocos2d::ui::PageView::EventType type);
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -160,13 +153,12 @@ class UIPageViewIndicatorTest : public UIScene
 {
 public:
     CREATE_FUNC(UIPageViewIndicatorTest);
-    
+
     UIPageViewIndicatorTest();
     ~UIPageViewIndicatorTest();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.cpp
index a30b8c0bf26a..a20fc29a83e4 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,43 +34,37 @@ UIRadioButtonTests::UIRadioButtonTests()
     ADD_TEST_CASE(UIRadioButtonTabTest);
 }
 
-
 // UIRadioButtonTest
-UIRadioButtonTest::UIRadioButtonTest() :
-_radioButtonGroup(nullptr),
-_allowNoSelectionText(nullptr)
-{
-}
-UIRadioButtonTest::~UIRadioButtonTest()
-{
-}
+UIRadioButtonTest::UIRadioButtonTest() : _radioButtonGroup(nullptr), _allowNoSelectionText(nullptr) {}
+UIRadioButtonTest::~UIRadioButtonTest() {}
 
 static const float BUTTON_WIDTH = 30;
-static float startPosX = 0;
+static float startPosX          = 0;
 
 bool UIRadioButtonTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Create a radio button group
         _radioButtonGroup = RadioButtonGroup::create();
         _uiLayer->addChild(_radioButtonGroup);
-        
+
         // Create the radio buttons
         static const int NUMBER_OF_BUTTONS = 5;
-        startPosX = widgetSize.width / 2.0f - ((NUMBER_OF_BUTTONS - 1) / 2.0f) * BUTTON_WIDTH;
-        for(int i = 0; i < NUMBER_OF_BUTTONS; ++i)
+        startPosX                          = widgetSize.width / 2.0f - ((NUMBER_OF_BUTTONS - 1) / 2.0f) * BUTTON_WIDTH;
+        for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
         {
-            RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
+            RadioButton* radioButton =
+                RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
             float posX = startPosX + BUTTON_WIDTH * i;
             radioButton->setPosition(Vec2(posX, widgetSize.height / 2.0f + 10));
             radioButton->setScale(1.2f);
             _radioButtonGroup->addRadioButton(radioButton);
             _uiLayer->addChild(radioButton);
         }
-        
+
         // Add button
         Button* addButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         addButton->setTitleText("Add");
@@ -78,7 +72,7 @@ bool UIRadioButtonTest::init()
         addButton->addClickEventListener(CC_CALLBACK_1(UIRadioButtonTest::addRadioButton, this));
         addButton->setScale(0.7f);
         _uiLayer->addChild(addButton);
-        
+
         // Delete button
         Button* deleteButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         deleteButton->setTitleText("Delete");
@@ -86,18 +80,19 @@ bool UIRadioButtonTest::init()
         deleteButton->addClickEventListener(CC_CALLBACK_1(UIRadioButtonTest::deleteRadioButton, this));
         deleteButton->setScale(0.7f);
         _uiLayer->addChild(deleteButton);
-        
+
         // Toggle button
         Button* allowNoSelectionToggle = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         allowNoSelectionToggle->setTitleText("Toggle Allow-No-Selection");
         allowNoSelectionToggle->setPosition(Vec2(widgetSize.width / 2.0f + 100, widgetSize.height / 2.0f - 65));
         allowNoSelectionToggle->addClickEventListener([this](Ref*) {
             _radioButtonGroup->setAllowedNoSelection(!_radioButtonGroup->isAllowedNoSelection());
-            _allowNoSelectionText->setString(_radioButtonGroup->isAllowedNoSelection() ? "No selection is allowed." : "No selection is disallowed.");
+            _allowNoSelectionText->setString(_radioButtonGroup->isAllowedNoSelection() ? "No selection is allowed."
+                                                                                       : "No selection is disallowed.");
         });
         allowNoSelectionToggle->setScale(0.7f);
         _uiLayer->addChild(allowNoSelectionToggle);
-        
+
         // Add a label for toggle
         _allowNoSelectionText = Text::create("No selection is disallowed.", "fonts/Marker Felt.ttf", 20);
         _allowNoSelectionText->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 70));
@@ -111,9 +106,10 @@ bool UIRadioButtonTest::init()
 void UIRadioButtonTest::addRadioButton(Ref* sender)
 {
     Vec2 pos;
-    if(_radioButtonGroup->getNumberOfRadioButtons() > 0)
+    if (_radioButtonGroup->getNumberOfRadioButtons() > 0)
     {
-        RadioButton* lastRadioButton = _radioButtonGroup->getRadioButtonByIndex((int)_radioButtonGroup->getNumberOfRadioButtons() - 1);
+        RadioButton* lastRadioButton =
+            _radioButtonGroup->getRadioButtonByIndex((int)_radioButtonGroup->getNumberOfRadioButtons() - 1);
         pos = lastRadioButton->getPosition();
     }
     else
@@ -121,7 +117,7 @@ void UIRadioButtonTest::addRadioButton(Ref* sender)
         pos.x = startPosX - BUTTON_WIDTH;
         pos.y = _widget->getContentSize().height / 2.0f + 10;
     }
-    
+
     RadioButton* radioButton = RadioButton::create("cocosui/radio_button_off.png", "cocosui/radio_button_on.png");
     pos.x += BUTTON_WIDTH;
     radioButton->setPosition(pos);
@@ -131,108 +127,105 @@ void UIRadioButtonTest::addRadioButton(Ref* sender)
 
 void UIRadioButtonTest::deleteRadioButton(Ref* sender)
 {
-    if(_radioButtonGroup->getNumberOfRadioButtons() > 0)
+    if (_radioButtonGroup->getNumberOfRadioButtons() > 0)
     {
-        RadioButton* radioButton = _radioButtonGroup->getRadioButtonByIndex((int)_radioButtonGroup->getNumberOfRadioButtons() - 1);
+        RadioButton* radioButton =
+            _radioButtonGroup->getRadioButtonByIndex((int)_radioButtonGroup->getNumberOfRadioButtons() - 1);
         _radioButtonGroup->removeRadioButton(radioButton);
         _uiLayer->removeChild(radioButton, true);
     }
 }
 
-
-
-
 // UIRadioButtonTwoGroupsTest
 UIRadioButtonTwoGroupsTest::UIRadioButtonTwoGroupsTest()
-: _groupEventLabel(nullptr),
-_buttonEventLabel(nullptr),
-_logConsole(nullptr),
-_numberOfLogLines(0)
+    : _groupEventLabel(nullptr), _buttonEventLabel(nullptr), _logConsole(nullptr), _numberOfLogLines(0)
 {
     _radioButtonGroups[0] = nullptr;
     _radioButtonGroups[1] = nullptr;
 }
 
-UIRadioButtonTwoGroupsTest::~UIRadioButtonTwoGroupsTest()
-{
-}
+UIRadioButtonTwoGroupsTest::~UIRadioButtonTwoGroupsTest() {}
 
 bool UIRadioButtonTwoGroupsTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the radio button events will be displayed
         _groupEventLabel = Text::create("RadioButtonGroup : No Event", "fonts/Marker Felt.ttf", 25);
         _groupEventLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _groupEventLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 70));
         _uiLayer->addChild(_groupEventLabel);
-        
+
         _buttonEventLabel = Text::create("RadioButton : No Event", "fonts/Marker Felt.ttf", 25);
         _buttonEventLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _buttonEventLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 35));
         _uiLayer->addChild(_buttonEventLabel);
-        
+
         _logConsole = Text::create("", "fonts/Marker Felt.ttf", 10);
         _logConsole->setAnchorPoint(Vec2(0.0f, 1.0f));
         _logConsole->setPosition(Vec2(widgetSize.width / 2.0f + 110, widgetSize.height / 2.0f + 55));
         _uiLayer->addChild(_logConsole);
 
-        static const int NUMBER_OF_BUTTONS = 4;
+        static const int NUMBER_OF_BUTTONS       = 4;
         static const float SPACE_BETWEEN_BUTTONS = 50;
         float startPosX = widgetSize.width / 2.0f - ((NUMBER_OF_BUTTONS - 1) / 2.0f) * SPACE_BETWEEN_BUTTONS;
-        
-        for(int type = 0; type < 2; ++type)
+
+        for (int type = 0; type < 2; ++type)
         {
             // Create a radio button group
             const char *normalImage, *selectedImage;
-            float posYAdjust = 0;
+            float posYAdjust         = 0;
             _radioButtonGroups[type] = RadioButtonGroup::create();
-            if(type == 0)
+            if (type == 0)
             {
-                _radioButtonGroups[type]->addEventListener(CC_CALLBACK_3(UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup1, this));
-                normalImage = "cocosui/radio_button_off.png";
+                _radioButtonGroups[type]->addEventListener(
+                    CC_CALLBACK_3(UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup1, this));
+                normalImage   = "cocosui/radio_button_off.png";
                 selectedImage = "cocosui/radio_button_on.png";
-                posYAdjust = 35;
+                posYAdjust    = 35;
             }
             else
             {
-                _radioButtonGroups[type]->addEventListener(CC_CALLBACK_3(UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup2, this));
-                normalImage = "cocosui/UIEditorTest/2.1/Button/button_common_box03_003 copy 221.png";
+                _radioButtonGroups[type]->addEventListener(
+                    CC_CALLBACK_3(UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup2, this));
+                normalImage   = "cocosui/UIEditorTest/2.1/Button/button_common_box03_003 copy 221.png";
                 selectedImage = "cocosui/UIEditorTest/2.1/Button/button_common_box03_001.png";
-                posYAdjust = -15;
+                posYAdjust    = -15;
             }
             _uiLayer->addChild(_radioButtonGroups[type]);
-            
+
             // Set allowing no selections
             _radioButtonGroups[type]->setAllowedNoSelection(type == 0);
 
             // Create the radio buttons
-            for(int i = 0; i < NUMBER_OF_BUTTONS; ++i)
+            for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
             {
                 RadioButton* radioButton = nullptr;
-                float posY = widgetSize.height / 2.0f + posYAdjust;
-                radioButton = RadioButton::create(normalImage, selectedImage);
-                float posX = startPosX + SPACE_BETWEEN_BUTTONS * i;
+                float posY               = widgetSize.height / 2.0f + posYAdjust;
+                radioButton              = RadioButton::create(normalImage, selectedImage);
+                float posX               = startPosX + SPACE_BETWEEN_BUTTONS * i;
                 radioButton->setScale(1.5f);
                 radioButton->setPosition(Vec2(posX, posY));
-                
-                radioButton->addEventListener(CC_CALLBACK_2(UIRadioButtonTwoGroupsTest::onChangedRadioButtonSelect, this));
+
+                radioButton->addEventListener(
+                    CC_CALLBACK_2(UIRadioButtonTwoGroupsTest::onChangedRadioButtonSelect, this));
                 radioButton->setTag(i);
                 _uiLayer->addChild(radioButton);
                 _radioButtonGroups[type]->addRadioButton(radioButton);
             }
         }
-        
+
         Button* clearButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         clearButton->setTitleText("Clear");
         clearButton->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 65));
         clearButton->addClickEventListener(CC_CALLBACK_1(UIRadioButtonTwoGroupsTest::clearRadioButtonGroup, this));
         clearButton->setScale(0.8f);
         _uiLayer->addChild(clearButton);
-        
-        Text* text1 = Text::create("Upper radio button group is allowed non-selection, but lower one is not.", "fonts/Marker Felt.ttf", 15);
+
+        Text* text1 = Text::create("Upper radio button group is allowed non-selection, but lower one is not.",
+                                   "fonts/Marker Felt.ttf", 15);
         text1->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 100));
         _uiLayer->addChild(text1);
 
@@ -241,7 +234,9 @@ bool UIRadioButtonTwoGroupsTest::init()
     return false;
 }
 
-void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup1(RadioButton* radioButton, int index, cocos2d::ui::RadioButtonGroup::EventType type)
+void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup1(RadioButton* radioButton,
+                                                            int index,
+                                                            cocos2d::ui::RadioButtonGroup::EventType type)
 {
     CCASSERT(index == _radioButtonGroups[0]->getSelectedButtonIndex(), "The two indexes must match!");
     auto text = StringUtils::format("RadioButtonGroup1 : %d", index);
@@ -249,7 +244,9 @@ void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup1(RadioButton* radioBu
     addLog(text);
 }
 
-void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup2(RadioButton* radioButton, int index, cocos2d::ui::RadioButtonGroup::EventType type)
+void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup2(RadioButton* radioButton,
+                                                            int index,
+                                                            cocos2d::ui::RadioButtonGroup::EventType type)
 {
     CCASSERT(index == _radioButtonGroups[1]->getSelectedButtonIndex(), "The two indexes must match!");
     auto text = StringUtils::format("RadioButtonGroup2 : %d", index);
@@ -259,26 +256,26 @@ void UIRadioButtonTwoGroupsTest::onChangedRadioButtonGroup2(RadioButton* radioBu
 
 void UIRadioButtonTwoGroupsTest::onChangedRadioButtonSelect(RadioButton* radioButton, RadioButton::EventType type)
 {
-    if(radioButton == nullptr)
+    if (radioButton == nullptr)
     {
         return;
     }
     auto text = StringUtils::format("RadioButton %d : ", radioButton->getTag());
     switch (type)
     {
-        case RadioButton::EventType::SELECTED:
-        {
-            text.append("Selected");
-            break;
-        }
-            
-        case RadioButton::EventType::UNSELECTED:
-        {
-            text.append("Unselected");
-            break;
-        }
-        default:
-            break;
+    case RadioButton::EventType::SELECTED:
+    {
+        text.append("Selected");
+        break;
+    }
+
+    case RadioButton::EventType::UNSELECTED:
+    {
+        text.append("Unselected");
+        break;
+    }
+    default:
+        break;
     }
     _buttonEventLabel->setString(text);
     addLog(text);
@@ -286,44 +283,43 @@ void UIRadioButtonTwoGroupsTest::onChangedRadioButtonSelect(RadioButton* radioBu
 
 void UIRadioButtonTwoGroupsTest::clearRadioButtonGroup(Ref* sender)
 {
-    for(int i = 0; i < 2; ++i)
+    for (int i = 0; i < 2; ++i)
     {
         _radioButtonGroups[i]->setSelectedButton(nullptr);
     }
 }
 
-void UIRadioButtonTwoGroupsTest::addLog(const std::string& log)
+void UIRadioButtonTwoGroupsTest::addLog(std::string_view log)
 {
-    std::string existingLog = _logConsole->getString();
-    if(!existingLog.empty())
+    std::string existingLog{_logConsole->getString()};
+    if (!existingLog.empty())
     {
         existingLog = existingLog + "\n";
     }
-    existingLog = existingLog + log;
+    existingLog += log;
     ++_numberOfLogLines;
-    
-    if(_numberOfLogLines > 10)
+
+    if (_numberOfLogLines > 10)
     {
-        size_t pos = existingLog.find('\n') + 1;
+        size_t pos         = existingLog.find('\n') + 1;
         std::string newLog = existingLog.substr(pos);
-        existingLog = newLog;
+        existingLog        = newLog;
         --_numberOfLogLines;
     }
-    
+
     _logConsole->setString(existingLog);
 }
 
-
 // UIRadioButtonTabTest
 bool UIRadioButtonTabTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         static const float BUTTON_SCALE = 0.5f;
-        const float buttonWidth = 350 * BUTTON_SCALE / Director::getInstance()->getContentScaleFactor();
-        
+        const float buttonWidth         = 350 * BUTTON_SCALE / Director::getInstance()->getContentScaleFactor();
+
         // Background for buttons
         LayerColor* colorLayer = LayerColor::create(Color4B::WHITE);
         colorLayer->setIgnoreAnchorPointForPosition(false);
@@ -331,20 +327,20 @@ bool UIRadioButtonTabTest::init()
         colorLayer->setContentSize(Size(buttonWidth * 3, 170 / Director::getInstance()->getContentScaleFactor()));
         colorLayer->setPosition(widgetSize / 2.0f);
         _uiLayer->addChild(colorLayer);
-        
+
         // Create a radio button group
         RadioButtonGroup* radioButtonGroup = RadioButtonGroup::create();
         _uiLayer->addChild(radioButtonGroup);
-        
+
         // Create the radio buttons
         static const int NUMBER_OF_BUTTONS = 3;
-        float startPosX = widgetSize.width / 2.0f - ((NUMBER_OF_BUTTONS - 1) / 2.0f) * buttonWidth;
-        for(int i = 0; i < NUMBER_OF_BUTTONS; ++i)
+        float startPosX                    = widgetSize.width / 2.0f - ((NUMBER_OF_BUTTONS - 1) / 2.0f) * buttonWidth;
+        for (int i = 0; i < NUMBER_OF_BUTTONS; ++i)
         {
-            auto filePathNormal = StringUtils::format("cocosui/btn_exercise%02d_n.png", i + 1);
-            auto filePathSelected = StringUtils::format("cocosui/btn_exercise%02d_p.png", i + 1);
+            auto filePathNormal      = StringUtils::format("cocosui/btn_exercise%02d_n.png", i + 1);
+            auto filePathSelected    = StringUtils::format("cocosui/btn_exercise%02d_p.png", i + 1);
             RadioButton* radioButton = RadioButton::create(filePathNormal, filePathSelected);
-            float posX = startPosX + buttonWidth * i;
+            float posX               = startPosX + buttonWidth * i;
             radioButton->setPosition(Vec2(posX, widgetSize.height / 2.0f));
             radioButton->setScale(BUTTON_SCALE);
             radioButton->setZoomScale(0.05f);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.h
index bf38825254bf..7a5c9a3af090 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRadioButtonTest/UIRadioButtonTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2015 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,22 +34,20 @@ class UIRadioButtonTest : public UIScene
 {
 public:
     CREATE_FUNC(UIRadioButtonTest);
-    
+
     UIRadioButtonTest();
     ~UIRadioButtonTest();
-    
+
     virtual bool init() override;
-    
+
     void addRadioButton(Ref* sender);
     void deleteRadioButton(Ref* sender);
 
 private:
     cocos2d::ui::RadioButtonGroup* _radioButtonGroup;
     cocos2d::ui::Text* _allowNoSelectionText;
-    
 };
 
-
 class UIRadioButtonTwoGroupsTest : public UIScene
 {
 public:
@@ -59,15 +57,18 @@ class UIRadioButtonTwoGroupsTest : public UIScene
     ~UIRadioButtonTwoGroupsTest();
 
     virtual bool init() override;
-    void onChangedRadioButtonGroup1(cocos2d::ui::RadioButton* radioButton, int index, cocos2d::ui::RadioButtonGroup::EventType type);
-    void onChangedRadioButtonGroup2(cocos2d::ui::RadioButton* radioButton, int index, cocos2d::ui::RadioButtonGroup::EventType type);
-    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton,cocos2d::ui::RadioButton::EventType type);
+    void onChangedRadioButtonGroup1(cocos2d::ui::RadioButton* radioButton,
+                                    int index,
+                                    cocos2d::ui::RadioButtonGroup::EventType type);
+    void onChangedRadioButtonGroup2(cocos2d::ui::RadioButton* radioButton,
+                                    int index,
+                                    cocos2d::ui::RadioButtonGroup::EventType type);
+    void onChangedRadioButtonSelect(cocos2d::ui::RadioButton* radioButton, cocos2d::ui::RadioButton::EventType type);
     void clearRadioButtonGroup(Ref* sender);
 
-    
 protected:
-    void addLog(const std::string& log);
-    
+    void addLog(std::string_view log);
+
     cocos2d::ui::RadioButtonGroup* _radioButtonGroups[2];
     cocos2d::ui::Text* _groupEventLabel;
     cocos2d::ui::Text* _buttonEventLabel;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp
index e30ad08900a8..b25fd5399277 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp
@@ -51,7 +51,6 @@ UIRichTextTests::UIRichTextTests()
     ADD_TEST_CASE(UIRichTextXMLSpace);
 }
 
-
 //
 // UIRichTextTest
 //
@@ -64,30 +63,27 @@ bool UIRichTextTest::init()
         auto config = Configuration::getInstance();
         config->loadConfigFile("configs/config-test-ok.plist");
 
-
         std::string str1 = config->getValue("Chinese").asString();
         std::string str2 = config->getValue("Japanese").asString();
-        CCLOG("str1:%s ascii length = %d, utf8 length = %d, substr = %s",
-            str1.c_str(),
-            static_cast<int32_t>(str1.length()),
-            StringUtils::getCharacterCountInUTF8String(str1),
-            Helper::getSubStringOfUTF8String(str1, 0, 5).c_str());
-        CCLOG("str2:%s ascii length = %d, utf8 length = %d, substr = %s",
-            str2.c_str(),
-            static_cast<int32_t>(str2.length()),
-            StringUtils::getCharacterCountInUTF8String(str2),
-            Helper::getSubStringOfUTF8String(str2, 0, 2).c_str());
+        CCLOG("str1:%s ascii length = %d, utf8 length = %d, substr = %s", str1.c_str(),
+              static_cast<int32_t>(str1.length()), StringUtils::getCharacterCountInUTF8String(str1),
+              Helper::getSubStringOfUTF8String(str1, 0, 5).c_str());
+        CCLOG("str2:%s ascii length = %d, utf8 length = %d, substr = %s", str2.c_str(),
+              static_cast<int32_t>(str2.length()), StringUtils::getCharacterCountInUTF8String(str2),
+              Helper::getSubStringOfUTF8String(str2, 0, 2).c_str());
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextTest::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -95,7 +91,8 @@ bool UIRichTextTest::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextTest::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -103,7 +100,8 @@ bool UIRichTextTest::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextTest::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
@@ -114,19 +112,21 @@ bool UIRichTextTest::init()
         _richText->setContentSize(Size(100, 100));
 
         RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, str1, "SimSun", 10);
-        RichElementText* re2 = RichElementText::create(2, Color3B::YELLOW, 255, "And this is yellow. ", "Helvetica", 10);
+        RichElementText* re2 =
+            RichElementText::create(2, Color3B::YELLOW, 255, "And this is yellow. ", "Helvetica", 10);
         RichElementText* re3 = RichElementText::create(3, Color3B::GRAY, 255, str2, "Yu Mincho", 10);
-        RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green with TTF support. ", "fonts/Marker Felt.ttf", 10);
+        RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green with TTF support. ",
+                                                       "fonts/Marker Felt.ttf", 10);
         RichElementText* re5 = RichElementText::create(5, Color3B::RED, 255, "Last one is red ", "Helvetica", 10);
 
         RichElementImage* reimg = RichElementImage::create(6, Color3B::WHITE, 255, "cocosui/sliderballnormal.png");
 
-//        TODO
-//        cocostudio::ArmatureDataManager::getInstance()->addArmatureFileInfo("cocosui/100/100.ExportJson");
-//        cocostudio::Armature *pAr = cocostudio::Armature::create("100"); //
-//        pAr->getAnimation()->play("Animation1");
+        //        TODO
+        //        cocostudio::ArmatureDataManager::getInstance()->addArmatureFileInfo("cocosui/100/100.ExportJson");
+        //        cocostudio::Armature *pAr = cocostudio::Armature::create("100"); //
+        //        pAr->getAnimation()->play("Animation1");
 
-//        RichElementCustomNode* recustom = RichElementCustomNode::create(1, Color3B::WHITE, 255, pAr);
+        //        RichElementCustomNode* recustom = RichElementCustomNode::create(1, Color3B::WHITE, 255, pAr);
         RichElementText* re6 = RichElementText::create(7, Color3B::ORANGE, 255, "Have fun!! ", "Helvetica", 10);
         _richText->pushBackElement(re1);
         _richText->insertElement(re2, 1);
@@ -134,13 +134,12 @@ bool UIRichTextTest::init()
         _richText->pushBackElement(re4);
         _richText->pushBackElement(re5);
         _richText->insertElement(reimg, 2);
-//        _richText->pushBackElement(recustom);
+        //        _richText->pushBackElement(recustom);
         _richText->pushBackElement(re6);
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -151,7 +150,7 @@ bool UIRichTextTest::init()
     return false;
 }
 
-void UIRichTextTest::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextTest::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -174,21 +173,23 @@ void UIRichTextTest::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextTest::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextTest::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextTest::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextTest::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -203,16 +204,17 @@ bool UIRichTextXMLBasic::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBasic::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -220,7 +222,8 @@ bool UIRichTextXMLBasic::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBasic::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -228,20 +231,22 @@ bool UIRichTextXMLBasic::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBasic::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("This is just a simple text. no xml tags here. testing the basics. testing word-wrapping. testing, testing, testing");
+        _richText = RichText::createWithXML(
+            "This is just a simple text. no xml tags here. testing the basics. testing word-wrapping. testing, "
+            "testing, testing");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -252,7 +257,7 @@ bool UIRichTextXMLBasic::init()
     return false;
 }
 
-void UIRichTextXMLBasic::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLBasic::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -275,21 +280,23 @@ void UIRichTextXMLBasic::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLBasic::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLBasic::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLBasic::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLBasic::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -304,16 +311,17 @@ bool UIRichTextXMLSmallBig::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSmallBig::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -321,7 +329,8 @@ bool UIRichTextXMLSmallBig::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSmallBig::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -329,20 +338,21 @@ bool UIRichTextXMLSmallBig::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSmallBig::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("Regular size.<small>smaller size.</small><big>bigger.<small>normal.</small>bigger</big>.normal.");
+        _richText = RichText::createWithXML(
+            "Regular size.<small>smaller size.</small><big>bigger.<small>normal.</small>bigger</big>.normal.");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -353,7 +363,7 @@ bool UIRichTextXMLSmallBig::init()
     return false;
 }
 
-void UIRichTextXMLSmallBig::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSmallBig::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -376,21 +386,23 @@ void UIRichTextXMLSmallBig::touchEvent(Ref *pSender, Widget::TouchEventType type
     }
 }
 
-void UIRichTextXMLSmallBig::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSmallBig::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLSmallBig::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLSmallBig::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -405,16 +417,17 @@ bool UIRichTextXMLColor::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLColor::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -422,7 +435,8 @@ bool UIRichTextXMLColor::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLColor::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -430,20 +444,21 @@ bool UIRichTextXMLColor::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLColor::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("Default color.<font color='#ff0000'>red.<font color='#00ff00'>green</font>red again.</font>default again");
+        _richText = RichText::createWithXML(
+            "Default color.<font color='#ff0000'>red.<font color='#00ff00'>green</font>red again.</font>default again");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -454,7 +469,7 @@ bool UIRichTextXMLColor::init()
     return false;
 }
 
-void UIRichTextXMLColor::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLColor::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -477,21 +492,23 @@ void UIRichTextXMLColor::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLColor::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLColor::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLColor::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLColor::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -506,16 +523,17 @@ bool UIRichTextXMLSUIB::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -523,7 +541,8 @@ bool UIRichTextXMLSUIB::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -531,20 +550,21 @@ bool UIRichTextXMLSUIB::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("system font: <u>underline</u><i>italics</i><b>bold</b><del>strike-through</del>");
+        _richText =
+            RichText::createWithXML("system font: <u>underline</u><i>italics</i><b>bold</b><del>strike-through</del>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -555,7 +575,7 @@ bool UIRichTextXMLSUIB::init()
     return false;
 }
 
-void UIRichTextXMLSUIB::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -578,21 +598,23 @@ void UIRichTextXMLSUIB::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLSUIB::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLSUIB::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLSUIB::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -607,16 +629,17 @@ bool UIRichTextXMLSUIB2::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB2::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -624,7 +647,8 @@ bool UIRichTextXMLSUIB2::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB2::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -632,20 +656,22 @@ bool UIRichTextXMLSUIB2::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB2::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font face='fonts/Marker Felt.ttf' size='24'>ttf font: <u>underline</u><i>italics</i><b>bold</b><del>strike-through</del></font>");
+        _richText = RichText::createWithXML(
+            "<font face='fonts/Marker Felt.ttf' size='24'>ttf font: "
+            "<u>underline</u><i>italics</i><b>bold</b><del>strike-through</del></font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -656,7 +682,7 @@ bool UIRichTextXMLSUIB2::init()
     return false;
 }
 
-void UIRichTextXMLSUIB2::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB2::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -679,21 +705,23 @@ void UIRichTextXMLSUIB2::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLSUIB2::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB2::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLSUIB2::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLSUIB2::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -708,16 +736,17 @@ bool UIRichTextXMLSUIB3::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB3::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -725,7 +754,8 @@ bool UIRichTextXMLSUIB3::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB3::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -733,20 +763,22 @@ bool UIRichTextXMLSUIB3::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSUIB3::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font face='fonts/Marker Felt.ttf' size='20'>ttf font: <i><u>italics and underline</u></i><del><b>bold and strike-through</b></del></font>");
+        _richText = RichText::createWithXML(
+            "<font face='fonts/Marker Felt.ttf' size='20'>ttf font: <i><u>italics and underline</u></i><del><b>bold "
+            "and strike-through</b></del></font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -757,7 +789,7 @@ bool UIRichTextXMLSUIB3::init()
     return false;
 }
 
-void UIRichTextXMLSUIB3::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB3::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -780,21 +812,23 @@ void UIRichTextXMLSUIB3::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLSUIB3::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSUIB3::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLSUIB3::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLSUIB3::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -809,16 +843,17 @@ bool UIRichTextXMLImg::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLImg::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -826,7 +861,8 @@ bool UIRichTextXMLImg::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLImg::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -834,20 +870,23 @@ bool UIRichTextXMLImg::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLImg::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("you should see an image here: <img src='cocosui/sliderballnormal.png'/> and this is text again. and this is the same image, but bigger: <img src='cocosui/sliderballnormal.png' width='30' height='30' /> and here goes text again");
+        _richText = RichText::createWithXML(
+            "you should see an image here: <img src='cocosui/sliderballnormal.png'/> and this is text again. and this "
+            "is the same image, but bigger: <img src='cocosui/sliderballnormal.png' width='30' height='30' /> and here "
+            "goes text again");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -858,7 +897,7 @@ bool UIRichTextXMLImg::init()
     return false;
 }
 
-void UIRichTextXMLImg::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLImg::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -881,21 +920,23 @@ void UIRichTextXMLImg::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLImg::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLImg::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLImg::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLImg::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -910,16 +951,17 @@ bool UIRichTextXMLUrl::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrl::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -927,7 +969,8 @@ bool UIRichTextXMLUrl::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrl::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -935,20 +978,21 @@ bool UIRichTextXMLUrl::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrl::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("This link will redirect you to google: <a href='http://www.google.com'>click me</a>");
+        _richText = RichText::createWithXML(
+            "This link will redirect you to google: <a href='http://www.google.com'>click me</a>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -959,7 +1003,7 @@ bool UIRichTextXMLUrl::init()
     return false;
 }
 
-void UIRichTextXMLUrl::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLUrl::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -982,21 +1026,23 @@ void UIRichTextXMLUrl::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLUrl::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLUrl::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLUrl::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLUrl::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1011,16 +1057,17 @@ bool UIRichTextXMLUrlImg::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrlImg::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1028,7 +1075,8 @@ bool UIRichTextXMLUrlImg::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrlImg::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1036,20 +1084,22 @@ bool UIRichTextXMLUrlImg::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLUrlImg::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("This link will redirect you to google: <a href='http://www.google.com'><img src=\"cocosui/ccicon.png\" height=\"48\" width=\"48\" /></a>");
+        _richText = RichText::createWithXML(
+            "This link will redirect you to google: <a href='http://www.google.com'><img src=\"cocosui/ccicon.png\" "
+            "height=\"48\" width=\"48\" /></a>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1060,7 +1110,7 @@ bool UIRichTextXMLUrlImg::init()
     return false;
 }
 
-void UIRichTextXMLUrlImg::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLUrlImg::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1083,21 +1133,23 @@ void UIRichTextXMLUrlImg::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLUrlImg::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLUrlImg::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLUrlImg::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLUrlImg::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1112,16 +1164,17 @@ bool UIRichTextXMLFace::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLFace::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1129,7 +1182,8 @@ bool UIRichTextXMLFace::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLFace::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1137,20 +1191,22 @@ bool UIRichTextXMLFace::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLFace::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font size='20' face='fonts/Marker Felt.ttf'>Marker Felt 20.<font face='fonts/arial.ttf'>Arial 20.</font></font><font face='font/Thonburi.ttf' size='24' color='#0000ff'>Thonburi 24 blue</font>");
+        _richText = RichText::createWithXML(
+            "<font size='20' face='fonts/Marker Felt.ttf'>Marker Felt 20.<font face='fonts/arial.ttf'>Arial "
+            "20.</font></font><font face='font/Thonburi.ttf' size='24' color='#0000ff'>Thonburi 24 blue</font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(120, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1161,7 +1217,7 @@ bool UIRichTextXMLFace::init()
     return false;
 }
 
-void UIRichTextXMLFace::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLFace::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1184,21 +1240,23 @@ void UIRichTextXMLFace::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLFace::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLFace::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLFace::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLFace::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1213,16 +1271,17 @@ bool UIRichTextXMLBR::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBR::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1230,7 +1289,8 @@ bool UIRichTextXMLBR::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBR::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1238,20 +1298,21 @@ bool UIRichTextXMLBR::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLBR::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("this is one line.<br/>this should be in another line.<br/>and this is another line");
+        _richText = RichText::createWithXML(
+            "this is one line.<br/>this should be in another line.<br/>and this is another line");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1262,7 +1323,7 @@ bool UIRichTextXMLBR::init()
     return false;
 }
 
-void UIRichTextXMLBR::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLBR::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1285,21 +1346,23 @@ void UIRichTextXMLBR::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLBR::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLBR::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLBR::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLBR::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1314,12 +1377,12 @@ bool UIRichTextXMLInvalid::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Invalid XML test", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Invalid XML test", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         // RichText
         _richText = RichText::createWithXML("this is an invalid xml. <i>no closing tag");
         if (_richText)
@@ -1330,7 +1393,6 @@ bool UIRichTextXMLInvalid::init()
             _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
             _richText->setLocalZOrder(10);
 
-
             _widget->addChild(_richText);
 
             // test remove all children, this call won't effect the test
@@ -1351,16 +1413,17 @@ bool UIRichTextXMLOutline::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Outline", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Outline", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLOutline::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1368,7 +1431,8 @@ bool UIRichTextXMLOutline::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLOutline::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1376,20 +1440,22 @@ bool UIRichTextXMLOutline::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLOutline::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font face='fonts/Marker Felt.ttf' size=\"24\"><outline color=\"#D2B48C\" size=\"2\">OUTLINE</outline></font>");
+        _richText = RichText::createWithXML(
+            "<font face='fonts/Marker Felt.ttf' size=\"24\"><outline color=\"#D2B48C\" "
+            "size=\"2\">OUTLINE</outline></font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1400,7 +1466,7 @@ bool UIRichTextXMLOutline::init()
     return false;
 }
 
-void UIRichTextXMLOutline::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLOutline::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1423,21 +1489,23 @@ void UIRichTextXMLOutline::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLOutline::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLOutline::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLOutline::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLOutline::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1452,16 +1520,17 @@ bool UIRichTextXMLShadow::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Shadow", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Shadow", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLShadow::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1469,7 +1538,8 @@ bool UIRichTextXMLShadow::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLShadow::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1477,20 +1547,22 @@ bool UIRichTextXMLShadow::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLShadow::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font size=\"24\"><shadow color=\"#4169E1\" offsetWidth=\"8\" offsetHeight=\"-8\" blurRadius=\"2\">SHADOW</shadow></font>");
+        _richText = RichText::createWithXML(
+            "<font size=\"24\"><shadow color=\"#4169E1\" offsetWidth=\"8\" offsetHeight=\"-8\" "
+            "blurRadius=\"2\">SHADOW</shadow></font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(150, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1501,7 +1573,7 @@ bool UIRichTextXMLShadow::init()
     return false;
 }
 
-void UIRichTextXMLShadow::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLShadow::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1524,21 +1596,23 @@ void UIRichTextXMLShadow::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLShadow::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLShadow::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLShadow::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLShadow::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1553,16 +1627,17 @@ bool UIRichTextXMLGlow::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Glow", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Glow", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLGlow::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1570,7 +1645,8 @@ bool UIRichTextXMLGlow::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLGlow::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1578,20 +1654,21 @@ bool UIRichTextXMLGlow::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLGlow::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("<font face=\"fonts/Marker Felt.ttf\" size=\"24\"><glow color=\"#AFEEEE\">GLOW</glow></font>");
+        _richText = RichText::createWithXML(
+            "<font face=\"fonts/Marker Felt.ttf\" size=\"24\"><glow color=\"#AFEEEE\">GLOW</glow></font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1602,7 +1679,7 @@ bool UIRichTextXMLGlow::init()
     return false;
 }
 
-void UIRichTextXMLGlow::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLGlow::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1625,21 +1702,23 @@ void UIRichTextXMLGlow::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLGlow::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLGlow::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLGlow::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLGlow::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1654,16 +1733,17 @@ bool UIRichTextXMLExtend::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Extend", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Extend", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLExtend::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1671,7 +1751,8 @@ bool UIRichTextXMLExtend::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLExtend::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1679,7 +1760,8 @@ bool UIRichTextXMLExtend::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLExtend::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
@@ -1690,46 +1772,45 @@ bool UIRichTextXMLExtend::init()
             return make_pair(ValueMap(), richElement);
         });
         RichText::setTagDescription("CloseSelected", false, [](const ValueMap& tagAttrValueMap) {
-            RichElementImage* richElement = RichElementImage::create(0, Color3B::WHITE, 255, "cocosui/CloseSelected.png");
+            RichElementImage* richElement =
+                RichElementImage::create(0, Color3B::WHITE, 255, "cocosui/CloseSelected.png");
             return make_pair(ValueMap(), richElement);
         });
 
         /* Defaults */
         ValueMap defaults;
-        defaults[RichText::KEY_FONT_COLOR_STRING] = "#FFF";
-        defaults[RichText::KEY_FONT_SIZE] = 12.0f;
-        defaults[RichText::KEY_FONT_FACE] = "fonts/Marker Felt.ttf";
+        defaults[RichText::KEY_FONT_COLOR_STRING]        = "#FFF";
+        defaults[RichText::KEY_FONT_SIZE]                = 12.0f;
+        defaults[RichText::KEY_FONT_FACE]                = "fonts/Marker Felt.ttf";
         defaults[RichText::KEY_ANCHOR_FONT_COLOR_STRING] = "#f0f8ff";
-        defaults[RichText::KEY_ANCHOR_TEXT_BOLD] = false;
-        defaults[RichText::KEY_ANCHOR_TEXT_ITALIC] = false;
-        //defaults[RichText::KEY_ANCHOR_TEXT_LINE] = RichText::VALUE_TEXT_LINE_NONE;
-        //defaults[RichText::KEY_ANCHOR_TEXT_LINE] = RichText::VALUE_TEXT_LINE_DEL;
+        defaults[RichText::KEY_ANCHOR_TEXT_BOLD]         = false;
+        defaults[RichText::KEY_ANCHOR_TEXT_ITALIC]       = false;
+        // defaults[RichText::KEY_ANCHOR_TEXT_LINE] = RichText::VALUE_TEXT_LINE_NONE;
+        // defaults[RichText::KEY_ANCHOR_TEXT_LINE] = RichText::VALUE_TEXT_LINE_DEL;
         defaults[RichText::KEY_ANCHOR_TEXT_LINE] = RichText::VALUE_TEXT_LINE_UNDER;
-        //defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_NONE;
-        //defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_OUTLINE;
-        //defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_SHADOW;
-        //defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_GLOW;
-        defaults[RichText::KEY_ANCHOR_TEXT_OUTLINE_COLOR] = "#D2B48C";
-        defaults[RichText::KEY_ANCHOR_TEXT_OUTLINE_SIZE] = 4;
-        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_COLOR] = "#4169E1";
-        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_OFFSET_WIDTH] = 4.0f;
+        // defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_NONE;
+        // defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_OUTLINE;
+        // defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_SHADOW;
+        // defaults[RichText::KEY_ANCHOR_TEXT_STYLE] = RichText::VALUE_TEXT_STYLE_GLOW;
+        defaults[RichText::KEY_ANCHOR_TEXT_OUTLINE_COLOR]        = "#D2B48C";
+        defaults[RichText::KEY_ANCHOR_TEXT_OUTLINE_SIZE]         = 4;
+        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_COLOR]         = "#4169E1";
+        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_OFFSET_WIDTH]  = 4.0f;
         defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_OFFSET_HEIGHT] = -4.0f;
-        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_BLUR_RADIUS] = 0;
-        defaults[RichText::KEY_ANCHOR_TEXT_GLOW_COLOR] = "#AFEEEE";
+        defaults[RichText::KEY_ANCHOR_TEXT_SHADOW_BLUR_RADIUS]   = 0;
+        defaults[RichText::KEY_ANCHOR_TEXT_GLOW_COLOR]           = "#AFEEEE";
 
         // RichText
-        _richText = RichText::createWithXML("<span>CloseNormal-tag:<br /><CloseNormal /><br /><br />CloseSelected-tag:<br /><CloseSelected></CloseSelected></span>",
-            defaults,
-            [](const std::string& url) {
-            Application::getInstance()->openURL(url);
-        });
+        _richText = RichText::createWithXML(
+            "<span>CloseNormal-tag:<br /><CloseNormal /><br /><br />CloseSelected-tag:<br "
+            "/><CloseSelected></CloseSelected></span>",
+            defaults, [](std::string_view url) { Application::getInstance()->openURL(url); });
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(100, 100));
 
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
         _richText->setLocalZOrder(10);
 
-
         _widget->addChild(_richText);
 
         // test remove all children, this call won't effect the test
@@ -1740,7 +1821,7 @@ bool UIRichTextXMLExtend::init()
     return false;
 }
 
-void UIRichTextXMLExtend::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLExtend::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1763,21 +1844,23 @@ void UIRichTextXMLExtend::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLExtend::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLExtend::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLExtend::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLExtend::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
@@ -1792,16 +1875,17 @@ bool UIRichTextXMLSpace::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add the alert
-        Text *alert = Text::create("Space", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Space", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.125));
         _widget->addChild(alert);
 
-
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setTouchEnabled(true);
         button->setTitleText("switch");
-        button->setPosition(Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
+        button->setPosition(
+            Vec2(widgetSize.width * 1 / 3, widgetSize.height / 2.0f + button->getContentSize().height * 2.5));
         button->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSpace::touchEvent, this));
         button->setLocalZOrder(10);
         _widget->addChild(button);
@@ -1809,7 +1893,8 @@ bool UIRichTextXMLSpace::init()
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button2->setTouchEnabled(true);
         button2->setTitleText("wrap mode");
-        button2->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button2->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button2->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSpace::switchWrapMode, this));
         button2->setLocalZOrder(10);
         _widget->addChild(button2);
@@ -1817,13 +1902,17 @@ bool UIRichTextXMLSpace::init()
         Button* button3 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button3->setTouchEnabled(true);
         button3->setTitleText("alignment");
-        button3->setPosition(Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
+        button3->setPosition(
+            Vec2(widgetSize.width * 2 / 3, widgetSize.height / 2.0f + button2->getContentSize().height * 2.5));
         button3->addTouchEventListener(CC_CALLBACK_2(UIRichTextXMLSpace::switchAlignment, this));
         button3->setLocalZOrder(10);
         _widget->addChild(button3);
 
         // RichText
-        _richText = RichText::createWithXML("words should be divided with space.<br /><br /><font face='fonts/Marker Felt.ttf' color='#ffff00'>HELLO </font><font color='#ffff00'>WORLD</font><br /><br /><font color='#ff00ff'>HELLO</font><font face='fonts/Marker Felt.ttf' color='#ff00ff'> WORLD</font>");
+        _richText = RichText::createWithXML(
+            "words should be divided with space.<br /><br /><font face='fonts/Marker Felt.ttf' color='#ffff00'>HELLO "
+            "</font><font color='#ffff00'>WORLD</font><br /><br /><font color='#ff00ff'>HELLO</font><font "
+            "face='fonts/Marker Felt.ttf' color='#ff00ff'> WORLD</font>");
         _richText->ignoreContentAdaptWithSize(false);
         _richText->setContentSize(Size(50, 100));
         _richText->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2));
@@ -1839,7 +1928,7 @@ bool UIRichTextXMLSpace::init()
     return false;
 }
 
-void UIRichTextXMLSpace::touchEvent(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSpace::touchEvent(Ref* pSender, Widget::TouchEventType type)
 {
     switch (type)
     {
@@ -1862,21 +1951,23 @@ void UIRichTextXMLSpace::touchEvent(Ref *pSender, Widget::TouchEventType type)
     }
 }
 
-void UIRichTextXMLSpace::switchWrapMode(Ref *pSender, Widget::TouchEventType type)
+void UIRichTextXMLSpace::switchWrapMode(Ref* pSender, Widget::TouchEventType type)
 {
     if (type == Widget::TouchEventType::ENDED)
     {
         auto wrapMode = _richText->getWrapMode();
-        wrapMode = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
+        wrapMode      = (wrapMode == RichText::WRAP_PER_WORD) ? RichText::WRAP_PER_CHAR : RichText::WRAP_PER_WORD;
         _richText->setWrapMode(wrapMode);
     }
 }
 
-void UIRichTextXMLSpace::switchAlignment(Ref *sender, Widget::TouchEventType type) {
+void UIRichTextXMLSpace::switchAlignment(Ref* sender, Widget::TouchEventType type)
+{
     if (type == Widget::TouchEventType::ENDED)
     {
         auto alignment = _richText->getHorizontalAlignment();
-        alignment = static_cast<RichText::HorizontalAlignment>((static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
+        alignment      = static_cast<RichText::HorizontalAlignment>(
+            (static_cast<std::underlying_type<RichText::HorizontalAlignment>::type>(alignment) + 1) % 3);
         _richText->setHorizontalAlignment(alignment);
     }
 }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h
index fb4923e8842b..515ce0573d17 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,8 +22,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
-
 #ifndef __TestCpp__UIRichTextTest__
 #define __TestCpp__UIRichTextTest__
 
@@ -161,7 +159,7 @@ class UIRichTextXMLUrlImg : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLUrlImg);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
@@ -214,7 +212,7 @@ class UIRichTextXMLOutline : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLOutline);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
@@ -228,7 +226,7 @@ class UIRichTextXMLShadow : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLShadow);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
@@ -242,7 +240,7 @@ class UIRichTextXMLGlow : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLGlow);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
@@ -256,7 +254,7 @@ class UIRichTextXMLExtend : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLExtend);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
@@ -270,7 +268,7 @@ class UIRichTextXMLSpace : public UIScene
 {
 public:
     CREATE_FUNC(UIRichTextXMLSpace);
-    
+
     bool init() override;
     void touchEvent(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
     void switchWrapMode(cocos2d::Ref* sender, cocos2d::ui::Widget::TouchEventType type);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp
index f54a10237670..ca2801e6e464 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -64,37 +64,30 @@ UIScale9SpriteTests::UIScale9SpriteTests()
 }
 
 // UIScale9SpriteTest
-UIScale9SpriteTest::UIScale9SpriteTest()
-{
-    
-}
+UIScale9SpriteTest::UIScale9SpriteTest() {}
 
-UIScale9SpriteTest::~UIScale9SpriteTest()
-{
-}
+UIScale9SpriteTest::~UIScale9SpriteTest() {}
 
 bool UIScale9SpriteTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
-        auto moveTo = MoveBy::create(1.0f, Vec2(30.0f,0.0f));
+
+        auto moveTo   = MoveBy::create(1.0f, Vec2(30.0f, 0.0f));
         auto moveBack = moveTo->reverse();
         auto rotateBy = RotateBy::create(1.0f, 180.0f);
-        auto scaleBy = ScaleTo::create(1.0f, -2.0f);
-        auto action = Sequence::create(moveTo,moveBack, rotateBy,scaleBy, NULL);
+        auto scaleBy  = ScaleTo::create(1.0f, -2.0f);
+        auto action   = Sequence::create(moveTo, moveBack, rotateBy, scaleBy, NULL);
 
-        
-        Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png");
+        Sprite* normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png");
         normalSprite1->setPosition(100, 270);
         normalSprite1->setFlippedY(true);
-        
 
         this->addChild(normalSprite1);
         normalSprite1->runAction((FiniteTimeAction*)action->clone());
-        
-        ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+
+        ui::Scale9Sprite* normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         normalSprite2->setPosition(120, 270);
         normalSprite2->setScale9Enabled(false);
         normalSprite2->setOpacity(100);
@@ -102,21 +95,21 @@ bool UIScale9SpriteTest::init()
         this->addChild(normalSprite2);
         normalSprite2->setColor(Color3B::GREEN);
         normalSprite2->runAction(action);
-        
-        auto action2 = action->clone();
-        ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+
+        auto action2          = action->clone();
+        ui::Scale9Sprite* sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         sp1->setPosition(100, 160);
         sp1->setScale(1.2f);
-        sp1->setContentSize(Size(100.0f,100.0f));
+        sp1->setContentSize(Size(100.0f, 100.0f));
         sp1->setColor(Color3B::GREEN);
         this->addChild(sp1);
         sp1->runAction((FiniteTimeAction*)action2);
 
-        cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+        cocos2d::ui::Scale9Sprite* sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         sp2->setPosition(350.0f, 160.0f);
         sp2->setPreferredSize(sp1->getContentSize() * 1.2f);
         sp2->setColor(Color3B::GREEN);
-        sp2->setContentSize(Size(100.0f,100.0f));
+        sp2->setContentSize(Size(100.0f, 100.0f));
 
         this->addChild(sp2);
         auto action3 = action->clone();
@@ -127,111 +120,98 @@ bool UIScale9SpriteTest::init()
     return false;
 }
 
+UIScale9SpriteHierarchialTest::UIScale9SpriteHierarchialTest() {}
 
-UIScale9SpriteHierarchialTest::UIScale9SpriteHierarchialTest()
-{
-    
-}
-
-UIScale9SpriteHierarchialTest::~UIScale9SpriteHierarchialTest()
-{
-}
+UIScale9SpriteHierarchialTest::~UIScale9SpriteHierarchialTest() {}
 
 bool UIScale9SpriteHierarchialTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
-        auto moveTo = MoveBy::create(1.0f, Vec2(30.0f,0.0f));
+
+        auto moveTo   = MoveBy::create(1.0f, Vec2(30.0f, 0.0f));
         auto moveBack = moveTo->reverse();
         auto rotateBy = RotateBy::create(1.0f, 180.0f);
-        auto fadeOut = FadeOut::create(2.0f);
-        auto scaleTo = ScaleTo::create(1.0f, 2.0f);
-        auto action = Sequence::create(moveTo,moveBack, rotateBy,fadeOut,scaleTo, NULL);
-        
-        Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png");
+        auto fadeOut  = FadeOut::create(2.0f);
+        auto scaleTo  = ScaleTo::create(1.0f, 2.0f);
+        auto action   = Sequence::create(moveTo, moveBack, rotateBy, fadeOut, scaleTo, NULL);
+
+        Sprite* normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png");
         normalSprite1->setPosition(100, 270);
         normalSprite1->setCascadeColorEnabled(true);
         normalSprite1->setCascadeOpacityEnabled(true);
         normalSprite1->setColor(Color3B::GREEN);
-        
+
         this->addChild(normalSprite1);
         normalSprite1->runAction((FiniteTimeAction*)action->clone());
-        
-        ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+
+        ui::Scale9Sprite* normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         normalSprite2->setScale9Enabled(false);
         normalSprite2->setOpacity(100);
         normalSprite1->addChild(normalSprite2);
-        
-        auto action2 = action->clone();
-        ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+
+        auto action2          = action->clone();
+        ui::Scale9Sprite* sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         sp1->setPosition(200.0f, 160.0f);
         sp1->setScale(1.2f);
-        sp1->setContentSize(Size(100.0f,100.0f));
+        sp1->setContentSize(Size(100.0f, 100.0f));
         sp1->setColor(Color3B::GREEN);
         this->addChild(sp1);
         sp1->runAction((FiniteTimeAction*)action2);
-        
-        cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
+
+        cocos2d::ui::Scale9Sprite* sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png");
         sp2->setPreferredSize(sp1->getContentSize() * 1.2f);
         sp2->setColor(Color3B::GREEN);
         sp2->setFlippedX(true);
-        sp2->setContentSize(Size(100.0f,100.0f));
+        sp2->setContentSize(Size(100.0f, 100.0f));
 
         sp1->addChild(sp2);
-        
+
         return true;
     }
     return false;
 }
 
-UIScale9SpriteTouchTest::UIScale9SpriteTouchTest()
-{
-    
-}
+UIScale9SpriteTouchTest::UIScale9SpriteTouchTest() {}
 
-UIScale9SpriteTouchTest::~UIScale9SpriteTouchTest()
-{
-}
+UIScale9SpriteTouchTest::~UIScale9SpriteTouchTest() {}
 
 bool UIScale9SpriteTouchTest::init()
 {
     if (UIScene::init())
     {
-    
+
         Vec2 origin = Director::getInstance()->getVisibleOrigin();
-        Size size = Director::getInstance()->getVisibleSize();
-        
+        Size size   = Director::getInstance()->getVisibleSize();
+
         auto containerForSprite1 = Node::create();
-        auto sprite1 = cocos2d::ui::Scale9Sprite::create("Images/CyanSquare.png");
-        sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80.0f, 80.0f));
+        auto sprite1             = cocos2d::ui::Scale9Sprite::create("Images/CyanSquare.png");
+        sprite1->setPosition(origin + Vec2(size.width / 2, size.height / 2) + Vec2(-80.0f, 80.0f));
         containerForSprite1->addChild(sprite1);
         addChild(containerForSprite1, 10);
-        
-        auto sprite2 = ui::Scale9Sprite::create("Images/MagentaSquare.png");
-        sprite2->setPosition(origin+Vec2(size.width/2, size.height/2));
 
+        auto sprite2 = ui::Scale9Sprite::create("Images/MagentaSquare.png");
+        sprite2->setPosition(origin + Vec2(size.width / 2, size.height / 2));
 
         addChild(sprite2, 20);
-        
+
         auto sprite3 = ui::Scale9Sprite::create("Images/YellowSquare.png");
         sprite3->setPosition(Vec2(0.0f, 0.0f));
         sprite3->setCascadeOpacityEnabled(false);
         sprite2->addChild(sprite3, 1);
 
-        
         // Make sprite1 touchable
         auto listener1 = EventListenerTouchOneByOne::create();
         listener1->setSwallowTouches(true);
-        
-        listener1->onTouchBegan = [](Touch* touch, Event* event){
+
+        listener1->onTouchBegan = [](Touch* touch, Event* event) {
             auto target = static_cast<Sprite*>(event->getCurrentTarget());
-            
+
             Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation());
-            Size s = target->getContentSize();
-            Rect rect = Rect(0, 0, s.width, s.height);
-            
+            Size s              = target->getContentSize();
+            Rect rect           = Rect(0, 0, s.width, s.height);
+
             if (rect.containsPoint(locationInNode))
             {
                 log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y);
@@ -240,13 +220,13 @@ bool UIScale9SpriteTouchTest::init()
             }
             return false;
         };
-        
-        listener1->onTouchMoved = [](Touch* touch, Event* event){
+
+        listener1->onTouchMoved = [](Touch* touch, Event* event) {
             auto target = static_cast<Sprite*>(event->getCurrentTarget());
             target->setPosition(target->getPosition() + touch->getDelta());
         };
-        
-        listener1->onTouchEnded = [=](Touch* touch, Event* event){
+
+        listener1->onTouchEnded = [=](Touch* touch, Event* event) {
             auto target = static_cast<ui::Scale9Sprite*>(event->getCurrentTarget());
             log("sprite onTouchesEnded.. ");
             target->setOpacity(255);
@@ -254,16 +234,16 @@ bool UIScale9SpriteTouchTest::init()
             {
                 containerForSprite1->setLocalZOrder(100);
             }
-            else if(target == sprite1)
+            else if (target == sprite1)
             {
                 containerForSprite1->setLocalZOrder(0);
             }
         };
-        
+
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2);
         _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite3);
-        
+
         return true;
     }
     return false;
@@ -271,201 +251,202 @@ bool UIScale9SpriteTouchTest::init()
 
 bool UIS9BatchNodeBasic::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto sprite = Sprite::create("Images/blocks9.png");
-        
+
         auto blocks = ui::Scale9Sprite::create();
-        
+
         blocks->updateWithSprite(sprite, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96));
-        
+
         blocks->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks);
-        
-        
+
         return true;
     }
 
-    
     return false;
 }
 
 bool UIS9FrameNameSpriteSheet::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
-        
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png");
         blocks->setInsetLeft(0);
         blocks->setInsetRight(0);
         blocks->setInsetTop(0);
         blocks->setInsetBottom(0);
-        blocks->setPreferredSize(Size(400.0f,80.0f));
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
         blocks->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks);
 
-        
         return true;
     }
-    
+
     return false;
 }
 
-
 bool UIS9FrameNameSpriteSheetRotated::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
-        blocks->setPreferredSize(Size(400.0f,80.0f));
-        
+
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
+
         blocks->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 bool UIS9FrameNameSpriteSheetCropped::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9c.png");
-        blocks->setPreferredSize(Size(400.0f,80.0f));
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
         blocks->setPosition(Vec2(x, y + 45));
         this->addChild(blocks);
-        
+
         auto blocks2 = ui::Scale9Sprite::create("Images/blocks9c.png");
-        blocks2->setPreferredSize(Size(400.0f,80.0f));
+        blocks2->setPreferredSize(Size(400.0f, 80.0f));
         blocks2->setPosition(Vec2(x, y - 45));
         this->addChild(blocks2);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 bool UIS9FrameNameSpriteSheetCroppedRotated::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9cr.png");
-        blocks->setPreferredSize(Size(400.0f,80.0f));
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
         blocks->setPosition(Vec2(x, y + 45));
         this->addChild(blocks);
-        
+
         auto blocks2 = ui::Scale9Sprite::create("Images/blocks9cr.png");
-        blocks2->setPreferredSize(Size(400.0f,80.0f));
+        blocks2->setPreferredSize(Size(400.0f, 80.0f));
         blocks2->setPosition(Vec2(x, y - 45));
         this->addChild(blocks2);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 bool UIS9FrameNameSpriteSheetCroppedSimple::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9c.png");
         blocks->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
-        blocks->setPreferredSize(Size(400.0f,80.0f));
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
         blocks->setPosition(Vec2(x, y + 45));
         this->addChild(blocks);
-        
+
         auto blocksSprite = Sprite::createWithSpriteFrameName("blocks9c.png");
-        blocksSprite->setScale(400/blocksSprite->getContentSize().width, 80/blocksSprite->getContentSize().height);
+        blocksSprite->setScale(400 / blocksSprite->getContentSize().width, 80 / blocksSprite->getContentSize().height);
         blocksSprite->setPosition(Vec2(x, y - 45));
         this->addChild(blocksSprite);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 bool UIS9FrameNameSpriteSheetCroppedRotatedSimple::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9cr.png");
         blocks->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
-        blocks->setPreferredSize(Size(400.0f,80.0f));
+        blocks->setPreferredSize(Size(400.0f, 80.0f));
         blocks->setPosition(Vec2(x, y + 45));
         this->addChild(blocks);
-        
+
         auto blocksSprite = Sprite::createWithSpriteFrameName("blocks9cr.png");
-        blocksSprite->setScale(400/blocksSprite->getContentSize().width, 80/blocksSprite->getContentSize().height);
+        blocksSprite->setScale(400 / blocksSprite->getContentSize().width, 80 / blocksSprite->getContentSize().height);
         blocksSprite->setPosition(Vec2(x, y - 45));
         this->addChild(blocksSprite);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
-
 bool UIS9BatchNodeScaledNoInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         // scaled without insets
         auto sprite_scaled = Sprite::create("Images/blocks9.png");
-        
+
         auto blocks_scaled = ui::Scale9Sprite::create();
         blocks_scaled->updateWithSprite(sprite_scaled, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96));
-        
+
         blocks_scaled->setPosition(Vec2(x, y));
-        
-        blocks_scaled->setContentSize(Size(96 * 4, 96*2));
-        
+
+        blocks_scaled->setContentSize(Size(96 * 4, 96 * 2));
+
         this->addChild(blocks_scaled);
         return true;
     }
@@ -474,18 +455,19 @@ bool UIS9BatchNodeScaledNoInsets::init()
 
 bool UIS9FrameNameSpriteSheetScaledNoInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png");
-        
+
         blocks_scaled->setPosition(Vec2(x, y));
-        
-        blocks_scaled->setContentSize(Size(96 * 4, 96*2));
-        
+
+        blocks_scaled->setContentSize(Size(96 * 4, 96 * 2));
+
         this->addChild(blocks_scaled);
         return true;
     }
@@ -494,46 +476,46 @@ bool UIS9FrameNameSpriteSheetScaledNoInsets::init()
 
 bool UIS9FrameNameSpriteSheetRotatedScaledNoInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
+
         blocks_scaled->setPosition(Vec2(x, y));
-        
-        blocks_scaled->setContentSize(Size(96 * 4, 96*2));
-        
+
+        blocks_scaled->setContentSize(Size(96 * 4, 96 * 2));
+
         this->addChild(blocks_scaled);
-        
+
         return true;
     }
     return false;
 }
 
-
 bool UIS9BatchNodeScaleWithCapInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto sprite_scaled_with_insets = Sprite::create("Images/blocks9.png");
-        
+
         auto blocks_scaled_with_insets = ui::Scale9Sprite::create();
-        
-        blocks_scaled_with_insets->updateWithSprite(sprite_scaled_with_insets, Rect(0, 0, 96, 96), false, Rect(32, 32, 32, 32));
-        
+
+        blocks_scaled_with_insets->updateWithSprite(sprite_scaled_with_insets, Rect(0, 0, 96, 96), false,
+                                                    Rect(32, 32, 32, 32));
+
         blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5));
-        
+
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks_scaled_with_insets);
         return true;
     }
@@ -542,19 +524,19 @@ bool UIS9BatchNodeScaleWithCapInsets::init()
 
 bool UIS9FrameNameSpriteSheetInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
-        
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        
-        auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
+        auto blocks_with_insets =
+            ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
+
         blocks_with_insets->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks_with_insets);
         return true;
     }
@@ -563,19 +545,21 @@ bool UIS9FrameNameSpriteSheetInsets::init()
 
 bool UIS9FrameNameSpriteSheetInsetsScaled::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
+        auto blocks_scaled_with_insets =
+            ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
+
         blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5));
-        
+
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks_scaled_with_insets);
         return true;
     }
@@ -584,16 +568,17 @@ bool UIS9FrameNameSpriteSheetInsetsScaled::init()
 
 bool UIS9FrameNameSpriteSheetRotatedInsets::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png", Rect(32, 32, 32, 32));
-        
+
         blocks_with_insets->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks_with_insets);
         return true;
     }
@@ -602,31 +587,32 @@ bool UIS9FrameNameSpriteSheetRotatedInsets::init()
 
 bool UIS9_TexturePacker::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist);
-        
+
         float x = winSize.width / 4;
         float y = 0 + (winSize.height / 2);
-        
+
         auto s = ui::Scale9Sprite::createWithSpriteFrameName("button_normal.png");
-        
+
         s->setPosition(Vec2(x, y));
-        
+
         s->setContentSize(Size(14 * 16, 10 * 16));
-        
+
         this->addChild(s);
-        
-        x = winSize.width * 3/4;
-        
+
+        x = winSize.width * 3 / 4;
+
         auto s2 = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png");
-        
+
         s2->setPosition(Vec2(x, y));
-        
+
         s2->setContentSize(Size(14 * 16, 10 * 16));
-        
+
         this->addChild(s2);
         return true;
     }
@@ -635,19 +621,21 @@ bool UIS9_TexturePacker::init()
 
 bool UIS9FrameNameSpriteSheetRotatedInsetsScaled::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
-        auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
+        auto blocks_scaled_with_insets =
+            ui::Scale9Sprite::createWithSpriteFrameName("blocks9ss/blocks9.png", Rect(32, 32, 32, 32));
 
         blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5));
-        
+
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
-        
+
         this->addChild(blocks_scaled_with_insets);
         return true;
     }
@@ -656,19 +644,20 @@ bool UIS9FrameNameSpriteSheetRotatedInsetsScaled::init()
 
 bool UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
 
         auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
 
         blocks_scaled_with_insets->setInsetLeft(32);
         blocks_scaled_with_insets->setInsetRight(32);
 
-        blocks_scaled_with_insets->setPreferredSize(Size(32*5.5f, 32*4));
+        blocks_scaled_with_insets->setPreferredSize(Size(32 * 5.5f, 32 * 4));
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
 
         this->addChild(blocks_scaled_with_insets);
@@ -679,32 +668,30 @@ bool UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::init()
 
 bool UIS9CascadeOpacityAndColor::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        auto rgba = Layer::create();
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+        auto rgba    = Layer::create();
         rgba->setCascadeColorEnabled(true);
         rgba->setCascadeOpacityEnabled(true);
         this->addChild(rgba);
-        
-        
+
         auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
+
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
-        
+
         rgba->addChild(blocks_scaled_with_insets);
-        auto actions = Sequence::create(FadeIn::create(1),
-                                        TintTo::create(1, 0, 255, 0),
-                                        TintTo::create(1, 255, 0, 255),
-                                        CallFunc::create([=](){
+        auto actions = Sequence::create(FadeIn::create(1), TintTo::create(1, 0, 255, 0), TintTo::create(1, 255, 0, 255),
+                                        CallFunc::create([=]() {
                                             rgba->setCascadeColorEnabled(false);
                                             rgba->setCascadeOpacityEnabled(false);
                                         }),
                                         nullptr);
-        auto repeat = RepeatForever::create(actions);
+        auto repeat  = RepeatForever::create(actions);
         rgba->runAction(repeat);
         return true;
     }
@@ -713,31 +700,32 @@ bool UIS9CascadeOpacityAndColor::init()
 
 bool UIS9ZOrder::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
+
         blocks_scaled_with_insets->setPosition(Vec2(x, y));
         this->addChild(blocks_scaled_with_insets);
-        
-        Sprite *normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png");
+
+        Sprite* normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png");
         normalSprite->setColor(Color3B::RED);
         blocks_scaled_with_insets->addChild(normalSprite);
-        
+
         auto topLabel = Label::createWithSystemFont("I Must be On the Top", "Arial", 15);
-        topLabel->setPosition(Vec2(20.0f,20.0f));
+        topLabel->setPosition(Vec2(20.0f, 20.0f));
         blocks_scaled_with_insets->addChild(topLabel);
-        
+
         auto bottomLabel = Label::createWithSystemFont("I Must be On the Bottom", "Arial", 15);
-        bottomLabel->setPosition(Vec2(80.0f,80.0f));
+        bottomLabel->setPosition(Vec2(80.0f, 80.0f));
         bottomLabel->setColor(Color3B::BLUE);
-        blocks_scaled_with_insets->addChild(bottomLabel,-1);
-        
+        blocks_scaled_with_insets->addChild(bottomLabel, -1);
+
         return true;
     }
     return false;
@@ -745,120 +733,132 @@ bool UIS9ZOrder::init()
 
 bool UIS9Flip::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2);
+
         auto statusLabel = Label::createWithSystemFont("Scale9Enabled", "Arial", 10);
         statusLabel->setPosition(Vec2(x, winSize.height - statusLabel->getContentSize().height - 40));
         this->addChild(statusLabel);
-        
+
         auto normalSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
-        normalSprite->setPosition(Vec2(x, y ));
+
+        normalSprite->setPosition(Vec2(x, y));
         this->addChild(normalSprite);
-        
-        
-        auto normalLabel = Label::createWithSystemFont("Normal Sprite","Arial",10);
-        normalLabel->setPosition(normalSprite->getPosition() + Vec2(0.0f, normalSprite->getContentSize().height/2 + 10));
+
+        auto normalLabel = Label::createWithSystemFont("Normal Sprite", "Arial", 10);
+        normalLabel->setPosition(normalSprite->getPosition() +
+                                 Vec2(0.0f, normalSprite->getContentSize().height / 2 + 10));
         this->addChild(normalLabel);
-        
-        
-        
+
         auto flipXSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
-        flipXSprite->setPosition(Vec2(x - 120, y ));
+
+        flipXSprite->setPosition(Vec2(x - 120, y));
         flipXSprite->setScale(1.2f);
         this->addChild(flipXSprite);
         flipXSprite->setFlippedX(false);
-        
-        auto flipXLabel = Label::createWithSystemFont("sprite is not flipped!","Arial",10);
-        flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0.0f, flipXSprite->getContentSize().height/2 + 10));
+
+        auto flipXLabel = Label::createWithSystemFont("sprite is not flipped!", "Arial", 10);
+        flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0.0f, flipXSprite->getContentSize().height / 2 + 10));
         this->addChild(flipXLabel);
-        
-        
+
         auto flipYSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        
+
         flipYSprite->setPosition(Vec2(x + 120, y));
         this->addChild(flipYSprite);
-        
+
         flipYSprite->setScale(0.8f);
         flipYSprite->setFlippedY(true);
-        
-        auto flipYLabel = Label::createWithSystemFont("sprite is flipped!","Arial",10);
-        flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0.0f, flipYSprite->getContentSize().height/2 + 10));
+
+        auto flipYLabel = Label::createWithSystemFont("sprite is flipped!", "Arial", 10);
+        flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0.0f, flipYSprite->getContentSize().height / 2 + 10));
         this->addChild(flipYLabel);
-        
-        
+
         auto toggleFlipXButton = Button::create();
         toggleFlipXButton->setTitleText("Toggle FlipX");
-        toggleFlipXButton->setPosition(flipXSprite->getPosition() + Vec2(0.0f, - 20 - flipXSprite->getContentSize().height/2));
-        toggleFlipXButton->addClickEventListener([=](Ref*){
-            flipXSprite->setFlippedX(! flipXSprite->isFlippedX());
-            if (flipXSprite->isFlippedX()) {
+        toggleFlipXButton->setPosition(flipXSprite->getPosition() +
+                                       Vec2(0.0f, -20 - flipXSprite->getContentSize().height / 2));
+        toggleFlipXButton->addClickEventListener([=](Ref*) {
+            flipXSprite->setFlippedX(!flipXSprite->isFlippedX());
+            if (flipXSprite->isFlippedX())
+            {
                 flipXLabel->setString("sprite is flipped!");
             }
-            else{
+            else
+            {
                 flipXLabel->setString("sprite is not flipped!");
             }
         });
         this->addChild(toggleFlipXButton);
-        
+
         auto toggleFlipYButton = Button::create();
         toggleFlipYButton->setTitleText("Toggle FlipY");
-        toggleFlipYButton->setPosition(flipYSprite->getPosition() + Vec2(0.0f, -20 - flipYSprite->getContentSize().height/2));
-        toggleFlipYButton->addClickEventListener([=](Ref*){
+        toggleFlipYButton->setPosition(flipYSprite->getPosition() +
+                                       Vec2(0.0f, -20 - flipYSprite->getContentSize().height / 2));
+        toggleFlipYButton->addClickEventListener([=](Ref*) {
             flipYSprite->setFlippedY(!flipYSprite->isFlippedY());
-            if (flipYSprite->isFlippedY()) {
+            if (flipYSprite->isFlippedY())
+            {
                 flipYLabel->setString("sprite is flipped!");
             }
-            else{
+            else
+            {
                 flipYLabel->setString("sprite is not flipped!");
             }
         });
         this->addChild(toggleFlipYButton);
-        
+
         auto toggleScale9Button = Button::create();
         toggleScale9Button->setTitleText("Toggle Scale9");
-        toggleScale9Button->setPosition(normalSprite->getPosition() + Vec2(0.0f, -20 - normalSprite->getContentSize().height/2));
-        toggleScale9Button->addClickEventListener([=](Ref*){
+        toggleScale9Button->setPosition(normalSprite->getPosition() +
+                                        Vec2(0.0f, -20 - normalSprite->getContentSize().height / 2));
+        toggleScale9Button->addClickEventListener([=](Ref*) {
             flipXSprite->setScale9Enabled(!flipXSprite->isScale9Enabled());
             flipYSprite->setScale9Enabled(!flipYSprite->isScale9Enabled());
-            if (flipXSprite->isScale9Enabled()) {
+            if (flipXSprite->isScale9Enabled())
+            {
                 statusLabel->setString("Scale9Enabled");
-            }else{
+            }
+            else
+            {
                 statusLabel->setString("Scale9Disabled");
             }
-            
+
             CCLOG("scaleX = %f", flipXSprite->getScaleX());
             CCLOG("scaleY = %f", flipYSprite->getScale());
-            if (flipXSprite->isFlippedX()) {
+            if (flipXSprite->isFlippedX())
+            {
                 CCLOG("xxxxxxx");
             }
-            if (flipYSprite->isFlippedY()) {
+            if (flipYSprite->isFlippedY())
+            {
                 CCLOG("YYYYYY");
             }
-            
-            if (flipXSprite->isFlippedX()) {
+
+            if (flipXSprite->isFlippedX())
+            {
                 flipXLabel->setString("sprite is flipped!");
             }
-            else{
+            else
+            {
                 flipXLabel->setString("sprite is not flipped!");
             }
-            
-            if (flipYSprite->isFlippedY()) {
+
+            if (flipYSprite->isFlippedY())
+            {
                 flipYLabel->setString("sprite is flipped!");
             }
-            else{
+            else
+            {
                 flipYLabel->setString("sprite is not flipped!");
             }
-            
         });
         this->addChild(toggleScale9Button);
-        
+
         return true;
     }
     return false;
@@ -866,63 +866,56 @@ bool UIS9Flip::init()
 
 bool UIS9ChangeAnchorPoint::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist);
-        
+
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2 + 50);
-        
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2 + 50);
+
         auto normalSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png");
-        normalSprite->setPosition(Vec2(x, y ));
-//        normalSprite->setScale9Enabled(false);
-//        normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+        normalSprite->setPosition(Vec2(x, y));
+        //        normalSprite->setScale9Enabled(false);
+        //        normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
 
         this->addChild(normalSprite);
-        
-        
+
         Button* button1 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button1->setPosition(Vec2(winSize.width/2 - 100,winSize.height/2 - 50));
+        button1->setPosition(Vec2(winSize.width / 2 - 100, winSize.height / 2 - 50));
         button1->setName("button2");
         button1->setTitleText("Vec(0,0)");
-        button1->addTouchEventListener([=](Ref*, Widget::TouchEventType type)
-                                       {
-                                           if (type == Widget::TouchEventType::ENDED) {
-                                               normalSprite->setAnchorPoint(Vec2::ZERO);
-                                               normalSprite->setScale9Enabled(true);
-                                               CCLOG("position = %f, %f,  anchor point = %f, %f", normalSprite->getPosition().x,
-                                                     normalSprite->getPosition().y,
-                                                     normalSprite->getAnchorPoint().x,
-                                                     normalSprite->getAnchorPoint().y);
-                                               CCLOG("tests:content size : width = %f, height = %f",
-                                                     normalSprite->getContentSize().width,
-                                                     normalSprite->getContentSize().height);
-                                           }
-                                       });
+        button1->addTouchEventListener([=](Ref*, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
+                normalSprite->setAnchorPoint(Vec2::ZERO);
+                normalSprite->setScale9Enabled(true);
+                CCLOG("position = %f, %f,  anchor point = %f, %f", normalSprite->getPosition().x,
+                      normalSprite->getPosition().y, normalSprite->getAnchorPoint().x,
+                      normalSprite->getAnchorPoint().y);
+                CCLOG("tests:content size : width = %f, height = %f", normalSprite->getContentSize().width,
+                      normalSprite->getContentSize().height);
+            }
+        });
         this->addChild(button1);
-        
+
         Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button2->setPosition(Vec2(winSize.width/2 + 100,winSize.height/2 - 50));
+        button2->setPosition(Vec2(winSize.width / 2 + 100, winSize.height / 2 - 50));
         button2->setName("button2");
         button2->setTitleText("Vec(1,1)");
-        button2->addTouchEventListener([=](Ref*, Widget::TouchEventType type)
-                                       {
-                                           if (type == Widget::TouchEventType::ENDED) {
-                                               normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
-                                               normalSprite->setScale9Enabled(false);
-                                               CCLOG("position = %f, %f,  anchor point = %f, %f", normalSprite->getPosition().x,
-                                                     normalSprite->getPosition().y,
-                                                     normalSprite->getAnchorPoint().x,
-                                                     normalSprite->getAnchorPoint().y);
-                                               CCLOG("tests:content size : width = %f, height = %f",
-                                                     normalSprite->getContentSize().width,
-                                                     normalSprite->getContentSize().height);
-                                               
-                                           }
-                                       });
+        button2->addTouchEventListener([=](Ref*, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
+                normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT);
+                normalSprite->setScale9Enabled(false);
+                CCLOG("position = %f, %f,  anchor point = %f, %f", normalSprite->getPosition().x,
+                      normalSprite->getPosition().y, normalSprite->getAnchorPoint().x,
+                      normalSprite->getAnchorPoint().y);
+                CCLOG("tests:content size : width = %f, height = %f", normalSprite->getContentSize().width,
+                      normalSprite->getContentSize().height);
+            }
+        });
         this->addChild(button2);
-        
 
         return true;
     }
@@ -931,44 +924,44 @@ bool UIS9ChangeAnchorPoint::init()
 
 bool UIS9NinePatchTest::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("cocosui/android9patch.plist");
 
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2 + 50);
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2 + 50);
 
-        auto preferedSize = Size(99,99);
+        auto preferedSize = Size(99, 99);
 
-        //9-patch sprite with filename
+        // 9-patch sprite with filename
         auto playerSprite = ui::Scale9Sprite::create("cocosui/player.9.png");
         playerSprite->setPosition(x, y);
         playerSprite->setContentSize(preferedSize);
         auto capInsets = playerSprite->getCapInsets();
-        CCLOG("player sprite capInset = %g, %g %g, %g", capInsets.origin.x,
-              capInsets.origin.y, capInsets.size.width, capInsets.size.height);
+        CCLOG("player sprite capInset = %g, %g %g, %g", capInsets.origin.x, capInsets.origin.y, capInsets.size.width,
+              capInsets.size.height);
         this->addChild(playerSprite);
 
         auto animationBtnSprite = ui::Scale9Sprite::createWithSpriteFrameName("animationbuttonpressed.png");
-        animationBtnSprite->setPosition(x-100, y-100);
+        animationBtnSprite->setPosition(x - 100, y - 100);
         capInsets = animationBtnSprite->getCapInsets();
-        CCLOG("animationBtnSprite capInset = %g, %g %g, %g", capInsets.origin.x,
-              capInsets.origin.y, capInsets.size.width, capInsets.size.height);
+        CCLOG("animationBtnSprite capInset = %g, %g %g, %g", capInsets.origin.x, capInsets.origin.y,
+              capInsets.size.width, capInsets.size.height);
         this->addChild(animationBtnSprite);
-        
-        
+
         auto monsterSprite = ui::Scale9Sprite::createWithSpriteFrameName("monster.9.png");
-        monsterSprite->setPosition(x+100, y-100);
+        monsterSprite->setPosition(x + 100, y - 100);
         capInsets = monsterSprite->getCapInsets();
         monsterSprite->setContentSize(preferedSize);
-        CCLOG("monsterSprite capInset = %g, %g %g, %g", capInsets.origin.x,
-              capInsets.origin.y, capInsets.size.width, capInsets.size.height);
+        CCLOG("monsterSprite capInset = %g, %g %g, %g", capInsets.origin.x, capInsets.origin.y, capInsets.size.width,
+              capInsets.size.height);
         this->addChild(monsterSprite);
 
-        auto spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName("buttonnormal.9.png");
+        auto spriteFrame        = SpriteFrameCache::getInstance()->getSpriteFrameByName("buttonnormal.9.png");
         auto buttonScale9Sprite = Scale9Sprite::createWithSpriteFrame(spriteFrame);
-        buttonScale9Sprite->setContentSize(Size(150.0f,80.0f));
-        buttonScale9Sprite->setPosition(Vec2(100.0f,200.0f));
+        buttonScale9Sprite->setContentSize(Size(150.0f, 80.0f));
+        buttonScale9Sprite->setPosition(Vec2(100.0f, 200.0f));
         this->addChild(buttonScale9Sprite);
 
         return true;
@@ -978,48 +971,55 @@ bool UIS9NinePatchTest::init()
 
 bool UIS9BatchTest::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/blocks9ss.plist");
-        
+
         auto winSize = Director::getInstance()->getVisibleSize();
-        
-        auto label = Label::createWithSystemFont("Click Button to Add Sprite and Slice Sprite\nThe draw call should always be 19 after adding sprites", "Arial", 15);
-        label->setPosition(Vec2(winSize.width/2, winSize.height - 60));
+
+        auto label = Label::createWithSystemFont(
+            "Click Button to Add Sprite and Slice Sprite\nThe draw call should always be 19 after adding sprites",
+            "Arial", 15);
+        label->setPosition(Vec2(winSize.width / 2, winSize.height - 60));
         this->addChild(label);
-        
-        auto preferedSize = Size(150.0f,99.0f);
-        std::vector<std::string>  spriteFrameNameArray = {"blocks9ss/blocks9.png", "blocks9ss/blocks9r.png"};
-        auto addSpriteButton = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        addSpriteButton->setPosition(Vec2(winSize.width/2 - 50,winSize.height - 100));
+
+        auto preferedSize                             = Size(150.0f, 99.0f);
+        std::vector<std::string> spriteFrameNameArray = {"blocks9ss/blocks9.png", "blocks9ss/blocks9r.png"};
+        auto addSpriteButton =
+            ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
+        addSpriteButton->setPosition(Vec2(winSize.width / 2 - 50, winSize.height - 100));
         addSpriteButton->setTitleText("Add Normal Sprite");
         std::srand((unsigned)time(nullptr));
-        addSpriteButton->addClickEventListener([=](Ref*){
-            auto spriteFrameName = spriteFrameNameArray[rand()%2];
-            auto sprite = Sprite::createWithSpriteFrameName(spriteFrameName);
-            sprite->setPosition(Vec2(rand() % (int)winSize.width + 50.0f, winSize.height/2));
+        addSpriteButton->addClickEventListener([=](Ref*) {
+            auto spriteFrameName = spriteFrameNameArray[rand() % 2];
+            auto sprite          = Sprite::createWithSpriteFrameName(spriteFrameName);
+            sprite->setPosition(Vec2(rand() % (int)winSize.width + 50.0f, winSize.height / 2));
             this->addChild(sprite);
         });
         this->addChild(addSpriteButton);
-        
-        auto addSliceSpriteButton = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        addSliceSpriteButton->setPosition(Vec2(winSize.width/2 + 50,winSize.height - 100));
+
+        auto addSliceSpriteButton =
+            ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
+        addSliceSpriteButton->setPosition(Vec2(winSize.width / 2 + 50, winSize.height - 100));
         addSliceSpriteButton->setTitleText("Add Slice Sprite");
-        addSliceSpriteButton->addClickEventListener([=](Ref*){
-            int random = rand()%2;
+        addSliceSpriteButton->addClickEventListener([=](Ref*) {
+            int random           = rand() % 2;
             auto spriteFrameName = spriteFrameNameArray[random];
-            auto sprite = ui::Scale9Sprite::createWithSpriteFrameName(spriteFrameName);
-            sprite->setPosition(Vec2(rand() % (int)winSize.width + 50.0f, winSize.height/3));
-            if (random == 0) {
+            auto sprite          = ui::Scale9Sprite::createWithSpriteFrameName(spriteFrameName);
+            sprite->setPosition(Vec2(rand() % (int)winSize.width + 50.0f, winSize.height / 3));
+            if (random == 0)
+            {
                 sprite->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
-            }else{
+            }
+            else
+            {
                 sprite->setRenderingType(Scale9Sprite::RenderingType::SLICE);
             }
             sprite->setPreferredSize(preferedSize);
             this->addChild(sprite);
         });
         this->addChild(addSliceSpriteButton);
-        
-        
+
         return true;
     }
     return false;
@@ -1027,107 +1027,109 @@ bool UIS9BatchTest::init()
 
 bool UIS9ToggleRenderingTypeTest::init()
 {
-    if (UIScene::init()) {
-        
+    if (UIScene::init())
+    {
+
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2 - 20);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2 - 20);
+
         auto label = Label::createWithSystemFont("Click Button to toggle rendering type", "Arial", 15);
-        label->setPosition(Vec2(winSize.width/2, winSize.height - 60));
+        label->setPosition(Vec2(winSize.width / 2, winSize.height - 60));
         this->addChild(label);
-        
+
         auto blocks = ui::Scale9Sprite::create("Images/blocks9.png");
-      
+
         blocks->setPosition(Vec2(x, y));
-        blocks->setPreferredSize(Size(96*2, 96));
+        blocks->setPreferredSize(Size(96 * 2, 96));
         this->addChild(blocks);
-        
-        auto addSliceSpriteButton = ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        addSliceSpriteButton->setPosition(Vec2(winSize.width/2,winSize.height - 100));
+
+        auto addSliceSpriteButton =
+            ui::Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
+        addSliceSpriteButton->setPosition(Vec2(winSize.width / 2, winSize.height - 100));
         addSliceSpriteButton->setTitleText("Slice Rendering");
-        addSliceSpriteButton->addClickEventListener([=](Ref*){
-            if (blocks->getRenderingType() == Scale9Sprite::RenderingType::SLICE) {
+        addSliceSpriteButton->addClickEventListener([=](Ref*) {
+            if (blocks->getRenderingType() == Scale9Sprite::RenderingType::SLICE)
+            {
                 blocks->setRenderingType(Scale9Sprite::RenderingType::SIMPLE);
                 addSliceSpriteButton->setTitleText("Simple Rendering");
-            }else{
+            }
+            else
+            {
                 blocks->setRenderingType(Scale9Sprite::RenderingType::SLICE);
                 addSliceSpriteButton->setTitleText("Slice Rendering");
-                blocks->setCapInsets(Rect(96/3,96/3,96/3,96/3));
+                blocks->setCapInsets(Rect(96 / 3, 96 / 3, 96 / 3, 96 / 3));
             }
         });
         this->addChild(addSliceSpriteButton);
-        
+
         return true;
     }
     return false;
 }
 
-
 bool UIS9GlobalZOrderTest::init()
 {
-    if (UIScene::init()) {
-        
+    if (UIScene::init())
+    {
+
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2 - 20);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2 - 20);
+
         auto label = Label::createWithSystemFont("The green scale9sprite is in the back.", "Arial", 15);
-        label->setPosition(Vec2(winSize.width/2, winSize.height - 60));
+        label->setPosition(Vec2(winSize.width / 2, winSize.height - 60));
         this->addChild(label);
-        
+
         auto blocks = ui::Scale9Sprite::create("Images/blocks9.png");
-        
+
         blocks->setPosition(Vec2(x, y));
-        blocks->setPreferredSize(Size(96*2, 96*1.5));
+        blocks->setPreferredSize(Size(96 * 2, 96 * 1.5));
         blocks->setColor(Color3B::RED);
         blocks->setGlobalZOrder(1);
         this->addChild(blocks);
-        
-      
+
         auto blocks2 = ui::Scale9Sprite::create("Images/blocks9.png");
         blocks2->setPosition(Vec2(x, y));
-        blocks2->setPreferredSize(Size(96*3, 96));
+        blocks2->setPreferredSize(Size(96 * 3, 96));
         blocks2->setGlobalZOrder(0);
         blocks2->setColor(Color3B::GREEN);
         this->addChild(blocks2);
 
-        
         return true;
     }
     return false;
 }
 
-
 bool UIS9EnableScale9FalseTest::init()
 {
-    if (UIScene::init()) {
-        
+    if (UIScene::init())
+    {
+
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2 + 50;
-        float y = 0 + (winSize.height / 2 + 10);
-        
+        float x      = winSize.width / 2 + 50;
+        float y      = 0 + (winSize.height / 2 + 10);
+
         auto label = Label::createWithSystemFont("Only the yellow block intersect with the green one.", "Arial", 15);
-        label->setPosition(Vec2(winSize.width/2, winSize.height - 60));
+        label->setPosition(Vec2(winSize.width / 2, winSize.height - 60));
         this->addChild(label);
-        
+
         auto blocks = ui::Scale9Sprite::create("Images/blocks9.png");
         blocks->setScale9Enabled(false);
         blocks->setPosition(Vec2(x, y));
-        blocks->setPreferredSize(Size(96*2.0f, 96.0f));
+        blocks->setPreferredSize(Size(96 * 2.0f, 96.0f));
         blocks->setColor(Color3B::RED);
         blocks->setGlobalZOrder(1);
         this->addChild(blocks);
-        
-        
+
         auto blocks2 = ui::Scale9Sprite::create("Images/blocks9.png");
         blocks2->setScale9Enabled(false);
         blocks2->setPosition(Vec2(0.0f, 0.0f));
-        blocks2->setPreferredSize(Size(96*1.5f, 96.0f));
+        blocks2->setPreferredSize(Size(96 * 1.5f, 96.0f));
         blocks2->setGlobalZOrder(0);
         blocks2->setColor(Color3B::GREEN);
         blocks->addChild(blocks2);
-        
+
         auto blocks3 = ui::Scale9Sprite::create("Images/blocks9.png");
         blocks3->setScale9Enabled(false);
         blocks3->setPosition(Vec2(0.0f, 0.0f));
@@ -1135,8 +1137,7 @@ bool UIS9EnableScale9FalseTest::init()
         blocks3->setGlobalZOrder(2);
         blocks3->setColor(Color3B::YELLOW);
         blocks2->addChild(blocks3);
-        
-        
+
         return true;
     }
     return false;
@@ -1144,26 +1145,27 @@ bool UIS9EnableScale9FalseTest::init()
 
 bool UIS9GrayStateOpacityTest::init()
 {
-    if (UIScene::init()) {
-        
+    if (UIScene::init())
+    {
+
         auto winSize = Director::getInstance()->getWinSize();
-        float x = winSize.width / 2;
-        float y = 0 + (winSize.height / 2 + 10);
-        
+        float x      = winSize.width / 2;
+        float y      = 0 + (winSize.height / 2 + 10);
+
         auto label = Label::createWithSystemFont("Drap slider to change opacity of the scale9Sprite", "Arial", 15);
-        label->setPosition(Vec2(winSize.width/2, winSize.height - 60));
+        label->setPosition(Vec2(winSize.width / 2, winSize.height - 60));
         this->addChild(label);
-        
+
         auto blocks = ui::Scale9Sprite::create("Images/blocks9.png");
-        
+
         blocks->setPosition(Vec2(x, y));
-        blocks->setPreferredSize(Size(96*2, 96*1.5));
+        blocks->setPreferredSize(Size(96 * 2, 96 * 1.5));
         blocks->setOpacity(100);
         blocks->setState(Scale9Sprite::State::GRAY);
         blocks->setGlobalZOrder(1);
         blocks->setName("GrayScale9");
         this->addChild(blocks);
-        
+
         Slider* slider = Slider::create();
         slider->loadBarTexture("cocosui/sliderTrack.png");
         slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
@@ -1180,13 +1182,13 @@ bool UIS9GrayStateOpacityTest::init()
     return false;
 }
 
-void UIS9GrayStateOpacityTest::sliderEvent(cocos2d::Ref *sender, cocos2d::ui::Slider::EventType type)
+void UIS9GrayStateOpacityTest::sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
-        Slider* slider = dynamic_cast<Slider*>(sender);
-        int percent = slider->getPercent();
-        int maxPercent = slider->getMaxPercent();
+        Slider* slider    = dynamic_cast<Slider*>(sender);
+        int percent       = slider->getPercent();
+        int maxPercent    = slider->getMaxPercent();
         auto scale9Sprite = (Scale9Sprite*)this->getChildByName("GrayScale9");
         scale9Sprite->setOpacity(1.0 * percent / maxPercent * 255.0);
     }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h
index dca6c3fd712a..ae1642036468 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -68,7 +68,7 @@ class UIS9BatchNodeBasic : public UIScene
 {
 public:
     CREATE_FUNC(UIS9BatchNodeBasic);
-    
+
     virtual bool init() override;
 };
 
@@ -78,7 +78,7 @@ class UIS9FrameNameSpriteSheet : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheet);
-    
+
     virtual bool init() override;
 };
 
@@ -88,7 +88,7 @@ class UIS9FrameNameSpriteSheetRotated : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetRotated);
-    
+
     virtual bool init() override;
 };
 
@@ -98,7 +98,7 @@ class UIS9FrameNameSpriteSheetCroppedSimple : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetCroppedSimple);
-    
+
     virtual bool init() override;
 };
 
@@ -108,18 +108,17 @@ class UIS9FrameNameSpriteSheetCroppedRotatedSimple : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetCroppedRotatedSimple);
-    
+
     virtual bool init() override;
 };
 
-
 // S9FrameNameSpriteSheetCropped
 
 class UIS9FrameNameSpriteSheetCropped : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetCropped);
-    
+
     virtual bool init() override;
 };
 
@@ -129,7 +128,7 @@ class UIS9FrameNameSpriteSheetCroppedRotated : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetCroppedRotated);
-    
+
     virtual bool init() override;
 };
 
@@ -139,7 +138,7 @@ class UIS9BatchNodeScaledNoInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9BatchNodeScaledNoInsets);
-    
+
     virtual bool init() override;
 };
 
@@ -149,7 +148,7 @@ class UIS9FrameNameSpriteSheetScaledNoInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetScaledNoInsets);
-    
+
     virtual bool init() override;
 };
 
@@ -159,18 +158,17 @@ class UIS9FrameNameSpriteSheetRotatedScaledNoInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedScaledNoInsets);
-    
+
     virtual bool init() override;
 };
 
-
 // S9BatchNodeScaleWithCapInsets
 
 class UIS9BatchNodeScaleWithCapInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9BatchNodeScaleWithCapInsets);
-    
+
     virtual bool init() override;
 };
 
@@ -180,7 +178,7 @@ class UIS9FrameNameSpriteSheetInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetInsets);
-    
+
     virtual bool init() override;
 };
 
@@ -190,7 +188,7 @@ class UIS9FrameNameSpriteSheetInsetsScaled : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetInsetsScaled);
-    
+
     virtual bool init() override;
 };
 
@@ -200,7 +198,7 @@ class UIS9FrameNameSpriteSheetRotatedInsets : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsets);
-    
+
     virtual bool init() override;
 };
 
@@ -210,7 +208,7 @@ class UIS9_TexturePacker : public UIScene
 {
 public:
     CREATE_FUNC(UIS9_TexturePacker);
-    
+
     virtual bool init() override;
 };
 
@@ -220,7 +218,7 @@ class UIS9FrameNameSpriteSheetRotatedInsetsScaled : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsetsScaled);
-    
+
     virtual bool init() override;
 };
 
@@ -230,7 +228,7 @@ class UIS9FrameNameSpriteSheetRotatedSetCapInsetLater : public UIScene
 {
 public:
     CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedSetCapInsetLater);
-    
+
     virtual bool init() override;
 };
 
@@ -240,7 +238,7 @@ class UIS9CascadeOpacityAndColor : public UIScene
 {
 public:
     CREATE_FUNC(UIS9CascadeOpacityAndColor);
-    
+
     virtual bool init() override;
 };
 
@@ -250,7 +248,7 @@ class UIS9ZOrder : public UIScene
 {
 public:
     CREATE_FUNC(UIS9ZOrder);
-    
+
     virtual bool init() override;
 };
 
@@ -260,7 +258,7 @@ class UIS9Flip : public UIScene
 {
 public:
     CREATE_FUNC(UIS9Flip);
-    
+
     virtual bool init() override;
 };
 
@@ -268,7 +266,7 @@ class UIS9ChangeAnchorPoint : public UIScene
 {
 public:
     CREATE_FUNC(UIS9ChangeAnchorPoint);
-    
+
     virtual bool init() override;
 };
 
@@ -280,39 +278,39 @@ class UIS9NinePatchTest : public UIScene
     virtual bool init() override;
 };
 
-class UIS9BatchTest: public UIScene
+class UIS9BatchTest : public UIScene
 {
 public:
     CREATE_FUNC(UIS9BatchTest);
-    
+
     virtual bool init() override;
 };
 
-class UIS9ToggleRenderingTypeTest: public UIScene
+class UIS9ToggleRenderingTypeTest : public UIScene
 {
 public:
     CREATE_FUNC(UIS9ToggleRenderingTypeTest);
-    
+
     virtual bool init() override;
 };
 
-class UIS9GlobalZOrderTest: public UIScene
+class UIS9GlobalZOrderTest : public UIScene
 {
 public:
     CREATE_FUNC(UIS9GlobalZOrderTest);
-    
+
     virtual bool init() override;
 };
 
-class UIS9EnableScale9FalseTest: public UIScene
+class UIS9EnableScale9FalseTest : public UIScene
 {
 public:
     CREATE_FUNC(UIS9EnableScale9FalseTest);
-    
+
     virtual bool init() override;
 };
 
-class UIS9GrayStateOpacityTest: public UIScene
+class UIS9GrayStateOpacityTest : public UIScene
 {
 public:
     CREATE_FUNC(UIS9GrayStateOpacityTest);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp
index cba747ec8ede..fad79ec11fd3 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,17 +31,9 @@
 USING_NS_CC;
 using namespace cocos2d::ui;
 
-UIScene::UIScene()
-: _uiLayer(nullptr)
-, _sceneTitle(nullptr)
-{
-    
-}
+UIScene::UIScene() : _uiLayer(nullptr), _sceneTitle(nullptr) {}
 
-UIScene::~UIScene()
-{
-	
-}
+UIScene::~UIScene() {}
 
 bool UIScene::init()
 {
@@ -49,25 +41,25 @@ bool UIScene::init()
     {
         _uiLayer = Layer::create();
         addChild(_uiLayer);
-        
-        _widget = dynamic_cast<Layout*>(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UITest/UITest.json"));
+
+        _widget = dynamic_cast<Layout*>(
+            cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UITest/UITest.json"));
         _uiLayer->addChild(_widget);
-        
+
         Size screenSize = Director::getInstance()->getWinSize();
-        Size rootSize = _widget->getContentSize();
-        _uiLayer->setPosition(Vec2((screenSize.width - rootSize.width) / 2,
-                                    (screenSize.height - rootSize.height) / 2));
-        
+        Size rootSize   = _widget->getContentSize();
+        _uiLayer->setPosition(Vec2((screenSize.width - rootSize.width) / 2, (screenSize.height - rootSize.height) / 2));
+
         // disable these widgets because they are conflict with menu items created in `TestCase`
-        
+
         auto restartButton = Helper::seekWidgetByName(_widget, "middle_Button");
         restartButton->setVisible(false);
         restartButton->setEnabled(false);
-        
+
         auto leftButton = Helper::seekWidgetByName(_widget, "left_Button");
         leftButton->setVisible(false);
         leftButton->setEnabled(false);
-        
+
         auto rightButton = Helper::seekWidgetByName(_widget, "right_Button");
         rightButton->setVisible(false);
         rightButton->setEnabled(false);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h
index 9327bd672150..c84e7d496be7 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,6 @@
 #include "ui/CocosGUI.h"
 #include "BaseTest.h"
 
-
 class UIScene : public TestCase
 {
 public:
@@ -40,6 +39,7 @@ class UIScene : public TestCase
 
     virtual bool init() override;
     virtual void onEnter() override;
+
 protected:
     cocos2d::Layer* _uiLayer;
     cocos2d::ui::Layout* _widget;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
index f41166c23a2c..7766e44252ea 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,4 +21,3 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
index 068378d8cfc8..fe29ec21ae33 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
index 322eb992090e..2c84f12f9830 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -43,154 +43,152 @@ UIScrollViewTests::UIScrollViewTests()
 }
 // UIScrollViewTest_Vertical
 
-UIScrollViewTest_Vertical::UIScrollViewTest_Vertical()
-: _displayValueLabel(nullptr)
-{
-}
+UIScrollViewTest_Vertical::UIScrollViewTest_Vertical() : _displayValueLabel(nullptr) {}
 
-UIScrollViewTest_Vertical::~UIScrollViewTest_Vertical()
-{
-}
+UIScrollViewTest_Vertical::~UIScrollViewTest_Vertical() {}
 
 bool UIScrollViewTest_Vertical::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the scrollview alert will be displayed
         _displayValueLabel = Text::create("Move by vertical direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
         Text* alert = Text::create("ScrollView vertical", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the scrollview by vertical
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setContentSize(Size(280.0f, 100.0f));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                               (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
-                               (widgetSize.height - backgroundSize.height) / 2.0f +
-                               (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
-		scrollView->setScrollBarWidth(4);
-		scrollView->setScrollBarPositionFromCorner(Vec2(2, 2));
-		scrollView->setScrollBarColor(Color3B::WHITE);
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                     (widgetSize.height - backgroundSize.height) / 2.0f +
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+        scrollView->setScrollBarWidth(4);
+        scrollView->setScrollBarPositionFromCorner(Vec2(2, 2));
+        scrollView->setScrollBarColor(Color3B::WHITE);
         scrollView->setGlobalZOrder(200);
         _uiLayer->addChild(scrollView);
-        
+
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
-        
-        float innerWidth = scrollView->getContentSize().width;
+
+        float innerWidth  = scrollView->getContentSize().width;
         float innerHeight = scrollView->getContentSize().height + imageView->getContentSize().height;
-        
-        scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));                
-        
+
+        scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button->setPosition(Vec2(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
+        button->setPosition(Vec2(innerWidth / 2.0f,
+                                 scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
         scrollView->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
-        titleButton->setPosition(Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
+        titleButton->setPosition(
+            Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
         scrollView->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
-        button_scale9->setPosition(Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
+        button_scale9->setPosition(
+            Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
         scrollView->addChild(button_scale9);
-        
+
         imageView->setPosition(Vec2(innerWidth / 2.0f, imageView->getContentSize().height / 2.0f));
-        scrollView->addChild(imageView);            
+        scrollView->addChild(imageView);
         scrollView->scrollToBottom(2.0, true);
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewTest_Horizontal
 
-UIScrollViewTest_Horizontal::UIScrollViewTest_Horizontal()
-: _displayValueLabel(nullptr)
-{
-}
+UIScrollViewTest_Horizontal::UIScrollViewTest_Horizontal() : _displayValueLabel(nullptr) {}
 
-UIScrollViewTest_Horizontal::~UIScrollViewTest_Horizontal()
-{
-}
+UIScrollViewTest_Horizontal::~UIScrollViewTest_Horizontal() {}
 
 bool UIScrollViewTest_Horizontal::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the scrollview alert will be displayed
-        _displayValueLabel = Text::create("Move by horizontal direction","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
-        _uiLayer->addChild(_displayValueLabel);            
-        
-        Text* alert = Text::create("ScrollView horizontal","fonts/Marker Felt.ttf",30);
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _uiLayer->addChild(_displayValueLabel);
+
+        Text* alert = Text::create("ScrollView horizontal", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the scrollview by horizontal
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setBounceEnabled(true);
         scrollView->setDirection(ui::ScrollView::Direction::HORIZONTAL);
         scrollView->setContentSize(Size(280.0f, 150.0f));
         scrollView->setInnerContainerSize(scrollView->getContentSize());
-		scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
-		scrollView->setScrollBarColor(Color3B::YELLOW);
+        scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
+        scrollView->setScrollBarColor(Color3B::YELLOW);
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition((widgetSize - scrollView->getContentSize()) / 2.0f);
         _uiLayer->addChild(scrollView);
-        
+
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
-        
-        float innerWidth = scrollView->getContentSize().width + imageView->getContentSize().width;
+
+        float innerWidth  = scrollView->getContentSize().width + imageView->getContentSize().width;
         float innerHeight = scrollView->getContentSize().height;
-        
+
         scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         button->setPosition(Vec2(button->getContentSize().width / 2.0f,
-                                scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
+                                 scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
         scrollView->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
         titleButton->setPosition(Vec2(button->getRightBoundary() + button->getContentSize().width / 2.0f,
-                                    button->getBottomBoundary() - button->getContentSize().height / 2.0f));
+                                      button->getBottomBoundary() - button->getContentSize().height / 2.0f));
         scrollView->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
-        button_scale9->setPosition(Vec2(titleButton->getRightBoundary() + titleButton->getContentSize().width / 2.0f,
-                                       titleButton->getBottomBoundary() - titleButton->getContentSize().height / 2.0f));
+        button_scale9->setPosition(
+            Vec2(titleButton->getRightBoundary() + titleButton->getContentSize().width / 2.0f,
+                 titleButton->getBottomBoundary() - titleButton->getContentSize().height / 2.0f));
         scrollView->addChild(button_scale9);
-                
-        imageView->setPosition(Vec2(innerWidth - imageView->getContentSize().width / 2.0f,
-                                   button_scale9->getBottomBoundary() - button_scale9->getContentSize().height / 2.0f));
+
+        imageView->setPosition(
+            Vec2(innerWidth - imageView->getContentSize().width / 2.0f,
+                 button_scale9->getBottomBoundary() - button_scale9->getContentSize().height / 2.0f));
         scrollView->addChild(imageView);
 
         // Jump to right
@@ -198,43 +196,39 @@ bool UIScrollViewTest_Horizontal::init()
 
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewTest_Both
-UIScrollViewTest_Both::UIScrollViewTest_Both()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UIScrollViewTest_Both::UIScrollViewTest_Both() : _displayValueLabel(nullptr) {}
 
-UIScrollViewTest_Both::~UIScrollViewTest_Both()
-{
-}
+UIScrollViewTest_Both::~UIScrollViewTest_Both() {}
 
 bool UIScrollViewTest_Both::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
-        _displayValueLabel = Text::create("Move by any direction","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Move by any direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("ScrollView both","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("ScrollView both", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the dragpanel
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setDirection(ui::ScrollView::Direction::BOTH);
@@ -243,20 +237,20 @@ bool UIScrollViewTest_Both::init()
         scrollView->setBackGroundImageScale9Enabled(true);
         scrollView->setBackGroundImage("cocosui/green_edit.png");
         scrollView->setContentSize(Size(210, 122.5));
-		scrollView->setScrollBarWidth(4);
-		scrollView->setScrollBarPositionFromCorner(Vec2(6, 6));
+        scrollView->setScrollBarWidth(4);
+        scrollView->setScrollBarPositionFromCorner(Vec2(6, 6));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                    (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
-                                    (widgetSize.height - backgroundSize.height) / 2.0f +
-                                    (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                     (widgetSize.height - backgroundSize.height) / 2.0f +
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
         ImageView* imageView = ImageView::create("Hello.png");
         scrollView->addChild(imageView);
-        
+
         scrollView->setInnerContainerSize(imageView->getContentSize());
         Size innerSize = scrollView->getInnerContainerSize();
         imageView->setPosition(Vec2(innerSize.width / 2.0f, innerSize.height / 2.0f));
-        
+
         _uiLayer->addChild(scrollView);
 
         // Jump to right bottom
@@ -264,61 +258,60 @@ bool UIScrollViewTest_Both::init()
 
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewTest_ScrollToPercentBothDirection
 UIScrollViewTest_ScrollToPercentBothDirection::UIScrollViewTest_ScrollToPercentBothDirection()
-: _displayValueLabel(nullptr)
-{
-    
-}
+    : _displayValueLabel(nullptr)
+{}
 
-UIScrollViewTest_ScrollToPercentBothDirection::~UIScrollViewTest_ScrollToPercentBothDirection()
-{
-}
+UIScrollViewTest_ScrollToPercentBothDirection::~UIScrollViewTest_ScrollToPercentBothDirection() {}
 
 bool UIScrollViewTest_ScrollToPercentBothDirection::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
-        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",30);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 30);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("ScrollView scroll to percent both direction without scroll bar","fonts/Marker Felt.ttf",20);
+        Text* alert =
+            Text::create("ScrollView scroll to percent both direction without scroll bar", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         ui::ScrollView* sc = ui::ScrollView::create();
         sc->setBackGroundColor(Color3B::GREEN);
         sc->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
         sc->setDirection(ui::ScrollView::Direction::BOTH);
         sc->setInnerContainerSize(Size(480.0f, 320.0f));
-        sc->setContentSize(Size(100.0f,100.0f));
-		sc->setScrollBarEnabled(false);
+        sc->setContentSize(Size(100.0f, 100.0f));
+        sc->setScrollBarEnabled(false);
         Size backgroundSize = background->getContentSize();
         sc->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                              (backgroundSize.width - sc->getContentSize().width) / 2.0f,
-                              (widgetSize.height - backgroundSize.height) / 2.0f +
-                              (backgroundSize.height - sc->getContentSize().height) / 2.0f));
+                                 (backgroundSize.width - sc->getContentSize().width) / 2.0f,
+                             (widgetSize.height - backgroundSize.height) / 2.0f +
+                                 (backgroundSize.height - sc->getContentSize().height) / 2.0f));
         sc->scrollToPercentBothDirection(Vec2(50, 50), 1, true);
         ImageView* iv = ImageView::create("cocosui/Hello.png");
         iv->setPosition(Vec2(240.0f, 160.0f));
         sc->addChild(iv);
         _uiLayer->addChild(sc);
-        
+
         return true;
     }
     return false;
@@ -326,52 +319,50 @@ bool UIScrollViewTest_ScrollToPercentBothDirection::init()
 
 // UIScrollViewTest_ScrollToPercentBothDirection_Bounce
 UIScrollViewTest_ScrollToPercentBothDirection_Bounce::UIScrollViewTest_ScrollToPercentBothDirection_Bounce()
-: _displayValueLabel(nullptr)
-{
-    
-}
+    : _displayValueLabel(nullptr)
+{}
 
-UIScrollViewTest_ScrollToPercentBothDirection_Bounce::~UIScrollViewTest_ScrollToPercentBothDirection_Bounce()
-{
-}
+UIScrollViewTest_ScrollToPercentBothDirection_Bounce::~UIScrollViewTest_ScrollToPercentBothDirection_Bounce() {}
 
 bool UIScrollViewTest_ScrollToPercentBothDirection_Bounce::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
-        _displayValueLabel = Text::create("No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("ScrollView scroll to percent both direction bounce","fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("ScrollView scroll to percent both direction bounce", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 4.5));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         ui::ScrollView* sc = ui::ScrollView::create();
         sc->setBackGroundColor(Color3B::GREEN);
         sc->setBackGroundColorType(Layout::BackGroundColorType::SOLID);
         sc->setBounceEnabled(true);
         sc->setDirection(ui::ScrollView::Direction::BOTH);
         sc->setInnerContainerSize(Size(480.0f, 320.0f));
-        sc->setContentSize(Size(100.0f,100.0f));
-		sc->setScrollBarPositionFromCornerForHorizontal(Vec2(5.0f, sc->getContentSize().height - 5));
-		sc->setScrollBarPositionFromCornerForVertical(Vec2(sc->getContentSize().width - 5, 5.0f));
-		sc->setScrollBarAutoHideEnabled(false);
+        sc->setContentSize(Size(100.0f, 100.0f));
+        sc->setScrollBarPositionFromCornerForHorizontal(Vec2(5.0f, sc->getContentSize().height - 5));
+        sc->setScrollBarPositionFromCornerForVertical(Vec2(sc->getContentSize().width - 5, 5.0f));
+        sc->setScrollBarAutoHideEnabled(false);
         Size backgroundSize = background->getContentSize();
         sc->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                              (backgroundSize.width - sc->getContentSize().width) / 2.0f,
-                              (widgetSize.height - backgroundSize.height) / 2.0f +
-                              (backgroundSize.height - sc->getContentSize().height) / 2.0f));
+                                 (backgroundSize.width - sc->getContentSize().width) / 2.0f,
+                             (widgetSize.height - backgroundSize.height) / 2.0f +
+                                 (backgroundSize.height - sc->getContentSize().height) / 2.0f));
         sc->scrollToPercentBothDirection(Vec2(50.0f, 50.0f), 1, true);
         ImageView* iv = ImageView::create("cocosui/Hello.png");
         iv->setPosition(Vec2(240.0f, 160.0f));
@@ -379,85 +370,82 @@ bool UIScrollViewTest_ScrollToPercentBothDirection_Bounce::init()
         _uiLayer->addChild(sc);
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewNestTest
 
-UIScrollViewNestTest::UIScrollViewNestTest()
-: _displayValueLabel(nullptr)
-{
-}
+UIScrollViewNestTest::UIScrollViewNestTest() : _displayValueLabel(nullptr) {}
 
-UIScrollViewNestTest::~UIScrollViewNestTest()
-{
-}
+UIScrollViewNestTest::~UIScrollViewNestTest() {}
 
 bool UIScrollViewNestTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the scrollview alert will be displayed
         _displayValueLabel = Text::create("Move by vertical direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
         Text* alert = Text::create("ScrollView vertical", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the scrollview by vertical
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setContentSize(Size(280.0f, 150.0f));
         scrollView->setDirection(ui::ScrollView::Direction::VERTICAL);
-		scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
+        scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                     (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
                                      (widgetSize.height - backgroundSize.height) / 2.0f +
-                                     (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
-		scrollView->setScrollBarPositionFromCornerForVertical(Vec2(scrollView->getContentSize().width - 4, 4.0f));
-		scrollView->setScrollBarColor(Color3B::BLUE);
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+        scrollView->setScrollBarPositionFromCornerForVertical(Vec2(scrollView->getContentSize().width - 4, 4.0f));
+        scrollView->setScrollBarColor(Color3B::BLUE);
         _uiLayer->addChild(scrollView);
-        
+
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
-        
-        float innerWidth = scrollView->getContentSize().width;
+
+        float innerWidth  = scrollView->getContentSize().width;
         float innerHeight = scrollView->getContentSize().height + imageView->getContentSize().height;
-        
+
         scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button->setPosition(Vec2(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
+        button->setPosition(Vec2(innerWidth / 2.0f,
+                                 scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
         scrollView->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
-        titleButton->setPosition(Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
+        titleButton->setPosition(
+            Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
         scrollView->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
-        button_scale9->setPosition(Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
+        button_scale9->setPosition(
+            Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
         scrollView->addChild(button_scale9);
-        
+
         imageView->setPosition(Vec2(innerWidth / 2.0f, imageView->getContentSize().height / 2.0f));
         scrollView->addChild(imageView);
-        
-        
-        
+
         // Create the scrollview by both
         ui::ScrollView* sc = ui::ScrollView::create();
         sc->setBackGroundColor(Color3B::GREEN);
@@ -465,118 +453,106 @@ bool UIScrollViewNestTest::init()
         sc->setBounceEnabled(true);
         sc->setDirection(ui::ScrollView::Direction::BOTH);
         sc->setInnerContainerSize(Size(480.0f, 320.0f));
-        sc->setContentSize(Size(100.0f,100.0f));
+        sc->setContentSize(Size(100.0f, 100.0f));
         sc->setPropagateTouchEvents(false);
-        sc->setPosition(Vec2(180.0f,100.0f));
+        sc->setPosition(Vec2(180.0f, 100.0f));
         sc->scrollToPercentBothDirection(Vec2(50.0f, 50.0f), 1, true);
-		sc->setScrollBarPositionFromCorner(Vec2(4.0f, 4.0f));
+        sc->setScrollBarPositionFromCorner(Vec2(4.0f, 4.0f));
         ImageView* iv = ImageView::create("cocosui/Hello.png");
         iv->setPosition(Vec2(240.0f, 160.0f));
         sc->addChild(iv);
 
-        
         scrollView->addChild(sc);
-        
+
         return true;
     }
-    
+
     return false;
 }
 
-
-
-
 // UIScrollViewRotated
 
-UIScrollViewRotated::UIScrollViewRotated()
-: _displayValueLabel(nullptr)
-{
-}
+UIScrollViewRotated::UIScrollViewRotated() : _displayValueLabel(nullptr) {}
 
-UIScrollViewRotated::~UIScrollViewRotated()
-{
-}
+UIScrollViewRotated::~UIScrollViewRotated() {}
 
 bool UIScrollViewRotated::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the scrollview alert will be displayed
         _displayValueLabel = Text::create("Move by vertical direction", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                             widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
         Text* alert = Text::create("ScrollView vertical", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = dynamic_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the scrollview by vertical
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setContentSize(Size(280.0f, 150.0f));
         scrollView->setDirection(ui::ScrollView::Direction::VERTICAL);
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                     (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
                                      (widgetSize.height - backgroundSize.height) / 2.0f +
-                                     (backgroundSize.height - scrollView->getContentSize().height) / 2.0f + 100) );
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f + 100));
         scrollView->setRotation(45);
-		scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
-		scrollView->setScrollBarColor(Color3B::WHITE);
+        scrollView->setScrollBarPositionFromCorner(Vec2(4, 4));
+        scrollView->setScrollBarColor(Color3B::WHITE);
         _uiLayer->addChild(scrollView);
-        
+
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
-        
-        float innerWidth = scrollView->getContentSize().width;
+
+        float innerWidth  = scrollView->getContentSize().width;
         float innerHeight = scrollView->getContentSize().height + imageView->getContentSize().height;
-        
+
         scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
-        
+
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button->setPosition(Vec2(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
+        button->setPosition(Vec2(innerWidth / 2.0f,
+                                 scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
         scrollView->addChild(button);
-        
+
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
-        titleButton->setPosition(Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
+        titleButton->setPosition(
+            Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
         scrollView->addChild(titleButton);
-        
+
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
-        button_scale9->setPosition(Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
+        button_scale9->setPosition(
+            Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
         scrollView->addChild(button_scale9);
-        
+
         imageView->setPosition(Vec2(innerWidth / 2.0f, imageView->getContentSize().height / 2.0f));
         scrollView->addChild(imageView);
-        
-     
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewDisableTest
 
-UIScrollViewDisableTest::UIScrollViewDisableTest()
-: _displayValueLabel(nullptr)
-{
-}
+UIScrollViewDisableTest::UIScrollViewDisableTest() : _displayValueLabel(nullptr) {}
 
-UIScrollViewDisableTest::~UIScrollViewDisableTest()
-{
-}
+UIScrollViewDisableTest::~UIScrollViewDisableTest() {}
 
 bool UIScrollViewDisableTest::init()
 {
@@ -587,14 +563,15 @@ bool UIScrollViewDisableTest::init()
         // Add a label in which the scrollview alert will be displayed
         _displayValueLabel = Text::create("ScrollView Disable Test", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-                                              widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
         Text* alert = Text::create("ScrollView vertical", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
 
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
@@ -606,9 +583,9 @@ bool UIScrollViewDisableTest::init()
         scrollView->setContentSize(Size(280.0f, 100.0f));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                               (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
-                               (widgetSize.height - backgroundSize.height) / 2.0f +
-                               (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                     (widgetSize.height - backgroundSize.height) / 2.0f +
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
         scrollView->setScrollBarWidth(4);
         scrollView->setTouchEnabled(false);
         scrollView->setScrollBarPositionFromCorner(Vec2(2, 2));
@@ -617,30 +594,32 @@ bool UIScrollViewDisableTest::init()
 
         ImageView* imageView = ImageView::create("cocosui/ccicon.png");
 
-        float innerWidth = scrollView->getContentSize().width;
+        float innerWidth  = scrollView->getContentSize().width;
         float innerHeight = scrollView->getContentSize().height + imageView->getContentSize().height;
 
         scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
 
         Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
-        button->setPosition(Vec2(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
+        button->setPosition(Vec2(innerWidth / 2.0f,
+                                 scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f));
         scrollView->addChild(button);
 
         Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png");
         titleButton->setTitleText("Title Button");
-        titleButton->setPosition(Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
+        titleButton->setPosition(
+            Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height));
         scrollView->addChild(titleButton);
 
         Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png");
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height));
-        button_scale9->setPosition(Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
+        button_scale9->setPosition(
+            Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height));
         scrollView->addChild(button_scale9);
 
         imageView->setPosition(Vec2(innerWidth / 2.0f, imageView->getContentSize().height / 2.0f));
         scrollView->addChild(imageView);
 
-
         return true;
     }
 
@@ -649,14 +628,9 @@ bool UIScrollViewDisableTest::init()
 
 // UIScrollViewInnerSize
 
-UIScrollViewInnerSize::UIScrollViewInnerSize()
-    : _displayValueLabel(nullptr)
-{
-}
+UIScrollViewInnerSize::UIScrollViewInnerSize() : _displayValueLabel(nullptr) {}
 
-UIScrollViewInnerSize::~UIScrollViewInnerSize()
-{
-}
+UIScrollViewInnerSize::~UIScrollViewInnerSize() {}
 
 bool UIScrollViewInnerSize::init()
 {
@@ -667,14 +641,16 @@ bool UIScrollViewInnerSize::init()
         // Add a label in which the scrollview alert will be displayed
         _displayValueLabel = Text::create("ScrollView InnerSize Test", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f,
-            widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text* alert = Text::create("ScrollView & InnerContainer should be align to the left and top point", "fonts/Marker Felt.ttf", 10);
+        Text* alert = Text::create("ScrollView & InnerContainer should be align to the left and top point",
+                                   "fonts/Marker Felt.ttf", 10);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
 
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
@@ -686,9 +662,9 @@ bool UIScrollViewInnerSize::init()
         scrollView->setContentSize(Size(200.0f, 50.0f));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-            (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
-            (widgetSize.height - backgroundSize.height) / 2.0f +
-            (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                     (widgetSize.height - backgroundSize.height) / 2.0f +
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
         scrollView->setScrollBarWidth(4);
         scrollView->setTouchEnabled(false);
         scrollView->setScrollBarPositionFromCorner(Vec2(2, 2));
@@ -711,34 +687,32 @@ bool UIScrollViewInnerSize::init()
 
 // UIScrollViewTestEvents
 
-UIScrollViewTestEvents::UIScrollViewTestEvents()
-    : _displayValueLabel(nullptr)
-{
-    
-}
+UIScrollViewTestEvents::UIScrollViewTestEvents() : _displayValueLabel(nullptr) {}
 
 bool UIScrollViewTestEvents::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the dragpanel events will be displayed
-        _displayValueLabel = Text::create("(no events)","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("(no events)", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("ScrollView events","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("ScrollView events", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
-        
+
         Layout* background = static_cast<Layout*>(root->getChildByName("background_Panel"));
-        
+
         // Create the dragpanel
         ui::ScrollView* scrollView = ui::ScrollView::create();
         scrollView->setDirection(ui::ScrollView::Direction::BOTH);
@@ -751,53 +725,49 @@ bool UIScrollViewTestEvents::init()
         scrollView->setScrollBarPositionFromCorner(Vec2(6, 6));
         Size backgroundSize = background->getContentSize();
         scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-                                     (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
+                                         (backgroundSize.width - scrollView->getContentSize().width) / 2.0f,
                                      (widgetSize.height - backgroundSize.height) / 2.0f +
-                                     (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
+                                         (backgroundSize.height - scrollView->getContentSize().height) / 2.0f));
         ImageView* imageView = ImageView::create("Hello.png");
         scrollView->addChild(imageView);
-        
+
         scrollView->setInnerContainerSize(imageView->getContentSize());
         Size innerSize = scrollView->getInnerContainerSize();
         imageView->setPosition(Vec2(innerSize.width / 2.0f, innerSize.height / 2.0f));
-        
+
         _uiLayer->addChild(scrollView);
-        
+
         // Jump to right bottom
         scrollView->jumpToBottomRight();
-        
-        auto getRandomColor = [] {
-            return Color4B(random(0, 255), random(0, 255), random(0, 255), 255);
-        };
+
+        auto getRandomColor = [] { return Color4B(random(0, 255), random(0, 255), random(0, 255), 255); };
         scrollView->addEventListener([&](Ref*, ui::ScrollView::EventType e) {
-            switch ( e ) {
-                case ui::ScrollView::EventType::SCROLLING_BEGAN:
-                    _displayValueLabel->setString("scrolling began!");
-                    _displayValueLabel->setTextColor(getRandomColor());
-                    break;
-                case ui::ScrollView::EventType::SCROLLING_ENDED:
-                    _displayValueLabel->setString("scrolling ended!");
-                    _displayValueLabel->setTextColor(getRandomColor());
-                    break;
-                default: break;
+            switch (e)
+            {
+            case ui::ScrollView::EventType::SCROLLING_BEGAN:
+                _displayValueLabel->setString("scrolling began!");
+                _displayValueLabel->setTextColor(getRandomColor());
+                break;
+            case ui::ScrollView::EventType::SCROLLING_ENDED:
+                _displayValueLabel->setString("scrolling ended!");
+                _displayValueLabel->setTextColor(getRandomColor());
+                break;
+            default:
+                break;
             }
         });
-        
+
         return true;
     }
-    
+
     return false;
 }
 
 // UIScrollViewStopScrollingTest
 
 UIScrollViewStopScrollingTest::UIScrollViewStopScrollingTest()
-    : _displayValueLabel(nullptr)
-    , _scrollView(nullptr)
-    , _remainingTime(0.0f)
-{
-
-}
+    : _displayValueLabel(nullptr), _scrollView(nullptr), _remainingTime(0.0f)
+{}
 
 bool UIScrollViewStopScrollingTest::init()
 {
@@ -808,13 +778,15 @@ bool UIScrollViewStopScrollingTest::init()
         // Add a label in which the time remaining till scrolling stop will be displayed.
         _displayValueLabel = Text::create("Scrolling stop isn't scheduled", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
         Text* alert = Text::create("Click the button and start to scroll", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
 
         Layout* root = static_cast<Layout*>(_uiLayer->getChildByTag(81));
@@ -833,9 +805,9 @@ bool UIScrollViewStopScrollingTest::init()
         _scrollView->setScrollBarPositionFromCorner(Vec2(6, 6));
         Size backgroundSize = background->getContentSize();
         _scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f +
-            (backgroundSize.width - _scrollView->getContentSize().width) / 2.0f,
-            (widgetSize.height - backgroundSize.height) / 2.0f +
-            (backgroundSize.height - _scrollView->getContentSize().height) / 2.0f));
+                                          (backgroundSize.width - _scrollView->getContentSize().width) / 2.0f,
+                                      (widgetSize.height - backgroundSize.height) / 2.0f +
+                                          (backgroundSize.height - _scrollView->getContentSize().height) / 2.0f));
         ImageView* imageView = ImageView::create("Hello.png");
         _scrollView->addChild(imageView);
         _scrollView->setInnerContainerSize(imageView->getContentSize());
@@ -844,8 +816,7 @@ bool UIScrollViewStopScrollingTest::init()
         _uiLayer->addChild(_scrollView);
 
         // Log some ScrollView events.
-        _scrollView->addEventListener([&] (Ref*, ui::ScrollView::EventType e)
-        {
+        _scrollView->addEventListener([&](Ref*, ui::ScrollView::EventType e) {
             switch (e)
             {
             case ui::ScrollView::EventType::SCROLLING_BEGAN:
@@ -857,7 +828,8 @@ bool UIScrollViewStopScrollingTest::init()
             case ui::ScrollView::EventType::AUTOSCROLL_ENDED:
                 CCLOG("auto-scrolling ended!");
                 break;
-            default: break;
+            default:
+                break;
             }
         });
 
@@ -870,7 +842,7 @@ bool UIScrollViewStopScrollingTest::init()
         button_scale9->setScale9Enabled(true);
         button_scale9->setContentSize(Size(120.0f, button_scale9->getVirtualRendererSize().height));
         button_scale9->setPosition(Vec2(innerSize.width / 2.0f, innerSize.height / 2.0f));
-        button_scale9->addClickEventListener([this] (Ref*) { this->_remainingTime = 3.0f; });
+        button_scale9->addClickEventListener([this](Ref*) { this->_remainingTime = 3.0f; });
         _scrollView->addChild(button_scale9);
 
         // Schedule update for this scene.
@@ -889,7 +861,7 @@ void UIScrollViewStopScrollingTest::update(float dt)
     if (_remainingTime > 0.0f)
     {
         _remainingTime -= dt;
-        
+
         if (_remainingTime > 0.0f)
         {
             // Update timer caption.
@@ -906,13 +878,10 @@ void UIScrollViewStopScrollingTest::update(float dt)
             _displayValueLabel->setString(strRemainingTime);
 
             // Show hint label.
-            auto hintLabel = Label::createWithTTF("Stopped!", "fonts/Marker Felt.ttf", 32.0f);
+            auto hintLabel   = Label::createWithTTF("Stopped!", "fonts/Marker Felt.ttf", 32.0f);
             Size contentSize = _uiLayer->getContentSize();
             hintLabel->setPosition(Vec2(contentSize.width / 2.0f, contentSize.height / 2.0f));
-            hintLabel->runAction(Spawn::createWithTwoActions(
-                FadeOut::create(0.3f),
-                ScaleTo::create(0.3f, 2.0f)
-                ));
+            hintLabel->runAction(Spawn::createWithTwoActions(FadeOut::create(0.3f), ScaleTo::create(0.3f, 2.0f)));
             _uiLayer->addChild(hintLabel);
         }
     }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
index fae82092ccd9..5aacaaf43782 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,9 +38,8 @@ class UIScrollViewTest_Vertical : public UIScene
     UIScrollViewTest_Vertical();
     ~UIScrollViewTest_Vertical();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -52,9 +51,8 @@ class UIScrollViewTest_Horizontal : public UIScene
     UIScrollViewTest_Horizontal();
     ~UIScrollViewTest_Horizontal();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -66,9 +64,8 @@ class UIScrollViewTest_Both : public UIScene
     UIScrollViewTest_Both();
     ~UIScrollViewTest_Both();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -80,9 +77,8 @@ class UIScrollViewTest_ScrollToPercentBothDirection : public UIScene
     UIScrollViewTest_ScrollToPercentBothDirection();
     ~UIScrollViewTest_ScrollToPercentBothDirection();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -94,9 +90,8 @@ class UIScrollViewTest_ScrollToPercentBothDirection_Bounce : public UIScene
     UIScrollViewTest_ScrollToPercentBothDirection_Bounce();
     ~UIScrollViewTest_ScrollToPercentBothDirection_Bounce();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -108,9 +103,8 @@ class UIScrollViewNestTest : public UIScene
     UIScrollViewNestTest();
     ~UIScrollViewNestTest();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -122,9 +116,8 @@ class UIScrollViewRotated : public UIScene
     UIScrollViewRotated();
     ~UIScrollViewRotated();
     virtual bool init() override;
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -138,7 +131,6 @@ class UIScrollViewDisableTest : public UIScene
     virtual bool init() override;
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -152,21 +144,19 @@ class UIScrollViewInnerSize : public UIScene
     virtual bool init() override;
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
 };
 
 class UIScrollViewTestEvents : public UIScene
 {
 public:
-	CREATE_FUNC(UIScrollViewTestEvents);
-	
-	UIScrollViewTestEvents();
-	virtual bool init() override;
-	
+    CREATE_FUNC(UIScrollViewTestEvents);
+
+    UIScrollViewTestEvents();
+    virtual bool init() override;
+
 protected:
-	
-	cocos2d::ui::Text* _displayValueLabel;
+    cocos2d::ui::Text* _displayValueLabel;
 };
 
 class UIScrollViewStopScrollingTest : public UIScene
@@ -180,7 +170,6 @@ class UIScrollViewStopScrollingTest : public UIScene
     virtual void update(float dt) override;
 
 protected:
-
     cocos2d::ui::Text* _displayValueLabel;
     cocos2d::ui::ScrollView* _scrollView;
     float _remainingTime;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
index cc4a4e92dcb4..4761b5add01f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,41 +40,37 @@ UISliderTests::UISliderTests()
 
 // UISliderTest
 
-UISliderTest::UISliderTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UISliderTest::UISliderTest() : _displayValueLabel(nullptr) {}
 
-UISliderTest::~UISliderTest()
-{
-}
+UISliderTest::~UISliderTest() {}
 
 bool UISliderTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the slider alert will be displayed
         _displayValueLabel = TextBMFont::create("Move the slider thumb", "ccb/markerfelt24shadow.fnt");
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("Slider","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Slider", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
-        _uiLayer->addChild(alert);        
-        
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        _uiLayer->addChild(alert);
+
         // Create the slider
         Slider* slider = Slider::create();
         slider->loadBarTexture("cocosui/sliderTrack.png");
         slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
         slider->loadProgressBarTexture("cocosui/sliderProgress.png");
         slider->setMaxPercent(10000);
-        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f/* + slider->getSize().height * 2.0f*/));
+        slider->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f /* + slider->getSize().height * 2.0f*/));
         slider->addEventListener(CC_CALLBACK_2(UISliderTest::sliderEvent, this));
         _uiLayer->addChild(slider);
 
@@ -82,23 +78,24 @@ bool UISliderTest::init()
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UISliderTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UISliderTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0.0f, 0.0f));
         this->addChild(pMenu1, 10);
-        
+
         return true;
     }
     return false;
 }
 
-void UISliderTest::sliderEvent(Ref *pSender, Slider::EventType type)
+void UISliderTest::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
         Slider* slider = dynamic_cast<Slider*>(pSender);
-        int percent = slider->getPercent();
+        int percent    = slider->getPercent();
         int maxPercent = slider->getMaxPercent();
         _displayValueLabel->setString(StringUtils::format("Percent %f", 10000.0 * percent / maxPercent));
     }
@@ -108,45 +105,44 @@ void UISliderTest::printWidgetResources(cocos2d::Ref* /*sender*/)
     cocos2d::ResourceData textureFile = _slider->getBackFile();
     CCLOG("textureFile  Name : %s, Type: %d", textureFile.file.c_str(), textureFile.type);
     cocos2d::ResourceData progressBarTextureFile = _slider->getProgressBarFile();
-    CCLOG("progressBarTextureFile  Name : %s, Type: %d", progressBarTextureFile.file.c_str(), progressBarTextureFile.type);
+    CCLOG("progressBarTextureFile  Name : %s, Type: %d", progressBarTextureFile.file.c_str(),
+          progressBarTextureFile.type);
     cocos2d::ResourceData slidBallNormalTextureFile = _slider->getBallNormalFile();
-    CCLOG("slidBallNormalTextureFile  Name : %s, Type: %d", slidBallNormalTextureFile.file.c_str(), slidBallNormalTextureFile.type);
+    CCLOG("slidBallNormalTextureFile  Name : %s, Type: %d", slidBallNormalTextureFile.file.c_str(),
+          slidBallNormalTextureFile.type);
     cocos2d::ResourceData slidBallPressedTextureFile = _slider->getBallPressedFile();
-    CCLOG("slidBallPressedTextureFile  Name : %s, Type: %d", slidBallPressedTextureFile.file.c_str(), slidBallPressedTextureFile.type);
+    CCLOG("slidBallPressedTextureFile  Name : %s, Type: %d", slidBallPressedTextureFile.file.c_str(),
+          slidBallPressedTextureFile.type);
     cocos2d::ResourceData slidBallDisabledTextureFile = _slider->getBallDisabledFile();
-    CCLOG("slidBallDisabledTextureFile  Name : %s, Type: %d", slidBallDisabledTextureFile.file.c_str(), slidBallDisabledTextureFile.type);
+    CCLOG("slidBallDisabledTextureFile  Name : %s, Type: %d", slidBallDisabledTextureFile.file.c_str(),
+          slidBallDisabledTextureFile.type);
 }
 
 // UISliderTest_Scale9
 
-UISliderTest_Scale9::UISliderTest_Scale9()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UISliderTest_Scale9::UISliderTest_Scale9() : _displayValueLabel(nullptr) {}
 
-UISliderTest_Scale9::~UISliderTest_Scale9()
-{
-}
+UISliderTest_Scale9::~UISliderTest_Scale9() {}
 
 bool UISliderTest_Scale9::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the slider alert will be displayed
-        _displayValueLabel = Text::create("Move the slider thumb","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("Move the slider thumb", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text *alert = Text::create("Slider scale9 render","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Slider scale9 render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the slider
         Slider* slider = Slider::create();
         slider->loadBarTexture("cocosui/sliderTrack2.png");
@@ -155,37 +151,31 @@ bool UISliderTest_Scale9::init()
         slider->setScale9Enabled(true);
         slider->setCapInsets(Rect(0.0f, 0.0f, 0.0f, 0.0f));
         slider->setContentSize(Size(250.0f, 19.0f));
-        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f/* + slider->getSize().height * 3.0f*/));
+        slider->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f /* + slider->getSize().height * 3.0f*/));
         slider->addEventListener(CC_CALLBACK_2(UISliderTest_Scale9::sliderEvent, this));
         _uiLayer->addChild(slider);
-        
-        
+
         return true;
     }
     return false;
 }
 
-void UISliderTest_Scale9::sliderEvent(Ref *pSender, Slider::EventType type)
+void UISliderTest_Scale9::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
         Slider* slider = dynamic_cast<Slider*>(pSender);
-        int percent = slider->getPercent();
+        int percent    = slider->getPercent();
         _displayValueLabel->setString(StringUtils::format("Percent %d", percent));
     }
 }
 
 // UISliderTest_Scale9_State_Change
 
-UISliderTest_Scale9_State_Change::UISliderTest_Scale9_State_Change()
-    : _displayValueLabel(nullptr)
-{
+UISliderTest_Scale9_State_Change::UISliderTest_Scale9_State_Change() : _displayValueLabel(nullptr) {}
 
-}
-
-UISliderTest_Scale9_State_Change::~UISliderTest_Scale9_State_Change()
-{
-}
+UISliderTest_Scale9_State_Change::~UISliderTest_Scale9_State_Change() {}
 
 bool UISliderTest_Scale9_State_Change::init()
 {
@@ -200,9 +190,10 @@ bool UISliderTest_Scale9_State_Change::init()
         _uiLayer->addChild(_displayValueLabel);
 
         // Add the alert
-        Text *alert = Text::create("Slider scale9 render", "fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Slider scale9 render", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the slider
@@ -214,9 +205,11 @@ bool UISliderTest_Scale9_State_Change::init()
         slider->setScale9Enabled(true);
         slider->setCapInsets(Rect(0.0f, 0.0f, 0.0f, 0.0f));
         slider->setContentSize(Size(200.0f, 60.0f));
-        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f/* + slider->getSize().height * 3.0f*/));
-        slider->addTouchEventListener([=](Ref* /*sender*/, Widget::TouchEventType type){
-            if (type == Widget::TouchEventType::ENDED) {
+        slider->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f /* + slider->getSize().height * 3.0f*/));
+        slider->addTouchEventListener([=](Ref* /*sender*/, Widget::TouchEventType type) {
+            if (type == Widget::TouchEventType::ENDED)
+            {
                 if (slider->isScale9Enabled())
                 {
                     slider->setScale9Enabled(false);
@@ -227,61 +220,53 @@ bool UISliderTest_Scale9_State_Change::init()
         });
         _uiLayer->addChild(slider);
 
-
         return true;
     }
     return false;
 }
 
-void UISliderTest_Scale9_State_Change::sliderEvent(Ref *pSender, Slider::EventType type)
+void UISliderTest_Scale9_State_Change::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
         Slider* slider = dynamic_cast<Slider*>(pSender);
-        int percent = slider->getPercent();
+        int percent    = slider->getPercent();
         _displayValueLabel->setString(StringUtils::format("Percent %d", percent));
     }
 }
 
 // UISliderNormalDefaultTest
 
-UISliderNormalDefaultTest::UISliderNormalDefaultTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UISliderNormalDefaultTest::UISliderNormalDefaultTest() : _displayValueLabel(nullptr) {}
 
-UISliderNormalDefaultTest::~UISliderNormalDefaultTest()
-{
-}
+UISliderNormalDefaultTest::~UISliderNormalDefaultTest() {}
 
 bool UISliderNormalDefaultTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the slider alert will be displayed
-        _displayValueLabel = Text::create("","Arial",32);
+        _displayValueLabel = Text::create("", "Arial", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 100));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("when pressed, the slider ball should scale","fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("when pressed, the slider ball should scale", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the slider
         Slider* slider = Slider::create();
         slider->loadBarTexture("cocosui/sliderTrack.png");
         slider->loadSlidBallTextures("cocosui/sliderThumb.png");
-        slider->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f + 50));
+        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
         _uiLayer->addChild(slider);
-        
+
         Slider* sliderScale9 = (Slider*)slider->clone();
         sliderScale9->setScale9Enabled(true);
         sliderScale9->setCapInsets(Rect(0.0f, 0.0f, 0.0f, 0.0f));
@@ -289,8 +274,7 @@ bool UISliderNormalDefaultTest::init()
         sliderScale9->setContentSize(Size(250.0f, 19.0f));
         sliderScale9->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 20));
         _uiLayer->addChild(sliderScale9);
-        
-        
+
         return true;
     }
     return false;
@@ -298,45 +282,38 @@ bool UISliderNormalDefaultTest::init()
 
 // UISliderDisabledDefaultTest
 
-UISliderDisabledDefaultTest::UISliderDisabledDefaultTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UISliderDisabledDefaultTest::UISliderDisabledDefaultTest() : _displayValueLabel(nullptr) {}
 
-UISliderDisabledDefaultTest::~UISliderDisabledDefaultTest()
-{
-}
+UISliderDisabledDefaultTest::~UISliderDisabledDefaultTest() {}
 
 bool UISliderDisabledDefaultTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the slider alert will be displayed
-        _displayValueLabel = Text::create("","Arial",32);
+        _displayValueLabel = Text::create("", "Arial", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 100));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("slider ball should be gray.","fonts/Marker Felt.ttf",20);
+        Text* alert = Text::create("slider ball should be gray.", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the slider
         Slider* slider = Slider::create();
         slider->loadBarTexture("cocosui/slidbar.png");
         slider->loadSlidBallTextureNormal("cocosui/sliderballnormal.png");
         slider->setEnabled(false);
         slider->setBright(false);
-        slider->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f + 50));
+        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
         _uiLayer->addChild(slider);
-        
+
         Slider* sliderScale9 = (Slider*)slider->clone();
         sliderScale9->setScale9Enabled(true);
         sliderScale9->setEnabled(false);
@@ -345,26 +322,17 @@ bool UISliderDisabledDefaultTest::init()
         sliderScale9->setContentSize(Size(250.0f, 10.0f));
         sliderScale9->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 20));
         _uiLayer->addChild(sliderScale9);
-        
-        
+
         return true;
     }
     return false;
 }
 
-
-
 // UISliderNewEventCallbackTest
 
-UISliderNewEventCallbackTest::UISliderNewEventCallbackTest()
-: _displayValueLabel(nullptr)
-{
-
-}
+UISliderNewEventCallbackTest::UISliderNewEventCallbackTest() : _displayValueLabel(nullptr) {}
 
-UISliderNewEventCallbackTest::~UISliderNewEventCallbackTest()
-{
-}
+UISliderNewEventCallbackTest::~UISliderNewEventCallbackTest() {}
 
 bool UISliderNewEventCallbackTest::init()
 {
@@ -373,7 +341,7 @@ bool UISliderNewEventCallbackTest::init()
         Size widgetSize = _widget->getContentSize();
 
         // Add a label in which the slider alert will be displayed
-        _displayValueLabel = Text::create("","Arial",32);
+        _displayValueLabel = Text::create("", "Arial", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 100));
         _uiLayer->addChild(_displayValueLabel);
@@ -381,8 +349,8 @@ bool UISliderNewEventCallbackTest::init()
         // Add the alert
         Text* alert = Text::create("See console output for Slider Down and Up event.", "fonts/Marker Felt.ttf", 20);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.75f));
         _uiLayer->addChild(alert);
 
         // Create the slider
@@ -391,58 +359,48 @@ bool UISliderNewEventCallbackTest::init()
         slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
         slider->loadProgressBarTexture("cocosui/sliderProgress.png");
         slider->setMaxPercent(1000);
-        slider->setPosition(Vec2(widgetSize.width / 2.0f,
-                                 widgetSize.height / 2.0f + 50));
-        slider->addEventListener([=](Ref* widget,Slider::EventType type)
-        {
+        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50));
+        slider->addEventListener([=](Ref* widget, Slider::EventType type) {
             Slider* slider = (Slider*)widget;
             CC_UNUSED_PARAM(slider);
-            if(type == Slider::EventType::ON_SLIDEBALL_DOWN)
+            if (type == Slider::EventType::ON_SLIDEBALL_DOWN)
             {
                 CCLOG("slider button pressed!");
             }
-            else if(type == Slider::EventType::ON_PERCENTAGE_CHANGED)
+            else if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
             {
-                CCLOG("slider is moving! percent = %f", 100.0f * slider->getPercent() / slider->getMaxPercent() );
+                CCLOG("slider is moving! percent = %f", 100.0f * slider->getPercent() / slider->getMaxPercent());
             }
-            else if(type == Slider::EventType::ON_SLIDEBALL_UP)
+            else if (type == Slider::EventType::ON_SLIDEBALL_UP)
             {
                 CCLOG("slider button is released.");
             }
         });
         _uiLayer->addChild(slider);
 
-
         return true;
     }
     return false;
 }
 
-
 // UISliderIssue12249Test
 
-UISliderIssue12249Test::UISliderIssue12249Test()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UISliderIssue12249Test::UISliderIssue12249Test() : _displayValueLabel(nullptr) {}
 
-UISliderIssue12249Test::~UISliderIssue12249Test()
-{
-}
+UISliderIssue12249Test::~UISliderIssue12249Test() {}
 
 bool UISliderIssue12249Test::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the slider alert will be displayed
         _displayValueLabel = TextBMFont::create("Move the slider thumb", "ccb/markerfelt24shadow.fnt");
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
         _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Create the slider
         Slider* slider = Slider::create();
         slider->setScale9Enabled(true);
@@ -451,22 +409,22 @@ bool UISliderIssue12249Test::init()
         slider->loadProgressBarTexture("cocosui/sliderProgress.png");
         slider->setContentSize(Size(300, slider->getContentSize().height * 1.5));
         slider->setMaxPercent(10000);
-        slider->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f/* + slider->getSize().height * 2.0f*/));
+        slider->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f /* + slider->getSize().height * 2.0f*/));
         slider->addEventListener(CC_CALLBACK_2(UISliderIssue12249Test::sliderEvent, this));
         _uiLayer->addChild(slider);
-        
-        
+
         return true;
     }
     return false;
 }
 
-void UISliderIssue12249Test::sliderEvent(Ref *pSender, Slider::EventType type)
+void UISliderIssue12249Test::sliderEvent(Ref* pSender, Slider::EventType type)
 {
     if (type == Slider::EventType::ON_PERCENTAGE_CHANGED)
     {
         Slider* slider = dynamic_cast<Slider*>(pSender);
-        int percent = slider->getPercent();
+        int percent    = slider->getPercent();
         int maxPercent = slider->getMaxPercent();
         _displayValueLabel->setString(StringUtils::format("Percent %f", 10000.0 * percent / maxPercent));
     }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.h
index 6d4eb294f7cc..ca16cab522f4 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,7 +40,7 @@ class UISliderTest : public UIScene
     virtual bool init() override;
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
     void printWidgetResources(cocos2d::Ref* sender);
-    
+
 protected:
     cocos2d::ui::TextBMFont* _displayValueLabel;
     cocos2d::ui::Slider* _slider;
@@ -55,7 +55,7 @@ class UISliderTest_Scale9 : public UIScene
     ~UISliderTest_Scale9();
     virtual bool init() override;
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
-    
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
 };
@@ -74,7 +74,6 @@ class UISliderTest_Scale9_State_Change : public UIScene
     cocos2d::ui::Text* _displayValueLabel;
 };
 
-
 class UISliderNormalDefaultTest : public UIScene
 {
 public:
@@ -83,7 +82,7 @@ class UISliderNormalDefaultTest : public UIScene
     UISliderNormalDefaultTest();
     ~UISliderNormalDefaultTest();
     virtual bool init() override;
-    
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
 };
@@ -96,7 +95,7 @@ class UISliderDisabledDefaultTest : public UIScene
     UISliderDisabledDefaultTest();
     ~UISliderDisabledDefaultTest();
     virtual bool init() override;
-    
+
 protected:
     cocos2d::ui::Text* _displayValueLabel;
 };
@@ -118,12 +117,12 @@ class UISliderIssue12249Test : public UIScene
 {
 public:
     CREATE_FUNC(UISliderIssue12249Test);
-    
+
     UISliderIssue12249Test();
     ~UISliderIssue12249Test();
     virtual bool init() override;
     void sliderEvent(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType type);
-    
+
 protected:
     cocos2d::ui::TextBMFont* _displayValueLabel;
 };
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.cpp
index cc5de4ddcb7e..4a0fedbda86c 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright(c) 2016 cocos2d - x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http ://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files(the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions :
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
@@ -34,15 +34,9 @@ UITabControlTests::UITabControlTests()
     ADD_TEST_CASE(UITabControlTest);
 }
 
+UITabControlTest::UITabControlTest() {}
 
-UITabControlTest::UITabControlTest()
-{
-}
-
-UITabControlTest::~UITabControlTest()
-{
-
-}
+UITabControlTest::~UITabControlTest() {}
 
 bool UITabControlTest::init()
 {
@@ -65,12 +59,12 @@ bool UITabControlTest::init()
         auto header1 = TabHeader::create();
         header1->setTitleText("background");
         header1->loadTextureBackGround("cocosui/check_box_normal_disable.png");
-        auto header2 = TabHeader::create("cross", "cocosui/check_box_normal_disable.png", "cocosui/check_box_active.png");
-        auto header3 = TabHeader::create("press&cross", "cocosui/check_box_normal.png",
-            "cocosui/check_box_normal_press.png",
-            "cocosui/check_box_active.png",
-            "cocosui/check_box_normal_disable.png",
-            "cocosui/check_box_active_disable.png");
+        auto header2 =
+            TabHeader::create("cross", "cocosui/check_box_normal_disable.png", "cocosui/check_box_active.png");
+        auto header3 =
+            TabHeader::create("press&cross", "cocosui/check_box_normal.png", "cocosui/check_box_normal_press.png",
+                              "cocosui/check_box_active.png", "cocosui/check_box_normal_disable.png",
+                              "cocosui/check_box_active_disable.png");
 
         auto container1 = Layout::create();
         container1->setOpacity(255);
@@ -93,23 +87,19 @@ bool UITabControlTest::init()
         tab->insertTab(2, header3, container3);
 
         tab->setSelectTab(2);
-        
+
         _uiLayer->addChild(tab);
         tab->setPosition(Vec2(widgetSize.width * .5f, widgetSize.height * .5f));
 
-        tab->setTabChangedEventListener(
-            [displayText](int index, TabControl::EventType evtType)
-        {
+        tab->setTabChangedEventListener([displayText](int index, TabControl::EventType evtType) {
             displayText->retain();
             char display[20];
             sprintf(display, "tab %d selected", index);
             displayText->setString(display);
             displayText->release();
-        }
-            );
+        });
 
         return true;
     }
     return false;
 }
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.h
index 159f474c67c4..e2319d75248f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITabControlTest/UITabControlTest.h
@@ -35,13 +35,10 @@ class UITabControlTest : public UIScene
 public:
     CREATE_FUNC(UITabControlTest);
 
-
     UITabControlTest();
     ~UITabControlTest();
 
     bool init() override;
-
 };
 
-
-#endif //__TestCpp__UITabControlTest__
\ No newline at end of file
+#endif  //__TestCpp__UITabControlTest__
\ No newline at end of file
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp
index b24b7ae65893..f3987441c70f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,13 +39,14 @@ bool UITextAtlasTest::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("TextAtlas","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextAtlas", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the text atlas
         TextAtlas* textAtlas = nullptr;
         if (Director::getInstance()->getWinSizeInPixels().height > 320.f)
@@ -57,13 +58,14 @@ bool UITextAtlasTest::init()
             textAtlas = TextAtlas::create("1234567890", "cocosui/labelatlas.png", 17, 22, "0");
         }
         textAtlas->setPosition(Vec2((widgetSize.width) / 2, widgetSize.height / 2.0f));
-        _uiLayer->addChild(textAtlas);                
+        _uiLayer->addChild(textAtlas);
         _textAtlas = textAtlas;
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UITextAtlasTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UITextAtlasTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0, 0));
         this->addChild(pMenu1, 10);
@@ -84,13 +86,14 @@ bool UITextAtlasETC1ShadowTest::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
-        Text* alert = Text::create("TextAtlas With ETC1 format","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextAtlas With ETC1 format", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the text atlas
         TextAtlas* textAtlas = nullptr;
         if (Director::getInstance()->getWinSizeInPixels().height > 320.f)
@@ -106,11 +109,13 @@ bool UITextAtlasETC1ShadowTest::init()
         auto labelAtlas = (Label*)textAtlas->getVirtualRenderer();
         labelAtlas->enableShadow(Color4B::GREEN);
         _textAtlas = textAtlas;
-        
+
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UITextAtlasETC1ShadowTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1 =
+            MenuItemLabel::create(label1, CC_CALLBACK_1(UITextAtlasETC1ShadowTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0, 0));
         this->addChild(pMenu1, 10);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h
index 7944897d1043..2c6059f0c576 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,8 +22,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
-
 #ifndef __TestCpp__UITextAtlasTest__
 #define __TestCpp__UITextAtlasTest__
 
@@ -38,6 +36,7 @@ class UITextAtlasTest : public UIScene
 
     virtual bool init() override;
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::TextAtlas* _textAtlas;
 };
@@ -46,9 +45,10 @@ class UITextAtlasETC1ShadowTest : public UIScene
 {
 public:
     CREATE_FUNC(UITextAtlasETC1ShadowTest);
-    
+
     virtual bool init() override;
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::TextAtlas* _textAtlas;
 };
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp
index 39fc6518b60e..83f405d86110 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -38,23 +38,26 @@ bool UITextBMFontTest::init()
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
-        Text* alert = Text::create("TextBMFont","TextBMFont",30);
+
+        Text* alert = Text::create("TextBMFont", "TextBMFont", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
-        
+
         // Create the TextBMFont
         TextBMFont* textBMFont = TextBMFont::create("BMFont", "cocosui/bitmapFontTest2.fnt");
-        textBMFont->setPosition(Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + textBMFont->getContentSize().height / 8.0f));
+        textBMFont->setPosition(
+            Vec2(widgetSize.width / 2, widgetSize.height / 2.0f + textBMFont->getContentSize().height / 8.0f));
         _uiLayer->addChild(textBMFont);
-        
+
         _textBMFont = textBMFont;
 
         TTFConfig ttfConfig("fonts/arial.ttf", 15);
         auto label1 = Label::createWithTTF(ttfConfig, "Print Resources");
-        auto item1 = MenuItemLabel::create(label1, CC_CALLBACK_1(UITextBMFontTest::printWidgetResources, this));
-        item1->setPosition(Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
+        auto item1  = MenuItemLabel::create(label1, CC_CALLBACK_1(UITextBMFontTest::printWidgetResources, this));
+        item1->setPosition(
+            Vec2(VisibleRect::left().x + 60, VisibleRect::bottom().y + item1->getContentSize().height * 3));
         auto pMenu1 = Menu::create(item1, nullptr);
         pMenu1->setPosition(Vec2(0, 0));
         this->addChild(pMenu1, 10);
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h
index e43a29a837ee..0a26ad80b93f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,6 +37,7 @@ class UITextBMFontTest : public UIScene
 
     virtual bool init() override;
     void printWidgetResources(cocos2d::Ref* sender);
+
 protected:
     cocos2d::ui::TextBMFont* _textBMFont;
 };
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
index 75c72866fb73..1f3205bd035f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,277 +39,262 @@ UITextFieldTests::UITextFieldTests()
 }
 
 // UITextFieldTest
-UITextFieldTest::UITextFieldTest()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest::UITextFieldTest() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest::~UITextFieldTest()
-{
-}
+UITextFieldTest::~UITextFieldTest() {}
 
 bool UITextFieldTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
-        _uiLayer->addChild(_displayValueLabel);        
-        
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _uiLayer->addChild(_displayValueLabel);
+
         // Add the alert
-        Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextField", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input words here","Arial",30);
+        TextField* textField = TextField::create("input words here", "Arial", 30);
 
         textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest::textFieldEvent, this));
         _uiLayer->addChild(textField);
-        
-        
+
         return true;
     }
     return false;
 }
 
-void UITextFieldTest::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-            _displayValueLabel->setString(StringUtils::format("insert words"));
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME"));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME"));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+        _displayValueLabel->setString(StringUtils::format("insert words"));
+        break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word"));
+        break;
+
+    default:
+        break;
     }
 }
 
 // UITextFieldTest_MaxLength
-UITextFieldTest_MaxLength::UITextFieldTest_MaxLength()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest_MaxLength::UITextFieldTest_MaxLength() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest_MaxLength::~UITextFieldTest_MaxLength()
-{
-}
+UITextFieldTest_MaxLength::~UITextFieldTest_MaxLength() {}
 
 bool UITextFieldTest_MaxLength::init()
 {
     if (UIScene::init())
     {
         Size screenSize = Director::getInstance()->getWinSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            screenSize.width / 2.0f, screenSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text *alert = Text::create("TextField max length","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextField max length", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input words here","Arial",30);
+        TextField* textField = TextField::create("input words here", "Arial", 30);
         textField->setMaxLengthEnabled(true);
         textField->setMaxLength(3);
         textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_MaxLength::textFieldEvent, this));
         _uiLayer->addChild(textField);
-        
+
         return true;
     }
     return false;
 }
 
-void UITextFieldTest_MaxLength::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_MaxLength::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME max length %d", textField->getMaxLength()));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME max length %d", textField->getMaxLength()));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            _displayValueLabel->setString(StringUtils::format("insert words max length %d", textField->getMaxLength()));
-        }
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            _displayValueLabel->setString(StringUtils::format("delete word max length %d", textField->getMaxLength()));
-        }
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME max length %d", textField->getMaxLength()));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME max length %d", textField->getMaxLength()));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        _displayValueLabel->setString(StringUtils::format("insert words max length %d", textField->getMaxLength()));
+    }
+    break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        _displayValueLabel->setString(StringUtils::format("delete word max length %d", textField->getMaxLength()));
+    }
+    break;
+
+    default:
+        break;
     }
 }
 
 // UITextFieldTest_Password
-UITextFieldTest_Password::UITextFieldTest_Password()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest_Password::UITextFieldTest_Password() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest_Password::~UITextFieldTest_Password()
-{
-}
+UITextFieldTest_Password::~UITextFieldTest_Password() {}
 
 bool UITextFieldTest_Password::init()
 {
     if (UIScene::init())
     {
         Size screenSize = Director::getInstance()->getWinSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            screenSize.width / 2.0f, screenSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text *alert = Text::create("TextField password","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextField password", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        alert->setPosition(
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input password here","Arial",30);
+        TextField* textField = TextField::create("input password here", "Arial", 30);
         textField->setPasswordEnabled(true);
         textField->setPasswordStyleText("*");
         textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_Password::textFieldEvent, this));
         _uiLayer->addChild(textField);
-        
+
         return true;
     }
     return false;
 }
 
-void UITextFieldTest_Password::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_Password::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME password"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME password"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-            _displayValueLabel->setString(StringUtils::format("insert words password"));
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word password"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME password"));
     }
-}
+    break;
 
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME password"));
+    }
+    break;
 
-// UITextFieldTest_LineWrap
-UITextFieldTest_LineWrap::UITextFieldTest_LineWrap()
-: _displayValueLabel(nullptr)
-{
-    
-}
+    case TextField::EventType::INSERT_TEXT:
+        _displayValueLabel->setString(StringUtils::format("insert words password"));
+        break;
 
-UITextFieldTest_LineWrap::~UITextFieldTest_LineWrap()
-{
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word password"));
+        break;
+
+    default:
+        break;
+    }
 }
 
+// UITextFieldTest_LineWrap
+UITextFieldTest_LineWrap::UITextFieldTest_LineWrap() : _displayValueLabel(nullptr) {}
+
+UITextFieldTest_LineWrap::~UITextFieldTest_LineWrap() {}
+
 bool UITextFieldTest_LineWrap::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("No Event","fonts/Marker Felt.ttf",30);
+        _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf", 30);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text *alert = Text::create("TextField line wrap","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("TextField line wrap", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30);
+        TextField* textField = TextField::create("input words here", "fonts/Marker Felt.ttf", 30);
         textField->ignoreContentAdaptWithSize(false);
         ((Label*)(textField->getVirtualRenderer()))->setLineBreakWithoutSpace(true);
         textField->setContentSize(Size(240.0f, 170.0f));
@@ -319,234 +304,224 @@ bool UITextFieldTest_LineWrap::init()
         textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_LineWrap::textFieldEvent, this));
         _uiLayer->addChild(textField);
-        
+
         return true;
     }
     return false;
 }
 
-void UITextFieldTest_LineWrap::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_LineWrap::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size widgetSize = _widget->getContentSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 30)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            textField->setTextHorizontalAlignment(TextHAlignment::CENTER);
-            textField->setTextVerticalAlignment(TextVAlignment::CENTER);
-            
-            _displayValueLabel->setString(StringUtils::format("detach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-            _displayValueLabel->setString(StringUtils::format("insert words"));
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size widgetSize      = _widget->getContentSize();
+        textField->runAction(MoveTo::create(0.225f, Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 30)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME"));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        textField->setTextHorizontalAlignment(TextHAlignment::CENTER);
+        textField->setTextVerticalAlignment(TextVAlignment::CENTER);
+
+        _displayValueLabel->setString(StringUtils::format("detach with IME"));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+        _displayValueLabel->setString(StringUtils::format("insert words"));
+        break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word"));
+        break;
+
+    default:
+        break;
     }
 }
 
 // UITextFieldTest_TrueTypeFont
-UITextFieldTest_TrueTypeFont::UITextFieldTest_TrueTypeFont()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest_TrueTypeFont::UITextFieldTest_TrueTypeFont() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest_TrueTypeFont::~UITextFieldTest_TrueTypeFont()
-{
-}
+UITextFieldTest_TrueTypeFont::~UITextFieldTest_TrueTypeFont() {}
 
 bool UITextFieldTest_TrueTypeFont::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("True Type Font Test - No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("True Type Font Test - No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30);
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        Text* alert = Text::create("TextField", "fonts/Marker Felt.ttf", 30);
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input words here","fonts/A Damn Mess.ttf",30);
-        
+        TextField* textField = TextField::create("input words here", "fonts/A Damn Mess.ttf", 30);
+
         textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_TrueTypeFont::textFieldEvent, this));
         _uiLayer->addChild(textField);
 
-        
         return true;
     }
     return false;
 }
 
-void UITextFieldTest_TrueTypeFont::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_TrueTypeFont::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-            _displayValueLabel->setString(StringUtils::format("insert words"));
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME"));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME"));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+        _displayValueLabel->setString(StringUtils::format("insert words"));
+        break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word"));
+        break;
+
+    default:
+        break;
     }
 }
 
 // UITextFieldTest_BMFont
-UITextFieldTest_BMFont::UITextFieldTest_BMFont()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest_BMFont::UITextFieldTest_BMFont() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest_BMFont::~UITextFieldTest_BMFont()
-{
-}
+UITextFieldTest_BMFont::~UITextFieldTest_BMFont() {}
 
 bool UITextFieldTest_BMFont::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("BMFont Test - No Event","fonts/Marker Felt.ttf",32);
+        _displayValueLabel = Text::create("BMFont Test - No Event", "fonts/Marker Felt.ttf", 32);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30);
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        Text* alert = Text::create("TextField", "fonts/Marker Felt.ttf", 30);
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("BMFont Text","fonts/bitmapFontTest3.fnt",30);
+        TextField* textField = TextField::create("BMFont Text", "fonts/bitmapFontTest3.fnt", 30);
         textField->setCursorEnabled(true);
         textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_BMFont::textFieldEvent, this));
         _uiLayer->addChild(textField);
-        
+
         return true;
     }
     return false;
 }
 
-void UITextFieldTest_BMFont::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_BMFont::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-            _displayValueLabel->setString(StringUtils::format("insert words"));
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME"));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME"));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+        _displayValueLabel->setString(StringUtils::format("insert words"));
+        break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word"));
+        break;
+
+    default:
+        break;
     }
 }
 
 // UITextFieldTest_PlaceHolderColor
-UITextFieldTest_PlaceHolderColor::UITextFieldTest_PlaceHolderColor()
-: _displayValueLabel(nullptr)
-{
-    
-}
+UITextFieldTest_PlaceHolderColor::UITextFieldTest_PlaceHolderColor() : _displayValueLabel(nullptr) {}
 
-UITextFieldTest_PlaceHolderColor::~UITextFieldTest_PlaceHolderColor()
-{
-}
+UITextFieldTest_PlaceHolderColor::~UITextFieldTest_PlaceHolderColor() {}
 
 bool UITextFieldTest_PlaceHolderColor::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add a label in which the textfield events will be displayed
-        _displayValueLabel = Text::create("You should see 16.50000, 34.0000 in the output window the first time you type","fonts/Marker Felt.ttf",12);
+        _displayValueLabel =
+            Text::create("You should see 16.50000, 34.0000 in the output window the first time you type",
+                         "fonts/Marker Felt.ttf", 12);
         _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
-        _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
+        _displayValueLabel->setPosition(Vec2(
+            widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f));
         _uiLayer->addChild(_displayValueLabel);
-        
+
         // Add the alert
-        Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30);
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
+        Text* alert = Text::create("TextField", "fonts/Marker Felt.ttf", 30);
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f));
         _uiLayer->addChild(alert);
-        
+
         // Create the textfield
-        TextField* textField = TextField::create("input words here","Arial",30);
+        TextField* textField = TextField::create("input words here", "Arial", 30);
         textField->setPlaceHolder("input text here");
         textField->setPlaceHolderColor(Color4B::GREEN);
         textField->setTextColor(Color4B::RED);
@@ -558,41 +533,43 @@ bool UITextFieldTest_PlaceHolderColor::init()
     return false;
 }
 
-void UITextFieldTest_PlaceHolderColor::textFieldEvent(Ref *pSender, TextField::EventType type)
+void UITextFieldTest_PlaceHolderColor::textFieldEvent(Ref* pSender, TextField::EventType type)
 {
     switch (type)
     {
-        case TextField::EventType::ATTACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.225f,
-                                                  Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("attach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::DETACH_WITH_IME:
-        {
-            TextField* textField = dynamic_cast<TextField*>(pSender);
-            Size screenSize = Director::getInstance()->getWinSize();
-            textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
-            _displayValueLabel->setString(StringUtils::format("detach with IME"));
-        }
-            break;
-            
-        case TextField::EventType::INSERT_TEXT:
-        {
-            _displayValueLabel->setString(StringUtils::format("insert words"));
-            CCLOG("%f, %f", dynamic_cast<TextField*>(pSender)->getContentSize().width, dynamic_cast<TextField*>(pSender)->getContentSize().height);
-        }
-            break;
-            
-        case TextField::EventType::DELETE_BACKWARD:
-            _displayValueLabel->setString(StringUtils::format("delete word"));
-            break;
-            
-        default:
-            break;
+    case TextField::EventType::ATTACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(
+            0.225f,
+            Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("attach with IME"));
+    }
+    break;
+
+    case TextField::EventType::DETACH_WITH_IME:
+    {
+        TextField* textField = dynamic_cast<TextField*>(pSender);
+        Size screenSize      = Director::getInstance()->getWinSize();
+        textField->runAction(MoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)));
+        _displayValueLabel->setString(StringUtils::format("detach with IME"));
+    }
+    break;
+
+    case TextField::EventType::INSERT_TEXT:
+    {
+        _displayValueLabel->setString(StringUtils::format("insert words"));
+        CCLOG("%f, %f", dynamic_cast<TextField*>(pSender)->getContentSize().width,
+              dynamic_cast<TextField*>(pSender)->getContentSize().height);
+    }
+    break;
+
+    case TextField::EventType::DELETE_BACKWARD:
+        _displayValueLabel->setString(StringUtils::format("delete word"));
+        break;
+
+    default:
+        break;
     }
 }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
index 532dd191bcf9..058d63a2856f 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -39,9 +39,8 @@ class UITextFieldTest : public UIScene
     ~UITextFieldTest();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -54,9 +53,8 @@ class UITextFieldTest_MaxLength : public UIScene
     ~UITextFieldTest_MaxLength();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -69,9 +67,8 @@ class UITextFieldTest_Password : public UIScene
     ~UITextFieldTest_Password();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -84,9 +81,8 @@ class UITextFieldTest_LineWrap : public UIScene
     ~UITextFieldTest_LineWrap();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -99,9 +95,8 @@ class UITextFieldTest_TrueTypeFont : public UIScene
     ~UITextFieldTest_TrueTypeFont();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -109,14 +104,13 @@ class UITextFieldTest_BMFont : public UIScene
 {
 public:
     CREATE_FUNC(UITextFieldTest_BMFont);
-    
+
     UITextFieldTest_BMFont();
     ~UITextFieldTest_BMFont();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 
@@ -129,9 +123,8 @@ class UITextFieldTest_PlaceHolderColor : public UIScene
     ~UITextFieldTest_PlaceHolderColor();
     virtual bool init() override;
     void textFieldEvent(cocos2d::Ref* sender, cocos2d::ui::TextField::EventType type);
-    
+
 protected:
-    
     cocos2d::ui::Text* _displayValueLabel;
 };
 #endif /* defined(__TestCpp__UITextFieldTest__) */
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp
index 9ca3ef615506..d24c4bc6f4ef 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -47,18 +47,16 @@ bool UITextTest::init()
     {
         Size widgetSize = _widget->getContentSize();
 
-        Text* alert = Text::create("Text","fonts/Marker Felt.ttf", 30);
+        Text* alert = Text::create("Text", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the text
         Text* text = Text::create("Text", "AmericanTypewriter", 30);
-        text->setPosition(Vec2(widgetSize.width / 2.0f,
-                               widgetSize.height / 2.0f
-                               + text->getContentSize().height / 4.0f));
+        text->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + text->getContentSize().height / 4.0f));
         _uiLayer->addChild(text);
 
         return true;
@@ -74,37 +72,34 @@ bool UITextTest_LineWrap::init()
     {
         Size widgetSize = _widget->getContentSize();
 
-        Text* alert = Text::create("Text line wrap","fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Text line wrap", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the line wrap
-        Text* text = Text::create("TextArea Widget can line wrap",
-                                  "AmericanTypewriter",32);
+        Text* text = Text::create("TextArea Widget can line wrap", "AmericanTypewriter", 32);
         text->ignoreContentAdaptWithSize(false);
         text->setContentSize(Size(280.0f, 150.0f));
         text->setTextHorizontalAlignment(TextHAlignment::CENTER);
         text->setTouchScaleChangeEnabled(true);
         text->setTouchEnabled(true);
-        text->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type)
-        {
+        text->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type) {
             if (type == Widget::TouchEventType::ENDED)
             {
                 if ((int)text->getContentSize().width == 280)
                 {
-                    text->setContentSize(Size(380.0f,100.0f));
-                }else
+                    text->setContentSize(Size(380.0f, 100.0f));
+                }
+                else
                 {
                     text->setContentSize(Size(280.0f, 150.0f));
                 }
             }
         });
-        text->setPosition(Vec2(widgetSize.width / 2.0f,
-                               widgetSize.height / 2.0f
-                               - text->getContentSize().height / 8.0f));
+        text->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - text->getContentSize().height / 8.0f));
         _uiLayer->addChild(text);
 
         return true;
@@ -114,7 +109,6 @@ bool UITextTest_LineWrap::init()
 
 // UILabelTest_Effect
 
-
 bool UILabelTest_Effect::init()
 {
     if (UIScene::init())
@@ -126,65 +120,53 @@ bool UILabelTest_Effect::init()
         alert->setFontName("fonts/Marker Felt.ttf");
         alert->setFontSize(30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 3.05f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.05f));
         _uiLayer->addChild(alert);
 
-
         // create the shadow only label
         Text* shadow_label = Text::create();
 
         shadow_label->enableShadow();
         shadow_label->setString("Shadow");
         shadow_label->setFontName("fonts/Marker Felt.ttf");
-        shadow_label->setPosition(Vec2(widgetSize.width / 2.0f,
-                                       widgetSize.height / 2.0f
-                                      + shadow_label->getContentSize().height + 20));
+        shadow_label->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + shadow_label->getContentSize().height + 20));
 
         _uiLayer->addChild(shadow_label);
 
-
         // create the stroke only label
         Text* glow_label = Text::create();
         glow_label->setFontName("fonts/Marker Felt.ttf");
         glow_label->setString("Glow");
         glow_label->enableGlow(Color4B::RED);
 
-
-        glow_label->setPosition(Vec2(widgetSize.width / 2.0f,
-                                     widgetSize.height / 2.0f - 20));
+        glow_label->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - 20));
 
         _uiLayer->addChild(glow_label);
 
-
         // create the label stroke and shadow
         Text* outline_label = Text::create();
         outline_label->setString("Outline");
-        CCLOG("content size without outline: %f %f",
-              outline_label->getContentSize().width,
+        CCLOG("content size without outline: %f %f", outline_label->getContentSize().width,
               outline_label->getContentSize().height);
         outline_label->enableOutline(Color4B::GREEN, 4);
-        outline_label->setPosition(Vec2(widgetSize.width / 2.0f,
-                                        widgetSize.height / 2.0f
-                                      - shadow_label->getContentSize().height - 50));
+        outline_label->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - shadow_label->getContentSize().height - 50));
 
         _uiLayer->addChild(outline_label);
-        CCLOG("content size after applying outline: %f %f",
-              outline_label->getContentSize().width,
+        CCLOG("content size after applying outline: %f %f", outline_label->getContentSize().width,
               outline_label->getContentSize().height);
 
-        //create buttons to disable effect and add
-        auto disableOutlineBtn= Button::create();
+        // create buttons to disable effect and add
+        auto disableOutlineBtn = Button::create();
         disableOutlineBtn->setTitleText("Disable outline");
         disableOutlineBtn->setTitleFontName("fonts/Marker Felt.ttf");
-        disableOutlineBtn->setPosition(Vec2(widgetSize.width * 0.3f,
-                                 widgetSize.height * 0.7f));
+        disableOutlineBtn->setPosition(Vec2(widgetSize.width * 0.3f, widgetSize.height * 0.7f));
         disableOutlineBtn->setPressedActionEnabled(true);
-        disableOutlineBtn->addClickEventListener([=](Ref*){
+        disableOutlineBtn->addClickEventListener([=](Ref*) {
             outline_label->disableEffect(LabelEffect::OUTLINE);
-            CCLOG("content size after disable outline: %f %f",
-                  outline_label->getContentSize().width,
+            CCLOG("content size after disable outline: %f %f", outline_label->getContentSize().width,
                   outline_label->getContentSize().height);
         });
         this->addChild(disableOutlineBtn);
@@ -192,30 +174,22 @@ bool UILabelTest_Effect::init()
         auto buttonWidth = disableOutlineBtn->getContentSize().width;
 
         auto disableGlowBtn = (Button*)disableOutlineBtn->clone();
-        disableGlowBtn->setPosition(disableOutlineBtn->getPosition()
-                                    + Vec2(buttonWidth + 40,0.0f));
+        disableGlowBtn->setPosition(disableOutlineBtn->getPosition() + Vec2(buttonWidth + 40, 0.0f));
         disableGlowBtn->setTitleText("Disable Glow");
-        disableGlowBtn->addClickEventListener([=](Ref*){
-            glow_label->disableEffect(LabelEffect::GLOW);
-        });
+        disableGlowBtn->addClickEventListener([=](Ref*) { glow_label->disableEffect(LabelEffect::GLOW); });
         this->addChild(disableGlowBtn);
 
         auto disableShadowBtn = (Button*)disableGlowBtn->clone();
-        disableShadowBtn->setPosition(disableGlowBtn->getPosition()
-                                      + Vec2(buttonWidth + 40,0.0f));
+        disableShadowBtn->setPosition(disableGlowBtn->getPosition() + Vec2(buttonWidth + 40, 0.0f));
         disableShadowBtn->setTitleText("Disable Shadow");
-        disableShadowBtn->addClickEventListener([=](Ref*){
-            shadow_label->disableEffect(LabelEffect::SHADOW);
-        });
+        disableShadowBtn->addClickEventListener([=](Ref*) { shadow_label->disableEffect(LabelEffect::SHADOW); });
         this->addChild(disableShadowBtn);
 
-
         return true;
     }
     return false;
 }
 
-
 // UITextTest_TTF
 
 bool UITextTest_TTF::init()
@@ -224,19 +198,16 @@ bool UITextTest_TTF::init()
     {
         Size widgetSize = _widget->getContentSize();
 
-        Text* alert = Text::create("Text set TTF font",
-                                   "fonts/Marker Felt.ttf",30);
+        Text* alert = Text::create("Text set TTF font", "fonts/Marker Felt.ttf", 30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f,
-                                widgetSize.height / 2.0f
-                                - alert->getContentSize().height * 1.75f));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f));
         _uiLayer->addChild(alert);
 
         // Create the text, and set font with .ttf
-        Text* text = Text::create("Text","fonts/A Damn Mess.ttf",30);
-        text->setPosition(Vec2(widgetSize.width / 2.0f,
-                               widgetSize.height / 2.0f
-                               + text->getContentSize().height / 4.0f));
+        Text* text = Text::create("Text", "fonts/A Damn Mess.ttf", 30);
+        text->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + text->getContentSize().height / 4.0f));
         _uiLayer->addChild(text);
 
         return true;
@@ -252,37 +223,31 @@ bool UITextTest_IgnoreContentSize::init()
     {
         Size widgetSize = _widget->getContentSize();
 
-        Text* leftText = Text::create("ignore content",
-                                   "fonts/Marker Felt.ttf",10);
-        leftText->setPosition(Vec2(widgetSize.width / 2.0f - 50,
-                                widgetSize.height / 2.0f));
+        Text* leftText = Text::create("ignore content", "fonts/Marker Felt.ttf", 10);
+        leftText->setPosition(Vec2(widgetSize.width / 2.0f - 50, widgetSize.height / 2.0f));
         leftText->ignoreContentAdaptWithSize(false);
-        leftText->setTextAreaSize(Size(60.0f,60.0f));
+        leftText->setTextAreaSize(Size(60.0f, 60.0f));
         leftText->setString("Text line with break\nText line with break\nText line with break\nText line with break\n");
         leftText->setTouchScaleChangeEnabled(true);
         leftText->setTouchEnabled(true);
         _uiLayer->addChild(leftText);
 
-
-        Text* rightText = Text::create("ignore content",
-                                      "fonts/Marker Felt.ttf",10);
-        rightText->setPosition(Vec2(widgetSize.width / 2.0f + 50,
-                                   widgetSize.height / 2.0f));
-        rightText->setString("Text line with break\nText line with break\nText line with break\nText line with break\n");
-        //note:setTextAreaSize must be used with ignoreContentAdaptWithSize(false)
-        rightText->setTextAreaSize(Size(100.0f,30.0f));
+        Text* rightText = Text::create("ignore content", "fonts/Marker Felt.ttf", 10);
+        rightText->setPosition(Vec2(widgetSize.width / 2.0f + 50, widgetSize.height / 2.0f));
+        rightText->setString(
+            "Text line with break\nText line with break\nText line with break\nText line with break\n");
+        // note:setTextAreaSize must be used with ignoreContentAdaptWithSize(false)
+        rightText->setTextAreaSize(Size(100.0f, 30.0f));
         rightText->ignoreContentAdaptWithSize(false);
         _uiLayer->addChild(rightText);
 
-
         auto halighButton = Button::create();
         halighButton->setTitleText("Alignment Right");
-        halighButton->addClickEventListener([=](Ref*){
+        halighButton->addClickEventListener([=](Ref*) {
             leftText->setTextHorizontalAlignment(TextHAlignment::RIGHT);
             rightText->setTextHorizontalAlignment(TextHAlignment::RIGHT);
         });
-        halighButton->setPosition(Vec2(widgetSize.width/2 - 50,
-                                       widgetSize.height/2 - 50));
+        halighButton->setPosition(Vec2(widgetSize.width / 2 - 50, widgetSize.height / 2 - 50));
         _uiLayer->addChild(halighButton);
 
         return true;
@@ -298,20 +263,17 @@ bool UITextTest_Clone::init()
     {
         Size widgetSize = _widget->getContentSize();
 
-        Text* singleText = Text::create("ignore content",
-            "fonts/Marker Felt.ttf", 30);
-        singleText->setPosition(Vec2(widgetSize.width / 2.0f - 80,
-            widgetSize.height / 2.0f));
+        Text* singleText = Text::create("ignore content", "fonts/Marker Felt.ttf", 30);
+        singleText->setPosition(Vec2(widgetSize.width / 2.0f - 80, widgetSize.height / 2.0f));
         singleText->setString("CHUKONG");
         singleText->setTouchScaleChangeEnabled(true);
         singleText->setTouchEnabled(true);
-        singleText->enableOutline(Color4B(255,0,0,100), 10);
-        singleText->enableShadow(Color4B::YELLOW, Size(2,-2), 0);
+        singleText->enableOutline(Color4B(255, 0, 0, 100), 10);
+        singleText->enableShadow(Color4B::YELLOW, Size(2, -2), 0);
         _uiLayer->addChild(singleText);
 
         auto cloneText = singleText->clone();
-        cloneText->setPosition(Vec2(widgetSize.width / 2.0f + 80,
-            widgetSize.height / 2.0f));
+        cloneText->setPosition(Vec2(widgetSize.width / 2.0f + 80, widgetSize.height / 2.0f));
         _uiLayer->addChild(cloneText);
 
         return true;
@@ -329,12 +291,10 @@ bool Issue16073Test::init()
 
         Text* singleText = Text::create("mwhahaha\360", "Verdana", 40);
 
-        singleText->setPosition(Vec2(widgetSize.width / 2.0f - 80,
-                                     widgetSize.height / 2.0f));
+        singleText->setPosition(Vec2(widgetSize.width / 2.0f - 80, widgetSize.height / 2.0f));
         _uiLayer->addChild(singleText);
 
         return true;
     }
     return false;
 }
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.h
index cd3569e8ff26..88faa4cd6f38 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -46,7 +46,6 @@ class UITextTest_LineWrap : public UIScene
     virtual bool init() override;
 };
 
-
 class UILabelTest_Effect : public UIScene
 {
 public:
@@ -54,7 +53,6 @@ class UILabelTest_Effect : public UIScene
 
     virtual bool init() override;
 };
- 
 
 class UITextTest_TTF : public UIScene
 {
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp
index 9ff803730708..339bc8b59abc 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,11 +35,11 @@ VideoPlayerTests::VideoPlayerTests()
 
 bool VideoPlayerTest::init()
 {
-    if ( !UIScene::init() )
+    if (!UIScene::init())
     {
         return false;
     }
-    
+
     _visibleRect = Director::getInstance()->getOpenGLView()->getVisibleRect();
 
     // Should create video first to make sure video is destryed first. If not, then may crash.
@@ -48,55 +48,61 @@ bool VideoPlayerTest::init()
 
     MenuItemFont::setFontSize(16);
 
-    auto fullSwitch = MenuItemFont::create("FullScreenSwitch", CC_CALLBACK_1(VideoPlayerTest::menuFullScreenCallback, this));
+    auto fullSwitch =
+        MenuItemFont::create("FullScreenSwitch", CC_CALLBACK_1(VideoPlayerTest::menuFullScreenCallback, this));
     fullSwitch->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    fullSwitch->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 50));
+    fullSwitch->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 50));
 
     auto pauseItem = MenuItemFont::create("Pause", CC_CALLBACK_1(VideoPlayerTest::menuPauseCallback, this));
     pauseItem->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    pauseItem->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 100));
+    pauseItem->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 100));
 
     auto resumeItem = MenuItemFont::create("Resume", CC_CALLBACK_1(VideoPlayerTest::menuResumeCallback, this));
     resumeItem->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    resumeItem->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 150));
+    resumeItem->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 150));
 
     auto stopItem = MenuItemFont::create("Stop", CC_CALLBACK_1(VideoPlayerTest::menuStopCallback, this));
     stopItem->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    stopItem->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 200));
+    stopItem->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 200));
 
     auto hintItem = MenuItemFont::create("Hint", CC_CALLBACK_1(VideoPlayerTest::menuHintCallback, this));
     hintItem->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    hintItem->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 250));
+    hintItem->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 250));
 
     //-------------------------------------------------------------------------------------------------------------------
-    auto resourceVideo = MenuItemFont::create("Play resource video", CC_CALLBACK_1(VideoPlayerTest::menuResourceVideoCallback, this));
+    auto resourceVideo =
+        MenuItemFont::create("Play resource video", CC_CALLBACK_1(VideoPlayerTest::menuResourceVideoCallback, this));
     resourceVideo->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    resourceVideo->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 50));
+    resourceVideo->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 50));
 
-    auto onlineVideo = MenuItemFont::create("Play online video", CC_CALLBACK_1(VideoPlayerTest::menuOnlineVideoCallback, this));
+    auto onlineVideo =
+        MenuItemFont::create("Play online video", CC_CALLBACK_1(VideoPlayerTest::menuOnlineVideoCallback, this));
     onlineVideo->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    onlineVideo->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 100));
+    onlineVideo->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 100));
 
     auto ratioSwitch = MenuItemFont::create("KeepRatioSwitch", CC_CALLBACK_1(VideoPlayerTest::menuRatioCallback, this));
     ratioSwitch->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    ratioSwitch->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 150));
-    
+    ratioSwitch->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 150));
+
     auto loopToggle = MenuItemFont::create("LoopToogle", CC_CALLBACK_1(VideoPlayerTest::menuLoopCallback, this));
     loopToggle->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    loopToggle->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 170));
+    loopToggle->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 170));
 
-    auto menu = Menu::create(resourceVideo,onlineVideo,ratioSwitch,loopToggle,fullSwitch,pauseItem,resumeItem,stopItem,hintItem,nullptr);
+    auto menu = Menu::create(resourceVideo, onlineVideo, ratioSwitch, loopToggle, fullSwitch, pauseItem, resumeItem,
+                             stopItem, hintItem, nullptr);
     menu->setPosition(Vec2::ZERO);
     _uiLayer->addChild(menu);
 
-    _videoStateLabel = Label::createWithSystemFont("IDLE","Arial",16);
+    _videoStateLabel = Label::createWithSystemFont("IDLE", "Arial", 16);
     _videoStateLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    _videoStateLabel->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 200));
+    _videoStateLabel->setPosition(
+        Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 200));
     _uiLayer->addChild(_videoStateLabel);
-    
-    _loopStatusLabel = Label::createWithSystemFont("(1)","Arial",10);
+
+    _loopStatusLabel = Label::createWithSystemFont("(1)", "Arial", 10);
     _loopStatusLabel->setAnchorPoint(Vec2::ANCHOR_MIDDLE_RIGHT);
-    _loopStatusLabel->setPosition(Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10,_visibleRect.origin.y + 185));
+    _loopStatusLabel->setPosition(
+        Vec2(_visibleRect.origin.x + _visibleRect.size.width - 10, _visibleRect.origin.y + 185));
     _uiLayer->addChild(_loopStatusLabel);
 
     return true;
@@ -111,7 +117,7 @@ void VideoPlayerTest::menuFullScreenCallback(Ref* sender)
 {
     if (_videoPlayer)
     {
-        _videoPlayer->setFullScreenEnabled(! _videoPlayer->isFullScreenEnabled());
+        _videoPlayer->setFullScreenEnabled(!_videoPlayer->isFullScreenEnabled());
     }
 }
 
@@ -119,7 +125,7 @@ void VideoPlayerTest::menuRatioCallback(Ref* sender)
 {
     if (_videoPlayer)
     {
-        _videoPlayer->setKeepAspectRatioEnabled(! _videoPlayer->isKeepAspectRatioEnabled());
+        _videoPlayer->setKeepAspectRatioEnabled(!_videoPlayer->isKeepAspectRatioEnabled());
     }
 }
 
@@ -127,12 +133,11 @@ void VideoPlayerTest::menuLoopCallback(Ref* sender)
 {
     if (_videoPlayer)
     {
-        _videoPlayer->setLooping(! _videoPlayer->isLooping());
+        _videoPlayer->setLooping(!_videoPlayer->isLooping());
         _loopStatusLabel->setString(_videoPlayer->isLooping() ? "(OO)" : "(1)");
     }
 }
 
-
 void VideoPlayerTest::menuResourceVideoCallback(Ref* sender)
 {
     if (_videoPlayer)
@@ -179,28 +184,30 @@ void VideoPlayerTest::menuHintCallback(Ref* sender)
 {
     if (_videoPlayer)
     {
-        _videoPlayer->setVisible(! _videoPlayer->isVisible());
+        _videoPlayer->setVisible(!_videoPlayer->isVisible());
     }
 }
 
 void VideoPlayerTest::createVideo()
 {
-    auto centerPos = Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2,_visibleRect.origin.y + _visibleRect.size.height /2);
+    auto centerPos =
+        Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2, _visibleRect.origin.y + _visibleRect.size.height / 2);
 
     auto widgetSize = _widget->getContentSize();
 
     _videoPlayer = VideoPlayer::create();
     _videoPlayer->setPosition(centerPos);
     _videoPlayer->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    _videoPlayer->setContentSize(Size(widgetSize.width * 0.4f,widgetSize.height * 0.4f));
+    _videoPlayer->setContentSize(Size(widgetSize.width * 0.4f, widgetSize.height * 0.4f));
     _uiLayer->addChild(_videoPlayer);
-    
+
     _videoPlayer->addEventListener(CC_CALLBACK_2(VideoPlayerTest::videoEventCallback, this));
 }
 
 void VideoPlayerTest::createSlider()
 {
-    auto centerPos = Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2,_visibleRect.origin.y + _visibleRect.size.height /2);
+    auto centerPos =
+        Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2, _visibleRect.origin.y + _visibleRect.size.height / 2);
 
     auto hSlider = ui::Slider::create();
     hSlider->setTouchEnabled(true);
@@ -210,7 +217,7 @@ void VideoPlayerTest::createSlider()
     hSlider->setPosition(Vec2(centerPos.x, _visibleRect.origin.y + _visibleRect.size.height * 0.15f));
     hSlider->setPercent(50);
     hSlider->addEventListener(CC_CALLBACK_2(VideoPlayerTest::sliderCallback, this));
-    _uiLayer->addChild(hSlider,0,1);
+    _uiLayer->addChild(hSlider, 0, 1);
 
     auto vSlider = ui::Slider::create();
     vSlider->setTouchEnabled(true);
@@ -221,54 +228,54 @@ void VideoPlayerTest::createSlider()
     vSlider->setRotation(90);
     vSlider->setPercent(50);
     vSlider->addEventListener(CC_CALLBACK_2(VideoPlayerTest::sliderCallback, this));
-    _uiLayer->addChild(vSlider,0,2);
+    _uiLayer->addChild(vSlider, 0, 2);
 }
 
-void VideoPlayerTest::sliderCallback(Ref *sender, ui::Slider::EventType eventType)
+void VideoPlayerTest::sliderCallback(Ref* sender, ui::Slider::EventType eventType)
 {
     if (eventType == Slider::EventType::ON_PERCENTAGE_CHANGED && _videoPlayer)
     {
-        Slider*  hSlider = (Slider*)this->getChildByTag(1);
-        Slider*  vSlider = (Slider*)this->getChildByTag(2);
+        Slider* hSlider = (Slider*)this->getChildByTag(1);
+        Slider* vSlider = (Slider*)this->getChildByTag(2);
 
         auto newPosX = _visibleRect.origin.x + _visibleRect.size.width / 2 + hSlider->getPercent() - 50;
         auto newPosY = _visibleRect.origin.y + _visibleRect.size.height / 2 + 50 - vSlider->getPercent();
 
-        _videoPlayer->setPosition(Vec2(newPosX,newPosY));
+        _videoPlayer->setPosition(Vec2(newPosX, newPosY));
     }
 }
 
 void VideoPlayerTest::videoEventCallback(Ref* sender, VideoPlayer::EventType eventType)
 {
-    switch (eventType) {
-        case VideoPlayer::EventType::PLAYING:
-            _videoStateLabel->setString("PLAYING");
-            break;
-        case VideoPlayer::EventType::PAUSED:
-            _videoStateLabel->setString("PAUSED");
-            break;
-        case VideoPlayer::EventType::STOPPED:
-            _videoStateLabel->setString("STOPPED");
-            break;
-        case VideoPlayer::EventType::COMPLETED:
-            _videoStateLabel->setString("COMPLETED");
-            break;
-        default:
-            break;
+    switch (eventType)
+    {
+    case VideoPlayer::EventType::PLAYING:
+        _videoStateLabel->setString("PLAYING");
+        break;
+    case VideoPlayer::EventType::PAUSED:
+        _videoStateLabel->setString("PAUSED");
+        break;
+    case VideoPlayer::EventType::STOPPED:
+        _videoStateLabel->setString("STOPPED");
+        break;
+    case VideoPlayer::EventType::COMPLETED:
+        _videoStateLabel->setString("COMPLETED");
+        break;
+    default:
+        break;
     }
 }
 
-
 // Simple Video Test
 
 SimpleVideoPlayerTest::SimpleVideoPlayerTest()
 {
-    _videoPlayer = nullptr;
-    _style = cocos2d::ui::VideoPlayer::StyleType::NONE;
+    _videoPlayer      = nullptr;
+    _style            = cocos2d::ui::VideoPlayer::StyleType::NONE;
     _userInputEnabled = true;
-    
+
     _switchUserInputEnabled = nullptr;
-    _switchStyle = nullptr;
+    _switchStyle            = nullptr;
 }
 
 void SimpleVideoPlayerTest::updateButtonsTexts()
@@ -278,53 +285,55 @@ void SimpleVideoPlayerTest::updateButtonsTexts()
         std::string str = _userInputEnabled ? "< User Input Enabled >" : "< User Input Disabled >";
         _switchUserInputEnabled->setString(str);
     }
-    
+
     if (_switchStyle)
     {
         std::string str = " - ";
-        switch(_style)
+        switch (_style)
         {
-            case cocos2d::ui::VideoPlayer::StyleType::NONE:
-                _switchUserInputEnabled->setVisible(false);
-                str = "< NO Sytle >";
-                break;
-                
-            case cocos2d::ui::VideoPlayer::StyleType::DEFAULT:
-                str = "< Default Style >";
-                _switchUserInputEnabled->setVisible(true);
-                break;
-                
-            default:
-                break;
+        case cocos2d::ui::VideoPlayer::StyleType::NONE:
+            _switchUserInputEnabled->setVisible(false);
+            str = "< NO Sytle >";
+            break;
+
+        case cocos2d::ui::VideoPlayer::StyleType::DEFAULT:
+            str = "< Default Style >";
+            _switchUserInputEnabled->setVisible(true);
+            break;
+
+        default:
+            break;
         }
-        
+
         _switchStyle->setString(str);
     }
 }
 
 bool SimpleVideoPlayerTest::init()
 {
-    if ( !UIScene::init() )
+    if (!UIScene::init())
     {
         return false;
     }
-    
+
     _visibleRect = Director::getInstance()->getOpenGLView()->getVisibleRect();
-    
+
     MenuItemFont::setFontSize(16);
-    
-    _switchStyle = MenuItemFont::create("Switch Style", CC_CALLBACK_1(SimpleVideoPlayerTest::switchStyleCallback, this));
+
+    _switchStyle =
+        MenuItemFont::create("Switch Style", CC_CALLBACK_1(SimpleVideoPlayerTest::switchStyleCallback, this));
     _switchStyle->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _switchStyle->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 50));
-    
-    _switchUserInputEnabled = MenuItemFont::create("Enable User Input", CC_CALLBACK_1(SimpleVideoPlayerTest::switchUserInputCallback, this));
+    _switchStyle->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 50));
+
+    _switchUserInputEnabled =
+        MenuItemFont::create("Enable User Input", CC_CALLBACK_1(SimpleVideoPlayerTest::switchUserInputCallback, this));
     _switchUserInputEnabled->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
-    _switchUserInputEnabled->setPosition(Vec2(_visibleRect.origin.x + 10,_visibleRect.origin.y + 100));
-    
-    auto menu = Menu::create(_switchUserInputEnabled,_switchStyle,nullptr);
+    _switchUserInputEnabled->setPosition(Vec2(_visibleRect.origin.x + 10, _visibleRect.origin.y + 100));
+
+    auto menu = Menu::create(_switchUserInputEnabled, _switchStyle, nullptr);
     menu->setPosition(Vec2::ZERO);
     _uiLayer->addChild(menu);
-    
+
     createVideo();
     updateButtonsTexts();
 
@@ -334,34 +343,34 @@ bool SimpleVideoPlayerTest::init()
 void SimpleVideoPlayerTest::menuCloseCallback(Ref* sender)
 {
     Director::getInstance()->end();
-    
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
     exit(0);
 #endif
 }
 
-
 void SimpleVideoPlayerTest::switchStyleCallback(Ref* sender)
 {
-    switch (_style) {
-        case cocos2d::ui::VideoPlayer::StyleType::NONE:
-            _style = cocos2d::ui::VideoPlayer::StyleType::DEFAULT;
-            break;
-            
-        case cocos2d::ui::VideoPlayer::StyleType::DEFAULT:
-            _style = cocos2d::ui::VideoPlayer::StyleType::NONE;
-            break;
-            
-        default:
-            break;
+    switch (_style)
+    {
+    case cocos2d::ui::VideoPlayer::StyleType::NONE:
+        _style = cocos2d::ui::VideoPlayer::StyleType::DEFAULT;
+        break;
+
+    case cocos2d::ui::VideoPlayer::StyleType::DEFAULT:
+        _style = cocos2d::ui::VideoPlayer::StyleType::NONE;
+        break;
+
+    default:
+        break;
     }
-    
+
     if (_videoPlayer)
     {
         _videoPlayer->setStyle(_style);
     }
-    
-    //createVideo();
+
+    // createVideo();
     updateButtonsTexts();
 }
 
@@ -372,34 +381,34 @@ void SimpleVideoPlayerTest::switchUserInputCallback(Ref* sender)
     {
         _videoPlayer->setUserInputEnabled(_userInputEnabled);
     }
-    
-    //createVideo();
+
+    // createVideo();
     updateButtonsTexts();
 }
 
-
 void SimpleVideoPlayerTest::createVideo()
 {
     if (_videoPlayer)
     {
         _uiLayer->removeChild(_videoPlayer);
     }
-    auto centerPos = Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2,_visibleRect.origin.y + _visibleRect.size.height /2);
-    
+    auto centerPos =
+        Vec2(_visibleRect.origin.x + _visibleRect.size.width / 2, _visibleRect.origin.y + _visibleRect.size.height / 2);
+
     auto widgetSize = _widget->getContentSize();
-    
+
     _videoPlayer = VideoPlayer::create();
     _videoPlayer->setPosition(centerPos);
     _videoPlayer->setAnchorPoint(Vec2::ANCHOR_MIDDLE);
-    _videoPlayer->setContentSize(Size(widgetSize.width * 0.4f,widgetSize.height * 0.4f));
+    _videoPlayer->setContentSize(Size(widgetSize.width * 0.4f, widgetSize.height * 0.4f));
     _videoPlayer->setLooping(true);
     _videoPlayer->setStyle(_style);
     _videoPlayer->setUserInputEnabled(_userInputEnabled);
-    
+
     _uiLayer->addChild(_videoPlayer);
-    
-   // _videoPlayer->addEventListener(CC_CALLBACK_2(SimpleVideoPlayerTest::videoEventCallback, this));
-    
+
+    // _videoPlayer->addEventListener(CC_CALLBACK_2(SimpleVideoPlayerTest::videoEventCallback, this));
+
     _videoPlayer->setFileName("cocosvideo.mp4");
     _videoPlayer->play();
 }
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h
index 6cdc84bc4f02..e453728e331b 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -48,7 +48,7 @@ class VideoPlayerTest : public UIScene
     void menuStopCallback(cocos2d::Ref* sender);
     void menuHintCallback(cocos2d::Ref* sender);
     void menuLoopCallback(cocos2d::Ref* sender);
-    
+
     void sliderCallback(cocos2d::Ref* sender, cocos2d::ui::Slider::EventType eventType);
 
     void videoEventCallback(cocos2d::Ref* sender, cocos2d::ui::VideoPlayer::EventType eventType);
@@ -63,35 +63,32 @@ class VideoPlayerTest : public UIScene
     cocos2d::Rect _visibleRect;
 };
 
-
 class SimpleVideoPlayerTest : public UIScene
 {
 public:
     CREATE_FUNC(SimpleVideoPlayerTest);
-    
+
     SimpleVideoPlayerTest();
-    
+
     virtual bool init() override;
-    
+
     void menuCloseCallback(cocos2d::Ref* sender);
     void switchStyleCallback(cocos2d::Ref* sender);
     void switchUserInputCallback(cocos2d::Ref* sender);
-    
+
 private:
     void createVideo();
-    
+
     cocos2d::Rect _visibleRect;
     cocos2d::ui::VideoPlayer* _videoPlayer;
-    
-    cocos2d::MenuItemFont*   _switchUserInputEnabled;
-    cocos2d::MenuItemFont*   _switchStyle;
-    
-    
+
+    cocos2d::MenuItemFont* _switchUserInputEnabled;
+    cocos2d::MenuItemFont* _switchStyle;
+
     bool _userInputEnabled;
     cocos2d::ui::VideoPlayer::StyleType _style;
-    
+
     void updateButtonsTexts();
 };
 
-
-#endif // __tests__VideoPlayerTest__
+#endif  // __tests__VideoPlayerTest__
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp
index 97d97241abcd..895b4af29707 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,175 +35,158 @@ WebViewTests::WebViewTests()
 
 bool WebViewTest::init()
 {
-    if (UIScene::init()) {
+    if (UIScene::init())
+    {
         Size winSize = Director::getInstance()->getVisibleSize();
 
-        
         _webView = cocos2d::ui::WebView::create();
-        _webView->setPosition(winSize/2);
+        _webView->setPosition(winSize / 2);
         _webView->setContentSize(winSize * 0.5);
         _webView->loadURL("https://www.baidu.com");
         _webView->setScalesPageToFit(true);
-        
+
         _webView->setOnShouldStartLoading(CC_CALLBACK_2(WebViewTest::onWebViewShouldStartLoading, this));
         _webView->setOnDidFinishLoading(CC_CALLBACK_2(WebViewTest::onWebViewDidFinishLoading, this));
         _webView->setOnDidFailLoading(CC_CALLBACK_2(WebViewTest::onWebViewDidFailLoading, this));
-        
+
         this->addChild(_webView);
-        
+
         auto spriteHello = Sprite::create("Hello.png");
-        spriteHello->setPosition(winSize/2);
+        spriteHello->setPosition(winSize / 2);
         this->addChild(spriteHello);
-        
-        TextField *urlTextField = TextField::create("Input a URL here", "Arial", 20);
+
+        TextField* urlTextField = TextField::create("Input a URL here", "Arial", 20);
         urlTextField->setPlaceHolderColor(Color3B::RED);
-        urlTextField->setPosition(Vec2(winSize/2) + Vec2(-80, _webView->getContentSize().height/2 +
-                                                     urlTextField->getContentSize().height/2 + 10));
+        urlTextField->setPosition(Vec2(winSize / 2) + Vec2(-80, _webView->getContentSize().height / 2 +
+                                                                    urlTextField->getContentSize().height / 2 + 10));
         this->addChild(urlTextField);
-        
-        Text *httpLabel = Text::create("https:// ", "Arial", 20);
+
+        Text* httpLabel = Text::create("https:// ", "Arial", 20);
         httpLabel->setTextColor(Color4B::GREEN);
-        httpLabel->setAnchorPoint(Vec2(1.0,0.5));
-        httpLabel->setPosition(urlTextField->getPosition() - Vec2(urlTextField->getContentSize().width/2,0));
+        httpLabel->setAnchorPoint(Vec2(1.0, 0.5));
+        httpLabel->setPosition(urlTextField->getPosition() - Vec2(urlTextField->getContentSize().width / 2, 0));
         this->addChild(httpLabel);
-        
-        
-        Button *resetBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                       "cocosui/animationbuttonpressed.png");
+
+        Button* resetBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         resetBtn->setTitleText("Visit URL");
-        resetBtn->setPosition(Vec2(winSize/2) + Vec2(50, _webView->getContentSize().height/2 +
-                                            resetBtn->getContentSize().height/2 + 10));
-        resetBtn->addClickEventListener([=](Ref*){
+        resetBtn->setPosition(Vec2(winSize / 2) + Vec2(50, _webView->getContentSize().height / 2 +
+                                                               resetBtn->getContentSize().height / 2 + 10));
+        resetBtn->addClickEventListener([=](Ref*) {
             if (urlTextField->getString().size() != 0)
             {
-                _webView->loadURL(std::string("https://") + urlTextField->getString());
+                _webView->loadURL(std::string("https://").append(urlTextField->getString()));
             }
         });
         this->addChild(resetBtn);
-        
-        
-        Button *reloadBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                          "cocosui/animationbuttonpressed.png");
+
+        Button* reloadBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         reloadBtn->setTitleText("Reload");
-        reloadBtn->setPosition(Vec2(winSize/2) + Vec2( _webView->getContentSize().width/2 +
-                                                      reloadBtn->getContentSize().width/2 + 10,50 ));
-        reloadBtn->addClickEventListener([=](Ref*){
-            _webView->reload();
-        });
+        reloadBtn->setPosition(
+            Vec2(winSize / 2) +
+            Vec2(_webView->getContentSize().width / 2 + reloadBtn->getContentSize().width / 2 + 10, 50));
+        reloadBtn->addClickEventListener([=](Ref*) { _webView->reload(); });
         this->addChild(reloadBtn);
-        
-        Button *forwardBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                           "cocosui/animationbuttonpressed.png");
+
+        Button* forwardBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         forwardBtn->setTitleText("Forward");
-        forwardBtn->setPosition(Vec2(winSize/2) + Vec2( _webView->getContentSize().width/2 +
-                                                      forwardBtn->getContentSize().width/2 + 10,0 ));
-        forwardBtn->addClickEventListener([=](Ref*){
-            _webView->goForward();
-        });
+        forwardBtn->setPosition(
+            Vec2(winSize / 2) +
+            Vec2(_webView->getContentSize().width / 2 + forwardBtn->getContentSize().width / 2 + 10, 0));
+        forwardBtn->addClickEventListener([=](Ref*) { _webView->goForward(); });
         this->addChild(forwardBtn);
-        
-        
-        
-        Button *backBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                           "cocosui/animationbuttonpressed.png");
+
+        Button* backBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         backBtn->setTitleText("Back");
-        backBtn->setPosition(Vec2(winSize/2) + Vec2( _webView->getContentSize().width/2 +
-                                                      backBtn->getContentSize().width/2 + 10,-50 ));
-        backBtn->addClickEventListener([=](Ref*){
-            _webView->goBack();
-        });
+        backBtn->setPosition(
+            Vec2(winSize / 2) +
+            Vec2(_webView->getContentSize().width / 2 + backBtn->getContentSize().width / 2 + 10, -50));
+        backBtn->addClickEventListener([=](Ref*) { _webView->goBack(); });
         this->addChild(backBtn);
-        
-        
-        Button *loadFileBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                           "cocosui/animationbuttonpressed.png");
+
+        Button* loadFileBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         loadFileBtn->setTitleText("Load FILE");
-        loadFileBtn->setPosition(Vec2(winSize/2) - Vec2( _webView->getContentSize().width/2 +
-                                                      loadFileBtn->getContentSize().width/2 + 10,50 ));
-        loadFileBtn->addClickEventListener([=](Ref*){
-            _webView->loadFile("Test.html");
-        });
+        loadFileBtn->setPosition(
+            Vec2(winSize / 2) -
+            Vec2(_webView->getContentSize().width / 2 + loadFileBtn->getContentSize().width / 2 + 10, 50));
+        loadFileBtn->addClickEventListener([=](Ref*) { _webView->loadFile("Test.html"); });
         this->addChild(loadFileBtn);
-        
-        Button *loadHTMLBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                            "cocosui/animationbuttonpressed.png");
+
+        Button* loadHTMLBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         loadHTMLBtn->setTitleText("Load Data");
-        loadHTMLBtn->setPosition(Vec2(winSize/2) - Vec2( _webView->getContentSize().width/2 +
-                                                       loadHTMLBtn->getContentSize().width/2 + 10,0 ));
-        loadHTMLBtn->addClickEventListener([=](Ref*){
-            _webView->loadHTMLString("<body style=\"font-size:50px;\">Hello World <img src=\"Icon.png\"/> </body>","Images/");
+        loadHTMLBtn->setPosition(
+            Vec2(winSize / 2) -
+            Vec2(_webView->getContentSize().width / 2 + loadHTMLBtn->getContentSize().width / 2 + 10, 0));
+        loadHTMLBtn->addClickEventListener([=](Ref*) {
+            _webView->loadHTMLString("<body style=\"font-size:50px;\">Hello World <img src=\"Icon.png\"/> </body>",
+                                     "Images/");
         });
         this->addChild(loadHTMLBtn);
-        
-        
-        
-        
-        Button *evalJsBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                         "cocosui/animationbuttonpressed.png");
+
+        Button* evalJsBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         evalJsBtn->setTitleText("Evaluate JS");
-        evalJsBtn->setPosition(Vec2(winSize/2) - Vec2( _webView->getContentSize().width/2 +
-                                                    evalJsBtn->getContentSize().width/2 + 10,-50 ));
-        evalJsBtn->addClickEventListener([=](Ref*){
-            _webView->evaluateJS("alert(\"hello\")");
-        });
+        evalJsBtn->setPosition(
+            Vec2(winSize / 2) -
+            Vec2(_webView->getContentSize().width / 2 + evalJsBtn->getContentSize().width / 2 + 10, -50));
+        evalJsBtn->addClickEventListener([=](Ref*) { _webView->evaluateJS("alert(\"hello\")"); });
         evalJsBtn->setName("evalJs");
         this->addChild(evalJsBtn);
-        
-        Button *opacityBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                           "cocosui/animationbuttonpressed.png");
+
+        Button* opacityBtn = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         opacityBtn->setTitleText("Opacity 1.f");
-        opacityBtn->setPosition(Vec2(winSize/2) - Vec2( _webView->getContentSize().width/2 +
-                                                      opacityBtn->getContentSize().width/2 + 10, 100 ));
-        opacityBtn->addClickEventListener([=](Ref*){
+        opacityBtn->setPosition(
+            Vec2(winSize / 2) -
+            Vec2(_webView->getContentSize().width / 2 + opacityBtn->getContentSize().width / 2 + 10, 100));
+        opacityBtn->addClickEventListener([=](Ref*) {
             auto currentOpacity = _webView->getOpacityWebView();
-            if(currentOpacity ==1.f){
+            if (currentOpacity == 1.f)
+            {
                 _webView->setOpacityWebView(.5f);
                 opacityBtn->setTitleText("Opacity .5f");
-            }else if(currentOpacity == .5f){
+            }
+            else if (currentOpacity == .5f)
+            {
                 _webView->setOpacityWebView(0);
                 opacityBtn->setTitleText("Opacity 0.f");
-            }else{
+            }
+            else
+            {
                 _webView->setOpacityWebView(1.f);
                 opacityBtn->setTitleText("Opacity 1.f");
             }
-            
         });
         opacityBtn->setName("Opacity");
         this->addChild(opacityBtn);
-        
-        
-        Button *transparentBgBtn = Button::create("cocosui/animationbuttonnormal.png",
-                                            "cocosui/animationbuttonpressed.png");
+
+        Button* transparentBgBtn =
+            Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png");
         transparentBgBtn->setTitleText("Transparent BG");
-        transparentBgBtn->setPosition(Vec2(winSize/2) + Vec2( _webView->getContentSize().width/2 +
-                                                             transparentBgBtn->getContentSize().width/2 + 10,-100 ));
-        transparentBgBtn->addClickEventListener([=](Ref*){
-            _webView->setBackgroundTransparent();
-        });
+        transparentBgBtn->setPosition(
+            Vec2(winSize / 2) +
+            Vec2(_webView->getContentSize().width / 2 + transparentBgBtn->getContentSize().width / 2 + 10, -100));
+        transparentBgBtn->addClickEventListener([=](Ref*) { _webView->setBackgroundTransparent(); });
         transparentBgBtn->setName("Transparent");
         this->addChild(transparentBgBtn);
-        
+
         return true;
     }
     return false;
 }
 
-bool WebViewTest::onWebViewShouldStartLoading(ui::WebView *sender, const std::string &url)
+bool WebViewTest::onWebViewShouldStartLoading(ui::WebView* sender, std::string_view url)
 {
-    CCLOG("onWebViewShouldStartLoading, url is %s", url.c_str());
-    //don't do any OpenGL operation here!! It's forbidden!
+    CCLOG("onWebViewShouldStartLoading, url is %s", url.data());
+    // don't do any OpenGL operation here!! It's forbidden!
     return true;
 }
 
-void WebViewTest::onWebViewDidFinishLoading(ui::WebView *sender, const std::string &url)
+void WebViewTest::onWebViewDidFinishLoading(ui::WebView* sender, std::string_view url)
 {
     auto node = (ui::Button*)this->getChildByName("evalJs");
     node->setTitleText("start loading...");
-    CCLOG("onWebViewDidFinishLoading, url is %s", url.c_str());
+    CCLOG("onWebViewDidFinishLoading, url is %s", url.data());
 }
 
-void WebViewTest::onWebViewDidFailLoading(ui::WebView *sender, const std::string &url)
+void WebViewTest::onWebViewDidFailLoading(ui::WebView* sender, std::string_view url)
 {
-    CCLOG("onWebViewDidFailLoading, url is %s", url.c_str());
+    CCLOG("onWebViewDidFailLoading, url is %s", url.data());
 }
-
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h
index eb9eee1de8ce..7b02cfdba3fc 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,16 +35,14 @@ class WebViewTest : public UIScene
 {
 public:
     CREATE_FUNC(WebViewTest);
-    
+
     virtual bool init() override;
-    bool onWebViewShouldStartLoading(cocos2d::ui::WebView *sender, const std::string &url);
-    void onWebViewDidFinishLoading(cocos2d::ui::WebView *sender, const std::string &url);
-    void onWebViewDidFailLoading(cocos2d::ui::WebView *sender, const std::string &url);
-    
-    
+    bool onWebViewShouldStartLoading(cocos2d::ui::WebView* sender, std::string_view url);
+    void onWebViewDidFinishLoading(cocos2d::ui::WebView* sender, std::string_view url);
+    void onWebViewDidFailLoading(cocos2d::ui::WebView* sender, std::string_view url);
+
 private:
-    cocos2d::ui::WebView *_webView;
-    
+    cocos2d::ui::WebView* _webView;
 };
 
 #endif /* defined(__cocos2d_tests__UIWebViewTest__) */
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
index fe20dfa92081..bc645f2edf89 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,39 +34,35 @@ UIWidgetAddNodeTests::UIWidgetAddNodeTests()
 
 // UIWidgetAddNodeTest
 
-UIWidgetAddNodeTest::UIWidgetAddNodeTest()
-{
-    
-}
+UIWidgetAddNodeTest::UIWidgetAddNodeTest() {}
 
-UIWidgetAddNodeTest::~UIWidgetAddNodeTest()
-{
-}
+UIWidgetAddNodeTest::~UIWidgetAddNodeTest() {}
 
 bool UIWidgetAddNodeTest::init()
 {
     if (UIScene::init())
     {
         Size widgetSize = _widget->getContentSize();
-        
+
         // Add the alert
         Text* alert = Text::create();
         alert->setString("Widget Add Node");
         alert->setFontName("fonts/Marker Felt.ttf");
         alert->setFontSize(30);
         alert->setColor(Color3B(159, 168, 176));
-        alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75));
+        alert->setPosition(
+            Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 1.75));
         _uiLayer->addChild(alert);
-        
+
         // Create the ui node container
         Widget* widget = Widget::create();
         widget->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
         _uiLayer->addChild(widget);
-        
+
         Sprite* sprite = Sprite::create("cocosui/ccicon.png");
         sprite->setPosition(Vec2(0.0f, sprite->getBoundingBox().size.height / 4));
         widget->addChild(sprite);
-        
+
         return true;
     }
     return false;
diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
index 99efd875897d..8c88ca662d10 100644
--- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
+++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2013 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/tests/cpp-tests/Classes/UITest/UITest.cpp b/tests/cpp-tests/Classes/UITest/UITest.cpp
index 711f9d3180c9..8703414cf8aa 100644
--- a/tests/cpp-tests/Classes/UITest/UITest.cpp
+++ b/tests/cpp-tests/Classes/UITest/UITest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,12 +25,9 @@
 #include "UITest.h"
 #include "CocoStudioGUITest/CocosGUIScene.h"
 
-
 UITests::UITests()
 {
-    addTest("GUI Dynamic Create Test", [](){ return new GUIDynamicCreateTests; });
+    addTest("GUI Dynamic Create Test", []() { return new GUIDynamicCreateTests; });
 }
 
-UITests::~UITests()
-{
-}
+UITests::~UITests() {}
diff --git a/tests/cpp-tests/Classes/UITest/UITest.h b/tests/cpp-tests/Classes/UITest/UITest.h
index 5ea74e4058e5..1fcea1a82e8d 100644
--- a/tests/cpp-tests/Classes/UITest/UITest.h
+++ b/tests/cpp-tests/Classes/UITest/UITest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,8 +34,6 @@ class UITests : public TestList
     ~UITests();
 
 private:
-
 };
 
-
 #endif /* defined(__cocos2d_tests__UITest__) */
diff --git a/tests/cpp-tests/Classes/UnitTest/RefPtrTest.h b/tests/cpp-tests/Classes/UnitTest/RefPtrTest.h
index 8852a582d09c..6104c1253eee 100644
--- a/tests/cpp-tests/Classes/UnitTest/RefPtrTest.h
+++ b/tests/cpp-tests/Classes/UnitTest/RefPtrTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,11 +30,10 @@
 class RefPtrTest : public UnitTestDemo
 {
 public:
-    
     CREATE_FUNC(RefPtrTest);
-    
+
     virtual void onEnter() override;
-    
+
     virtual std::string subtitle() const override;
 };
 
diff --git a/tests/cpp-tests/Classes/UnitTest/UnitTest.cpp b/tests/cpp-tests/Classes/UnitTest/UnitTest.cpp
index 4e1f44012bdf..f255c6c44bc4 100644
--- a/tests/cpp-tests/Classes/UnitTest/UnitTest.cpp
+++ b/tests/cpp-tests/Classes/UnitTest/UnitTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
  Copyright (c) 2021 Bytedance Inc.
- 
+
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,33 +32,33 @@ USING_NS_CC;
 using namespace cocos2d::network;
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
-#if defined (__arm64__)
-#define USE_NEON64
-#define INCLUDE_NEON64
-#elif defined (__ARM_NEON__)
-#define USE_NEON32
-#define INCLUDE_NEON32
-#else
-#endif
+#    if defined(__arm64__)
+#        define USE_NEON64
+#        define INCLUDE_NEON64
+#    elif defined(__ARM_NEON__)
+#        define USE_NEON32
+#        define INCLUDE_NEON32
+#    else
+#    endif
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-#if defined (__arm64__) || defined (__aarch64__)
-#define USE_NEON64
-#define INCLUDE_NEON64
-#elif defined (__ARM_NEON__)
-#define INCLUDE_NEON32
-#else
-#endif
+#    if defined(__arm64__) || defined(__aarch64__)
+#        define USE_NEON64
+#        define INCLUDE_NEON64
+#    elif defined(__ARM_NEON__)
+#        define INCLUDE_NEON32
+#    else
+#    endif
 #else
 
 #endif
 
-#if defined (__SSE__)
-#define USE_SSE
-#define INCLUDE_SSE
+#if defined(__SSE__)
+#    define USE_SSE
+#    define INCLUDE_SSE
 #endif
 
-#if (defined INCLUDE_NEON64) || (defined INCLUDE_NEON32) // FIXME: || (defined INCLUDE_SSE)
-#define UNIT_TEST_FOR_OPTIMIZED_MATH_UTIL
+#if (defined INCLUDE_NEON64) || (defined INCLUDE_NEON32)  // FIXME: || (defined INCLUDE_SSE)
+#    define UNIT_TEST_FOR_OPTIMIZED_MATH_UTIL
 #endif
 
 #define EXPECT_EQ(a, b) assert((a) == (b))
@@ -144,7 +144,7 @@ void TemplateVectorTest::onEnter()
 
     // Test move constructor
 
-    auto createVector = [](){
+    auto createVector = []() {
         Vector<Node*> ret;
 
         for (int i = 0; i < 20; i++)
@@ -235,46 +235,48 @@ void TemplateVectorTest::onEnter()
     vec6.eraseObject(vec6.at(2));
     CCASSERT(vec6.at(2)->getTag() == 1013, "vec6's 3rd element's tag is 1013.");
     vec6.clear();
-    
-    auto objA = Node::create(); // retain count is 1
+
+    auto objA = Node::create();  // retain count is 1
     auto objB = Node::create();
     auto objC = Node::create();
     {
         Vector<Node*> array1;
         Vector<Node*> array2;
-        
+
         // push back objA 3 times
-        array1.pushBack(objA); // retain count is 2
-        array1.pushBack(objA); // retain count is 3
-        array1.pushBack(objA); // retain count is 4
-        
-        array2.pushBack(objA); // retain count is 5
+        array1.pushBack(objA);  // retain count is 2
+        array1.pushBack(objA);  // retain count is 3
+        array1.pushBack(objA);  // retain count is 4
+
+        array2.pushBack(objA);  // retain count is 5
         array2.pushBack(objB);
         array2.pushBack(objC);
-        
-        for (auto obj : array1) {
+
+        for (auto obj : array1)
+        {
             array2.eraseObject(obj);
         }
         CCASSERT(objA->getReferenceCount() == 4, "objA's reference count is 4.");
     }
     CCASSERT(objA->getReferenceCount() == 1, "objA's reference count is 1.");
-    
+
     {
         Vector<Node*> array1;
         // push back objA 3 times
-        array1.pushBack(objA); // retain count is 2
-        array1.pushBack(objA); // retain count is 3
-        array1.pushBack(objA); // retain count is 4
+        array1.pushBack(objA);  // retain count is 2
+        array1.pushBack(objA);  // retain count is 3
+        array1.pushBack(objA);  // retain count is 4
         CCASSERT(objA->getReferenceCount() == 4, "objA's reference count is 4.");
-        array1.eraseObject(objA, true); // Remove all occurrences in the Vector.
+        array1.eraseObject(objA, true);  // Remove all occurrences in the Vector.
         CCASSERT(objA->getReferenceCount() == 1, "objA's reference count is 1.");
-        
-        array1.pushBack(objA); // retain count is 2
-        array1.pushBack(objA); // retain count is 3
-        array1.pushBack(objA); // retain count is 4
-        
+
+        array1.pushBack(objA);  // retain count is 2
+        array1.pushBack(objA);  // retain count is 3
+        array1.pushBack(objA);  // retain count is 4
+
         array1.eraseObject(objA, false);
-        CCASSERT(objA->getReferenceCount() == 3, "objA's reference count is 3."); // Only remove the first occurrence in the Vector.
+        CCASSERT(objA->getReferenceCount() == 3,
+                 "objA's reference count is 3.");  // Only remove the first occurrence in the Vector.
     }
 
     // Check the retain count in vec7
@@ -287,9 +289,7 @@ void TemplateVectorTest::onEnter()
 
     // Sort
     Vector<Node*> vecForSort = createVector();
-    std::sort(vecForSort.begin(), vecForSort.end(), [](Node* a, Node* b){
-        return a->getTag() >= b->getTag();
-    });
+    std::sort(vecForSort.begin(), vecForSort.end(), [](Node* a, Node* b) { return a->getTag() >= b->getTag(); });
 
     for (int i = 0; i < 20; ++i)
     {
@@ -333,7 +333,7 @@ void TemplateVectorTest::onEnter()
 
     // Self assignment
     Vector<Node*> vecSelfAssign = createVector();
-    vecSelfAssign = vecSelfAssign;
+    vecSelfAssign               = vecSelfAssign;
     CCASSERT(vecSelfAssign.size() == 20, "vecSelfAssign's size is 20.");
 
     for (const auto& child : vecSelfAssign)
@@ -366,15 +366,14 @@ std::string TemplateVectorTest::subtitle() const
     return "Vector<T>, should not crash";
 }
 
-
 //---------------------------------------------------------------
 
 void TemplateMapTest::onEnter()
 {
     UnitTestDemo::onEnter();
 
-    auto createMap = [](){
-        Map<std::string, Node*> ret;
+    auto createMap = []() {
+        StringMap<Node*> ret;
         for (int i = 0; i < 20; ++i)
         {
             auto node = Node::create();
@@ -393,7 +392,7 @@ void TemplateMapTest::onEnter()
     CCASSERT(map1.keys(Node::create()).empty(), "map1's keys don't contain a empty Node.");
 
     // Move constructor
-    Map<std::string, Node*> map2 = createMap();
+    auto map2 = createMap();
     for (const auto& e : map2)
     {
         CC_UNUSED_PARAM(e);
@@ -401,7 +400,7 @@ void TemplateMapTest::onEnter()
     }
 
     // Copy constructor
-    Map<std::string, Node*> map3(map2);
+    auto map3(map2);
     for (const auto& e : map3)
     {
         CC_UNUSED_PARAM(e);
@@ -409,9 +408,9 @@ void TemplateMapTest::onEnter()
     }
 
     // Move assignment operator
-    Map<std::string, Node*> map4;
+    StringMap<Node*> map4;
     auto unusedNode = Node::create();
-    map4.insert("unused",unusedNode);
+    map4.insert("unused", unusedNode);
     map4 = createMap();
     CCASSERT(unusedNode->getReferenceCount() == 1, "unusedNode's reference count is 1.");
     for (const auto& e : map4)
@@ -421,7 +420,7 @@ void TemplateMapTest::onEnter()
     }
 
     // Copy assignment operator
-    Map<std::string, Node*> map5;
+    StringMap<Node*> map5;
     map5 = map4;
     for (const auto& e : map5)
     {
@@ -501,7 +500,7 @@ void TemplateMapTest::onEnter()
     CCASSERT(map6.at("insert03") == node3, "The element at insert03 is equal to node3.");
 
     // erase
-    Map<std::string, Node*> mapForErase = createMap();
+    StringMap<Node*> mapForErase = createMap();
     mapForErase.erase(mapForErase.find("9"));
     CCASSERT(mapForErase.find("9") == mapForErase.end(), "9 is already removed.");
     CCASSERT(mapForErase.size() == 19, "mapForErase's size is 19.");
@@ -518,8 +517,8 @@ void TemplateMapTest::onEnter()
     CCASSERT(mapForErase.size() == 15, "mapForErase's size is 15.");
 
     // clear
-    Map<std::string, Node*> mapForClear = createMap();
-    auto mapForClearCopy = mapForClear;
+    StringMap<Node*> mapForClear = createMap();
+    auto mapForClearCopy         = mapForClear;
     mapForClear.clear();
 
     for (const auto& e : mapForClearCopy)
@@ -531,7 +530,7 @@ void TemplateMapTest::onEnter()
     // get random object
     // Set the seed by time
     std::srand((unsigned)time(nullptr));
-    Map<std::string, Node*> mapForRandom = createMap();
+    StringMap<Node*> mapForRandom = createMap();
     log("<--- begin ---->");
     for (int i = 0; i < mapForRandom.size(); ++i)
     {
@@ -540,8 +539,8 @@ void TemplateMapTest::onEnter()
     log("<---- end  ---->");
 
     // Self assignment
-    Map<std::string, Node*> mapForSelfAssign = createMap();
-    mapForSelfAssign = mapForSelfAssign;
+    StringMap<Node*> mapForSelfAssign = createMap();
+    mapForSelfAssign                  = mapForSelfAssign;
     CCASSERT(mapForSelfAssign.size() == 20, "mapForSelfAssign's size is 20.");
 
     for (const auto& e : mapForSelfAssign)
@@ -560,7 +559,7 @@ void TemplateMapTest::onEnter()
     }
 }
 
-void TemplateMapTest::constFunc(const Map<std::string, Node*>& map) const
+void TemplateMapTest::constFunc(const StringMap<Node*>& map) const
 {
     log("[%s]=(tag)%d", "0", map.at("0")->getTag());
     log("[%s]=(tag)%d", "1", map.find("1")->second->getTag());
@@ -576,73 +575,72 @@ std::string TemplateMapTest::subtitle() const
 void ValueTest::onEnter()
 {
     UnitTestDemo::onEnter();
-    
+
     Value v1;
     CCASSERT(v1.getType() == Value::Type::NONE, "v1's value type should be VALUE::Type::NONE.");
     CCASSERT(v1.isNull(), "v1 is null.");
-    
+
     Value v2(100);
     CCASSERT(v2.getType() == Value::Type::INTEGER, "v2's value type should be VALUE::Type::INTEGER.");
     CCASSERT(!v2.isNull(), "v2 is not null.");
-    
+
     Value v3(101.4f);
     CCASSERT(v3.getType() == Value::Type::FLOAT, "v3's value type should be VALUE::Type::FLOAT.");
     CCASSERT(!v3.isNull(), "v3 is not null.");
-    
+
     Value v4(106.1);
     CCASSERT(v4.getType() == Value::Type::DOUBLE, "v4's value type should be VALUE::Type::DOUBLE.");
     CCASSERT(!v4.isNull(), "v4 is not null.");
-    
+
     unsigned char byte = 50;
     Value v5(byte);
     CCASSERT(v5.getType() == Value::Type::INT_UI32, "v5's value type should be Value::Type::INT_UI32.");
     CCASSERT(!v5.isNull(), "v5 is not null.");
-    
+
     Value v6(true);
     CCASSERT(v6.getType() == Value::Type::BOOLEAN, "v6's value type is Value::Type::BOOLEAN.");
     CCASSERT(!v6.isNull(), "v6 is not null.");
-    
+
     Value v7("string");
     CCASSERT(v7.getType() == Value::Type::STRING, "v7's value type is Value::type::STRING.");
     CCASSERT(!v7.isNull(), "v7 is not null.");
-    
+
     Value v8(std::string("string2"));
     CCASSERT(v8.getType() == Value::Type::STRING, "v8's value type is Value::Type::STRING.");
     CCASSERT(!v8.isNull(), "v8 is not null.");
 
-    auto createValueVector = [&](){
+    auto createValueVector = [&]() {
         ValueVector ret;
         ret.push_back(v1);
         ret.push_back(v2);
         ret.push_back(v3);
         return ret;
     };
-    
-    
+
     Value v9(createValueVector());
     CCASSERT(v9.getType() == Value::Type::VECTOR, "v9's value type is Value::Type::VECTOR.");
     CCASSERT(!v9.isNull(), "v9 is not null.");
 
-    auto createValueMap = [&](){
+    auto createValueMap = [&]() {
         ValueMap ret;
         ret["aaa"] = v1;
         ret["bbb"] = v2;
         ret["ccc"] = v3;
         return ret;
     };
-    
+
     Value v10(createValueMap());
     CCASSERT(v10.getType() == Value::Type::MAP, "v10's value type is Value::Type::MAP.");
     CCASSERT(!v10.isNull(), "v10 is not null.");
-    
-    auto createValueMapIntKey = [&](){
+
+    auto createValueMapIntKey = [&]() {
         ValueMapIntKey ret;
         ret[111] = v1;
         ret[222] = v2;
         ret[333] = v3;
         return ret;
     };
-    
+
     Value v11(createValueMapIntKey());
     CCASSERT(v11.getType() == Value::Type::INT_KEY_MAP, "v11's value type is Value::Type::INT_KEY_MAP.");
     CCASSERT(!v11.isNull(), "v11 is not null.");
@@ -653,149 +651,102 @@ std::string ValueTest::subtitle() const
     return "Value Test, should not crash";
 }
 
-void ValueTest::constFunc(const Value& /*value*/) const
-{
-}
+void ValueTest::constFunc(const Value& /*value*/) const {}
 
 // UTFConversionTest
 
 // FIXME: made as define to prevent compile warnings in release mode. Better is to be a `const static int`
 #define TEST_CODE_NUM 11
 
-static const char16_t __utf16Code[] =
-{
-    0x3042,
-    0x3044,
-    0x3046,
-    0x3048,
-    0x304A,
-    0x3042,
-    0x3044,
-    0x3046,
-    0x3048,
-    0x304A,
-    0x0041,
-    0x0000,
+static const char16_t __utf16Code[] = {
+    0x3042, 0x3044, 0x3046, 0x3048, 0x304A, 0x3042, 0x3044, 0x3046, 0x3048, 0x304A, 0x0041, 0x0000,
 };
 
 // to avoid Xcode error, char => unsigned char
 // If you use this table, please cast manually as (const char *).
-static const unsigned char __utf8Code[] =
-{
-    0xE3,0x81,0x82,
-    0xE3,0x81,0x84,
-    0xE3,0x81,0x86,
-    0xE3,0x81,0x88,
-    0xE3,0x81,0x8A,
-    0xE3,0x81,0x82,
-    0xE3,0x81,0x84,
-    0xE3,0x81,0x86,
-    0xE3,0x81,0x88,
-    0xE3,0x81,0x8A,
-    0x41,
-    0x00,
+static const unsigned char __utf8Code[] = {
+    0xE3, 0x81, 0x82, 0xE3, 0x81, 0x84, 0xE3, 0x81, 0x86, 0xE3, 0x81, 0x88, 0xE3, 0x81, 0x8A, 0xE3,
+    0x81, 0x82, 0xE3, 0x81, 0x84, 0xE3, 0x81, 0x86, 0xE3, 0x81, 0x88, 0xE3, 0x81, 0x8A, 0x41, 0x00,
 };
 
-
-static const char16_t WHITE_SPACE_CODE[] =
-{
-    0x0009,
-    0x000A,
-    0x000B,
-    0x000C,
-    0x000D,
-    0x0020,
-    0x0085,
-    0x00A0,
-    0x1680,
-    0x2000,
-    0x2001,
-    0x2002,
-    0x2003,
-    0x2004,
-    0x2005,
-    0x2006,
-    0x2007,
-    0x2008,
-    0x2009,
-    0x200A,
-    0x2028,
-    0x2029,
-    0x202F,
-    0x205F,
-    0x3000
-};
+static const char16_t WHITE_SPACE_CODE[] = {0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x0020, 0x0085, 0x00A0, 0x1680,
+                                            0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008,
+                                            0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F, 0x3000};
 
 static void doUTFConversion()
 {
     bool isSuccess = false;
-    
-    std::string originalUTF8 = (const char*)__utf8Code;
+
+    std::string originalUTF8     = (const char*)__utf8Code;
     std::u16string originalUTF16 = __utf16Code;
-    
+
     //---------------------------
     std::string utf8Str;
     isSuccess = StringUtils::UTF16ToUTF8(originalUTF16, utf8Str);
-    
+
     if (isSuccess)
     {
-        isSuccess = memcmp(utf8Str.data(), originalUTF8.data(), originalUTF8.length()+1)==0;
+        isSuccess = memcmp(utf8Str.data(), originalUTF8.data(), originalUTF8.length() + 1) == 0;
     }
-    
+
     CCASSERT(isSuccess, "StringUtils::UTF16ToUTF8 failed");
-    
+
     //---------------------------
     std::u16string utf16Str;
     isSuccess = StringUtils::UTF8ToUTF16(originalUTF8, utf16Str);
-    
+
     if (isSuccess)
     {
-        isSuccess = memcmp(utf16Str.data(), originalUTF16.data(), originalUTF16.length()+1)==0;
+        isSuccess = memcmp(utf16Str.data(), originalUTF16.data(), originalUTF16.length() + 1) == 0;
     }
-    
+
     CCASSERT(isSuccess && (utf16Str.length() == TEST_CODE_NUM), "StringUtils::UTF8ToUTF16 failed");
-    
+
     //---------------------------
     auto vec1 = StringUtils::getChar16VectorFromUTF16String(originalUTF16);
-    
+
     CCASSERT(vec1.size() == originalUTF16.length(), "StringUtils::getChar16VectorFromUTF16String failed");
-    
+
     //---------------------------
-    std::vector<char16_t> vec2( vec1 );
+    std::vector<char16_t> vec2(vec1);
     vec2.push_back(0x2009);
     vec2.push_back(0x2009);
     vec2.push_back(0x2009);
     vec2.push_back(0x2009);
-    
-    std::vector<char16_t> vec3( vec2 );
+
+    std::vector<char16_t> vec3(vec2);
     StringUtils::trimUTF16Vector(vec2);
-    
+
     CCASSERT(vec1.size() == vec2.size(), "StringUtils::trimUTF16Vector failed");
-    
-    for (size_t i = 0; i < vec2.size(); i++ )
+
+    for (size_t i = 0; i < vec2.size(); i++)
     {
         CCASSERT(vec1.at(i) == vec2.at(i), "StringUtils::trimUTF16Vector failed");
     }
-    
+
     //---------------------------
-    CCASSERT(StringUtils::getCharacterCountInUTF8String(originalUTF8) == TEST_CODE_NUM, "StringUtils::getCharacterCountInUTF8String failed");
-    
+    CCASSERT(StringUtils::getCharacterCountInUTF8String(originalUTF8) == TEST_CODE_NUM,
+             "StringUtils::getCharacterCountInUTF8String failed");
+
     //---------------------------
-    CCASSERT(StringUtils::getIndexOfLastNotChar16(vec3, 0x2009) == (vec1.size()-1), "StringUtils::getIndexOfLastNotChar16 failed");
-    
+    CCASSERT(StringUtils::getIndexOfLastNotChar16(vec3, 0x2009) == (vec1.size() - 1),
+             "StringUtils::getIndexOfLastNotChar16 failed");
+
     //---------------------------
-    CCASSERT(originalUTF16.length() == TEST_CODE_NUM, "The length of the original utf16 string isn't equal to TEST_CODE_NUM");
-    
+    CCASSERT(originalUTF16.length() == TEST_CODE_NUM,
+             "The length of the original utf16 string isn't equal to TEST_CODE_NUM");
+
     //---------------------------
     size_t whiteCodeNum = sizeof(WHITE_SPACE_CODE) / sizeof(WHITE_SPACE_CODE[0]);
-    for( size_t i = 0; i < whiteCodeNum; i++ )
+    for (size_t i = 0; i < whiteCodeNum; i++)
     {
         CCASSERT(StringUtils::isUnicodeSpace(WHITE_SPACE_CODE[i]), "StringUtils::isUnicodeSpace failed");
     }
-    
+
     CCASSERT(!StringUtils::isUnicodeSpace(0xFFFF), "StringUtils::isUnicodeSpace failed");
-    
-    CCASSERT(!StringUtils::isCJKUnicode(0xFFFF) && StringUtils::isCJKUnicode(0x3100), "StringUtils::isCJKUnicode failed");
+
+    CCASSERT(!StringUtils::isCJKUnicode(0xFFFF) && StringUtils::isCJKUnicode(0x3100),
+             "StringUtils::isCJKUnicode failed");
 }
 
 void UTFConversionTest::onEnter()
@@ -873,9 +824,12 @@ void UIHelperSubStringTest::onEnter()
         CC_ASSERT(Helper::getSubStringOfUTF8String(source, 8, 1) == "");
         CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 1) == "\xe8\xbf\x99");
         CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 4) == "\xe8\xbf\x99\xe9\x87\x8c\xe6\x98\xaf\xe4\xb8\xad");
-        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 8) == "\xe8\xbf\x99\xe9\x87\x8c\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95\xe4\xbe\x8b");
-        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 100) == "\xe8\xbf\x99\xe9\x87\x8c\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95\xe4\xbe\x8b");
-        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 2, 5) == "\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95");
+        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 8) ==
+                  "\xe8\xbf\x99\xe9\x87\x8c\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95\xe4\xbe\x8b");
+        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 0, 100) ==
+                  "\xe8\xbf\x99\xe9\x87\x8c\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95\xe4\xbe\x8b");
+        CC_ASSERT(Helper::getSubStringOfUTF8String(source, 2, 5) ==
+                  "\xe6\x98\xaf\xe4\xb8\xad\xe6\x96\x87\xe6\xb5\x8b\xe8\xaf\x95");
         CC_ASSERT(Helper::getSubStringOfUTF8String(source, 6, 2) == "\xe8\xaf\x95\xe4\xbe\x8b");
         CC_ASSERT(Helper::getSubStringOfUTF8String(source, 6, 100) == "\xe8\xaf\x95\xe4\xbe\x8b");
 
@@ -924,7 +878,8 @@ std::string UIHelperSubStringTest::subtitle() const
 }
 
 // ParseIntegerListTest
-void ParseIntegerListTest::onEnter() {
+void ParseIntegerListTest::onEnter()
+{
     UnitTestDemo::onEnter();
 
     {
@@ -1173,10 +1128,11 @@ void ParseUriTest::onEnter()
     {
         // test query parameters
         std::string s("http://localhost?&key1=foo&key2=&key3&=bar&=bar=&");
-        Uri u = Uri::parse(s);
+        Uri u           = Uri::parse(s);
         auto paramsList = u.getQueryParams();
         std::map<std::string, std::string> params;
-        for (auto& param : paramsList) {
+        for (auto& param : paramsList)
+        {
             params[param.first] = param.second;
         }
         EXPECT_EQ(3, params.size());
@@ -1190,7 +1146,7 @@ void ParseUriTest::onEnter()
     {
         // test query parameters
         std::string s("http://localhost?&&&&&&&&&&&&&&&");
-        Uri u = Uri::parse(s);
+        Uri u       = Uri::parse(s);
         auto params = u.getQueryParams();
         EXPECT_TRUE(params.empty());
     }
@@ -1198,10 +1154,11 @@ void ParseUriTest::onEnter()
     {
         // test query parameters
         std::string s("http://localhost?&=invalid_key&key2&key3=foo");
-        Uri u = Uri::parse(s);
+        Uri u           = Uri::parse(s);
         auto paramsList = u.getQueryParams();
         std::map<std::string, std::string> params;
-        for (auto& param : paramsList) {
+        for (auto& param : paramsList)
+        {
             params[param.first] = param.second;
         }
         EXPECT_EQ(2, params.size());
@@ -1213,10 +1170,11 @@ void ParseUriTest::onEnter()
     {
         // test query parameters
         std::string s("http://localhost?&key1=====&&=key2&key3=");
-        Uri u = Uri::parse(s);
+        Uri u           = Uri::parse(s);
         auto paramsList = u.getQueryParams();
         std::map<std::string, std::string> params;
-        for (auto& param : paramsList) {
+        for (auto& param : paramsList)
+        {
             params[param.first] = param.second;
         }
         EXPECT_EQ(1, params.size());
@@ -1227,10 +1185,11 @@ void ParseUriTest::onEnter()
     {
         // test query parameters
         std::string s("ws://localhost:90?key1=foo=bar&key2=foobar&");
-        Uri u = Uri::parse(s);
+        Uri u           = Uri::parse(s);
         auto paramsList = u.getQueryParams();
         std::map<std::string, std::string> params;
-        for (auto& param : paramsList) {
+        for (auto& param : paramsList)
+        {
             params[param.first] = param.second;
         }
         EXPECT_EQ(1, params.size());
@@ -1350,16 +1309,16 @@ void ParseUriTest::onEnter()
     }
 
     {
-        Uri http = Uri::parse("http://google.com");
-        Uri https = Uri::parse("https://www.google.com:90");
-        Uri query = Uri::parse("http://google.com:8080/foo/bar?foo=bar");
-        Uri localhost = Uri::parse("http://localhost:8080");
-        Uri ipv6 = Uri::parse("https://[2001:0db8:85a3:0042:1000:8a2e:0370:7334]");
-        Uri ipv6short = Uri::parse("http://[2001:db8:85a3:42:1000:8a2e:370:7334]");
-        Uri ipv6port = Uri::parse("http://[2001:db8:85a3:42:1000:8a2e:370:7334]:90");
+        Uri http       = Uri::parse("http://google.com");
+        Uri https      = Uri::parse("https://www.google.com:90");
+        Uri query      = Uri::parse("http://google.com:8080/foo/bar?foo=bar");
+        Uri localhost  = Uri::parse("http://localhost:8080");
+        Uri ipv6       = Uri::parse("https://[2001:0db8:85a3:0042:1000:8a2e:0370:7334]");
+        Uri ipv6short  = Uri::parse("http://[2001:db8:85a3:42:1000:8a2e:370:7334]");
+        Uri ipv6port   = Uri::parse("http://[2001:db8:85a3:42:1000:8a2e:370:7334]:90");
         Uri ipv6abbrev = Uri::parse("http://[2001::7334:a:90]");
-        Uri ipv6http = Uri::parse("http://[2001::7334:a]:90");
-        Uri ipv6query = Uri::parse("http://[2001::7334:a]:90/foo/bar?foo=bar");
+        Uri ipv6http   = Uri::parse("http://[2001::7334:a]:90");
+        Uri ipv6query  = Uri::parse("http://[2001::7334:a]:90/foo/bar?foo=bar");
 
         EXPECT_EQ(http.getScheme(), "http");
         EXPECT_EQ(http.getPort(), 80);
@@ -1443,7 +1402,6 @@ void ParseUriTest::onEnter()
         EXPECT_EQ(u6.getPathEtc(), "?&foo=321&bbb=1");
         EXPECT_EQ(u6.getQuery(), "&foo=321&bbb=1");
     }
-
 }
 
 std::string ParseUriTest::subtitle() const
@@ -1453,23 +1411,24 @@ std::string ParseUriTest::subtitle() const
 
 // MathUtilTest
 
-namespace UnitTest {
+namespace UnitTest
+{
 
 #ifdef INCLUDE_NEON32
-#include "math/MathUtilNeon.inl"
+#    include "math/MathUtilNeon.inl"
 #endif
 
 #ifdef INCLUDE_NEON64
-#include "math/MathUtilNeon64.inl"
+#    include "math/MathUtilNeon64.inl"
 #endif
 
 #ifdef INCLUDE_SSE
-//FIXME: #include "math/MathUtilSSE.inl"
+// FIXME: #include "math/MathUtilSSE.inl"
 #endif
 
 #include "math/MathUtil.inl"
 
-} // namespace UnitTest {
+}  // namespace UnitTest
 
 // I know the next line looks ugly, but it's a way to test MathUtil. :)
 using namespace UnitTest::cocos2d;
@@ -1480,7 +1439,7 @@ static void __checkMathUtilResult(const char* description, const float* a1, cons
     // Check whether the result of the optimized instruction is the same as which is implemented in C
     for (int i = 0; i < size; ++i)
     {
-        bool r = fabs(a1[i] - a2[i]) < 0.00001f;//FLT_EPSILON;
+        bool r = fabs(a1[i] - a2[i]) < 0.00001f;  // FLT_EPSILON;
         if (r)
         {
             log("Correct: a1[%d]=%f, a2[%d]=%f", i, a1[i], i, a2[i]);
@@ -1496,234 +1455,241 @@ static void __checkMathUtilResult(const char* description, const float* a1, cons
 void MathUtilTest::onEnter()
 {
     UnitTestDemo::onEnter();
-    
+
     const int MAT4_SIZE = 16;
     const int VEC4_SIZE = 4;
-    
+
     const float inMat41[MAT4_SIZE] = {
-        0.234023f, 2.472349f, 1.984244f, 2.23348f,
-        0.634124f, 0.234975f, 6.384572f, 0.82368f,
-        0.738028f, 1.845237f, 1.934721f, 1.62343f,
-        0.339023f, 3.472452f, 1.324714f, 4.23852f,
+        0.234023f, 2.472349f, 1.984244f, 2.23348f, 0.634124f, 0.234975f, 6.384572f, 0.82368f,
+        0.738028f, 1.845237f, 1.934721f, 1.62343f, 0.339023f, 3.472452f, 1.324714f, 4.23852f,
     };
-    
+
     const float inMat42[MAT4_SIZE] = {
-        1.640232f, 4.472349f, 0.983244f, 1.23343f,
-        2.834124f, 8.234975f, 0.082572f, 3.82464f,
-        3.238028f, 2.845237f, 0.331721f, 4.62544f,
-        4.539023f, 9.472452f, 3.520714f, 2.23252f,
+        1.640232f, 4.472349f, 0.983244f, 1.23343f, 2.834124f, 8.234975f, 0.082572f, 3.82464f,
+        3.238028f, 2.845237f, 0.331721f, 4.62544f, 4.539023f, 9.472452f, 3.520714f, 2.23252f,
     };
-    
+
     const float scalar = 1.323298f;
-    const float x = 0.432234f;
-    const float y = 1.333229f;
-    const float z = 2.535292f;
-    const float w = 4.632234f;
-    
-    const float inVec4[VEC4_SIZE] = {2.323478f, 0.238482f, 4.223783f, 7.238238f};
+    const float x      = 0.432234f;
+    const float y      = 1.333229f;
+    const float z      = 2.535292f;
+    const float w      = 4.632234f;
+
+    const float inVec4[VEC4_SIZE]  = {2.323478f, 0.238482f, 4.223783f, 7.238238f};
     const float inVec42[VEC4_SIZE] = {0.322374f, 8.258883f, 3.293683f, 2.838337f};
-    
+
     float outMat4Opt[MAT4_SIZE] = {0};
-    float outMat4C[MAT4_SIZE] = {0};
+    float outMat4C[MAT4_SIZE]   = {0};
     float outVec4Opt[VEC4_SIZE] = {0};
-    float outVec4C[VEC4_SIZE] = {0};
-    
+    float outVec4C[VEC4_SIZE]   = {0};
+
     // inline static void addMatrix(const float* m, float scalar, float* dst);
     MathUtilC::addMatrix(inMat41, scalar, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::addMatrix(inMat41, scalar, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::addMatrix(inMat41, scalar, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
 // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void addMatrix(const float* m, float scalar, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void addMatrix(const float* m, float scalar, float* dst);", outMat4C,
+                          outMat4Opt, MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void addMatrix(const float* m1, const float* m2, float* dst);
     MathUtilC::addMatrix(inMat41, inMat42, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::addMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::addMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void addMatrix(const float* m1, const float* m2, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void addMatrix(const float* m1, const float* m2, float* dst);", outMat4C,
+                          outMat4Opt, MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
 
     // inline static void subtractMatrix(const float* m1, const float* m2, float* dst);
     MathUtilC::subtractMatrix(inMat41, inMat42, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::subtractMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::subtractMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void subtractMatrix(const float* m1, const float* m2, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void subtractMatrix(const float* m1, const float* m2, float* dst);", outMat4C,
+                          outMat4Opt, MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void multiplyMatrix(const float* m, float scalar, float* dst);
     MathUtilC::multiplyMatrix(inMat41, scalar, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::multiplyMatrix(inMat41, scalar, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::multiplyMatrix(inMat41, scalar, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void multiplyMatrix(const float* m, float scalar, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void multiplyMatrix(const float* m, float scalar, float* dst);", outMat4C,
+                          outMat4Opt, MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void multiplyMatrix(const float* m1, const float* m2, float* dst);
     MathUtilC::multiplyMatrix(inMat41, inMat42, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::multiplyMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::multiplyMatrix(inMat41, inMat42, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void multiplyMatrix(const float* m1, const float* m2, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void multiplyMatrix(const float* m1, const float* m2, float* dst);", outMat4C,
+                          outMat4Opt, MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void negateMatrix(const float* m, float* dst);
     MathUtilC::negateMatrix(inMat41, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::negateMatrix(inMat41, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::negateMatrix(inMat41, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void negateMatrix(const float* m, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void negateMatrix(const float* m, float* dst);", outMat4C, outMat4Opt,
+                          MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void transposeMatrix(const float* m, float* dst);
     MathUtilC::transposeMatrix(inMat41, outMat4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::transposeMatrix(inMat41, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::transposeMatrix(inMat41, outMat4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void transposeMatrix(const float* m, float* dst);", outMat4C, outMat4Opt, MAT4_SIZE);
+
+    __checkMathUtilResult("inline static void transposeMatrix(const float* m, float* dst);", outMat4C, outMat4Opt,
+                          MAT4_SIZE);
     // Clean
     memset(outMat4C, 0, sizeof(outMat4C));
     memset(outMat4Opt, 0, sizeof(outMat4Opt));
-    
+
     // inline static void transformVec4(const float* m, float x, float y, float z, float w, float* dst);
     MathUtilC::transformVec4(inMat41, x, y, z, w, outVec4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::transformVec4(inMat41, x, y, z, w, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::transformVec4(inMat41, x, y, z, w, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void transformVec4(const float* m, float x, float y, float z, float w, float* dst);", outVec4C, outVec4Opt, VEC4_SIZE);
+
+    __checkMathUtilResult(
+        "inline static void transformVec4(const float* m, float x, float y, float z, float w, float* dst);", outVec4C,
+        outVec4Opt, VEC4_SIZE);
     // Clean
     memset(outVec4C, 0, sizeof(outVec4C));
     memset(outVec4Opt, 0, sizeof(outVec4Opt));
-    
+
     // inline static void transformVec4(const float* m, const float* v, float* dst);
     MathUtilC::transformVec4(inMat41, inVec4, outVec4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::transformVec4(inMat41, inVec4, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::transformVec4(inMat41, inVec4, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void transformVec4(const float* m, const float* v, float* dst);", outVec4C, outVec4Opt, VEC4_SIZE);
+
+    __checkMathUtilResult("inline static void transformVec4(const float* m, const float* v, float* dst);", outVec4C,
+                          outVec4Opt, VEC4_SIZE);
     // Clean
     memset(outVec4C, 0, sizeof(outVec4C));
     memset(outVec4Opt, 0, sizeof(outVec4Opt));
-    
+
     // inline static void crossVec3(const float* v1, const float* v2, float* dst);
     MathUtilC::crossVec3(inVec4, inVec42, outVec4C);
-    
+
 #ifdef INCLUDE_NEON32
     MathUtilNeon::crossVec3(inVec4, inVec42, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_NEON64
     MathUtilNeon64::crossVec3(inVec4, inVec42, outVec4Opt);
 #endif
-    
+
 #ifdef INCLUDE_SSE
     // FIXME:
 #endif
-    
-    __checkMathUtilResult("inline static void crossVec3(const float* v1, const float* v2, float* dst);", outVec4C, outVec4Opt, VEC4_SIZE);
+
+    __checkMathUtilResult("inline static void crossVec3(const float* v1, const float* v2, float* dst);", outVec4C,
+                          outVec4Opt, VEC4_SIZE);
     // Clean
     memset(outVec4C, 0, sizeof(outVec4C));
     memset(outVec4Opt, 0, sizeof(outVec4Opt));
@@ -1757,5 +1723,3 @@ std::string ResizableBufferAdapterTest::subtitle() const
 {
     return "ResiziableBufferAdapter<Data> Test";
 }
-
-
diff --git a/tests/cpp-tests/Classes/UnitTest/UnitTest.h b/tests/cpp-tests/Classes/UnitTest/UnitTest.h
index 23ce9ad675ab..b75181fcb0b5 100644
--- a/tests/cpp-tests/Classes/UnitTest/UnitTest.h
+++ b/tests/cpp-tests/Classes/UnitTest/UnitTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -52,7 +52,7 @@ class TemplateMapTest : public UnitTestDemo
     CREATE_FUNC(TemplateMapTest);
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
-    void constFunc(const cocos2d::Map<std::string, cocos2d::Node*>& map) const;
+    void constFunc(const cocos2d::StringMap<cocos2d::Node*>& map) const;
 };
 
 class ValueTest : public UnitTestDemo
@@ -112,5 +112,4 @@ class ResizableBufferAdapterTest : public UnitTestDemo
     virtual std::string subtitle() const override;
 };
 
-
 #endif /* __UNIT_TEST__ */
diff --git a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp
index 07859f508460..8d9c62980220 100644
--- a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp
+++ b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
  Copyright (c) 2020 c4games.com.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,10 +41,10 @@ UserDefaultTests::UserDefaultTests()
 
 UserDefaultTest::UserDefaultTest()
 {
-    auto s = Director::getInstance()->getWinSize();
+    auto s     = Director::getInstance()->getWinSize();
     auto label = Label::createWithTTF("CCUserDefault test Log data see console", "fonts/arial.ttf", 22);
     addChild(label, 0);
-    label->setPosition( Vec2(s.width/2, s.height-50) );
+    label->setPosition(Vec2(s.width / 2, s.height - 50));
 
     this->_label = Label::createWithTTF("result", "fonts/arial.ttf", 12);
     addChild(this->_label, 0);
@@ -55,54 +55,57 @@ UserDefaultTest::UserDefaultTest()
     doTest();
 }
 
-//template<typename T>
-//void logData(const char* key)
+// template<typename T>
+// void logData(const char* key)
 //{
-//    Data data = UserDefault::getInstance()->getDataForKey(key);
-//    T* buffer = (T*) data.getBytes();
-//    ssize_t length = data.getSize() / sizeof(T);
+//     Data data = UserDefault::getInstance()->getDataForKey(key);
+//     T* buffer = (T*) data.getBytes();
+//     ssize_t length = data.getSize() / sizeof(T);
 //
-//    std::ostringstream ss;
-//    ss << setprecision(2) << std::fixed;
-//    for (int i = 0; i < length; i++)
-//    {
-//        ss << buffer[i] << " ";
-//    }
+//     std::ostringstream ss;
+//     ss << setprecision(2) << std::fixed;
+//     for (int i = 0; i < length; i++)
+//     {
+//         ss << buffer[i] << " ";
+//     }
 //
-//    CCLOG("%s is %s", key, ss.str().c_str());
-//}
+//     CCLOG("%s is %s", key, ss.str().c_str());
+// }
 
-//template<typename T>
-//void setData(const char* key)
+// template<typename T>
+// void setData(const char* key)
 //{
-//    Data data;
-//    vector<T> v;
+//     Data data;
+//     vector<T> v;
 //
-//    for (int i = 0; i <= 5; i++)
-//    {
-//        v.push_back(static_cast<T>(i));
-//    }
-//    data.copy((unsigned char*) v.data(), v.size() * sizeof(T));
-//    UserDefault::getInstance()->setDataForKey(key, data);
-//}
+//     for (int i = 0; i <= 5; i++)
+//     {
+//         v.push_back(static_cast<T>(i));
+//     }
+//     data.copy((unsigned char*) v.data(), v.size() * sizeof(T));
+//     UserDefault::getInstance()->setDataForKey(key, data);
+// }
 //
-//template<typename T>
-//void setData2(const char* key)
+// template<typename T>
+// void setData2(const char* key)
 //{
-//    Data data;
-//    vector<T> v;
+//     Data data;
+//     vector<T> v;
 //
-//    for (int i = 5; i >= 0; i--)
-//    {
-//        v.push_back(static_cast<T>(i));
-//    }
-//    data.copy((unsigned char*) v.data(), v.size() * sizeof(T));
-//    UserDefault::getInstance()->setDataForKey(key, data);
-//}
+//     for (int i = 5; i >= 0; i--)
+//     {
+//         v.push_back(static_cast<T>(i));
+//     }
+//     data.copy((unsigned char*) v.data(), v.size() * sizeof(T));
+//     UserDefault::getInstance()->setDataForKey(key, data);
+// }
 
 void UserDefaultTest::doTest()
 {
-    this->_label->setString(this->_label->getString() + "\n" + "********************** init value ***********************");
+    std::string strVal{this->_label->getString()};
+    this->_label->setString(
+        strVal.append("\n"
+                      "********************** init value ***********************"));
 
     // set default value
 
@@ -113,19 +116,22 @@ void UserDefaultTest::doTest()
     UserDefault::getInstance()->setBoolForKey("bool", true);
 
     // test saving of Data buffers
-//    setData<int>("int_data");
-//    setData<float>("float_data");
-//    setData<double>("double_data");
+    //    setData<int>("int_data");
+    //    setData<float>("float_data");
+    //    setData<double>("double_data");
 
     printValue();
 
-//    logData<int>("int_data");
-//    logData<float>("float_data");
-//    logData<double>("double_data");
+    //    logData<int>("int_data");
+    //    logData<float>("float_data");
+    //    logData<double>("double_data");
 
-    //CCUserDefault::getInstance()->flush();
+    // CCUserDefault::getInstance()->flush();
 
-    this->_label->setString(this->_label->getString() + "\n" + "********************** after change value ***********************");
+    strVal = this->_label->getString();
+    this->_label->setString(
+        strVal.append("\n"
+                      "********************** after change value ***********************"));
 
     // change the value
 
@@ -135,20 +141,23 @@ void UserDefaultTest::doTest()
     UserDefault::getInstance()->setDoubleForKey("double", 2.6);
     UserDefault::getInstance()->setBoolForKey("bool", false);
 
-//    setData2<int>("int_data");
-//    setData2<float>("float_data");
-//    setData2<double>("double_data");
+    //    setData2<int>("int_data");
+    //    setData2<float>("float_data");
+    //    setData2<double>("double_data");
 
     UserDefault::getInstance()->flush();
 
     // print value
     printValue();
 
-//    logData<int>("int_data");
-//    logData<float>("float_data");
-//    logData<double>("double_data");
+    //    logData<int>("int_data");
+    //    logData<float>("float_data");
+    //    logData<double>("double_data");
 
-    this->_label->setString(this->_label->getString() + "\n" + "********************** after delete value ***********************");
+    strVal = this->_label->getString();
+    this->_label->setString(
+        strVal.append("\n"
+                      "********************** after delete value ***********************"));
 
     UserDefault::getInstance()->deleteValueForKey("string");
     UserDefault::getInstance()->deleteValueForKey("integer");
@@ -164,37 +173,33 @@ void UserDefaultTest::printValue()
 {
     char strTemp[256] = "";
     // print value
-    std::string ret = UserDefault::getInstance()->getStringForKey("string");
-    sprintf(strTemp, "string is %s", ret.c_str());
-    this->_label->setString(this->_label->getString() + "\n" + strTemp);
+    std::string_view ret = UserDefault::getInstance()->getStringForKey("string");
+    sprintf(strTemp, "string is %s", ret.data());
+    this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
 
     double d = UserDefault::getInstance()->getDoubleForKey("double");
     sprintf(strTemp, "double is %f", d);
-    this->_label->setString(this->_label->getString() + "\n" + strTemp);
+    this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
 
     int i = UserDefault::getInstance()->getIntegerForKey("integer");
     sprintf(strTemp, "integer is %d", i);
-    this->_label->setString(this->_label->getString() + "\n" + strTemp);
+    this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
 
     float f = UserDefault::getInstance()->getFloatForKey("float");
     sprintf(strTemp, "float is %f", f);
-    this->_label->setString(this->_label->getString() + "\n" + strTemp);
+    this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
 
     bool b = UserDefault::getInstance()->getBoolForKey("bool");
     if (b)
     {
         sprintf(strTemp, "bool is true");
-        this->_label->setString(this->_label->getString() + "\n" + strTemp);
+        this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
     }
     else
     {
         sprintf(strTemp, "bool is false");
-        this->_label->setString(this->_label->getString() + "\n" + strTemp);
+        this->_label->setString((std::string)this->_label->getString() + "\n" + strTemp);
     }
 }
 
-UserDefaultTest::~UserDefaultTest()
-{
-}
-
-
+UserDefaultTest::~UserDefaultTest() {}
diff --git a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h
index 17f74654cdc3..1f8fba6215ae 100644
--- a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h
+++ b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -44,4 +44,4 @@ class UserDefaultTest : public TestCase
     cocos2d::Label* _label;
 };
 
-#endif // _USERDEFAULT_TEST_H_
+#endif  // _USERDEFAULT_TEST_H_
diff --git a/tests/cpp-tests/Classes/VRTest/VRTest.cpp b/tests/cpp-tests/Classes/VRTest/VRTest.cpp
index 4605f10c90b5..84107c502fbb 100644
--- a/tests/cpp-tests/Classes/VRTest/VRTest.cpp
+++ b/tests/cpp-tests/Classes/VRTest/VRTest.cpp
@@ -44,11 +44,10 @@ VRTest1::VRTest1()
     auto size = Director::getInstance()->getVisibleSize();
 
     auto image = Sprite::create("Images/background.png");
-    image->setPosition(size/2);
+    image->setPosition(size / 2);
     addChild(image);
 
-    auto button = MenuItemFont::create("Enable / Disable VR", [](Ref* ref){
-
+    auto button = MenuItemFont::create("Enable / Disable VR", [](Ref* ref) {
         auto glview = Director::getInstance()->getOpenGLView();
         auto vrimpl = glview->getVR();
         if (vrimpl)
@@ -65,7 +64,7 @@ VRTest1::VRTest1()
     auto menu = Menu::create(button, nullptr);
     addChild(menu);
 
-    menu->setPosition(size / 6 );
+    menu->setPosition(size / 6);
 }
 
 std::string VRTest1::title() const
@@ -77,6 +76,3 @@ std::string VRTest1::subtitle() const
 {
     return "Enable / Disable it with the button";
 }
-
-
-
diff --git a/tests/cpp-tests/Classes/VRTest/VRTest.h b/tests/cpp-tests/Classes/VRTest/VRTest.h
index cd0ef455adfd..b72cff7196de 100644
--- a/tests/cpp-tests/Classes/VRTest/VRTest.h
+++ b/tests/cpp-tests/Classes/VRTest/VRTest.h
@@ -35,7 +35,7 @@ DEFINE_TEST_SUITE(VRTests);
 class VRTestDemo : public TestCase
 {
 protected:
-    std::string    _title;
+    std::string _title;
 
 public:
 };
@@ -49,5 +49,4 @@ class VRTest1 : public VRTestDemo
     virtual std::string subtitle() const override;
 };
 
-
 #endif
diff --git a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.cpp b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.cpp
index cbd871999f06..39025fc9fb6f 100644
--- a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.cpp
+++ b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.cpp
@@ -36,220 +36,236 @@ VibrateTests::VibrateTests()
     ADD_TEST_CASE(VibrateControlTest);
 }
 
-namespace {
-    class TextButton : public cocos2d::Label
+namespace
+{
+class TextButton : public cocos2d::Label
+{
+public:
+    static TextButton* create(std::string_view text, const std::function<void(TextButton*)>& onTriggered)
     {
-    public:
-        
-        static TextButton *create(const std::string& text, const std::function<void(TextButton*)> &onTriggered)
+        auto ret = new TextButton();
+
+        TTFConfig ttfconfig("fonts/arial.ttf", 25);
+        if (ret->setTTFConfig(ttfconfig))
         {
-            auto ret = new TextButton();
-            
-            TTFConfig ttfconfig("fonts/arial.ttf",25);
-            if (ret->setTTFConfig(ttfconfig)) {
-                ret->setString(text);
-                ret->_onTriggered = onTriggered;
-                
-                ret->autorelease();
-                
-                return ret;
-            }
-            
-            delete ret;
-            return nullptr;
+            ret->setString(text);
+            ret->_onTriggered = onTriggered;
+
+            ret->autorelease();
+
+            return ret;
         }
-        
-        void setEnabled(bool enabled)
+
+        delete ret;
+        return nullptr;
+    }
+
+    void setEnabled(bool enabled)
+    {
+        _enabled = enabled;
+        if (_enabled)
         {
-            _enabled = enabled;
-            if(_enabled){
-                this->setColor(Color3B::WHITE);
-            }
-            else {
-                this->setColor(Color3B::GRAY);
-            }
+            this->setColor(Color3B::WHITE);
         }
-        
-    private:
-        TextButton()
+        else
         {
-            auto listener = EventListenerTouchOneByOne::create();
-            listener->setSwallowTouches(true);
-            
-            listener->onTouchBegan = CC_CALLBACK_2(TextButton::onTouchBegan, this);
-            listener->onTouchEnded = CC_CALLBACK_2(TextButton::onTouchEnded, this);
-            listener->onTouchCancelled = CC_CALLBACK_2(TextButton::onTouchCancelled, this);
-            
-            _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);            
+            this->setColor(Color3B::GRAY);
         }
-        
-        bool touchHits(Touch  *touch)
+    }
+
+private:
+    TextButton()
+    {
+        auto listener = EventListenerTouchOneByOne::create();
+        listener->setSwallowTouches(true);
+
+        listener->onTouchBegan     = CC_CALLBACK_2(TextButton::onTouchBegan, this);
+        listener->onTouchEnded     = CC_CALLBACK_2(TextButton::onTouchEnded, this);
+        listener->onTouchCancelled = CC_CALLBACK_2(TextButton::onTouchCancelled, this);
+
+        _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
+    }
+
+    bool touchHits(Touch* touch)
+    {
+        auto hitPos = this->convertToNodeSpace(touch->getLocation());
+        if (hitPos.x >= 0 && hitPos.y >= 0 && hitPos.x <= _contentSize.width && hitPos.y <= _contentSize.height)
         {
-            auto hitPos = this->convertToNodeSpace(touch->getLocation());
-            if (hitPos.x >= 0 && hitPos.y >= 0 && hitPos.x <= _contentSize.width && hitPos.y <= _contentSize.height) {
-                return true;
-            }
-            return false;
+            return true;
         }
-        
-        bool onTouchBegan(Touch  *touch, Event  *event)
+        return false;
+    }
+
+    bool onTouchBegan(Touch* touch, Event* event)
+    {
+        auto hits = touchHits(touch);
+        if (hits)
         {
-            auto hits = touchHits(touch);
-            if (hits){
-                scaleButtonTo(0.95f);
-            }
-            return hits;
+            scaleButtonTo(0.95f);
         }
-        
-        void onTouchEnded(Touch  *touch, Event  *event)
+        return hits;
+    }
+
+    void onTouchEnded(Touch* touch, Event* event)
+    {
+        if (_enabled)
         {
-            if(_enabled) {
-                auto hits = touchHits(touch);
-                if (hits && _onTriggered){
-                    _onTriggered(this);
-                }
+            auto hits = touchHits(touch);
+            if (hits && _onTriggered)
+            {
+                _onTriggered(this);
             }
-            
-            scaleButtonTo(1);
         }
-        
-        void onTouchCancelled(Touch  *touch, Event  *event)
+
+        scaleButtonTo(1);
+    }
+
+    void onTouchCancelled(Touch* touch, Event* event) { scaleButtonTo(1); }
+
+    void scaleButtonTo(float scale)
+    {
+        auto action = ScaleTo::create(0.05f, scale);
+        action->setTag(10000);
+        stopActionByTag(10000);
+        runAction(action);
+    }
+
+    std::function<void(TextButton*)> _onTriggered = nullptr;
+
+    bool _enabled = true;
+};
+
+class SliderEx : public Slider
+{
+public:
+    enum class TouchEvent
+    {
+        DOWN,
+        MOVE,
+        UP,
+        CANCEL
+    };
+    typedef std::function<void(SliderEx*, float, TouchEvent)> ccSliderExCallback;
+
+    static SliderEx* create()
+    {
+        auto ret = new SliderEx();
+        if (ret->init())
         {
-            scaleButtonTo(1);
+            ret->_callback = nullptr;
+            ret->loadBarTexture("ccs-res/cocosui/sliderTrack.png");
+            ret->loadSlidBallTextures("ccs-res/cocosui/sliderThumb.png", "ccs-res/cocosui/sliderThumb.png", "");
+            ret->loadProgressBarTexture("ccs-res/cocosui/sliderProgress.png");
+
+            ret->autorelease();
+
+            return ret;
         }
-        
-        void scaleButtonTo(float scale)
+        CC_SAFE_DELETE(ret);
+        return ret;
+    }
+
+    void setCallBack(const ccSliderExCallback& callback) { _callback = callback; }
+
+    void setRatio(float ratio)
+    {
+        if (ratio > 1.0f)
         {
-            auto action = ScaleTo::create(0.05f, scale);
-            action->setTag(10000);
-            stopActionByTag(10000);
-            runAction(action);
+            ratio = 1.0f;
         }
-        
-        std::function<void(TextButton*)> _onTriggered = nullptr;
-        
-        bool _enabled = true;
-    };
-    
-    class SliderEx : public Slider
-    {
-    public:
-        enum class TouchEvent
+        else if (ratio < 0.0f)
         {
-            DOWN,
-            MOVE,
-            UP,
-            CANCEL
-        };
-        typedef std::function<void(SliderEx*,float,TouchEvent)> ccSliderExCallback;
-        
-        static SliderEx* create(){
-            auto ret = new SliderEx();
-            if (ret->init())
-            {
-                ret->_callback = nullptr;
-                ret->loadBarTexture("ccs-res/cocosui/sliderTrack.png");
-                ret->loadSlidBallTextures("ccs-res/cocosui/sliderThumb.png", "ccs-res/cocosui/sliderThumb.png", "");
-                ret->loadProgressBarTexture("ccs-res/cocosui/sliderProgress.png");
-                
-                ret->autorelease();
-                
-                return ret;
-            }
-            CC_SAFE_DELETE(ret);
-            return ret;
+            ratio = 0.0f;
         }
-        
-        void setCallBack(const ccSliderExCallback& callback){
-            _callback = callback;
+
+        _ratio   = ratio;
+        _percent = 100 * _ratio;
+
+        float dis = _barLength * _ratio;
+        _slidBallRenderer->setPosition(Vec2(dis, _contentSize.height / 2.0f));
+        if (_scale9Enabled)
+        {
+            _progressBarRenderer->setPreferredSize(Size(dis, _progressBarTextureSize.height));
         }
-        
-        void setRatio(float ratio) {
-            if (ratio > 1.0f){
-                ratio = 1.0f;
-            }
-            else if (ratio < 0.0f){
-                ratio = 0.0f;
-            }
-            
-            _ratio = ratio;
-            _percent = 100 * _ratio;
-            
-            float dis = _barLength * _ratio;
-            _slidBallRenderer->setPosition(Vec2(dis, _contentSize.height / 2.0f));
-            if (_scale9Enabled){
-                _progressBarRenderer->setPreferredSize(Size(dis,_progressBarTextureSize.height));
-            }
-            else
+        else
+        {
+            auto spriteRenderer = _progressBarRenderer->getSprite();
+
+            if (nullptr != spriteRenderer)
             {
-                auto spriteRenderer = _progressBarRenderer->getSprite();
-                
-                if (nullptr != spriteRenderer) {
-                    Rect rect = spriteRenderer->getTextureRect();
-                    rect.size.width = _progressBarTextureSize.width * _ratio;
-                    spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size);
-                }
-            }
-        }
-        
-        virtual bool onTouchBegan(Touch *touch, Event *unusedEvent) override{
-            auto ret = Slider::onTouchBegan(touch, unusedEvent);
-            if(ret && _callback){
-                _touchEvent = TouchEvent::DOWN;
-                Vec2 nsp = convertToNodeSpace(_touchBeganPosition);
-                _ratio = nsp.x / _barLength;
-                if(_ratio < 0.0f)
-                    _ratio = 0.0f;
-                else if(_ratio > 1.0f)
-                    _ratio = 1.0f;
-                _callback(this,_ratio,_touchEvent);
+                Rect rect       = spriteRenderer->getTextureRect();
+                rect.size.width = _progressBarTextureSize.width * _ratio;
+                spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size);
             }
-            return ret;
         }
-        
-        virtual void onTouchMoved(Touch *touch, Event *unusedEvent) override{
-            _touchEvent = TouchEvent::MOVE;
-            Slider::onTouchMoved(touch, unusedEvent);
-            Vec2 nsp = convertToNodeSpace(_touchMovePosition);
-            _ratio = nsp.x / _barLength;
-            if(_ratio < 0.0f)
+    }
+
+    virtual bool onTouchBegan(Touch* touch, Event* unusedEvent) override
+    {
+        auto ret = Slider::onTouchBegan(touch, unusedEvent);
+        if (ret && _callback)
+        {
+            _touchEvent = TouchEvent::DOWN;
+            Vec2 nsp    = convertToNodeSpace(_touchBeganPosition);
+            _ratio      = nsp.x / _barLength;
+            if (_ratio < 0.0f)
                 _ratio = 0.0f;
-            else if(_ratio > 1.0f)
+            else if (_ratio > 1.0f)
                 _ratio = 1.0f;
-            if(_callback){
-                _callback(this,_ratio,_touchEvent);
-            }
+            _callback(this, _ratio, _touchEvent);
         }
-        
-        virtual void onTouchEnded(Touch *touch, Event *unusedEvent) override{
-            _touchEvent = TouchEvent::UP;
-            Slider::onTouchEnded(touch, unusedEvent);
-            Vec2 nsp = convertToNodeSpace(_touchEndPosition);
-            _ratio = nsp.x / _barLength;
-            if(_ratio < 0.0f)
-                _ratio = 0.0f;
-            else if(_ratio > 1.0f)
-                _ratio = 1.0f;
-            if(_callback){
-                _callback(this,_ratio,_touchEvent);
-            }
+        return ret;
+    }
+
+    virtual void onTouchMoved(Touch* touch, Event* unusedEvent) override
+    {
+        _touchEvent = TouchEvent::MOVE;
+        Slider::onTouchMoved(touch, unusedEvent);
+        Vec2 nsp = convertToNodeSpace(_touchMovePosition);
+        _ratio   = nsp.x / _barLength;
+        if (_ratio < 0.0f)
+            _ratio = 0.0f;
+        else if (_ratio > 1.0f)
+            _ratio = 1.0f;
+        if (_callback)
+        {
+            _callback(this, _ratio, _touchEvent);
         }
-        
-        virtual void onTouchCancelled(Touch *touch, Event *unusedEvent) override{
-            _touchEvent = TouchEvent::CANCEL;
-            Slider::onTouchCancelled(touch, unusedEvent);
-            
-            if(_callback){
-                _callback(this,_ratio,_touchEvent);
-            }
+    }
+
+    virtual void onTouchEnded(Touch* touch, Event* unusedEvent) override
+    {
+        _touchEvent = TouchEvent::UP;
+        Slider::onTouchEnded(touch, unusedEvent);
+        Vec2 nsp = convertToNodeSpace(_touchEndPosition);
+        _ratio   = nsp.x / _barLength;
+        if (_ratio < 0.0f)
+            _ratio = 0.0f;
+        else if (_ratio > 1.0f)
+            _ratio = 1.0f;
+        if (_callback)
+        {
+            _callback(this, _ratio, _touchEvent);
         }
-        
-    private:
-        TouchEvent _touchEvent;
-        float _ratio;
-        ccSliderExCallback _callback;
-    };
-}
+    }
+
+    virtual void onTouchCancelled(Touch* touch, Event* unusedEvent) override
+    {
+        _touchEvent = TouchEvent::CANCEL;
+        Slider::onTouchCancelled(touch, unusedEvent);
+
+        if (_callback)
+        {
+            _callback(this, _ratio, _touchEvent);
+        }
+    }
+
+private:
+    TouchEvent _touchEvent;
+    float _ratio;
+    ccSliderExCallback _callback;
+};
+}  // namespace
 
 void VibrateTestDemo::onExit()
 {
@@ -264,19 +280,17 @@ std::string VibrateTestDemo::title() const
 // VibrateControlTest
 bool VibrateControlTest::init()
 {
-    auto ret = VibrateTestDemo::init();
+    auto ret  = VibrateTestDemo::init();
     _duration = 0.1f;
-    
+
     std::string fontFilePath = "fonts/arial.ttf";
-    
+
     auto& layerSize = this->getContentSize();
 
-    auto vibrateItem = TextButton::create("vibrate", [&](TextButton* button){
-        Device::vibrate(_duration);
-    });
+    auto vibrateItem = TextButton::create("vibrate", [&](TextButton* button) { Device::vibrate(_duration); });
     vibrateItem->setPosition(layerSize.width * 0.5f, layerSize.height * 0.7f);
     addChild(vibrateItem);
-    
+
     auto durationLabelValue = StringUtils::format("duration: %.3fs", _duration);
 
     auto durationLabel = Label::createWithTTF(durationLabelValue, fontFilePath, 20);
@@ -287,21 +301,19 @@ bool VibrateControlTest::init()
 
     auto durationSlider = SliderEx::create();
     durationSlider->setPercent(0);
-    durationSlider->setCallBack([&](SliderEx* sender, float ratio, SliderEx::TouchEvent event){
-        _duration = ratio * 1.9f + 0.1f; // From 0.1s to 2s
+    durationSlider->setCallBack([&](SliderEx* sender, float ratio, SliderEx::TouchEvent event) {
+        _duration               = ratio * 1.9f + 0.1f;  // From 0.1s to 2s
         auto durationLabelValue = StringUtils::format("duration: %.3fs", _duration);
         (static_cast<Label*>(_durationLabel))->setString(durationLabelValue);
     });
     durationSlider->setPosition(Vec2(layerSize.width * 0.5f, layerSize.height * 0.35f));
     addChild(durationSlider);
     _durationSlider = durationSlider;
-        
+
     return ret;
 }
 
-VibrateControlTest::~VibrateControlTest()
-{
-}
+VibrateControlTest::~VibrateControlTest() {}
 
 std::string VibrateControlTest::title() const
 {
diff --git a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h
index fc05417e7fbb..2db3a0ec060d 100644
--- a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h
+++ b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h
@@ -26,10 +26,10 @@
 #include "platform/CCPlatformConfig.h"
 
 #ifndef __VIBRATE_TEST_H_
-#define __VIBRATE_TEST_H_
+#    define __VIBRATE_TEST_H_
 
-#include "cocos2d.h"
-#include "../BaseTest.h"
+#    include "cocos2d.h"
+#    include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(VibrateTests);
 
@@ -38,24 +38,22 @@ class VibrateTestDemo : public TestCase
 public:
     virtual std::string title() const override;
     virtual void onExit() override;
-   
 };
 
 class VibrateControlTest : public VibrateTestDemo
 {
 public:
-    CREATE_FUNC(VibrateControlTest);    
+    CREATE_FUNC(VibrateControlTest);
     virtual ~VibrateControlTest();
-    
-    virtual bool init()override;    
+
+    virtual bool init() override;
     virtual std::string title() const override;
-    
+
 private:
     float _duration = 0.f;
-    
-    void* _durationLabel = nullptr;
+
+    void* _durationLabel  = nullptr;
     void* _durationSlider = nullptr;
 };
 
-
 #endif /* defined(__VIBRATE_TEST_H_) */
diff --git a/tests/cpp-tests/Classes/VisibleRect.cpp b/tests/cpp-tests/Classes/VisibleRect.cpp
index 504a16b7d3d2..6d391c042d3c 100644
--- a/tests/cpp-tests/Classes/VisibleRect.cpp
+++ b/tests/cpp-tests/Classes/VisibleRect.cpp
@@ -45,43 +45,46 @@ Rect VisibleRect::getVisibleRect()
 Vec2 VisibleRect::left()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height/2);
+    return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y + s_visibleRect.size.height / 2);
 }
 
 Vec2 VisibleRect::right()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height/2);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width,
+                s_visibleRect.origin.y + s_visibleRect.size.height / 2);
 }
 
 Vec2 VisibleRect::top()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width / 2,
+                s_visibleRect.origin.y + s_visibleRect.size.height);
 }
 
 Vec2 VisibleRect::bottom()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width / 2, s_visibleRect.origin.y);
 }
 
 Vec2 VisibleRect::center()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width/2, s_visibleRect.origin.y+s_visibleRect.size.height/2);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width / 2,
+                s_visibleRect.origin.y + s_visibleRect.size.height / 2);
 }
 
 Vec2 VisibleRect::leftTop()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y+s_visibleRect.size.height);
+    return Vec2(s_visibleRect.origin.x, s_visibleRect.origin.y + s_visibleRect.size.height);
 }
 
 Vec2 VisibleRect::rightTop()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y+s_visibleRect.size.height);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width, s_visibleRect.origin.y + s_visibleRect.size.height);
 }
 
 Vec2 VisibleRect::leftBottom()
@@ -93,5 +96,5 @@ Vec2 VisibleRect::leftBottom()
 Vec2 VisibleRect::rightBottom()
 {
     lazyInit();
-    return Vec2(s_visibleRect.origin.x+s_visibleRect.size.width, s_visibleRect.origin.y);
+    return Vec2(s_visibleRect.origin.x + s_visibleRect.size.width, s_visibleRect.origin.y);
 }
diff --git a/tests/cpp-tests/Classes/VisibleRect.h b/tests/cpp-tests/Classes/VisibleRect.h
index 8e6b5743d1af..0f08da26d54b 100644
--- a/tests/cpp-tests/Classes/VisibleRect.h
+++ b/tests/cpp-tests/Classes/VisibleRect.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,6 +41,7 @@ class VisibleRect
     static cocos2d::Vec2 rightTop();
     static cocos2d::Vec2 leftBottom();
     static cocos2d::Vec2 rightBottom();
+
 private:
     static void lazyInit();
     static cocos2d::Rect s_visibleRect;
diff --git a/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp b/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp
index 49a79b076dd1..050152eb863f 100644
--- a/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp
+++ b/tests/cpp-tests/Classes/WindowTest/WindowTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,10 +24,12 @@
 
 #include "WindowTest.h"
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || \
+     CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
 USING_NS_CC;
 
-WindowTests::WindowTests() {
+WindowTests::WindowTests()
+{
     ADD_TEST_CASE(WindowTestWindowed1);
     ADD_TEST_CASE(WindowTestWindowed2);
     ADD_TEST_CASE(WindowTestFullscreen1);
@@ -35,27 +37,32 @@ WindowTests::WindowTests() {
     ADD_TEST_CASE(WindowTestFullscreen3);
 }
 
-std::string WindowTest::title() const {
+std::string WindowTest::title() const
+{
     return "Window Test";
 }
 
-void WindowTestWindowed1::onEnter() {
+void WindowTestWindowed1::onEnter()
+{
     WindowTest::onEnter();
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setWindowed(480, 320);
 }
 
-std::string WindowTestWindowed1::subtitle() const {
+std::string WindowTestWindowed1::subtitle() const
+{
     return "Windowed 480x320";
 }
 
-void WindowTestWindowed2::onEnter() {
+void WindowTestWindowed2::onEnter()
+{
     WindowTest::onEnter();
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setWindowed(960, 640);
 }
 
-std::string WindowTestWindowed2::subtitle() const {
+std::string WindowTestWindowed2::subtitle() const
+{
     return "Windowed 960x640";
 }
 
@@ -68,27 +75,32 @@ bool WindowTestFullscreen1::init()
     return WindowTest::init();
 }
 
-std::string WindowTestFullscreen1::subtitle() const {
+std::string WindowTestFullscreen1::subtitle() const
+{
     return "Fullscreen";
 }
 
-bool WindowTestFullscreen2::init() {
+bool WindowTestFullscreen2::init()
+{
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setFullscreen(1);
     return WindowTest::init();
 }
 
-std::string WindowTestFullscreen2::subtitle() const {
+std::string WindowTestFullscreen2::subtitle() const
+{
     return "Fullscreen Monitor 2 (if present)";
 }
 
-bool WindowTestFullscreen3::init() {
+bool WindowTestFullscreen3::init()
+{
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setFullscreen(2);
     return WindowTest::init();
 }
 
-std::string WindowTestFullscreen3::subtitle() const {
+std::string WindowTestFullscreen3::subtitle() const
+{
     return "Fullscreen Monitor 3 (if present)";
 }
 
diff --git a/tests/cpp-tests/Classes/WindowTest/WindowTest.h b/tests/cpp-tests/Classes/WindowTest/WindowTest.h
index f5ee4e734047..e1b2ab766507 100644
--- a/tests/cpp-tests/Classes/WindowTest/WindowTest.h
+++ b/tests/cpp-tests/Classes/WindowTest/WindowTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,8 +25,9 @@
 #ifndef __WINDOWTEST_H__
 #define __WINDOWTEST_H__
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
-#include "../BaseTest.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || \
+     CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
+#    include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(WindowTests);
 
diff --git a/tests/cpp-tests/Classes/ZipTest/ZipTests.cpp b/tests/cpp-tests/Classes/ZipTest/ZipTests.cpp
index 5388c1d56ee5..0d6dee7fc6a4 100644
--- a/tests/cpp-tests/Classes/ZipTest/ZipTests.cpp
+++ b/tests/cpp-tests/Classes/ZipTest/ZipTests.cpp
@@ -31,83 +31,97 @@
 
 using namespace cocos2d;
 
-ZipTests::ZipTests() {
+ZipTests::ZipTests()
+{
     ADD_TEST_CASE(UnZipNormalFile);
     ADD_TEST_CASE(UnZipWithPassword);
 }
 
-std::string ZipTest::title() const {
+std::string ZipTest::title() const
+{
     return "Unzip Test";
 }
 
-
-static void unzipTest(Label *label, const std::string &originFile, const std::string &tmpName, const std::string &zipFile, const std::string& password = "")
+static void unzipTest(Label* label,
+                      std::string_view originFile,
+                      std::string_view tmpName,
+                      std::string_view zipFile,
+                      std::string_view password = "")
 {
 
     auto fu = FileUtils::getInstance();
     cocos2d::Data origContent;
     const int BUFF_SIZE = 1024;
-    char *buff = nullptr;
+    char* buff          = nullptr;
     std::vector<char> fileData;
-    bool hasError = false;
+    bool hasError          = false;
     unz_file_info fileInfo = {0};
-    char fileName[40] = {0};
+    char fileName[40]      = {0};
 
-    auto newLocal = fu->getWritablePath() + tmpName;
-    //copy file to support android
+    std::string newLocal{fu->getWritablePath()};
+    newLocal += tmpName;
+    // copy file to support android
 
-    if(fu->isFileExist(newLocal)) {
+    if (fu->isFileExist(newLocal))
+    {
         CCLOG("Remove file %s", newLocal.c_str());
         fu->removeFile(newLocal);
     }
 
-    CCLOG("Copy %s to %s", zipFile.c_str(), newLocal.c_str());
+    CCLOG("Copy %s to %s", zipFile.data(), newLocal.c_str());
     auto writeSuccess = fu->writeDataToFile(fu->getDataFromFile(zipFile), newLocal);
-    if(!writeSuccess) {
+    if (!writeSuccess)
+    {
         label->setString("Failed to copy zip file to writable path");
         return;
     }
 
     unzFile fp = unzOpen(newLocal.c_str());
-    if(!fp) {
+    if (!fp)
+    {
         CCLOG("Failed to open zip file %s", newLocal.c_str());
         label->setString("Failed to open zip file");
         return;
     }
 
     int err = unzGoToFirstFile(fp);
-    if(err != UNZ_OK) {
+    if (err != UNZ_OK)
+    {
         label->setString("Failed to local first file");
         goto close_and_return;
     }
 
-    unzGetCurrentFileInfo(fp, &fileInfo, fileName, sizeof(fileName) -1, nullptr, 0, nullptr, 0 );
+    unzGetCurrentFileInfo(fp, &fileInfo, fileName, sizeof(fileName) - 1, nullptr, 0, nullptr, 0);
 
     CCASSERT(strncmp("10k.txt", fileName, 7) == 0, "file name should be 10k.txt");
 
-    if(password.empty())
+    if (password.empty())
     {
         err = unzOpenCurrentFile(fp);
     }
     else
     {
-        err = unzOpenCurrentFilePassword(fp, password.c_str());
+        err = unzOpenCurrentFilePassword(fp, password.data());
     }
 
-    if(err != UNZ_OK) {
+    if (err != UNZ_OK)
+    {
         label->setString("failed to open zip file");
         goto close_and_return;
     }
 
     buff = new char[BUFF_SIZE];
 
-    for(;;) {
-        int retSize =  unzReadCurrentFile(fp, buff, BUFF_SIZE);
-        if(retSize < 0) {
+    for (;;)
+    {
+        int retSize = unzReadCurrentFile(fp, buff, BUFF_SIZE);
+        if (retSize < 0)
+        {
             hasError = true;
             break;
         }
-        else if(retSize == 0) {
+        else if (retSize == 0)
+        {
             break;
         }
 
@@ -116,52 +130,59 @@ static void unzipTest(Label *label, const std::string &originFile, const std::st
 
     delete[] buff;
 
-    if(hasError) {
+    if (hasError)
+    {
         label->setString("unzip error! read error!");
         goto close_and_return;
     }
 
     origContent = FileUtils::getInstance()->getDataFromFile(originFile);
 
-    if(origContent.getSize() == fileData.size() &&
-       memcmp(origContent.getBytes(), fileData.data(), fileData.size()) == 0) {
+    if (origContent.getSize() == fileData.size() &&
+        memcmp(origContent.getBytes(), fileData.data(), fileData.size()) == 0)
+    {
         label->setString("unzip ok!");
-    } else {
+    }
+    else
+    {
         label->setString("unzip error! data mismatch!");
     }
 close_and_return:
     unzClose(fp);
 }
 
-
-void UnZipNormalFile::onEnter() {
+void UnZipNormalFile::onEnter()
+{
     TestCase::onEnter();
 
     const auto winSize = Director::getInstance()->getWinSize();
 
-    Label *label = Label::createWithTTF("unziping file", "fonts/Marker Felt.ttf", 23);
-    label->setPosition(winSize.width/2, winSize.height/2);
+    Label* label = Label::createWithTTF("unziping file", "fonts/Marker Felt.ttf", 23);
+    label->setPosition(winSize.width / 2, winSize.height / 2);
     addChild(label);
 
     unzipTest(label, "zip/10k.txt", "10-nopasswd.zip", "zip/10k-nopass.zip");
 }
 
-std::string UnZipNormalFile::subtitle() const {
+std::string UnZipNormalFile::subtitle() const
+{
     return "unzip without password";
 }
 
-void UnZipWithPassword::onEnter() {
+void UnZipWithPassword::onEnter()
+{
     TestCase::onEnter();
 
     const auto winSize = Director::getInstance()->getWinSize();
 
-    Label *label = Label::createWithTTF("unziping file", "fonts/Marker Felt.ttf", 23);
-    label->setPosition(winSize.width/2, winSize.height/2);
+    Label* label = Label::createWithTTF("unziping file", "fonts/Marker Felt.ttf", 23);
+    label->setPosition(winSize.width / 2, winSize.height / 2);
     addChild(label);
 
     unzipTest(label, "zip/10k.txt", "10.zip", "zip/10k.zip", "123456");
 }
 
-std::string UnZipWithPassword::subtitle() const {
+std::string UnZipWithPassword::subtitle() const
+{
     return "unzip with password";
 }
diff --git a/tests/cpp-tests/Classes/ZipTest/ZipTests.h b/tests/cpp-tests/Classes/ZipTest/ZipTests.h
index 623c902f0c8f..7b11581fe4aa 100644
--- a/tests/cpp-tests/Classes/ZipTest/ZipTests.h
+++ b/tests/cpp-tests/Classes/ZipTest/ZipTests.h
@@ -49,4 +49,3 @@ class UnZipWithPassword : public ZipTest
     virtual void onEnter() override;
     virtual std::string subtitle() const override;
 };
-
diff --git a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp
index 7a82a9ec4ef9..739a99b30a80 100644
--- a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp
+++ b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,31 +45,33 @@ void ZwoptexGenericTest::onEnter()
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("zwoptex/grossini.plist");
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("zwoptex/grossini-generic.plist");
-    
+
     auto layer1 = LayerColor::create(Color4B(255, 0, 0, 255), 85, 121);
-    layer1->setPosition(Vec2(s.width/2-80 - (85.0f * 0.5f), s.height/2 - (121.0f * 0.5f)));
+    layer1->setPosition(Vec2(s.width / 2 - 80 - (85.0f * 0.5f), s.height / 2 - (121.0f * 0.5f)));
     addChild(layer1);
 
-    sprite1 = Sprite::createWithSpriteFrame(SpriteFrameCache::getInstance()->getSpriteFrameByName("grossini_dance_01.png"));
-    sprite1->setPosition(Vec2( s.width/2-80, s.height/2));
+    sprite1 =
+        Sprite::createWithSpriteFrame(SpriteFrameCache::getInstance()->getSpriteFrameByName("grossini_dance_01.png"));
+    sprite1->setPosition(Vec2(s.width / 2 - 80, s.height / 2));
     addChild(sprite1);
 
     sprite1->setFlippedX(false);
     sprite1->setFlippedY(false);
 
     auto layer2 = LayerColor::create(Color4B(255, 0, 0, 255), 85, 121);
-    layer2->setPosition(Vec2(s.width/2+80 - (85.0f * 0.5f), s.height/2 - (121.0f * 0.5f)));
+    layer2->setPosition(Vec2(s.width / 2 + 80 - (85.0f * 0.5f), s.height / 2 - (121.0f * 0.5f)));
     addChild(layer2);
-    
-    sprite2 = Sprite::createWithSpriteFrame(SpriteFrameCache::getInstance()->getSpriteFrameByName("grossini_dance_generic_01.png"));
-    sprite2->setPosition(Vec2( s.width/2 + 80, s.height/2));
+
+    sprite2 = Sprite::createWithSpriteFrame(
+        SpriteFrameCache::getInstance()->getSpriteFrameByName("grossini_dance_generic_01.png"));
+    sprite2->setPosition(Vec2(s.width / 2 + 80, s.height / 2));
     addChild(sprite2);
 
     sprite2->setFlippedX(false);
     sprite2->setFlippedY(false);
 
     schedule(CC_SCHEDULE_SELECTOR(ZwoptexGenericTest::startIn05Secs), 1.0f);
-    
+
     sprite1->retain();
     sprite2->retain();
 
@@ -89,26 +91,26 @@ void ZwoptexGenericTest::flipSprites(float dt)
 
     bool fx = false;
     bool fy = false;
-    int i = counter % 4;
+    int i   = counter % 4;
 
-    switch ( i )
+    switch (i)
     {
-        case 0:
-            fx = false;
-            fy = false;
-            break;
-        case 1:
-            fx = true;
-            fy = false;
-            break;
-        case 2:
-            fx = false;
-            fy = true;
-            break;
-        case 3:
-            fx = true;
-            fy = true;
-            break;
+    case 0:
+        fx = false;
+        fy = false;
+        break;
+    case 1:
+        fx = true;
+        fy = false;
+        break;
+    case 2:
+        fx = false;
+        fy = true;
+        break;
+    case 3:
+        fx = true;
+        fy = true;
+        break;
     }
 
     sprite1->setFlippedX(fx);
@@ -116,7 +118,7 @@ void ZwoptexGenericTest::flipSprites(float dt)
     sprite1->setFlippedY(fy);
     sprite2->setFlippedY(fy);
 
-    if(++spriteFrameIndex > 14)
+    if (++spriteFrameIndex > 14)
     {
         spriteFrameIndex = 1;
     }
diff --git a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h
index 47f18f374cfa..06e498d23d67 100644
--- a/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h
+++ b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -49,9 +49,9 @@ class ZwoptexGenericTest : public ZwoptexTest
     virtual std::string subtitle() const override;
 
 protected:
-    cocos2d::Sprite*  sprite1;
-    cocos2d::Sprite*  sprite2;
+    cocos2d::Sprite* sprite1;
+    cocos2d::Sprite* sprite2;
     int counter;
 };
 
-#endif // __ZWOPTEX_TEST_H__
+#endif  // __ZWOPTEX_TEST_H__
diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp
index 4132ff6a0657..2b4acdb08acc 100644
--- a/tests/cpp-tests/Classes/controller.cpp
+++ b/tests/cpp-tests/Classes/controller.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,16 +45,15 @@ class RootTests : public TestList
     {
 //        addTest("Node: Scene3D", [](){return new Scene3DTests(); });
 #if defined(CC_PLATFORM_PC)
-        addTest("ImGuiEXT", []() {return new ImGuiEXTTests(); });
+        addTest("ImGuiEXT", []() { return new ImGuiEXTTests(); });
 #endif
-        addTest("Texture2D", []() {return new Texture2DTests(); });
-        addTest("ActionManager", [](){return new ActionManagerTests(); });
-        addTest("Actions - Basic", [](){ return new ActionsTests(); });
-        addTest("Actions - Ease", [](){return new ActionsEaseTests(); });
-        addTest("Actions - Progress", [](){return new ActionsProgressTests(); });
+        addTest("Texture2D", []() { return new Texture2DTests(); });
+        addTest("ActionManager", []() { return new ActionManagerTests(); });
+        addTest("Actions - Basic", []() { return new ActionsTests(); });
+        addTest("Actions - Ease", []() { return new ActionsEaseTests(); });
+        addTest("Actions - Progress", []() { return new ActionsProgressTests(); });
         addTest("Audio - NewAudioEngine", []() { return new AudioEngineTests(); });
 
-
         addTest("Box2D - Basic", []() { return new Box2DTests(); });
 #if defined(CC_PLATFORM_PC)
         addTest("Box2D - TestBed", []() { return new Box2DTestBedTests(); });
@@ -64,7 +63,7 @@ class RootTests : public TestList
         addTest("Chipmunk2D - TestBed", []() { return new ChipmunkTestBedTests(); });
 #endif
         addTest("Bugs", []() { return new BugsTests(); });
-        addTest("Click and Move", [](){return new ClickAndMoveTest(); });
+        addTest("Click and Move", []() { return new ClickAndMoveTest(); });
         addTest("Configuration", []() { return new ConfigurationTests(); });
         addTest("Console", []() { return new ConsoleTests(); });
         addTest("Curl", []() { return new CurlTests(); });
@@ -72,80 +71,78 @@ class RootTests : public TestList
         addTest("Network Test", []() { return new NetworkTests(); });
         addTest("EventDispatcher", []() { return new EventDispatcherTests(); });
         addTest("Effects - Advanced", []() { return new EffectAdvanceTests(); });
-        addTest("Effects - Basic", [](){return new EffectTests(); });
+        addTest("Effects - Basic", []() { return new EffectTests(); });
         addTest("Extensions", []() { return new ExtensionsTests(); });
         addTest("FileUtils", []() { return new FileUtilsTests(); });
         addTest("Fonts", []() { return new FontTests(); });
-        addTest("Interval", [](){return new IntervalTests(); });
+        addTest("Interval", []() { return new IntervalTests(); });
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
         addTest("JNIHelper", []() { return new JNITests(); });
 #endif
-        addTest("Material System", [](){return new MaterialSystemTest(); });
-        addTest("Navigation Mesh", [](){return new NavMeshTests(); });
-        addTest("Node: BillBoard Test", [](){  return new BillBoardTests(); });
-        addTest("Node: Camera3D Test", [](){  return new Camera3DTests(); });
+        addTest("Material System", []() { return new MaterialSystemTest(); });
+        addTest("Navigation Mesh", []() { return new NavMeshTests(); });
+        addTest("Node: BillBoard Test", []() { return new BillBoardTests(); });
+        addTest("Node: Camera3D Test", []() { return new Camera3DTests(); });
         addTest("Node: Clipping", []() { return new ClippingNodeTests(); });
-        addTest("Node: Draw", [](){return new DrawPrimitivesTests(); });
-        addTest("Node: Label - New API", [](){return new NewLabelTests(); });
-        addTest("Node: Layer", [](){return new LayerTests(); });
-        addTest("Node: Light", [](){return new LightTests(); });
-        addTest("Node: Menu", [](){return new MenuTests(); });
-        addTest("Node: MotionStreak", [](){return new MotionStreakTests(); });
-        addTest("Node: Node", [](){return new CocosNodeTests(); });
-        addTest("Node: Parallax", [](){return new ParallaxTests(); });
-        addTest("Node: Particles", [](){return new ParticleTests(); });
-        addTest("Node: Particle3D (PU)", [](){return new Particle3DTests(); });
+        addTest("Node: Draw", []() { return new DrawPrimitivesTests(); });
+        addTest("Node: Label - New API", []() { return new NewLabelTests(); });
+        addTest("Node: Layer", []() { return new LayerTests(); });
+        addTest("Node: Light", []() { return new LightTests(); });
+        addTest("Node: Menu", []() { return new MenuTests(); });
+        addTest("Node: MotionStreak", []() { return new MotionStreakTests(); });
+        addTest("Node: Node", []() { return new CocosNodeTests(); });
+        addTest("Node: Parallax", []() { return new ParallaxTests(); });
+        addTest("Node: Particles", []() { return new ParticleTests(); });
+        addTest("Node: Particle3D (PU)", []() { return new Particle3DTests(); });
 #if CC_USE_PHYSICS
         addTest("Node: Physics", []() { return new PhysicsTests(); });
 #endif
-        addTest("Node: Physics3D", []() { return new Physics3DTests(); } );
-        addTest("Node: RenderTexture", [](){return new RenderTextureTests(); });
-        addTest("Node: Scene", [](){return new SceneTests(); });
-        addTest("Node: Spine", [](){return new SpineTests(); });
-        addTest("Node: Sprite", [](){return new SpriteTests(); });
-        addTest("Node: Sprite3D", [](){  return new Sprite3DTests(); });
-        addTest("Node: SpritePolygon", [](){return new SpritePolygonTest(); });
-        addTest("Node: Terrain", [](){  return new TerrainTests(); });
-        addTest("Node: FastTileMap", [](){return new FastTileMapTests(); });
-        addTest("Node: Text Input", [](){return new TextInputTests(); });
-        addTest("Node: UI", [](){  return new UITests(); });
+        addTest("Node: Physics3D", []() { return new Physics3DTests(); });
+        addTest("Node: RenderTexture", []() { return new RenderTextureTests(); });
+        addTest("Node: Scene", []() { return new SceneTests(); });
+        addTest("Node: Spine", []() { return new SpineTests(); });
+        addTest("Node: Sprite", []() { return new SpriteTests(); });
+        addTest("Node: Sprite3D", []() { return new Sprite3DTests(); });
+        addTest("Node: SpritePolygon", []() { return new SpritePolygonTest(); });
+        addTest("Node: Terrain", []() { return new TerrainTests(); });
+        addTest("Node: FastTileMap", []() { return new FastTileMapTests(); });
+        addTest("Node: Text Input", []() { return new TextInputTests(); });
+        addTest("Node: UI", []() { return new UITests(); });
         addTest("Mouse", []() { return new MouseTests(); });
         addTest("MultiTouch", []() { return new MultiTouchTests(); });
         addTest("Renderer", []() { return new NewRendererTests(); });
-        addTest("ReleasePool", [](){ return new ReleasePoolTests(); });
-        addTest("Rotate World", [](){return new RotateWorldTests(); });
-        addTest("Scheduler", [](){return new SchedulerTests(); });
+        addTest("ReleasePool", []() { return new ReleasePoolTests(); });
+        addTest("Rotate World", []() { return new RotateWorldTests(); });
+        addTest("Scheduler", []() { return new SchedulerTests(); });
         addTest("Shader - Basic", []() { return new ShaderTests(); });
         addTest("Shader - Sprite", []() { return new Shader2Tests(); });
         addTest("TextureCache", []() { return new TextureCacheTests(); });
         addTest("TexturePacker Encryption", []() { return new TextureAtlasEncryptionTests(); });
-        addTest("Touches", [](){return new TouchesTests(); });
-        addTest("Transitions", [](){return new TransitionsTests(); });
+        addTest("Touches", []() { return new TouchesTests(); });
+        addTest("Transitions", []() { return new TransitionsTests(); });
         addTest("Unit Test", []() { return new UnitTests(); });
-        addTest("Unzip Test", []() {return new ZipTests();});
+        addTest("Unzip Test", []() { return new ZipTests(); });
         addTest("URL Open Test", []() { return new OpenURLTests(); });
         addTest("UserDefault", []() { return new UserDefaultTests(); });
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
         addTest("Vibrate", []() { return new VibrateTests(); });
 #endif
         addTest("Zwoptex", []() { return new ZwoptexTests(); });
-        addTest("SpriteFrameCache", []() { return new SpriteFrameCacheTests(); }); // TODO
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
-        addTest("Window Test", []() { return new WindowTests(); }); // TODO wrong effect
+        addTest("SpriteFrameCache", []() { return new SpriteFrameCacheTests(); });  // TODO
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || \
+     CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
+        addTest("Window Test", []() { return new WindowTests(); });  // TODO wrong effect
 #endif
     }
 };
 
-TestController::TestController()
-: _stopAutoTest(true)
-, _isRunInBackground(false)
-, _testSuite(nullptr)
+TestController::TestController() : _stopAutoTest(true), _isRunInBackground(false), _testSuite(nullptr)
 {
     _rootTestList = new RootTests;
     _rootTestList->runThisTest();
     _director = Director::getInstance();
 
-    _touchListener = EventListenerTouchOneByOne::create();
+    _touchListener               = EventListenerTouchOneByOne::create();
     _touchListener->onTouchBegan = CC_CALLBACK_2(TestController::blockTouchBegan, this);
     _touchListener->setSwallowTouches(true);
 
@@ -164,7 +161,7 @@ void TestController::startAutoTest()
 {
     if (!_autoTestThread.joinable())
     {
-        _stopAutoTest = false;
+        _stopAutoTest   = false;
         _logIndentation = "";
         _autoTestThread = std::thread(&TestController::traverseThreadFunc, this);
         _autoTestThread.detach();
@@ -174,8 +171,9 @@ void TestController::startAutoTest()
 void TestController::stopAutoTest()
 {
     _stopAutoTest = true;
-    
-    if (_autoTestThread.joinable()) {
+
+    if (_autoTestThread.joinable())
+    {
         _sleepCondition.notify_all();
         _autoTestThread.join();
     }
@@ -184,7 +182,7 @@ void TestController::stopAutoTest()
 void TestController::traverseThreadFunc()
 {
     std::mutex sleepMutex;
-    auto lock = std::unique_lock<std::mutex>(sleepMutex);
+    auto lock        = std::unique_lock<std::mutex>(sleepMutex);
     _sleepUniqueLock = &lock;
     traverseTestList(_rootTestList);
     _sleepUniqueLock = nullptr;
@@ -204,10 +202,11 @@ void TestController::traverseTestList(TestList* testList)
     logEx("%s%sBegin traverse TestList:%s", LOG_TAG, _logIndentation.c_str(), testList->getTestName().c_str());
 
     auto scheduler = _director->getScheduler();
-    int testIndex = 0;
+    int testIndex  = 0;
     for (auto& callback : testList->_testCallbacks)
     {
-        if (_stopAutoTest) break;
+        if (_stopAutoTest)
+            break;
         while (_isRunInBackground)
         {
             logEx("_director is paused");
@@ -220,9 +219,7 @@ void TestController::traverseTestList(TestList* testList)
             test->setTestName(testList->_childTestNames[testIndex++]);
             if (test->isTestList())
             {
-                scheduler->performFunctionInCocosThread([&](){
-                    test->runThisTest();
-                });
+                scheduler->performFunctionInCocosThread([&]() { test->runThisTest(); });
 
                 traverseTestList((TestList*)test);
             }
@@ -241,22 +238,20 @@ void TestController::traverseTestList(TestList* testList)
     {
         if (!_stopAutoTest)
         {
-            //Backs up one level and release TestList object.
-            scheduler->performFunctionInCocosThread([&](){
-                testList->_parentTest->runThisTest();
-            });
+            // Backs up one level and release TestList object.
+            scheduler->performFunctionInCocosThread([&]() { testList->_parentTest->runThisTest(); });
             _sleepCondition.wait_for(*_sleepUniqueLock, std::chrono::milliseconds(500));
             testList->release();
         }
-        
+
         _logIndentation.erase(_logIndentation.rfind(LOG_INDENTATION));
     }
 }
 
 void TestController::traverseTestSuite(TestSuite* testSuite)
 {
-    auto scheduler = _director->getScheduler();
-    int testIndex = 0;
+    auto scheduler         = _director->getScheduler();
+    int testIndex          = 0;
     float testCaseDuration = 0.0f;
     _logIndentation += LOG_INDENTATION;
     logEx("%s%sBegin traverse TestSuite:%s", LOG_TAG, _logIndentation.c_str(), testSuite->getTestName().c_str());
@@ -268,37 +263,40 @@ void TestController::traverseTestSuite(TestSuite* testSuite)
     for (auto& callback : testSuite->_testCallbacks)
     {
         auto testName = testSuite->_childTestNames[testIndex++];
-        
-        Scene* testScene = nullptr;
-        TestCase* testCase = nullptr;
+
+        Scene* testScene                 = nullptr;
+        TestCase* testCase               = nullptr;
         TransitionScene* transitionScene = nullptr;
 
-        if (_stopAutoTest) break;
+        if (_stopAutoTest)
+            break;
 
         while (_isRunInBackground)
         {
             logEx("_director is paused");
             _sleepCondition.wait_for(*_sleepUniqueLock, std::chrono::milliseconds(500));
         }
-        //Run test case in the cocos[GL] thread.
-        scheduler->performFunctionInCocosThread([&, logIndentation, testName](){
-            if (_stopAutoTest) return;
+        // Run test case in the cocos[GL] thread.
+        scheduler->performFunctionInCocosThread([&, logIndentation, testName]() {
+            if (_stopAutoTest)
+                return;
             logEx("%s%sRun test:%s.", LOG_TAG, logIndentation.c_str(), testName.c_str());
 
             auto scene = callback();
-            if (_stopAutoTest) return;
+            if (_stopAutoTest)
+                return;
 
             if (scene)
             {
                 transitionScene = dynamic_cast<TransitionScene*>(scene);
                 if (transitionScene)
                 {
-                    testCase = (TestCase*)transitionScene->getInScene();
+                    testCase         = (TestCase*)transitionScene->getInScene();
                     testCaseDuration = transitionScene->getDuration() + 0.5f;
                 }
                 else
                 {
-                    testCase = (TestCase*)scene;
+                    testCase         = (TestCase*)scene;
                     testCaseDuration = testCase->getDuration();
                 }
                 testSuite->_currTestIndex++;
@@ -310,9 +308,10 @@ void TestController::traverseTestSuite(TestSuite* testSuite)
             }
         });
 
-        if (_stopAutoTest) break;
+        if (_stopAutoTest)
+            break;
 
-        //Wait for the test case be created.
+        // Wait for the test case be created.
         float waitTime = 0.0f;
         while (!testScene && !_stopAutoTest)
         {
@@ -330,9 +329,10 @@ void TestController::traverseTestSuite(TestSuite* testSuite)
             }
         }
 
-        if (_stopAutoTest) break;
+        if (_stopAutoTest)
+            break;
 
-        //Wait for test completed.
+        // Wait for test completed.
         _sleepCondition.wait_for(*_sleepUniqueLock, std::chrono::milliseconds(int(1000 * testCaseDuration)));
 
         if (transitionScene == nullptr)
@@ -356,7 +356,7 @@ void TestController::traverseTestSuite(TestSuite* testSuite)
 
             if (!_stopAutoTest)
             {
-                //Check the result of test.
+                // Check the result of test.
                 checkTest(testCase);
             }
         }
@@ -364,11 +364,9 @@ void TestController::traverseTestSuite(TestSuite* testSuite)
 
     if (!_stopAutoTest)
     {
-        //Backs up one level and release TestSuite object.
+        // Backs up one level and release TestSuite object.
         auto parentTest = testSuite->_parentTest;
-        scheduler->performFunctionInCocosThread([&](){
-            parentTest->runThisTest();
-        });
+        scheduler->performFunctionInCocosThread([&]() { parentTest->runThisTest(); });
 
         _sleepCondition.wait_for(*_sleepUniqueLock, std::chrono::milliseconds(1000));
         testSuite->release();
@@ -434,7 +432,7 @@ void TestController::onEnterForeground()
     _isRunInBackground = false;
 }
 
-void TestController::logEx(const char * format, ...)
+void TestController::logEx(const char* format, ...)
 {
     char buff[1024];
 
@@ -447,7 +445,7 @@ void TestController::logEx(const char * format, ...)
     __android_log_print(ANDROID_LOG_DEBUG, "cocos2d-x debug info", "%s", buff);
 
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-    WCHAR wszBuf[1024] = { 0 };
+    WCHAR wszBuf[1024] = {0};
     MultiByteToWideChar(CP_UTF8, 0, buff, -1, wszBuf, sizeof(wszBuf));
     OutputDebugStringW(wszBuf);
 
@@ -492,7 +490,7 @@ bool TestController::blockTouchBegan(Touch* touch, Event* event)
 
 //==================================================================================================
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
-#include <windows.h>
+#    include <windows.h>
 
 static long __stdcall windowExceptionFilter(_EXCEPTION_POINTERS* excp)
 {
@@ -513,30 +511,18 @@ static void disableCrashCatch()
     SetUnhandledExceptionFilter(UnhandledExceptionFilter);
 }
 
-#elif CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#elif CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || \
+    CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
+#    if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 static int s_fatal_signals[] = {
-    SIGILL,
-    SIGABRT,
-    SIGBUS,
-    SIGFPE,
-    SIGSEGV,
-    SIGSTKFLT,
-    SIGPIPE,
+    SIGILL, SIGABRT, SIGBUS, SIGFPE, SIGSEGV, SIGSTKFLT, SIGPIPE,
 };
-#else
+#    else
 static int s_fatal_signals[] = {
-    SIGABRT,
-    SIGBUS,
-    SIGFPE,
-    SIGILL,
-    SIGSEGV,
-    SIGTRAP,
-    SIGTERM,
-    SIGKILL,
+    SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGTRAP, SIGTERM, SIGKILL,
 };
-#endif
+#    endif
 
 static void signalHandler(int sig)
 {
@@ -564,12 +550,8 @@ static void disableCrashCatch()
 
 #else
 
-static void initCrashCatch()
-{
-}
+static void initCrashCatch() {}
 
-static void disableCrashCatch()
-{
-}
+static void disableCrashCatch() {}
 
 #endif
diff --git a/tests/cpp-tests/Classes/controller.h b/tests/cpp-tests/Classes/controller.h
index 1d9028996a1d..37aa88cdeed9 100644
--- a/tests/cpp-tests/Classes/controller.h
+++ b/tests/cpp-tests/Classes/controller.h
@@ -37,11 +37,11 @@ class TestCase;
 
 namespace cocos2d
 {
-    class Director;
-    class Touch;
-    class Event;
-    class EventListenerTouchOneByOne;
-}
+class Director;
+class Touch;
+class Event;
+class EventListenerTouchOneByOne;
+}  // namespace cocos2d
 
 class TestController
 {
@@ -64,6 +64,7 @@ class TestController
     void setCurrTestSuite(TestSuite* testSuite) { _testSuite = testSuite; }
     TestSuite* getCurrTestSuite() { return _testSuite; }
     bool isAutoTestRunning() const { return !_stopAutoTest; }
+
 private:
     TestController();
 
@@ -73,7 +74,7 @@ class TestController
     void traverseTestSuite(TestSuite* testSuite);
     bool checkTest(TestCase* testCase);
 
-    void logEx(const char * format, ...);
+    void logEx(const char* format, ...);
 
     std::atomic<bool> _stopAutoTest;
     bool _isRunInBackground;
diff --git a/tests/cpp-tests/Classes/testBasic.h b/tests/cpp-tests/Classes/testBasic.h
index 000123162fe5..1907aa629d62 100644
--- a/tests/cpp-tests/Classes/testBasic.h
+++ b/tests/cpp-tests/Classes/testBasic.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -30,13 +30,13 @@
 #include "VisibleRect.h"
 
 /**
-* TestScene is retained for compatibility with older versions.
-* @warning It should soon be removed.
-*/
+ * TestScene is retained for compatibility with older versions.
+ * @warning It should soon be removed.
+ */
 class TestScene : public cocos2d::Scene
 {
-public: 
-    TestScene(bool bPortrait = false, bool physics = false){}
+public:
+    TestScene(bool bPortrait = false, bool physics = false) {}
     virtual void onEnter() override {}
 
     virtual void runThisTest() = 0;
@@ -44,7 +44,12 @@ class TestScene : public cocos2d::Scene
 
 // C++ 11
 
-#define CL(__className__) [](){ return __className__::create();}
-#define CLN(__className__) [](){ auto obj = new __className__(); obj->autorelease(); return obj; }
+#define CL(__className__) []() { return __className__::create(); }
+#define CLN(__className__)              \
+    []() {                              \
+        auto obj = new __className__(); \
+        obj->autorelease();             \
+        return obj;                     \
+    }
 
 #endif
diff --git a/tests/cpp-tests/Classes/testResource.h b/tests/cpp-tests/Classes/testResource.h
index 8e9a10c5e627..1e1454f0239a 100644
--- a/tests/cpp-tests/Classes/testResource.h
+++ b/tests/cpp-tests/Classes/testResource.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,48 +25,48 @@
 #ifndef _TEST_RESOURCE_H_
 #define _TEST_RESOURCE_H_
 
-static const char s_pathGrossini[]       = "Images/grossini.png";
-static const char s_pathSister1[]        = "Images/grossinis_sister1.png";
-static const char s_pathSister2[]        = "Images/grossinis_sister2.png";
-static const char s_pathB1[]             = "Images/b1.png";
-static const char s_pathB2[]             = "Images/b2.png";
-static const char s_pathR1[]             = "Images/r1.png";
-static const char s_pathR2[]             = "Images/r2.png";
-static const char s_pathF1[]             = "Images/f1.png";
-static const char s_pathF2[]             = "Images/f2.png";
-static const char s_pathBlock[]          = "Images/blocks.png";
-static const char s_back[]                = "Images/background.png";
-static const char s_back1[]               = "Images/background1.png";
-static const char s_back2[]               = "Images/background2.png";
-static const char s_back3[]               = "Images/background3.png";
-static const char s_stars1[]              = "Images/stars.png";
-static const char s_stars2[]              = "Images/stars2.png";
-static const char s_fire[]                = "Images/fire.png";
-static const char s_snow[]                = "Images/snow.png";
-static const char s_streak[]              = "Images/streak.png";
-static const char s_PlayNormal[]          = "Images/btn-play-normal.png";
-static const char s_PlaySelect[]          = "Images/btn-play-selected.png";
-static const char s_AboutNormal[]         = "Images/btn-about-normal.png";
-static const char s_AboutSelect[]         = "Images/btn-about-selected.png";
-static const char s_HighNormal[]          = "Images/btn-highscores-normal.png";
-static const char s_HighSelect[]          = "Images/btn-highscores-selected.png";
-static const char s_Ball[]                = "Images/ball.png";
-static const char s_Paddle[]              = "Images/paddle.png";
-static const char s_pathClose[]          = "Images/close.png";
-static const char s_MenuItem[]            = "Images/menuitemsprite.png";
-static const char s_SendScore[]           = "Images/SendScoreButton.png";
-static const char s_PressSendScore[]      = "Images/SendScoreButtonPressed.png";
-static const char s_Power[]               = "Images/powered.png";
-static const char s_AtlasTest[]           = "Images/atlastest.png";
+static const char s_pathGrossini[]   = "Images/grossini.png";
+static const char s_pathSister1[]    = "Images/grossinis_sister1.png";
+static const char s_pathSister2[]    = "Images/grossinis_sister2.png";
+static const char s_pathB1[]         = "Images/b1.png";
+static const char s_pathB2[]         = "Images/b2.png";
+static const char s_pathR1[]         = "Images/r1.png";
+static const char s_pathR2[]         = "Images/r2.png";
+static const char s_pathF1[]         = "Images/f1.png";
+static const char s_pathF2[]         = "Images/f2.png";
+static const char s_pathBlock[]      = "Images/blocks.png";
+static const char s_back[]           = "Images/background.png";
+static const char s_back1[]          = "Images/background1.png";
+static const char s_back2[]          = "Images/background2.png";
+static const char s_back3[]          = "Images/background3.png";
+static const char s_stars1[]         = "Images/stars.png";
+static const char s_stars2[]         = "Images/stars2.png";
+static const char s_fire[]           = "Images/fire.png";
+static const char s_snow[]           = "Images/snow.png";
+static const char s_streak[]         = "Images/streak.png";
+static const char s_PlayNormal[]     = "Images/btn-play-normal.png";
+static const char s_PlaySelect[]     = "Images/btn-play-selected.png";
+static const char s_AboutNormal[]    = "Images/btn-about-normal.png";
+static const char s_AboutSelect[]    = "Images/btn-about-selected.png";
+static const char s_HighNormal[]     = "Images/btn-highscores-normal.png";
+static const char s_HighSelect[]     = "Images/btn-highscores-selected.png";
+static const char s_Ball[]           = "Images/ball.png";
+static const char s_Paddle[]         = "Images/paddle.png";
+static const char s_pathClose[]      = "Images/close.png";
+static const char s_MenuItem[]       = "Images/menuitemsprite.png";
+static const char s_SendScore[]      = "Images/SendScoreButton.png";
+static const char s_PressSendScore[] = "Images/SendScoreButtonPressed.png";
+static const char s_Power[]          = "Images/powered.png";
+static const char s_AtlasTest[]      = "Images/atlastest.png";
 
 // tilemaps resource
-static const char s_TilesPng[]            = "TileMaps/tiles.png";
-static const char s_LevelMapTga[]         = "TileMaps/levelmap.tga";
+static const char s_TilesPng[]    = "TileMaps/tiles.png";
+static const char s_LevelMapTga[] = "TileMaps/levelmap.tga";
 
 // Scale9Sprite resource
-static const char s_s9s_blocks9[]         = "Images/blocks9ss.png";
-static const char s_s9s_blocks9_plist[]   = "Images/blocks9ss.plist";
-static const char s_s9s_ui[]              = "Images/ui.png";
-static const char s_s9s_ui_plist[]        = "Images/ui.plist";
+static const char s_s9s_blocks9[]       = "Images/blocks9ss.png";
+static const char s_s9s_blocks9_plist[] = "Images/blocks9ss.plist";
+static const char s_s9s_ui[]            = "Images/ui.png";
+static const char s_s9s_ui_plist[]      = "Images/ui.plist";
 
 #endif
diff --git a/tests/cpp-tests/Classes/tests.h b/tests/cpp-tests/Classes/tests.h
index bb05d67b0948..e54046b6e986 100644
--- a/tests/cpp-tests/Classes/tests.h
+++ b/tests/cpp-tests/Classes/tests.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,33 +25,32 @@
 #ifndef _TESTS_H_
 #define _TESTS_H_
 
-
 #include "Box2DTest/Box2dTest.h"
 #include "Box2DTestBed/Box2DTestBed.h"
 
-
 #include "ChipmunkTest/ChipmunkTest.h"
 #if defined(CC_PLATFORM_PC)
-#include "ChipmunkTestBed/ChipmunkTestBed.h"
+#    include "ChipmunkTestBed/ChipmunkTestBed.h"
 #endif
 
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
-#include "ClippingNodeTest/ClippingNodeTest.h"
+#    include "ClippingNodeTest/ClippingNodeTest.h"
 #endif
 #include "NewAudioEngineTest/NewAudioEngineTest.h"
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPEN)
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
+#    if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
 // bada don't support libcurl
-#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
-#include "CurlTest/CurlTest.h"
-#endif
-#endif
+#        if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
+#            include "CurlTest/CurlTest.h"
+#        endif
+#    endif
 #endif
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-#include "JNITest/JNITest.h"
+#    include "JNITest/JNITest.h"
 #endif
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
-#include "WindowTest/WindowTest.h"
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || \
+     CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
+#    include "WindowTest/WindowTest.h"
 #endif
 
 // sort them alphabetically. thanks
@@ -121,6 +120,6 @@
 #include "SpriteFrameCacheTest/SpriteFrameCacheTest.h"
 #include "ZipTest/ZipTests.h"
 #if defined(CC_PLATFORM_PC)
-#include "ImGuiEXTTest/ImGuiEXTTest.h"
+#    include "ImGuiEXTTest/ImGuiEXTTest.h"
 #endif
 #endif
diff --git a/tests/cpp-tests/Resources/audio/GAME_END.WAV b/tests/cpp-tests/Resources/audio/GAME_END.WAV
new file mode 100644
index 000000000000..2cd195115cb4
Binary files /dev/null and b/tests/cpp-tests/Resources/audio/GAME_END.WAV differ
diff --git a/tests/cpp-tests/Resources/audio/Roll.mp3 b/tests/cpp-tests/Resources/audio/Roll.mp3
new file mode 100644
index 000000000000..149b2334b826
Binary files /dev/null and b/tests/cpp-tests/Resources/audio/Roll.mp3 differ
diff --git a/tests/cpp-tests/Resources/audio/Roll.wav b/tests/cpp-tests/Resources/audio/Roll.wav
new file mode 100644
index 000000000000..40ad07d31f08
Binary files /dev/null and b/tests/cpp-tests/Resources/audio/Roll.wav differ
diff --git a/tests/cpp-tests/Resources/audio/battle_bgm2.mp3 b/tests/cpp-tests/Resources/audio/battle_bgm2.mp3
new file mode 100644
index 000000000000..cea00a41d196
Binary files /dev/null and b/tests/cpp-tests/Resources/audio/battle_bgm2.mp3 differ
diff --git a/tests/cpp-tests/Resources/spine/11105.atlas b/tests/cpp-tests/Resources/spine/11105.atlas
new file mode 100644
index 000000000000..4b97dc5a1da9
--- /dev/null
+++ b/tests/cpp-tests/Resources/spine/11105.atlas
@@ -0,0 +1,860 @@
+
+11105.png
+size: 1409,1409
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+a/zhuj_00001
+  rotate: true
+  xy: 384, 206
+  size: 71, 76
+  orig: 960, 540
+  offset: 527, 321
+  index: -1
+a/zhuj_00002
+  rotate: false
+  xy: 197, 566
+  size: 136, 281
+  orig: 960, 540
+  offset: 553, 93
+  index: -1
+a/zhuj_00003
+  rotate: true
+  xy: 801, 1224
+  size: 183, 308
+  orig: 960, 540
+  offset: 503, 37
+  index: -1
+a/zhuj_00004
+  rotate: false
+  xy: 2, 232
+  size: 187, 308
+  orig: 960, 540
+  offset: 499, 35
+  index: -1
+a/zhuj_00005
+  rotate: true
+  xy: 492, 1218
+  size: 189, 307
+  orig: 960, 540
+  offset: 496, 33
+  index: -1
+a/zhuj_00006
+  rotate: false
+  xy: 2, 542
+  size: 193, 305
+  orig: 960, 540
+  offset: 492, 32
+  index: -1
+a/zhuj_00007
+  rotate: false
+  xy: 294, 1104
+  size: 196, 303
+  orig: 960, 540
+  offset: 488, 30
+  index: -1
+a/zhuj_00008
+  rotate: true
+  xy: 1111, 1208
+  size: 199, 295
+  orig: 960, 540
+  offset: 484, 29
+  index: -1
+a/zhuj_00009
+  rotate: true
+  xy: 1100, 1006
+  size: 200, 274
+  orig: 960, 540
+  offset: 481, 27
+  index: -1
+a/zhuj_00010
+  rotate: true
+  xy: 460, 872
+  size: 197, 257
+  orig: 960, 540
+  offset: 479, 27
+  index: -1
+a/zhuj_00011
+  rotate: false
+  xy: 477, 620
+  size: 193, 250
+  orig: 960, 540
+  offset: 478, 27
+  index: -1
+a/zhuj_00012
+  rotate: false
+  xy: 273, 849
+  size: 185, 233
+  orig: 960, 540
+  offset: 482, 28
+  index: -1
+a/zhuj_00013
+  rotate: true
+  xy: 649, 282
+  size: 160, 213
+  orig: 960, 540
+  offset: 492, 31
+  index: -1
+a/zhuj_00014
+  rotate: true
+  xy: 864, 293
+  size: 124, 171
+  orig: 960, 540
+  offset: 514, 42
+  index: -1
+a/zhuj_00015
+  rotate: false
+  xy: 1326, 879
+  size: 81, 125
+  orig: 960, 540
+  offset: 556, 84
+  index: -1
+body
+  rotate: false
+  xy: 2, 1084
+  size: 290, 323
+  orig: 302, 323
+  offset: 12, 0
+  index: -1
+body_back
+  rotate: true
+  xy: 929, 419
+  size: 141, 153
+  orig: 141, 153
+  offset: 0, 0
+  index: -1
+canying/s1
+  rotate: false
+  xy: 516, 146
+  size: 125, 142
+  orig: 125, 142
+  offset: 0, 0
+  index: -1
+canying/s3
+  rotate: false
+  xy: 643, 150
+  size: 135, 130
+  orig: 135, 130
+  offset: 0, 0
+  index: -1
+canying/s4
+  rotate: true
+  xy: 292, 9
+  size: 158, 106
+  orig: 158, 106
+  offset: 0, 0
+  index: -1
+canying/s5
+  rotate: false
+  xy: 1221, 135
+  size: 146, 107
+  orig: 146, 107
+  offset: 0, 0
+  index: -1
+canying/s6
+  rotate: true
+  xy: 516, 7
+  size: 137, 106
+  orig: 137, 106
+  offset: 0, 0
+  index: -1
+eyefire/eyefire_00000
+  rotate: false
+  xy: 1326, 851
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00001
+  rotate: false
+  xy: 1326, 851
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00002
+  rotate: true
+  xy: 1381, 623
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00003
+  rotate: false
+  xy: 365, 566
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00004
+  rotate: false
+  xy: 757, 2
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00005
+  rotate: true
+  xy: 325, 1091
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00006
+  rotate: true
+  xy: 325, 1091
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00007
+  rotate: false
+  xy: 1376, 1148
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00008
+  rotate: true
+  xy: 777, 1042
+  size: 12, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00009
+  rotate: false
+  xy: 191, 243
+  size: 12, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00010
+  rotate: false
+  xy: 941, 814
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00011
+  rotate: false
+  xy: 941, 814
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00012
+  rotate: true
+  xy: 197, 552
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00013
+  rotate: false
+  xy: 649, 457
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00014
+  rotate: false
+  xy: 1214, 381
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00015
+  rotate: false
+  xy: 1368, 349
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00016
+  rotate: false
+  xy: 757, 31
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00017
+  rotate: true
+  xy: 864, 210
+  size: 11, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00018
+  rotate: false
+  xy: 349, 193
+  size: 11, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00019
+  rotate: true
+  xy: 901, 793
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00020
+  rotate: true
+  xy: 1180, 34
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00021
+  rotate: true
+  xy: 1180, 34
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00022
+  rotate: false
+  xy: 1381, 593
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00023
+  rotate: false
+  xy: 335, 566
+  size: 13, 27
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00024
+  rotate: false
+  xy: 1204, 209
+  size: 13, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00025
+  rotate: false
+  xy: 1137, 139
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00026
+  rotate: false
+  xy: 1137, 139
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00027
+  rotate: true
+  xy: 294, 1089
+  size: 13, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00028
+  rotate: false
+  xy: 1376, 1177
+  size: 13, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00029
+  rotate: false
+  xy: 762, 1041
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00030
+  rotate: true
+  xy: 777, 1056
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00031
+  rotate: true
+  xy: 777, 1056
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00032
+  rotate: false
+  xy: 350, 566
+  size: 13, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00033
+  rotate: false
+  xy: 1395, 594
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00034
+  rotate: false
+  xy: 1395, 565
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00035
+  rotate: false
+  xy: 1381, 564
+  size: 12, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00036
+  rotate: false
+  xy: 1381, 564
+  size: 12, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00037
+  rotate: false
+  xy: 1391, 1179
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+hair_t
+  rotate: false
+  xy: 492, 1071
+  size: 313, 145
+  orig: 313, 145
+  offset: 0, 0
+  index: -1
+head
+  rotate: true
+  xy: 1269, 380
+  size: 145, 138
+  orig: 145, 138
+  offset: 0, 0
+  index: -1
+head_beard_b
+  rotate: false
+  xy: 780, 142
+  size: 113, 66
+  orig: 113, 66
+  offset: 0, 0
+  index: -1
+head_beard_f
+  rotate: false
+  xy: 989, 24
+  size: 96, 95
+  orig: 96, 95
+  offset: 0, 0
+  index: -1
+headmouth
+  rotate: false
+  xy: 385, 279
+  size: 86, 55
+  orig: 86, 55
+  offset: 0, 0
+  index: -1
+l_arm
+  rotate: true
+  xy: 1087, 24
+  size: 95, 91
+  orig: 96, 92
+  offset: 1, 1
+  index: -1
+l_armour
+  rotate: true
+  xy: 888, 31
+  size: 91, 99
+  orig: 92, 100
+  offset: 1, 0
+  index: -1
+l_beard
+  rotate: true
+  xy: 1018, 121
+  size: 46, 117
+  orig: 46, 117
+  offset: 0, 0
+  index: -1
+l_ear
+  rotate: true
+  xy: 864, 419
+  size: 23, 51
+  orig: 23, 51
+  offset: 0, 0
+  index: -1
+l_eye
+  rotate: false
+  xy: 285, 224
+  size: 9, 8
+  orig: 9, 8
+  offset: 0, 0
+  index: -1
+l_finger_a
+  rotate: false
+  xy: 1180, 48
+  size: 94, 85
+  orig: 94, 85
+  offset: 0, 0
+  index: -1
+l_finger_b
+  rotate: true
+  xy: 317, 224
+  size: 73, 65
+  orig: 73, 65
+  offset: 0, 0
+  index: -1
+l_finger_c
+  rotate: true
+  xy: 224, 169
+  size: 63, 59
+  orig: 63, 59
+  offset: 0, 0
+  index: -1
+l_finger_d
+  rotate: true
+  xy: 1350, 62
+  size: 71, 49
+  orig: 71, 49
+  offset: 0, 0
+  index: -1
+l_hand
+  rotate: true
+  xy: 624, 2
+  size: 117, 76
+  orig: 118, 76
+  offset: 0, 0
+  index: -1
+l_leg
+  rotate: true
+  xy: 672, 683
+  size: 160, 227
+  orig: 160, 227
+  offset: 0, 0
+  index: -1
+l_upparm
+  rotate: true
+  xy: 1092, 851
+  size: 153, 232
+  orig: 153, 232
+  offset: 0, 0
+  index: -1
+lock
+  rotate: false
+  xy: 1034, 169
+  size: 168, 68
+  orig: 168, 68
+  offset: 0, 0
+  index: -1
+lock_2
+  rotate: false
+  xy: 864, 223
+  size: 168, 68
+  orig: 168, 68
+  offset: 0, 0
+  index: -1
+r_arm
+  rotate: false
+  xy: 477, 290
+  size: 170, 196
+  orig: 170, 196
+  offset: 0, 0
+  index: -1
+r_armour_t
+  rotate: false
+  xy: 719, 845
+  size: 234, 187
+  orig: 234, 187
+  offset: 0, 0
+  index: -1
+r_armour_u
+  rotate: true
+  xy: 477, 488
+  size: 130, 193
+  orig: 130, 193
+  offset: 0, 0
+  index: -1
+r_beard
+  rotate: true
+  xy: 925, 562
+  size: 83, 158
+  orig: 83, 158
+  offset: 0, 0
+  index: -1
+r_ear
+  rotate: true
+  xy: 779, 43
+  size: 97, 107
+  orig: 97, 107
+  offset: 0, 0
+  index: -1
+r_ear_ringa
+  rotate: true
+  xy: 1018, 175
+  size: 15, 14
+  orig: 15, 14
+  offset: 0, 0
+  index: -1
+r_ear_ringb
+  rotate: false
+  xy: 901, 807
+  size: 38, 36
+  orig: 38, 36
+  offset: 0, 0
+  index: -1
+r_ear_ringb_s
+  rotate: false
+  xy: 719, 1034
+  size: 41, 35
+  orig: 41, 35
+  offset: 0, 0
+  index: -1
+r_ear_s
+  rotate: false
+  xy: 238, 234
+  size: 77, 67
+  orig: 78, 67
+  offset: 1, 0
+  index: -1
+r_eye
+  rotate: true
+  xy: 1018, 192
+  size: 29, 14
+  orig: 30, 14
+  offset: 1, 0
+  index: -1
+r_eye_hurt
+  rotate: true
+  xy: 672, 845
+  size: 25, 38
+  orig: 25, 39
+  offset: 0, 0
+  index: -1
+r_finger_a
+  rotate: false
+  xy: 224, 7
+  size: 66, 160
+  orig: 66, 161
+  offset: 0, 1
+  index: -1
+r_finger_b
+  rotate: true
+  xy: 1037, 313
+  size: 97, 175
+  orig: 98, 176
+  offset: 0, 0
+  index: -1
+r_finger_c
+  rotate: true
+  xy: 1085, 527
+  size: 108, 210
+  orig: 109, 211
+  offset: 0, 1
+  index: -1
+r_finger_d
+  rotate: true
+  xy: 1092, 637
+  size: 78, 226
+  orig: 78, 226
+  offset: 0, 0
+  index: -1
+r_hand
+  rotate: false
+  xy: 1084, 412
+  size: 183, 113
+  orig: 183, 113
+  offset: 0, 0
+  index: -1
+r_leg
+  rotate: false
+  xy: 2, 849
+  size: 269, 233
+  orig: 269, 233
+  offset: 0, 0
+  index: -1
+r_upparm
+  rotate: false
+  xy: 807, 1034
+  size: 291, 188
+  orig: 291, 188
+  offset: 0, 0
+  index: -1
+skill/0
+  rotate: false
+  xy: 1297, 527
+  size: 82, 108
+  orig: 267, 145
+  offset: 130, 18
+  index: -1
+skill/1
+  rotate: true
+  xy: 400, 14
+  size: 153, 114
+  orig: 267, 145
+  offset: 43, 0
+  index: -1
+skill/10
+  rotate: false
+  xy: 1276, 48
+  size: 72, 85
+  orig: 267, 145
+  offset: 93, 30
+  index: -1
+skill/11
+  rotate: false
+  xy: 702, 62
+  size: 75, 86
+  orig: 267, 145
+  offset: 92, 30
+  index: -1
+skill/12
+  rotate: false
+  xy: 1221, 244
+  size: 145, 134
+  orig: 267, 145
+  offset: 56, 11
+  index: -1
+skill/13
+  rotate: true
+  xy: 955, 787
+  size: 245, 135
+  orig: 267, 145
+  offset: 11, 10
+  index: -1
+skill/14
+  rotate: false
+  xy: 1092, 717
+  size: 249, 132
+  orig: 267, 145
+  offset: 9, 12
+  index: -1
+skill/15
+  rotate: false
+  xy: 672, 556
+  size: 251, 125
+  orig: 267, 145
+  offset: 8, 15
+  index: -1
+skill/16
+  rotate: false
+  xy: 672, 444
+  size: 255, 110
+  orig: 267, 145
+  offset: 6, 22
+  index: -1
+skill/17
+  rotate: true
+  xy: 385, 336
+  size: 257, 90
+  orig: 267, 145
+  offset: 5, 34
+  index: -1
+skill/18
+  rotate: true
+  xy: 238, 303
+  size: 261, 90
+  orig: 267, 145
+  offset: 3, 34
+  index: -1
+skill/19
+  rotate: true
+  xy: 330, 299
+  size: 265, 53
+  orig: 267, 145
+  offset: 1, 62
+  index: -1
+skill/2
+  rotate: false
+  xy: 895, 124
+  size: 121, 97
+  orig: 267, 145
+  offset: 58, 12
+  index: -1
+skill/20
+  rotate: true
+  xy: 191, 273
+  size: 267, 45
+  orig: 267, 145
+  offset: 0, 68
+  index: -1
+skill/3
+  rotate: true
+  xy: 1320, 637
+  size: 78, 79
+  orig: 267, 145
+  offset: 76, 27
+  index: -1
+skill/4
+  rotate: true
+  xy: 285, 171
+  size: 51, 62
+  orig: 267, 145
+  offset: 103, 37
+  index: -1
+skill/5
+  rotate: false
+  xy: 1350, 6
+  size: 55, 54
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/6
+  rotate: false
+  xy: 702, 2
+  size: 53, 58
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/7
+  rotate: false
+  xy: 1343, 722
+  size: 52, 73
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/8
+  rotate: false
+  xy: 1343, 797
+  size: 60, 80
+  orig: 267, 145
+  offset: 103, 32
+  index: -1
+skill/9
+  rotate: true
+  xy: 780, 210
+  size: 70, 82
+  orig: 267, 145
+  offset: 94, 31
+  index: -1
+skirt_b
+  rotate: false
+  xy: 925, 647
+  size: 165, 138
+  orig: 165, 138
+  offset: 0, 0
+  index: -1
+skirt_f
+  rotate: false
+  xy: 335, 595
+  size: 140, 252
+  orig: 140, 252
+  offset: 0, 0
+  index: -1
+tail
+  rotate: true
+  xy: 2, 4
+  size: 226, 220
+  orig: 226, 220
+  offset: 0, 0
+  index: -1
+tail_b
+  rotate: false
+  xy: 1037, 239
+  size: 182, 72
+  orig: 182, 72
+  offset: 0, 0
+  index: -1
diff --git a/tests/cpp-tests/Resources/spine/11105.json b/tests/cpp-tests/Resources/spine/11105.json
new file mode 100644
index 000000000000..b70bb7207637
--- /dev/null
+++ b/tests/cpp-tests/Resources/spine/11105.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"EZgfrt9Q9UH4oPUnOQvGv/BXWBQ","spine":"3.8.95","x":-813.41,"y":-212.14,"width":2272.03,"height":2447.02,"images":"./images/","audio":"E:/正在制作中/芬里尔"},"bones":[{"name":"root"},{"name":"bodyroot","parent":"root","scaleX":0.5,"scaleY":0.5},{"name":"body","parent":"bodyroot","length":177.73,"rotation":82.1,"x":82.98,"y":475.22,"color":"0000ffff"},{"name":"body2","parent":"body","length":241.58,"rotation":-28.67,"x":177.73,"color":"0000ffff"},{"name":"l_upparm","parent":"body2","length":153.97,"rotation":-139.16,"x":228.65,"y":-180.36,"color":"0000ffff"},{"name":"l_upparm2","parent":"l_upparm","length":223.22,"rotation":-34.8,"x":153.97,"color":"0000ffff"},{"name":"l_armour","parent":"l_upparm2","length":121.38,"rotation":54.27,"x":224.35,"y":1.51,"color":"0000ffff"},{"name":"lhand","parent":"bodyroot","rotation":-66.25,"x":336.2,"y":268.79,"color":"0000ffff"},{"name":"l_hand","parent":"lhand","length":155.21,"rotation":16.9,"x":1.02,"y":-0.45,"color":"0000ffff"},{"name":"l_finger_a","parent":"l_hand","length":123.4,"rotation":51.42,"x":67.26,"y":27.18,"color":"0000ffff"},{"name":"l_finger_a2","parent":"l_finger_a","length":97.57,"rotation":-62,"x":124.51,"y":-0.04,"color":"0000ffff"},{"name":"l_finger_b","parent":"l_hand","length":76.3,"rotation":7.31,"x":200.91,"y":31.05,"color":"0000ffff"},{"name":"l_finger_b2","parent":"l_finger_b","length":64.11,"rotation":-75.85,"x":76.3,"color":"0000ffff"},{"name":"l_finger_c","parent":"l_hand","length":70.21,"rotation":-45.18,"x":160.62,"y":-19.28,"color":"0000ffff"},{"name":"l_finger_c2","parent":"l_finger_c","length":68.53,"rotation":-68.5,"x":70.21,"color":"0000ffff"},{"name":"l_finger_d","parent":"l_hand","length":85.66,"rotation":-87.22,"x":124.69,"y":-44.08,"color":"0000ffff"},{"name":"l_finger_d2","parent":"l_finger_d","length":65.02,"rotation":-76.57,"x":85.66,"color":"0000ffff"},{"name":"r_upparm","parent":"body2","length":179.64,"rotation":138.9,"x":235.44,"y":186.79,"color":"0000ffff"},{"name":"r_upparm2","parent":"r_upparm","length":352.22,"rotation":16.52,"x":179.64,"color":"0000ffff"},{"name":"r_arm","parent":"r_upparm2","length":205.31,"rotation":66.89,"x":351.56,"y":-1.2,"color":"0000ffff"},{"name":"rhand","parent":"bodyroot","rotation":-84.25,"x":-365.78,"y":540.34,"color":"0000ffff"},{"name":"r_hand","parent":"rhand","length":129.6,"rotation":0.32,"x":1.36,"y":-0.14,"color":"0000ffff"},{"name":"r_finger_a","parent":"r_hand","length":216.23,"rotation":-11.53,"x":31.12,"y":141.46,"color":"0000ffff"},{"name":"r_finger_b","parent":"r_hand","length":199.56,"rotation":6.63,"x":-15.93,"y":-93.44,"color":"0000ffff"},{"name":"r_finger_c","parent":"r_hand","length":244.47,"rotation":6.56,"x":69.12,"y":-149.36,"color":"0000ffff"},{"name":"r_finger_d","parent":"r_hand","length":234.37,"rotation":-12.12,"x":113.12,"y":-202.3,"color":"0000ffff"},{"name":"head","parent":"body2","length":140.56,"rotation":-11,"x":240.46,"y":-1.18,"color":"0000ffff"},{"name":"r_ear","parent":"head","length":110.31,"rotation":78.26,"x":135.56,"y":-69.9,"color":"0000ffff"},{"name":"r_ear2","parent":"r_ear","length":127.52,"rotation":9.9,"x":110.31,"color":"0000ffff"},{"name":"l_ear","parent":"head","length":49.88,"rotation":55.53,"x":236.87,"y":-130.4,"color":"0000ffff"},{"name":"l_ear2","parent":"l_ear","length":44.37,"rotation":-19.53,"x":49.88,"color":"0000ffff"},{"name":"hair_t","parent":"head","length":161.15,"rotation":102.8,"x":226.83,"y":-89.39,"color":"ffff00ff"},{"name":"hair_t2","parent":"hair_t","length":161.66,"rotation":26.68,"x":161.15,"color":"ffff00ff"},{"name":"hair_t3","parent":"hair_t2","length":145.45,"rotation":4.97,"x":161.66,"color":"ffff00ff"},{"name":"hair_t4","parent":"hair_t3","length":126.46,"rotation":3.12,"x":145.45,"color":"ffff00ff"},{"name":"hair_t5","parent":"hair_t4","length":41.55,"rotation":-72,"x":126.46,"color":"ffff00ff"},{"name":"hair_t6","parent":"hair_t","length":45.45,"rotation":-55.24,"x":105.17,"y":-54.49,"color":"ffff00ff"},{"name":"hair_t7","parent":"hair_t6","length":45.25,"rotation":-36.12,"x":45.45,"color":"ffff00ff"},{"name":"hair_t8","parent":"hair_t2","length":41.68,"rotation":-50.49,"x":77.2,"y":-72.86,"color":"ffff00ff"},{"name":"hair_t9","parent":"hair_t3","length":45.54,"rotation":-46.28,"x":58.31,"y":-53.23,"color":"ffff00ff"},{"name":"hair_t10","parent":"hair_t3","length":52.14,"rotation":83.3,"x":53.88,"y":100.89,"color":"ffff00ff"},{"name":"hair_t11","parent":"hair_t2","length":73.36,"rotation":33.61,"x":70.23,"y":102.78,"color":"ffff00ff"},{"name":"r_eye","parent":"head","length":55.66,"rotation":117.62,"x":162.34,"y":-173.01},{"name":"l_eye","parent":"head","length":19.01,"rotation":-8.36,"x":186.18,"y":-200.45},{"name":"head2","parent":"head","length":110.58,"rotation":-77.71,"x":140.45,"y":-199.34,"color":"0000ffff"},{"name":"headbeard_b","parent":"head","length":84.61,"rotation":141.54,"x":125.94,"y":-206.96,"color":"ffff00ff"},{"name":"headbeard_b2","parent":"headbeard_b","length":59.45,"rotation":16.25,"x":84.61,"color":"ffff00ff"},{"name":"headbeard_b3","parent":"headbeard_b2","length":32.2,"rotation":22.93,"x":59.45,"color":"ffff00ff"},{"name":"r_eye3","parent":"r_eye","x":23.27,"y":0.16},{"name":"r_ear_s","parent":"head","length":107.77,"rotation":93.23,"x":116.77,"y":-59.98,"color":"002d6cff"},{"name":"r_ear_ring_b","parent":"r_ear","length":70.73,"rotation":107.11,"x":65.47,"y":42.89,"color":"ff0000ff"},{"name":"r_ear_ringb_s","parent":"r_ear","length":80.52,"rotation":93.81,"x":62.65,"y":56.6,"color":"5d0000ff"},{"name":"r_ear_ringa","parent":"r_ear","length":27.09,"rotation":114.5,"x":106.19,"y":33.19,"color":"ff0000ff"},{"name":"r_beard","parent":"head","length":131.38,"rotation":-142.97,"x":52.1,"y":-9.02,"color":"ff0000ff"},{"name":"r_beard2","parent":"r_beard","length":87.59,"x":131.38,"color":"ff0000ff"},{"name":"r_beard3","parent":"r_beard2","length":43.79,"x":87.59,"color":"ff0000ff"},{"name":"l_bear","parent":"head","length":109.23,"rotation":-137,"x":127.26,"y":-156.27,"color":"ff0000ff"},{"name":"l_bear2","parent":"l_bear","length":72.82,"x":109.23,"color":"ff0000ff"},{"name":"l_beard3","parent":"l_bear2","length":36.41,"x":72.82,"color":"ff0000ff"},{"name":"headbeard_f","parent":"head","length":69.03,"rotation":150.34,"x":76.63,"y":-138.99,"color":"ffff00ff"},{"name":"headbeard_f2","parent":"headbeard_f","length":47.75,"rotation":19.76,"x":69.03,"color":"ffff00ff"},{"name":"headbeard_f3","parent":"headbeard_f2","length":42.28,"rotation":34.27,"x":47.75,"color":"ffff00ff"},{"name":"headbeard_f4","parent":"headbeard_f","length":52.36,"rotation":-47.52,"x":78.43,"y":-52.66,"color":"ffff00ff"},{"name":"headbeard_f5","parent":"headbeard_f4","length":40.38,"rotation":5.98,"x":52.36,"color":"ffff00ff"},{"name":"l_leg","parent":"body","length":259.69,"rotation":-131.1,"x":-96.06,"y":-6.15,"color":"0000ffff"},{"name":"l_leg2","parent":"l_leg","length":85.2,"rotation":-94.14,"x":259.69,"color":"0000ffff"},{"name":"l_leg3","parent":"l_leg2","length":131.52,"rotation":84.89,"x":85.2,"color":"0000ffff"},{"name":"l_ik","parent":"bodyroot","rotation":-58.24,"x":247.34,"y":20.32,"color":"0000ffff"},{"name":"l_leg4","parent":"l_ik","length":115.52,"rotation":46,"color":"0000ffff"},{"name":"r_leg","parent":"body","length":322.61,"rotation":129.46,"x":-78.5,"y":21.46,"color":"0000ffff"},{"name":"r_leg2","parent":"r_leg","length":99.8,"rotation":75.21,"x":322.61,"color":"0000ffff"},{"name":"r_leg3","parent":"r_leg2","length":151.51,"rotation":-67.03,"x":99.8,"color":"0000ffff"},{"name":"r_ik","parent":"bodyroot","rotation":-140.26,"x":-311.65,"y":39.13,"color":"0000ffff"},{"name":"r_leg4","parent":"r_ik","length":153.02,"rotation":-29.39,"color":"0000ffff"},{"name":"skirt_f","parent":"body","length":148.8,"rotation":-177.03,"x":-79.11,"y":-6.29,"color":"ff0000ff"},{"name":"skirt_f2","parent":"skirt_f","length":99.2,"x":148.8,"color":"ff0000ff"},{"name":"skirt_f3","parent":"skirt_f2","length":49.6,"x":99.2,"color":"ff0000ff"},{"name":"r_leg5","parent":"r_leg","length":77.69,"rotation":37.22,"x":164.63,"y":68.04,"color":"ff0000ff"},{"name":"l_leg5","parent":"l_leg","length":70.74,"rotation":-39.63,"x":135.91,"y":-24.6,"color":"ff0000ff"},{"name":"tail","parent":"body","length":147.59,"rotation":142.64,"x":-53.6,"y":15.95,"color":"ffff00ff"},{"name":"tail2","parent":"tail","length":153.62,"rotation":27.15,"x":147.59,"color":"ffff00ff"},{"name":"tail3","parent":"tail2","length":145.02,"rotation":-65.6,"x":153.62,"color":"ffff00ff"},{"name":"tail4","parent":"tail3","length":121.56,"rotation":-86.55,"x":145.02,"color":"ffff00ff"},{"name":"tail5","parent":"tail4","length":63.05,"rotation":31.03,"x":119.56,"y":-0.61,"color":"ffff00ff"},{"name":"tail6","parent":"tail5","length":80.54,"rotation":100.35,"x":63.05,"color":"ffff00ff"},{"name":"l_ik2","parent":"l_ik","rotation":-84.89,"x":-131.52,"color":"0000ffff"},{"name":"r_ik2","parent":"r_ik","rotation":67.03,"x":-151.51,"color":"0000ffff"},{"name":"r_eye_fire","parent":"r_eye","rotation":23.99,"x":19.98,"y":-4.53,"scaleX":2.4368,"scaleY":2.4368},{"name":"shadow","parent":"bodyroot","length":150,"rotation":-90,"scaleX":0.2986,"scaleY":1.4317},{"name":"r_upparm3","parent":"r_upparm","length":91.08,"rotation":111.51,"x":74.13,"y":76.86,"color":"0000ffff"},{"name":"l_hand2","parent":"lhand","length":129.6,"rotation":-17.68,"x":-0.3,"y":-1.4,"color":"0000ffff"},{"name":"r_finger_a2","parent":"l_hand2","length":216.23,"rotation":-11.53,"x":31.12,"y":141.46,"color":"0000ffff"},{"name":"r_finger_b2","parent":"l_hand2","length":199.56,"rotation":6.63,"x":-15.93,"y":-93.44,"color":"0000ffff"},{"name":"r_finger_c2","parent":"l_hand2","length":244.47,"rotation":6.56,"x":69.12,"y":-149.36,"color":"0000ffff"},{"name":"r_finger_d2","parent":"l_hand2","length":234.37,"rotation":-12.12,"x":113.12,"y":-202.3,"color":"0000ffff"},{"name":"headmouth","parent":"head","length":133,"rotation":-81.22,"x":92.69,"y":-150.77,"color":"0000ffff"},{"name":"lock","parent":"body","rotation":-105.65,"x":-8.77,"y":-14.12,"scaleX":4,"scaleY":4},{"name":"lock2","parent":"body","rotation":-105.65,"x":-8.77,"y":-14.12,"scaleX":4,"scaleY":4},{"name":"effectroot","parent":"root","scaleX":0.5,"scaleY":0.5},{"name":"s","parent":"effectroot"},{"name":"s1","parent":"s"},{"name":"s2","parent":"s"},{"name":"s3","parent":"s"},{"name":"s4","parent":"s"},{"name":"s5","parent":"s"},{"name":"s6","parent":"s"},{"name":"skill","parent":"effectroot","x":284.53,"y":3231.33,"scaleX":7.3877,"scaleY":7.3877},{"name":"tailstop","parent":"bodyroot","rotation":-135.26,"x":59.81,"y":424.32,"color":"abe323ff"},{"name":"zj","parent":"effectroot","x":1957.23,"y":755.64},{"name":"zj2","parent":"effectroot","rotation":38.68,"x":1804.01,"y":542.75,"scaleX":0.9467,"scaleY":0.9467}],"slots":[{"name":"s1","bone":"s1","color":"49b2ff00","attachment":"s1"},{"name":"s2","bone":"s2","color":"49b2ff00","attachment":"s2"},{"name":"s3","bone":"s3","color":"49b2ff00","attachment":"s3"},{"name":"s4","bone":"s4","color":"49b2ff00","attachment":"s4"},{"name":"s5","bone":"s5","color":"49b2ff00","attachment":"s5"},{"name":"s6","bone":"s6","color":"49b2ff00","attachment":"s6"},{"name":"shadow","bone":"shadow","color":"ffffff37"},{"name":"tail","bone":"tail","attachment":"tail"},{"name":"tail_b","bone":"tail","attachment":"tail_b"},{"name":"l_upparm","bone":"l_upparm","attachment":"l_upparm"},{"name":"l_arm","bone":"l_armour","attachment":"l_arm"},{"name":"l_hand","bone":"l_hand","attachment":"l_hand"},{"name":"l_finger_d","bone":"l_finger_d","attachment":"l_finger_d"},{"name":"l_finger_c","bone":"l_finger_c","attachment":"l_finger_c"},{"name":"l_finger_b","bone":"l_finger_b","attachment":"l_finger_b"},{"name":"l_finger_a","bone":"l_finger_a","attachment":"l_finger_a"},{"name":"l_armour","bone":"l_armour","attachment":"l_armour"},{"name":"body","bone":"body","attachment":"body"},{"name":"body_back","bone":"body","color":"ffffff00","attachment":"body_back"},{"name":"l_leg","bone":"l_leg","attachment":"l_leg"},{"name":"r_leg","bone":"r_leg","attachment":"r_leg"},{"name":"skirt_b","bone":"body","attachment":"skirt_b"},{"name":"skirt_f","bone":"skirt_f","attachment":"skirt_f"},{"name":"l_beard","bone":"l_bear","attachment":"l_beard"},{"name":"head_beard_b","bone":"headbeard_b","attachment":"head_beard_b"},{"name":"l_ear","bone":"l_ear","attachment":"l_ear"},{"name":"headmouth","bone":"headmouth","attachment":"headmouth"},{"name":"head","bone":"head","attachment":"head"},{"name":"r_eye_hurt","bone":"head","attachment":"r_eye_hurt"},{"name":"r_eye","bone":"r_eye3","attachment":"r_eye"},{"name":"l_eye","bone":"l_eye","attachment":"l_eye"},{"name":"head_beard_f","bone":"headbeard_f","attachment":"head_beard_f"},{"name":"r_beard","bone":"r_beard","attachment":"r_beard"},{"name":"hair_t","bone":"hair_t","attachment":"hair_t"},{"name":"r_ear_ringb_s","bone":"r_ear_ringb_s","attachment":"r_ear_ringb_s"},{"name":"r_ear_s","bone":"r_ear_s","attachment":"r_ear_s"},{"name":"r_ear","bone":"r_ear","attachment":"r_ear"},{"name":"r_ear_ringb","bone":"r_ear_ring_b","attachment":"r_ear_ringb"},{"name":"r_ear_ringa","bone":"r_ear_ringa","attachment":"r_ear_ringa"},{"name":"r_beard2","bone":"r_beard","attachment":"r_beard"},{"name":"r_upparm","bone":"r_upparm2","attachment":"r_upparm"},{"name":"r_eye_fire","bone":"r_eye_fire","attachment":"eyefire/eyefire_00000"},{"name":"r_armour_u","bone":"r_upparm","attachment":"r_armour_u"},{"name":"r_upparm_2","bone":"r_upparm2","attachment":"r_upparm"},{"name":"r_armour_t","bone":"r_upparm","attachment":"r_armour_t"},{"name":"r_arm","bone":"r_arm","attachment":"r_arm"},{"name":"r_hand","bone":"r_hand","attachment":"r_hand"},{"name":"l_hand2","bone":"l_hand2","attachment":"r_hand"},{"name":"skill","bone":"skill","color":"1effe100","attachment":"skill/9"},{"name":"r_finger_d","bone":"r_finger_d","attachment":"r_finger_d"},{"name":"r_finger_d2","bone":"r_finger_d2","attachment":"r_finger_d"},{"name":"r_finger_c","bone":"r_finger_c","attachment":"r_finger_c"},{"name":"r_finger_c2","bone":"r_finger_c2","attachment":"r_finger_c"},{"name":"r_finger_b","bone":"r_finger_b","attachment":"r_finger_b"},{"name":"r_finger_b2","bone":"r_finger_b2","attachment":"r_finger_b"},{"name":"r_finger_a","bone":"r_finger_a","attachment":"r_finger_a"},{"name":"r_finger_a2","bone":"r_finger_a2","attachment":"r_finger_a"},{"name":"lock","bone":"lock","color":"ffffff00","attachment":"lock"},{"name":"lock_2","bone":"lock2","color":"ffffff00","attachment":"Lock"},{"name":"zj2","bone":"zj2","color":"ffffff00","attachment":"a/zhuj_00009"},{"name":"zj","bone":"zj","color":"ffffff00","attachment":"a/zhuj_00009"}],"ik":[{"name":"l_ik","order":2,"bones":["l_leg3"],"target":"l_ik"},{"name":"l_ik2","bones":["l_leg","l_leg2"],"target":"l_ik2","softness":50,"bendPositive":false},{"name":"lhand","order":8,"bones":["l_upparm2","l_armour"],"target":"lhand","softness":50},{"name":"r_ik","order":3,"bones":["r_leg3"],"target":"r_ik"},{"name":"r_ik2","order":1,"bones":["r_leg","r_leg2"],"target":"r_ik2","softness":50},{"name":"rhand","order":9,"bones":["r_upparm2","r_arm"],"target":"rhand","softness":50}],"transform":[{"name":"r_ear","order":5,"bones":["r_ear_s"],"target":"r_ear","rotation":14.97,"x":5.89,"y":20.41,"rotateMix":0.5,"translateMix":0.5,"scaleMix":0.5,"shearMix":0.5},{"name":"r_ear_ring_b","order":6,"bones":["r_ear_ringb_s"],"target":"r_ear_ring_b","rotation":-13.3,"x":13.93,"y":-1.34,"rotateMix":0.5,"translateMix":0.5,"scaleMix":0.5,"shearMix":0.5},{"name":"r_ear_ring_b2","order":7,"bones":["r_ear_ringa"],"target":"r_ear_ring_b","rotation":7.4,"x":-21.25,"y":-36.06,"rotateMix":3,"translateMix":0,"scaleMix":0,"shearMix":0},{"name":"tailstop","order":4,"bones":["tail"],"target":"tailstop","rotateMix":0,"translateMix":0,"scaleMix":0,"shearMix":0}],"skins":[{"name":"default","attachments":{"body":{"body":{"type":"mesh","uvs":[0.14905,0,0.05732,0.13531,0.05112,0.24871,0.04492,0.3621,0.05236,0.5565,0.07468,0.72081,0.11434,0.80644,0.04245,0.96612,0.17633,0.98306,0.31021,1,0.49615,1,0.52094,0.87355,0.62096,0.87601,0.70937,0.87818,0.81598,0.85041,0.93746,0.75784,0.95482,0.56576,0.99201,0.50327,0.996,0.40145,1,0.29962,0.91763,0.17465,0.76143,0.05662,0.57797,0,0.46144,0,0.34492,0,0.24699,0,0.72556,0.35848,0.34726,0.66029,0.28537,0.25931,0.71399,0.70628,0.36451,0.42609,0.81777,0.58214,0.5104,0.18357,0.58203,0.60122,0.61379,0.39127,0.25729,0.84069,0.68418,0.19439,0.17677,0.54516,0.47638,0.7008,0.9013,0.41399,0.48908,0.33191,0.43889,0.52353,0.30185,0.09637,0.16255,0.3997,0.72568,0.50893,0.40138,0.84587,0.2286,0.73657,0.84575,0.28844,0.56737,0.76759,0.18221,0.12361,0.48257,0.78604,0.60565,0.79327],"triangles":[42,25,24,49,0,25,49,25,42,1,0,49,32,23,22,36,22,21,36,21,20,32,22,36,28,49,42,47,36,20,47,20,19,23,42,24,26,36,47,36,40,32,34,36,26,34,40,36,2,49,28,49,2,1,43,2,28,3,2,43,23,32,42,32,28,42,19,39,47,18,39,19,26,47,39,32,40,28,30,28,40,43,28,30,17,39,18,44,26,39,34,26,44,41,30,40,41,40,34,37,43,30,4,3,43,4,43,37,16,39,17,31,44,39,16,31,39,33,41,34,33,34,44,41,27,37,41,37,30,38,41,33,29,33,44,29,44,31,15,31,16,29,31,15,48,38,33,48,33,29,14,29,15,13,51,29,29,14,13,27,41,38,5,4,37,46,5,37,27,46,37,50,38,48,51,48,29,50,48,51,6,5,46,45,35,46,6,46,35,50,45,27,50,27,38,45,46,27,11,50,51,45,50,11,13,12,51,11,51,12,8,6,35,7,6,8,9,35,45,8,35,9,10,45,11,9,45,10],"vertices":[1,3,250.05,350.93,1,2,2,471.3,230.72,0.00204,3,146.89,343.28,0.99796,2,2,398.23,224.36,0.02147,3,85.83,302.64,0.97853,2,2,325.16,218,0.09153,3,24.76,262.01,0.90847,2,2,201.38,196.31,0.45201,3,-73.43,183.59,0.54799,2,2,98.09,168.4,0.86474,3,-150.66,109.55,0.13526,2,2,46.59,137.11,0.97903,3,-180.84,57.38,0.02097,1,2,-61.54,165.88,1,1,2,-61.29,84.41,1,1,2,-61.04,2.95,1,2,2,-45.64,-108.12,0.99445,3,-144.12,-202.02,0.00555,2,2,37.32,-111.7,0.85541,3,-69.6,-165.37,0.14459,2,2,44.04,-171.66,0.65507,3,-34.95,-214.75,0.34493,2,2,49.97,-224.66,0.478,3,-4.32,-258.41,0.522,2,2,76.57,-285.87,0.36681,3,48.39,-299.35,0.63319,2,2,145.87,-350.21,0.25392,3,140.06,-322.56,0.74608,2,2,270.21,-343.53,0.10251,3,245.96,-257.05,0.89749,2,2,313.28,-360.2,0.05898,3,291.74,-251.01,0.94102,2,2,378.76,-353.55,0.02402,3,346.01,-213.76,0.97598,2,2,444.25,-346.9,0.00659,3,400.28,-176.51,0.99341,2,2,517.39,-286.61,8.0E-5,3,435.53,-88.52,0.99992,1,3,440.66,32.55,1,1,3,404.13,143.2,1,1,3,362.27,199.63,1,1,3,320.41,256.07,1,1,3,285.23,303.5,1,2,2,383.85,-188.21,0.00687,3,271.15,-66.24,0.99313,1,2,159.4,10.96,1,2,2,410.85,83.51,0.00305,3,164.47,185.11,0.99695,2,2,160.35,-212.16,0.32405,3,86.53,-194.49,0.67595,2,2,310.69,21.44,0.00408,3,106.37,82.6,0.99592,2,2,248.38,-263.13,0.13495,3,188.23,-196.98,0.86505,1,3,284.61,105.27,1,2,2,216.65,-124.02,0.17899,3,93.65,-90.15,0.82101,2,2,353.62,-124.36,0.00291,3,213.98,-24.73,0.99709,1,2,36.52,48.69,1,1,3,341.42,16.95,1,2,2,218.95,123.01,0.3835,3,-22.85,127.7,0.6165,2,2,144.17,-69.75,0.64637,3,4.02,-77.3,0.35363,2,2,362.9,-298.1,0.02818,3,305.48,-172.72,0.97182,1,3,199.98,58.51,1,1,3,82.53,9.08,1,1,3,254.93,239.84,1,2,2,310.85,144.41,0.10338,3,47.51,190.57,0.89662,2,2,287.6,-201.63,0.07053,3,193.13,-124.2,0.92947,2,2,45.13,-37.83,0.98,3,-98.19,-96.81,0.02,2,2,100.76,75.06,0.96519,3,-103.55,28.93,0.03481,2,2,438.63,-253.78,0.00324,3,350.66,-97.5,0.99676,2,2,108.97,-130.03,0.61934,3,2.06,-147.08,0.38066,2,2,489.14,157.17,2.6E-4,3,197.83,287.3,0.99974,2,2,90.14,-81.02,0.77008,3,-37.98,-113.11,0.22992,2,2,95.71,-155.17,0.58803,3,2.48,-175.5,0.41197],"hull":26,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,0,22,24,24,26,22,100,100,102,102,24],"width":603,"height":646}},"body_back":{"body_back":{"type":"mesh","uvs":[0,0.9566,0.13313,1,0.258,1,0.38286,1,0.51508,0.92615,0.73176,0.94645,0.8401,0.8754,0.94844,0.80434,1,0.63178,1,0.51504,1,0.39831,0.92641,0.31372,0.96314,0.22913,0.86948,0.15807,0.77583,0.08702,0.70605,0,0.48937,0,0.27269,0,0.04866,0.03964,0,0.1513,0,0.31372,0,0.47613,0.02808,0.56368,0.05474,0.60543,0.0574,0.69138,0.03341,0.82644,0,0.88293,0.74083,0.61244,0.18776,0.25763,0.55176,0.26829,0.25497,0.62118,0.55305,0.48494,0.758,0.36077,0.45172,0.68962,0.26068,0.4955,0.37718,0.17216,0.26122,0.82219,0.3858,0.33557,0.6563,0.74391,0.82974,0.46691,0.14376,0.40706,0.38157,0.52561,0.58006,0.10536,0.70693,0.19624,0.1772,0.12395,0.45308,0.83618,0.55667,0.61153],"triangles":[42,16,15,42,15,14,44,18,17,19,18,44,35,17,16,35,16,42,44,17,35,43,42,14,43,14,13,28,44,35,19,44,28,29,35,42,29,42,43,20,19,28,11,13,12,37,35,29,28,35,37,32,43,13,32,13,11,29,43,32,40,20,28,40,28,37,39,32,11,39,11,10,21,20,40,31,29,32,31,32,39,37,29,31,34,40,37,41,34,37,39,10,9,31,41,37,22,21,40,22,40,34,23,22,34,27,46,31,41,31,46,39,27,31,30,23,34,30,34,41,39,9,8,27,39,8,33,41,46,30,41,33,24,23,30,38,46,27,33,46,38,7,27,8,6,38,27,36,30,33,24,30,36,25,24,36,45,33,38,36,33,45,7,6,27,4,45,38,5,4,38,6,5,38,1,0,26,1,25,36,1,26,25,2,1,36,3,2,36,45,3,36,4,3,45],"vertices":[240.34,-865.06,232.37,-903.93,237.19,-938.69,242.01,-973.45,269.42,-1007.15,271.65,-1068.31,297.3,-1095.49,322.95,-1122.67,377.07,-1129.79,412.34,-1124.9,447.6,-1120.01,470.32,-1095.98,497.29,-1102.66,515.14,-1073.61,533,-1044.57,556.59,-1021.5,548.23,-961.19,539.86,-900.88,519.24,-840.19,483.63,-831.32,434.56,-838.13,385.49,-844.93,360.13,-856.42,348.54,-865.58,322.68,-869.93,280.95,-868.91,262.6,-861.98,372.91,-1056.84,458.75,-888.04,469.58,-989.8,351.51,-921.98,404.18,-999.24,449.6,-1051.08,338.43,-979.61,389.7,-918.3,491.88,-937.18,291.03,-932.14,442.85,-946.42,329.93,-1038.82,420.31,-1075.49,411.91,-882.05,385.27,-953.21,519.89,-990.85,497.34,-1029.97,498.73,-879.5,294.21,-986.13,366.08,-1005.55],"hull":27,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,0],"width":281,"height":305}},"hair_t":{"hair_t":{"type":"mesh","uvs":[1,1,1,0.93655,1,0.8731,1,0.80965,1,0.74621,0.97867,0.65134,0.95734,0.55648,0.93166,0.49324,0.90598,0.43,0.89938,0.35095,0.89278,0.27189,0.91919,0.18968,0.9412,0.12644,0.88104,0.13593,0.82969,0.20233,0.82089,0.29087,0.78127,0.21182,0.70644,0.16755,0.65363,0.11063,0.62512,0.04678,0.60457,0,0.5777,0.03826,0.57295,0.10469,0.57295,0.15409,0.51661,0.1587,0.47709,0.16551,0.42097,0.17914,0.38224,0.15018,0.35774,0.10589,0.34114,0.05138,0.33008,0.14166,0.34193,0.2081,0.35853,0.23706,0.31337,0.26952,0.27385,0.3104,0.23907,0.33936,0.19243,0.35639,0.14027,0.3581,0.09047,0.34447,0.05886,0.3104,0.05095,0.26952,0.07387,0.2593,0.09601,0.26441,0.07545,0.20819,0.03752,0.19116,0.00116,0.23545,0,0.33936,0.02645,0.39216,0.06812,0.41367,0.11507,0.42638,0.16385,0.45577,0.20596,0.46757,0.24251,0.49014,0.27222,0.52294,0.30975,0.5429,0.33763,0.56244,0.35493,0.5825,0.35339,0.62355,0.34707,0.71554,0.34628,0.80071,0.35577,0.8944,0.36841,0.96765,0.39054,1,0.38659,0.93188,0.39608,0.87226,0.41505,0.82286,0.44824,0.80071,0.48381,0.80071,0.50831,0.80412,0.52807,0.81263,0.50989,0.85352,0.49092,0.8961,0.48618,0.96765,0.52175,0.92166,0.55653,0.92506,0.60501,0.9455,0.63821,0.96595,0.68168,0.9932,0.71962,1,0.73306,0.96254,0.72515,0.91995,0.71509,0.88104,0.69121,0.836,0.71509,0.85638,0.74395,0.8982,0.7748,0.93467,0.77431,0.87247,0.82738,0.92009,0.88046,0.96772,0.90235,0.92053,0.88494,0.87227,0.92923,0.92804,0.94067,0.92911,0.98545,1,0.56916,0.64447,0.82587,0.6385,0.70306,0.38182,0.45682,0.41814,0.62948,0.33442,0.74222,0.63473,0.66662,0.56659,0.53681,0.3129,0.43869,0.68673,0.93205,0.74328,0.7731,0.45982,0.87323,0.4955,0.48291,0.62679,0.55701,0.48373,0.60783,0.81374,0.37064,0.34021,0.61036,0.45399,0.41112,0.51834,0.65541,0.69911,0.91643,0.5967,0.77713,0.75995,0.5023,0.50074,0.87749,0.72979,0.82792,0.79865],"triangles":[94,67,106,68,67,94,69,68,94,108,94,112,69,94,108,82,112,99,108,112,82,73,70,69,71,70,73,74,69,108,73,69,74,75,74,108,76,75,108,82,76,108,72,71,73,77,76,82,77,82,81,77,81,80,78,77,80,79,78,80,102,111,106,102,57,111,58,57,102,67,66,102,67,102,106,65,58,102,65,102,66,59,58,65,64,59,65,60,59,64,63,60,64,61,60,63,61,63,62,30,29,28,31,30,28,31,28,27,32,31,27,26,109,32,26,32,27,97,26,25,98,23,22,101,24,23,19,22,21,98,18,17,19,18,22,19,21,20,22,18,98,11,13,12,10,13,11,14,13,10,15,14,10,104,16,15,9,105,15,9,15,10,105,9,8,105,8,7,104,15,105,113,105,7,43,40,44,41,43,42,41,40,43,45,44,40,46,45,40,46,40,39,47,46,39,48,39,38,47,39,48,49,38,37,48,38,49,50,37,36,49,37,50,51,36,35,50,36,51,51,35,52,33,32,109,109,26,97,97,25,101,52,35,34,111,109,97,53,52,34,109,54,34,109,34,33,55,54,109,53,34,54,111,55,109,56,55,111,115,111,97,57,56,111,96,98,17,96,17,16,25,24,101,98,101,23,110,101,98,104,96,16,107,101,110,115,97,101,107,115,101,96,110,98,100,96,104,100,110,96,106,111,115,94,107,110,94,110,100,112,94,100,112,100,99,106,115,94,94,115,107,113,7,6,99,100,104,95,104,105,95,105,113,99,104,95,116,95,113,5,103,113,5,113,6,116,113,103,103,5,4,114,99,95,117,95,116,114,95,117,103,4,3,83,82,99,114,83,99,90,116,103,117,116,90,86,83,114,86,114,117,92,91,103,86,84,83,87,86,117,87,117,90,90,103,91,92,103,3,2,92,3,84,86,85,92,2,1,88,87,90,88,90,89,93,92,1,93,1,0],"vertices":[1,31,-61.6,28.58,1,1,31,-51.11,13.46,1,2,31,-40.62,-1.65,1,35,-322.22,-524.55,0,3,31,-30.13,-16.77,0.99737,35,-304.72,-530.24,0,36,-108.13,-89.64,0.00263,3,31,-19.64,-31.89,0.98371,35,-287.22,-535.93,0,36,-89.73,-89.64,0.01629,3,31,7,-46.88,0.8976,35,-256.94,-531.75,0,36,-62.22,-76.31,0.1024,3,31,33.64,-61.88,0.68276,35,-226.66,-527.57,0,36,-34.71,-62.97,0.31724,3,31,57.28,-67.8,0.41463,35,-204.26,-517.98,0,36,-16.37,-46.93,0.58537,3,31,80.92,-73.71,0.08773,35,-181.85,-508.38,0,36,1.97,-30.88,0.91227,4,31,97.38,-90.19,0.00184,35,-158.78,-511.54,0,36,24.89,-26.75,0.92623,37,-0.83,-33.72,0.07193,3,35,-135.7,-514.7,0,36,47.82,-22.62,0.23199,37,15.25,-16.88,0.76801,2,35,-118.12,-537.77,0,37,44.24,-16.16,1,2,35,-104.93,-556.52,0,37,67.16,-16.46,1,1,37,42.78,12.29,1,5,31,157.74,-100.77,0.00179,32,-48.3,-88.5,0.0031,36,67.99,16.81,0.07896,37,8.3,26.87,0.91389,38,-67.78,-106.77,0.00226,5,31,147.62,-76.53,0.06218,32,-46.46,-62.31,0.06667,36,42.32,22.31,0.71947,37,-15.68,16.18,0.10635,38,-86.82,-88.69,0.04533,4,31,181.03,-81.25,0.07264,32,-18.72,-81.52,0.23909,36,65.24,47.07,0.47841,38,-54.35,-79.52,0.20986,4,31,226.77,-65.13,0.00828,32,29.39,-87.66,0.22154,36,78.08,93.84,0.16765,38,-19.01,-46.31,0.60253,3,32,64.39,-99.36,0.00589,36,94.58,126.85,0.02029,38,12.29,-26.74,0.97382,2,36,113.1,144.67,5.6E-4,38,37.38,-21.2,0.99944,1,38,55.65,-17.31,1,3,32,114.33,-113.47,1.1E-4,38,54.95,2.81,0.99985,39,-39.4,-121.83,4.0E-5,5,32,114.55,-93.98,0.02542,33,-55.07,-89.55,2.5E-4,35,-27.8,-339.59,0,38,40.05,15.38,0.96866,39,-52.1,-107.04,0.00566,5,32,112.54,-79.79,0.15157,33,-55.85,-75.24,0.00374,35,-41.43,-335.16,0,38,27.83,22.85,0.8135,39,-62.98,-97.72,0.03119,5,32,147.21,-73.52,0.39051,33,-20.76,-71.99,0.07899,35,-31.82,-301.26,0,38,45.05,53.59,0.3286,39,-41.07,-70.12,0.2019,5,32,171.39,-68.09,0.28816,33,3.8,-68.68,0.16807,35,-26.06,-277.15,0,38,56.24,75.7,0.149,39,-26.5,-50.08,0.39477,5,32,205.56,-59.25,0.04629,33,38.61,-62.83,0.08654,35,-18.98,-242.58,0,38,71.16,107.69,0.02133,39,-6.68,-20.87,0.84583,4,32,230.71,-64.16,5.8E-4,35,-3.51,-222.15,0,38,90.95,123.97,3.2E-4,39,15.45,-7.96,0.99911,1,39,35.17,-4.69,1,2,35,31.68,-206.58,0,39,53.92,-7.1,1,1,39,38.55,15.19,1,2,33,87.48,-51.75,0.05177,39,19.1,22.1,0.94823,2,33,76.66,-43.93,0.26237,39,5.97,19.69,0.73763,3,33,104.34,-33,0.85622,35,-23.12,-170.51,0,39,17.19,47.25,0.14378,4,33,128.36,-19.82,0.98032,34,-18.15,-18.86,0.00805,35,-26.76,-143.36,0,39,24.26,73.72,0.01163,4,33,149.6,-10.25,0.40644,34,3.59,-10.46,0.59355,35,-28.03,-120.09,0,39,32.03,95.69,1.0E-5,4,33,178.44,-3.73,0.001,34,32.74,-5.52,0.999,35,-23.72,-90.85,0,39,47.25,121.03,0,1,34,65.34,-5.03,1,2,34,96.46,-8.98,0.99158,35,-0.74,-31.31,0.00842,2,34,116.22,-18.86,0.3722,35,14.77,-15.57,0.6278,2,34,121.16,-30.71,0.03643,35,27.57,-14.53,0.96357,2,34,106.84,-33.68,0.00113,35,25.96,-29.08,0.99887,2,33,240.07,-27.09,0,35,20.28,-41.77,1,1,35,39.75,-34.6,1,1,35,51.78,-13.57,1,3,33,299.72,-32.26,0,35,46.58,12.01,1,39,151.68,188.98,0,3,33,298.8,-2.13,0,35,18.15,22.01,1,39,129.27,209.14,0,4,33,281.46,12.27,0,34,136.48,4.86,0.23392,35,-1.52,11.02,0.76608,39,106.88,206.55,0,3,33,255.12,17.08,0,34,110.43,11.09,1,39,85.2,190.83,0,2,34,81.09,14.78,1,35,-28.08,-38.59,0,1,34,50.6,23.3,1,1,34,24.28,26.72,1,2,33,145.08,33.3,0.64231,34,1.44,33.27,0.35769,2,33,126.02,41.78,0.99984,40,-50.28,-78.55,1.6E-4,2,33,102.28,46.29,0.98705,40,-48.58,-54.45,0.01295,3,33,84.57,51,0.89321,40,-45.97,-36.31,0.10673,41,117.93,-131.99,6.0E-5,4,32,229.98,62.37,0.00163,33,73.46,56.22,0.61689,40,-42.08,-24.67,0.37782,41,110.68,-122.08,0.00366,4,32,229.26,74.29,2.6E-4,33,73.77,68.16,0.27919,40,-30.18,-23.58,0.71925,41,116.67,-111.75,0.0013,2,33,76.27,95.01,0.03669,40,-3.22,-22.93,0.96331,2,35,-175.98,-142.47,0,40,21.2,-19.2,1,1,40,46.96,-8.72,1,1,40,66.54,2.69,1,2,40,73.43,17.92,1,41,142.77,-3.24,0,3,35,-219.94,-154.67,0,40,54.38,12.11,0.99995,41,136.48,-22.13,5.0E-5,4,32,192.71,141.95,0.00202,35,-205.33,-165.65,0,40,36.33,15.01,0.99209,41,123.68,-35.17,0.00589,5,32,182.98,126.1,0.02187,33,32.16,123.78,0.00508,35,-195.37,-181.36,0,40,20.2,24.24,0.91897,41,106.81,-42.99,0.05408,5,32,163.34,116.82,0.08233,33,11.79,116.24,0.03959,35,-195.68,-203.07,0,40,10.33,43.59,0.6777,41,85.32,-39.85,0.20038,5,32,141.34,113.7,0.12842,33,-10.41,115.03,0.04255,35,-202.55,-224.22,0,40,6.54,65.5,0.39976,41,65.26,-30.27,0.42926,5,32,126.03,112.52,0.12147,33,-25.75,115.18,0.02779,35,-208.22,-238.48,0,40,4.9,80.75,0.22502,41,51.87,-22.77,0.62571,5,32,113.46,113.23,0.05717,33,-38.22,116.98,0.00949,35,-214.39,-249.46,0,40,5.23,93.34,0.07499,41,41.79,-15.22,0.85834,5,32,123.04,126.57,0.00259,33,-27.52,129.43,4.1E-4,35,-222.15,-234.99,0,40,18.85,84.17,0.00392,41,57.15,-9.42,0.99308,5,32,133.04,140.46,1.0E-5,33,-16.35,142.41,0,35,-230.23,-219.9,0,40,33.04,74.6,2.0E-5,41,73.17,-3.39,0.99997,4,32,133.06,161.42,1.0E-5,33,-14.52,163.29,0,40,53.99,75.21,1.0E-5,41,84.79,14.06,0.99998,1,41,58.98,11.6,1,1,41,39.79,21.86,1,2,31,150.21,156.36,0.0168,41,15,40.27,0.9832,2,31,129.79,149.4,0.05254,41,-1.16,54.56,0.94746,2,31,102.96,140.4,0.08571,41,-22.28,73.4,0.91429,2,31,82.36,128.5,0.09209,41,-42.82,85.4,0.90791,2,31,81.65,114.78,0.09581,41,-55.08,79.22,0.90419,3,31,92.75,107.45,0.10785,32,-12.87,126.73,0.00181,41,-55.95,65.94,0.89035,3,31,104.35,101.77,0.13824,32,-5.06,116.44,0.00828,41,-55.14,53.05,0.85348,3,31,124.06,99.55,0.27556,32,11.56,105.6,0.04416,41,-47.3,34.83,0.68028,3,31,108.43,95.89,0.54334,32,-4.05,109.36,0.03887,41,-58.22,46.6,0.41779,3,31,86.7,95.57,0.7217,32,-23.61,118.83,0.01395,41,-69.27,65.32,0.26435,3,31,64.83,93.26,0.76976,32,-44.19,126.59,0.00579,41,-82.11,83.17,0.22445,3,31,75.37,78.62,0.80256,32,-41.35,108.77,0.00679,41,-89.61,66.76,0.19066,2,31,40.24,71.06,0.9487,41,-113.59,93.52,0.0513,2,31,5.11,63.49,0.98325,41,-137.57,120.27,0.01675,2,31,1.67,44.44,0.98561,41,-155.81,113.82,0.01439,2,31,18.6,39.15,0.98849,41,-152.02,96.5,0.01151,2,31,-13.36,36.66,0.99971,41,-170.03,123.03,2.9E-4,1,31,-19.42,32.83,1,1,31,-54.13,33.76,1,6,31,218.4,97.42,0.00197,32,94.89,61.34,0.46454,33,-61.21,66.89,0.01013,35,-175.94,-288.95,0,40,-47.21,110.33,0.04658,41,-2.4,-48.16,0.47677,3,31,87.58,4.51,0.99612,32,-63.71,37.06,4.0E-5,41,-147.92,19.42,0.00384,4,31,193.08,-12.88,0.00105,32,22.75,-25.84,0.7646,36,15.94,95.95,0.08638,38,-70.92,-12.1,0.14798,4,32,173.63,6.22,0.00578,33,12.47,5.16,0.97992,40,-99.9,29.95,0.01114,41,32.67,-137.65,0.00316,5,32,70.21,-32.99,0.63018,35,-102.08,-352.6,0,36,29.68,141.94,0.00919,38,-35.22,19.97,0.35978,39,-125.67,-90.52,8.4E-4,4,31,131.15,33.42,0.74875,32,-11.8,43.33,0.13476,35,-206.69,-392.69,0,41,-101.22,-4.1,0.11649,4,31,181.23,44.13,0.11995,32,37.76,30.41,0.71938,35,-173.29,-353.86,0,41,-67.1,-42.29,0.16067,5,32,128.43,-31.02,0.73318,33,-35.8,-28.03,0.02197,35,-78.25,-299.44,0,38,0.31,66.14,0.18983,39,-83.25,-50.6,0.05502,4,32,173.9,84.93,0.10715,33,19.55,83.56,0.15377,40,-21.22,32.07,0.6024,41,76.46,-72.24,0.13668,3,31,15.74,-8.37,0.98676,35,-273.29,-495.8,0,36,-88.88,-47.17,0.01324,4,31,144.22,-19.25,0.73181,32,-23.78,-9.6,0.03897,36,-6.68,52.17,0.21206,38,-113.05,-37.66,0.01715,3,31,86.91,-46.44,0.25332,35,-193.59,-483.05,0,36,-17.03,-10.41,0.74668,4,32,148.98,63.84,0.31834,33,-7.11,64.7,0.18251,40,-43.07,56.34,0.27716,41,44.03,-76.02,0.22199,5,32,108.96,16.25,0.92743,33,-51.09,20.75,0.00237,35,-129.26,-296.14,0,40,-91.84,94.9,0.01205,41,-15.64,-93.5,0.05816,2,31,170.55,123.96,0.00933,41,-3.06,6.55,0.99067,2,33,67.48,-14.47,0.82256,39,-21.67,33.41,0.17744,5,31,228.74,37.35,2.5E-4,32,77.17,3.03,0.99114,35,-131.37,-330.51,0,40,-106.03,126.28,2.3E-4,41,-49.44,-86.91,0.00838,4,32,197.83,39.01,0.02891,33,39.41,35.73,0.72157,40,-66.4,6.76,0.23214,41,70.97,-123.74,0.01738,5,31,165.08,79.7,0.17404,32,39.29,69.45,0.29033,35,-207.67,-335.32,0,40,-40.79,166.15,2.0E-5,41,-44.21,-10.63,0.53561,3,31,47.99,-37.72,0.71699,35,-229.85,-499.65,0,36,-46.38,-37.41,0.28301,3,31,92.52,50.81,0.83996,32,-38.51,76.22,0.01729,41,-105.26,38.07,0.14276,4,32,142.13,25.94,0.71705,33,-17.22,27.54,0.14769,40,-81.15,62.04,0.06442,41,17.35,-103.78,0.07084,2,31,45.98,7.86,0.99735,41,-165.63,57.21,0.00265,2,31,60.04,41.93,0.94849,41,-129.07,61.88,0.05151],"hull":94,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,62,64,64,66,66,68,68,70,70,72,72,74,74,76,76,78,78,80,80,82,82,84,84,86,86,88,88,90,90,92,92,94,94,96,96,98,98,100,100,102,102,104,104,106,106,108,108,110,110,112,112,114,114,116,116,118,118,120,120,122,122,124,124,126,126,128,128,130,130,132,132,134,134,136,136,138,138,140,140,142,142,144,144,146,146,148,148,150,150,152,152,154,154,156,156,158,158,160,160,162,162,164,164,166,166,168,168,170,170,172,172,174,174,176,176,178,178,180,180,182,182,184,184,186,186,0],"width":625,"height":290}},"head":{"head":{"type":"mesh","uvs":[0.23467,0.78444,0.37718,0.76636,0.53048,0.8274,0.67514,1,1,1,1,0.83418,0.88674,0.69401,0.7939,0.6307,0.77014,0.5787,0.84356,0.51314,0.84356,0.38427,0.62764,0.04062,0.49161,0,0.3016,0,0.12023,0.07227,0.02523,0.19436,0,0.3187,0,0.45888,0.02523,0.60809,0.1116,0.71888,0.23035,0.6194,0.31888,0.40462,0.52832,0.30062,0.69889,0.32096,0.42252,0.63975,0.57366,0.54479,0.69026,0.54931,0.58446,0.75505,0.64492,0.71209,0.72049,0.66914],"triangles":[4,3,5,6,5,3,3,29,6,29,7,6,2,27,3,27,28,3,3,28,29,27,2,24,19,20,0,0,20,1,2,1,24,1,20,24,28,27,25,19,18,20,27,24,25,28,26,29,28,25,26,29,8,7,29,26,8,25,24,21,24,20,21,21,20,17,20,18,17,8,26,9,10,9,26,21,22,25,26,25,23,25,22,23,26,23,10,17,16,21,16,15,21,15,14,21,14,13,21,22,13,12,22,21,13,22,11,23,10,23,11,22,12,11],"vertices":[1,26,40.53,-149.57,1,1,26,74.3,-173.68,1,2,26,95.63,-216.01,0.5,44,6.75,-47.35,0.5,1,44,68.39,-62.1,1,1,44,145.04,-7.88,1,1,44,118.61,29.48,1,1,44,69.54,42.16,1,2,26,188.44,-227.31,0.5,44,37.55,40.93,0.5,1,26,193.06,-212.09,1,1,26,220.93,-213.05,1,1,26,244.93,-186.8,1,1,26,262.88,-74.69,1,1,26,241.43,-39.89,1,1,26,200.9,-2.84,1,1,26,148.76,17.81,1,1,26,105.76,11.47,1,1,26,77.22,-8.94,1,1,26,51.11,-37.5,1,1,26,28.7,-72.81,1,1,26,26.49,-112.22,1,1,26,70.35,-115.11,1,1,26,129.23,-88.63,1,1,26,193.27,-108.28,1,1,26,225.86,-145.69,1,1,26,107.55,-156.73,1,1,26,157.47,-166.86,1,1,26,181.5,-190.52,1,2,26,120.61,-211.8,0.5,44,7.95,-22.04,0.5,2,26,141.51,-214.84,0.5,44,15.37,-2.27,0.5,2,26,165.63,-220.83,0.5,44,26.35,20.02,0.5],"hull":20,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,0,38,0,40,40,42,42,44,44,46,46,20,2,48,48,50,50,52,52,16,4,54,54,56,56,58,58,14],"width":289,"height":276}},"head_beard_b":{"head_beard_b":{"type":"mesh","uvs":[0.4976,1,0.52707,0.87968,0.55654,0.75936,0.66851,0.5911,0.78048,0.42284,1,0.38265,1,0.2822,0.92413,0.18426,0.84826,0.08631,0.6803,0,0.44014,0,0.19999,0,0.09999,0.09589,0,0.19179,0,0.3274,0.08802,0.42284,0.04401,0.58105,0,0.73927,0.14106,0.63379,0.16168,0.74931,0.35911,0.71415,0.38268,0.88493,0.43278,1,0.49157,0.44396,0.86158,0.28706,0.24567,0.34296,0.6811,0.26133,0.38276,0.27419,0.26709,0.51149,0.53512,0.19559,0.31718,0.15384,0.59552,0.47699,0.45436,0.66692,0.13585,0.21936,0.58411,0.11415],"triangles":[13,12,33,14,13,33,15,14,33,15,33,25,15,25,28,18,15,28,16,15,18,17,16,18,19,18,28,19,28,20,30,11,10,33,12,11,33,11,30,27,30,10,27,10,29,25,33,30,25,30,27,23,27,29,23,29,31,28,25,27,28,27,23,32,28,23,20,28,32,31,32,23,2,32,31,1,32,2,21,20,32,21,32,1,1,22,21,0,22,1,34,10,9,29,10,34,26,9,8,34,9,26,24,8,7,26,8,24,24,7,6,5,24,6,4,26,24,4,24,5,26,29,34,31,26,4,31,29,26,3,31,4,2,31,3],"vertices":[3,45,98.89,87.12,0.00523,46,38.08,79.65,0.93692,47,11.35,81.68,0.05785,3,45,91.18,71.74,0.03882,46,26.37,67.04,0.90884,47,-4.35,74.63,0.05234,3,45,83.46,56.35,0.16909,46,14.66,54.43,0.8013,47,-20.05,67.58,0.02962,3,45,56.79,35.95,0.74597,46,-16.66,42.3,0.25397,47,-53.62,68.6,5.0E-5,2,45,30.11,15.54,0.99819,46,-47.98,30.16,0.00181,1,45,-19.53,13.67,1,1,45,-20.45,0.45,1,1,45,-4.32,-13.64,1,1,45,11.82,-27.72,1,2,45,48.73,-41.71,0.97579,46,-46.12,-30,0.02421,3,45,102.63,-45.46,0.23509,46,4.58,-48.68,0.76089,47,-69.5,-23.46,0.00402,3,45,156.53,-49.21,3.0E-5,46,55.28,-67.36,0.71012,47,-30.08,-60.42,0.28985,2,46,80.77,-63.26,0.466,47,-5.01,-66.57,0.534,2,46,106.26,-59.16,0.30578,47,20.06,-72.72,0.69422,2,46,112.45,-42.37,0.26865,47,32.31,-59.66,0.73135,2,46,98.22,-23.7,0.14867,47,26.47,-36.93,0.85133,2,46,114.73,-7.52,0.00351,47,47.98,-28.47,0.99649,1,47,69.49,-20,1,1,47,36.81,-8.45,1,1,47,43.86,5.85,1,3,45,127.36,47.32,0.00236,46,54.28,33.47,0.67009,47,8.28,32.84,0.32755,3,45,123.63,70.17,5.9E-4,46,57.09,56.46,0.90424,47,19.82,52.91,0.09517,3,45,113.44,86.11,3.1E-4,46,51.77,74.61,0.93533,47,21.99,71.7,0.06436,3,45,95.15,13.81,0.07184,46,13.98,10.31,0.92713,47,-37.86,27.21,0.00102,1,45,10.67,-1.08,1,2,46,61.29,-21.33,0.6048,47,-6.62,-20.36,0.3952,1,45,50.94,-7.28,1,3,45,118.02,-10.25,0.00992,46,29.21,-19.18,0.98469,47,-35.33,-5.89,0.00539,1,47,5.08,-0.84,1,2,45,83.1,-18.22,0.61725,46,-6.55,-17.07,0.38275,3,45,131.64,-27.12,0.01237,46,37.56,-39.19,0.89658,47,-35.43,-27.57,0.09106,2,45,72.12,19.78,0.69962,46,-6.46,22.49,0.30038,3,45,105.55,42.59,0.05542,46,32.01,35.03,0.8662,47,-11.62,42.95,0.07838,2,46,78.83,-45.18,0.43351,47,0.25,-49.16,0.56649,2,45,71.36,-28.18,0.82384,46,-20.61,-23.34,0.17616],"hull":23,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,0],"width":225,"height":132}},"head_beard_f":{"head_beard_f":{"type":"mesh","uvs":[0.50254,0.11314,0.53275,0.21387,0.56295,0.31461,0.65962,0.4245,0.82981,0.45656,1,0.48861,0.96877,0.58782,0.93754,0.68703,0.82879,0.7084,0.72004,0.72977,0.60827,0.86103,0.4391,0.87324,0.32733,0.93124,0.279,1,0.21254,1,0.17327,0.89156,0.17025,0.73282,0.22462,0.58019,0.34545,0.51914,0.24275,0.44587,0.07056,0.36956,0,0.38482,0,0.30545,0.10077,0.26882,0.27295,0.25661,0.15212,0.16503,0.08264,0.07956,0.02223,0,0.12191,0,0.29108,0.06124,0.39681,0.08719,0.53297,0.509,0.41058,0.35977,0.49354,0.70647,0.31084,0.74766,0.69703,0.58386,0.61046,0.67755,0.38149,0.61256,0.40608,0.19882,0.87698,0.58537,0.21941,0.33999,0.44655,0.46301,0.39065,0.77425],"triangles":[26,27,28,25,28,29,26,28,25,38,30,0,38,0,1,24,25,29,38,24,29,38,29,30,40,23,24,32,38,1,32,1,2,24,38,32,40,24,32,20,22,23,20,23,40,21,22,20,19,40,32,20,40,19,41,32,2,31,41,2,18,19,32,41,18,32,15,16,34,12,42,11,15,34,12,13,14,15,12,13,15,37,18,41,37,41,31,17,18,37,33,37,31,34,17,37,42,34,37,16,17,34,33,42,37,10,33,36,11,42,33,11,33,10,12,34,42,3,31,2,35,3,4,31,3,35,39,4,5,35,4,39,6,39,5,36,31,35,7,39,6,36,33,31,8,35,39,8,39,7,9,36,35,8,9,35,10,36,9],"vertices":[1,62,15.26,-48.85,1,2,59,51.28,-76.95,0.01729,62,-0.42,-36.43,0.98271,2,59,49.86,-57.01,0.17834,62,-16.09,-24.01,0.82166,2,59,36.38,-32.54,0.75033,62,-43.24,-17.43,0.24967,2,59,5.86,-19.37,0.99558,62,-73.56,-31.05,0.00442,1,59,-24.66,-6.2,1,1,59,-14.64,10.85,1,1,59,-4.63,27.91,1,2,59,16.63,27.25,0.9988,60,-40.1,43.36,0.0012,2,59,37.89,26.59,0.90812,60,-20.31,35.55,0.09188,3,59,64.34,46.17,0.39602,60,11.19,45.03,0.58793,61,-4.85,57.8,0.01605,3,59,96.53,41.25,0.04257,60,39.82,29.52,0.58388,61,10.08,28.86,0.37355,3,59,119.89,47.25,6.0E-5,60,63.84,27.27,0.03318,61,28.66,13.47,0.96676,1,61,44.32,10.09,1,1,61,49.35,-1.64,1,1,61,33.38,-16.68,1,3,60,68.99,-20.73,0.22226,61,5.89,-29.1,0.77404,62,0.58,84.26,0.0037,3,60,44.6,-39.57,0.79105,61,-24.88,-30.93,0.13414,62,8.53,54.48,0.07482,4,59,99.18,-28.34,0.00977,60,18.8,-36.87,0.52807,61,-44.68,-14.17,0.00191,62,-3.92,31.72,0.46025,2,60,27.94,-59.21,0.06339,62,20.22,31.52,0.93661,1,62,55.65,38.45,1,1,62,65.12,48.55,1,1,62,73.72,36.16,1,1,62,61.79,19.42,1,1,62,35.94,-1.33,1,1,62,64.92,-2.41,1,1,62,85.14,-8.15,1,1,62,103.29,-13.96,1,1,62,87.56,-24.87,1,1,62,54.24,-33.82,1,1,62,34.75,-41.33,1,3,59,63.64,-22.26,0.55276,60,-12.59,-19.13,0.14794,62,-32.41,9.62,0.29931,1,62,3.06,-0.29,1,3,59,79.33,12.66,0.07857,60,13.97,8.43,0.91718,61,-23.17,25.98,0.00425,3,60,47.75,-3.84,0.63078,61,-2.15,-3.18,0.36745,62,-23.2,71.19,0.00176,2,59,36.07,-1.42,0.99794,62,-66.4,3.36,0.00206,2,59,56.22,12.26,0.83826,60,-7.91,15.87,0.16174,4,59,96.36,-9.5,0.00145,60,22.51,-18.18,0.87545,61,-31.09,-0.82,8.6E-4,62,-19.72,42.37,0.12225,1,62,21.2,-24.92,1,1,59,2.44,6.5,1,2,60,20.9,-78.58,0.00594,62,35.36,17.55,0.99406,3,59,77.89,-34.45,0.14305,60,-3.3,-35.42,0.22133,62,-13.79,11.9,0.63561,3,59,101.44,20.85,0.00551,60,37.55,8.66,0.83489,61,-3.55,12.9,0.1596],"hull":31,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,0],"width":192,"height":190}},"headmouth":{"headmouth":{"x":60.98,"y":0.2,"rotation":38.79,"width":172,"height":109}},"l_arm":{"l_arm":{"x":86.74,"y":-13.25,"rotation":66.25,"width":191,"height":184}},"l_armour":{"l_armour":{"x":67.24,"y":-12.87,"rotation":66.25,"width":184,"height":200}},"l_beard":{"l_beard":{"type":"mesh","uvs":[0.27682,0,0.14862,0.08845,0,0.19099,0,0.37968,0,0.56265,0.03753,0.69116,0.07098,0.80567,0,1,0.90171,1,0.78409,0.83426,0.77745,0.72847,0.76938,0.59982,0.94582,0.45401,0.86496,0.33965,0.94485,0.19418,1,0.09378],"triangles":[14,0,15,1,0,14,14,2,1,7,6,9,8,7,9,3,11,4,5,4,11,5,11,10,6,5,10,6,10,9,13,2,14,3,2,13,12,3,13,12,11,3],"vertices":[1,26,112.99,-125.71,1,1,26,90.42,-133.11,1,1,56,36.14,-53.64,1,2,56,80.16,-50.12,0.93755,57,-29.07,-50.12,0.06245,2,56,122.84,-46.72,0.32047,57,13.61,-46.72,0.67953,3,56,152.54,-40.92,0.02686,57,43.31,-40.92,0.94911,58,-29.51,-40.92,0.02402,2,57,69.78,-35.75,0.59075,58,-3.04,-35.75,0.40925,1,58,42.8,-38.57,1,1,58,36.27,43.23,1,2,57,71.28,29.47,0.37868,58,-1.54,29.47,0.62132,2,57,46.66,26.9,0.94433,58,-26.16,26.9,0.05567,2,56,125.93,23.77,0.17361,57,16.71,23.77,0.82639,2,56,90.65,37.06,0.95658,57,-18.58,37.06,0.04342,1,56,64.56,27.59,1,1,26,127.2,-200.26,1,1,26,146.75,-186.31,1],"hull":16,"edges":[12,14,14,16,16,18,22,24,24,26,0,30,4,6,6,8,8,10,10,12,18,20,20,22,0,2,2,4,26,28,28,30,2,28],"width":91,"height":234}},"l_ear":{"l_ear":{"type":"mesh","uvs":[0.23839,0.76519,0.44833,1,1,1,1,0.76193,1,0.49441,1,0.25796,1,0,0.71964,0,0.36855,0.24323,0,0.49855],"triangles":[8,5,4,8,7,5,7,6,5,1,3,2,1,0,3,3,0,4,0,9,4,9,8,4],"vertices":[1,29,20.15,15.41,1,1,29,-4.88,9.38,1,1,29,-8.32,-15.21,1,1,29,15.73,-18.58,1,2,29,42.75,-22.36,0.73651,30,0.76,-23.46,0.26349,2,29,66.64,-25.7,0.03658,30,24.38,-18.62,0.96342,1,30,50.16,-13.35,1,1,30,47.63,-0.99,1,2,29,72.07,2.23,0.02184,30,20.16,9.52,0.97816,2,29,48.57,22.26,0.92807,30,-8.68,20.55,0.07193],"hull":10,"edges":[2,4,12,14,14,16,16,18,8,10,10,12,2,0,0,18,4,6,6,8],"width":45,"height":102}},"l_eye":{"l_eye":{"x":8.91,"y":-0.86,"rotation":-34.08,"width":17,"height":15}},"l_finger_a":{"l_finger_a":{"type":"mesh","uvs":[1,1,0.86727,1,0.66479,0.53694,0.51568,0.58383,0,0.65185,0,0,0.19829,0,0.47673,0,1,0,0.15557,0.27187],"triangles":[9,6,7,3,9,7,9,5,6,4,5,9,4,9,3,2,7,8,0,1,2,8,0,2,3,7,2],"vertices":[1,10,130,-12.23,1,1,10,117.56,-33.71,1,2,9,114.94,-39.63,0.45352,10,30.46,-27.04,0.54648,1,8,157.81,65.97,1,1,8,103.77,-14.73,1,1,8,19.69,57.45,1,1,8,43.85,85.59,1,2,9,83.09,52.85,0.8084,10,-66.15,-11.74,0.1916,1,10,-17.12,72.94,1,1,8,73.71,49.42,1],"hull":9,"edges":[8,10,0,16,0,2,2,4,4,16,10,12,12,18,4,6,6,8,18,6,12,14,14,16,4,14],"width":187,"height":170}},"l_finger_b":{"l_finger_b":{"type":"mesh","uvs":[1,0.51051,0.78902,0.99999,0.57176,1,0.12581,0.80863,0.53734,0.60657,0.06593,0.28854,0,0,0.65224,0,1,0.36769],"triangles":[5,6,7,4,5,7,3,4,2,2,4,1,1,4,0,0,4,8,4,7,8],"vertices":[2,11,94.37,22.26,0.62846,12,-17.17,22.96,0.37154,1,12,53.38,25.7,1,1,12,68.12,-2.14,1,2,11,26.2,-91.41,0,12,76.39,-70.93,1,2,11,52.92,-31.94,0.45304,12,25.26,-30.48,0.54696,1,8,181.56,-18.83,1,1,8,146.88,-1.65,1,1,8,208.48,70.11,1,2,11,81.94,36.05,0.91025,12,-33.58,14.28,0.08975],"hull":9,"edges":[8,10,10,12,12,14,14,16,10,14,16,8,6,8,2,4,4,6,2,0,0,16,8,0],"width":145,"height":130}},"l_finger_c":{"l_finger_c":{"type":"mesh","uvs":[1,0.2059,0.91275,0.83391,0.81682,0.99998,0,1,1.0E-5,0.59484,0.44765,0.60693,0.50456,0.19374,0.54629,1.0E-5,1,0],"triangles":[6,7,0,7,8,0,0,5,6,1,5,0,2,5,1,3,4,5,3,5,2],"vertices":[1,8,188.86,-0.79,1,2,13,81.53,27.97,0.64282,14,-21.87,20.78,0.35718,2,13,102.02,17.48,0.20684,14,-4.6,36,0.79316,1,14,93.85,5.97,1,1,14,79.89,-39.76,1,2,13,59.47,-32.57,0.23965,14,26.36,-21.93,0.76035,1,8,147.11,-47.23,1,1,8,133.19,-28.34,1,1,8,170.43,15.03,1],"hull":9,"edges":[14,16,12,14,2,0,0,16,10,12,2,10,6,8,8,10,12,0,2,4,4,6,10,4],"width":126,"height":118}},"l_finger_d":{"l_finger_d":{"type":"mesh","uvs":[1,0.2697,1,0.43237,0.49844,0.99999,0.27323,1,0.05049,0.68462,0,0.25986,0.35345,0.51742,0.30353,0,1,0],"triangles":[7,8,0,0,6,7,3,4,6,4,5,6,3,6,2,2,6,1,1,6,0],"vertices":[1,8,151.75,-26.93,1,1,15,-4.98,39.32,1,2,15,84.6,30.35,0.98314,16,-29.77,6.01,0.01686,2,15,107.82,8.37,0.23589,16,-3,23.5,0.76411,1,16,40.21,15.18,1,1,16,68.74,-15.4,1,2,15,67.37,-17.79,0.6513,16,13.06,-21.92,0.3487,1,8,67.48,-84.92,1,1,8,131.9,-9.88,1],"hull":9,"edges":[12,14,14,16,0,16,14,0,12,4,10,12,0,2,2,4,4,6,6,8,12,6,8,10],"width":142,"height":97}},"l_hand":{"l_hand":{"x":85.5,"y":12.82,"rotation":49.35,"width":236,"height":152}},"l_hand2":{"r_hand":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[221.31,134.74,182.59,-229.21,-41.15,-205.41,-2.43,158.54],"hull":4,"edges":[0,2,2,4,4,6,0,6],"width":366,"height":225}},"l_leg":{"l_leg":{"type":"mesh","uvs":[0,0,0.38747,0,0.74199,0.28564,0.83631,0.64779,0.75522,0.68707,0.59861,0.66926,0.57636,0.70766,0.69103,0.84858,0.76802,0.88789,0.99222,0.93764,1,1,0.48373,0.98435,0.52022,0.89414,0.49957,0.85583,0.28127,0.68446,0.30726,0.60179,0.41697,0.55447,0.36977,0.4857,0,0.37108],"triangles":[12,7,8,11,12,8,8,9,10,10,11,8,6,14,15,13,14,6,13,6,7,12,13,7,5,16,2,3,5,2,15,16,5,4,5,3,5,6,15,18,0,1,17,18,1,2,17,1,16,17,2],"vertices":[1,64,-64.32,15.84,1,1,64,17.04,109.4,1,1,64,189.12,110.1,1,2,64,332.72,25.23,0.16781,65,-30.44,71.02,0.83219,3,64,329.12,-6.03,0.07378,65,1,69.69,0.92561,66,61.91,90.07,6.1E-4,2,65,36.25,33.17,0.83025,66,28.68,51.71,0.16975,2,65,52.39,42.81,0.39548,66,39.72,36.5,0.60452,2,66,113.31,34.1,0.75,68,11.88,36.78,0.25,2,66,141.42,45.67,0.35,68,39.73,24.61,0.65,1,68,114.62,17.79,1,1,68,123.05,-9.28,1,1,68,-39.91,-37.39,1,2,66,102.09,-23.24,0.35,68,-37.16,5.02,0.65,2,66,83.86,-19.73,0.75,68,-47.3,20.58,0.25,3,64,228.71,-119.7,3.0E-4,65,121.62,-22.25,0.29172,66,-18.92,-38.26,0.70798,3,64,205.91,-88.85,0.03635,65,92.5,-47.22,0.74889,66,-46.38,-11.48,0.21476,3,64,212.77,-48.29,0.39835,65,51.55,-43.31,0.6009,66,-46.13,29.66,7.5E-4,2,64,179.35,-39.25,0.90959,65,44.94,-77.29,0.09041,1,64,62.53,-94.47,1],"hull":19,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,0,36,32,10,12,30,28,12,26,14,24,16,30,10,34,4],"width":320,"height":453}},"l_upparm":{"l_upparm":{"type":"mesh","uvs":[0.09978,0.58733,0,0.85791,0,1,0.5004,1,0.53419,0.85154,0.66934,0.66373,0.9686,0.47911,1,0.32313,0.90585,0,0.40386,0,0.1046,0.10986,0,0.29448,0,0.47911],"triangles":[4,3,1,3,2,1,1,0,4,4,0,5,7,5,11,6,5,7,11,5,0,0,12,11,11,9,7,9,11,10,7,9,8],"vertices":[2,4,231.14,-151.98,0.08056,5,150.1,-80.76,0.91944,1,5,273.75,-43.3,1,1,5,330.55,-9.82,1,1,5,252.78,122.09,1,1,5,188.19,96.01,1,2,4,279.48,19.18,0.0028,5,92.12,87.38,0.9972,2,4,200.88,116.89,0.51255,5,-28.18,122.76,0.48745,2,4,129.43,131.87,0.84804,5,-95.41,94.28,0.15196,1,4,-22.23,114.32,1,2,4,-33.69,-38.86,0.99553,5,-131.92,-139.01,0.00447,2,4,10.32,-133.98,0.87229,5,-41.51,-192.01,0.12771,2,4,93.36,-172.29,0.59756,5,48.55,-176.07,0.40244,2,4,178.78,-178.68,0.27264,5,122.34,-132.57,0.72736],"hull":13,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,0,24],"width":306,"height":464}},"lock":{"lock":{"width":335,"height":136}},"lock_2":{"Lock":{"path":"lock_2","width":335,"height":136}},"r_arm":{"r_arm":{"type":"mesh","uvs":[0.07385,1.0E-5,0,0.37872,0,0.54104,0.3259,1,0.43316,1,0.76024,0.99999,0.87402,0.90654,1,0.80308,1,0.37409,1,0.25582,0.58064,0,0.87023,0.53173],"triangles":[1,4,2,0,5,1,11,10,9,8,11,9,11,0,10,11,8,7,6,11,7,5,11,6,5,0,11,5,4,1,3,2,4],"vertices":[-95.66,-146.16,49.55,-185.94,112.86,-192.31,302.93,-100.41,306.58,-64.23,317.72,46.09,285.11,88.14,249.01,134.69,81.69,151.54,35.57,156.18,-78.45,24.77,138.79,101.57],"hull":11,"edges":[0,2,2,4,4,6,18,20,0,20,10,0,6,8,8,10,2,8,14,16,16,18,16,22,10,12,12,14,22,12],"width":339,"height":392}},"r_armour_t":{"r_armour_t":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[10.29,223.65,466.51,123.86,386.8,-240.53,-69.41,-140.73],"hull":4,"edges":[0,2,2,4,4,6,0,6],"width":467,"height":373}},"r_armour_u":{"r_armour_u":{"type":"mesh","uvs":[0.64487,0,0.52295,0.27447,0.97536,0.85789,0.99999,0.99857,0.77321,1,0.68978,0.84141,0.1636,0.36489,0,0.31322,0,0],"triangles":[6,1,5,1,6,8,6,7,8,1,8,0,4,2,3,4,5,2,5,1,2],"vertices":[1,89,51.37,111.96,1,1,89,121.77,26.73,1,2,2,96.14,-154.1,0.59,3,2.34,-174.35,0.41,2,2,43.22,-167.88,0.66,3,-37.48,-211.83,0.34,2,2,34.61,-109.77,0.86,3,-72.91,-164.98,0.14,2,2,92.27,-79.96,0.78,3,-36.62,-111.16,0.22,1,89,98.92,-70.01,1,1,89,58.76,-94.1,1,1,89,-41.66,-26.76,1],"hull":9,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,0,16,10,4,2,12],"width":259,"height":386}},"r_beard":{"r_beard":{"type":"mesh","uvs":[0.2079,0,0.15063,0.16618,0.15584,0.39316,0.47841,0.49333,0.66864,0.49374,0.74412,0.35647,0.95237,0.28307,0.96803,0.21333,1,0.07104,0.70248,0,0.45519,0,0.42371,0.36333,0.59611,0.17744,0.35657,0.22015,0.76263,0.19178,0.57726,0.26196,0.43861,0.12192,0.68143,0.12191,0.87714,0.17112],"triangles":[7,14,18,13,1,16,7,18,8,14,17,18,12,16,17,18,17,8,1,0,16,16,10,17,16,0,10,17,9,8,17,10,9,5,4,11,2,11,3,4,3,11,2,13,11,2,1,13,11,15,5,11,13,15,5,14,6,6,14,7,5,15,14,15,12,14,15,13,12,13,16,12,12,17,14],"vertices":[1,26,45.68,67.27,1,1,26,3.27,34.89,1,2,53,82.89,-50.5,0.99951,54,-48.49,-50.5,4.9E-4,1,53,104.28,7.61,1,2,53,98.68,38.5,0.99208,54,-32.7,38.5,0.00792,1,53,53.75,42.81,1,1,53,24.67,72.36,1,1,26,92.76,-67.12,1,1,26,126.99,-37.49,1,1,26,105.91,12.2,1,1,26,75.79,39.73,1,1,53,65.55,-8.77,1,1,53,2.6,8.46,1,1,53,23.09,-27.93,1,1,53,2.03,36.3,1,1,53,29.42,10.29,1,1,26,47.78,13.15,1,1,26,77.35,-13.89,1,1,26,90.69,-47.15,1],"hull":11,"edges":[0,2,2,4,8,10,10,12,16,18,18,20,20,0,2,32,32,34,34,36,12,14,14,16,36,14,4,6,6,8],"width":165,"height":316}},"r_beard2":{"r_beard":{"type":"mesh","uvs":[0.47841,0.49333,0.15584,0.39316,0.16105,0.62015,0.08295,0.7914,0,0.88655,0,1,0.1561,1,0.31219,1,0.62438,1,0.5515,0.8213,0.59315,0.63102,0.66864,0.49374,0.32382,0.86705,0.36613,0.70389,0.3626,0.53397],"triangles":[7,12,8,12,9,8,7,6,12,12,6,4,6,5,4,4,3,12,12,13,9,12,3,13,9,13,10,3,2,13,2,14,13,13,14,10,14,0,10,10,0,11,2,1,14,14,1,0],"vertices":[1,53,104.28,7.61,1,2,53,82.89,-50.5,0.99951,54,-48.49,-50.5,4.9E-4,2,53,153.25,-36.55,0.14444,54,21.87,-36.55,0.85556,2,54,77.43,-39.32,0.6598,55,-10.15,-39.32,0.3402,2,54,109.49,-47.29,0.13046,55,21.91,-47.29,0.86954,1,55,57.16,-40.73,1,1,55,52.45,-15.41,1,1,55,47.74,9.91,1,2,54,125.91,60.56,0.02568,55,38.33,60.56,0.97432,2,54,72.6,38.41,0.75452,55,-14.99,38.41,0.24548,2,53,143.6,34.18,0.27152,54,12.22,34.18,0.72848,2,53,98.68,38.5,0.99208,54,-32.7,38.5,0.00792,2,54,93.67,4.12,0.00469,55,6.08,4.12,0.99531,1,54,41.71,1.56,1,2,53,120.4,-8.83,0.9936,54,-10.98,-8.83,0.0064],"hull":12,"edges":[2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,2,0,0,22],"width":165,"height":316}},"r_ear":{"r_ear":{"type":"mesh","uvs":[0.69857,1,0.77644,0.96287,0.91662,0.9418,1,0.85986,1,0.73812,0.88287,0.63745,0.70269,0.44043,0.52251,0.24341,0.2811,0.12171,0.03969,0,0,0,0,0.05846,0.1565,0.26916,0.21101,0.42017,0.26552,0.57117,0.37455,0.87317,0.53809,0.98321,0.62894,1,0.51919,0.55974,0.34907,0.35226,0.64304,0.85127,0.45082,0.71211,0.67328,0.66834,0.84166,0.8086,0.49564,0.42023,0.38232,0.50585],"triangles":[23,4,3,2,23,3,1,23,2,20,0,17,1,0,20,11,10,9,8,11,9,12,11,8,19,8,7,12,8,19,13,12,19,24,19,7,24,7,6,25,19,24,13,19,25,25,24,18,14,13,25,18,24,6,22,18,6,22,6,5,21,25,18,21,18,22,14,25,21,23,22,5,23,5,4,20,21,22,20,22,23,15,14,21,15,21,20,1,20,23,16,15,20,17,16,20],"vertices":[1,26,115.29,-72.26,1,1,26,131.75,-76.54,1,1,26,154.76,-91.46,1,1,26,178.47,-89.38,1,1,26,196.05,-70.15,1,1,27,42.12,-50.83,1,2,27,96.13,-42.46,0.83404,28,-21.27,-39.39,0.16596,2,27,150.13,-34.08,0.01342,28,33.37,-40.42,0.98658,1,28,83.47,-22,1,1,28,133.57,-3.57,1,1,28,138.55,2.25,1,1,28,129.05,10.39,1,1,28,75.16,16.8,1,2,27,148.3,36.92,0.02051,28,43.78,29.84,0.97949,2,27,115.14,44.37,0.41739,28,12.4,42.88,0.58261,2,27,48.83,59.28,0.99749,28,-50.37,68.97,0.00251,1,27,12.47,44.16,1,1,26,105.38,-63.19,1,2,27,92.25,1.03,0.99824,28,-17.61,4.12,0.00176,2,27,147.19,6.59,1.0E-5,28,37.47,0.15,0.99999,1,27,26.41,12.33,1,2,27,70.95,29.02,0.97013,28,-33.78,35.36,0.02987,1,27,57.09,-12.68,1,1,27,14.69,-25.3,1,2,27,120.24,-10.3,0.11084,28,8.02,-11.86,0.88916,2,27,115.66,17.86,0.2898,28,8.34,16.67,0.7102],"hull":18,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,0],"width":193,"height":214}},"r_ear_ringa":{"r_ear_ringa":{"x":10.4,"y":3.04,"rotation":124.8,"width":30,"height":27}},"r_ear_ringb":{"r_ear_ringb":{"x":30.77,"y":3.76,"rotation":132.19,"width":76,"height":71}},"r_ear_ringb_s":{"r_ear_ringb_s":{"x":30.54,"y":-0.5,"rotation":145.49,"width":81,"height":69}},"r_ear_s":{"r_ear_s":{"x":94.93,"y":11.05,"rotation":-135.67,"width":156,"height":133}},"r_eye":{"r_eye":{"x":5.72,"y":0.66,"rotation":-160.06,"width":60,"height":27}},"r_eye_fire":{"eyefire/eyefire_00000":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00001":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00002":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00003":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00004":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00005":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00006":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00007":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00008":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00009":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00010":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00011":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00012":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00013":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00014":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00015":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00016":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00017":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00018":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00019":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00020":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00021":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00022":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00023":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00024":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00025":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00026":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00027":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00028":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00029":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00030":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00031":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00032":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00033":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00034":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00035":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00036":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00037":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64}},"r_eye_hurt":{"r_eye_hurt":{"x":162.63,"y":-138.57,"rotation":-42.44,"width":49,"height":78}},"r_finger_a":{"r_finger_a":{"x":112.78,"y":0.67,"rotation":95.46,"width":131,"height":321}},"r_finger_a2":{"r_finger_a":{"x":112.78,"y":0.67,"rotation":95.46,"width":131,"height":321}},"r_finger_b":{"r_finger_b":{"x":119.22,"y":11.56,"rotation":77.3,"width":195,"height":352}},"r_finger_b2":{"r_finger_b":{"x":119.22,"y":11.56,"rotation":77.3,"width":195,"height":352}},"r_finger_c":{"r_finger_c":{"x":134.42,"y":6.36,"rotation":77.37,"width":218,"height":421}},"r_finger_c2":{"r_finger_c":{"x":134.42,"y":6.36,"rotation":77.37,"width":218,"height":421}},"r_finger_d":{"r_finger_d":{"x":159.42,"y":8.42,"rotation":96.04,"width":156,"height":451}},"r_finger_d2":{"r_finger_d":{"x":159.42,"y":8.42,"rotation":96.04,"width":156,"height":451}},"r_hand":{"r_hand":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[221.31,134.74,182.59,-229.21,-41.15,-205.41,-2.43,158.54],"hull":4,"edges":[0,2,2,4,4,6,0,6],"width":366,"height":225}},"r_leg":{"r_leg":{"type":"mesh","uvs":[0.7409,0,0.62921,0.07564,0.39813,0.34299,0.31726,0.519,0.36347,0.60144,0.41181,0.60462,0.4,0.64394,0.27725,0.78161,0,0.90594,0,1,0.40262,1,0.38919,0.87659,0.5877,0.69354,0.59069,0.62619,0.55636,0.57266,0.58181,0.50632,0.79153,0.40491,0.93929,0.34965,1,0.20631,1,0.07507,0.88407,0],"triangles":[7,11,10,9,8,7,9,7,10,11,7,6,11,6,12,3,5,4,3,2,5,15,14,5,6,5,14,6,14,13,12,6,13,20,19,18,17,20,18,16,0,20,16,20,17,1,0,16,15,2,1,16,15,1,2,15,5],"vertices":[1,69,78.53,-106.62,1,1,69,148.14,-108.1,1,2,69,319.14,-67.25,0.93733,70,-65.9,-13.81,0.06267,3,69,399.06,-20.28,0.04469,70,-0.1,-79.09,0.95386,71,33.83,-122.84,0.00145,2,70,43.78,-66.34,0.95046,71,39.22,-77.47,0.04954,2,70,52.7,-41.87,0.81033,71,20.17,-59.7,0.18967,2,70,68.37,-53.23,0.40278,71,36.74,-49.71,0.59722,2,71,128.45,-42.71,0.5,73,0.87,-48.53,0.5,1,73,157.99,-18.45,1,1,73,165.85,24.58,1,1,73,-47.24,63.49,1,2,71,110.38,29.76,0.5,73,-50.44,5.74,0.5,2,70,119.6,36.8,0.72619,71,-26.16,32.59,0.27381,3,69,299.8,99.18,0.00796,70,90.07,47.38,0.96436,71,-47.42,9.53,0.02768,2,69,302.51,68.31,0.11979,70,60.91,36.88,0.88021,2,69,274.69,49.19,0.68231,70,35.32,58.89,0.31769,1,69,153.87,68.07,1,1,69,72.68,87.78,1,1,69,9.97,48.09,1,1,69,-21.97,-3.92,1,1,69,12.9,-66.31,1],"hull":21,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,0,40,10,30,10,28,12,24,26,12,14,22,4,30,32,2],"width":538,"height":465}},"r_upparm":{"r_upparm":{"type":"mesh","uvs":[0.5629,0,0.44107,0.13245,0.33446,0.35768,0,0.70057,0,1,0.50416,1,0.55593,0.91151,0.79695,0.90142,0.93211,0.83091,1,0.68376,1,0.44172,0.92622,0.17615,0.79786,0,0.65662,0.27214,0.71933,0.47436,0.75204,0.72291,0.40813,0.72836,0.31878,0.50647],"triangles":[1,0,13,17,3,2,13,16,2,13,2,1,16,13,14,6,16,14,17,2,16,15,6,14,6,15,7,16,4,3,16,3,17,5,16,6,4,16,5,13,0,12,13,12,11,14,13,11,14,11,10,15,14,10,9,15,10,8,15,9,7,15,8],"vertices":[2,3,191.71,419.51,0.5,18,-35.67,-142.37,0.5,1,18,50.36,-132.92,1,1,18,145.48,-88.64,1,1,18,377.9,-69.52,1,1,18,432.24,29.08,1,1,18,175.7,170.46,1,1,18,133.29,155.84,1,2,3,0.5,108.37,0.5,18,8.83,220.11,0.5,1,3,68.57,61.1,1,1,3,136.51,62.38,1,1,3,209.6,116.59,1,1,3,264.27,210.51,1,1,3,273.04,309.87,1,2,3,141.97,314.81,0.5,18,-33.97,-26.47,0.5,2,3,102.6,240.26,0.5,18,-29.18,57.7,0.5,2,3,38.86,169.32,0.5,18,-0.72,148.73,0.5,1,18,175.27,54.08,1,1,18,180.46,-44.04,1],"hull":13,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,16,18,18,20,20,22,22,24,0,24,0,26,26,28,28,30,30,14,14,16,12,32,32,34,34,4],"width":581,"height":376}},"r_upparm_2":{"r_upparm":{"type":"mesh","uvs":[0.40813,0.72836,0.31878,0.50647,0.33446,0.35768,0,0.70057,0,1,0.50416,1,0.55593,0.91151],"triangles":[1,3,2,0,4,3,0,3,1,5,0,6,4,0,5],"vertices":[1,18,175.27,54.08,1,1,18,180.46,-44.04,1,1,18,145.48,-88.64,1,1,18,377.9,-69.52,1,1,18,432.24,29.08,1,1,18,175.7,170.46,1,1,18,133.29,155.84,1],"hull":7,"edges":[4,6,6,8,8,10,10,12,12,0,0,2,2,4],"width":581,"height":376}},"s1":{"s1":{"path":"canying/s1","width":249,"height":284}},"s2":{"s2":{"path":"canying/s1","width":249,"height":284}},"s3":{"s3":{"path":"canying/s3","width":270,"height":260}},"s4":{"s4":{"path":"canying/s4","width":316,"height":211}},"s5":{"s5":{"path":"canying/s5","width":292,"height":214}},"s6":{"s6":{"path":"canying/s6","width":273,"height":212}},"skill":{"skill/0":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/1":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/2":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/3":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/4":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/5":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/6":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/7":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/8":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/9":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/10":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/11":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/12":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/13":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/14":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/15":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/16":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/17":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/18":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/19":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/20":{"x":8.28,"y":23.13,"width":534,"height":289}},"skirt_b":{"skirt_b":{"type":"mesh","uvs":[0.55483,0.0745,0.27158,0,0.10839,0,0.07042,0.04782,0,0.13651,0,0.24672,0.07943,0.36639,0.08934,0.56514,0.09847,0.74821,0.10432,0.86567,0.11102,1,0.13246,1,0.22417,0.91358,0.33284,0.81118,0.43649,0.7135,0.5086,0.64554,0.58606,0.73603,0.66628,0.82975,0.72654,0.90014,0.81201,1,0.83809,1,0.86946,0.87562,0.89354,0.78014,0.92519,0.65463,0.95637,0.53101,0.97065,0.47438,0.98229,0.4282,1,0.35799,0.99881,0.28119,0.88446,0.16119,0.54426,0.20515,0.53488,0.32098,0.5287,0.39736,0.52041,0.49974],"triangles":[23,17,16,22,17,23,22,18,17,21,18,22,19,18,21,20,19,21,13,8,7,14,13,7,12,9,8,13,12,8,11,10,9,12,11,9,30,29,28,31,30,28,31,28,27,26,31,27,32,31,26,25,32,26,33,32,25,24,33,25,15,33,24,24,16,15,23,16,24,30,1,0,2,1,30,5,33,6,31,2,30,3,2,31,4,3,32,33,5,32,31,32,3,4,32,5,6,14,7,33,15,6,15,14,6,30,0,29],"vertices":[2,69,-29.26,-28.11,0.882,64,-55.27,28.56,0.118,1,69,39.43,-94.34,1,1,69,85.18,-122.44,1,1,69,102.7,-117.78,1,1,69,135.21,-109.12,1,1,69,151.07,-83.29,1,1,69,146.03,-41.58,1,2,69,171.86,6.7,0.9105,77,-31.34,-53.22,0.0895,2,69,195.65,51.17,0.10647,77,14.5,-32.2,0.89353,2,69,210.92,79.7,6.7E-4,77,43.92,-18.71,0.99933,1,77,77.56,-3.29,1,1,77,75,3.29,1,3,64,47.47,-204.95,4.1E-4,77,41.93,22.81,0.99946,78,46.91,-195.32,1.3E-4,4,69,139.02,106.28,0.05243,64,49.68,-159.49,0.03263,77,2.74,45.95,0.90459,78,19.62,-158.9,0.01035,4,69,95.9,101.25,0.26312,64,51.79,-116.13,0.16773,77,-34.64,68.02,0.51089,78,-6.41,-124.16,0.05826,4,69,65.9,97.74,0.23503,64,53.25,-85.96,0.37814,77,-60.65,83.37,0.19912,78,-24.52,-99.99,0.18771,4,69,57.21,132.28,0.05687,64,88.75,-83.06,0.32056,77,-46.68,116.13,0.05051,78,0.97,-75.11,0.57206,4,69,48.21,168.06,0.00712,64,125.52,-80.06,0.0588,77,-32.2,150.06,0.0109,78,27.37,-49.35,0.92318,4,69,41.45,194.93,2.6E-4,64,153.13,-77.8,1.5E-4,77,-21.33,175.55,0.00173,78,47.2,-30,0.99786,1,78,75.33,-2.54,1,1,78,75.54,6.03,1,2,64,178.9,-37.9,0.02489,78,41.59,17.17,0.97511,2,64,164.29,-14.69,0.42853,78,15.53,25.73,0.57147,1,64,145.07,15.82,1,1,64,126.15,45.87,1,1,64,117.48,59.63,1,1,64,110.41,70.85,1,1,64,99.67,87.92,1,1,64,83.47,101.48,1,2,69,-109.18,48.97,8.3E-4,64,33.88,94.75,0.99917,2,69,-7.48,0.69,0.88955,64,-30.44,2.36,0.11045,4,69,11.82,26.21,0.46467,64,-8.43,-20.87,0.52721,77,-146.98,59.13,0.00502,78,-113.54,-89.2,0.0031,4,69,24.55,43.05,0.38003,64,6.09,-36.19,0.57426,77,-126.67,64.83,0.02605,78,-92.59,-91.74,0.01966,4,69,41.61,65.61,0.32084,64,25.54,-56.72,0.5139,77,-99.43,72.48,0.08787,78,-64.51,-95.14,0.0774],"hull":30,"edges":[2,4,8,10,20,22,38,40,54,56,56,58,4,6,6,8,16,26,12,30,12,14,14,16,26,28,28,30,14,28,16,18,18,20,22,24,24,26,18,24,30,48,30,32,46,48,32,46,32,34,44,46,34,44,34,36,36,38,40,42,42,44,36,42,10,12,52,54,48,50,50,52,2,0,0,58,0,60,60,56,62,60,54,62,64,62,52,64,30,66,66,64,66,50,60,4,6,62,64,8,10,66],"width":329,"height":275}},"skirt_f":{"skirt_f":{"type":"mesh","uvs":[0.76659,0.10516,0.53321,0.09018,0.31685,0,0.11097,0,0,0.15158,0,0.18723,0.11172,0.28589,0.12084,0.3891,0.12749,0.46441,0.14327,0.64294,0.15904,0.82147,0.17482,1,0.28922,1,0.40363,1,0.63244,1,0.72433,0.8302,0.81622,0.6604,0.90811,0.4906,0.94806,0.40504,0.99999,0.29383,1,0.07988,0.46626,0.67526,0.59829,0.42794,0.36219,0.39794,0.72087,0.52069,0.30873,0.80022,0.45151,0.88401,0.45759,0.53275,0.44099,0.2974,0.71835,0.32344,0.55373,0.76966,0.31134,0.54266,0.60346,0.63165,0.22468,0.23695,0.8356,0.39205],"triangles":[22,28,29,28,23,33,34,29,19,28,1,29,29,0,19,29,1,0,28,33,1,19,0,20,2,33,4,33,2,1,2,4,3,33,5,4,13,26,14,14,26,15,13,12,26,26,12,10,26,10,25,10,12,11,26,30,15,26,25,30,15,30,16,10,9,25,25,21,30,25,9,21,30,32,16,30,21,32,9,31,21,31,27,21,21,27,32,32,24,16,16,24,17,9,8,31,32,27,24,27,31,23,31,8,23,27,22,24,27,23,22,24,34,17,24,22,34,17,34,18,8,7,23,23,28,22,22,29,34,18,34,19,33,23,6,23,7,6,6,5,33],"vertices":[1,2,8.55,-46.79,1,1,2,7.07,18.74,1,1,2,43.71,84.76,1,1,2,35.82,141.66,1,1,2,-43.96,161.85,1,1,74,-25.95,-164.56,1,2,74,20.82,-129.24,0.991,75,-127.98,-129.24,0.009,2,74,72.32,-122.25,0.9168,75,-76.48,-122.25,0.0832,2,74,109.91,-117.14,0.77199,75,-38.89,-117.14,0.22801,3,74,199,-105.04,0.17387,75,50.2,-105.04,0.72762,76,-49,-105.04,0.09851,3,74,288.09,-92.95,3.7E-4,75,139.29,-92.95,0.25441,76,40.09,-92.95,0.74522,2,75,228.38,-80.85,5.6E-4,76,129.18,-80.85,0.99944,1,76,126.44,-49.05,1,1,76,123.7,-17.25,1,1,76,118.21,46.36,1,2,75,130.12,64.56,0.22231,76,30.92,64.56,0.77769,3,74,191.62,82.77,0.16701,75,42.82,82.77,0.81073,76,-56.38,82.77,0.02226,2,74,104.32,100.98,0.87402,75,-44.47,100.98,0.12598,2,74,60.49,108.39,0.98435,75,-88.31,108.39,0.01565,1,2,-76.5,-124.33,1,1,2,30.09,-109.55,1,3,74,207.45,-13.87,0.00222,75,58.65,-13.87,0.99232,76,-40.55,-13.87,0.00547,1,74,80.34,12.15,1,2,74,70.97,-54.78,0.96235,75,-77.83,-54.78,0.03765,2,74,123.89,50.23,0.79891,75,-24.91,50.23,0.20109,2,75,125.05,-52.26,0.27119,76,25.85,-52.26,0.72881,2,75,163.62,-8.95,9.4E-4,76,64.42,-8.95,0.99906,2,74,136.24,-22.43,0.7678,75,-12.56,-22.43,0.2322,1,2,-99.7,29.91,1,1,2,-102.05,-48.54,1,2,75,103.87,14.53,0.33551,76,4.67,14.53,0.66449,3,74,144.71,-62.66,0.53214,75,-4.09,-62.66,0.46626,76,-103.28,-62.66,0.0016,2,74,182.31,22.39,0.03446,75,33.51,22.39,0.96554,1,2,-77.88,93.87,1,2,74,56.67,76.56,0.98952,75,-92.13,76.56,0.01048],"hull":21,"edges":[6,8,8,10,10,12,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,8,66,66,56,56,58,58,38,34,36,36,38,12,14,14,16,38,40,6,4,66,4,4,2,56,2,2,0,0,40,58,0],"width":279,"height":503}},"tail":{"tail":{"type":"mesh","uvs":[0.86601,0,0.77697,0.0272,0.68794,0.05441,0.58182,0.11908,0.50537,0.23825,0.42893,0.35743,0.45231,0.41102,0.40195,0.44612,0.34979,0.41656,0.28504,0.32048,0.2005,0.28722,0.08359,0.32602,0,0.43688,0,0.5302,0,0.62351,0.0602,0.56068,0.11376,0.59366,0.10476,0.69159,0.12994,0.7886,0.15512,0.8856,0.23427,0.9428,0.31341,1,0.41863,1,0.52385,1,0.67134,0.94658,0.74239,0.89115,0.81344,0.83572,0.92496,0.71007,0.99151,0.60475,0.99575,0.49019,1,0.37563,1,0.27406,1,0.17249,0.98047,0.08624,0.96093,0,0.77729,0.55777,0.31623,0.71699,0.5658,0.70194,0.6858,0.26757,0.8362,0.23794,0.57194,0.45103,0.47806,0.87273,0.4433,0.52477,0.22564,0.46302,0.72838,0.72388,0.81124,0.39667,0.61736,0.59178,0.32775,0.54978,0.35419,0.86041,0.44331,0.68815,0.83926,0.12218,0.62985,0.84682,0.66152,0.41712,0.20303,0.63394,0.91514,0.485,0.73469,0.13814,0.85807,0.65295,0.23248,0.80486,0.91228,0.35372,0.5283,0.59155,0.55111,0.35677,0.09778,0.45666,0.68787,0.48294],"triangles":[14,13,15,15,61,16,15,13,61,13,12,61,12,11,61,43,61,11,53,43,47,16,61,43,47,7,42,47,8,7,47,43,8,43,11,10,43,9,8,43,10,9,19,18,57,36,57,53,57,18,53,18,17,53,36,53,47,17,16,53,53,16,43,22,41,23,23,51,24,23,41,51,21,48,22,22,48,41,21,20,48,24,51,25,19,57,20,20,57,48,48,49,41,41,37,51,41,49,37,57,36,48,48,36,49,36,47,49,47,42,49,26,25,44,25,51,44,51,37,44,26,56,27,26,44,56,37,46,44,44,35,56,44,46,35,27,56,28,49,59,37,37,59,46,49,42,59,56,54,28,56,35,54,59,40,46,46,62,35,62,40,52,62,46,40,59,42,40,35,62,45,42,6,40,42,7,6,62,52,45,6,60,40,40,60,52,6,5,60,28,54,29,35,45,54,29,54,30,45,58,54,54,58,30,52,38,45,52,60,38,45,39,58,45,38,39,58,31,30,5,4,60,60,4,38,58,39,31,31,39,32,32,39,50,50,33,32,4,3,38,38,55,39,38,3,55,50,0,33,0,34,33,39,55,50,3,2,55,55,1,50,55,2,1,50,1,0],"vertices":[1,79,-42.87,-71.32,1,1,79,-5.86,-91.15,1,3,79,31.15,-110.98,0.99893,80,-154.26,-45.6,4.5E-4,83,13.88,-297.41,6.3E-4,3,79,85.25,-124.53,0.95456,80,-112.31,-82.35,0.03695,83,23.67,-242.51,0.00849,4,79,146.7,-111.61,0.69671,80,-51.73,-98.9,0.25579,81,5.22,-227.87,2.0E-5,83,6.53,-182.09,0.04748,4,79,208.16,-98.69,0.31032,80,8.85,-115.45,0.53865,81,45.32,-179.54,0.00956,83,-10.6,-121.68,0.14146,5,79,217.25,-74.5,0.16641,80,27.98,-98.08,0.57721,81,37.4,-154.94,0.03031,82,148.18,-116.75,0.00162,83,-35.36,-114.28,0.22444,5,79,244.29,-79.55,0.02905,80,49.73,-114.91,0.38417,81,61.73,-142.09,0.06291,82,136.81,-91.7,0.01309,83,-32.18,-86.95,0.51077,5,79,251.88,-105.39,0.00302,80,44.69,-141.37,0.15618,81,83.73,-157.6,0.0301,82,153.62,-70.67,6.8E-4,83,-6.93,-77.6,0.81003,3,80,13.6,-182.32,0.02712,81,108.19,-202.83,8.4E-4,83,44.2,-83.05,0.97204,3,80,11.57,-223.19,0.0048,83,80.24,-63.68,0.94097,84,-65.73,-5.47,0.05423,2,83,101.83,-12.51,0.2921,84,-19.28,-35.91,0.7079,1,84,42.41,-34.71,1,1,84,74.38,-8.95,1,1,84,106.34,16.82,1,3,82,113.3,69.08,0.07266,83,30.56,62.94,0.08176,84,67.75,20.66,0.84558,3,82,94.9,47.68,0.57185,83,3.76,54.09,0.17221,84,63.86,48.61,0.25594,3,82,53.12,58.98,0.97648,83,-26.21,85.31,0.00456,84,99.96,72.48,0.01896,3,81,200.46,-5.8,0.09295,82,9.13,54.99,0.90704,84,126.05,108.13,1.0E-5,2,81,193.83,37.88,0.54563,82,-34.87,51.01,0.45437,2,81,161.04,66.82,0.91652,82,-65.73,20.02,0.08348,1,81,128.25,95.76,1,1,81,80.97,100.98,1,2,80,264.25,13.19,0.01246,81,33.7,106.19,0.98754,3,79,312.81,162.56,2.4E-4,80,221.19,69.25,0.31653,81,-35.14,90.15,0.68323,3,79,272.83,167.84,0.00866,80,188.03,92.19,0.62689,81,-69.74,69.43,0.36445,3,79,232.85,173.13,0.04125,80,154.87,115.14,0.83373,81,-104.34,48.71,0.12502,3,79,158.13,169.34,0.21227,80,86.66,145.87,0.78597,81,-160.5,-0.71,0.00175,2,79,104.15,157.6,0.4043,80,33.27,160.06,0.5957,2,79,67.3,123.15,0.62991,80,-15.24,146.22,0.37009,2,79,30.46,88.7,0.8698,80,-63.75,132.38,0.1302,2,79,-1,56.96,0.97761,80,-106.23,118.5,0.02239,2,79,-32.46,25.22,0.99981,80,-148.71,104.61,1.9E-4,1,79,-52.9,-7.95,1,1,79,-73.35,-41.12,1,2,79,158.37,74.76,0.23918,80,43.71,61.61,0.76082,4,80,175.05,-114.71,0.01481,81,113.31,-27.87,0.55454,82,25.91,-33.33,0.41217,83,-97.11,20.24,0.01848,4,80,133.71,-9.55,0.84984,81,0.46,-22.08,0.14613,82,13.33,-145.62,8.7E-4,83,-165.79,-69.5,0.00316,3,79,97.86,-45.04,0.97689,80,-64.81,-17.38,0.01798,83,-56.51,-235.41,0.00514,1,79,40.4,-6.45,1,5,79,191.23,-23.93,0.08553,80,27.91,-41.21,0.83201,81,-14.41,-131.51,0.01142,82,121.67,-167.06,1.6E-4,83,-84.01,-143.71,0.07087,1,81,48.13,48.26,1,5,79,255.37,-41.82,0.01222,80,76.82,-86.4,0.50088,81,46.95,-105.64,0.13185,82,99.54,-104.26,0.04564,83,-70.59,-78.49,0.30941,4,80,81.56,-188.35,0.01759,81,141.75,-143.44,0.00241,82,142.98,-11.9,0.03233,83,14.25,-21.76,0.94767,3,79,225.52,111.12,0.03643,80,120.05,63.31,0.92236,81,-71.52,-4.42,0.04122,2,79,97.57,35.22,0.86912,80,-28.44,54.17,0.13088,4,80,80.39,-2.45,0.99635,81,-28.02,-67.7,0.00187,82,57.16,-176.8,1.4E-4,83,-144.31,-118.81,0.00164,5,79,300.22,-70.77,2.0E-4,80,103.5,-132.62,0.14731,81,100.07,-100.43,0.10732,82,97.54,-50.92,0.2557,83,-44.81,-31.76,0.48947,1,81,103.18,36.73,1,4,80,145.14,-64.05,0.18193,81,54.83,-34.18,0.70539,82,28.69,-92.09,0.06015,83,-125.03,-31.54,0.05253,1,79,3.56,-41.65,1,3,79,295.23,118.18,5.0E-4,80,185.3,37.78,0.36535,81,-21.32,44.46,0.63415,4,79,151.97,-6.03,0.367,80,1.14,-7.36,0.62916,81,-56.29,-141.9,3.0E-5,83,-99.16,-184.12,0.00381,2,82,70.6,10.91,0.99072,84,52.33,91.15,0.00928,2,79,91.57,95.88,0.62265,80,-6.09,110.88,0.37735,3,79,42.07,-69.93,0.99938,80,-125.81,-14.07,1.4E-4,83,-27.82,-289.34,4.7E-4,3,79,161.92,130.21,0.21468,80,72.17,109.32,0.78462,81,-133.21,-29.01,6.9E-4,2,81,155.18,6.4,0.44908,82,-5.77,10.53,0.55092,2,79,51.83,53.94,0.91358,80,-60.59,91.7,0.08642,4,80,92.81,-40.75,0.76617,81,11.98,-72.22,0.13802,82,64.07,-137.15,0.01562,83,-117.94,-88.39,0.0802,4,79,168.73,-60.02,0.43901,80,-8.59,-63.05,0.48475,81,-9.6,-173.76,0.00298,83,-46.46,-163.68,0.07326,3,82,155.53,44.58,3.4E-4,83,54.12,20.17,0.11655,84,21.45,5.16,0.88311,2,79,163.9,22.92,0.07152,80,24.97,12.96,0.92848],"hull":35,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,62,64,64,66,66,68,68,0],"width":452,"height":440}},"tail_b":{"tail_b":{"type":"mesh","uvs":[0.31626,0,0.37404,0.09754,0.43183,0.19509,0.49267,0.25605,0.64919,0.15345,0.80571,0.05086,0.87665,0.02977,0.98627,0.10785,1,0.15251,1,0.15531,0.90036,0.33062,0.83816,0.35413,0.7781,0.49328,0.71804,0.63243,0.61453,0.78842,0.51489,0.89214,0.41525,0.99586,0.25427,0.88236,0.2051,0.76577,0.15594,0.64918,0.14491,0.49846,0.13389,0.34774,0.08421,0.24664,0.00804,0.25066,0,0.25022,0,0.22052,0.11791,0.03845,0.20824,0,0.66434,0.44762,0.51691,0.60848,0.39727,0.55387,0.27133,0.37677,0.3602,0.70938,0.7471,0.29976,0.46117,0.73234,0.58729,0.4507,0.23725,0.62333,0.32511,0.22487,0.20027,0.21681,0.48109,0.46614],"triangles":[38,26,27,22,25,26,22,26,38,23,24,25,22,23,25,21,22,38,38,0,37,0,38,27,31,20,21,31,21,38,37,0,1,31,38,37,2,37,1,30,37,2,31,37,30,36,20,31,32,36,31,19,20,36,18,19,36,18,36,17,30,2,39,30,32,31,34,30,39,34,39,29,32,30,34,17,36,32,16,32,34,16,34,15,17,32,16,15,34,29,28,35,4,13,28,12,35,3,4,29,35,14,14,35,28,14,28,13,29,39,35,39,2,3,39,3,35,15,29,14,7,8,9,33,4,5,10,6,7,10,7,9,11,5,6,11,6,10,33,5,11,28,4,33,12,33,11,28,33,12],"vertices":[1,84,6.5,-9.32,1,4,80,74.32,-201.92,0.09,81,151.12,-155.64,4.2E-4,82,155.73,-3.28,0.26236,83,29.61,-20.94,0.64722,4,80,70.9,-151.46,0.13586,81,103.75,-137.91,0.05643,82,135.17,-49.5,0.41435,83,-11.83,-49.95,0.39336,4,80,57.77,-105.65,0.51222,81,56.61,-130.94,0.11576,82,125.38,-96.13,0.07259,83,-44.26,-84.85,0.29943,4,79,131.54,-45.8,0.80958,80,-35.19,-33.43,0.18522,81,-47.56,-185.75,3.0E-5,83,-58.07,-201.76,0.00517,1,79,15.87,-23.96,1,1,79,-33.44,-7.44,1,1,79,-96.04,46.92,1,1,79,-99.6,62.81,1,1,79,-99.26,63.54,1,1,79,-12.11,78.3,1,2,79,31.73,65.12,0.99179,80,-73.38,110.82,0.00821,2,79,88.37,82.73,0.80256,80,-14.94,100.64,0.19744,2,79,145,100.34,0.32067,80,43.49,90.47,0.67933,3,79,232.32,108.86,0.00339,80,125.07,58.2,0.73661,81,-64.8,-1.95,0.26,2,80,193.01,18.98,0.42,81,-1.01,43.71,0.58,2,80,260.94,-20.25,0.61,81,62.78,89.37,0.39,4,80,306.58,-133.03,0.12,81,184.34,84.33,0.53344,82,-81.81,44.33,0.30944,84,178.16,183.41,0.03712,3,81,226.87,59.83,0.24435,82,-54.79,85.3,0.60731,84,191.03,136.05,0.14834,3,81,269.39,35.32,0.05912,82,-27.76,126.27,0.64216,84,203.91,88.7,0.29872,3,81,287.12,-5.11,0.00878,82,13.66,141.54,0.51406,84,187.99,47.52,0.47716,2,82,55.08,156.8,0.22564,84,172.06,6.35,0.77436,2,82,77.64,197.39,0.02422,84,187.6,-37.4,0.97578,1,84,235.42,-65.49,1,1,84,240.34,-68.67,1,1,84,235.86,-75.95,1,1,84,135.27,-75.6,1,1,84,73.47,-50.55,1,2,79,157.68,35.53,0.1946,80,25.19,27.01,0.8054,4,80,127.4,-29.72,0.56069,81,16.24,-36.16,0.40742,82,28.34,-130.73,0.00334,83,-145.25,-64.47,0.02855,4,80,168.1,-108.31,0.02687,81,104.62,-31.57,0.57852,82,29.07,-42.23,0.33852,83,-98.99,10.98,0.05609,2,82,63.8,56.78,0.6657,84,91.24,65.93,0.3343,1,81,120.66,18.21,1,2,79,85.03,22.69,0.97447,80,-45.31,48.75,0.02553,1,81,47.58,7.84,1,3,80,60.13,-16.87,0.96628,81,-23.26,-92.11,0.01411,83,-121.49,-128.7,0.0196,3,81,213.46,14.54,0.11546,82,-10.39,69.19,0.70335,84,149.6,113.39,0.18118,3,82,113.55,25.61,0.74401,83,8.36,25.57,0.06702,84,34.97,49.2,0.18897,2,82,100.43,115.57,0.08897,84,111.15,-0.42,0.91103,4,80,110.84,-75.4,0.40056,81,50.99,-70.11,0.35064,82,64.32,-98.08,0.06651,83,-97.59,-55.05,0.18229],"hull":28,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,0],"width":364,"height":144}},"zj":{"a/zhuj_00001":{"width":1920,"height":1080},"a/zhuj_00002":{"width":1920,"height":1080},"a/zhuj_00003":{"width":1920,"height":1080},"a/zhuj_00004":{"width":1920,"height":1080},"a/zhuj_00005":{"width":1920,"height":1080},"a/zhuj_00006":{"width":1920,"height":1080},"a/zhuj_00007":{"width":1920,"height":1080},"a/zhuj_00008":{"width":1920,"height":1080},"a/zhuj_00009":{"width":1920,"height":1080},"a/zhuj_00010":{"width":1920,"height":1080},"a/zhuj_00011":{"width":1920,"height":1080},"a/zhuj_00012":{"width":1920,"height":1080},"a/zhuj_00013":{"width":1920,"height":1080},"a/zhuj_00014":{"width":1920,"height":1080},"a/zhuj_00015":{"width":1920,"height":1080}},"zj2":{"a/zhuj_00001":{"width":1920,"height":1080},"a/zhuj_00002":{"width":1920,"height":1080},"a/zhuj_00003":{"width":1920,"height":1080},"a/zhuj_00004":{"width":1920,"height":1080},"a/zhuj_00005":{"width":1920,"height":1080},"a/zhuj_00006":{"width":1920,"height":1080},"a/zhuj_00007":{"width":1920,"height":1080},"a/zhuj_00008":{"width":1920,"height":1080},"a/zhuj_00009":{"width":1920,"height":1080},"a/zhuj_00010":{"width":1920,"height":1080},"a/zhuj_00011":{"width":1920,"height":1080},"a/zhuj_00012":{"width":1920,"height":1080},"a/zhuj_00013":{"width":1920,"height":1080},"a/zhuj_00014":{"width":1920,"height":1080},"a/zhuj_00015":{"width":1920,"height":1080}}}}],"events":{"hit":{},"shou":{},"tui1":{}},"animations":{"attack":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00004"},{"time":0.1,"name":"eyefire/eyefire_00006"},{"time":0.1333,"name":"eyefire/eyefire_00008"},{"time":0.1667,"name":"eyefire/eyefire_00010"},{"time":0.2,"name":"eyefire/eyefire_00012"},{"time":0.2333,"name":"eyefire/eyefire_00014"},{"time":0.2667,"name":"eyefire/eyefire_00016"},{"time":0.3,"name":"eyefire/eyefire_00018"},{"time":0.3333,"name":"eyefire/eyefire_00020"},{"time":0.3667,"name":"eyefire/eyefire_00022"},{"time":0.4,"name":"eyefire/eyefire_00024"},{"time":0.4333,"name":"eyefire/eyefire_00026"},{"time":0.4667,"name":"eyefire/eyefire_00028"},{"time":0.5,"name":"eyefire/eyefire_00030"},{"time":0.5333,"name":"eyefire/eyefire_00032"},{"time":0.5667,"name":"eyefire/eyefire_00034"},{"time":0.6,"name":"eyefire/eyefire_00036"},{"time":0.6333,"name":"eyefire/eyefire_00000"},{"time":0.6667,"name":"eyefire/eyefire_00002"},{"time":0.7,"name":"eyefire/eyefire_00004"},{"time":0.7333,"name":"eyefire/eyefire_00006"},{"time":0.7667,"name":"eyefire/eyefire_00008"},{"time":0.8,"name":"eyefire/eyefire_00010"},{"time":0.8333,"name":"eyefire/eyefire_00012"},{"time":0.8667,"name":"eyefire/eyefire_00014"},{"time":0.9,"name":"eyefire/eyefire_00016"},{"time":0.9333,"name":"eyefire/eyefire_00018"},{"time":0.9667,"name":"eyefire/eyefire_00020"},{"time":1,"name":"eyefire/eyefire_00022"},{"time":1.0333,"name":"eyefire/eyefire_00024"},{"time":1.0667,"name":"eyefire/eyefire_00026"},{"time":1.1,"name":"eyefire/eyefire_00028"},{"time":1.1333,"name":"eyefire/eyefire_00030"},{"time":1.1667,"name":"eyefire/eyefire_00032"},{"time":1.2,"name":"eyefire/eyefire_00034"},{"time":1.2333,"name":"eyefire/eyefire_00036"},{"time":1.2667,"name":"eyefire/eyefire_00000"},{"time":1.3,"name":"eyefire/eyefire_00002"},{"time":1.3333,"name":"eyefire/eyefire_00000"}]},"s1":{"color":[{"color":"4951ff00"},{"time":0.5667,"color":"49faff00"},{"time":0.6,"color":"49d6ff7d"},{"time":0.8333,"color":"4951ff00"}]},"s2":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6,"color":"4951ff00"},{"time":0.6333,"color":"49b6ff7d"},{"time":0.8667,"color":"4951ff00"}]},"s3":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6333,"color":"4951ff00"},{"time":0.6667,"color":"49f0ff7d"},{"time":0.9,"color":"4951ff00"}]},"s4":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6667,"color":"4951ff00"},{"time":0.7,"color":"49f6ff7d"},{"time":0.9333,"color":"4951ff00"}]},"s5":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.7,"color":"4951ff00"},{"time":0.7333,"color":"49ebff7d"},{"time":0.9667,"color":"4951ff00"}]},"s6":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.7333,"color":"4951ff00"},{"time":0.7667,"color":"49e1ff7d"},{"time":1,"color":"4951ff00"}]},"skill":{"color":[{"color":"1fffe1ff"}]},"zj":{"color":[{"color":"ffffffff"}],"attachment":[{"name":null},{"time":0.6333,"name":"a/zhuj_00001"},{"time":0.6667,"name":"a/zhuj_00002"},{"time":0.7,"name":"a/zhuj_00003"},{"time":0.7333,"name":"a/zhuj_00004"},{"time":0.7667,"name":"a/zhuj_00005"},{"time":0.8,"name":"a/zhuj_00006"},{"time":0.8333,"name":"a/zhuj_00007"},{"time":0.8667,"name":"a/zhuj_00008"},{"time":0.9,"name":"a/zhuj_00009"},{"time":0.9333,"name":"a/zhuj_00010"},{"time":0.9667,"name":"a/zhuj_00011"},{"time":1,"name":"a/zhuj_00012"},{"time":1.0333,"name":"a/zhuj_00013"},{"time":1.0667,"name":"a/zhuj_00014"},{"time":1.1,"name":"a/zhuj_00015"},{"time":1.1333,"name":null}]},"zj2":{"color":[{"color":"ffffffff"}],"attachment":[{"name":null},{"time":0.6333,"name":"a/zhuj_00001"},{"time":0.6667,"name":"a/zhuj_00002"},{"time":0.7,"name":"a/zhuj_00003"},{"time":0.7333,"name":"a/zhuj_00004"},{"time":0.7667,"name":"a/zhuj_00005"},{"time":0.8,"name":"a/zhuj_00006"},{"time":0.8333,"name":"a/zhuj_00007"},{"time":0.8667,"name":"a/zhuj_00008"},{"time":0.9,"name":"a/zhuj_00009"},{"time":0.9333,"name":"a/zhuj_00010"},{"time":0.9667,"name":"a/zhuj_00011"},{"time":1,"name":"a/zhuj_00012"},{"time":1.0333,"name":"a/zhuj_00013"},{"time":1.0667,"name":"a/zhuj_00014"},{"time":1.1,"name":"a/zhuj_00015"},{"time":1.1333,"name":null}]}},"bones":{"r_ik":{"rotate":[{"time":0.1333,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1667,"angle":38.69},{"time":0.2667,"angle":2.56,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"angle":31.51},{"time":0.6667,"angle":-22.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.7}],"translate":[{"time":0.1333,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.1667,"x":24.02,"y":22.96},{"time":0.2667,"x":64.64,"y":225.09,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":56.03,"y":396.79},{"time":0.6667,"x":150,"y":122.9,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7}],"scale":[{"time":0.1333,"curve":0.25,"c3":0.75},{"time":0.1667,"x":0.503,"y":-0.381},{"time":0.2667,"y":-1,"curve":"stepped"},{"time":0.6333,"y":-1},{"time":0.6667,"y":-1.629,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.7}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":17.12,"y":13.52,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.1667,"x":-86.63,"y":-266.74},{"time":0.2,"x":-29.17,"y":-63},{"time":0.2333,"x":-24.28,"y":60.16},{"time":0.2667,"x":41.62,"y":67.15,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":0.16,"y":17.95},{"time":0.6667,"x":80.42,"y":-14.4,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"x":-20.57,"y":2.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"x":67.02,"y":-70.19,"curve":0.349,"c2":0.39,"c3":0.69,"c4":0.75},{"time":1.0667,"x":29.46,"y":-24.29,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"x":-59.3,"y":6,"curve":0.364,"c2":0.64,"c3":0.701},{"time":1.3333}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":82.85,"y":-12.22,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"x":47.4,"y":-37.21,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"x":-17.65,"y":-32.13,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.6667,"x":43.49,"y":42.81,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"x":21.85,"y":9.36,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7667,"x":-62.69,"y":-76.55,"curve":0.342,"c2":0.36,"c3":0.687,"c4":0.73},{"time":1.0667,"x":3.36,"y":12.83,"curve":0.379,"c2":0.6,"c3":0.723},{"time":1.3333}]},"l_ik":{"rotate":[{"time":0.0667,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1333,"angle":-34.28,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"angle":-63.4,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.6667,"angle":2.03,"curve":"stepped"},{"time":0.7,"angle":2.03,"curve":0.365,"c2":0.45,"c3":0.754},{"time":1.3333}],"translate":[{"time":0.0667,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1333,"x":-60.34,"y":70.73,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"x":-151.67,"y":380.94,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":29.71,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1333,"angle":7.38,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.6,"angle":36.02,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":76.11,"curve":0.338,"c2":0.36,"c3":0.671,"c4":0.69},{"time":0.7667,"angle":13.31,"curve":0.348,"c2":0.44,"c3":0.682,"c4":0.78},{"time":1.0667,"angle":21.11,"curve":0.35,"c2":0.65,"c3":0.684},{"time":1.3333,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":"stepped"},{"time":0.1333,"x":-7.85,"y":2.92,"curve":0.347,"c2":0.39,"c3":0.682,"c4":0.73},{"time":0.6,"x":99.36,"y":8.92,"curve":0.367,"c2":0.63,"c3":0.704},{"time":1.3333,"x":-7.85,"y":2.92}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":37.22,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":73.39,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":77.65,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":22.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":50.48,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":48.95,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":59.93,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":1.54,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-6.68,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"angle":-4.77,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}],"translate":[{"time":0.0667,"curve":0.325,"c2":0.23,"c3":0.659,"c4":0.56},{"time":0.1333,"x":39.49,"y":101.31,"curve":0.305,"c2":0.17,"c3":0.641,"c4":0.52},{"time":0.6,"x":6.66,"y":41.87,"curve":0.329,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.6667,"x":28.08,"y":83.67,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"x":5.91,"y":37.16,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7333,"x":-29.5,"y":109.03,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7667,"x":-21.98,"y":129.19,"curve":0.322,"c2":0.3,"c3":0.658,"c4":0.64},{"time":1.0333,"x":0.7,"y":-13.01,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0667,"x":-19.75,"y":-19.42,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.1667,"x":-16.77,"y":-3.81,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.3333}]},"l_upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":8.27,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":1.52,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":-25.71,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":37.43,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":30.18,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":8.56,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":-4.37,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":-2.06,"curve":0.38,"c2":0.6,"c3":0.725},{"time":1.3333,"angle":-6.45}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":45.87,"y":-1.01,"curve":0.287,"c2":0.15,"c3":0.634,"c4":0.54},{"time":0.6,"x":12.36,"y":-44.52,"curve":0.329,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.7,"x":-15.16,"y":-9.56,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"x":-100.98,"y":22.47,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-34.69,"y":12.67,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"x":-54.29,"y":-30.69,"curve":0.38,"c2":0.6,"c3":0.725},{"time":1.3333}]},"l_finger_a":{"rotate":[{"angle":-2.5}]},"l_finger_a2":{"rotate":[{"angle":5.32}],"translate":[{"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5}]},"l_finger_b2":{"rotate":[{"angle":16.78}],"translate":[{"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5}]},"l_finger_c2":{"rotate":[{"angle":16.54}],"translate":[{"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_d":{"rotate":[{"angle":-2.5}]},"l_finger_d2":{"rotate":[{"angle":26.01}],"translate":[{"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r_upparm":{"rotate":[{"angle":-6.94,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-42.16,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"angle":2.03,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":47.11,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":79.85,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":55.18,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":6.04,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":-0.99,"curve":0.337,"c2":0.35,"c3":0.674,"c4":0.69},{"time":0.9333,"angle":-35.06,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"angle":-32.65,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-28.99,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"angle":-6.33,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":25.34,"y":-85.66,"curve":0.289,"c2":0.17,"c3":0.641,"c4":0.57},{"time":0.6,"x":65.74,"y":35.42,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"x":117.09,"y":-47.26,"curve":0.34,"c2":0.35,"c3":0.679,"c4":0.71},{"time":0.9333,"x":-13.82,"y":-152.47,"curve":0.341,"c2":0.36,"c3":0.676,"c4":0.7},{"time":1.0333,"x":3.6,"y":-136.8,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":30.12,"y":-113.75,"curve":0.375,"c2":0.62,"c3":0.715},{"time":1.3333}]},"r_upparm2":{"rotate":[{"angle":12.97,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-1.38,"curve":0.322,"c2":0.23,"c3":0.656,"c4":0.56},{"time":0.0667,"angle":12.97,"curve":0.308,"c3":0.643,"c4":0.35},{"time":0.1,"angle":42.24,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":78.82,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":24.1,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":18.81,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":0.7,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":14.3,"curve":0.337,"c2":0.35,"c3":0.674,"c4":0.69},{"time":0.9333,"angle":15.51,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"angle":31.74,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":35.18,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333,"angle":12.97}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.6,"x":122.67,"y":45.28,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":73.71,"y":95.62,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":-46.55,"y":-38.81,"curve":0.335,"c2":0.34,"c3":0.675,"c4":0.69},{"time":0.9333,"x":-24.66,"y":-20.56,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"x":42.13,"y":20.67,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":25.48,"y":11.95,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333}]},"r_finger_a":{"rotate":[{"angle":14.41}]},"r_finger_b":{"rotate":[{"angle":-8.92}]},"r_finger_c":{"rotate":[{"angle":-9.49}]},"r_finger_d":{"rotate":[{"angle":7.12}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-28.12,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":44.43,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-3.92,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":-9.95,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.7667,"angle":-4.89,"curve":0.353,"c2":0.42,"c3":0.689,"c4":0.77},{"time":1.0667,"angle":-2.65,"curve":0.343,"c2":0.4,"c3":0.677,"c4":0.74},{"time":1.1667,"angle":-6.58,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"angle":-4.31}],"translate":[{"time":0.1333,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":-82.09,"y":-2.66,"curve":0.333,"c2":0.33,"c3":0.669,"c4":0.67},{"time":0.7667}]},"r_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":23.99,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"angle":5.22,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"angle":-18.84,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":7.33,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"angle":-13.57,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"angle":19.53,"curve":0.349,"c2":0.39,"c3":0.69,"c4":0.75},{"time":1.0667,"angle":-8.27,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":7.25,"curve":0.364,"c2":0.64,"c3":0.701},{"time":1.3333}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-17.47,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-7.31,"curve":0.336,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.3667,"angle":19.96,"curve":0.34,"c2":0.36,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-21.12,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":13.14,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":-13.39,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-41.77,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.9333,"angle":27.48,"curve":0.343,"c2":0.39,"c3":0.677,"c4":0.73},{"time":1.0667,"angle":-3.74,"curve":0.342,"c2":0.4,"c3":0.676,"c4":0.74},{"time":1.1667,"angle":-17.22,"curve":0.351,"c2":0.65,"c3":0.686},{"time":1.3333,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0667,"angle":23.99,"curve":0.326,"c2":0.23,"c3":0.66,"c4":0.56},{"time":0.1333,"angle":5.22,"curve":0.296,"c2":0.14,"c3":0.635,"c4":0.5},{"time":0.6,"angle":-18.84,"curve":0.33,"c2":0.32,"c3":0.664,"c4":0.65},{"time":0.6667,"angle":7.33,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"angle":-13.57,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.7667,"angle":19.53,"curve":0.324,"c2":0.3,"c3":0.66,"c4":0.64},{"time":1.0667,"angle":-8.27,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.1667,"angle":7.25,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.3333}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-11.92,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-1.76,"curve":0.336,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.3667,"angle":25.52,"curve":0.34,"c2":0.36,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-15.57,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":18.69,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":-7.84,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-36.22,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.9333,"angle":33.03,"curve":0.343,"c2":0.39,"c3":0.677,"c4":0.73},{"time":1.0667,"angle":1.81,"curve":0.342,"c2":0.4,"c3":0.676,"c4":0.74},{"time":1.1667,"angle":-11.67,"curve":0.351,"c2":0.65,"c3":0.686},{"time":1.3333,"angle":3.27}]},"head2":{"rotate":[{"time":0.6667,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"angle":5.87,"curve":0.377,"c2":0.51,"c3":0.748},{"time":1.0667}]},"r_leg":{"scale":[{"time":0.1333,"curve":0.25,"c3":0.75},{"time":0.1667,"x":0.787,"y":-1,"curve":"stepped"},{"time":0.6333,"x":0.787,"y":-1},{"time":0.6667}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":25.34,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-42.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-24.81,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":161.27,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-143.61,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":108.86,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":36.8,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-4.25,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.8,"angle":-31.24,"curve":0.342,"c2":0.37,"c3":0.676,"c4":0.7},{"time":0.9333,"angle":-58.68,"curve":0.341,"c2":0.37,"c3":0.675,"c4":0.71},{"time":1.0333,"angle":-90.06,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-48.42,"curve":0.343,"c2":0.4,"c3":0.677,"c4":0.74},{"time":1.1667,"angle":-6.5,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-135.88,"y":5.39,"curve":0.325,"c2":0.23,"c3":0.659,"c4":0.56},{"time":0.0667,"x":-256.76,"y":63.87,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"x":318.1,"y":-171.89,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"x":1082.98,"y":45.2,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"x":754.88,"y":728.06,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":1273.35,"y":-53.61,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":455.27,"y":-180.44,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-64.06,"y":-103.48,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.8,"x":-68.82,"y":-25.93,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9333,"x":-153.32,"y":121.18,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"x":-58.69,"y":40.26,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":-44.28,"y":-55.53,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"x":122.47,"y":-55.31,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":0.803,"y":0.682,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"y":-1,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"x":0.994,"y":-0.844,"curve":"stepped"},{"time":0.7,"x":0.994,"y":-0.844,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7667,"x":0.831,"y":-0.93,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.8,"x":0.789,"y":-0.755,"curve":"stepped"},{"time":1.0333,"x":0.789,"y":-0.755,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":1.0667,"x":0.695,"curve":0.25,"c3":0.75},{"time":1.3333}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-9.73,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":-23.13,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":4.69,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":-61.02,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7667,"angle":-32.79,"curve":0.345,"c2":0.37,"c3":0.689,"c4":0.74},{"time":1.0667,"angle":-13.92,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-186.25,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"x":48.5,"y":40.9,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"y":345.15,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":248.34,"y":-36.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":61.3,"y":-61.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-206.23,"y":-101.45,"curve":0.345,"c2":0.37,"c3":0.689,"c4":0.74},{"time":1.0667,"x":2.79,"y":-19.68,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"x":29.1,"y":32.67,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-31,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"angle":78.45,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":-152.46,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":-87.67,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.6333,"angle":-108,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.6667,"angle":-114.69,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":-105.82,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":41.72,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":27.63,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":3.14,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.3333,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":103.03,"y":16.59,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"x":349.17,"y":93.6,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":377,"y":129.38,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"x":432.04,"y":252.54,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"x":-13.24,"y":1029.9,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.6333,"x":284.88,"y":696.93,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.6667,"x":752.07,"y":275.43,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"x":362.28,"y":224.75,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7333,"x":252.8,"y":12.37,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"x":80.29,"y":-97.37,"curve":0.351,"c2":0.41,"c3":0.686,"c4":0.75},{"time":1.0333,"x":15.48,"y":-24.23,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.1667,"x":-52.17,"y":55.03,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":"stepped"},{"time":0.0667,"x":0.95,"y":0.95,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":0.95,"y":-0.95,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"x":1.29,"y":-1.29,"curve":0.347,"c2":0.38,"c3":0.688,"c4":0.74},{"time":0.6,"x":1.232,"y":-1.232,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.6333,"x":1.232,"y":-0.809,"curve":0.345,"c2":0.37,"c3":0.68,"c4":0.71},{"time":0.6667,"x":1.232,"y":-1.232,"curve":0.347,"c2":0.38,"c3":0.689,"c4":0.74},{"time":0.7,"x":0.875,"y":-0.95,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7333,"x":0.975,"y":0.844,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"curve":0.37,"c2":0.63,"c3":0.708},{"time":1.3333,"x":0.95,"y":0.95}]},"shadow":{"scale":[{"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.0667,"y":0.757,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"y":0.811,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"y":1.253,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"y":1.164,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"y":0.986,"curve":0.377,"c2":0.51,"c3":0.748},{"time":0.7667}]},"r_arm":{"rotate":[{"angle":-8.2,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-13.93},{"time":0.0667,"angle":-60.51},{"time":0.1,"angle":-62.71},{"time":0.1333,"angle":-25.84},{"time":0.6,"angle":27.68},{"time":0.6667,"angle":3.05},{"time":0.7,"angle":-137.79},{"time":0.7667,"angle":171.9},{"time":0.8,"angle":157.91},{"time":0.9333,"angle":144.13},{"time":1.0333,"angle":124.02},{"time":1.0667,"angle":-32.36},{"time":1.3333,"angle":-8.2}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-41.06,"y":-16.61},{"time":0.1,"x":-27.22,"y":52.6},{"time":0.1333,"x":5.47,"y":50.88},{"time":0.6,"x":-26.72,"y":-9.06},{"time":0.6667,"x":-136.32,"y":1.61},{"time":0.7,"x":80.65,"y":75.26},{"time":0.7667,"x":84.81,"y":71.67},{"time":0.8,"x":9.26,"y":-15.84},{"time":0.9333,"x":7.48,"y":-9.84},{"time":1.0333,"x":6.15,"y":-5.35},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":0.708},{"time":0.1,"x":0.717},{"time":0.1333,"x":0.803},{"time":0.6,"x":0.817,"y":0.762},{"time":0.6667,"x":1.37},{"time":0.7,"x":-1.065},{"time":0.9333,"x":-1.368},{"time":1.0333,"x":-1.021},{"time":1.0667}]},"l_armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-70.14},{"time":0.1,"angle":-13.03},{"time":0.1333,"angle":115.4},{"time":0.6,"angle":147.71},{"time":0.6667,"angle":139.35},{"time":0.7,"angle":144.7},{"time":0.7333,"angle":179.91},{"time":0.7667,"angle":-15.92},{"time":1.0333,"angle":-2.99},{"time":1.3333,"angle":1.84}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-47.04,"y":42.46},{"time":0.1,"x":11.52,"y":-6.65},{"time":0.1333,"x":53.7,"y":-2.86},{"time":0.6,"x":61.61,"y":1.75},{"time":0.6667,"x":61.32,"y":5.82},{"time":0.7,"x":85.02,"y":2.27},{"time":0.7333,"x":25.94,"y":7.26},{"time":0.7667,"x":-46.14,"y":-10.29},{"time":1.0333,"x":-0.75,"y":-10.81},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":1.09},{"time":0.1333,"x":0.706,"y":0.847},{"time":0.6,"x":2.248},{"time":0.7,"x":1.63},{"time":0.7333,"x":-1.044},{"time":0.7667,"x":1.584},{"time":1.0333,"x":1.27},{"time":1.3333}]},"r_finger_a2":{"rotate":[{"angle":14.41}]},"r_finger_b2":{"rotate":[{"angle":-8.92}]},"r_finger_c2":{"rotate":[{"angle":-9.49}]},"r_finger_d2":{"rotate":[{"angle":7.12}]},"l_hand2":{"scale":[{"x":0,"y":0}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":15.59},{"time":0.1333,"angle":18.42},{"time":0.6,"angle":13.11},{"time":0.6667,"angle":57.13},{"time":0.7,"angle":7.32},{"time":0.7667,"angle":15.43},{"time":1.0667,"angle":15.55},{"time":1.1667},{"time":1.3333,"angle":9.15}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":0.751},{"time":0.1333,"y":0.853},{"time":0.6,"x":0.659,"y":0.822},{"time":1.3333}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0667,"x":26.77},{"time":0.1333,"x":16.87},{"time":0.6,"x":29.56},{"time":0.6667,"x":-0.2},{"time":0.7667,"x":-0.17,"y":-10.27},{"time":1.0667,"x":-0.08,"y":8.78},{"time":1.3333,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":44.9},{"time":0.1333,"angle":-45.16},{"time":0.6,"angle":11.27},{"time":0.6667,"angle":54.79},{"time":0.7,"angle":35.24},{"time":0.7667,"angle":19.05},{"time":1.0667,"angle":-20.9},{"time":1.1667,"angle":14.34},{"time":1.3333,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":44.9},{"time":0.1333,"angle":38.44},{"time":0.3,"angle":-18.77},{"time":0.6,"angle":7.41},{"time":0.6667,"angle":-24.12},{"time":0.7,"angle":35.24},{"time":0.7667,"angle":31.85},{"time":1.0667,"angle":-20.9},{"time":1.1667,"angle":-20.36},{"time":1.3333,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-12.38},{"time":0.1333,"angle":-36.29},{"time":0.3,"angle":-24.56},{"time":0.6,"angle":-31.83},{"time":0.6667,"angle":-110.13},{"time":0.7,"angle":-83.67},{"time":0.7667},{"time":1.0667,"angle":26.37},{"time":1.1667,"angle":-10.6},{"time":1.3333,"angle":7.98}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-112.87,"y":-109.8},{"time":0.1333,"x":-133.67,"y":-105.23},{"time":0.1667,"x":-101.04,"y":-49.3},{"time":0.3,"x":-176.77,"y":-36.51},{"time":0.6,"x":-99.31,"y":-37.52},{"time":0.6667,"x":-100.9,"y":-138.3},{"time":0.7,"x":-72.09,"y":-142.33},{"time":0.7667,"x":-110.87,"y":-78.71},{"time":1.0667,"x":-24.67,"y":-48.57},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":2.138,"y":2.138},{"time":0.1333,"x":2.823,"y":1.854},{"time":0.6,"x":2.967,"y":1.522},{"time":0.6667,"x":1.934,"y":1.474},{"time":1.3333}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":33.36},{"time":0.1333,"angle":7.96},{"time":0.6,"angle":24.88},{"time":0.6667,"angle":45.51},{"time":0.7,"angle":21.47},{"time":0.7667,"angle":-9.31},{"time":1.0667,"angle":-33.22},{"time":1.1667,"angle":29.51},{"time":1.3333,"angle":-9.62}]},"r_upparm3":{"rotate":[{},{"time":0.0667,"angle":56.14},{"time":0.1333,"angle":-50.51},{"time":0.6,"angle":-135.48},{"time":0.6667,"angle":-136.3},{"time":0.7,"angle":-23.42},{"time":0.7667,"angle":-21.34},{"time":1.0667,"angle":6.75},{"time":1.1667,"angle":4.67},{"time":1.3333}],"translate":[{},{"time":0.6,"x":127.5,"y":81.83},{"time":0.6667,"x":135.42,"y":147.68},{"time":0.7},{"time":0.7667,"x":-12.2,"y":-20.68},{"time":1.0667}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":15.49},{"time":0.1333},{"time":0.6,"angle":-31.98},{"time":0.6667,"angle":10.06},{"time":0.7,"curve":"stepped"},{"time":0.7667},{"time":1.0667,"angle":-9.17},{"time":1.1667},{"time":1.3333,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-42.06},{"time":0.1333,"angle":18.35},{"time":0.6,"angle":-45.41},{"time":0.6667,"angle":-50.42},{"time":0.7,"curve":"stepped"},{"time":0.7667},{"time":1.0667,"angle":6.4},{"time":1.1667},{"time":1.3333,"angle":4.52}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-91.9},{"time":0.1333,"angle":-74.48},{"time":0.6,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-56.28},{"time":0.1333,"angle":-77.8},{"time":0.6,"angle":33.91},{"time":0.6667},{"time":0.7,"angle":-18.96},{"time":0.7667,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-11.95}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":39.84},{"time":0.1333,"angle":31.32},{"time":0.6,"angle":86.4},{"time":0.6667,"angle":83.56},{"time":0.7,"angle":26.29},{"time":0.7667,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-8.22}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":19.89,"y":-14.88},{"time":0.1333,"x":32.79,"y":-41.73},{"time":0.6,"x":19.38,"y":-35.79},{"time":0.6667,"x":2.31,"y":-7.7},{"time":1.3333}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667},{"time":0.1333,"angle":43.27},{"time":0.6,"angle":55.73},{"time":0.6667},{"time":0.7,"angle":-67.87},{"time":0.7667,"angle":4.09},{"time":1.0667,"angle":20.21},{"time":1.1667},{"time":1.3333,"angle":-1.85}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":4.88,"y":-43.61},{"time":0.1333,"x":-11.93,"y":65},{"time":0.6,"x":31.93,"y":-32.46},{"time":0.6667,"x":-54.15,"y":41.88},{"time":0.7,"x":21.7,"y":68.45},{"time":0.7667,"x":32.71,"y":67.25},{"time":1.0667,"x":-47.13,"y":35.86},{"time":1.3333}]},"hair_t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":8.52},{"time":0.1333,"angle":-8.98},{"time":0.6,"angle":0.79},{"time":0.6667,"angle":-1.02},{"time":0.7,"angle":-8.68},{"time":0.7667},{"time":1.0667,"angle":-6.38},{"time":1.1667}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":12.22},{"time":0.1333,"angle":-7.25},{"time":0.6,"angle":-5.48},{"time":0.6667,"angle":-12.84},{"time":0.7,"angle":5.93},{"time":0.7667},{"time":1.0667,"angle":-10.87},{"time":1.1667},{"time":1.3333,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-21.87},{"time":0.1333,"angle":32.23},{"time":0.3333,"angle":21.14},{"time":0.6,"angle":40.57},{"time":0.6667,"angle":13.45},{"time":0.7,"angle":14.83},{"time":0.7667,"angle":14.44},{"time":1.0667,"angle":10.66},{"time":1.1667,"angle":11.02},{"time":1.3333,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-29.51},{"time":0.1333,"angle":-41.13},{"time":0.3333,"angle":22.09},{"time":0.6,"angle":26.89},{"time":0.6667,"angle":-3.93},{"time":0.7,"angle":-23.54},{"time":0.7667,"angle":12.73},{"time":1.0667,"angle":5.46},{"time":1.1667,"angle":-0.83},{"time":1.3333,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":44.78},{"time":0.1333,"angle":28.47},{"time":0.3333,"angle":48.31},{"time":0.6,"angle":85.29},{"time":0.6667,"angle":9.1},{"time":0.7,"angle":29.31},{"time":0.7667,"angle":56.03},{"time":1.0667,"angle":95.45},{"time":1.1667,"angle":18.9},{"time":1.3333,"angle":63.33}]},"headmouth":{"rotate":[{"time":0.6667},{"time":0.7,"angle":0.32},{"time":0.7667,"angle":-7.36},{"time":1,"angle":-15.78},{"time":1.1667,"angle":-4.46},{"time":1.3333}],"translate":[{"time":0.6667},{"time":0.7,"x":-9.23,"y":5.08},{"time":0.7667,"x":-14.87,"y":16.6},{"time":1,"x":-7.26,"y":35.86},{"time":1.3333}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-13.02},{"time":0.1333,"angle":-24.09},{"time":0.6,"angle":-18.83},{"time":0.6667,"angle":-10.89},{"time":0.7,"angle":-19.1},{"time":0.7667,"angle":-21.93},{"time":1.0667,"angle":-5.66},{"time":1.1667,"angle":-2.83},{"time":1.3333,"angle":8.77}],"scale":[{"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-13.02},{"time":0.1333,"angle":-24.09},{"time":0.6,"angle":9.35},{"time":0.6667,"angle":-23.49},{"time":0.7,"angle":14.32},{"time":0.7667,"angle":-3.09},{"time":0.8333,"angle":-32.51},{"time":1.0667,"angle":2.58},{"time":1.1667,"angle":-4.79},{"time":1.3333,"angle":-0.61}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-53.23,"y":-6.97},{"time":0.6,"x":-73.04,"y":-5.93},{"time":0.6667,"x":-86.38,"y":19.37},{"time":0.7,"x":-62.23,"y":-13.36},{"time":0.7667,"x":-6.3,"y":2.44},{"time":1.3333}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":26.12},{"time":0.1333,"angle":-33.86},{"time":0.6,"angle":17.96},{"time":0.6667,"angle":-30.75},{"time":0.7,"angle":14.32},{"time":0.7667,"angle":44.83},{"time":0.8333,"angle":32.69},{"time":1.0667,"angle":-51.59},{"time":1.1667,"angle":8.36},{"time":1.3333,"angle":-10}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.93},{"time":0.1333,"angle":-10.83},{"time":0.3,"angle":-17.1},{"time":0.6,"angle":-16.9},{"time":0.6667,"angle":20.79},{"time":0.7,"angle":13.57},{"time":0.7667,"curve":"stepped"},{"time":1.0667},{"time":1.1667,"angle":-5.03},{"time":1.3333,"angle":-11.82}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":41.46},{"time":0.1333,"angle":-31.95},{"time":0.3,"angle":10.84},{"time":0.6},{"time":0.6667,"angle":45.5},{"time":0.7,"angle":-15.56},{"time":0.7667,"angle":-27.01},{"time":1.0667,"angle":13.84},{"time":1.1667,"angle":2.84},{"time":1.3333,"angle":1.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-58.71,"y":-18.28},{"time":0.3,"x":-43.07,"y":-3.13},{"time":0.6,"x":-8.1,"y":-1.98},{"time":0.6667,"x":-84.71,"y":-4.69},{"time":0.7,"x":-54.46,"y":-33.89},{"time":0.7667,"x":-3.81,"y":-47.8},{"time":1.0667,"x":-40.87,"y":-40.97},{"time":1.1667,"x":1.02,"y":-5.62},{"time":1.3333}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":23.83},{"time":0.1333,"angle":-25.44},{"time":0.6,"angle":24.3},{"time":0.6667,"angle":45.5},{"time":0.7,"angle":29.05},{"time":0.7667,"angle":13.4},{"time":0.8667,"angle":-24.92},{"time":1.0667,"angle":-20.59},{"time":1.1667,"angle":11.55},{"time":1.3333,"angle":15.47}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-19.5},{"time":0.1333,"angle":16.7},{"time":0.6,"angle":7.2},{"time":0.6667,"angle":39.42},{"time":0.7,"angle":-34.68},{"time":0.7667,"angle":34.93},{"time":1.0667,"angle":-21.35},{"time":1.1667},{"time":1.3333,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-35.8},{"time":0.1333,"angle":68.99},{"time":0.6,"angle":-26.98},{"time":0.6667,"angle":56.47},{"time":0.7,"angle":-44.29},{"time":0.7667,"angle":-15.83},{"time":1.0667,"angle":37.68},{"time":1.1667},{"time":1.3333,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":6.21,"y":10.67},{"time":0.6,"x":9.81,"y":-25.6},{"time":0.7,"x":-26.54,"y":-20.81},{"time":0.7667,"x":-1.22,"y":-7.58},{"time":1.3333,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":37.1},{"time":0.1333,"angle":-42.72},{"time":0.6,"angle":72.54},{"time":0.6667,"angle":-44.71},{"time":0.7,"angle":14.62},{"time":0.7667,"angle":43.02},{"time":1.0667,"angle":-30.54},{"time":1.1667,"angle":-2.06},{"time":1.3333,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":13.87},{"time":0.1333,"angle":16.7},{"time":0.2667,"angle":56.98},{"time":0.6,"angle":16.82},{"time":0.6667,"angle":-4.21},{"time":0.7,"angle":52.49},{"time":0.7667,"angle":80.81},{"time":1.0667,"angle":63.64},{"time":1.1667,"angle":-20.36},{"time":1.3333,"angle":26.63}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":9.54}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":40.99}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":8.76}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":-10.54},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":-0.6}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":6.67}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":-10.54},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":3.67}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"r_ear_s":{"rotate":[{"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":27.35,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":8.97,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.2667,"angle":37.07,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.6,"angle":16.2,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":-23.8,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":46.84,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":19.5,"curve":0.341,"c2":0.37,"c3":0.675,"c4":0.7},{"time":0.9,"angle":-3.82,"curve":0.345,"c2":0.4,"c3":0.68,"c4":0.74},{"time":1.0667,"angle":8.97,"curve":0.342,"c2":0.4,"c3":0.676,"c4":0.74},{"time":1.1667,"angle":17.06,"curve":0.351,"c2":0.65,"c3":0.686},{"time":1.3333,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"r_eye_fire":{"rotate":[{},{"time":0.0667,"angle":-7.84},{"time":0.1333,"angle":-32.4},{"time":0.6,"angle":-46.07},{"time":0.6667,"angle":-6},{"time":0.7,"angle":-7.95},{"time":0.7667,"angle":20.37},{"time":1.0667,"angle":-15.05},{"time":1.1667,"angle":-5.08},{"time":1.3333}]},"s1":{"translate":[{"x":44.14,"y":871.69},{"time":0.6,"x":39.16,"y":905.66}],"scale":[{"x":5,"y":5}]},"s2":{"translate":[{"x":250.1,"y":731.92},{"time":0.6333,"x":278.27,"y":730.27}],"scale":[{"x":5,"y":5}]},"s3":{"translate":[{"x":522.28,"y":518.6},{"time":0.6667,"x":313.28,"y":707.08}],"scale":[{"x":5,"y":5}]},"s4":{"translate":[{"x":257.46,"y":525.95}],"scale":[{"x":5,"y":5}]},"s5":{"translate":[{"x":217,"y":511.24}],"scale":[{"x":5,"y":5}]},"s6":{"translate":[{"x":189.08,"y":511.24}],"scale":[{"x":5,"y":5}]},"s":{"scale":[{"x":0,"y":0},{"time":0.0333,"curve":"stepped"},{"time":1.3},{"time":1.3333,"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"zj":{"rotate":[{"angle":39.03},{"time":0.6333,"angle":14.74},{"time":0.7333,"angle":-4.12},{"time":0.9667,"angle":-7.72}],"translate":[{"x":-1638.68,"y":144.25},{"time":0.6333,"x":-1834.28,"y":20.37},{"time":0.7333,"x":-1638.68,"y":144.25}],"scale":[{"x":2.807,"y":2.807}],"shear":[{"y":-13}]},"zj2":{"rotate":[{"angle":39.03},{"time":0.6333,"angle":-13.63},{"time":0.7333,"angle":-7.4},{"time":0.9667,"angle":-11.28}],"translate":[{"x":-1638.68,"y":144.25},{"time":0.6333,"x":-1638.68,"y":-83.37}],"scale":[{"x":2.807,"y":2.807}],"shear":[{"y":17}]}},"ik":{"lhand":[{"softness":50},{"time":0.0333,"mix":0,"softness":50,"curve":"stepped"},{"time":1.0333,"mix":0,"softness":50},{"time":1.3333,"softness":50}],"r_ik":[{"time":0.6}],"r_ik2":[{"time":0.1333,"softness":50,"curve":"stepped"},{"time":0.1667,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":0.6,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":0.6667,"softness":50}],"rhand":[{"softness":50},{"time":0.0333,"mix":0,"softness":50,"curve":"stepped"},{"time":1.0333,"mix":0,"softness":50},{"time":1.0667,"softness":50}]},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.2,"vertices":[-31.93134,-81.1846,-42.60324,-50.47324,-21.36816,-62.50143,-20.28406,-38.41428,-4.95038,-43.16226,1.75409,-26.59991,11.29492,-24.15213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14.02216,-58.32932,1.53766,-64.53867,-10.9469,-70.74783,-21.43884,-75.96606,0,0,0,0,0,0,9.83972,-34.66701,21.75732,-28.73352,0,0,0,0,0,0,0,0,0,0,0,0,34.44312,-29.9411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1.04004,-56.24902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-30.10202,-50.38266,-9.75293,-57.8786],"curve":0.328,"c2":0.27,"c3":0.661,"c4":0.6},{"time":0.6,"vertices":[-7.16339,-66.76302,5.08936,-49.54437,-1.29144,-49.78841,4.49988,-18.28939,2.12268,-18.7148,9.95319,-12.1902,8.31146,-13.36357,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.1665,0.00913,0.16797,-0.01204,1.97058,0.11008,1.96887,-0.14279,6.69678,13.14975,8.32507,12.18524,14.53662,38.57264,19.35376,36.39595,20.49756,75.40443,29.97852,72.16203,6.336,27.22184,9.76855,26.18748,2.30487,10.26134,3.60046,9.88228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25.71436,-29.77234,17.19019,-34.88861,-5.34116,-25.95972,2.87909,-26.34647,30.28652,-123.59125,69.57217,-109.37783,55.94293,-119.57079,12.49084,25.94439,21.61969,24.69611,35.44558,-124.35976,28.14204,-133.34988,4.31403,19.35526,14.09491,17.24059,48.12115,-135.29684,-3.29041,-14.08661,10.0495,-16.24655,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.90897,-144.90884,-11.19832,-140.3,-7.68707,-43.81539,6.48303,-44.93758,0.21606,1.12893,0.35913,1.0921,-5.72417,-40.28438,54.25677,-122.33961,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-4.50888,-9.19664,6.18164,-11.14027,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-2.07217,-24.64662,6.72906,-25.35147,55.4898,-115.34093,44.22822,-137.56801,0.70801,0.03941,0.70764,-0.05124,3.12305,2.39338,3.40527,1.97456]},{"time":0.6667,"vertices":[3.6321,-100.9129,62.7143,-54.9528,12.52618,-87.53851,61.60427,-40.45278,16.05284,-73.74738,80.50346,-26.3567,38.5543,-76.38689,18.67151,22.63937,29.30438,1.55887,-5.25476,-10.40659,-11.2193,-3.168,-2.58197,-0.24799,-1.92908,1.73404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-19.46552,-13.89214,-5.67834,-52.09679,11.59296,-45.30103,28.76481,-58.07358,21.99501,-68.80438,-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,37.42488,-76.73364,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,58.73687,-116.59249,45.50251,-140.80627]},{"time":0.7,"offset":86,"vertices":[-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,55.4898,-115.34093,44.22822,-137.56801]},{"time":1.0667}]},"r_armour_t":{"r_armour_t":[{"time":0.1},{"time":0.1333,"vertices":[363.86145,-406.77414,-154.45874,172.56805,-444.83313,480.81378,73.48755,-98.52859],"curve":"stepped"},{"time":0.6667,"vertices":[363.86145,-406.77414,-154.45874,172.56805,-444.83313,480.81378,73.48755,-98.52859]},{"time":0.7}]},"r_armour_u":{"r_armour_u":[{},{"time":0.6,"offset":2,"vertices":[33.29639,97.05774,25.34796,-46.59947,19.17896,-49.4594,0,0,0,0,46.1908,-30.76799,41.87512,-36.42543,63.92395,-85.74211,52.42944,-93.21632,50.58545,147.45459]},{"time":0.7,"offset":2,"vertices":[40.94677,-10.65396,13.24945,-35.16621,10.98497,-34.38681,0,0,0,0,39.89206,-26.57236,36.16488,-31.45833,34.73873,-44.58083,39.64137,-45.07053,45.15741,2.10747]},{"time":1.3333}]},"r_upparm":{"r_upparm":[{},{"time":0.0667,"vertices":[43.13046,-13.27382,-36.1978,-26.94739,5.74899,22.31195,0,0,0,0,0,0,0,0,0,0,31.6051,18.1186,-4.06282,-36.20312,38.16904,39.10783,37.80072,30.64732,43.97684,21.13391,55.23495,13.60487,67.52536,11.74265]},{"time":0.1333,"vertices":[60.07882,-69.59204,19.27461,1.86738,5.44641,21.13764,0,0,0,0,0,0,0,0,0,0,66.70468,20.39863,-12.45708,1.58896,184.55437,33.34988,148.37286,83.35548,67.07377,93.50201,-36.5234,56.99421,-120.72923,-18.50066,12.30743,-14.77753,12.80518,14.34698,24.56116,-5.73856,2.06067,25.13708,31.05945,12.91113,-17.34119,28.82153]},{"time":0.6,"vertices":[-2.76124,-163.20505,137.66345,-15.41998,3.32836,12.91745,0,0,0,0,0,0,0,0,0,0,91.91296,-18.69115,13.58247,56.98287,196.27774,40.69681,101.71411,88.45444,-28.87119,64.12794,-155.66006,-30.5406,-222.00279,-166.49883,-7.98074,-106.22893,106.21513,11.44228,19.44185,-73.45589,69.19238,32.60618,49.33606,-42.82529,33.65353,56.79309]},{"time":0.7,"vertices":[-13.96832,-199.53496,111.97314,45.99949,72.60979,33.76303,0,0,0,0,0,0,0,0,0,0,79.37938,-16.14236,11.73032,49.21249,138.32974,-78.16116,102.05568,-47.90683,40.54369,-51.69243,-17.7495,-95.54425,-39.05264,-155.89218,-6.89246,-91.74317,91.73126,9.88197,-3.60842,-58.27855,80.75627,29.49527,42.60842,-36.98548,29.06442,49.04858]},{"time":1.3333}]},"skirt_f":{"skirt_f":[{"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.0667,"vertices":[11.36368,-18.2469,7.44275,-20.89423,8.88153,19.13908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.28342,-32.90398,7.84229,-30.18169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4.3587,5.60055],"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"vertices":[32.97858,-49.33337,27.75054,-52.55202,23.88503,-50.57948,6.32187,8.77411,6.32187,8.77411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22.94338,-67.66884,29.05088,-64.37901,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18.69651,-67.62704],"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"vertices":[23.30594,-62.53973,21.92651,-95.65314,12.84511,-100.54065,32.995,20.33549,32.995,20.33549,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19.05412,-104.6858,20.95905,-71.52986,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9.74485,-110.72694],"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"vertices":[23.30984,-57.4722,22.0685,-117.90897,7.61622,-123.34504,29.1326,17.95502,29.1326,17.95502,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19.53236,-125.88426,21.23767,-65.40994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4.87887,-132.33893],"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"vertices":[18.67397,-46.04212,16.6993,-66.78976,12.59822,-53.31103,23.33871,14.38412,23.33871,14.38412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14.66753,-73.17892,17.01392,-52.40121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10.40528,-60.5162],"curve":0.38,"c2":0.53,"c3":0.744},{"time":1.0667}]}}},"drawOrder":[{"time":0.0667,"offsets":[{"slot":"body","offset":2},{"slot":"r_beard2","offset":3}]},{"time":0.1333,"offsets":[{"slot":"l_arm","offset":40},{"slot":"l_hand","offset":40},{"slot":"l_finger_d","offset":40},{"slot":"l_finger_c","offset":40},{"slot":"l_finger_b","offset":40},{"slot":"l_finger_a","offset":40},{"slot":"l_armour","offset":40},{"slot":"l_beard","offset":-6},{"slot":"r_beard","offset":-14},{"slot":"r_upparm","offset":-20},{"slot":"r_armour_u","offset":-23},{"slot":"r_upparm_2","offset":-22},{"slot":"r_arm","offset":-23},{"slot":"r_hand","offset":-36},{"slot":"r_finger_d","offset":-38},{"slot":"r_finger_c","offset":-39},{"slot":"r_finger_b","offset":-40},{"slot":"r_finger_a","offset":-41}]},{"time":0.6667,"offsets":[{"slot":"l_armour","offset":-5},{"slot":"body","offset":-5}]},{"time":0.7,"offsets":[{"slot":"body","offset":2}]},{"time":1.3333,"offsets":[{"slot":"r_beard2","offset":3}]}],"events":[{"time":0.7,"name":"hit"}]},"die":{"slots":{"lock":{"color":[{"time":0.7667,"color":"ffffff00"},{"time":0.8333,"color":"ffffffff"}]},"lock_2":{"color":[{"time":1.3333,"color":"ffffff00"},{"time":1.4,"color":"ffffffff"}]},"r_eye":{"color":[{"time":2.7667,"color":"ffffffff"},{"time":3,"color":"000000ff"}]},"r_eye_fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"},{"time":1.9333,"name":"eyefire/eyefire_00002"},{"time":1.9667,"name":"eyefire/eyefire_00003"},{"time":2,"name":"eyefire/eyefire_00004"},{"time":2.0333,"name":"eyefire/eyefire_00006"},{"time":2.0667,"name":"eyefire/eyefire_00007"},{"time":2.1,"name":"eyefire/eyefire_00008"},{"time":2.1333,"name":"eyefire/eyefire_00010"},{"time":2.1667,"name":"eyefire/eyefire_00011"},{"time":2.2,"name":"eyefire/eyefire_00012"},{"time":2.2333,"name":"eyefire/eyefire_00014"},{"time":2.2667,"name":"eyefire/eyefire_00015"},{"time":2.3,"name":"eyefire/eyefire_00017"},{"time":2.3333,"name":"eyefire/eyefire_00018"},{"time":2.3667,"name":"eyefire/eyefire_00019"},{"time":2.4,"name":"eyefire/eyefire_00021"},{"time":2.4333,"name":"eyefire/eyefire_00022"},{"time":2.4667,"name":"eyefire/eyefire_00023"},{"time":2.5,"name":"eyefire/eyefire_00025"},{"time":2.5333,"name":"eyefire/eyefire_00026"},{"time":2.5667,"name":"eyefire/eyefire_00028"},{"time":2.6,"name":"eyefire/eyefire_00029"},{"time":2.6333,"name":"eyefire/eyefire_00030"},{"time":2.6667,"name":"eyefire/eyefire_00032"},{"time":2.7,"name":"eyefire/eyefire_00033"},{"time":2.7333,"name":"eyefire/eyefire_00034"},{"time":2.7667,"name":null}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":16.49},{"time":0.1,"angle":-16.57},{"time":0.3,"angle":1.8},{"time":0.7667,"angle":-16.9},{"time":0.8333,"angle":3.76},{"time":0.9667,"angle":1.33},{"time":1.3333,"angle":1.68},{"time":1.4,"angle":-16.6},{"time":1.6333,"angle":-6.02},{"time":1.8667,"angle":-0.35},{"time":1.9333,"angle":-13.61},{"time":2.0333,"angle":-5.47},{"time":2.6667,"angle":-9.54},{"time":2.7667,"angle":-7.05},{"time":2.8333,"angle":-15.47},{"time":3,"angle":2.5}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-184.28,"y":-59.89},{"time":0.1,"x":55.28,"y":-92.14},{"time":0.3,"x":115.18,"y":4.61},{"time":0.7667,"x":198.1,"y":64.5},{"time":0.8333,"x":-364.72,"y":-0.95},{"time":0.9667,"x":-270.68,"y":6.37},{"time":1.3333,"x":-164.46,"y":78.32},{"time":1.4,"x":61.15,"y":-24.61},{"time":1.6333,"x":96.07,"y":-109.25},{"time":1.8667,"x":15.4,"y":-158.17},{"time":1.9333,"x":-35.28,"y":-151.53},{"time":2.0333,"x":23.8,"y":14.69},{"time":2.6667,"x":-96.75,"y":119.78},{"time":2.7667,"x":-96.75,"y":-257.99},{"time":2.8333,"x":-96.75,"y":-175.07},{"time":3,"x":-96.75,"y":-216.53}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":40.56},{"time":0.1,"angle":48.46},{"time":0.1667,"angle":36.57},{"time":0.3,"angle":30.02},{"time":0.7667,"angle":21.83},{"time":0.8333,"angle":12.42},{"time":0.9,"angle":34.56},{"time":0.9333,"angle":71.56},{"time":0.9667,"angle":44.82},{"time":1.0667,"angle":16.51},{"time":1.3333,"angle":-27.67},{"time":1.4,"angle":-49.08},{"time":1.5,"angle":-39.13},{"time":1.6333,"angle":-47.16},{"time":1.8667,"angle":-37.47},{"time":1.9333,"angle":-55.66},{"time":2.0333,"angle":-8.32},{"time":2.6667,"angle":-18.72},{"time":2.7667,"angle":-9.15},{"time":2.8333,"angle":-36.31},{"time":3,"angle":-15.71}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-98.46,"y":-24.61},{"time":0.0667,"x":74.49,"y":72.73},{"time":0.1,"x":286.77,"y":-3.16},{"time":0.1667,"x":388.95,"y":-330.47},{"time":0.3,"x":320.72,"y":-272.48},{"time":0.7667,"x":328.07,"y":-224.33},{"time":0.8333,"x":269.63,"y":-170.96},{"time":0.9,"x":77.59,"y":-240.96},{"time":0.9333,"x":-99.14,"y":-246.25},{"time":0.9667,"x":-171.61,"y":-179.86},{"time":1.0667,"x":-116.17,"y":-43},{"time":1.3333,"x":34.67,"y":23.83},{"time":1.4,"x":316.86,"y":-73.41},{"time":1.5,"x":380.06,"y":-201.1},{"time":1.6333,"x":346.97,"y":-293.06},{"time":1.8667,"x":323.56,"y":-321.08},{"time":1.9333,"x":386.93,"y":-386},{"time":2.0333,"x":376.07,"y":-344.42},{"time":2.6667,"x":260.01,"y":-271.8},{"time":2.7667,"x":14.09,"y":-439.51},{"time":2.8333,"x":27.11,"y":-364.85},{"time":3,"x":35.95,"y":-382.46}],"scale":[{"time":0.0333},{"time":0.0667,"y":-1,"curve":"stepped"},{"time":0.9,"y":-1},{"time":0.9333,"x":0.679,"y":0.679}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-21.28},{"time":0.1,"angle":29.83},{"time":0.3,"angle":-22.81},{"time":0.7667,"angle":36.27},{"time":0.8333,"angle":-13.81},{"time":0.9667,"angle":4.9},{"time":1.3333,"angle":17.12},{"time":1.4,"angle":62.03},{"time":1.6333,"angle":16.28},{"time":1.8667,"angle":-4},{"time":1.9333,"angle":5.81},{"time":2.0333,"angle":-2.56},{"time":2.6667,"angle":61.08},{"time":2.7667,"angle":41.63},{"time":2.8333,"angle":37.23},{"time":3,"angle":2.61}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"x":18.45,"y":-42.62},{"time":0.1,"x":-43.9,"y":-0.68},{"time":0.3,"x":-58.59,"y":-2.25},{"time":0.7667,"x":11.9,"y":-2.22,"curve":"stepped"},{"time":0.8333,"x":11.9,"y":-2.22},{"time":0.9667,"x":6.27,"y":6.41},{"time":1.3333,"x":33.65,"y":8.73},{"time":1.4,"x":7.7,"y":32.35},{"time":1.6333,"x":-4.69,"y":-13.44},{"time":1.8667,"x":8.33,"y":-6.9},{"time":1.9333,"x":-19.99,"y":-23.01},{"time":2.0333,"x":-15.28,"y":-2.95},{"time":2.6667,"x":-0.46,"y":11.36}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":2.76},{"time":0.1,"angle":-18.51},{"time":0.3,"angle":48.94},{"time":0.7667,"angle":17.78},{"time":0.8333,"angle":5.37},{"time":0.9667,"angle":5.68},{"time":1.3333,"angle":-0.07},{"time":1.4,"angle":1.28},{"time":1.6333,"angle":4.18},{"time":1.8667,"angle":-4.85},{"time":1.9333,"angle":1.88},{"time":2.0333,"angle":34.7},{"time":2.6667,"angle":0.77},{"time":2.7667,"angle":29.95},{"time":2.8333,"angle":1.95},{"time":3,"angle":-10.36}],"translate":[{"time":0.1},{"time":0.3,"x":-14.48,"y":30.27},{"time":0.8333}]},"r_upparm":{"rotate":[{"angle":-6.94,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":0.83},{"time":0.1,"angle":-12.63},{"time":0.1667,"angle":28.26},{"time":0.3,"angle":39.35},{"time":0.7667,"angle":-0.67},{"time":0.8333,"angle":53.95},{"time":0.9,"angle":28.66},{"time":0.9667,"angle":9.43},{"time":1.0667,"angle":-13.21},{"time":1.3333,"angle":-41.05},{"time":1.4,"angle":-64.3},{"time":1.5,"angle":-18.04},{"time":1.6333,"angle":2.94},{"time":1.8667,"angle":21.32},{"time":1.9333,"angle":31.47},{"time":2.0333,"angle":59.01},{"time":2.6667,"angle":7.47},{"time":2.7667,"angle":-19.11},{"time":2.8333,"angle":-5.56},{"time":3,"angle":4.52}],"translate":[{"time":0.1},{"time":0.1667,"x":57.8,"y":22.76},{"time":0.3,"x":31.87,"y":44.86},{"time":0.7667,"x":42.14,"y":-13.87},{"time":0.8333,"x":39.83,"y":-36.83},{"time":0.9,"x":18.62,"y":-33.41,"curve":"stepped"},{"time":1.5,"x":18.62,"y":-33.41},{"time":1.6333,"x":43.93,"y":-21.89},{"time":1.8667,"x":47.72,"y":15.61},{"time":2.6667,"x":7.84,"y":-7.41},{"time":3}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":16.11},{"time":0.1,"angle":-35.23},{"time":0.1667,"angle":82.25},{"time":0.3,"angle":116.74},{"time":0.7667,"angle":82.7},{"time":0.8333,"angle":82.18},{"time":0.8667,"angle":57.67},{"time":0.9667,"angle":-26.21},{"time":1.3333,"angle":-85.18},{"time":1.4,"angle":-78.37},{"time":1.5,"angle":-30.79},{"time":1.6333,"angle":-39.33,"curve":"stepped"},{"time":1.8667,"angle":-39.33},{"time":1.9333,"angle":-9.78},{"time":2.0333,"angle":-7.75},{"time":2.6667,"angle":-10.01},{"time":2.7667,"angle":4.29},{"time":2.8333,"angle":34.82},{"time":3,"angle":37.42}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":-150.81,"y":24.49},{"time":0.1,"x":-76.17,"y":120.73},{"time":0.1667,"x":131.02,"y":104.78},{"time":0.3,"x":518.03,"y":344.46},{"time":0.7667,"x":758.79,"y":560.74},{"time":0.8333,"x":77.5,"y":434.32},{"time":0.8667,"x":-262.6,"y":159.04},{"time":0.9,"x":-573.86,"y":162.62},{"time":0.9667,"x":-428.45,"y":161.24},{"time":1.3333,"x":-380.12,"y":197.16},{"time":1.4,"x":-110.57,"y":161.24},{"time":1.5,"x":-67.63,"y":142.65},{"time":1.6333,"x":-87.53,"y":32.25},{"time":1.8667,"x":-133.6,"y":-18.43},{"time":1.9333,"x":-152.03,"y":-32.25},{"time":2.0333,"x":-181.18,"y":85.36},{"time":2.1333,"x":-235.29,"y":123.69},{"time":2.6667,"x":-322.46,"y":196.08},{"time":2.7667,"x":-367.32,"y":-41.73},{"time":2.8333,"x":-362.56,"y":-83.63},{"time":3,"x":-359.32,"y":-106.64}],"scale":[{"x":0.95,"y":0.95}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-19.75},{"time":0.1,"angle":11.41},{"time":0.1667,"angle":40.75},{"time":0.3,"angle":111.94},{"time":0.7667,"angle":70.86},{"time":0.8333,"angle":81.86},{"time":0.9667,"angle":5.88},{"time":1.3333,"angle":-11.53},{"time":1.4,"angle":-24.45},{"time":1.5,"curve":"stepped"},{"time":1.8667},{"time":1.9333,"angle":5.49},{"time":2.0333,"angle":8.95},{"time":2.6667,"angle":-41.62},{"time":2.7667,"angle":-2.49},{"time":2.8333,"angle":-23.36},{"time":2.9333,"angle":-2.1},{"time":3}],"translate":[{"time":0.0333},{"time":0.1,"x":-32.08,"y":138.93},{"time":0.1667,"x":-24.98,"y":138.16},{"time":0.3,"x":-57.9,"y":74.7},{"time":0.7667,"x":-39.31,"y":141.16},{"time":2.0333},{"time":2.6667,"x":-41.56,"y":-12.73},{"time":2.7667,"x":-30.06,"y":148.44}],"scale":[{"time":0.3},{"time":0.7667,"x":1.275},{"time":0.8333,"curve":"stepped"},{"time":2.0333},{"time":2.6667,"x":1.827},{"time":2.7667}],"shear":[{"time":2.0333},{"time":2.6667,"x":-3.87,"y":28.69},{"time":2.7667}]},"r_upparm3":{"rotate":[{"time":0.0333},{"time":0.1,"angle":-21.47},{"time":0.1667,"angle":-27.88},{"time":0.3,"angle":-33.47},{"time":0.7667,"angle":-5.69},{"time":0.8333,"angle":-57.95},{"time":0.9,"angle":-24.73},{"time":0.9667,"angle":-7.42},{"time":1.0667,"angle":28.95},{"time":1.3333,"angle":53.49},{"time":1.4,"angle":79.29},{"time":1.5,"angle":27.55},{"time":1.6333,"angle":0.33},{"time":1.8667,"angle":-23.2},{"time":1.9333,"angle":-32.54},{"time":2.0333,"angle":-58.89},{"time":2.6667,"angle":-1.39},{"time":2.7667,"angle":33.34},{"time":2.8333,"angle":19.02},{"time":3}],"translate":[{},{"time":0.1,"x":22.99,"y":-32.47},{"time":0.1667,"x":74.29,"y":2.56},{"time":0.3,"x":34.41,"y":49.49},{"time":0.7667,"x":69.3,"y":30.53},{"time":0.8333,"x":64.16,"y":28.43},{"time":0.9,"x":37.93,"y":34.06},{"time":0.9667,"x":49.12,"y":1.88},{"time":1.0667,"x":64.85,"y":-31.31},{"time":1.6333,"x":80.3,"y":9.26},{"time":1.8667,"x":91.3,"y":14.17},{"time":2.6667,"x":100.79,"y":-26.46}]},"l_ik":{"rotate":[{"time":2.6667},{"time":2.7333,"angle":-34.2},{"time":2.8333,"angle":-127.38}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":4.61,"curve":"stepped"},{"time":0.1667,"x":4.61},{"time":0.2333,"x":172.76,"y":64.5},{"time":0.3,"x":165.85,"curve":"stepped"},{"time":0.7667,"x":165.85},{"time":0.8333,"x":-225.74,"y":69.11},{"time":0.9,"x":-400.81,"curve":"stepped"},{"time":1.3333,"x":-400.81},{"time":1.4,"x":9.21,"y":87.53},{"time":1.4667,"x":87.53,"y":96.75},{"time":1.5333,"x":105.96,"y":4.61,"curve":"stepped"},{"time":2.6667,"x":105.96,"y":4.61},{"time":2.7333,"x":-122.32,"y":40.88},{"time":2.8333,"x":-273.74,"y":20.43},{"time":3,"x":-264.7,"y":23.44}]},"r_ik":{"rotate":[{"time":2.6667},{"time":2.7667,"angle":139.62},{"time":3,"angle":178.71}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8333,"x":4.61,"curve":"stepped"},{"time":0.9667,"x":4.61},{"time":1.0333,"x":-184.28,"y":42.93},{"time":1.1333,"x":-214.34,"curve":"stepped"},{"time":1.2667,"x":-214.34},{"time":1.3,"x":-9.32,"y":94.45},{"time":1.3667,"x":69.58,"curve":"stepped"},{"time":2.6667,"x":69.58},{"time":2.7667,"x":155.07,"y":0.5},{"time":3,"x":136.39,"y":-39.99}]},"l_ik2":{"translate":[{"time":0.1667},{"time":0.2333,"x":28.91,"y":-23.32},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"x":2.98,"y":-12.68},{"time":0.9,"x":43.46,"y":0.19},{"time":1.3333,"x":15.3,"y":77.22},{"time":1.4,"x":35.04,"y":42.45},{"time":1.4667,"x":27.23,"y":26.49},{"time":1.5333,"x":7.88,"y":58.56},{"time":1.6333,"x":22.2,"y":62.12},{"time":1.8667,"x":41.41,"y":-7.11},{"time":1.9333,"x":57.27,"y":-30.03},{"time":2.0333,"x":-26.86,"y":0.37},{"time":2.6667,"x":-131.88,"y":-108},{"time":2.7333,"x":68.19,"y":9.9},{"time":2.8333,"x":17.31,"y":6.26},{"time":3,"x":-3.16,"y":28.58}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":119.88,"y":-43.84},{"time":0.1,"x":56.38,"y":18.74},{"time":0.7667,"x":37.11,"y":12.33},{"time":0.8333,"x":102.75,"y":-72.41},{"time":0.9667,"x":145.32,"y":-93.43},{"time":1.0333,"x":56.33,"y":-22.09},{"time":1.1333,"x":16.21,"y":-23.93},{"time":1.2667,"x":14.63,"y":-21.59},{"time":1.3,"x":128.62,"y":-71.45},{"time":1.3667,"x":63.44},{"time":2.6667},{"time":2.7667,"x":89.2,"y":2.13},{"time":2.8333,"x":128.84,"y":-9.59},{"time":3,"x":135.19,"y":26.05}]},"l_hand2":{"scale":[{"x":0,"y":0}]},"r_upparm2":{"rotate":[{"angle":12.97,"curve":0.25,"c3":0.75},{"time":0.1,"angle":21.5},{"time":0.3,"angle":17.38},{"time":0.7667,"angle":28.93},{"time":0.8333,"angle":15.91},{"time":0.9,"angle":22.08},{"time":0.9667,"angle":47.05},{"time":1.0667,"angle":69.38},{"time":1.6333,"angle":55.09},{"time":1.8667,"angle":60.16},{"time":2.6667,"angle":34.95},{"time":3,"angle":52.06}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":-12.47,"y":-65.76},{"time":0.1667,"x":38.83,"y":-30.73},{"time":0.3,"x":38.26,"y":-28.45},{"time":0.7667,"x":59.51,"y":18.64},{"time":0.8333,"x":47.97,"y":10.09},{"time":0.9,"x":27.01,"y":20.96},{"time":0.9667,"x":48.86,"y":1.53},{"time":1.0667,"x":42.04,"y":-55.44},{"time":1.6333,"x":71.88,"y":-0.06},{"time":1.8667,"x":67.73,"y":-10.59},{"time":2.6667,"x":30.39,"y":-75.33}]},"lock":{"rotate":[{},{"time":0.7667,"angle":33.15},{"time":0.8333,"angle":12.05},{"time":0.9667,"angle":5.02},{"time":1.3333,"angle":-6.27},{"time":1.4,"angle":22.68},{"time":1.5,"angle":17.17},{"time":1.6333,"angle":-3.53},{"time":1.8667,"angle":6.47},{"time":1.9333,"angle":10.48},{"time":2.0333,"angle":15.89},{"time":2.6667,"angle":41.03},{"time":2.7667,"angle":23.73},{"time":2.8333,"angle":33.96},{"time":3,"angle":15.35}],"translate":[{"time":0.7667},{"time":0.8333,"x":28.21,"y":-55.96},{"time":0.9667,"x":66.08,"y":79.4},{"time":1.3333,"x":110.87,"y":113.37},{"time":1.4,"x":69.74,"y":83.77},{"time":1.5,"x":39.7,"y":39.04},{"time":1.8667,"x":13.03,"y":-41.58},{"time":1.9333,"x":12.89,"y":-68.2},{"time":2.0333,"x":-21.33,"y":-63.12},{"time":2.6667,"x":-22.19,"y":3.95},{"time":2.7667,"x":-74.3,"y":5.84},{"time":2.8333,"x":-153.69,"y":-31.86},{"time":3,"x":-131.13,"y":2.54}],"scale":[{"x":0,"y":0},{"time":0.7667,"x":2,"y":2},{"time":0.8333,"x":0.309,"y":0.309},{"time":0.9667,"x":0.508,"y":0.508},{"time":1.3333,"x":0.626,"y":0.572},{"time":1.4,"x":0.681,"y":0.917}]},"lock2":{"rotate":[{},{"time":1.3333,"angle":26.76,"curve":"stepped"},{"time":1.4,"angle":26.76},{"time":1.5,"angle":17.08},{"time":1.6333,"angle":-3.95},{"time":1.8667,"angle":-7.56},{"time":1.9333,"angle":2.43},{"time":2.0333,"angle":2.8},{"time":2.6667,"angle":40.34},{"time":2.7667,"angle":16.77},{"time":2.8333,"angle":11.01},{"time":3,"angle":-5.08}],"translate":[{},{"time":1.3333,"x":198.13,"y":193.19,"curve":"stepped"},{"time":1.4,"x":198.13,"y":193.19},{"time":1.5,"x":162.47,"y":108.28},{"time":1.6333,"x":207.63,"y":64.45},{"time":1.8667,"x":184.34,"y":3.51},{"time":1.9333,"x":169.05,"y":-31.92},{"time":2.0333,"x":112.27,"y":-31.4},{"time":2.6667,"x":145.34,"y":117.01},{"time":2.7667,"x":221.78,"y":144.78},{"time":2.8333,"x":167.65,"y":123},{"time":3,"x":197.32,"y":97.4}],"scale":[{"x":0,"y":0},{"time":1.3333,"x":-2,"y":2},{"time":1.4,"x":-0.671,"y":0.859},{"time":1.5,"x":-0.751,"y":0.917,"curve":"stepped"},{"time":2.7333,"x":-0.751,"y":0.917},{"time":2.7667,"x":-0.836,"y":0.917}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":-17.28},{"time":0.3,"angle":-24.69},{"time":0.7667,"angle":-24.78},{"time":0.8333,"angle":-24.51},{"time":0.9667},{"time":1.3333,"angle":-43.74},{"time":1.4,"angle":-65.84},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1},{"time":0.1667,"x":33.54,"y":-5.99},{"time":0.3,"x":40.27,"y":49.7},{"time":0.7667,"x":42.99,"y":4.1},{"time":0.8333}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":68.98},{"time":0.1,"angle":69.57},{"time":0.1667,"angle":80.32},{"time":0.3,"angle":60.85},{"time":0.7667,"angle":56.27},{"time":0.8333,"angle":42.87},{"time":0.9667,"angle":27.14},{"time":1.3333,"angle":49.52},{"time":1.4,"angle":39.01},{"time":1.6333,"angle":32.12},{"time":1.8667,"angle":4.56},{"time":1.9333,"angle":4.29},{"time":2.0333,"angle":23.86},{"time":2.6667,"angle":50.59},{"time":2.7667,"angle":26.41},{"time":2.8333,"angle":35.92},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":15.69,"y":-42.72},{"time":0.1,"x":29.26,"y":-74.82},{"time":0.1667,"x":-64.57,"y":-135.91},{"time":0.3,"x":-27.47,"y":-144.54},{"time":0.7667,"x":-7.52,"y":-129.4}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":5.46},{"time":0.3,"angle":-10.65},{"time":0.7667,"angle":-8.36},{"time":0.8333,"curve":"stepped"},{"time":1.3333},{"time":1.4,"angle":-22.1},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1667},{"time":0.3,"x":69.31,"y":13.25},{"time":0.7667,"x":33.77,"y":-24.7},{"time":0.8333}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":-14.73},{"time":0.3,"angle":-22.7},{"time":0.7667,"angle":-20.59},{"time":0.8333,"angle":-34.81},{"time":0.9667},{"time":1.3333,"angle":-40.05},{"time":1.4,"angle":-62.15},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1},{"time":0.1667,"x":121.04,"y":-31.75},{"time":0.3,"x":86.34,"y":46.01},{"time":0.7667,"x":96.48,"y":35.54},{"time":0.8333,"x":59.11,"y":-15.72},{"time":0.9667}]},"l_finger_a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":-8.74},{"time":0.8333,"angle":13.91},{"time":0.9667,"angle":10.78},{"time":1.3333}]},"l_finger_a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":-0.62,"curve":"stepped"},{"time":0.8333,"angle":-0.62},{"time":0.9667,"angle":18.9},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":35.95,"y":34.16},{"time":0.7667,"x":-65.9,"y":-20.58},{"time":0.8333,"x":-18.98,"y":-25.1},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":-46.37,"curve":"stepped"},{"time":0.8333,"angle":-46.37},{"time":0.9667,"angle":-26.85},{"time":1.3333}]},"l_finger_b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":70.98,"curve":"stepped"},{"time":0.8333,"angle":70.98},{"time":0.9667,"angle":90.5},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":2.03,"y":49.54},{"time":0.7667,"x":37.04,"y":7.14},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":50.22,"curve":"stepped"},{"time":0.8333,"angle":50.22},{"time":0.9667,"angle":69.74},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":-38.06,"y":31.78},{"time":0.7667,"x":37.53,"y":3.76},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":11.31,"curve":"stepped"},{"time":0.8333,"angle":11.31},{"time":0.9667,"angle":30.84},{"time":1.3333}]},"l_finger_d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":37.45,"curve":"stepped"},{"time":0.8333,"angle":37.45},{"time":0.9667,"angle":56.97},{"time":1.3333}]},"l_finger_d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":62.3,"curve":"stepped"},{"time":0.8333,"angle":62.3},{"time":0.9667,"angle":81.83},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":-49.55,"y":-1.88},{"time":0.7667,"x":35.07,"y":13.9},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-24.25},{"time":0.1,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":18.79},{"time":0.9667},{"time":1.3333,"angle":-7.62},{"time":1.4,"curve":"stepped"},{"time":2.8333},{"time":3,"angle":-20.01}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":15},{"time":0.1,"angle":-9.71},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":15.73},{"time":0.9667,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":13.37},{"time":1.9333,"angle":27.39},{"time":2.0333,"angle":-1.64},{"time":2.6667,"angle":-11.25},{"time":2.7667,"angle":-25.72},{"time":2.8333,"angle":3.52},{"time":3}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-40.42},{"time":0.1,"angle":-80.2},{"time":0.3,"curve":"stepped"},{"time":1.8667},{"time":1.9333,"angle":28.45},{"time":2.0333,"angle":15.88},{"time":2.6667,"angle":-37.9},{"time":2.7667}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.3},{"time":0.7667,"angle":-64.49},{"time":0.8333,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":-18.41},{"time":1.9333,"angle":-3.01},{"time":2.0333,"angle":-10.67},{"time":2.6667,"angle":-56.72},{"time":2.7667,"angle":-57.84},{"time":2.8333}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-23.31},{"time":0.1,"angle":24.59},{"time":0.3},{"time":0.7667,"angle":13.06},{"time":0.8333,"angle":-1.7},{"time":0.9667},{"time":1.3333,"angle":33.27},{"time":1.4,"angle":6.41},{"time":1.6333},{"time":1.8667,"angle":-30.46},{"time":1.9333,"angle":-27.92},{"time":2.0333,"angle":15.55},{"time":2.6667,"angle":40.74},{"time":2.7667},{"time":2.8333,"angle":1.33},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-13.9,"y":32.14},{"time":0.3,"x":15.52,"y":-53.53},{"time":0.7667,"x":96.22,"y":-50.78},{"time":0.8333,"x":1.97,"y":-11.66},{"time":0.9667,"x":-19.97,"y":-17.52},{"time":1.3333,"x":-94.05,"y":113.18},{"time":1.4,"x":-103.02,"y":53.64},{"time":1.6333,"x":-4.96,"y":-0.23},{"time":1.9333,"x":-3.87,"y":-0.18},{"time":2.0333,"x":-67.59,"y":20.05},{"time":2.6667,"x":27.34,"y":-49.83},{"time":3}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333},{"time":0.1,"angle":35.69},{"time":0.3},{"time":0.7667,"angle":54.04},{"time":0.8333,"angle":-32.08},{"time":0.9667},{"time":1.3333,"angle":12.43},{"time":1.4,"angle":48.89},{"time":1.6333},{"time":1.8667,"angle":-5.58},{"time":1.9333,"angle":-34.21},{"time":2.0333,"angle":-9.74},{"time":2.6667,"angle":5.99},{"time":2.7667,"angle":44.18},{"time":2.8333,"angle":13.05},{"time":3}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-13.21},{"time":0.1,"angle":23.14},{"time":0.3,"angle":29.25},{"time":0.5,"angle":2.77},{"time":0.7667,"angle":-24.22},{"time":0.8333,"angle":-16.63},{"time":0.9667,"angle":21.53},{"time":1.3333,"angle":-7.86},{"time":1.4,"angle":39.09},{"time":1.6333,"angle":-12.88},{"time":1.8667,"angle":-1.91},{"time":1.9333,"angle":29.51},{"time":2.0333},{"time":2.6667,"angle":22.49},{"time":2.7667,"angle":26.71},{"time":2.8333,"angle":13.79},{"time":3,"angle":28.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":0.806,"curve":"stepped"},{"time":2.6667,"x":0.806},{"time":2.7667,"x":0.717}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0333,"x":10.51,"y":15.78},{"time":0.3,"x":-12.05,"y":-4.86},{"time":0.7667,"x":12.01,"y":5.63},{"time":0.8333,"x":25.98,"y":17.69},{"time":0.9667,"x":0.44,"y":17.69},{"time":1.3333,"x":4.31,"y":17.69},{"time":1.4,"x":30.99,"y":17.69},{"time":1.6333,"x":35.32,"y":31.2},{"time":1.8667,"x":23.94,"y":31.2,"curve":"stepped"},{"time":2.6667,"x":23.94,"y":31.2},{"time":2.7667,"x":23.94,"y":38.29},{"time":2.8333,"x":23.94,"y":23.92}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":26.87},{"time":0.1,"angle":-15.74},{"time":0.3,"angle":-27.27},{"time":0.5,"angle":25.21},{"time":0.7667,"angle":4.19},{"time":0.8333,"angle":24.92},{"time":0.9667,"angle":-26.3},{"time":1.1333,"angle":15.5},{"time":1.3333,"angle":5.56},{"time":1.4,"angle":-25.66},{"time":1.5,"angle":22.59},{"time":1.6333,"angle":19.98},{"time":1.8667,"angle":-10.7},{"time":1.9333,"angle":-6.66},{"time":2.0333,"angle":22.3},{"time":2.6667,"angle":-10.86},{"time":2.7667,"angle":24.66},{"time":2.8333,"angle":49.32},{"time":3,"angle":2.02}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":22.62},{"time":0.1,"angle":17.78},{"time":0.3,"angle":-27.7},{"time":0.7667,"angle":36.62},{"time":0.8333,"angle":35.15},{"time":0.9,"angle":-18.39},{"time":0.9667,"angle":-16.39},{"time":1.3333,"angle":13.16},{"time":1.4,"angle":-30.81},{"time":1.6333,"angle":30.96},{"time":1.8667,"angle":-9.54},{"time":1.9333,"angle":-31.08},{"time":2.0333,"angle":-16.04},{"time":2.2667,"angle":18.83},{"time":2.6667,"angle":-25.39},{"time":2.7667,"angle":44.23},{"time":2.8333,"angle":11.22},{"time":3,"angle":19.6}]},"hair_t":{"rotate":[{"time":0.1},{"time":0.3,"angle":-19.21},{"time":0.7667,"angle":-5.78},{"time":0.8333},{"time":0.9667,"angle":-9.38},{"time":1.3333,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":10.8},{"time":1.9333},{"time":2.0333,"angle":-9.13},{"time":2.6667},{"time":2.7667,"angle":-13.97},{"time":2.8333}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":7.3},{"time":0.1,"angle":3.64},{"time":0.3,"angle":1.74},{"time":0.7667,"angle":-1.69},{"time":0.8333},{"time":0.9667,"angle":-9.58},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":-5.18},{"time":1.8667,"angle":-4.5},{"time":1.9333},{"time":2.0333,"angle":2.63},{"time":2.6667},{"time":2.7667,"angle":-8.41},{"time":2.8333,"angle":-9.13},{"time":3,"angle":-1.65}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-6.72},{"time":0.1,"angle":14.11},{"time":0.3,"angle":14.45},{"time":0.7667,"angle":25.58},{"time":0.8333,"angle":30.7},{"time":0.9667,"angle":25.88},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":20.83},{"time":1.8667,"angle":15.95},{"time":1.9333,"angle":19.25},{"time":2.0333,"angle":23.38},{"time":2.6667,"angle":22.61},{"time":2.7667,"angle":-34.4},{"time":2.8333,"angle":24.51},{"time":3,"angle":23.31}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":-21.29},{"time":0.1,"angle":-19.11},{"time":0.3,"angle":14.45},{"time":0.7667,"angle":19.91},{"time":0.8333,"angle":30.7},{"time":0.9667,"angle":28.91},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":-39.75},{"time":1.8667,"angle":24.75},{"time":1.9333,"angle":24.59},{"time":2.0333,"angle":23.38},{"time":2.6667,"angle":22.61},{"time":2.7667,"angle":-34.4},{"time":2.8333,"angle":-23.73},{"time":3,"angle":19.69}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":93.37},{"time":0.1,"angle":14.11},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":49.55},{"time":0.9667}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":-2.26,"y":14.51}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":1.49,"y":10.12}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-9.24},{"time":0.1,"angle":42.73},{"time":0.3,"angle":25.78},{"time":0.5,"angle":80.97},{"time":0.7667,"angle":34.03},{"time":0.8333,"angle":-16.62},{"time":0.9667,"angle":-10.38},{"time":1.1,"angle":49.94},{"time":1.3333,"angle":39.12},{"time":1.4,"angle":-36.84},{"time":1.6333,"angle":90.97},{"time":1.8667,"angle":-36.46},{"time":1.9333,"angle":52.21},{"time":2.0333,"angle":79.24},{"time":2.2,"angle":30.05},{"time":2.6667,"angle":-28.63},{"time":2.7667,"angle":-4.12},{"time":2.8333,"angle":30.39},{"time":3,"angle":37.87}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"angle":19.46},{"time":0.1},{"time":0.3,"angle":-23.17},{"time":0.7667},{"time":0.8333,"angle":5.71},{"time":0.9667,"angle":16.32},{"time":1.3333},{"time":1.4,"angle":-21.2},{"time":1.6333},{"time":1.8667,"angle":33.35},{"time":1.9333,"angle":7.55},{"time":2.0333},{"time":2.6667,"angle":-21.03},{"time":2.7667,"angle":-16.96},{"time":2.8333,"angle":18.8},{"time":3,"angle":33.05}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-41.2},{"time":0.1,"angle":-50.03},{"time":0.3,"angle":5.43},{"time":0.7667,"angle":25.23},{"time":0.8333,"angle":-40.92},{"time":0.9667,"angle":-25.65},{"time":1.3333,"angle":29.67},{"time":1.4,"angle":22.01},{"time":1.6333,"angle":-37.44},{"time":1.8667,"angle":-14.65},{"time":1.9333,"angle":33.09},{"time":2.0333},{"time":2.6667,"angle":-24.86},{"time":2.7667,"angle":-37.16},{"time":2.8333,"angle":-10.32},{"time":3}]},"r_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.46},{"time":0.1},{"time":0.3,"angle":-23.17},{"time":0.7667},{"time":0.8333,"angle":5.71},{"time":0.9667,"angle":16.32},{"time":1.3333},{"time":1.4,"angle":-21.2},{"time":1.6333},{"time":1.8667,"angle":33.35},{"time":1.9333,"angle":7.55},{"time":2.0333},{"time":2.6667,"angle":-21.03},{"time":2.7667,"angle":-16.96},{"time":2.8333,"angle":18.8},{"time":3,"angle":33.05}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-41.2},{"time":0.1,"angle":-50.03},{"time":0.3,"angle":5.43},{"time":0.7667,"angle":25.23},{"time":0.8333,"angle":-40.92},{"time":0.9667,"angle":-25.65},{"time":1.3333,"angle":29.67},{"time":1.4,"angle":22.01},{"time":1.6333,"angle":-37.44},{"time":1.8667,"angle":-14.65},{"time":1.9333,"angle":33.09},{"time":2.0333},{"time":2.6667,"angle":-24.86},{"time":2.7667,"angle":-37.16},{"time":2.8333,"angle":-10.32},{"time":3}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-12.54},{"time":0.1,"angle":14.62},{"time":0.3,"angle":-35.54},{"time":0.7667,"angle":-32.14},{"time":0.8333,"angle":-7.04},{"time":0.9667,"angle":-11.61},{"time":1.3333},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-20.77},{"time":1.8667}],"scale":[{"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-21.33},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":0.78},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-5.05},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":3.48},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-25.81},{"time":3,"angle":6.58}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-6.15},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":-20.92},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-23.18},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-35.63},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-32.65},{"time":3,"angle":6.58}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-12.54},{"time":0.1,"angle":7},{"time":0.3,"angle":-35.54},{"time":0.7667,"angle":-21.7},{"time":0.8333,"angle":-7.04},{"time":0.9667,"angle":-11.61},{"time":1.3333},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-27.21},{"time":1.8667}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-21.33},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":18.51},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-5.05},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":3.48},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-25.81},{"time":3,"angle":6.58}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-6.15},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":-20.92},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-23.18},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-35.63},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-32.65},{"time":3,"angle":6.58}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.0333}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.0333}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"r_finger_b2":{"rotate":[{"angle":-8.92}]},"r_finger_c2":{"rotate":[{"angle":-9.49}]},"r_finger_d2":{"rotate":[{"angle":7.12}]},"l_upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":3,"angle":-22.92}]},"l_armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":3,"angle":-6.9}]},"r_arm":{"rotate":[{"angle":-8.2,"curve":0.25,"c3":0.75},{"time":3,"angle":-84.98}]},"head2":{"rotate":[{"time":1.9333},{"time":2.0333,"angle":-15.66},{"time":2.6667},{"time":2.8333,"angle":0.67},{"time":3}],"scale":[{"time":1.9333},{"time":2.0333,"x":0.704,"curve":"stepped"},{"time":2.6667,"x":0.704},{"time":2.8333,"x":0.962}]},"r_ear_s":{"rotate":[{"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0333,"angle":25.5,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":30,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-2.46,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3,"angle":12,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.5,"angle":28.55,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.7667,"angle":11.33,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.8333,"angle":45.65,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.9667,"angle":8.97,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.67},{"time":1.1333,"angle":-13.54,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.3333,"angle":13.28,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-5.15,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":1.6333,"angle":-35.62,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.8667,"angle":25.03,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.9333,"angle":30.1,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":2.0333,"angle":-22.46,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":2.2,"angle":-24.55,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.69},{"time":2.3667,"angle":19.09,"curve":0.348,"c2":0.44,"c3":0.682,"c4":0.78},{"time":2.6667,"angle":8.97,"curve":0.338,"c2":0.39,"c3":0.671,"c4":0.72},{"time":2.7667,"angle":-66.43,"curve":0.337,"c2":0.39,"c3":0.67,"c4":0.72},{"time":2.8333,"angle":23.33,"curve":0.337,"c2":0.41,"c3":0.67,"c4":0.75},{"time":2.9,"angle":-15.04,"curve":0.339,"c2":0.66,"c3":0.672},{"time":3,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"l_leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":12.22}]},"l_leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":-42.07}]},"l_leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":-112.01}]},"r_leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":2.27}]},"r_finger_a2":{"rotate":[{"angle":14.41}]},"r_leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":78.83}]},"r_leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":37.17}]},"headmouth":{"rotate":[{"time":1.9333},{"time":2.0333,"angle":-15.66},{"time":2.6667},{"time":2.8333,"angle":0.67},{"time":3}],"scale":[{"time":1.9333},{"time":2.0333,"x":0.704,"curve":"stepped"},{"time":2.6667,"x":0.704},{"time":2.8333,"x":0.962}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{},{"time":0.0333,"x":-52.19},{"time":0.1},{"time":0.3,"x":115.98},{"time":0.7667,"x":266.75},{"time":0.8333},{"time":0.9667,"x":-237.76},{"time":1.3333,"x":-231.96},{"time":1.4,"curve":"stepped"},{"time":2.6667},{"time":2.7667,"x":-92.78}],"scale":[{"time":0.1},{"time":0.3,"y":1.232},{"time":0.7667,"y":1.58},{"time":0.8333},{"time":0.9667,"y":0.536},{"time":1.3333,"y":0.652},{"time":1.4}]}},"ik":{"rhand":[{"time":0.9,"softness":50,"curve":"stepped"},{"time":0.9333,"softness":50,"bendPositive":false}]},"deform":{"default":{"body":{"body":[{"curve":0.302,"c3":0.638,"c4":0.36},{"time":0.0333,"vertices":[-4.1153,0.91935,-0.5435,1.2124,-1.28705,0.32984,-0.05736,0.12703,-0.1351,0.03424,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.74619,6.97106,-4.85626,5.05685,0.88869,4.14338,-2.60641,3.35652,1.02708,-0.3251,0.89402,0.60109,2.63937,-0.78508,2.25804,1.576,3.52824,-0.95351,2.94341,2.16655,4.84342,-0.90697,3.7261,3.22445,8.82589,0.14881,5.38043,6.99781,11.44717,4.0523,3.95901,11.47977,10.01059,7.30026,0.52313,12.37865,6.47924,6.7613,-1.25457,9.28015,-4.45389,7.45256,-3.69558,4.99202,-3.78844,3.58235,-4.69701,2.60094,-5.46063,1.77614,2.19235,11.80027,-7.64506,9.28321,0.43578,17.35511,-0.68811,6.51941,-5.27305,3.7746,2.73917,15.66486,-10.24678,12.19822,1.55328,33.7552,-24.66179,23.00762,3.01895,6.80544,-3.3014,6.74132,-6.13159,7.02413,4.14872,37.86676,-26.31855,27.5432,3.41262,27.00195,-18.48252,19.99765,-0.34166,-2.25426,-1.80031,4.26406,1.38734,13.60001,-9.48202,9.84584,2.73526,28.93797,-20.34003,20.75162,7.7228,2.09087,3.17401,7.34435,-19.73705,20.81664,-38.53515,39.35129,-2.63548,-0.10939,0.22252,7.39798,-5.36327,5.06402,2.56552,19.94356,-13.62535,14.80327,0.69241,6.74577,-4.71307,4.87467,-0.42123,-1.56642,1.05072,-1.21863,5.16376,4.07882,0.02488,6.58028,2.27185,21.22257,-14.78314,15.39545,-1.49342,1.82014,-2.3542,-0.03492,1.92342,18.63513,-13.01709,13.47079,1.94992,15.99203,-10.99022,11.78841],"curve":0.298,"c2":0.2,"c3":0.64,"c4":0.56},{"time":0.1,"vertices":[-22.26223,4.97336,-2.94012,6.55864,-6.96244,1.78431,-0.31027,0.68719,-0.73086,0.18522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5.33311,-2.23315,0.91981,-3.78338,5.6047,-2.15946,2.62758,-0.99887,5.55613,-1.75866,4.83634,3.25168,14.278,-4.24701,12.21517,8.52559,19.08644,-5.15816,15.92276,11.72021,26.20108,-4.90639,20.15682,17.44309,47.74479,0.80502,29.10615,37.85557,61.92494,21.92143,21.4168,62.10127,54.15356,39.49168,2.82995,66.96391,35.05027,36.57613,-6.78673,50.20215,-24.09389,40.31559,-19.99172,27.00497,-20.49403,19.37918,-25.40909,14.07012,-29.53996,9.60828,14.01798,-2.63816,3.8906,-1.60183,6.87228,-45.23476,-1.23131,-41.52568,23.74606,-39.44804,17.76514,-6.06559,6.37881,-4.804,15.98149,-50.7523,25.4265,-57.45984,17.72219,-6.0619,11.32707,3.04255,-8.63794,9.90101,29.47439,-11.64159,4.98232,-19.77231,23.4934,-8.89044,5.49456,-12.62604,-1.84825,-12.19472,-9.739,23.06697,10.36659,-14.5649,8.698,-15.44688,20.59812,-22.13459,11.58973,-27.03798,41.77746,11.31083,17.1702,39.73018,4.45708,-14.78033,17.59593,-46.03601,-14.25695,-0.59174,3.98647,-45.70159,29.33579,-39.43365,17.5745,-5.98054,3.79861,-8.69057,5.04403,-3.50579,1.73052,-4.81115,-1.42439,-34.81126,23.61242,-27.12441,27.93404,22.06491,0.1346,35.59686,16.23739,-6.79893,2.80269,-11.5181,-8.07885,9.84628,-12.73536,-0.18888,13.952,-8.48876,3.97924,-12.33589,13.53505,-5.56713,3.22267,-8.01195],"curve":0.351,"c2":0.4,"c3":0.757},{"time":0.3,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-0.20004,-4.47328,3.37485,-2.94272,1.32175,-10.04788,8.6839,-5.22366,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.59958,-3.50456,3.73788,-0.93118,9.31931,-4.97392,9.69562,4.1936,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-77.95499,139.5144,-68.95795,95.20963,-67.75372,66.04831,-87.16837,48.07956,-105.95621,34.46371,21.12277,65.79138,-38.31924,57.50052,-34.0228,-120.66727,-34.52148,-75.35884,37.45737,-73.94339,23.65421,13.29997,4.32504,26.78931,-42.72495,-99.12656,50.94351,-95.16449,43.1265,29.30727,3.92996,51.99387,-60.84778,75.42023,13.15533,15.12206,-3.63907,19.71024,18.56497,51.51018,-28.73895,46.60474,-6.62946,-43.74097,-77.1142,118.49139,3.00098,-54.91417,44.83057,-31.854,-2.21936,-39.77296,29.73355,-26.50864,147.60321,110.82056,5.22476,184.50085,-32.34265,44.54117,34.14267,-30.10867,-53.02216,3.44684,-15.76364,-86.75548,58.05627,-66.36523,13.24509,40.70563,-23.59857,35.71393,1.48032,-15.22014,12.82947,-8.32074,-14.17093,-129.51518,92.50186,-91.75037,99.53561,145.1262,-51.55228,168.25897,6.18896,-2.98102,6.18579,2.98547,-26.54926,16.85483,-29.72351,-10.27573,3.91257,-18.37961,16.81393,-8.38663,8.65265,-4.23897,8.70456,4.13007]},{"time":0.7667,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,2.75589,-0.42628,1.58078,-2.28954,5.60254,-4.18729,6.08701,-4.27817,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.19995,-0.43807,0.46724,-0.1164,8.4584,-3.08743,7.6835,4.69482,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-80.48647,140.43622,-69.77977,95.50932,-69.4754,66.67523,-88.35617,48.5122,-105.95621,34.46371,67.6171,-8.89087,58.74532,-0.2251,14.35814,-132.19081,34.2604,-116.84779,101.91853,-100.09985,49.79036,-8.59889,45.48568,5.89893,48.48497,-130.59308,132.98515,-117.84822,94.47238,-16.07789,88.03683,16.13512,-2.70163,25.97961,62.91244,-18.09288,63.4963,-20.86634,75.38478,-24.30334,75.00404,-20.3076,2.51481,-41.32964,-12.05236,66.65906,22.81944,-46.42033,45.52597,-39.19585,29.14079,-53.85693,58.51183,-42.75884,167.16922,38.85638,78.7717,138.65527,66.34669,-26.23772,107.88594,-68.4304,-38.91688,-6.22905,71.97962,-155.1956,155.81104,-129.06247,85.74921,-11.28976,82.18533,-13.07769,4.40195,-7.67998,7.91182,-6.10981,19.336,-116.30773,92.66841,-82.64078,117.17766,71.6339,18.1808,119.03931,9.79512,-8.19908,11.40335,-7.36845,-17.32522,31.50395,-37.30602,-5.86323,11.45646,-16.85958,18.40235,-13.79494,8.98471,-5.55903,9.45208,-0.83554]},{"time":0.8333,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-1.11292,2.46487,-2.62152,0.66437,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.33542,-2.81793,7.39606,4.76642,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-86.42184,144.60709,-71.70786,96.86353,-73.50958,69.51074,-91.13928,50.4678,-105.95621,34.46371,18.44489,3.86809,8.46115,16.83865,-3.9183,-113.68477,-1.60358,-84.10944,54.73862,-66.66803,20.23096,-3.54591,15.37378,13.61917,-10.85379,-103.38661,64.05984,-85.91092,43.03165,-13.14539,37.08572,25.47952,-33.96228,47.75824,2.03949,1.65744,-0.02682,2.62775,10.05231,-0.81355,6.89728,7.35754,3.82114,-40.98517,-34.93259,82.7384,-0.50278,-26.98291,18.32074,-20.40405,2.55304,-37.71628,27.71506,-25.87012,149.85062,40.57056,61.5874,142.5073,0.24445,9.84131,34.5827,-37.72894,-61.27515,10.12372,1.24237,-105.39186,73.16168,-77.69614,8.5022,1.38368,4.2128,7.51306,0.39243,-4.21655,3.13745,-2.84338,9.74438,-104.49744,77.75705,-70.48712,100.19598,79.14415,0.48279,127.68155,0,0,0,0,-27.42624,39.75204,-48.89328,2.37924,0.71335,-7.65024,5.69312,-5.15967,4.44827,-1.50385,3.94696,2.54361]},{"time":0.9667,"curve":"stepped"},{"time":1.9333,"curve":0.25,"c3":0.75},{"time":2.6667,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-1.11292,2.46487,-2.62152,0.66437,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.33542,-2.81793,7.39606,4.76642,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-86.42184,144.60709,-71.70786,96.86353,-73.50958,69.51074,-91.13928,50.4678,-105.95621,34.46371,18.44489,3.86809,8.46115,16.83865,-13.66269,-9.18733,-11.34796,20.388,-23.01843,3.81909,20.23096,-3.54591,15.37378,13.61917,-20.59818,1.11082,-13.6972,-15.4238,43.03165,-13.14539,37.08572,25.47952,-33.96228,47.75824,2.03949,1.65744,-0.02682,2.62775,10.05231,-0.81355,6.89728,7.35754,0,0,-34.93259,82.7384,-2.89908,-1.27499,-0.80798,-3.06244,-0.72122,-2.60077,1.58545,-2.18445,149.85062,40.57056,61.5874,142.5073,-11.21695,20.23029,3.77939,-9.80554,-80.78256,27.80896,-8.50201,-0.89442,-4.59537,-7.20901,8.5022,1.38368,4.2128,7.51306,0,0,0,0,0,0,0,0,100.19598,79.14415,0.48279,127.68155,0,0,0,0,-28.11429,47.13446,-54.38657,7.35934,0,0,0,0,4.44827,-1.50385,3.94696,2.54361]},{"time":2.7667,"offset":90,"vertices":[34.13654,-127.86366,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13.38882,-50.14972,0,0,8.39827,-31.45702,1.12668,-32.53924,11.47104,-42.96606,1.53851,-44.44423,0,0,0,0,0.67459,-19.49482,1.814,-52.39503,1.14877,-33.18303,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,1.37723,-5.15866,0.18454,-5.33613,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,0,0,0,0,2.41159,-9.0331,0.32309,-9.34386,2.49876,-9.35932,0.33484,-9.68131]}]}}},"drawOrder":[{"offsets":[{"slot":"r_beard2","offset":3}]}]},"dizzy":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00002"},{"time":0.1,"name":"eyefire/eyefire_00003"},{"time":0.1333,"name":"eyefire/eyefire_00004"},{"time":0.1667,"name":"eyefire/eyefire_00005"},{"time":0.2,"name":"eyefire/eyefire_00006"},{"time":0.2333,"name":"eyefire/eyefire_00007"},{"time":0.2667,"name":"eyefire/eyefire_00008"},{"time":0.3,"name":"eyefire/eyefire_00009"},{"time":0.3333,"name":"eyefire/eyefire_00010"},{"time":0.3667,"name":"eyefire/eyefire_00011"},{"time":0.4,"name":"eyefire/eyefire_00012"},{"time":0.4333,"name":"eyefire/eyefire_00013"},{"time":0.4667,"name":"eyefire/eyefire_00014"},{"time":0.5,"name":"eyefire/eyefire_00015"},{"time":0.5333,"name":"eyefire/eyefire_00016"},{"time":0.5667,"name":"eyefire/eyefire_00017"},{"time":0.6,"name":"eyefire/eyefire_00018"},{"time":0.6333,"name":"eyefire/eyefire_00019"},{"time":0.6667,"name":"eyefire/eyefire_00020"},{"time":0.7,"name":"eyefire/eyefire_00021"},{"time":0.7333,"name":"eyefire/eyefire_00022"},{"time":0.7667,"name":"eyefire/eyefire_00023"},{"time":0.8,"name":"eyefire/eyefire_00024"},{"time":0.8333,"name":"eyefire/eyefire_00025"},{"time":0.8667,"name":"eyefire/eyefire_00026"},{"time":0.9,"name":"eyefire/eyefire_00027"},{"time":0.9333,"name":"eyefire/eyefire_00028"},{"time":0.9667,"name":"eyefire/eyefire_00029"},{"time":1,"name":"eyefire/eyefire_00030"},{"time":1.0333,"name":"eyefire/eyefire_00031"},{"time":1.0667,"name":"eyefire/eyefire_00032"},{"time":1.1,"name":"eyefire/eyefire_00033"},{"time":1.1333,"name":"eyefire/eyefire_00034"},{"time":1.1667,"name":"eyefire/eyefire_00035"},{"time":1.2,"name":"eyefire/eyefire_00036"},{"time":1.2333,"name":"eyefire/eyefire_00037"},{"time":1.2667,"name":"eyefire/eyefire_00000"},{"time":1.3,"name":"eyefire/eyefire_00001"},{"time":1.3333,"name":"eyefire/eyefire_00002"},{"time":1.3667,"name":"eyefire/eyefire_00003"},{"time":1.4,"name":"eyefire/eyefire_00004"},{"time":1.4333,"name":"eyefire/eyefire_00005"},{"time":1.4667,"name":"eyefire/eyefire_00006"},{"time":1.5,"name":"eyefire/eyefire_00007"},{"time":1.5333,"name":"eyefire/eyefire_00008"},{"time":1.5667,"name":"eyefire/eyefire_00009"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"body":{"rotate":[{"angle":0.6,"curve":0.25,"c3":0.75},{"time":0.8,"angle":17.85,"curve":0.25,"c3":0.75},{"time":1.6,"angle":0.6}],"translate":[{"x":-103.58,"y":-38.84,"curve":0.25,"c3":0.75},{"time":0.8,"x":-170.24,"y":-75.87,"curve":0.25,"c3":0.75},{"time":1.6,"x":-103.58,"y":-38.84}],"scale":[{"x":0.98,"y":0.98,"curve":0.25,"c3":0.75},{"time":0.8,"x":1.02,"y":1.02,"curve":0.25,"c3":0.75},{"time":1.6,"x":0.98,"y":0.98}]},"body2":{"rotate":[{"angle":-39.45,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-46.98,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-31.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-39.45}]},"r_upparm":{"rotate":[{"angle":33.1,"curve":0.25,"c3":0.75},{"time":0.8,"angle":15.15,"curve":0.25,"c3":0.75},{"time":1.6,"angle":33.1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":40.04,"y":-36.24,"curve":0.25,"c3":0.75},{"time":1.6}]},"lhand":{"rotate":[{"angle":143.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":139.77,"curve":0.25,"c3":0.75},{"time":1.2,"angle":147.52,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":143.65}],"translate":[{"x":121.33,"y":183.16,"curve":0.25,"c3":0.75},{"time":0.8,"x":8.16,"y":258.79,"curve":0.25,"c3":0.75},{"time":1.6,"x":121.33,"y":183.16}],"scale":[{"y":-1}],"shear":[{"x":18.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":15.59,"curve":0.25,"c3":0.75},{"time":1.2,"x":21.46,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":18.53}]},"head":{"rotate":[{"angle":8.82,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-13.83,"curve":0.25,"c3":0.75},{"time":1.6,"angle":8.82}]},"l_upparm":{"rotate":[{"angle":50.38,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.55,"curve":0.25,"c3":0.75},{"time":1.6,"angle":50.38}],"translate":[{"x":-44.25,"y":75.09,"curve":0.25,"c3":0.75},{"time":0.8,"x":0.93,"y":104.69,"curve":0.25,"c3":0.75},{"time":1.6,"x":-44.25,"y":75.09}]},"l_upparm2":{"rotate":[{"angle":88.28}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":-7.17,"y":-14.44,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_armour":{"rotate":[{"angle":52.64}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":1.348,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_ik2":{"translate":[{"x":-2.35,"y":-18.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"x":-4.71,"y":-36.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":-2.35,"y":-18.34}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":68.21,"y":-32.84,"curve":0.25,"c3":0.75},{"time":1.6}]},"r_upparm3":{"rotate":[{"angle":-25.15,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-25.55,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-24.75,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-25.15}]},"rhand":{"rotate":[{"angle":-9.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-0.24,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-19.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-9.78}],"translate":[{"x":55.95,"y":-181.34,"curve":0.25,"c3":0.75},{"time":0.8,"x":-39.14,"y":-223.6,"curve":0.25,"c3":0.75},{"time":1.6,"x":55.95,"y":-181.34}]},"r_hand":{"translate":[{"x":4.87,"y":-2.59,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":14.89,"y":-7.36,"curve":0.25,"c3":0.75},{"time":1.2,"x":-5.15,"y":2.18,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":4.87,"y":-2.59}]},"l_hand2":{"translate":[{"x":4.87,"y":-2.59,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":14.89,"y":-7.36,"curve":0.25,"c3":0.75},{"time":1.2,"x":-5.15,"y":2.18,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":4.87,"y":-2.59}],"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"skirt_f":{"rotate":[{"angle":-1.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":6.96,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-9.65,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-1.34}],"scale":[{"x":0.829,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":0.658,"curve":0.25,"c3":0.75},{"time":1.2,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":0.829}],"shear":[{"y":7.76,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"y":15.51,"curve":0.25,"c3":0.75},{"time":1.2,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"y":7.76}]},"skirt_f2":{"rotate":[{"angle":-9.65,"curve":0.25,"c3":0.75},{"time":0.8,"angle":14.51,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.2,"angle":2.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.6,"angle":-9.65}]},"skirt_f3":{"rotate":[{"angle":2.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-9.65,"curve":0.25,"c3":0.75},{"time":1.2,"angle":14.51,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":2.43}]},"l_leg5":{"rotate":[{"angle":4.23,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":26.02,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-17.56,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.23}]},"r_leg5":{"rotate":[{"angle":4.23,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":26.02,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-17.56,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.23}]},"headmouth":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.5333,"angle":-7.39,"curve":0.25,"c3":0.75},{"time":1.6}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.5333,"x":-5.29,"y":14.89,"curve":0.25,"c3":0.75},{"time":1.6}]},"head2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":-1.24,"curve":0.25,"c3":0.75},{"time":1.6}]},"r_finger_a":{"rotate":[{"angle":2.63,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":11.35,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":2.63}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r_finger_c":{"rotate":[{"angle":-1.34,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":-5.78,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":-1.34}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r_finger_d":{"rotate":[{"angle":2.14,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":9.22,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":2.14}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r_finger_b":{"rotate":[{"angle":-2.11,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":-9.1,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":-2.11}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r_beard":{"rotate":[{"angle":11.44,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1,"angle":-8.1,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":11.44}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":0.78,"curve":0.25,"c3":0.75},{"time":1.6}]},"r_beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.88}]},"r_beard3":{"rotate":[{"angle":-3.68,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.1,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-3.68}]},"l_bear":{"rotate":[{"angle":11.44,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1,"angle":-8.1,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":11.44}],"scale":[{"x":0.744,"curve":0.25,"c3":0.75},{"time":0.7667,"curve":0.25,"c3":0.75},{"time":1.6,"x":0.744}]},"l_bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.88}]},"l_beard3":{"rotate":[{"angle":-3.68,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.1,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-3.68}]},"l_finger_d":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":10.96,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_finger_c":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":-0.02,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_finger_b":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":2.72,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_finger_a":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":-38.23,"curve":0.25,"c3":0.75},{"time":1.6}]},"l_finger_d2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l_finger_c2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l_finger_b2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l_finger_a2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.8,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":-8.22}]},"hair_t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.6}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":24.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":18.48,"curve":0.25,"c3":0.75},{"time":1.2,"angle":30.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":24.7}]},"hair_t4":{"rotate":[{"angle":21.75,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":3.93,"curve":0.25,"c3":0.75},{"time":1.4,"angle":25.78,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":21.75}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"x":-2.26,"y":14.51}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":9.54}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.2,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.6}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.6,"angle":8.76}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.2,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.2,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":5.7,"y":-8.17}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.8,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.6,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.2,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.2,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":40.99}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.2,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-8.22}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":-46.39,"curve":0.25,"c3":0.75},{"time":1.6}]},"r_eye_fire":{"rotate":[{"angle":29.87}]},"r_leg3":{"rotate":[{"angle":-61.17}]},"r_leg2":{"rotate":[{"angle":52}]},"r_leg":{"rotate":[{"angle":8.57}]},"l_leg3":{"rotate":[{"angle":-27.36}]},"l_leg2":{"rotate":[{"angle":19.09}]},"l_leg":{"rotate":[{"angle":15.47}]},"r_ear_ring_b":{"rotate":[{"angle":33.49},{"time":0.8},{"time":1.6,"angle":33.49}]},"l_ear2":{"rotate":[{"angle":-8.03,"curve":0.25,"c3":0.75},{"time":0.8,"angle":16.51,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-8.03}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.6}]},"l_ear":{"rotate":[{"angle":4.24,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":16.51,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.03,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.24}]},"r_ear2":{"rotate":[{"angle":-8.03,"curve":0.25,"c3":0.75},{"time":0.8,"angle":16.51,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-8.03}]},"r_ear":{"rotate":[{"angle":4.24,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":16.51,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.03,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.24}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.6}]},"r_arm":{"rotate":[{"angle":-49.77}]},"r_upparm2":{"rotate":[{"angle":26.73}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.8,"offset":36,"vertices":[-1.33797,7.81604,-5.90574,5.2917,6.33594,0.28658,4.78575,4.16223,11.55866,17.07976,-1.55895,20.56429,29.86721,11.68993,16.13397,27.72059,24.26713,30.27791,0.19429,38.80218,-0.48879,10.80822,-7.1001,8.1636,3.17479,16.88126,-8.00425,15.19824,1.25424,15.80983,-8.84296,13.16528,-2.85379,19.56236,-14.39343,13.55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-11.877,-17.74498,1.72377,-21.28316,-18.11217,-35.82497,-1.48508,-27.23736,15.76438,-22.26129,8.43136,-21.825,20.16967,-11.85804,-0.1679,-16.30974,10.00489,-12.88177,0.20083,-4.4402,2.91694,-3.35373,4.57208,-8.01418,-3.4199,-44.53263,24.99755,-37.01321,-6.20858,-22.9226,9.38237,-21.81659,-1.48507,-27.23736,0,0,-2.4751,-45.39566,26.27411,-37.10221,-4.85504,-32.8238,16.59641,-28.73217,-1.24924,5.85095,-4.61498,3.80738,8.04572,-13.38659,16.68522,-27.45588,0,0,0,0,0,0,-2.38898,-27.27825,15.08163,-22.85509,-1.35797,-10.02383,5.16594,-8.69684,1.14474,-25.30709,16.62506,-19.11462,0,0,0,0,-11.13212,5.83612,-12.34814,-2.3464,0,0,0,0,0,0,0,0,2.15036,6.44641,-2.32169,6.38667],"curve":0.25,"c3":0.75},{"time":1.6}]}}},"drawOrder":[{"offsets":[{"slot":"r_beard2","offset":3}]}]},"enter":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00009"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00013"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00016"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00020"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00023"},{"time":0.5667,"name":"eyefire/eyefire_00024"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00027"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00030"},{"time":0.7333,"name":"eyefire/eyefire_00031"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00034"},{"time":0.8333,"name":"eyefire/eyefire_00035"},{"time":0.8667,"name":"eyefire/eyefire_00010"},{"time":0.9,"name":"eyefire/eyefire_00001"},{"time":0.9333,"name":"eyefire/eyefire_00002"},{"time":0.9667,"name":"eyefire/eyefire_00004"},{"time":1,"name":"eyefire/eyefire_00005"},{"time":1.0333,"name":"eyefire/eyefire_00007"},{"time":1.0667,"name":"eyefire/eyefire_00008"},{"time":1.1,"name":"eyefire/eyefire_00009"},{"time":1.1333,"name":"eyefire/eyefire_00011"},{"time":1.1667,"name":"eyefire/eyefire_00012"},{"time":1.2,"name":"eyefire/eyefire_00014"},{"time":1.2333,"name":"eyefire/eyefire_00015"},{"time":1.2667,"name":"eyefire/eyefire_00016"},{"time":1.3,"name":"eyefire/eyefire_00018"},{"time":1.3333,"name":"eyefire/eyefire_00019"},{"time":1.3667,"name":"eyefire/eyefire_00021"},{"time":1.4,"name":"eyefire/eyefire_00022"},{"time":1.4333,"name":"eyefire/eyefire_00023"},{"time":1.4667,"name":"eyefire/eyefire_00025"},{"time":1.5,"name":"eyefire/eyefire_00026"},{"time":1.5333,"name":"eyefire/eyefire_00028"},{"time":1.5667,"name":"eyefire/eyefire_00029"},{"time":1.6,"name":"eyefire/eyefire_00030"},{"time":1.6333,"name":"eyefire/eyefire_00032"},{"time":1.6667,"name":"eyefire/eyefire_00033"},{"time":1.7,"name":"eyefire/eyefire_00035"},{"time":1.7333,"name":"eyefire/eyefire_00036"},{"time":1.7667,"name":"eyefire/eyefire_00010"},{"time":1.8,"name":"eyefire/eyefire_00001"},{"time":1.8333,"name":"eyefire/eyefire_00002"},{"time":1.8667,"name":"eyefire/eyefire_00003"},{"time":1.9,"name":"eyefire/eyefire_00004"},{"time":1.9333,"name":"eyefire/eyefire_00005"},{"time":1.9667,"name":"eyefire/eyefire_00006"},{"time":2,"name":"eyefire/eyefire_00007"},{"time":2.0333,"name":"eyefire/eyefire_00008"},{"time":2.0667,"name":"eyefire/eyefire_00009"},{"time":2.1,"name":"eyefire/eyefire_00010"},{"time":2.1333,"name":"eyefire/eyefire_00011"},{"time":2.1667,"name":"eyefire/eyefire_00012"},{"time":2.2,"name":"eyefire/eyefire_00013"},{"time":2.2333,"name":"eyefire/eyefire_00014"},{"time":2.2667,"name":"eyefire/eyefire_00015"},{"time":2.3,"name":"eyefire/eyefire_00016"},{"time":2.3333,"name":"eyefire/eyefire_00017"},{"time":2.3667,"name":"eyefire/eyefire_00018"},{"time":2.4,"name":"eyefire/eyefire_00019"},{"time":2.4333,"name":"eyefire/eyefire_00020"},{"time":2.4667,"name":"eyefire/eyefire_00021"},{"time":2.5,"name":"eyefire/eyefire_00022"},{"time":2.5333,"name":"eyefire/eyefire_00023"},{"time":2.5667,"name":"eyefire/eyefire_00024"},{"time":2.6,"name":"eyefire/eyefire_00025"},{"time":2.6333,"name":"eyefire/eyefire_00026"},{"time":2.6667,"name":"eyefire/eyefire_00027"},{"time":2.7,"name":"eyefire/eyefire_00028"},{"time":2.7333,"name":"eyefire/eyefire_00029"},{"time":2.7667,"name":"eyefire/eyefire_00030"},{"time":2.8,"name":"eyefire/eyefire_00031"},{"time":2.8333,"name":"eyefire/eyefire_00032"},{"time":2.8667,"name":"eyefire/eyefire_00033"},{"time":2.9,"name":"eyefire/eyefire_00034"},{"time":2.9333,"name":"eyefire/eyefire_00035"},{"time":2.9667,"name":"eyefire/eyefire_00036"},{"time":3,"name":"eyefire/eyefire_00037"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"r_finger_a2":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72},{"time":3,"angle":14.41}],"translate":[{"x":131.03,"y":-25.92,"curve":"stepped"},{"time":0.8,"x":131.03,"y":-25.92},{"time":3}],"scale":[{"x":0.356,"y":0.528,"curve":"stepped"},{"time":0.8,"x":0.356,"y":0.528},{"time":3}]},"r_finger_d2":{"rotate":[{"angle":-55.55},{"time":0.3,"angle":27.3},{"time":0.4,"angle":-22.35},{"time":0.5,"angle":-106.07},{"time":0.6,"angle":-89.23,"curve":"stepped"},{"time":0.8,"angle":-89.23},{"time":3,"angle":7.12}],"translate":[{"x":25.4,"y":155.06},{"time":0.3,"x":55.13,"y":192.85},{"time":0.4,"x":39.27,"y":177.3},{"time":0.5,"x":-13.43,"y":192.22},{"time":0.6,"x":-0.48,"y":179.83,"curve":"stepped"},{"time":0.8,"x":-0.48,"y":179.83},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"r_finger_b2":{"rotate":[{"angle":-72.05},{"time":0.3,"angle":-7.32},{"time":0.4,"angle":-56.97},{"time":0.5,"angle":-139.63},{"time":0.6,"angle":-117.1,"curve":"stepped"},{"time":0.8,"angle":-117.1},{"time":3,"angle":-8.92}],"translate":[{"x":171.78,"y":113.86},{"time":0.3,"x":144.96,"y":155.26},{"time":0.4,"x":129.1,"y":139.7},{"time":0.5,"x":188.45,"y":155.72},{"time":0.6,"x":182.9,"y":141.76,"curve":"stepped"},{"time":0.8,"x":182.9,"y":141.76},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"r_finger_c2":{"rotate":[{"angle":-62.67},{"time":0.3,"angle":2.17},{"time":0.4,"angle":-47.48},{"time":0.5,"angle":-133.75},{"time":0.6,"angle":-110.06,"curve":"stepped"},{"time":0.8,"angle":-110.06},{"time":3,"angle":-9.49}],"translate":[{"x":43.59,"y":126.34},{"time":0.3,"x":73.32,"y":164.13},{"time":0.4,"x":57.46,"y":148.57},{"time":0.5,"x":63.53,"y":172.35},{"time":0.6,"x":56.88,"y":157.01,"curve":"stepped"},{"time":0.8,"x":56.88,"y":157.01},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"body":{"rotate":[{"angle":-8.67},{"time":0.1,"angle":-57.16},{"time":0.2,"angle":-81.65},{"time":0.3,"angle":-101.77},{"time":0.4,"angle":-119.71},{"time":0.5,"angle":-130.33},{"time":0.6,"angle":-117.59},{"time":0.7,"angle":-79.13},{"time":0.8,"angle":-59.37},{"time":0.9333,"angle":-31.14},{"time":1.1333,"angle":-8.99},{"time":1.2333,"angle":-1.19},{"time":1.4667,"angle":1.56},{"time":1.9,"angle":-13.1},{"time":2,"angle":-41.48},{"time":2.0333,"angle":-42.2},{"time":2.4333,"angle":-34.12},{"time":2.6667,"angle":2.11},{"time":3}],"translate":[{"x":-3552.25,"y":-102.64,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.1,"x":-3277.91,"y":-75.73,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.2,"x":-2495.59,"y":-30.21,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.3,"x":-1391.07,"y":16.35,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.4,"x":-963.85,"y":43.22,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.5,"x":-791.92,"y":16.31,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.6,"x":-515.79,"y":-29.21,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.7,"x":-270.92,"y":-75.77,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"x":-197.98,"y":-102.64},{"time":0.9333,"x":-130.76,"y":-113.25},{"time":1.1333,"x":-79.12,"y":-106.01},{"time":1.2333,"x":-68.94,"y":-4.14},{"time":1.4667,"x":-79.19,"y":55.69},{"time":1.9,"x":-42.06,"y":43.32},{"time":2,"x":44.57,"y":-30.94},{"time":2.0333,"x":75.51,"y":-71.16},{"time":2.4333,"x":47.66,"y":-71.16},{"time":2.6667,"x":50.42,"y":-19.84},{"time":3}]},"l_hand2":{"rotate":[{"angle":-5.46},{"time":0.1,"angle":19.32},{"time":0.2,"angle":21.77},{"time":0.3,"angle":22.05},{"time":0.4,"angle":-91.8},{"time":0.5,"angle":-68.35},{"time":0.6,"angle":-55.42,"curve":"stepped"},{"time":0.8,"angle":-55.42},{"time":3}],"translate":[{"x":-23.89,"y":-2.05},{"time":0.1,"x":-28.71,"y":12.87},{"time":0.2,"x":-41.75,"y":-1.02},{"time":0.3,"x":-65.66,"y":-15.55},{"time":0.4,"x":98.13,"y":100.45},{"time":0.5,"x":44.43,"y":127.78},{"time":0.6,"x":43.38,"y":135.2,"curve":"stepped"},{"time":0.8,"x":43.38,"y":135.2},{"time":3}],"scale":[{"x":0.578,"y":-0.613,"curve":"stepped"},{"time":1.0667,"x":0.578,"y":-0.613},{"time":1.1,"x":0,"y":0}]},"body2":{"rotate":[{"angle":-22.79},{"time":0.1,"angle":-10.08},{"time":0.2,"angle":16.6},{"time":0.3,"angle":38.66},{"time":0.4,"angle":52.44},{"time":0.5,"angle":59.18},{"time":0.6,"angle":41.89},{"time":0.7,"angle":-15.52},{"time":0.8,"angle":-13.97},{"time":0.9333,"angle":-38.77},{"time":1.1333,"angle":-42.93},{"time":1.2333,"angle":-26.53},{"time":1.4667,"angle":10.48},{"time":1.9,"angle":64.45},{"time":2,"angle":45.37},{"time":2.0333,"angle":12.98},{"time":2.4333,"angle":-20.67},{"time":2.6667,"angle":-35.35},{"time":3,"angle":-2.21}],"translate":[{"x":-80.64,"y":48.56},{"time":0.1,"x":-29.6,"y":11.44},{"time":0.2,"x":24.21,"y":6.83},{"time":0.3,"x":87.48,"y":24.44},{"time":0.4,"x":76.26,"y":17.25},{"time":0.5,"x":26.63,"y":100.63},{"time":0.6,"x":-89.25,"y":-3.33},{"time":0.7,"x":-119.7,"y":79.08},{"time":0.8,"x":-10.26,"y":16.06},{"time":0.9333,"x":28.57,"y":-3.29},{"time":3,"x":-7.85,"y":2.92}]},"head":{"rotate":[{"angle":54.91},{"time":0.1,"angle":57.8},{"time":0.2,"angle":61.64},{"time":0.3,"angle":73.6},{"time":0.4,"angle":89.11},{"time":0.5,"angle":87.54},{"time":0.6,"angle":81.54},{"time":0.7,"angle":92.91},{"time":0.8,"angle":54.91},{"time":0.9333,"angle":42.93},{"time":1.1333,"angle":17.02},{"time":1.2333,"angle":13.18},{"time":1.4667,"angle":4.73},{"time":1.9,"angle":16.82},{"time":2,"angle":33.14},{"time":2.0333,"angle":36.1},{"time":2.4333,"angle":66.37},{"time":2.6667,"angle":29.02},{"time":3,"angle":-4.31}],"translate":[{"x":20.04,"y":114.02,"curve":"stepped"},{"time":1.1333,"x":20.04,"y":114.02},{"time":1.2333,"x":-9.67,"y":27.62},{"time":1.4667,"x":-20.75,"y":35.91,"curve":"stepped"},{"time":1.9,"x":-20.75,"y":35.91},{"time":2,"x":-33.53,"y":5.13},{"time":2.0333,"x":23.53,"y":45.69,"curve":"stepped"},{"time":2.6667,"x":23.53,"y":45.69},{"time":3}]},"rhand":{"rotate":[{"angle":-61.96},{"time":0.1,"angle":-73.08},{"time":0.2,"angle":-53.34},{"time":0.3,"angle":-7.68},{"time":0.4,"angle":-29.8},{"time":0.5,"angle":-28.8},{"time":0.6,"angle":-23.59},{"time":0.7,"angle":-38.24},{"time":0.8,"angle":-31.8},{"time":0.9333,"angle":-54.75},{"time":1.1333,"angle":-97.12},{"time":1.2667,"angle":-59.09},{"time":1.3,"angle":-164.78},{"time":1.4667,"angle":-173.44},{"time":1.9,"angle":149.12},{"time":2,"angle":21.91},{"time":2.0333,"angle":-53.26,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-21.83},{"time":2.6667,"angle":-25.48},{"time":3,"angle":5.78}],"translate":[{"x":-3139.48,"y":-265.49},{"time":0.1,"x":-2597.5,"y":-287.15},{"time":0.2,"x":-1538.08,"y":-271.75},{"time":0.3,"x":-156.59,"y":-302.33},{"time":0.4,"x":162.82,"y":-415.03},{"time":0.5,"x":333.89,"y":-405.4},{"time":0.6,"x":362.68,"y":-451.02},{"time":0.7,"x":341.39,"y":-449.56},{"time":0.8,"x":363.74,"y":-468.24},{"time":0.9333,"x":436.4,"y":-362.08},{"time":1.1333,"x":449.16,"y":-326.78},{"time":1.2667,"x":362.78,"y":-209.31},{"time":1.3,"x":335.64,"y":-198.55},{"time":1.4667,"x":131.27,"y":-121.58},{"time":1.9,"x":2.3,"y":-135.16},{"time":2,"x":126.95,"y":24.83},{"time":2.0333,"x":215.53,"y":202.48,"curve":0.25,"c3":0.75},{"time":2.4333,"x":271.51,"y":181.5},{"time":2.6667,"x":215.79,"y":82.37},{"time":3}],"scale":[{"x":0.445,"y":-0.647,"curve":"stepped"},{"time":0.7,"x":0.445,"y":-0.647},{"time":0.8,"x":0.445,"y":-0.648},{"time":1.2667,"x":0.665,"y":-0.968},{"time":1.3,"x":0.492,"y":0.694},{"time":1.4667,"x":1.263,"y":1.104},{"time":1.9}]},"r_upparm":{"rotate":[{"angle":56.42,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.1,"angle":74.64,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.2,"angle":73.29,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.3,"angle":101.63,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.4,"angle":104.15,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.5,"angle":99.53,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.6,"angle":87.72,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.7,"angle":95.14,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"angle":80.25},{"time":0.9333,"angle":71.45},{"time":1.1333,"angle":66.47},{"time":1.3,"angle":27.63},{"time":1.4667,"angle":-6.25},{"time":1.7333,"angle":-24.81},{"time":1.9,"angle":-40.77},{"time":2,"angle":-23.48},{"time":2.0333,"angle":-19.48},{"time":2.4333,"angle":-10.17},{"time":2.6667,"angle":-0.31},{"time":3,"angle":-6.94}],"translate":[{},{"time":0.4,"x":-23.64,"y":21.09},{"time":0.8,"curve":"stepped"},{"time":1.1333},{"time":1.3,"x":-37.82,"y":-33.24},{"time":1.4667,"x":-30.27,"y":-75.09},{"time":1.7333,"x":-8,"y":-64.19},{"time":1.9,"x":-1.33,"y":-79.96,"curve":"stepped"},{"time":2,"x":-1.33,"y":-79.96},{"time":2.0333,"x":-0.65,"y":-149.57},{"time":2.4333,"x":24.58,"y":-147.44},{"time":2.6667,"x":-50.71,"y":-70.12},{"time":3}]},"l_ik":{"rotate":[{"angle":-2.64},{"time":0.1,"angle":3.05},{"time":0.2,"angle":-46.63},{"time":0.3,"angle":-134.68},{"time":0.4,"angle":-137.5},{"time":0.5,"angle":-127.9},{"time":0.6,"angle":-79.41},{"time":0.7,"angle":-68.78},{"time":0.8,"angle":-2.64},{"time":0.8667,"angle":-18.59},{"time":0.9333,"angle":3.59,"curve":"stepped"},{"time":1.9333,"angle":3.59},{"time":2.0333}],"translate":[{"x":-3697.95,"y":70.09},{"time":0.1,"x":-3528.29,"y":-2.76},{"time":0.2,"x":-2975.64,"y":85.85},{"time":0.3,"x":-2033.06,"y":290.99},{"time":0.4,"x":-1594.4,"y":360.98},{"time":0.5,"x":-1351.98,"y":415.93},{"time":0.6,"x":-857.77,"y":228.69},{"time":0.7,"x":-522.75,"y":181.63},{"time":0.8,"x":-222.27,"y":109.6},{"time":0.8667,"x":-119.44,"y":50.83},{"time":0.9333,"x":-86.11,"y":9.27,"curve":"stepped"},{"time":1.9333,"x":-86.11,"y":9.27},{"time":2,"x":-36.61,"y":102.09},{"time":2.0333}]},"lhand":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-84.39},{"time":0.2,"angle":-88.18},{"time":0.3,"angle":-51.49},{"time":0.4,"angle":63.47},{"time":0.5,"angle":23.26},{"time":0.6,"angle":22.08,"curve":"stepped"},{"time":0.7,"angle":22.08},{"time":0.8,"angle":13.43},{"time":0.9333,"angle":13.68},{"time":1,"angle":-64.87},{"time":1.2333,"angle":-72.6},{"time":1.2667,"angle":-44.35},{"time":1.4667,"angle":-14.78},{"time":1.9,"angle":85.83},{"time":2,"angle":36.86},{"time":2.0333,"angle":-97.53},{"time":2.4333,"angle":-72.24},{"time":2.6667,"angle":-27.8},{"time":3,"angle":-6.06}],"translate":[{"x":-3709.84,"y":-59.33},{"time":0.1,"x":-3469.49,"y":197.82},{"time":0.2,"x":-2505.59,"y":106.23},{"time":0.3,"x":-1151.71,"y":12.55},{"time":0.4,"x":-405.36,"y":-39.96},{"time":0.5,"x":-202.6,"y":-176.13},{"time":0.6,"x":-75.62,"y":-178.34},{"time":0.7,"x":-33.78,"y":-178.34,"curve":"stepped"},{"time":0.9333,"x":-33.78,"y":-178.34},{"time":1,"x":-142.05,"y":-61.94},{"time":1.1333,"x":-282.59,"y":176.33},{"time":1.2333,"x":-276.56,"y":345.61},{"time":1.4667,"x":-151.63,"y":252.03},{"time":1.9,"x":139.85,"y":309.89},{"time":2,"x":135.73,"y":256.73},{"time":2.0333,"x":-128.65,"y":48.02},{"time":2.4333,"x":-132.78,"y":-49.13},{"time":2.6667,"x":-69.38,"y":-48.69},{"time":3,"x":-49.01,"y":-5.46}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.525,"y":-0.516},{"time":1.4667,"y":-0.582},{"time":1.6667,"y":-1},{"time":1.9,"x":1.175,"y":-0.725},{"time":2,"y":-0.983},{"time":2.0333,"curve":"stepped"},{"time":2.6667},{"time":3,"x":0.95,"y":0.95}]},"l_upparm":{"rotate":[{"angle":121.1},{"time":0.1,"angle":113.65},{"time":0.2,"angle":153.35},{"time":0.3,"angle":138.84},{"time":0.4,"angle":121.54},{"time":0.5,"angle":114.98},{"time":0.6,"angle":121.16},{"time":0.7,"angle":148.41},{"time":0.8,"angle":106.3},{"time":0.9333,"angle":74.35},{"time":1.9,"angle":24.26},{"time":2,"angle":52.64},{"time":2.6667,"angle":24.26},{"time":3}],"translate":[{"x":-7.3,"y":263.84,"curve":"stepped"},{"time":0.8,"x":-7.3,"y":263.84},{"time":1.9,"x":4.3,"y":132.76,"curve":"stepped"},{"time":2.6667,"x":4.3,"y":132.76},{"time":3}]},"r_finger_b":{"rotate":[{"angle":-31.61},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-40.66},{"time":0.4,"angle":-120.95},{"time":0.7,"angle":-134.91,"curve":"stepped"},{"time":0.8,"angle":-134.91},{"time":0.9333,"angle":-144.5},{"time":1.1333,"angle":-91.5},{"time":1.2667,"angle":-130.98},{"time":1.3,"angle":-148.54},{"time":1.4667,"angle":-142.86},{"time":1.9,"angle":-149.27},{"time":2,"angle":-130.98},{"time":2.0333,"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-80.56},{"time":2.6667,"angle":-65.19},{"time":3,"angle":-8.92}],"translate":[{"x":78.27,"y":97.55},{"time":0.2,"x":144.96,"y":155.26},{"time":0.3,"x":129.1,"y":139.7},{"time":0.4,"x":188.45,"y":155.72},{"time":0.7,"x":171.78,"y":113.86,"curve":"stepped"},{"time":0.9333,"x":171.78,"y":113.86},{"time":1.1333,"x":84.68,"y":122.05},{"time":1.2667,"x":153.6,"y":158.11,"curve":"stepped"},{"time":2,"x":153.6,"y":158.11},{"time":2.0333,"curve":0.25,"c3":0.75},{"time":2.4333,"x":49.96,"y":19.95},{"time":2.6667,"x":80.79,"y":37.55},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.9333,"x":0.674},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.307,"y":0.895},{"time":2,"x":0.674},{"time":2.0333}]},"r_finger_c":{"rotate":[{"angle":-22.53},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-31.17},{"time":0.4,"angle":-115.08},{"time":0.7,"angle":-125.53,"curve":"stepped"},{"time":0.8,"angle":-125.53},{"time":0.9333,"angle":-118.27},{"time":1.1333,"angle":-82.13},{"time":1.2667,"angle":-121.6},{"time":1.3,"angle":-121.62},{"time":1.4667,"angle":-133.48},{"time":1.9,"angle":-115.45},{"time":2,"angle":-121.6},{"time":2.0333,"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-66.51},{"time":2.6667,"angle":-35.74},{"time":3,"angle":-9.49}],"translate":[{"x":6.64,"y":106.41},{"time":0.2,"x":73.32,"y":164.13},{"time":0.3,"x":57.46,"y":148.57},{"time":0.4,"x":63.53,"y":172.35},{"time":0.7,"x":43.59,"y":126.34,"curve":"stepped"},{"time":0.9333,"x":43.59,"y":126.34},{"time":1.1333,"x":-43.51,"y":134.53},{"time":1.2667,"x":25.41,"y":170.59,"curve":"stepped"},{"time":2,"x":25.41,"y":170.59},{"time":2.0333,"curve":"stepped"},{"time":2.4333,"curve":0.382,"c2":0.56,"c3":0.739},{"time":2.6667,"x":30.83,"y":17.59},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":0.9333,"x":0.534},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.399,"y":0.679},{"time":2,"x":0.674},{"time":2.0333}]},"r_finger_d":{"rotate":[{"angle":1.61},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-6.04},{"time":0.4,"angle":-87.39},{"time":0.7,"angle":-118.41,"curve":"stepped"},{"time":0.8,"angle":-118.41},{"time":0.9333,"angle":-94.23},{"time":1.1333,"angle":-75.01},{"time":1.2667,"angle":-93.5},{"time":1.3,"angle":-58.49},{"time":1.4667,"angle":-126.36},{"time":1.9,"angle":-79.35},{"time":2,"angle":-114.48},{"time":2.0333,"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-49.17},{"time":2.6667,"angle":7.68},{"time":3,"angle":7.12}],"translate":[{"x":-11.55,"y":135.14},{"time":0.2,"x":55.13,"y":192.85},{"time":0.3,"x":39.27,"y":177.3},{"time":0.4,"x":-13.43,"y":192.22},{"time":0.7,"x":25.4,"y":155.06,"curve":"stepped"},{"time":0.9333,"x":25.4,"y":155.06},{"time":1.1333,"x":-61.7,"y":163.26},{"time":1.2667,"x":7.22,"y":199.32},{"time":1.3,"x":-6.92,"y":192.44},{"time":2,"x":7.22,"y":199.32},{"time":2.0333,"curve":"stepped"},{"time":2.4333,"curve":0.382,"c2":0.56,"c3":0.739},{"time":2.6667,"x":30.83,"y":17.59},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":0.9333,"x":0.434,"y":0.747},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.458,"y":0.679},{"time":2,"x":0.674},{"time":2.0333}]},"r_finger_a":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72},{"time":0.9333,"angle":-9.99},{"time":1.1333,"angle":-1.21},{"time":1.4667,"angle":-42.33},{"time":1.9,"angle":-28.83},{"time":2,"angle":-1.21},{"time":2.0333,"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":45.08},{"time":2.6667,"angle":39.22},{"time":3,"angle":14.41}],"translate":[{"x":131.03,"y":-25.92,"curve":"stepped"},{"time":1.2667,"x":131.03,"y":-25.92},{"time":1.3,"x":188.98,"y":-2.29,"curve":"stepped"},{"time":2,"x":188.98,"y":-2.29},{"time":2.0333,"curve":0.25,"c3":0.75},{"time":2.4333,"x":33.92,"y":-37.24},{"time":2.6667,"x":13.46,"y":-38.48},{"time":3}],"scale":[{"x":0.356,"y":0.528,"curve":"stepped"},{"time":0.8,"x":0.356,"y":0.528},{"time":1.3,"x":0.512,"y":0.759,"curve":"stepped"},{"time":2,"x":0.512,"y":0.759},{"time":2.0333}]},"r_upparm2":{"rotate":[{"angle":2.65},{"time":1.1333,"angle":38.25},{"time":1.4667,"angle":55.72},{"time":1.7333,"angle":27.54},{"time":1.9,"angle":6.41},{"time":2.4333,"angle":25.98},{"time":3,"angle":12.97}],"translate":[{},{"time":0.1,"x":-23.06,"y":-56.12},{"time":0.2,"x":18.62,"y":-75.54},{"time":0.3,"x":58.57,"y":-61.11},{"time":0.4,"x":21.93,"y":-102.93},{"time":0.5,"x":56.85,"y":-62.14},{"time":0.6,"x":63.16,"y":-55.04},{"time":0.7,"x":-2.02,"y":-22.9},{"time":0.8,"x":-12.36,"y":-30.77},{"time":0.9333,"x":-18.04,"y":-30.53},{"time":1.1333,"x":-32.01,"y":-71.98},{"time":1.3,"x":14.33,"y":3.83},{"time":1.4667,"x":-0.34,"y":5.85},{"time":1.5,"x":10.13,"y":4.27},{"time":1.7333,"x":-15.82,"y":-3.94},{"time":1.9,"x":-16.38,"y":5.99},{"time":2.4333,"x":-19.28,"y":-33.74},{"time":3}],"scale":[{"x":0.874,"y":0.874,"curve":"stepped"},{"time":0.9333,"x":0.874,"y":0.874},{"time":3}]},"l_finger_c":{"rotate":[{"angle":67.75},{"time":0.2,"angle":46.4},{"time":0.4,"angle":29.53},{"time":0.5,"angle":73.3,"curve":"stepped"},{"time":0.7,"angle":73.3},{"time":0.8,"angle":67.75,"curve":"stepped"},{"time":1.2333,"angle":67.75},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l_finger_b":{"rotate":[{"angle":12.29},{"time":0.2,"angle":-9.05},{"time":0.4,"angle":-25.92},{"time":0.5,"angle":17.85,"curve":"stepped"},{"time":0.7,"angle":17.85},{"time":0.8,"angle":12.29,"curve":"stepped"},{"time":1.2333,"angle":12.29},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l_finger_a":{"rotate":[{"angle":-21},{"time":0.2,"angle":-42.35},{"time":0.4,"angle":-59.21},{"time":0.5,"angle":-15.44,"curve":"stepped"},{"time":0.7,"angle":-15.44},{"time":0.8,"angle":-21,"curve":"stepped"},{"time":1.2333,"angle":-21},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l_finger_d":{"rotate":[{"angle":104.78},{"time":0.2,"angle":83.43},{"time":0.4,"angle":66.56},{"time":0.5,"angle":110.34,"curve":"stepped"},{"time":0.7,"angle":110.34},{"time":0.8,"angle":104.78,"curve":"stepped"},{"time":1.2333,"angle":104.78},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l_finger_b2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":16.78,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":79.08,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-11.64,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":16.78}],"translate":[{"time":1.2333},{"time":1.2667,"x":-1.29,"y":10.42}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l_finger_a2":{"rotate":[{"angle":19.49},{"time":0.2,"angle":-1.85},{"time":0.4,"angle":10.22},{"time":0.5,"angle":56.06},{"time":0.7,"angle":44.53},{"time":0.8,"angle":19.49,"curve":"stepped"},{"time":1.2333,"angle":19.49},{"time":1.2667,"angle":5.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":67.62,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-23.1,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":5.32}],"translate":[{"time":1.2333},{"time":1.2667,"x":-3.75,"y":9.81}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l_finger_c2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":16.54,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":78.84,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-11.88,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":16.54}],"translate":[{"time":1.2333},{"time":1.2667,"x":-2.62,"y":10.17}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l_finger_d2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":26.01,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":88.3,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-2.42,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":26.01}],"translate":[{"time":1.2333},{"time":1.2667,"x":-1.16,"y":10.43}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"r_ik":{"rotate":[{"angle":102.66},{"time":0.1,"angle":27.72},{"time":0.2,"angle":-23.72},{"time":0.3,"angle":-35},{"time":0.4,"angle":-34.26},{"time":0.5},{"time":0.6,"angle":71.42},{"time":0.7,"angle":72.92},{"time":0.8,"angle":82.14},{"time":0.9333,"angle":102.66,"curve":"stepped"},{"time":1.1667,"angle":102.66},{"time":1.3,"angle":28.42},{"time":1.5333}],"translate":[{"x":-3273.98,"y":-6.67},{"time":0.1,"x":-3267.98,"y":99.3},{"time":0.2,"x":-2558.01,"y":126.65},{"time":0.3,"x":-1289.31,"y":271.14},{"time":0.4,"x":-701.5,"y":318.34},{"time":0.5,"x":-427.68,"y":281.87},{"time":0.6,"x":-135.25,"y":150.47},{"time":0.7,"x":34.7,"y":120.68},{"time":0.8,"x":91.94,"y":49.04},{"time":0.9333,"x":77.25,"y":-9.7,"curve":"stepped"},{"time":1.1667,"x":77.25,"y":-9.7},{"time":1.3,"x":140.65,"y":110.58},{"time":1.5333}],"scale":[{"y":-1,"curve":"stepped"},{"time":1.1667,"y":-1},{"time":1.3}]},"l_ik2":{"translate":[{"x":91.54,"y":85.04},{"time":0.1,"x":57.37,"y":79.54},{"time":0.2,"x":46.58,"y":84.16},{"time":0.3,"x":43.88,"y":-108.48},{"time":0.4,"x":50.02,"y":-49.47},{"time":0.5,"x":61.7,"y":4.19},{"time":0.6,"x":69.69,"y":-9.68},{"time":0.7,"x":87.16,"y":32.39},{"time":0.8,"x":40.89,"y":17.54},{"time":0.8667,"x":36.41,"y":-39.33},{"time":0.9333,"x":57.87,"y":16.78},{"time":1.1333,"x":37.58,"y":-6.79},{"time":1.2333,"x":1.78,"y":6.73},{"time":1.4667,"x":-27.38,"y":7.96},{"time":1.9333,"x":-17.93,"y":-28.08},{"time":2,"x":52.27,"y":21.93},{"time":2.0333,"x":39.5,"y":-2.99},{"time":2.4333,"x":28.53,"y":-14.33},{"time":3}]},"r_arm":{"rotate":[{"angle":22.15},{"time":3,"angle":-8.2}],"scale":[{},{"time":0.9333,"y":1.378,"curve":"stepped"},{"time":2,"y":1.378},{"time":2.0333}]},"l_leg":{"rotate":[{"angle":7.96},{"time":3}]},"r_ik2":{"rotate":[{"time":1.0333},{"time":1.2333,"angle":11.17},{"time":1.5333}],"translate":[{"x":128.11,"y":-106.46},{"time":0.1,"x":78.5,"y":-78.71},{"time":0.2,"x":-2.33,"y":39.33},{"time":0.3,"x":87.53,"y":45.77},{"time":0.4,"x":81.77,"y":1.21},{"time":0.5,"x":108.09,"y":16.09},{"time":0.6,"x":105.52,"y":-61.86},{"time":0.7,"x":167.96,"y":-36.84},{"time":0.8,"x":112.19,"y":-79.33},{"time":0.9333,"x":101.11,"y":-61.8},{"time":1.0333,"x":135.3,"y":-65.86},{"time":1.1667,"x":115.72,"y":-49.39},{"time":1.3,"x":104.91,"y":-7.44},{"time":1.5333,"x":89.47,"y":-33.56,"curve":0.26,"c3":0.618,"c4":0.44},{"time":3}]},"r_leg":{"rotate":[{"angle":63.83,"curve":"stepped"},{"time":1.3,"angle":63.83},{"time":1.5333}],"translate":[{"x":3.77,"y":-2.04},{"time":1.0333}],"scale":[{"x":0.787,"y":-1,"curve":"stepped"},{"time":1.1667,"x":0.787,"y":-1},{"time":1.3}]},"r_hand":{"rotate":[{"time":1.2667},{"time":1.3,"angle":22.22,"curve":"stepped"},{"time":2,"angle":22.22},{"time":2.0333}],"translate":[{"x":-108.92,"y":-86.21},{"time":0.1,"x":-231.8,"y":-34.01},{"time":0.2,"x":-257.1,"y":-45.29},{"time":0.3,"x":-225.91,"y":-67.47},{"time":0.4,"x":-184.87,"y":-44.92},{"time":0.5,"x":-188.82,"y":-80.85},{"time":0.6,"x":-168.25,"y":-121.48},{"time":0.7,"x":-209.89,"y":-75.36},{"time":0.8,"x":-202.11,"y":-101.44},{"time":0.9333,"x":-119.87,"y":-108.71},{"time":1.1333,"x":-205.04,"y":-50.37},{"time":1.2667,"x":-212.95,"y":-50.19},{"time":1.3,"x":-185.79,"y":-148.06},{"time":1.4667,"x":-119.62,"y":-101.72,"curve":"stepped"},{"time":2,"x":-119.62,"y":-101.72},{"time":2.0333}]},"r_upparm3":{"rotate":[{"angle":-27.65},{"time":0.1,"angle":-53.5},{"time":0.2,"angle":-105.96},{"time":0.3,"angle":-138.28},{"time":0.4,"angle":-125.37},{"time":0.5,"angle":-109.13},{"time":0.6,"angle":-88.34},{"time":0.7,"angle":-34.45},{"time":0.8,"angle":-67.94},{"time":0.9333,"angle":-57.34},{"time":1.1333,"angle":-44.48},{"time":1.3,"angle":-19.31},{"time":1.4667,"angle":16.01},{"time":1.9,"angle":43.83},{"time":2,"angle":16.04},{"time":2.0333,"angle":22.11},{"time":2.4333,"angle":27.19},{"time":2.6667,"angle":16.64},{"time":3}],"translate":[{},{"time":1.1333,"x":-0.49,"y":-9.64},{"time":1.3,"x":-5.15,"y":-12.45},{"time":1.4667,"x":-5.55,"y":-5.54},{"time":1.9,"x":13.19,"y":-8.62},{"time":2,"x":13.75,"y":-10.47},{"time":2.0333,"x":10.82,"y":10.91},{"time":3}]},"l_upparm2":{"rotate":[{"angle":-78.3},{"time":2.6667,"angle":1.59},{"time":3,"angle":-6.45}],"translate":[{"x":-56.13,"y":20.55},{"time":0.1,"x":-86.33,"y":42.77},{"time":0.2,"curve":"stepped"},{"time":0.3},{"time":0.4,"x":-97.89,"y":54.46},{"time":0.5,"x":10.44,"y":22.48},{"time":0.6,"x":-13,"y":90.89},{"time":0.7,"x":-44.26,"y":70.92},{"time":0.8,"x":-56.13,"y":20.55},{"time":1.9,"x":2.61,"y":-9.89,"curve":"stepped"},{"time":2.6667,"x":2.61,"y":-9.89},{"time":3}]},"l_hand":{"scale":[{"x":0,"y":0,"curve":"stepped"},{"time":1.0667,"x":0,"y":0},{"time":1.1}]},"r_leg2":{"rotate":[{"angle":93.27},{"time":1.5333}]},"r_leg3":{"rotate":[{"angle":-83.89},{"time":1.5333}]},"l_armour":{"rotate":[{"angle":-53.88},{"time":2.6667,"angle":19.71},{"time":3,"angle":1.84}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"r_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":19.13,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":41.37,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":37.65,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":16.4,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":-10.53,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":-4.8,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-31.05,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-27.47,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":-4.22,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3}]},"r_ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":-0.23,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":-26.38,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-13.4,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":37.79,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.6333,"angle":-23.32,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.9,"angle":39.57,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":3.84,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":27.73,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":2.2,"angle":-25.17,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":2.4333,"angle":-8.23,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":15.32,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":19.13,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":41.37,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":37.65,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":16.4,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":-10.53,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":-4.8,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-31.05,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-27.47,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":-4.22,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3}]},"l_ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":0.22,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":-25.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-11.95,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":40,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.6333,"angle":-20.58,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.9,"angle":43.11,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":7.66,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":31.64,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":2.2,"angle":-20.82,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":2.4333,"angle":-3.36,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":20.61,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":3.27}]},"hair_t":{"rotate":[{"angle":4.07,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":17.13,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-8.99,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":4.07,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":13.41,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":7.98,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":2.46,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":1.48,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":1.28,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":1.21,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":0.5,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":0.19,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3}]},"hair_t2":{"rotate":[{"angle":-2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":8.12,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":17.96,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.9333,"angle":9.4,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.1333,"angle":11.59,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":2.86,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":-7.32,"curve":0.342,"c2":0.38,"c3":0.676,"c4":0.71},{"time":1.9,"angle":-0.51,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":-14.93,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-12.73,"curve":0.344,"c2":0.41,"c3":0.678,"c4":0.75},{"time":2.4333,"angle":0.27,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":0.48,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":0.21,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-23.63,"curve":0.25,"c3":0.75},{"time":0.6,"angle":24.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":21.08,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":31.72,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.1333,"angle":29.69,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":9.21,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-1.61,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-26.31,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-11.28,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":15.95,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":-30.14,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":6.15,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":15.32,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-41.21,"curve":0.25,"c3":0.75},{"time":0.7,"angle":28.11,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":36.2,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.9333,"angle":32.22,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.1333,"angle":42.54,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.2333,"angle":49.92,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":9.97,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":-18.95,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":-4.6,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":22.41,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":-26.13,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":9.07,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":30.87,"curve":0.25,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.87,"curve":0.293,"c3":0.631,"c4":0.37},{"time":1.1333,"angle":33.5,"curve":0.311,"c2":0.25,"c3":0.648,"c4":0.59},{"time":1.4667,"angle":38.85,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":47.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":49,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":49.65,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":57.11,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":60.71,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.4,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.7,"angle":-0.67,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"angle":-31.7,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":-3.83,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":35.91,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":54.86,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":-64.12,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":2.07,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":34.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-26.89,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-34.03,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":18.89,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3,"angle":6.2}],"translate":[{},{"time":3,"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":0.51,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":0.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.9333,"angle":-30.83,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.1333,"angle":22.86,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":10.61,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":76.25,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":1.6,"angle":19.11,"curve":0.34,"c2":0.37,"c3":0.673,"c4":0.7},{"time":1.9,"angle":45.99,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":17.52,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":74.08,"curve":0.337,"c2":0.36,"c3":0.67,"c4":0.69},{"time":2.1667,"angle":-1.64,"curve":0.341,"c2":0.39,"c3":0.674,"c4":0.73},{"time":2.4333,"angle":12.71,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":48.39,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":10.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.6,"angle":26.71,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.7,"angle":19.65,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.8,"angle":-15.64,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":18.47,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":53.6,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":71.03,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-45.85,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":20.45,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":53.24,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":-8.58,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":-16.16,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":36.42,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":23.39}],"translate":[{},{"time":3,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":20.79,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.7,"angle":25.53,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":-5.5,"curve":0.328,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.9333,"angle":29.47,"curve":0.328,"c2":0.31,"c3":0.662,"c4":0.65},{"time":1.1333,"angle":67.48,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.2333,"angle":86.62,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":-27.55,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":44.89,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":79.09,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":17.73,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":15.34,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":70.34,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":59.01}],"translate":[{},{"time":3,"x":-2.26,"y":14.51}]},"hair_t10":{"rotate":[{},{"time":1.1333,"angle":0.98},{"time":1.4667,"angle":1.27},{"time":1.9,"angle":1.65},{"time":2,"angle":1.73},{"time":2.0333,"angle":1.76},{"time":2.4333,"angle":2.11},{"time":2.6667,"angle":2.31},{"time":3,"angle":2.6}]},"hair_t11":{"rotate":[{},{"time":1.1333,"angle":3.61},{"time":1.4667,"angle":4.67},{"time":1.9,"angle":6.04},{"time":2,"angle":6.36},{"time":2.0333,"angle":6.47},{"time":2.4333,"angle":7.74},{"time":2.6667,"angle":8.48},{"time":3,"angle":9.54}]},"head2":{"rotate":[{"time":1.9},{"time":2.0333,"angle":3.15},{"time":3}],"translate":[{"time":1.9},{"time":2.0333,"x":23.71,"y":-27.59},{"time":3}]},"headbeard_b":{"rotate":[{},{"time":1.1333,"angle":1.39},{"time":1.4667,"angle":1.79},{"time":1.9,"angle":2.32},{"time":2,"angle":2.45},{"time":2.0333,"angle":2.49},{"time":2.4333,"angle":2.98},{"time":2.6667,"angle":3.26},{"time":3,"angle":3.67}]},"headbeard_b2":{"rotate":[{},{"time":1.1333,"angle":2.52},{"time":1.4667,"angle":3.26},{"time":1.9,"angle":4.23},{"time":2,"angle":4.45},{"time":2.0333,"angle":4.52},{"time":2.4333,"angle":5.41},{"time":2.6667,"angle":5.93},{"time":3,"angle":6.67}]},"headbeard_b3":{"rotate":[{},{"time":1.1333,"angle":3.31},{"time":1.4667,"angle":4.28},{"time":1.9,"angle":5.55},{"time":2,"angle":5.84},{"time":2.0333,"angle":5.93},{"time":2.4333,"angle":7.1},{"time":2.6667,"angle":7.78},{"time":3,"angle":8.76}]},"r_ear_s":{"rotate":[{},{"time":3,"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":-66.72},{"time":0.1,"angle":-71.8},{"time":0.2,"angle":-35.65},{"time":0.3,"angle":-111.88},{"time":0.4,"angle":-70.5},{"time":0.5,"angle":-82.82},{"time":0.6,"angle":-85.91},{"time":0.7,"angle":-52.68},{"time":0.8,"angle":67.57},{"time":0.9333,"angle":14.92},{"time":1.1333,"angle":36.09},{"time":1.2333,"angle":3.69},{"time":1.4667,"angle":4.39},{"time":1.9,"angle":-0.89},{"time":2,"angle":-24.46},{"time":2.0333,"angle":47.99},{"time":2.4333,"angle":-47.91},{"time":2.5667,"angle":6.64},{"time":2.6667,"angle":36.26},{"time":2.7333,"angle":47.4},{"time":2.8333,"angle":16.15},{"time":3,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{},{"time":3,"angle":15.92}],"translate":[{},{"time":3,"x":5.7,"y":-8.17}]},"r_beard":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38},{"time":1.1333,"angle":1.69},{"time":1.4667,"angle":-6.56},{"time":1.9,"angle":-51.71},{"time":2,"angle":-50.66},{"time":2.0333,"angle":-1.36},{"time":2.1667,"angle":3.87},{"time":2.4333,"angle":-10.16},{"time":2.6667,"angle":3.59},{"time":3,"angle":8.77}],"scale":[{},{"time":3,"x":0.88}]},"r_beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":23.26,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":31.09,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-23.54,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-2.37,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-43.11,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":-24.88,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":2.1667,"angle":17.77,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":2.4333,"angle":11.18,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":-9.8,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72},{"time":1.1333,"angle":-6.27},{"time":1.2333,"angle":29.04},{"time":1.4667,"angle":30.42},{"time":1.9,"angle":-2.19},{"time":2,"angle":-34.94},{"time":2.0333,"angle":-54.22},{"time":2.1667,"angle":-34.76},{"time":2.4333,"angle":15.5},{"time":2.6667,"angle":-13.08},{"time":3,"angle":-10}]},"l_bear":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38},{"time":0.9333,"angle":-9.76},{"time":1.1333,"angle":-0.57},{"time":1.2333,"angle":7.72},{"time":1.4667,"angle":-0.77},{"time":1.9,"angle":-46.51},{"time":2,"angle":-50.69},{"time":2.0333,"angle":-29.9},{"time":2.1333,"angle":-23.51},{"time":2.4333,"angle":-24.86},{"time":2.6667,"angle":-19.49},{"time":3,"angle":-11.82}],"translate":[{},{"time":0.4,"x":5.14,"y":33.81},{"time":0.8,"x":-27.44,"y":61.13},{"time":1.1333,"x":13,"y":65.62},{"time":1.2333,"x":18.59,"y":79.6},{"time":1.4667,"x":-35.4,"y":16.96},{"time":1.9}]},"l_bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":-29.64,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":22.7,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":18.77,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-24.33,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-10.77,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-31.53,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":34.58,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":2.1333,"angle":35.65,"curve":0.345,"c2":0.39,"c3":0.679,"c4":0.72},{"time":2.4333,"angle":0.16,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":17.9,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72},{"time":0.9333,"angle":-37.29},{"time":1.1333,"angle":-16.24},{"time":1.2333,"angle":37.88},{"time":1.4667,"angle":18.31},{"time":1.9,"angle":-12.28},{"time":2,"angle":-26.03},{"time":2.0333,"angle":-28.49},{"time":2.1333,"angle":36.65},{"time":2.4333,"angle":37.07},{"time":2.6667,"angle":-6.49},{"time":3,"angle":15.47}]},"headbeard_f":{"rotate":[{},{"time":1.1333,"angle":1.14},{"time":1.4667,"angle":1.47},{"time":1.9,"angle":1.91},{"time":2,"angle":2.01},{"time":2.0333,"angle":2.04},{"time":2.4333,"angle":2.44},{"time":2.6667,"angle":2.67},{"time":3,"angle":3.01}]},"headbeard_f2":{"rotate":[{},{"time":1.1333,"angle":-1.76},{"time":1.4667,"angle":-2.28},{"time":1.9,"angle":-2.95},{"time":2,"angle":-3.11},{"time":2.0333,"angle":-3.16},{"time":2.4333,"angle":-3.78},{"time":2.6667,"angle":-4.14},{"time":3,"angle":-4.66}]},"headbeard_f3":{"rotate":[{},{"time":1.1333,"angle":-0.23},{"time":1.4667,"angle":-0.29},{"time":1.9,"angle":-0.38},{"time":2,"angle":-0.4},{"time":2.0333,"angle":-0.41},{"time":2.4333,"angle":-0.49},{"time":2.6667,"angle":-0.53},{"time":3,"angle":-0.6}]},"headbeard_f4":{"rotate":[{},{"time":1.1333,"angle":13.61},{"time":1.4667,"angle":17.61},{"time":1.9,"angle":22.81},{"time":2,"angle":24.01},{"time":2.0333,"angle":24.42},{"time":2.4333,"angle":29.22},{"time":2.6667,"angle":32.02},{"time":3,"angle":36.02}]},"headbeard_f5":{"rotate":[{},{"time":1.1333,"angle":15.48},{"time":1.4667,"angle":20.04},{"time":1.9,"angle":25.96},{"time":2,"angle":27.33},{"time":2.0333,"angle":27.78},{"time":2.4333,"angle":33.25},{"time":2.6667,"angle":36.43},{"time":3,"angle":40.99}]},"l_leg2":{"rotate":[{"angle":-85.86},{"time":3}]},"l_leg3":{"rotate":[{"angle":2.06},{"time":3}]},"skirt_f":{"rotate":[{"angle":16.01},{"time":0.1,"angle":37.11},{"time":0.4,"angle":72.86},{"time":0.5,"angle":79.35},{"time":0.8,"angle":16.01},{"time":0.9333,"angle":31.78},{"time":1.1333,"angle":25.95},{"time":1.2333,"angle":-3.48},{"time":1.4667,"angle":2},{"time":1.9,"angle":1.29},{"time":2,"angle":-0.42},{"time":2.0333,"angle":9.72},{"time":2.4333,"angle":21.18},{"time":2.6667,"angle":3.49},{"time":3,"angle":9.15}],"scale":[{"x":0.554,"curve":"stepped"},{"time":0.8,"x":0.554},{"time":3}],"shear":[{},{"time":3,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":8.67},{"time":0.2,"angle":26.26},{"time":0.6,"angle":-8.92},{"time":0.8,"angle":8.67},{"time":0.9333,"angle":-25.83},{"time":1.1333,"angle":-6.53},{"time":1.2333,"angle":20.3},{"time":1.4667,"angle":0.81},{"time":1.9,"angle":12.72},{"time":2,"angle":31.36},{"time":2.0333,"angle":-12.77},{"time":2.4333,"angle":-2.08},{"time":2.6667,"angle":-27.26},{"time":3,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-8.92},{"time":0.4,"angle":26.26},{"time":0.8,"angle":-8.92},{"time":0.9333,"angle":-26.44},{"time":1.1333,"angle":-8.67},{"time":1.2333,"angle":17.39},{"time":1.4667,"angle":-3.9},{"time":1.9,"angle":4.69},{"time":2,"angle":22.56},{"time":2.0333,"angle":-21.83},{"time":2.4333,"angle":-14.22},{"time":3,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":-21.75},{"time":0.3},{"time":0.7,"angle":-26.67},{"time":0.8,"angle":-21.75,"curve":0.328,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.9333,"angle":-19.83,"curve":0.325,"c2":0.31,"c3":0.66,"c4":0.65},{"time":1.2333,"angle":-16.8,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":18.96,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":6.38,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":-6.93,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":2.29,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":22.58,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":-12.72,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":7.98}]},"l_leg5":{"rotate":[{"angle":7.51},{"time":0.1},{"time":0.5,"angle":40.71},{"time":0.8,"angle":7.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.9333,"angle":5.91,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.2333,"angle":3.57,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":32.52,"curve":0.342,"c2":0.38,"c3":0.676,"c4":0.71},{"time":1.9,"angle":5.8,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":-10.08,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-1.56,"curve":0.344,"c2":0.41,"c3":0.678,"c4":0.75},{"time":2.4333,"angle":10.52,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":-28.82,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":-9.62}]},"tail":{"rotate":[{"angle":-11.38},{"time":0.1,"angle":0.98},{"time":0.2,"angle":21.9},{"time":0.3,"angle":42.82},{"time":0.4,"angle":66.9},{"time":0.5,"angle":82.78},{"time":0.6,"angle":73.27},{"time":0.7,"angle":22.12},{"time":0.8,"angle":5.63,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":6.83},{"time":1.1333,"angle":-3.18},{"time":1.2333,"angle":4},{"time":1.4667,"angle":-4.11},{"time":1.9,"angle":-5.33},{"time":2,"angle":-5.61},{"time":2.0333,"angle":-5.7},{"time":2.4333,"angle":-6.82},{"time":2.6667,"angle":-7.47},{"time":3,"angle":-8.41}]},"tail2":{"rotate":[{"angle":21.88},{"time":0.1,"angle":16.73},{"time":0.2,"angle":28.65},{"time":0.3,"angle":30.6},{"time":0.4,"angle":39.52},{"time":0.5,"angle":35.58},{"time":0.6,"angle":25.54},{"time":0.7,"angle":30.68},{"time":0.8,"angle":25.76,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.9333,"angle":14.17},{"time":1.1333,"angle":1.71},{"time":1.2333,"angle":6.71},{"time":1.4667,"angle":2.21},{"time":1.9,"angle":2.86},{"time":2,"angle":3.01},{"time":2.0333,"angle":3.06},{"time":2.4333,"angle":-7.59},{"time":2.6667,"angle":-21.43},{"time":3,"angle":4.52}]},"tail3":{"rotate":[{"angle":9.68},{"time":0.1,"angle":-0.06},{"time":0.2,"angle":16.73},{"time":0.3,"angle":-0.19},{"time":0.4,"angle":-0.25},{"time":0.5,"angle":-0.31},{"time":0.6,"angle":2.63},{"time":0.7,"angle":-0.43},{"time":0.8,"angle":24.08,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.9333,"angle":7.46},{"time":1.1333,"angle":-0.7},{"time":1.2333,"angle":26.36},{"time":1.4667,"angle":-0.91},{"time":1.9,"angle":-1.17},{"time":2,"angle":23.89},{"time":2.0333,"angle":-1.26},{"time":2.4333,"angle":29.51},{"time":2.6667,"angle":-1.65},{"time":3,"angle":-1.85}],"translate":[{},{"time":0.4,"x":-8.99,"y":-3.86},{"time":0.8}]},"tail4":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-0.27},{"time":0.2,"angle":-0.55},{"time":0.3,"angle":16.73},{"time":0.4,"angle":-1.1},{"time":0.5,"angle":-1.37},{"time":0.6,"angle":-1.64},{"time":0.7,"angle":34.38},{"time":0.8,"angle":34.35,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.9333,"angle":32.05},{"time":1.1333,"angle":-3.11},{"time":1.2333,"angle":-33.57},{"time":1.4667,"angle":35.01},{"time":1.9,"angle":-30.93},{"time":2,"angle":-32.01},{"time":2.0333,"angle":18.49},{"time":2.4333,"angle":50.3},{"time":2.6667,"angle":29.73},{"time":3,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-20.23},{"time":0.1,"angle":-0.4},{"time":0.2,"angle":-0.8},{"time":0.3,"angle":-1.19},{"time":0.4,"angle":16.73},{"time":0.5,"angle":-1.99},{"time":0.6,"angle":-2.39},{"time":0.7,"angle":-2.79},{"time":0.8,"angle":-20.23,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-39.18},{"time":1.1333,"angle":-4.51},{"time":1.2333,"angle":-4.91},{"time":1.4667,"angle":33.19},{"time":1.9,"angle":-33.29},{"time":2,"angle":-14.52},{"time":2.0333,"angle":-8.1},{"time":2.4333,"angle":-24.82},{"time":2.6667,"angle":-10.62},{"time":3,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-20.23},{"time":0.2,"angle":-0.55},{"time":0.3,"angle":-0.82},{"time":0.4,"angle":-1.1},{"time":0.5,"angle":16.73},{"time":0.6,"angle":-1.64},{"time":0.7,"angle":-1.92},{"time":0.8,"angle":-37.57,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.9333,"angle":-32.92},{"time":1.1333,"angle":-3.11},{"time":1.2333,"angle":-52.46},{"time":1.4667,"angle":35.01},{"time":1.9,"angle":-30.93},{"time":2,"angle":-12.04},{"time":2.0333,"angle":-5.57},{"time":2.4333,"angle":-62.19},{"time":2.6667,"angle":-7.31},{"time":3,"angle":-8.22}]},"headmouth":{"rotate":[{"time":1.9},{"time":2,"angle":-3.81},{"time":2.0333,"angle":-8.16},{"time":2.0667,"angle":-12.2},{"time":2.1,"angle":-7.9},{"time":2.1333,"angle":-12.39},{"time":2.1667,"angle":-11.44},{"time":2.2333,"angle":-17.98},{"time":2.3,"angle":-13.71},{"time":2.4333,"angle":-24.39},{"time":2.6667,"angle":1.02},{"time":3}],"translate":[{"time":1.9},{"time":2,"x":-13.44,"y":11.31},{"time":2.0333,"x":-29.23,"y":22.85},{"time":2.0667,"x":-25.45,"y":24.41},{"time":2.1,"x":-32.91,"y":16.54},{"time":2.1333,"x":-28.89,"y":18.24},{"time":2.1667,"x":-30.6,"y":15.24},{"time":3}],"scale":[{"time":1.9},{"time":2.0333,"x":1.207},{"time":3}]},"shadow":{"translate":[{"x":-3453.81},{"time":0.1,"x":-3037.09},{"time":0.2,"x":-2203.66},{"time":0.3,"x":-1179.52},{"time":0.4,"x":-565.04},{"time":0.5,"x":-317.84},{"time":0.6,"x":-36.69},{"time":0.7},{"time":0.8,"x":61.15},{"time":0.9333,"x":67.27},{"time":1.1333,"x":48.92},{"time":1.2333},{"time":1.4667,"x":-79.5},{"time":1.9},{"time":2,"x":91.72},{"time":2.0333,"x":134.53},{"time":2.4333,"x":91.73},{"time":2.6667}],"scale":[{"y":0.576},{"time":0.1,"y":1.071},{"time":0.2,"y":1.353},{"time":0.3,"y":1.424},{"time":0.4,"y":1.212},{"time":0.5,"y":1.283},{"time":0.6,"y":1.183},{"time":0.7,"y":1.245},{"time":0.8,"y":1.122},{"time":0.9333,"y":1.061},{"time":1.1333,"y":0.817,"curve":"stepped"},{"time":1.2333,"y":0.817},{"time":1.4667,"y":0.755},{"time":1.9},{"time":2,"y":1.122},{"time":2.0333,"y":1.183},{"time":2.4333,"y":1.256},{"time":2.6667}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]}},"ik":{"r_ik2":[{"softness":50,"bendPositive":false,"curve":"stepped"},{"time":1.0333,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":1.3,"softness":50}]},"deform":{"default":{"body":{"body":[{"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,23.4961,-62.50654,62.42265,-22.3002,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,49.89716,22.95819,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.74295,37.16302,155.17085,-24.09232,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-3.7588,-102.26871,75.48494,-69.10156,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321]},{"time":1.1333,"vertices":[24.27805,-94.09186,-49.44308,-60.33459,28.93794,-79.05698,-27.72601,-33.53111,23.06407,-36.89331,-12.34491,-18.84964,13.98885,-17.66406,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-18.47495,10.59903,-6.60213,-16.58984,5.19722,-44.14511,14.71194,-69.24146,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,12.18525,-58.46974,55.0217,-31.75858,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,45.32996,18.62659,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.34499,36.78583,155.17085,-24.09232,41.83589,-65.34915,1.92397,-24.0264,25.36412,-11.29166,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-28.56895,-91.9902,57.89997,-89.39825,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321]},{"time":1.2333,"vertices":[26.0888,-115.37415,-60.942,-60.92342,19.51513,-86.1563,-29.9238,-33.3717,14.43166,-42.43585,-15.08719,-19.20169,9.3477,-22.55963,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.82828,-26.58117,0,0,0,0,0,0,0,0,12.07422,7.25618,2.29202,13.89929,33.88745,25.18236,2.76247,42.12947,41.37867,38.17905,-2.28754,56.25507,36.94104,59.35998,-20.70907,66.73123,16.80132,49.46973,-26.80858,44.8434,31.41111,30.16824,-2.06893,54.23732,34.14772,37.64679,-8.51598,59.00241,37.59007,38.5527,-8.53843,62.33112,30.00274,28.43958,-6.58674,47.23649,0,0,-7.04848,8.31307,2.46563,-20.15645,11.72204,-52.64817,18.92917,-83.68405,47.98579,-19.03939,34.5077,40.68241,-5.60923,-93.8857,-0.72711,-39.98087,32.63293,-26.73019,46.03236,-12.84887,38.17278,38.55824,12.01404,-62.09341,51.17092,-24.30579,44.21547,-10.87038,31.58019,45.07083,21.86119,6.09239,16.02022,-38.2474,36.95699,-2.1788,32.5742,-36.1992,39.77699,16.73414,-18.98038,-57.27432,28.34156,19.3312,0.47513,-132.15439,98.75189,-78.98983,-4.25787,-64.75793,45.48936,-38.03102,64.41954,6.77971,25.12898,73.3241,36.98894,10.2651,65.26631,-23.17101,28.55318,-61.52522,-4.7227,-19.02296,14.65312,-14.9681,45.51391,-31.6144,45.71153,33.27042,-3.74494,-12.41611,7.03439,-10.89497,-17.08905,-82.54562,51.86396,-65.71756,52.90584,1.86257,22.51154,57.57791,3.06972,-5.36997,6.06438,1.21763,-47.42712,-78.2764,38.69441,-88.07888,-2.75548,-18.69411,12.54269,-12.61953,7.03135,4.65735,1.11801,10.48928]},{"time":1.4667,"vertices":[-5.35229,-88.68799,-14.94373,-37.65738,-2.44073,-40.4408,-3.34583,-8.42907,-0.54663,-9.05249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.0462,-0.7608,-2.02533,-33.55963,-3.68903,-61.12369,0,0,0,0,0,0,-0.57379,-1.44237,-0.09277,-1.54971,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-2.21967,-36.78369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-18.57355,-46.80413,-3.03394,-50.26352],"curve":0.271,"c3":0.619,"c4":0.41},{"time":1.9,"offset":60,"vertices":[37.48517,62.19609,58.01733,43.6738,13.45941,74.05562,40.16711,63.65485,-9.40399,84.27005,22.77954,81.67564,-42.74304,78.72104,-10.21722,88.99184,0.15021,15.37225,0,0,0,0,0,0,0,0,-18.41156,25.91011,-7.39111,30.91399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.12845,3.8064,12.67126,-1.00376,-4.67511,2.56232,0,0,0,0,-14.9501,1.44153,-13.32825,6.92537,0,0,-16.55725,22.66578,0,0,0,0,0,0,0,0,8.89136,54.56642,28.6449,47.28631,-11.92657,1.74176,0,0,0,0,0,0,0,0,5.03729,3.62621,6.02765,1.47992,0,0,0,0,0,0,0,0,-24.07605,55.22311,-1.68732,60.21938],"curve":0.326,"c2":0.31,"c3":0.66,"c4":0.65},{"time":2.0333,"offset":52,"vertices":[87.80539,-3.36305,86.0305,26.09262,130.83118,-21.90453,125.22055,52.53799,231.09903,59.91956,159.18552,171.53738,139.97455,62.84583,105.13766,121.96976,101.75116,59.44374,53.0515,105.1792,29.55228,46.22049,15.95096,52.49091,1.58522,66.16406,0,0,0,0,0,0,0,0,99.92578,15.82083,81.96442,72.44122,-8.27121,-59.20851,-13.54034,-95.89952,63.9221,-72.7597,57.12891,-35.91383,79.75745,-2.03003,-12.68851,-75.12286,48.71669,-58.57599,248.4389,26.41142,200.59967,151.51443,32.05046,-23.61557,-11.67401,-69.22443,45.22089,-54.46356,0.49945,-87.57159,71.31328,-58.93054,-13.29416,-95.16391,18.18263,51.32007,-13.29416,-95.16391,63.52454,-72.09381,-6.30997,-42.96962,28.483,-32.78632,234.6795,96.40231,152.50386,196.57257,48.24133,-58.27618,71.33318,-84.88074,34.19733,-38.8103,-8.07059,-57.77269,38.56491,-43.76678,151.72177,-27.3723,154.17879,64.48386,-8.21057,-58.77573,39.23445,-44.52594,-13.29416,-95.16391,63.52454,-72.09381,136.71231,74.96933,76.5536,138.8316,-2.34671,-16.79988,11.21426,-12.72662,-7.04813,-50.45514,33.68033,-38.22357,-4.77377,-34.17123,22.81015,-25.88733,5.27451,-8.41873,11.83421,-4.42062],"curve":0.358,"c2":0.42,"c3":0.756},{"time":2.4333,"offset":52,"vertices":[121.78693,-17.43251,118.8455,42.70169,121.45566,-21.26025,118.62239,45.84622,175.42584,40.20203,137.86493,116.45798,141.89926,62.06236,106.98592,122.91977,142.46075,91.74541,55.07549,157.10797,55.44174,78.74402,8.14989,93.32208,-9.89001,32.80634,0,0,0,0,0,0,0,0,131.74475,82.10487,52.01645,139.483,25.79602,-85.88007,97.53918,-163.19644,91.48434,-110.04504,85.04752,-65.79146,108.91766,-5.57858,60.92096,-78.17427,44.11397,-49.71747,262.46606,36.98798,201.71605,169.0477,26.32883,-4.14645,18.63394,-132.9446,67.16234,-96.28162,105.9787,-70.70122,89.06021,7.86621,14.16776,-118.22227,-2.03976,94.02371,49.73306,-140.92178,70.21329,-118.33276,8.70432,-76.16702,34.98631,-61.9126,248.1388,155.0454,116.789,244.99268,45.33655,0.63382,80.07954,-173.95483,58.1859,-87.73584,52.98373,-80.64719,53.52129,-63.22638,182.49146,-3.64156,144.65237,96.48193,2.49295,-81.07822,31.68808,-73.56509,26.83438,-132.03143,60.44763,-115.29529,157.94473,132.68073,46.61153,192.5437,2.67133,-46.40553,26.008,-34.77368,44.24838,-114.66135,69.61789,-97.22211,2.86493,-60.93796,27.50298,-51.37921,8.84415,-38.44814,31.4649,-24.35187],"curve":0.358,"c2":0.42,"c3":0.756},{"time":2.6667,"offset":52,"vertices":[87.80539,-3.36305,86.0305,26.09262,130.83118,-21.90453,125.22055,52.53799,231.09903,59.91956,159.18552,171.53738,139.97455,62.84583,105.13766,121.96976,101.75116,59.44374,53.0515,105.1792,29.55228,46.22049,15.95096,52.49091,1.58522,66.16406,0,0,0,0,0,0,0,0,99.97629,16.18695,81.71991,72.71924,0,0,-0.24619,-0.73561,0.39757,-0.66589,58.98053,-22.65485,70.90659,8.0141,-3.87582,-12.03766,6.60556,-10.78387,248.4389,26.41142,200.59967,151.51443,5.0999,6.97037,-4.35648,-16.8421,10.25435,-14.78021,5.65866,-50.63797,46.65887,-30.95007,0,0,15.91461,53.89301,0,0,0,0,-0.5282,-1.57901,0.85345,-1.42944,234.6795,96.40231,152.50386,196.57257,19.63693,-25.81274,7.80864,-12.78693,0,0,0,0,0,0,153.23071,-16.5722,146.96951,72.66568,0,0,0,0,0,0,0,0,136.71231,74.96933,76.5536,138.8316,0,0,0,0,0,0,0,0,0,0,0,0,6.44553,-0.03372,6.23685,1.93149],"curve":0.358,"c2":0.42,"c3":0.756},{"time":3}]},"l_hand2":{"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}],"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r_arm":{"r_arm":[{"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043],"curve":"stepped"},{"time":2,"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043]},{"time":2.0333}]},"r_armour_u":{"r_armour_u":[{"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576],"curve":0.25,"c3":0.75},{"time":0.4,"offset":4,"vertices":[163.9654,-45.00104,177.28926,99.94327,181.48798,-69.53613,202.98242,108.74658,140.53593,-68.87366,203.46579,65.00528,76.7599,-81.34448,151.37636,9.09085],"curve":0.25,"c3":0.75},{"time":0.8,"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]},{"time":0.9333,"offset":4,"vertices":[86.15086,-86.93385,131.65134,16.42305,98.35374,-87.21111,139.04272,20.50257,72.67327,-88.64056,118.05659,-0.91488,47.05607,-96.31017,106.23074,-20.62051]},{"time":1.1333,"offset":4,"vertices":[76.72326,-75.8345,106.16136,31.64257,76.53687,-57.70183,90.38624,33.82039,57.22791,-59.38353,79.41578,16.51402,46.80376,-80.84232,91.47905,3.04135]},{"time":1.1667,"offset":4,"vertices":[61.37862,-60.66761,84.92911,25.31406,51.66551,-48.59739,70.66653,17.3245,36.21834,-49.94276,61.89016,3.4794,37.44302,-64.67386,73.18325,2.43308]},{"time":1.2,"offset":4,"vertices":[46.03392,-45.50067,63.69678,18.98553,31.84498,-37.87653,50.86269,6.27486,20.25962,-38.88556,44.28042,-4.10896,28.08224,-48.50535,54.88739,1.82481]},{"time":1.2333,"offset":4,"vertices":[30.68928,-30.33378,42.46452,12.65702,24.77088,-24.68441,35.46425,7.4142,17.04731,-25.35709,31.07607,0.49165,18.72149,-32.3369,36.59159,1.21654]},{"time":1.3}]},"r_hand":{"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052],"curve":"stepped"},{"time":2,"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]},{"time":2.0333}]},"r_upparm":{"r_upparm":[{"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":0.1,"vertices":[-28.71144,-44.1958,56.25366,21.75468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88.93488,43.86108,51.64029,65.98203,0.65607,47.6413,-54.5849,17.91281,-131.43018,-29.84882]},{"time":0.2,"vertices":[-70.29115,-121.59358,129.93558,-53.69101,0,0,0,0,0,0,0,0,0,0,0,0,60.33824,12.40262,1.57361,70.47795,138.48999,146.07806,67.43813,181.56848,-45.18221,149.7756,-149.39273,46.96301,-219.99423,-105.85606,-43.01499,-68.8707,65.8432,-65.57346,-24.77599,-39.39505,37.61963,-37.69945]},{"time":0.3,"vertices":[-142.63615,-149.74637,47.56436,-137.68623,0,0,0,0,0,0,0,0,0,0,0,0,50.28187,10.33552,1.31134,58.73162,40.17482,138.09778,-59.78693,144.63666,-163.83813,74.89461,-232.30444,-49.23798,-259.16425,-211.93402,-35.84583,-57.39225,54.86933,-54.64455,-20.64665,-32.82921,31.34969,-31.41621,12.45225,-6.3985,16.0213,-0.0816]},{"time":0.4,"vertices":[-114.10892,-119.7971,38.05149,-110.14899,0,0,0,0,0,0,0,0,0,0,0,0,40.22549,8.26841,1.04907,46.9853,17.968,82.77934,-63.6477,81.75819,-145.03168,21.48185,-197.31894,-77.27264,-203.24228,-209.83081,-28.67666,-45.9138,43.89547,-43.71564,-16.51732,-26.26337,25.07975,-25.13297,9.9618,-5.1188,12.81704,-0.06528]},{"time":0.7,"vertices":[-28.52724,-29.94928,9.51288,-27.53725,0,0,0,0,0,0,0,0,0,0,0,0,10.05638,2.0671,0.26227,11.74633,97.34462,37.31192,50.5202,69.83792,-27.32924,70.25962,-114.90354,35.7408,-166.87126,-25.32079,-7.16917,-11.47845,10.97387,-10.92891,-4.12933,-6.56584,6.26994,-6.28324,2.49045,-1.2797,3.20426,-0.01632]},{"time":0.8,"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":2.0333,"vertices":[-14.41787,-22.19356,28.24859,10.92443,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31.91917,-11.54503,15.38733,-3.67176,5.42368,5.79634,-24.18028,6.86073,-50.13742,-7.49749]},{"time":3}]},"skirt_f":{"skirt_f":[{},{"time":0.1,"vertices":[29.77103,5.39417,30.0675,-3.43262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74.49672,-23.86407,63.89751,-45.12604,82.84251,-46.12787,65.17497,-68.86804,-3.84917,2.3681,-24.82707,-23.53223,0,0,0,0,0,0,-1.31363,0.83984,-8.37158,5.35114,-6.37955,7.61755,21.60481,-10.06567,17.58562,-16.08618,0,0,0,0,0,0,0,0,0,0,0,0,18.72389,-2.96655,19.30846,1.07959,-3.83809,2.36029,-3.84302,2.35248,0,0,0,0,0,0,-6.52203,1.63745,-5.73038,3.5202,2.70682,-0.42847,72.03828,-37.46112,57.46828,-57.35541]},{"time":0.2,"vertices":[-10.04969,2.73807,11.70756,13.7414,-18.09149,2.26469,-19.20455,5.93506,-11.55451,-12.96573,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.3334,-0.83588,0.20313,-0.87646,24.80927,-22.33905,12.36267,-31.01239,7.54532,-32.52161,44.9576,-40.38214,22.44687,-56.10919,47.03943,-38.67505,25.06897,-55.50098,-6.95396,22.94112,-36.46767,2.33705,0,0,0,0,0,0,13.88802,-10.00909,0,0,0,0,18.66487,-16.08008,9.62213,-22.68195,0,0,0,0,0,0,0,0,0,0,0,0,21.18966,-3.96492,17.27429,17.16789,0,0,0,0,0,0,0,0,0,0,0.59949,-0.53894,0.29929,-0.74969,10.05263,-0.3857,43.32411,-36.52094,22.6911,-51.92395]},{"time":0.3,"vertices":[32.96143,42.9007,36.27815,35.07705,-6.40857,21.45368,-38.4091,11.87012,-23.10901,-25.93146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13.66522,-11.19592,9.67724,-14.77771,4.79333,-17.00208,42.37201,-35.92627,29.63678,-46.98547,60.88477,-51.64868,42.57747,-67.53815,17.2459,34.70853,-0.27335,27.82636,-62.52094,-35.15393,-70.1869,-14.76245,-71.38336,6.9856,-65.36993,-19.04333,-147.13306,-16.39813,-145.26855,28.52521,-13.59222,-27.56677,-21.23542,-22.20966,-17.08845,-7.50128,-18.55252,-2.02631,-2.00135,-0.87878,-2.17343,-0.23834,-138.15216,-23.08295,-138.70569,19.45636,60.18911,5.80254,57.08116,27.12878,-18.29591,-8.03143,-19.86368,-2.16962,-103.66052,-14.96423,-103.36949,16.84503,-93.54749,47.0957,-37.90393,-26.94879,-44.24208,-14.32513,25.86692,0.85528,29.33148,-46.22931,14.10792,-52.89557]},{"time":0.4,"vertices":[85.03808,92.0652,60.84875,56.4127,5.27435,40.64267,-60.38025,15.18234,-37.98126,-42.51804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.50174,-6.88995,23.18378,-10.50537,39.7272,-11.17102,37.58984,-17.03296,169.01555,100.40013,102.75883,100.44009,0,0,0,0,0,0,-148.26126,9.08026,-179.54529,25.46252,-173.65207,52.24176,-72.85404,16.16473,-69.58151,26.96375,0,0,0,0,0,0,0,0,-140.4855,11.33417,-137.16751,32.38611,117.11499,32.16437,145.49597,70.59102,0,0,0,0,-105.47204,9.21844,-102.8735,25.01575,-81.18507,67.95551,-19.56075,0.50739,-19.25989,3.45074,77.78021,3.76645,-73.41949,41.85291,-66.26471,52.44482]},{"time":0.5,"vertices":[98.97076,122.33449,71.14431,75.21844,6.45155,34.72729,-43.21024,13.35388,-25.99763,-29.17289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2.90942,-0.15887,2.90927,-0.15295,2.72858,-1.0188,6.39044,17.90192,6.34564,17.91156,7.17944,23.72333,7.12088,23.7345,197.09889,137.91492,126.121,172.19183,-94.86169,-6.23267,-94.84933,-6.43994,-92.40857,22.32886,-162.70685,28.44037,-224.23279,42.28723,-224.32718,41.79688,-91.37616,15.74432,-91.41458,15.54291,-31.54678,-2.14349,-30.73615,7.42535,-19.24805,-1.30878,-18.75409,4.53033,-183.96515,31.53412,-184.03857,31.13214,126.82291,44.03753,175.29443,89.89668,-50.26117,-3.41376,-48.96826,11.83069,-161.44751,24.45978,-161.5062,24.10504,-146.82385,71.47552,-54.05664,-0.23596,-54.05936,-0.35535,66.0486,18.34165,-56.79108,22.65503,-56.84888,22.526]},{"time":0.6,"vertices":[70.55106,80.51097,47.42953,50.14563,4.30104,23.15152,-28.80682,8.90259,-17.33176,-19.44859,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.93962,-0.10592,1.93951,-0.10197,1.81905,-0.6792,4.26029,11.93461,4.23043,11.94104,0.45826,21.08649,-0.34637,20.35883,167.47198,82.80629,96.28879,112.00243,-77.90076,-1.48645,-76.72931,-13.54907,-77.89581,-1.82489,-139.95065,20.5493,-160.04181,7.89392,-159.33154,-17.01953,-77.87032,11.26345,-78.92719,-0.50081,-14.89178,-2.35162,-15.07574,-0.07941,-11.81348,-1.86609,-11.96008,-0.06354,-135.43759,12.97308,-135.81561,-8.18652,94.24568,30.76365,134.06992,60.45961,-45.53186,-8.38275,-46.27618,-1.42163,-119.92587,2.16119,-118.81512,-16.46234,-119.9386,1.64038,-72.12686,-1.35559,-71.0481,-12.52502,48.064,15.98153,-61.56853,23.28792,-63.73883,15.60138]},{"time":0.7,"vertices":[25.43316,38.42686,23.71478,25.07282,2.15052,11.57577,-14.40342,4.4513,-8.66588,-9.7243,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.96981,-0.05296,0.96976,-0.05098,0.90953,-0.3396,9.2871,4.79262,9.27464,4.81153,13.23838,8.40812,12.84045,8.07267,49.86007,25.83252,21.53345,50.97621,-30.03882,-13.7832,-30.00909,-13.84845,-29.97913,-13.9137,-22.32333,-8.63523,-74.55142,-23.59625,-74.50015,-23.75842,-28.49702,-13.06856,-28.4693,-13.13053,0,0,0,0,-0.20227,-0.0929,-0.20227,-0.09393,-37.01572,-12.8902,-36.98819,-12.97009,29.6137,6.47106,44.05499,18.03541,-29.31354,-13.52759,-29.28421,-13.59149,-35.31091,-11.17645,-35.28683,-11.25311,-35.26239,-11.3299,-59.13733,-27.13458,-59.07843,-27.26324,8.63378,0.39027,4.58519,0.96617,4.58145,0.97473]},{"time":0.8,"vertices":[35.81818,-3.6875,39.17149,-3.98846,2.36737,-0.86804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28.52529,-22.64508,24.78587,-26.6861,28.62631,-22.51886,67.57469,-48.15497,59.54384,-57.79132,83.82215,-53.5672,74.78942,-65.59021,-43.89932,46.33734,-18.26237,7.9278,0,0,0,0,0,0,11.983,-6.11731,-13.72738,3.23785,-13.0817,5.27094,25.99117,-19.65289,22.73274,-23.34479,0,0,0,0,0,0,0,0,-0.11163,0.02496,-0.10563,0.04224,27.33977,-2.78223,9.39142,13.24054,0,0,0,0,0,0,0,0,0,0,4.02523,-3.20117,3.49873,-3.76947,2.99234,-0.21301,64.49009,-39.26947,57.83382,-48.54248]},{"time":1.1333}]}}},"drawOrder":[{"offsets":[{"slot":"body","offset":7},{"slot":"r_leg","offset":6},{"slot":"l_hand2","offset":-35},{"slot":"r_finger_d2","offset":-37},{"slot":"r_finger_c2","offset":-38},{"slot":"r_finger_b2","offset":-39},{"slot":"r_finger_a2","offset":-40}]},{"time":1.2333,"offsets":[{"slot":"r_beard2","offset":3}]}]},"hit":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00005"},{"time":0.1667,"name":"eyefire/eyefire_00006"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00009"},{"time":0.2667,"name":"eyefire/eyefire_00010"},{"time":0.3,"name":"eyefire/eyefire_00011"},{"time":0.3333,"name":"eyefire/eyefire_00012"},{"time":0.3667,"name":"eyefire/eyefire_00014"},{"time":0.4,"name":"eyefire/eyefire_00015"},{"time":0.4333,"name":"eyefire/eyefire_00016"},{"time":0.4667,"name":"eyefire/eyefire_00017"},{"time":0.5,"name":"eyefire/eyefire_00019"},{"time":0.5333,"name":"eyefire/eyefire_00020"},{"time":0.5667,"name":"eyefire/eyefire_00021"},{"time":0.6,"name":"eyefire/eyefire_00022"},{"time":0.6333,"name":"eyefire/eyefire_00024"},{"time":0.6667,"name":"eyefire/eyefire_00025"},{"time":0.7,"name":"eyefire/eyefire_00026"},{"time":0.7333,"name":"eyefire/eyefire_00027"},{"time":0.7667,"name":"eyefire/eyefire_00029"},{"time":0.8,"name":"eyefire/eyefire_00030"},{"time":0.8333,"name":"eyefire/eyefire_00031"},{"time":0.8667,"name":"eyefire/eyefire_00032"},{"time":0.9,"name":"eyefire/eyefire_00034"},{"time":0.9333,"name":"eyefire/eyefire_00035"},{"time":0.9667,"name":"eyefire/eyefire_00036"},{"time":1,"name":"eyefire/eyefire_00037"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"r_ik":{"rotate":[{"time":0.0333,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1,"angle":25.21,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"curve":"stepped"},{"time":0.7,"curve":0.352,"c2":0.41,"c3":0.689,"c4":0.75},{"time":0.7667,"angle":9.64,"curve":0.369,"c2":0.63,"c3":0.706},{"time":0.8333}],"translate":[{"time":0.0333,"curve":0.324,"c2":0.23,"c3":0.658,"c4":0.56},{"time":0.1,"x":-101.79,"y":48.93,"curve":0.325,"c2":0.27,"c3":0.659,"c4":0.61},{"time":0.1667,"x":-80.39,"curve":"stepped"},{"time":0.7,"x":-80.39,"curve":0.289,"c2":0.17,"c3":0.637,"c4":0.56},{"time":0.7667,"x":1.39,"y":24.46,"curve":0.333,"c2":0.33,"c3":0.68,"c4":0.71},{"time":0.8333}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":12.92,"y":48.34,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":65.28,"y":-16.92,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":74.96,"y":-32.61,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":-2.67,"y":33.81,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":30.14,"y":55.33,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-15.63,"y":47.49,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":-51.28,"y":-15.43,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":9.84,"y":-19.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.5333,"x":46.76,"y":-38.04,"curve":0.34,"c2":0.35,"c3":0.678,"c4":0.7},{"time":0.7,"x":42.59,"y":2.41,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"l_ik":{"rotate":[{"time":0.4667,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.5333,"angle":-13.4,"curve":0.34,"c2":0.35,"c3":0.678,"c4":0.7},{"time":0.7}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-90.87,"curve":"stepped"},{"time":0.4667,"x":-90.87,"curve":0.291,"c2":0.1,"c3":0.631,"c4":0.47},{"time":0.5333,"x":7.14,"y":90.87,"curve":0.308,"c2":0.25,"c3":0.676,"c4":0.7},{"time":0.7}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-23.46,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.1,"angle":15.41,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.1667,"angle":43.89,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":0.4667,"angle":70.49,"curve":0.346,"c2":0.41,"c3":0.68,"c4":0.75},{"time":0.7,"angle":19.6,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":34.99,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":42.13,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":-8.35,"curve":0.314,"c2":0.27,"c3":0.651,"c4":0.61},{"time":0.3333,"angle":9.48,"curve":0.329,"c2":0.32,"c3":0.681,"c4":0.71},{"time":0.7,"angle":2.12,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"x":-52.34,"y":46.37,"curve":0.324,"c2":0.23,"c3":0.658,"c4":0.56},{"time":0.1,"x":-57.03,"y":72.75,"curve":0.309,"c2":0.19,"c3":0.644,"c4":0.54},{"time":0.3333,"x":-104.82,"y":61.44,"curve":0.311,"c2":0.25,"c3":0.649,"c4":0.6},{"time":0.7,"x":-20.34,"y":18.01,"curve":0.327,"c2":0.31,"c3":0.664,"c4":0.66},{"time":1}]},"l_upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":0.7,"angle":-28,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":-6.45}]},"l_finger_a":{"rotate":[{"angle":-2.5}]},"l_finger_a2":{"rotate":[{"angle":5.32}],"translate":[{"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5}]},"l_finger_b2":{"rotate":[{"angle":16.78}],"translate":[{"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5}]},"l_finger_c2":{"rotate":[{"angle":16.54}],"translate":[{"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_d":{"rotate":[{"angle":-2.5}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":164.73,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1,"angle":56.93,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-2.31,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.4667,"angle":-48.64,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-60.78,"curve":0.369,"c2":0.63,"c3":0.707},{"time":1,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":769.74,"y":-4.16,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.1,"x":-38.06,"y":-43.54,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.1667,"x":-293.89,"y":-78.91,"curve":0.328,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.4667,"x":-319.95,"y":69.94,"curve":0.337,"c2":0.34,"c3":0.679,"c4":0.7},{"time":0.7,"x":-52.78,"y":-127.22,"curve":0.382,"c2":0.58,"c3":0.732},{"time":1}]},"l_finger_d2":{"rotate":[{"angle":26.01}],"translate":[{"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r_upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":87.31,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":-15.69,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":-58.76,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-108.56,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-38.56,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1,"angle":-6.74}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":25.92,"y":124.89,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"x":-3.54,"y":-53.5,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"x":-26.77,"y":-128.17,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"x":-62.12,"y":-136.89,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":4.04,"y":-103.39,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}]},"r_upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":0.7,"angle":42.78,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":12.65}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":73.73,"y":-9.65,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":49.53,"y":-9.85,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":82.59,"y":-14.08,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":96.88,"y":-28.67,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":54.66,"y":-48.55,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":28.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.3,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":58.28,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":67.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":101.84,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.4,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-19.98,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-43.93,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-57.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-18.62,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":-8.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":10.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":1.48,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-3.19,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-34.21,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-9.49}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":36.4,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":57.75,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":39.01,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":20.82,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":7.12}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.64,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-23.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-55.53,"curve":0.343,"c2":0.37,"c3":0.68,"c4":0.71},{"time":0.4667,"angle":-33.3,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":5.38,"curve":0.368,"c2":0.63,"c3":0.705},{"time":1,"angle":-4.31}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-69.32,"y":62.19,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-21.53,"y":24.11,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":14.64,"y":-70.3,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":-13.03,"y":-34.66,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":36.17,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"angle":39.42,"curve":0.314,"c2":0.24,"c3":0.649,"c4":0.58},{"time":0.1667,"angle":16.9,"curve":0.306,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-24.36,"curve":0.339,"c2":0.35,"c3":0.679,"c4":0.71},{"time":0.7,"angle":14.42,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-25.52,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.95,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1667,"angle":34.72,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":28.88,"curve":0.344,"c2":0.37,"c3":0.678,"c4":0.71},{"time":0.6333,"angle":-29.04,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.7,"angle":-12.45,"curve":0.347,"c2":0.41,"c3":0.681,"c4":0.75},{"time":0.8333,"angle":13.31,"curve":0.356,"c2":0.65,"c3":0.691},{"time":1,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"angle":36.17,"curve":0.323,"c2":0.17,"c3":0.657,"c4":0.51},{"time":0.1,"angle":39.42,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1667,"angle":16.9,"curve":0.307,"c2":0.21,"c3":0.644,"c4":0.56},{"time":0.4667,"angle":-24.36,"curve":0.322,"c2":0.29,"c3":0.657,"c4":0.63},{"time":0.7,"angle":14.42,"curve":0.327,"c2":0.31,"c3":0.663,"c4":0.66},{"time":1}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-19.97,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":22.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1667,"angle":40.27,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":34.43,"curve":0.344,"c2":0.37,"c3":0.678,"c4":0.71},{"time":0.6333,"angle":-23.49,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.7,"angle":-6.9,"curve":0.347,"c2":0.41,"c3":0.681,"c4":0.75},{"time":0.8333,"angle":18.86,"curve":0.356,"c2":0.65,"c3":0.691},{"time":1,"angle":3.27}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":30.35,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":1.75,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":4.65,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-6.59,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-3.61,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-58.43,"y":-54.32,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"x":-260.66,"y":9.12,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"x":-230.19,"y":5.77,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"x":-37.59,"y":-15.4,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":24.51,"y":-84.79,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":67.62,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"angle":123.9,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"angle":46.02,"curve":0.311,"c2":0.25,"c3":0.649,"c4":0.6},{"time":0.3333,"angle":-8.31,"curve":0.326,"c2":0.31,"c3":0.662,"c4":0.65},{"time":0.4667,"angle":-43.48,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-5.26,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":-32.58,"y":323.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":-52.71,"y":368.77,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"x":-78.73,"y":205.05,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.3333,"x":-204.38,"y":122.23,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.4667,"x":-88.19,"y":158.14,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"x":48.72,"y":-37.23,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95}]},"shadow":{"translate":[{"time":0.0333,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-132.37,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":-127.28,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":-56,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7}],"scale":[{"curve":0.323,"c3":0.656,"c4":0.34},{"time":0.0333,"y":0.796,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"y":0.844,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"y":1.131,"curve":0.311,"c2":0.25,"c3":0.757},{"time":1}]},"r_upparm3":{"rotate":[{},{"time":0.0333,"angle":-102.88},{"time":0.1,"angle":7.97},{"time":0.1667,"angle":51.87},{"time":0.4667,"angle":88.15},{"time":0.7,"angle":35.32},{"time":1}],"translate":[{},{"time":0.0333,"x":-11.7,"y":10.92},{"time":0.1,"x":-8.78,"y":-0.12},{"time":0.4667,"x":-22.85,"y":-27.98},{"time":0.7,"x":18.84,"y":1.59},{"time":1}]},"r_finger_a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":28.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.3,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":58.28,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":67.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":101.84,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.4,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-19.98,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-43.93,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-57.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-18.62,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":-8.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":10.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":1.48,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-3.19,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-34.21,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-9.49}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r_finger_d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":36.4,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":57.75,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":39.01,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":20.82,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":7.12}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"l_hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-19.79},{"time":0.1,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-10.97},{"time":0.7},{"time":1,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-32.84},{"time":0.1},{"time":0.1667,"angle":-12.75},{"time":0.4667,"angle":-10.69},{"time":0.7,"angle":-17.17},{"time":1,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-48.54},{"time":0.1},{"time":0.1667,"angle":10.41},{"time":0.4667,"angle":11.72},{"time":0.7,"angle":42.67},{"time":1,"angle":-1.85}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":-61.9},{"time":0.1667,"curve":"stepped"},{"time":0.7},{"time":1,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333},{"time":0.1,"angle":-75.34},{"time":0.1667,"angle":-21.66},{"time":0.4667},{"time":0.7,"angle":-54.92},{"time":1,"angle":-8.22}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":23.05},{"time":0.1,"angle":38.94},{"time":0.1667,"angle":40.08},{"time":0.4667,"angle":66.43},{"time":0.7,"angle":-37.39},{"time":1,"angle":-8.22}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-37.07},{"time":0.1,"angle":4.09},{"time":0.1667},{"time":0.4667,"angle":9.33},{"time":0.7,"angle":-23.32},{"time":0.8333,"angle":-14.82},{"time":1,"angle":9.15}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":0.729},{"time":0.1,"x":0.864},{"time":0.1667,"x":1.304},{"time":0.4667,"x":1.094},{"time":0.7,"x":0.831},{"time":1}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0333,"x":10.19,"y":11.92},{"time":0.1,"x":6.58,"y":-9.31},{"time":0.1667,"x":-14.72,"y":-8.62},{"time":0.4667,"x":-8.71,"y":-5.52},{"time":0.7,"x":11.07,"y":25.64},{"time":1,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":33.85},{"time":0.1,"angle":3.29},{"time":0.1667,"angle":-42.38},{"time":0.4667,"angle":-24.67},{"time":0.7,"angle":15.69},{"time":0.8333,"angle":13.56},{"time":1,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":33.85},{"time":0.1,"angle":20.17},{"time":0.1667,"angle":34.82},{"time":0.3,"angle":-41.81},{"time":0.4667,"angle":-60.29},{"time":0.6,"angle":-42.16},{"time":0.7,"angle":-10.93},{"time":0.8333,"angle":16.66},{"time":1,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-28.82},{"time":0.1},{"time":0.1667,"angle":38.87},{"time":0.4667},{"time":0.7,"angle":-32.16},{"time":1,"angle":7.98}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":27.64},{"time":0.1667,"angle":-9.15},{"time":0.4667,"angle":-16.72},{"time":0.7,"angle":31.14},{"time":1,"angle":-9.62}]},"headmouth":{"rotate":[{},{"time":0.1333,"angle":-27.08},{"time":0.5333,"angle":-7.87},{"time":1}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-30.45},{"time":0.7,"angle":-18.66},{"time":0.8333,"angle":-22.58},{"time":1,"angle":8.77}],"scale":[{"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.45},{"time":0.1,"angle":-16.16},{"time":0.1667,"angle":-31.14},{"time":0.4667,"angle":-21.04},{"time":0.7,"angle":17},{"time":1,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":26.3},{"time":0.1,"angle":30.94},{"time":0.1667,"angle":15.76},{"time":0.2667,"angle":-40.58},{"time":0.4667,"angle":-37.74},{"time":0.7,"angle":-32.12},{"time":0.8333,"angle":16.53},{"time":1,"angle":-10}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-30.45},{"time":0.7,"angle":-18.66},{"time":0.8333,"angle":-22.58},{"time":1,"angle":-11.82}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.45},{"time":0.1,"angle":-16.16},{"time":0.1667,"angle":-31.14},{"time":0.4667,"angle":-21.04},{"time":0.7,"angle":17},{"time":1,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":26.3},{"time":0.1,"angle":30.94},{"time":0.1667,"angle":15.76},{"time":0.2667,"angle":-40.58},{"time":0.4667,"angle":-37.74},{"time":0.7,"angle":-32.12},{"time":0.8333,"angle":16.53},{"time":1,"angle":15.47}]},"hair_t":{"rotate":[{"time":0.1667},{"time":0.4667,"angle":-7.53},{"time":0.7}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":8.83},{"time":0.1,"angle":10.81},{"time":0.1667,"angle":12.21},{"time":0.4667,"angle":-9.5},{"time":0.7,"angle":-15.08},{"time":1,"angle":0.61}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":83.56},{"time":0.1667,"angle":96.33},{"time":0.4667,"angle":96.83},{"time":0.7,"angle":51},{"time":1,"angle":26.63}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":34.16},{"time":0.1,"angle":10.81},{"time":0.1667,"angle":19.55},{"time":0.4667,"angle":-19.87},{"time":0.7,"angle":-31.29},{"time":1,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":34.16},{"time":0.1,"angle":14.59},{"time":0.1667,"angle":12.21},{"time":0.4667,"angle":19.46},{"time":0.7,"angle":-20.89},{"time":1,"angle":5.88}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":23.39}],"translate":[{"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.7},{"time":1,"angle":63.33}]},"s":{"scale":[{"x":0,"y":0}]},"l_armour":{"rotate":[{"angle":1.84}]},"r_arm":{"rotate":[{"angle":-7.98}]},"hair_t10":{"rotate":[{"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54}]},"headbeard_b":{"rotate":[{"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67}]},"headbeard_b3":{"rotate":[{"angle":8.76}]},"r_ear_s":{"rotate":[{"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0333,"angle":20.83,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-23.91,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-56.65,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-32,"curve":0.342,"c2":0.37,"c3":0.676,"c4":0.7},{"time":0.6,"angle":-22.68,"curve":0.342,"c2":0.37,"c3":0.675,"c4":0.71},{"time":0.7,"angle":-29.85,"curve":0.34,"c2":0.37,"c3":0.673,"c4":0.7},{"time":0.7667,"angle":8.82,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":0.8667,"angle":-6.22,"curve":0.352,"c2":0.65,"c3":0.687},{"time":1,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"headbeard_f":{"rotate":[{"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99}]},"skill":{"scale":[{"x":0,"y":0}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.1667,"offset":92,"vertices":[7.26987,15.03769,10.96051,12.60177,0,0,0,0,30.51038,37.76599,39.35309,28.43263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13.85974,61.16544,29.42847,55.38221,0,0,0,0,0,0,0,0,8.91608,3.06887,8.6225,2.96766,0,0,24.79684,90.10992,47.57898,80.44111,0,0,0,0,0,0,0,0,-0.4502,2.23753,0.15289,2.27719],"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"vertices":[50.96356,-63.95969,125.297,9.36234,99.62122,-76.56879,137.16132,12.42788,110.50739,-82.19516,96.17535,1.83795,72.90155,-62.75839,33.88568,20.26118,38.76379,-7.49484,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28.43463,-34.76004,37.47375,-29.39993,51.36212,-34.07013,59.93573,-63.58115,0,0,0,0,0,0,95.10123,-17.68539,59.08325,-76.59195,0,0,0,0,30.65289,25.9108,40.12335,-1.12958,0,0,0,0,4.94843,-2.55756,0,0,0,0,0,0,0,0,0,0,0,0,37.83487,23.48198,43.85706,-7.72815,0,0,0,0,0,0,0,0,8.55737,2.1813,7.87781,2.00778,50.45117,-64.9491,84.02487,43.87574,91.87836,-23.32877,0,0,0,0,0,0,0,0,19.07703,10.20507,21.02405,-5.11511,0,0,0,0,0,0,0,0,100.59836,-10.82629,67.75372,-75.1456],"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]}}}},"idle":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":10.23,"y":32.42,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-14.9,"y":-20.45,"curve":0.25,"c3":0.75},{"time":1.8667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":-11.96,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-40.32,"y":-0.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-7.85,"y":2.92}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-13.07,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":-32.01,"y":36.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.9,"y":0.9,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_upparm2":{"rotate":[{"angle":-6.45}]},"l_armour":{"rotate":[{"angle":1.84}]},"l_finger_a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":17.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-7.5,"y":19.61,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.64,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.59,"y":20.84,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.16,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-5.23,"y":20.34,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l_finger_d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":59.08,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.33,"y":20.87,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"r_upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":2.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":36.1,"y":-45.18,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":12.97}]},"r_arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.2}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.63,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.31}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":12.82,"y":6.27,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_ear":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-3.09,"y":-14.86,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.842,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":14.28,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-16.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":12.07,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":18.73,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":3.59,"y":24.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.76,"curve":0.25,"c3":0.75},{"time":1.4,"angle":24.3,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.27}]},"hair_t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.8667}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-2.51,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-11.93,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":9.92,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":-2.26,"y":14.51}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-32.32,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":10.5,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":9.54}]},"head2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":4.6,"y":-21.12,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.7,"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.76}]},"r_ear_s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":8.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-5.67}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":12.16,"y":-17.99,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-10.98,"curve":0.25,"c3":0.75},{"time":1.4,"angle":28.93,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.4,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.4,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":5.7,"y":-8.17}]},"r_ear_ringa":{"rotate":[{"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.4667,"angle":-29.16,"curve":0.314,"c2":0.27,"c3":0.686,"c4":0.73},{"time":1.4,"angle":16.48,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.8667}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.19,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.77}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":9.4,"y":-12.46,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-10}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":15.47,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-22.67,"y":24.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.819,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.4,"angle":15.47,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":15.47}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":40.99}]},"l_leg":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-2.29,"y":50.63,"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.75,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":9.15}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":5.8,"y":-22.14,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.9333,"y":16.45,"curve":0.25,"c3":0.75},{"time":1.8667,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":10.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10.83,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":27.49,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":27.96,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-12.01,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.98}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-30.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":11.31,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.62}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.1667,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6333,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-8.22}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-45.72,"y":-64.16,"curve":0.25,"c3":0.75},{"time":1.8667}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":16.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":5.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":-98.01,"y":-10.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":0.9,"y":0.9,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.95,"y":0.95}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-3.18,"curve":0.25,"c3":0.75},{"time":1.4,"angle":14.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":59.09,"y":-135.37,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":1.8667}]},"shadow":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.97,"y":0.895,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_finger_a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r_finger_b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r_finger_c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r_finger_d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"l_hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.9333,"offset":36,"vertices":[-2.41049,14.08145,-10.63983,9.53357,11.41489,0.51631,8.62204,7.49872,20.82419,30.77104,-2.80862,37.0488,53.80902,21.06067,29.06711,49.94165,43.71988,54.54894,0.35004,69.90634,-0.88062,19.47218,-12.7916,14.70761,5.71973,30.41342,-14.42053,27.38129,2.25964,28.48312,-15.93155,23.71869,-5.14142,35.24371,-25.93134,24.41534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-21.39771,-31.9695,3.10556,-38.34393,-32.63104,-64.54259,-2.67554,-49.07106,28.40125,-40.10614,15.19,-39.32011,36.33786,-21.36356,-0.30249,-29.38377,18.0249,-23.20792,0.36182,-7.9995,5.25519,-6.04211,8.23709,-14.43842,-6.16132,-80.23037,45.0358,-66.68332,-11.18542,-41.29755,16.90335,-39.30496,-2.67551,-49.07107,0,0,-4.45917,-81.78522,47.33566,-66.84366,-8.74689,-59.13564,29.90024,-51.76413,-2.25064,10.54112,-8.31439,6.85941,14.49524,-24.1174,30.06024,-49.46475,0,0,0,0,0,0,-4.30402,-49.14474,27.1712,-41.17593,-2.44653,-18.05902,9.30701,-15.6683,2.06238,-45.59348,29.95184,-34.43707,0,0,0,0,-20.05573,10.5144,-22.24652,-4.22729,0,0,0,0,0,0,0,0,3.87411,11.61391,-4.18277,11.50629],"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt_f":{"skirt_f":[{"curve":0.25,"c3":0.75},{"time":0.9333,"vertices":[-1.8898,-25.58164,0.47333,-28.95829,-1.18393,-41.18966,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.78281,5.60857,0,0,0,0,11.63187,18.17604,12.89143,17.3054,0,0,0,0,0,0,0,0,0,0,0,0,-0.37607,-29.25813,5.20969,-17.44646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.98029,-21.54911],"curve":0.25,"c3":0.75},{"time":1.8667}]}}},"drawOrder":[{"offsets":[{"slot":"r_beard2","offset":3}]}]},"skill":{"slots":{"body":{"color":[{"time":0.4333,"color":"ffffffff"},{"time":0.4667,"color":"ffffff00","curve":"stepped"},{"time":1.2333,"color":"ffffff00"},{"time":1.2667,"color":"ffffffff"}]},"body_back":{"color":[{"time":0.4333,"color":"ffffff00"},{"time":0.4667,"color":"ffffffff","curve":"stepped"},{"time":1.2333,"color":"ffffffff"},{"time":1.2667,"color":"ffffff00"}]},"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_armour_u":{"color":[{"time":0.4333,"color":"ffffffff"},{"time":0.4667,"color":"ffffff00","curve":"stepped"},{"time":1.2333,"color":"ffffff00"},{"time":1.2667,"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00005"},{"time":0.1667,"name":"eyefire/eyefire_00006"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00009"},{"time":0.2667,"name":"eyefire/eyefire_00010"},{"time":0.3,"name":"eyefire/eyefire_00011"},{"time":0.3333,"name":"eyefire/eyefire_00012"},{"time":0.3667,"name":"eyefire/eyefire_00014"},{"time":0.4,"name":"eyefire/eyefire_00015"},{"time":0.4333,"name":"eyefire/eyefire_00016"},{"time":0.4667,"name":"eyefire/eyefire_00017"},{"time":0.5,"name":"eyefire/eyefire_00019"},{"time":0.5333,"name":"eyefire/eyefire_00020"},{"time":0.5667,"name":"eyefire/eyefire_00021"},{"time":0.6,"name":"eyefire/eyefire_00022"},{"time":0.6333,"name":"eyefire/eyefire_00024"},{"time":0.6667,"name":"eyefire/eyefire_00025"},{"time":0.7,"name":"eyefire/eyefire_00026"},{"time":0.7333,"name":"eyefire/eyefire_00027"},{"time":0.7667,"name":"eyefire/eyefire_00029"},{"time":0.8,"name":"eyefire/eyefire_00030"},{"time":0.8333,"name":"eyefire/eyefire_00031"},{"time":0.8667,"name":"eyefire/eyefire_00032"},{"time":0.9,"name":"eyefire/eyefire_00033"},{"time":0.9333,"name":"eyefire/eyefire_00035"},{"time":0.9667,"name":"eyefire/eyefire_00036"},{"time":1,"name":"eyefire/eyefire_00010"},{"time":1.0333,"name":"eyefire/eyefire_00001"},{"time":1.0667,"name":"eyefire/eyefire_00003"},{"time":1.1,"name":"eyefire/eyefire_00004"},{"time":1.1333,"name":"eyefire/eyefire_00005"},{"time":1.1667,"name":"eyefire/eyefire_00006"},{"time":1.2,"name":"eyefire/eyefire_00008"},{"time":1.2333,"name":"eyefire/eyefire_00009"},{"time":1.2667,"name":"eyefire/eyefire_00010"},{"time":1.3,"name":"eyefire/eyefire_00011"},{"time":1.3333,"name":"eyefire/eyefire_00013"},{"time":1.3667,"name":"eyefire/eyefire_00014"},{"time":1.4,"name":"eyefire/eyefire_00015"},{"time":1.4333,"name":"eyefire/eyefire_00016"},{"time":1.4667,"name":"eyefire/eyefire_00018"},{"time":1.5,"name":"eyefire/eyefire_00019"},{"time":1.5333,"name":"eyefire/eyefire_00020"},{"time":1.5667,"name":"eyefire/eyefire_00021"},{"time":1.6,"name":"eyefire/eyefire_00022"},{"time":1.6333,"name":"eyefire/eyefire_00024"},{"time":1.6667,"name":"eyefire/eyefire_00025"},{"time":1.7,"name":"eyefire/eyefire_00026"},{"time":1.7333,"name":"eyefire/eyefire_00027"},{"time":1.7667,"name":"eyefire/eyefire_00029"},{"time":1.8,"name":"eyefire/eyefire_00030"},{"time":1.8333,"name":"eyefire/eyefire_00031"},{"time":1.8667,"name":"eyefire/eyefire_00032"},{"time":1.9,"name":"eyefire/eyefire_00034"},{"time":1.9333,"name":"eyefire/eyefire_00035"},{"time":1.9667,"name":"eyefire/eyefire_00036"},{"time":2,"name":"eyefire/eyefire_00010"},{"time":2.0333,"name":"eyefire/eyefire_00002"},{"time":2.0667,"name":"eyefire/eyefire_00003"},{"time":2.1,"name":"eyefire/eyefire_00004"},{"time":2.1333,"name":"eyefire/eyefire_00005"},{"time":2.1667,"name":"eyefire/eyefire_00006"},{"time":2.2,"name":"eyefire/eyefire_00008"},{"time":2.2333,"name":"eyefire/eyefire_00009"},{"time":2.2667,"name":"eyefire/eyefire_00010"},{"time":2.3,"name":"eyefire/eyefire_00011"},{"time":2.3333,"name":"eyefire/eyefire_00013"},{"time":2.3667,"name":"eyefire/eyefire_00014"},{"time":2.4,"name":"eyefire/eyefire_00015"},{"time":2.4333,"name":"eyefire/eyefire_00016"},{"time":2.4667,"name":"eyefire/eyefire_00018"},{"time":2.5,"name":"eyefire/eyefire_00019"},{"time":2.5333,"name":"eyefire/eyefire_00020"},{"time":2.5667,"name":"eyefire/eyefire_00021"},{"time":2.6,"name":"eyefire/eyefire_00023"},{"time":2.6333,"name":"eyefire/eyefire_00024"},{"time":2.6667,"name":"eyefire/eyefire_00025"},{"time":2.7,"name":"eyefire/eyefire_00026"},{"time":2.7333,"name":"eyefire/eyefire_00027"},{"time":2.7667,"name":"eyefire/eyefire_00029"},{"time":2.8,"name":"eyefire/eyefire_00030"},{"time":2.8333,"name":"eyefire/eyefire_00031"},{"time":2.8667,"name":"eyefire/eyefire_00032"},{"time":2.9,"name":"eyefire/eyefire_00034"},{"time":2.9333,"name":"eyefire/eyefire_00035"},{"time":2.9667,"name":"eyefire/eyefire_00036"},{"time":3,"name":"eyefire/eyefire_00037"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}],"attachment":[{"name":null},{"time":0.5333,"name":"skill/5"},{"time":0.7333,"name":"skill/6"},{"time":0.7667,"name":"skill/7"},{"time":0.8667,"name":"skill/8"},{"time":0.9333,"name":"skill/9"},{"time":1.0333,"name":"skill/10"},{"time":1.1333,"name":"skill/11"},{"time":1.2,"name":null},{"time":1.3667,"name":"skill/12"},{"time":1.4333,"name":"skill/13"},{"time":1.5,"name":"skill/14"},{"time":1.5667,"name":"skill/15"},{"time":1.6333,"name":"skill/16"},{"time":1.7,"name":"skill/17"},{"time":1.7667,"name":"skill/18"},{"time":1.8333,"name":"skill/19"},{"time":1.9,"name":"skill/20"},{"time":1.9667,"name":null}]}},"bones":{"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.03},{"time":0.2667,"angle":8.71},{"time":0.3667,"angle":0.42},{"time":0.4333,"angle":-4.13},{"time":0.4667,"angle":-1.03},{"time":0.8,"angle":5.39},{"time":1.1667,"angle":12.46},{"time":1.2333,"angle":4.33},{"time":1.2667,"angle":0.27},{"time":1.4,"angle":-4.27},{"time":1.9667,"angle":-10.87},{"time":2.5,"angle":-23.32},{"time":2.6667,"angle":-11.3},{"time":2.7333,"angle":0.46},{"time":2.8667,"angle":5.04},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-61.4,"y":-89.91},{"time":0.2667,"x":-143.8,"y":-26.64},{"time":0.3667,"x":-224.94,"y":77},{"time":0.4333,"x":22.87,"y":-15.17},{"time":0.4667,"x":109.65,"y":-48.74},{"time":1.1667,"x":6.62,"y":-44.84},{"time":1.2667,"x":111.06,"y":13.19},{"time":1.4,"x":24.54,"y":54.39},{"time":1.9667,"x":17.67,"y":-6.04},{"time":2.5,"x":41.02,"y":-19.77},{"time":2.6667,"x":22.37,"y":-10.79},{"time":2.7333,"x":14.92,"y":-7.19},{"time":2.8667}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":6.03},{"time":0.2667,"angle":44.43},{"time":0.3667,"angle":-77.68},{"time":0.4333,"angle":-3.17},{"time":0.4667,"angle":95.02},{"time":0.5333,"angle":117.6},{"time":1.1667,"angle":90.81},{"time":1.2667,"angle":45.14},{"time":1.3333,"angle":16.95},{"time":1.9667,"angle":7.45},{"time":2.5,"angle":-13.6},{"time":2.6667,"angle":16.35},{"time":2.8667},{"time":3,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":120.37,"y":40.89},{"time":0.2667,"x":-226.83,"y":262.85},{"time":0.3667,"x":-613.37,"y":525.86},{"time":0.4333,"x":228.17,"y":161.45},{"time":0.4667,"x":1219.84,"y":-322.34},{"time":0.5333,"x":1236.11,"y":-299.06},{"time":0.6,"x":1197.44,"y":-264.17},{"time":0.6667,"x":1191.19,"y":-233.27},{"time":0.7,"x":1125.53,"y":-226.48},{"time":0.7333,"x":1085.31,"y":-185.2},{"time":0.7667,"x":1089.89,"y":-146.31},{"time":0.8,"x":1056.94,"y":-182.19},{"time":0.8333,"x":1054.45,"y":-142.4},{"time":0.8667,"x":1047.28,"y":-177.92},{"time":0.9333,"x":1031.34,"y":-121.25},{"time":1,"x":982.45,"y":-147.96},{"time":1.0667,"x":953.74,"y":-100.45},{"time":1.1667,"x":910.67,"y":-101.25},{"time":1.2667,"x":70.18,"y":-60.67},{"time":1.3333,"x":60.37,"y":121.19},{"time":1.9667,"x":-48.93,"y":26.13},{"time":2.5,"x":33.5,"y":-81.54},{"time":2.6667,"x":-76.89,"y":-16.48},{"time":2.7333,"x":-171.19,"y":89.85},{"time":2.8667,"x":63.81,"y":-25.52},{"time":3}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5333,"x":0.751,"y":0.751,"curve":"stepped"},{"time":2.5,"x":0.751,"y":0.751},{"time":2.8667}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":21.11},{"time":0.2667,"angle":34.4},{"time":0.3667,"angle":50.74},{"time":0.4333,"angle":-50.06},{"time":0.4667,"angle":-50.83},{"time":1.1333,"angle":-95.12},{"time":1.1667,"angle":-100.51},{"time":1.2333,"angle":-38.36},{"time":1.2667,"angle":-23.14},{"time":1.3,"angle":1.54},{"time":1.3333,"angle":72.8},{"time":1.4,"angle":103.52},{"time":1.5333,"angle":111.69},{"time":1.9667,"angle":154.79},{"time":2.5,"angle":176.43},{"time":2.6667,"angle":73.58},{"time":2.7,"angle":-19.93},{"time":2.7333,"angle":-29.83},{"time":2.8667,"angle":-13.63},{"time":3,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"x":-31.25,"y":-37.5},{"time":0.2667,"x":-60.05,"y":105.72},{"time":0.3667,"x":-131.25,"y":225},{"time":0.4333,"x":-100.52,"y":153.09},{"time":0.4667,"x":-535.02,"y":442.88},{"time":1.1333,"x":-670.18,"y":422.97},{"time":1.1667,"x":-659.56,"y":662},{"time":1.2333,"x":-213.4,"y":332.2},{"time":1.2667,"x":-105.03,"y":260.32},{"time":1.3,"x":-38.13,"y":244.9},{"time":1.3333,"x":371.64,"y":122.17},{"time":1.4,"x":407.25,"y":278.83},{"time":1.5333,"x":417.36,"y":402.07},{"time":1.9667,"x":434.51,"y":566.11},{"time":2.5,"x":290.33,"y":243.81},{"time":2.6667,"x":200.06,"y":22.13},{"time":2.7,"x":76.96,"y":25.59},{"time":2.7333,"x":-26.14,"y":15.72},{"time":2.8667,"x":-76.46,"y":5.13},{"time":3,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.0667,"x":0.96,"y":0.96,"curve":0.36,"c2":0.43,"c3":0.709,"c4":0.82},{"time":0.3333,"x":0.995,"y":0.78,"curve":0.342,"c2":0.39,"c3":0.676,"c4":0.73},{"time":0.3667,"x":0.997,"y":0.611,"curve":0.355,"c2":0.65,"c3":0.689},{"time":0.4333},{"time":0.4667,"y":-1,"curve":"stepped"},{"time":1.5333,"y":-1},{"time":1.9667,"x":1.19,"y":-1.19},{"time":2.5,"x":1.206,"y":-0.681},{"time":2.6667,"x":0.711,"y":-0.766},{"time":2.7},{"time":3,"x":0.95,"y":0.95}]},"r_upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-24.35},{"time":0.2667,"angle":-37.26},{"time":0.3667,"angle":-37.23},{"time":0.4333,"angle":-62.7},{"time":0.4667,"angle":95.46},{"time":0.5333,"angle":107.56},{"time":1.1667,"angle":99.22},{"time":1.2667,"angle":-34.17},{"time":1.9667,"angle":-43.69},{"time":2.5,"angle":-60.1},{"time":2.6667,"angle":-70.15},{"time":2.7333,"angle":-37.86},{"time":2.8667,"angle":-5.8},{"time":3,"angle":-6.74}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-7.31,"y":-20.37},{"time":0.2667,"x":6.31,"y":56.99},{"time":0.3667,"x":24.31,"y":8.76},{"time":0.4333,"x":-72.1,"y":-142.92},{"time":0.4667,"x":68.98,"y":-167.34},{"time":0.5333,"x":33.11,"y":-180.49},{"time":0.7,"x":79.98,"y":-186.75},{"time":1.1667,"x":24.31,"y":8.2},{"time":1.2667,"x":-0.19,"y":-140.11},{"time":1.9667,"x":-26.37,"y":-161.8,"curve":"stepped"},{"time":2.5,"x":-26.37,"y":-161.8},{"time":2.8667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-12.19},{"time":0.2667,"angle":6.53},{"time":0.3667,"angle":24.69},{"time":0.4333,"angle":54.22},{"time":0.4667,"angle":0.87},{"time":1.1667,"angle":-26.44},{"time":1.2667,"angle":-13.84},{"time":1.4,"angle":14.64},{"time":1.9667,"angle":43.3},{"time":2.5,"angle":56.68},{"time":2.6667,"angle":39.49},{"time":2.7333,"angle":16.66},{"time":2.8667,"angle":-5.11},{"time":3,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"x":14.34,"y":-20.85},{"time":0.2667,"x":-9.76,"y":36.53},{"time":0.3667,"x":-0.26,"y":-3.78},{"time":0.4333,"x":-0.25,"y":-3.66},{"time":0.4667,"x":-27.41,"y":-59.88},{"time":1.1667,"x":1.56,"y":6.75},{"time":1.2667,"x":-25.1,"y":-4.85},{"time":1.4,"x":13.01,"y":0.94},{"time":1.9667,"x":32.32,"y":15.52},{"time":2.5,"x":-40.3,"y":2.78},{"time":2.6667,"x":0.88,"y":0.43},{"time":2.7333,"x":8.07,"y":-13.87},{"time":2.8667},{"time":3,"x":-7.85,"y":2.92}]},"r_upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":2.5,"angle":-1.68},{"time":2.8667},{"time":3,"angle":12.65}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.48,"y":-51.78},{"time":0.2667,"x":-51.18,"y":55.67},{"time":0.3667,"x":19.29,"y":-28.02},{"time":0.4333,"x":26.15,"y":-98.44},{"time":0.4667,"x":69.93,"y":-24.3},{"time":0.5333,"x":4.79,"y":-48.18},{"time":1.1667,"x":46.4,"y":-127.16},{"time":1.2667,"x":22.49,"y":-35.79},{"time":1.9667,"x":-23.7,"y":-52.16,"curve":"stepped"},{"time":2.5,"x":-23.7,"y":-52.16},{"time":2.8667}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":17.16},{"time":0.2667,"angle":-3.01},{"time":0.3667,"angle":-32.36},{"time":0.4333,"angle":-50.81},{"time":0.4667,"angle":8.69},{"time":1.1667,"angle":19.17},{"time":1.2667,"angle":28.98},{"time":1.4,"angle":-1.83},{"time":1.9667,"angle":-17.27},{"time":2.5,"angle":-37.93},{"time":2.6667,"angle":-16.09},{"time":2.7333,"angle":-10.97},{"time":2.8667,"angle":3.9},{"time":3,"angle":-4.31}],"translate":[{"time":0.4333,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":35.31,"y":17.77,"curve":0.305,"c2":0.24,"c3":0.65,"c4":0.61},{"time":1.1667,"x":-36.58,"y":80.24,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1.2667,"x":-42.37,"y":74.66},{"time":1.4}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.74},{"time":0.2667,"angle":26.02},{"time":0.3667,"angle":-12.97},{"time":0.4333,"angle":-28.46},{"time":0.4667,"angle":-84.46},{"time":1.1333,"angle":-53.97},{"time":1.1667,"angle":-16.7},{"time":1.2333,"angle":23.44},{"time":1.2667,"angle":2.88},{"time":1.3,"angle":44.72},{"time":1.3333,"angle":58.53},{"time":1.9667,"angle":36.88},{"time":2.5,"angle":18.71},{"time":2.6667,"angle":23.41},{"time":2.7333,"angle":14.65},{"time":2.8667,"angle":9.4},{"time":3}],"translate":[{"time":0.0667},{"time":0.2667,"x":-0.07,"y":60.35},{"time":0.3667,"x":-43.08,"y":70.98},{"time":0.4333,"x":50.21,"y":235.41},{"time":0.4667,"x":-20.77,"y":339.32},{"time":1.1333,"x":-48.52,"y":286.89},{"time":1.1667,"x":-119.99,"y":423.7},{"time":1.2333,"x":-82.01,"y":66.55},{"time":1.2667,"x":-103.21,"y":60.51},{"time":1.3,"x":-134.41,"y":86.04},{"time":1.3333,"x":-124.32,"y":75.41},{"time":1.9667,"x":-132.91,"y":25.84},{"time":2.5,"x":-100.45,"y":13.55},{"time":2.6667,"x":-93.32,"y":26.52},{"time":2.7333,"x":-67.2,"y":-4.84},{"time":2.8667,"x":-8.95,"y":-18},{"time":3}]},"l_ik":{"rotate":[{"time":2.5},{"time":2.7333,"angle":-17.05},{"time":2.8667}],"translate":[{"time":0.2667},{"time":0.3667,"x":-201.34},{"time":0.4333,"x":131.25,"y":34.23},{"time":0.4667,"x":221.88,"curve":"stepped"},{"time":2.5,"x":221.88},{"time":2.6667,"x":121.02,"y":41.2},{"time":2.7333,"x":18.88,"y":37.08},{"time":2.8667}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":8.22,"y":13.29},{"time":0.2667,"x":-90.32,"y":-99.12},{"time":0.3667,"x":-88.9,"y":34.14},{"time":0.4333,"x":-66.3,"y":11.64},{"time":0.4667,"x":-9.53,"y":-7.72},{"time":1.1667,"x":-106.48,"y":14.13},{"time":1.2667,"x":-66.76,"y":-21.97},{"time":1.4,"x":-105.14,"y":-65.01},{"time":1.9667,"x":-28.56,"y":-53.45},{"time":2.5,"x":-4.01,"y":-49.13},{"time":2.8667}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":53.57,"y":0.46},{"time":0.2667,"x":42.73,"y":-27.34},{"time":0.3667,"x":11.36,"y":-74.91},{"time":0.4333,"x":-32.64,"y":14.87},{"time":0.4667,"x":-1.63,"y":17.72},{"time":1.1667,"x":36.5,"y":52.17},{"time":1.2667,"x":-61.69,"y":-29.08},{"time":1.4,"x":-63.95,"y":-56.02},{"time":1.9667,"x":-69.01,"y":-36.85},{"time":2.5}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":31.41},{"time":0.2667,"angle":26.63},{"time":0.3667,"angle":25.07},{"time":0.5333,"angle":59.28},{"time":0.7333,"angle":67.91},{"time":1.1667,"angle":16.34},{"time":1.2667,"angle":4.28},{"time":1.3333,"angle":33.29},{"time":1.9667,"angle":39.84},{"time":2.5,"angle":64.76},{"time":2.6667,"angle":35.33},{"time":2.8667},{"time":3,"angle":14.41}],"translate":[{"time":0.3667,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.5333,"x":62.16,"y":-22.18,"curve":0.308,"c2":0.25,"c3":0.654,"c4":0.63},{"time":1.2667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.751},{"time":1.1667,"x":1.552},{"time":1.9667,"x":1.167},{"time":2.5,"x":0.835},{"time":2.6667,"x":0.653},{"time":2.7333,"x":0.506},{"time":2.8,"x":1.232},{"time":2.8667}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-14.7},{"time":0.2667},{"time":0.3667,"angle":-23.72},{"time":0.4667,"angle":-54.57},{"time":0.5333,"angle":-65.12},{"time":1.2667,"angle":8.43},{"time":1.3333,"angle":-55.31},{"time":1.9667,"angle":-36.86},{"time":2.5,"angle":-9.95},{"time":2.6667,"angle":-5.43},{"time":2.8,"angle":-23.47},{"time":3,"angle":-8.92}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.1},{"time":0.4667,"x":52.41,"y":34.74},{"time":1.2667,"x":24.08,"y":35.18},{"time":2.5,"x":-43.03,"y":20.1},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-4.33},{"time":0.2667},{"time":0.3667,"angle":-21.35},{"time":0.4667,"angle":-56.6},{"time":0.5333,"angle":-67.46},{"time":1.2667,"angle":21.7},{"time":1.3333,"angle":-53.94},{"time":1.9667,"angle":-11.99},{"time":2.5,"angle":-5.02},{"time":2.6667,"angle":-2.74},{"time":2.8,"angle":-18.4},{"time":3,"angle":-9.49}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11},{"time":0.4667,"x":71.35,"y":64.02},{"time":1.2667,"x":24.08,"y":35.18},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":18.15},{"time":0.2667,"angle":1.92},{"time":0.3667},{"time":0.5333,"angle":-53},{"time":1.2667,"angle":46.29},{"time":1.3333,"angle":-17.24},{"time":1.9667,"angle":20.97},{"time":2.5,"angle":20.38},{"time":2.6667,"angle":11.12},{"time":2.8667},{"time":3,"angle":7.12}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11},{"time":0.4667,"x":69.56,"y":88.56},{"time":1.2667,"x":24.08,"y":35.18},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"l_upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":2.5,"angle":56.15},{"time":2.8667},{"time":3,"angle":-6.45}]},"l_finger_a":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":-7.83,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l_finger_a2":{"rotate":[{"angle":5.32,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-19.59,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":38.22,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":40.11,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-2.9,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-29.33,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":46.48,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":66.45,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":40.05,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":68.88,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":24.23,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l_finger_b2":{"rotate":[{"angle":16.78,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-8.55,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":48.44,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":49.31,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":5.9,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-20.73,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":52.54,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":71.04,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":43.48,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":71.65,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":25.24,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l_finger_c2":{"rotate":[{"angle":16.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-8.78,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":48.23,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":49.11,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":5.71,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-20.92,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":52.41,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":70.95,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":43.4,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":71.6,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":25.22,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l_finger_d":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l_finger_d2":{"rotate":[{"angle":26.01,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":0.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":56.67,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":56.71,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":12.98,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-13.82,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":57.4,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":74.74,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":46.23,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":73.89,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":26.05,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"r_ear":{"rotate":[{"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":11.14,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":2.98,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":-13.4,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":14.28,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":-7.62,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":16.06,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"curve":"stepped"},{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-1.35,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":-16.1,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"angle":17.08},{"time":2.6667,"angle":6.65},{"time":2.7333}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-42.59,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":-1.96,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":34.44,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":36.05,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":12.19,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":-17.37,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.9667,"angle":-39.92,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.1667,"angle":-10.76,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":3.18,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":13.12,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":38.7,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-0.2,"curve":0.343,"c2":0.4,"c3":0.676,"c4":0.74},{"time":2.1667,"angle":-36.33,"curve":0.352,"c2":0.65,"c3":0.687},{"time":2.5,"angle":0.57},{"time":2.6667,"angle":19.78},{"time":2.7333},{"time":2.8667,"angle":-9.43},{"time":3,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.329,"c3":0.662,"c4":0.34},{"time":0.0667,"angle":11.14,"curve":0.321,"c2":0.14,"c3":0.655,"c4":0.48},{"time":0.2667,"angle":2.98,"curve":0.328,"c2":0.28,"c3":0.662,"c4":0.62},{"time":0.3667,"angle":-13.4,"curve":0.33,"c2":0.31,"c3":0.663,"c4":0.64},{"time":0.4333,"curve":0.332,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.4667,"angle":14.28,"curve":0.319,"c2":0.26,"c3":0.653,"c4":0.59},{"time":0.8,"angle":-7.62,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":1.1667,"angle":16.06,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.2333,"curve":"stepped"},{"time":1.2667,"curve":0.33,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.4,"angle":-1.35,"curve":0.324,"c2":0.3,"c3":0.659,"c4":0.64},{"time":1.9667,"angle":-16.1,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":2.5,"angle":17.08},{"time":2.6667,"angle":6.65},{"time":2.7333}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-37.24,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":2.81,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":38.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":40.33,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":16.37,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":-13.58,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.9667,"angle":-36.85,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.1667,"angle":-8.53,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":5.24,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":15.1,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":40.35,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":0.29,"curve":0.343,"c2":0.4,"c3":0.676,"c4":0.74},{"time":2.1667,"angle":-36.12,"curve":0.352,"c2":0.65,"c3":0.687},{"time":2.5,"angle":0.57},{"time":2.6667,"angle":19.78},{"time":2.7333},{"time":2.8667,"angle":-9.43},{"time":3,"angle":3.27}]},"hair_t":{"rotate":[{"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":3.28,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-2.05,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":3.95,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":19.96,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":13.11,"curve":0.322,"c2":0.29,"c3":0.656,"c4":0.63},{"time":0.6667,"angle":18.15,"curve":0.328,"c2":0.31,"c3":0.662,"c4":0.65},{"time":0.9,"angle":20.47,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":11.62,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"curve":"stepped"},{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":11.5,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":6.64,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"angle":12.3},{"time":2.6667},{"time":2.7333,"angle":10.43},{"time":2.8667}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-1.67,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.2667,"angle":-4.47,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":-0.95,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.4333,"angle":-9.95,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-5.81,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":4.66,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.9,"angle":0.7,"curve":0.34,"c2":0.37,"c3":0.674,"c4":0.7},{"time":1.1667,"angle":2.5,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":15.57,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-11.36,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-2.55,"curve":0.347,"c2":0.44,"c3":0.681,"c4":0.77},{"time":1.9667,"angle":-8.53,"curve":0.34,"c2":0.42,"c3":0.673,"c4":0.76},{"time":2.2,"angle":-18.29,"curve":0.343,"c2":0.66,"c3":0.676},{"time":2.5,"angle":-9.26},{"time":2.6667,"angle":-10.67},{"time":2.7333,"angle":-11.03},{"time":2.8667,"angle":3.64},{"time":3,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-19.29,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":23.21,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":15.49,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-16.51,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-2.92,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.6667,"angle":-4.93,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.9,"angle":10.03,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":15.58,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":14.82,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-14.88,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-22.71,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":19.4,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.75},{"time":2.2,"angle":13.88,"curve":0.343,"c2":0.45,"c3":0.676,"c4":0.79},{"time":2.3667,"angle":-8.17,"curve":0.342,"c2":0.66,"c3":0.675},{"time":2.5,"angle":10.84},{"time":2.6667,"angle":14.86},{"time":2.7333,"angle":-17.62},{"time":2.8667,"angle":-9.88},{"time":3,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":-22.25,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":21.21,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":12.89,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":-14.62,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":-14.41,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.6667,"angle":-26.81,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.9,"angle":12.92,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":20.16,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":35.21,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":14.79,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-31.89,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":19.72,"curve":0.359,"c2":0.5,"c3":0.695,"c4":0.86},{"time":2.3667,"angle":-26,"curve":0.345,"c2":0.66,"c3":0.679},{"time":2.5,"angle":-1.41},{"time":2.6667,"angle":20.55},{"time":2.7333,"angle":7.37},{"time":2.8667,"angle":-16.61},{"time":3,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":55.78,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":48.98,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":102.32,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":93.66,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":55.8,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.9,"angle":46.53,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":128.97,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":32.4,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":31.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":26.75,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":9.04,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-11.54,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-25.22,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.2667,"angle":-0.67,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":40.35,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.4333,"angle":40.34,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":18.57,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.5667,"angle":-28.55,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.8,"angle":-7.26,"curve":0.34,"c2":0.37,"c3":0.674,"c4":0.7},{"time":1.1667,"angle":16.92,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":26.54,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":36.13,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-25.52,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":4.39,"curve":0.337,"c2":0.36,"c3":0.671,"c4":0.7},{"time":1.7,"angle":17.05,"curve":0.34,"c2":0.39,"c3":0.674,"c4":0.73},{"time":1.9667,"angle":42.08,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":5.05},{"time":2.6667,"angle":-21.25},{"time":2.7333,"angle":-5.06},{"time":2.8667,"angle":9.18},{"time":3,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":8.2,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1667,"angle":-6.71,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":16.99,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":56.97,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":56.27,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":34.15,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.5667,"angle":-13.93,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.8,"angle":4.89,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":25.42,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":34.4,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":43.69,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-19.2,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":9.24,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.7,"angle":20.68,"curve":0.344,"c2":0.39,"c3":0.678,"c4":0.72},{"time":1.9667,"angle":43.98,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":5.05},{"time":2.6667,"angle":-21.25},{"time":2.7333,"angle":-5.06},{"time":2.8667,"angle":9.18},{"time":3,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":5.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1667,"angle":-9.66,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":14.21,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":54.36,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":53.77,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":31.71,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.5667,"angle":-16.2,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.8,"angle":3.01,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":24.11,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":33.2,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":42.53,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-20.16,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":8.47,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.7,"angle":20.11,"curve":0.344,"c2":0.39,"c3":0.678,"c4":0.72},{"time":1.9667,"angle":43.7,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":5.05},{"time":2.6667,"angle":-21.25},{"time":2.7333,"angle":-5.06},{"time":2.8667,"angle":9.18},{"time":3,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":41,"curve":0.322,"c2":0.2,"c3":0.656,"c4":0.53},{"time":0.1667,"angle":21.31,"curve":0.324,"c2":0.26,"c3":0.657,"c4":0.6},{"time":0.2667,"angle":50.33,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":89.79,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":88.54,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":66.09,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.64},{"time":0.5667,"angle":17.53,"curve":0.323,"c2":0.3,"c3":0.657,"c4":0.63},{"time":0.8,"angle":32.77,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":47.01,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":54.71,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":63.34,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-2.16,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":1.5333,"angle":23.11,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.7,"angle":31.47,"curve":0.344,"c2":0.37,"c3":0.68,"c4":0.71},{"time":1.9667,"angle":50.08,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"angle":5.05},{"time":2.6667,"angle":-21.25},{"time":2.7333,"angle":-5.06},{"time":2.8667,"angle":9.18},{"time":3,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-2.26,"y":14.51}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":22.15,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":2.3,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":-18.65,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":-16.75,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":-9.11,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.8,"angle":1.64,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":1.17,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":1.09,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":1.05,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":0.89,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":0.28,"curve":0.37,"c2":0.63,"c3":0.708},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":28.84,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":8.19,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-13.14,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-11.49,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-3.98,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":5.55,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":3.83,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":3.54,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":3.4,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":2.83,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":0.83,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":9.54}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":23.17,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":3.15,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-17.87,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-16.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-8.4,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":2.13,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":1.47,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":1.36,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":1.31,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":1.09,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":0.32,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":6.48,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":5.9,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":5.59,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":5.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":5.28,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.8,"angle":4.21,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":3.01,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":2.8,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":2.69,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":2.28,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":0.72,"curve":0.37,"c2":0.63,"c3":0.708},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":6.67}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":8.68,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":8.34,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":8.05,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":7.83,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":7.71,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":6.43,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":4.79,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":4.48,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":4.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":3.7,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":1.25,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":8.76}]},"r_ear_s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":25.88,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":7.7,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-19.51,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-56.07,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-62.15,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":51.97,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":14.48,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":3.33,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-26.31,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":36.04,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":39.18,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":20.13},{"time":2.6667,"angle":46.16},{"time":2.7333,"angle":-5.87},{"time":2.8667,"angle":22.72},{"time":3,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":5.7,"y":-8.17}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":0.25,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-8.63,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":-3.34,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-4.21,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-6.28,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":-15.96,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":-7.3,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":4.49,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-4.79,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-12.19,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":0.53,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"angle":2.32},{"time":2.6667,"angle":-27.35},{"time":2.7333,"angle":-9.63},{"time":2.8667},{"time":3,"angle":8.77}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":12.63,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":21.16,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-15.92,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-16.59,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":12.01,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":16.74,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-16.84,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-11.71,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":16.85,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":15.45,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-17.01,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":2.29},{"time":2.6667,"angle":12.28},{"time":2.7333,"angle":-21.14},{"time":2.8667},{"time":3,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-19.37,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":12.17,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":14.01,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-31.94,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-49.4,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":16.14,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":-16.78,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-5.11,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-16,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":39.04,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":-1.43,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"angle":17.73},{"time":2.7333,"angle":11.76},{"time":2.8667},{"time":3,"angle":-10}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-12.13,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-11.26,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":0.6,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":3,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-10.42,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":-8.69,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":-6.47,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-6.05,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-5.84,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-4.99,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":-1.69,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"angle":-20.31},{"time":2.7333,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-11.82}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":15.18,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":28.27,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-13.96,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-21.36,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":13.85,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":18.15,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-7.16,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-5.39,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":19.66,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":19.15,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-16.79,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":2.29},{"time":2.6667,"angle":12.28},{"time":2.7333,"angle":-21.14},{"time":2.8667},{"time":3,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-15.4,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":14.73,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":14.22,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-50.39,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-26.97,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":34.84,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":-22.16,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-3.31,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-12.44,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":17.46,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":2.21,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"angle":17.73},{"time":2.7333,"angle":11.76},{"time":2.8667},{"time":3,"angle":15.47}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":22.61,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":2.87,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":-18.06,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-16.15,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-8.52,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":2.21,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":1.65,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":1.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":1.49,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":1.27,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":0.43,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-4.5,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":-4,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-3.75,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-3.59,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-3.51,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":-2.71,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-1.87,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-1.73,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-1.66,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-1.38,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-0.41,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":-0.58,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":-0.53,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":-0.5,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":-0.48,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":-0.47,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.8,"angle":-0.38,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":-0.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-0.25,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-0.24,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-0.2,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":-0.06,"curve":0.37,"c2":0.63,"c3":0.708},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":54.37,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":30.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":8.19,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":8.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":15.96,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":20.93,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":14.47,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":13.37,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":12.82,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":10.68,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":3.15,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":39.83,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":36.25,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":34.35,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":33.06,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":32.41,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.8,"angle":25.83,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":18.5,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":17.2,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":16.55,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":13.98,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":4.44,"curve":0.37,"c2":0.63,"c3":0.708},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":40.99}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":1.89,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-0.64,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":8.42,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":16.93,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":19.34,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":3.42,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":-12.9,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":8.01,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":4.52,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":3.87,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":8.38,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"angle":19.74},{"time":2.6667,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":9.15}],"scale":[{"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"x":0.927,"curve":0.303,"c2":0.11,"c3":0.639,"c4":0.46},{"time":0.3667,"x":1.123,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"x":0.826,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":0.771,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"x":0.624,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"x":0.732,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"x":0.88,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"x":0.846,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":0.682,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"x":0.778,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"x":0.857},{"time":2.8667}],"shear":[{"y":-15.36,"curve":0.326,"c3":0.66,"c4":0.34},{"time":0.0667,"y":20.35,"curve":0.315,"c2":0.14,"c3":0.649,"c4":0.48},{"time":0.2667,"y":-0.46,"curve":0.326,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"y":-32.23,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"y":-32.63,"curve":0.331,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.4667,"y":7.15,"curve":"stepped"},{"time":0.8,"y":7.15,"curve":0.322,"c2":0.3,"c3":0.658,"c4":0.64},{"time":1.1667,"y":10.36,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.2333,"y":27.95,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2667,"y":33.56,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.4,"y":14.21,"curve":0.336,"c2":0.34,"c3":0.675,"c4":0.69},{"time":1.9667,"y":-25.6,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":2.5,"y":0.65,"curve":0.344,"c2":0.39,"c3":0.678,"c4":0.72},{"time":2.6667,"y":11.31,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":22.5,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":32.25,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-21.87,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-32.75,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":13.24,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":0.27,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-14.11,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-13.22,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":13.99,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":12.46,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":3.51,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":8.15},{"time":2.6667,"angle":17.54},{"time":2.7333,"angle":-15.62},{"time":2.8667},{"time":3,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-34.85,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":29.36,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":18.38,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-32.96,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-53.59,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.64},{"time":0.6,"angle":25.81,"curve":0.324,"c2":0.3,"c3":0.659,"c4":0.64},{"time":0.8,"angle":7.4,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":3.44,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-16.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-20.88,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":24.17,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":-3.05,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"angle":17.54},{"time":2.7333,"angle":2.64},{"time":2.8667,"angle":-15.51},{"time":3,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":-32.46,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":31.38,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":27.98,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-2.82,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":17,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-3.85,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.6333,"angle":30.02,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.8,"angle":11.16,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":34.38,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":2.96,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-3.37,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":27.18,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":0.7,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5},{"time":2.6667,"angle":26.61},{"time":2.7333,"angle":9.97},{"time":2.8667,"angle":-4.16},{"time":3,"angle":7.98}],"translate":[{"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"x":-23.98,"y":0.7,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"x":-5.86,"y":-37.32,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"x":-12.54,"y":0.58,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":-14.37,"y":15.83,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"x":-4.62,"y":10.98,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"curve":"stepped"},{"time":1.2333,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"x":2.06,"y":5.22,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":-17.57,"y":8.81,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":2.87,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":28.43,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":-14.59,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-76.63,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-30.34,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.6333,"angle":1.74,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.8,"angle":-14.61,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-3.86,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-18.66,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-19.7,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":27.19,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-18,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5},{"time":2.6667,"angle":-29.65},{"time":2.7333},{"time":2.8667,"angle":20.12},{"time":3,"angle":-9.62}],"translate":[{"time":0.0667,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"x":13.36,"y":13.32,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"x":-34.25,"y":-17.32,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"curve":0.324,"c2":0.3,"c3":0.658,"c4":0.63},{"time":0.6333,"x":6.43,"y":-12.6,"curve":0.326,"c2":0.31,"c3":0.66,"c4":0.64},{"time":0.8,"curve":"stepped"},{"time":1.2333,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"x":13.64,"y":13.03,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":30.84,"y":-11.3,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-0.94,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-28.9,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":-7.73,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-23.55,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":-7.41,"curve":0.305,"c2":0.24,"c3":0.65,"c4":0.61},{"time":1.1667,"angle":-4.61,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-4.31,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-4.16,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-3.56,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":-1.2,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5,"curve":"stepped"},{"time":2.6667},{"time":2.7333,"angle":-3.91},{"time":2.8667,"angle":-6.91},{"time":3,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-12.02,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.2667,"angle":31.84,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":7.52,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.4333,"angle":6.93,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":3.26,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.8,"angle":-16.24,"curve":0.34,"c2":0.37,"c3":0.674,"c4":0.7},{"time":1.1667,"angle":-20.33,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":1.47,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-7.27,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":1.15,"curve":0.347,"c2":0.44,"c3":0.681,"c4":0.77},{"time":1.9667,"angle":10.21,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5},{"time":2.6667,"angle":6.08},{"time":2.7333,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-39.69,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2667,"angle":15.06,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.3667,"angle":27.2,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":19.09,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-1.39,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.8,"angle":-25.1,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":1.1667,"angle":-31.25,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":29.62,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":40.09,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":28.93,"curve":0.352,"c2":0.42,"c3":0.688,"c4":0.77},{"time":1.9667,"angle":-6.66,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5},{"time":2.6667,"angle":7.62},{"time":2.7333},{"time":2.8667,"angle":-21.17},{"time":3,"angle":-1.85}],"translate":[{"time":0.4333,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":-47.16,"y":11.55,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"x":-35.02,"y":-4.91,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"x":13.7,"y":-9.5,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"x":-4.81,"y":-6.66,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"x":26.1,"y":-13.6,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"x":-12.37,"y":6.58},{"time":2.7333}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.0667,"angle":20.68,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.2667,"angle":0.07,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.3667,"angle":38.73,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.4333,"angle":16.7,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4667,"angle":-6.5,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":0.8,"angle":14.67,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.1667,"angle":-2.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-40.6,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-15.1,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-1.99,"curve":0.352,"c2":0.4,"c3":0.69,"c4":0.75},{"time":1.9667,"angle":29.85,"curve":0.37,"c2":0.63,"c3":0.708},{"time":2.5,"angle":36.03},{"time":2.6667,"angle":0.59},{"time":2.7333},{"time":2.8667,"angle":12.69},{"time":3,"angle":-8.22}],"translate":[{"time":0.0667,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"x":16.25,"y":8.66,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"x":12.56,"y":25.25,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":35.13,"y":-2.75,"curve":0.305,"c2":0.24,"c3":0.65,"c4":0.61},{"time":1.1667,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"x":15.2,"y":-44.41,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"x":28.53,"y":-13.78,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":45.91,"y":-23.74,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"x":6.76,"y":-22.09,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"x":-3.64,"y":-23.79},{"time":2.7333}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.325,"c3":0.658,"c4":0.34},{"time":0.0667,"angle":-32.28,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.2667,"angle":-68.99,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.3667,"angle":-47.29,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"angle":-5.77,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"angle":12.2,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"angle":44.43,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"angle":30.36,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"angle":-31.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-30.5,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"angle":-18.57,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"angle":22.95,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5},{"time":2.6667,"angle":-16.84},{"time":2.7333},{"time":2.8667,"angle":28.05},{"time":3,"angle":-11.95}],"translate":[{"time":0.3667,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"x":-33.43,"y":58.71,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":20.14,"y":56.86,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"x":30.52,"y":23.87,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"x":-33.19,"y":15.58,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"curve":"stepped"},{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":-11.49,"y":-19.88,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667,"x":14.36,"y":48.34,"curve":0.376,"c2":0.61,"c3":0.718},{"time":2.5}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-64.05,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.2667,"angle":-96.39,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":-86.1,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.4333,"angle":-6.08,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-5.68,"curve":0.345,"c2":0.39,"c3":0.679,"c4":0.72},{"time":1.1667,"angle":-45.78,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-58.7,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.2667,"angle":-82.71,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.4,"angle":-61.3,"curve":0.347,"c2":0.44,"c3":0.681,"c4":0.77},{"time":1.9667,"angle":7.38,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5},{"time":2.6667,"angle":-46.36},{"time":2.7333,"angle":-75.05},{"time":2.8667,"angle":-0.33},{"time":3,"angle":-8.22}],"translate":[{"time":0.4667,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":0.8,"x":-15.03,"y":-14.76,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":1.1667,"x":-33.57,"y":-54.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.2333,"x":-41.35,"y":-57.52,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"x":-32.71,"y":-32.32,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":1.9667}]},"shadow":{"translate":[{"time":0.0667,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.3667,"x":-145,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":78.72,"curve":"stepped"},{"time":2.5,"x":78.72,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":2.6667}],"scale":[{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"y":1.153,"curve":"stepped"},{"time":2.5,"y":1.153,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":2.8667}]},"r_upparm3":{"rotate":[{},{"time":0.0667,"angle":22.9},{"time":0.2667,"angle":50.67},{"time":0.3667,"angle":52.68},{"time":0.4333,"angle":68.19},{"time":0.4667,"angle":-155},{"time":0.5333,"angle":-145.55},{"time":1.1667,"angle":-120.43},{"time":1.2667,"angle":55.76},{"time":1.3,"angle":33.08},{"time":1.9667,"angle":21.53},{"time":2.5,"angle":56.21},{"time":2.6667,"angle":63.35},{"time":2.7333,"angle":13.6},{"time":2.8667}],"translate":[{},{"time":1.2667,"x":-66.65,"y":3.21},{"time":1.9667}]},"r_finger_a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":31.41},{"time":0.2667,"angle":26.63},{"time":0.3667,"angle":25.07},{"time":1.1667},{"time":1.2667,"angle":4.28},{"time":1.3333,"angle":33.29},{"time":1.9667,"angle":39.84},{"time":2.5,"angle":64.76},{"time":2.6667,"angle":35.33},{"time":2.8667},{"time":3,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.751},{"time":1.1667,"x":1.552},{"time":1.9667,"x":1.167},{"time":2.5,"x":0.835},{"time":2.6667,"x":0.653},{"time":2.7333,"x":0.506},{"time":2.8,"x":1.232},{"time":2.8667}]},"r_finger_b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-14.7},{"time":0.2667},{"time":0.3667,"angle":-23.72},{"time":0.4667,"angle":-54.57},{"time":0.5333,"angle":-35.92},{"time":1.2667,"angle":8.43},{"time":1.3333,"angle":-55.31},{"time":1.9667,"angle":-36.86},{"time":2.5,"angle":-9.95},{"time":2.6667,"angle":-5.43},{"time":2.8,"angle":-23.47},{"time":3,"angle":-8.92}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.1,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.1},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r_finger_c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-4.33},{"time":0.2667},{"time":0.3667,"angle":-21.35},{"time":0.4667,"angle":-56.6},{"time":0.5333,"angle":-38.26},{"time":1.2667,"angle":21.7},{"time":1.3333,"angle":-53.94},{"time":1.9667,"angle":-11.99},{"time":2.5,"angle":-5.02},{"time":2.6667,"angle":-2.74},{"time":2.8,"angle":-18.4},{"time":3,"angle":-9.49}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r_finger_d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":18.15},{"time":0.2667,"angle":1.92},{"time":0.3667},{"time":0.5333,"angle":-23.8},{"time":1.2667,"angle":46.29},{"time":1.3333,"angle":-17.24},{"time":1.9667,"angle":20.97},{"time":2.5,"angle":20.38},{"time":2.6667,"angle":11.12},{"time":2.8667},{"time":3,"angle":7.12}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"l_hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"skill":{"rotate":[{"angle":-90},{"time":0.5333},{"time":0.6667,"angle":-90},{"time":0.7}],"translate":[{"x":751.05,"y":-2674.72},{"time":0.5333,"x":912.09,"y":-2857.24},{"time":0.7,"x":751.05,"y":-2680.69},{"time":0.9333,"x":606.8,"y":-2744.39},{"time":1.1333,"x":445.07,"y":-2776.14},{"time":1.1667,"x":333.03,"y":-2816.05},{"time":1.2,"x":173.45,"y":-2798.68},{"time":1.2333,"x":908.46,"y":-3060.52},{"time":1.2667,"x":908.46,"y":-2994.78},{"time":1.3,"x":905.39,"y":-2995.2},{"time":1.3333,"x":902.32,"y":-2995.61},{"time":1.3667,"x":899.24,"y":-2996.02},{"time":3,"x":748.69,"y":-3016.22}],"scale":[{"x":0,"y":0},{"time":0.0333,"x":0.937,"y":0.937},{"time":0.5333,"x":0,"y":0},{"time":0.6667,"x":0.414,"y":0.414},{"time":0.7,"x":0.414,"y":0.414},{"time":0.9333,"x":0.63,"y":0.63},{"time":1.1333,"x":0.4,"y":0.4},{"time":1.2,"x":0,"y":0},{"time":1.2333,"x":0.948,"y":0.948,"curve":"stepped"},{"time":2.9667,"x":0.948,"y":0.948},{"time":3,"x":0,"y":0}]},"s":{"scale":[{"x":0,"y":0}]},"l_armour":{"rotate":[{"angle":1.84}]},"r_arm":{"rotate":[{"angle":-7.98}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.0667,"offset":92,"vertices":[2.20322,30.46043,-18.26239,24.47815,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2.20322,30.46043,0,0,1.46875,20.30699,-12.17502,16.31879,0,0,0,0,0,0,0,0,0,0,0,0,-18.26239,24.47815,1.46875,20.30699,-12.17502,16.31879,0,0,0,0,0,0,0,0,2.20322,30.46043,-18.26239,24.47815,0,0,0,0,0,0,0,0,2.20322,30.46043,-18.26239,24.47815]},{"time":0.3667,"offset":90,"vertices":[1.22015,85.50305,8.85266,63.22167,-11.04908,62.60259,0,0,0,0,-6.34235,126.33496,-53.48529,114.63028,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-3.36218,63.396,0,0,1.15774,53.59198,-21.08538,49.06215,0,0,0,0,0,0,0,0,0,0,-26.46741,90.20621,-22.42884,58.16097,1.15774,53.59198,-21.08538,49.06215,0,0,0,0,0,0,0,0,-3.01361,87.82533,-31.31251,80.92049,0,0,0,0,0,0,0,0,-3.36218,63.396,-22.42884,58.16097]},{"time":0.4333,"offset":90,"vertices":[11.28321,29.56786,64.24847,-1.59769,15.38139,-20.66391,0,0,0,0,30.03378,63.63551,-37.9719,42.57151,0,0,0,0,21.52234,-32.401,0,0,0,0,0,0,0,0,11.37859,-10.34697,0,0,10.04763,-32.86191,-46.04496,-32.88637,0,0,0,0,0,0,0,0,-6.04218,-42.5224,-6.48686,6.21558,13.33047,-7.81927,74.10146,18.25119,33.79031,-14.39904,0,0,0,0,0,0,0,0,10.88204,44.88947,-30.96428,36.15376,0,0,0,0,0,0,0,0,63.57747,-1.31068,14.50655,-29.04317]},{"time":0.4667,"offset":86,"vertices":[-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,55.4898,-115.34093,44.22822,-137.56801]},{"time":1.1667,"offset":44,"vertices":[13.68317,13.3293,-1.79593,19.0177,40.93475,29.97415,2.33765,50.68173,45.62729,58.9476,-17.28067,72.51294,5.87097,28.37482,-18.41379,22.37299,9.02417,22.71495,-12.02777,21.27783,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-5.34116,-25.95972,2.87909,-26.34647,21.36486,-151.78146,69.57217,-109.37783,55.94293,-119.57079,-9.27048,-25.94392,7.98193,-27.92816,21.33434,-164.38474,48.64049,-169.80396,-10.8429,-18.338,-1.82306,-23.04482,48.12115,-135.29684,-21.33124,-65.07796,18.26343,-64.03969,-10.16232,-58.32629,22.86304,-54.1167,-4.32936,-91.79655,0,0,-10.19131,-230.23357,44.46687,-207.03862,-13.73187,-64.35754,17.35513,-60.88112,0,0,0,0,24.02046,-94.70818,55.50031,-161.04776,64.36263,-117.89432,52.18075,-116.5673,99.54089,-135.70296,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-6.65829,-158.96844,49.1057,-142.28601,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,50.47698,-132.96794,54.80964,-152.53014]},{"time":1.2667,"vertices":[29.06982,-72.12125,-15.9902,-42.64353,17.02545,-42.24011,-8.49564,-22.65597,9.0448,-22.44153,-0.47134,-1.25648,0.50055,-1.24426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4.56106,4.4431,-0.59864,6.33924,13.64492,9.99139,0.77922,16.89392,15.2091,19.64921,-5.76023,24.17099,1.95699,9.45827,-6.13793,7.45766,3.00806,7.57165,-4.00926,7.09261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7.16559,-17.77921,15.33618,-38.04984,22.20337,-55.08542,-6.47704,-36.10748,16.04478,-32.1932,-11.66546,-151.5143,-27.1316,-126.09022,42.10883,-139.93118,-12.85862,-68.80717,36.10632,-60.25766,-12.99173,-156.02612,69.79156,-144.80843,-9.5186,-43.75845,20.4741,-39.42205,36.13084,-109.71313,-22.23346,-115.78752,58.51549,-100.9286,-12.63305,-73.00189,36.99162,-63.76791,-7.82084,-76.26741,8.58105,-32.21619,-24.01515,-151.97418,50.45047,-138.40071,-20.42968,-118.18782,59.45955,-102.31465,0.59845,1.70294,-0.71265,1.6615,41.66179,-96.37958,83.84325,-153.11818,51.87237,-181.09866,-21.86926,-116.7386,56.85548,-129.17567,-12.02087,-67.09482,32.61721,-58.43959,-9.96017,-74.88145,38.81413,-64.40079,-16.36066,-125.88433,55.19584,-110.71894,1.57309,9.11859,-5.00427,7.78589,-15.29986,-92.5833,47.58673,-79.88013,-48.06121,-165.48805,52.30351,-184.00641,-13.90564,-85.01868,47.19269,-72.06903,-11.91748,-73.83663,41.10345,-62.48297]},{"time":1.4,"vertices":[23.01361,-57.09599,-12.65891,-33.75946,13.47848,-33.44009,-6.72571,-17.93597,7.16047,-17.76621,-0.37315,-0.99471,0.39627,-0.98504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.61084,3.51745,-0.47393,5.01856,10.80223,7.90985,0.61688,13.37435,12.04054,15.55562,-4.56018,19.13536,1.54928,7.4878,-4.85919,5.90398,2.38138,5.99422,-3.174,5.61499,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5.67276,-14.0752,12.14114,-30.12278,17.57767,-43.60929,-37.40884,80.90787,-22.69981,79.84479,-21.81034,-112.46321,-69.53212,-61.44518,23.95736,-70.31633,-5.52369,-61.88129,38.22286,-52.7466,-48.32508,-67.20107,44.80422,-56.20119,-8.41052,-25.36345,20.63107,-20.17984,-11.03411,8.36736,-23.17635,-82.03205,55.08798,-66.62843,-42.80547,31.16739,3.06902,36.41177,-11.74329,-49.05764,-36.39805,78.77538,-41.89071,-104.48355,51.84534,-87.36143,-21.45167,-80.40545,55.62834,-64.36916,-15.84734,77.03049,-22.53262,74.3882,6.43098,4.80322,66.73289,-78.549,13.31977,-86.71854,-55.78627,-75.32662,48.65828,-79.61618,-19.57751,-21.27523,23.22398,-13.2485,-13.15283,-40.95397,31.56849,-31.90127,-25.15525,-74.27544,48.14829,-59.80457,-32.12083,149.45386,-54.87665,140.78326,-11.74581,-61.11443,40.8359,-49.66849,-73.8765,-103.35275,27.6935,-118.63463,-15.52067,-45.71382,38.7096,-34.11666,-8.28208,-49.48368,35.00734,-39.49377]},{"time":1.9667}]},"body_back":{"body_back":[{"vertices":[-248.84149,984.15564,-256.0761,952.2449,-252.69482,923.5105,-249.3135,894.7759,-227.28748,866.5216,-226.49063,816.0619,-205.80875,793.2189,-185.12735,770.3761,-140.62946,763.5835,-111.47226,767.0144,-82.31494,770.4459,-63.17963,789.8679,-41.05719,783.90247,-25.84525,807.54236,-10.63358,831.1809,9.21088,849.79614,3.34344,899.65967,-2.52435,949.5222,-18.49289,999.9104,-47.70047,1007.8253,-88.26645,1003.0521,-128.83289,998.2776,-149.93976,989.24255,-159.64532,981.8817,-181.04153,978.7423,-215.42685,980.2926,-230.43939,986.32153,-142.81763,823.79224,-69.17297,961.4939,-61.97717,877.41736,-158.15805,935.3407,-116.05615,870.7516,-79.49326,827.23804,-169.92407,888.0531,-126.61203,937.7208,-42.6969,920.41504,-208.19629,927.995,-83.27798,913.6301,-177.94455,839.38,-104.06152,807.6094,-107.68793,967.2245,-130.85959,909.01746,-20.5181,875.69336,-39.78152,843.8264,-36.06897,967.8529,-206.4953,883.4315,-147.5774,866.198],"curve":"stepped"},{"time":0.4667,"vertices":[-248.84149,984.15564,-256.0761,952.2449,-252.69482,923.5105,-249.3135,894.7759,-227.28748,866.5216,-226.49063,816.0619,-205.80875,793.2189,-185.12735,770.3761,-140.62946,763.5835,-111.47226,767.0144,-82.31494,770.4459,-63.17963,789.8679,-41.05719,783.90247,-25.84525,807.54236,-10.63358,831.1809,9.21088,849.79614,3.34344,899.65967,-2.52435,949.5222,-18.49289,999.9104,-47.70047,1007.8253,-88.26645,1003.0521,-128.83289,998.2776,-149.93976,989.24255,-159.64532,981.8817,-181.04153,978.7423,-215.42685,980.2926,-230.43939,986.32153,-142.81763,823.79224,-69.17297,961.4939,-61.97717,877.41736,-158.15805,935.3407,-116.05615,870.7516,-79.49326,827.23804,-169.92407,888.0531,-126.61203,937.7208,-42.6969,920.41504,-208.19629,927.995,-83.27798,913.6301,-177.94455,839.38,-104.06152,807.6094,-107.68793,967.2245,-130.85959,909.01746,-20.5181,875.69336,-39.78152,843.8264,-36.06897,967.8529,-206.4953,883.4315,-147.5774,866.198]},{"time":1.1667,"vertices":[-248.84149,984.15564,-256.0761,952.2449,-252.69482,923.5105,-249.3135,894.7759,-227.28748,866.5216,-226.49063,816.0619,-205.80875,793.2189,-185.12735,770.3761,-140.62946,763.5835,-111.47226,767.0144,-82.31494,770.4459,-63.17963,789.8679,-41.05719,783.90247,-25.84525,807.54236,-10.63358,831.1809,9.21088,849.79614,3.34344,899.65967,-2.52435,949.5222,-18.49289,999.9104,-47.70047,1007.8253,-88.26645,1003.0521,-128.83289,998.2776,-149.93976,989.24255,-159.64532,981.8817,-181.04153,978.7423,-215.42685,980.2926,-230.43939,986.32153,-103.0361,1024.2079,-64.87897,1040.5034,-44.87289,1052.709,-163.90921,1037.5004,-96.87616,1071.7126,-37.24252,1037.6261,-168.77554,1034.1577,-126.17181,1051.0022,-33.91873,1041.6232,-220.0662,1001.74164,-74.33423,1058.4902,-165.10123,978.16345,-67.14713,957.76855,-105.10043,1034.3718,-131.6464,1068.6799,-5.13809,980.3032,-17.89572,968.657,-31.7659,1022.473,-216.04953,993.4871,-129.88193,1059.1964]},{"time":1.2333,"vertices":[-248.84149,984.15564,-256.0761,952.2449,-252.69482,923.5105,-249.3135,894.7759,-227.28748,866.5216,-226.49063,816.0619,-205.80875,793.2189,-185.12735,770.3761,-140.62946,763.5835,-111.47226,767.0144,-82.31494,770.4459,-63.17963,789.8679,-41.05719,783.90247,-25.84525,807.54236,-10.63358,831.1809,9.21088,849.79614,3.34344,899.65967,-2.52435,949.5222,-18.49289,999.9104,-47.70047,1007.8253,-88.26645,1003.0521,-128.83289,998.2776,-149.93976,989.24255,-159.64532,981.8817,-181.04153,978.7423,-215.42685,980.2926,-230.43939,986.32153,-142.81763,823.79224,-69.17297,961.4939,-61.97717,877.41736,-158.15805,935.3407,-116.05615,870.7516,-79.49326,827.23804,-169.92407,888.0531,-126.61203,937.7208,-42.6969,920.41504,-208.19629,927.995,-83.27798,913.6301,-177.94455,839.38,-104.06152,807.6094,-107.68793,967.2245,-130.85959,909.01746,-20.5181,875.69336,-39.78152,843.8264,-36.06897,967.8529,-206.4953,883.4315,-147.5774,866.198]}]},"r_armour_t":{"r_armour_t":[{"time":0.4333},{"time":0.4667,"vertices":[152.28754,-504.84186,41.04651,-90.2688,-130.66052,549.6482,-19.42004,135.07526]},{"time":0.5333,"vertices":[102.75201,-525.598,-12.29422,-106.9043,-187.29251,529.9733,-72.24661,111.27966]},{"time":0.7,"vertices":[155.13583,-579.0996,-19.70542,-106.5833,-237.69284,482.53497,-62.85197,10.01894]},{"time":1.1667,"vertices":[282.43243,-469.5668,63.4035,32.51511,-178.19824,586.34045,40.83038,84.25827]},{"time":1.2,"curve":"stepped"},{"time":1.2333},{"time":1.2667,"vertices":[-50.65718,-0.62451,-50.65718,-0.62451,-50.65718,-0.62451,-50.65718,-0.62451]},{"time":1.9667}]},"r_armour_u":{"r_armour_u":[{},{"time":1.2667,"offset":4,"vertices":[12.2439,-42.27058,37.5871,-22.88742,0,0,0,0,4.04147,-30.19534,23.3819,-19.52841,9.9678,-90.87462,68.75055,-60.25513,14.1861,22.35083]},{"time":1.9667,"offset":4,"vertices":[-4.71359,20.53979,0.62439,21.06448,0,0,0,0,0,0,0,0,-12.00818,15.14584,-7.79572,17.68724]},{"time":3}]},"r_upparm":{"r_upparm":[{},{"time":0.0667,"vertices":[71.42023,-102.62211,-59.57715,58.98571,-5.55792,13.88953,0.0719,5.32324,0,0,0,0,0,0,0,0,-27.13274,56.92213,64.57664,-45.52594,-10.7289,77.28154,-24.0618,58.08443,-10.93439,33.24786,32.51658,14.61764,38.99049,-37.58549,40.94386,-48.92675,-21.46527,22.31351,12.05781,-11.15483,12.86837,-1.65199,-31.71793,9.20399,60.00681,-4.37593]},{"time":0.2667,"vertices":[14.49724,-143.9148,86.2994,-7.67324,-29.00799,43.29948,0.04109,3.04185,0,0,0,0,0,0,0,0,154.17299,20.83762,76.12129,-60.70172,31.93622,132.94388,0.21045,133.35263,-15.50144,82.60187,-16.21501,16.47086,-8.79588,-32.1922,27.94626,-74.8526,96.62123,-6.14262,64.04028,-37.00799,93.58081,-27.17517,115.43555,-20.91914,87.97645,-34.27887]},{"time":0.3667,"vertices":[57.66969,-205.21594,129.24759,-60.09939,-18.12999,27.06218,0.02568,1.90116,0,0,0,0,0,0,0,0,147.55629,-34.66768,79.43922,1.22364,65.22589,117.25517,72.26199,103.7204,38.78865,44.84063,25.09694,-30.57835,94.71159,-90.42285,57.64677,-129.74088,129.0995,-23.49015,67.25021,-84.08886,121.04185,-2.89511,110.66865,-66.0593,102.23569,10.19076]},{"time":0.4333,"vertices":[94.94589,-245.40454,98.97653,-52.22503,22.1245,35.24601,0.01541,1.14069,0,0,0,0,0,0,4.34332,15.29031,151.88974,-15.64919,98.16955,-0.94751,131.75479,6.61076,133.46225,10.04301,124.7209,-8.17683,96.46043,-51.51637,84.6468,-80.23224,73.48962,-136.4072,136.07724,-32.39825,88.67035,-81.99995,127.75926,-21.35464,141.57883,-37.24434,109.43723,-25.01987]},{"time":0.4667,"vertices":[60.20279,-285.2079,178.6695,5.61779,14.74967,23.49734,0.01027,0.76046,0,0,0,0,0,0,2.89555,10.19354,187.63078,-84.14836,99.69791,106.1776,229.37988,-159.0247,152.201,-118.8279,50.96189,-129.61198,-35.65657,-200.7696,-107.07523,-311.73053,68.04438,-185.79814,170.60408,29.32304,83.40746,-135.03584,150.50427,36.70192,152.17752,-102.41692,122.37683,64.7523]},{"time":0.5333,"vertices":[-47.25385,-244.7281,246.85596,34.43988,0,0,0,0,0,0,0,0,0,0,0,0,103.16193,-124.55746,84.49106,137.89844,229.84851,-203.27744,139.59644,-136.4622,14.70477,-141.05151,-103.68231,-217.37236,-189.42932,-330.68317,-4.70135,-201.6728,192.35057,60.77765,27.54327,-171.68956,153.54951,81.5907,71.18427,-147.68524,116.71904,115.12]},{"time":1.1667,"vertices":[27.01488,-170.28525,187.80948,88.65892,-2.34058,186.42535,-65.4801,109.36133,0,0,0,0,24.0575,15.42035,41.30264,57.43616,148.5838,-121.58712,108.90398,164.83578,215.16722,-8.65701,126.92986,20.5615,27.95605,-16.17876,-52.0628,-96.19275,-93.76085,-197.85007,51.99199,-145.674,152.78575,99.94455,74.53324,-131.81415,131.74635,111.92378,103.08414,-122.82332,111.96646,130.86502,-17.19373,38.00159,-55.41232,52.68878]},{"time":1.2667,"vertices":[8.43998,-214.75891,134.6461,69.56977,24.73396,105.37369,9.14541,45.10073,0,0,0,0,0,0,0,0,86.28294,42.3029,37.2919,-31.77069,139.02008,67.24488,82.06499,89.76331,11.51316,64.20482,-48.90337,-3.86349,-79.66286,-83.41179,8.49401,-143.56448,123.51006,45.3092,24.97614,-86.67883,100.11182,23.803,64.69868,-15.87694,61.73894,-5.88001]},{"time":3}]}}},"events":[{"time":0.2667,"name":"tui1"},{"time":0.4667,"name":"hit"},{"time":1.4,"name":"hit"},{"time":2.3333,"name":"shou"}]},"walk":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00005"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00008"},{"time":0.2,"name":"eyefire/eyefire_00010"},{"time":0.2333,"name":"eyefire/eyefire_00011"},{"time":0.2667,"name":"eyefire/eyefire_00013"},{"time":0.3,"name":"eyefire/eyefire_00014"},{"time":0.3333,"name":"eyefire/eyefire_00016"},{"time":0.3667,"name":"eyefire/eyefire_00017"},{"time":0.4,"name":"eyefire/eyefire_00019"},{"time":0.4333,"name":"eyefire/eyefire_00020"},{"time":0.4667,"name":"eyefire/eyefire_00022"},{"time":0.5,"name":"eyefire/eyefire_00023"},{"time":0.5333,"name":"eyefire/eyefire_00025"},{"time":0.5667,"name":"eyefire/eyefire_00027"},{"time":0.6,"name":"eyefire/eyefire_00028"},{"time":0.6333,"name":"eyefire/eyefire_00030"},{"time":0.6667,"name":"eyefire/eyefire_00031"},{"time":0.7,"name":"eyefire/eyefire_00033"},{"time":0.7333,"name":"eyefire/eyefire_00034"},{"time":0.7667,"name":"eyefire/eyefire_00036"},{"time":0.8,"name":"eyefire/eyefire_00037"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"body":{"rotate":[{"angle":-46.01},{"time":0.1,"angle":-57.16},{"time":0.2,"angle":-81.65},{"time":0.3,"angle":-101.77},{"time":0.4,"angle":-119.71},{"time":0.5,"angle":-130.33},{"time":0.6,"angle":-117.59},{"time":0.7,"angle":-79.13},{"time":0.8,"angle":-46.01}],"translate":[{"y":-102.64},{"time":0.4,"y":43.22},{"time":0.8,"y":-102.64}]},"body2":{"rotate":[{"angle":-22.79},{"time":0.1,"angle":-10.08},{"time":0.2,"angle":16.6},{"time":0.3,"angle":38.66},{"time":0.4,"angle":52.44},{"time":0.5,"angle":59.18},{"time":0.6,"angle":41.89},{"time":0.7,"angle":-15.52},{"time":0.8,"angle":-22.79}],"translate":[{"x":-80.64,"y":48.56},{"time":0.1,"x":-29.6,"y":11.44},{"time":0.2,"x":24.21,"y":6.83},{"time":0.3,"x":87.48,"y":24.44},{"time":0.4,"x":76.26,"y":17.25},{"time":0.5,"x":-2.05,"y":-11.35},{"time":0.6,"x":-89.25,"y":-3.33},{"time":0.7,"x":-119.7,"y":79.08},{"time":0.8,"x":-80.64,"y":48.56}]},"head":{"rotate":[{"angle":54.91},{"time":0.1,"angle":57.8},{"time":0.2,"angle":61.64},{"time":0.3,"angle":73.6},{"time":0.4,"angle":89.11},{"time":0.5,"angle":87.54},{"time":0.6,"angle":81.54},{"time":0.7,"angle":92.91},{"time":0.8,"angle":54.91}],"translate":[{"x":20.04,"y":114.02}]},"rhand":{"rotate":[{"angle":-61.96},{"time":0.1,"angle":-73.08},{"time":0.2,"angle":-53.34},{"time":0.3,"angle":-7.68},{"time":0.4,"angle":-29.8},{"time":0.5,"angle":-31.51},{"time":0.6,"angle":-40.31},{"time":0.7,"angle":-69.63},{"time":0.8,"angle":-61.96}],"translate":[{"x":262.77,"y":-233.79},{"time":0.1,"x":680.4,"y":-287.15},{"time":0.2,"x":957.51,"y":-271.75},{"time":0.3,"x":1234.48,"y":-302.33},{"time":0.4,"x":1221.78,"y":-462.7},{"time":0.5,"x":1093.17,"y":-495.57},{"time":0.6,"x":634.16,"y":-422.65},{"time":0.7,"x":326.51,"y":-326.65},{"time":0.8,"x":262.77,"y":-233.79}],"scale":[{"x":0.445,"y":-0.647}]},"r_upparm":{"rotate":[{"angle":56.42},{"time":0.4,"angle":110.55},{"time":0.8,"angle":56.42}],"translate":[{},{"time":0.4,"x":-23.64,"y":21.09},{"time":0.8}]},"l_ik":{"rotate":[{"angle":-2.64},{"time":0.1,"angle":3.05},{"time":0.2,"angle":-46.63},{"time":0.3,"angle":-134.68},{"time":0.4,"angle":-137.5},{"time":0.5,"angle":-127.9},{"time":0.6,"angle":-79.41},{"time":0.7,"angle":-68.78},{"time":0.8,"angle":-2.64}],"translate":[{"x":-145.7,"y":70.09},{"time":0.1,"x":-250.39,"y":-2.76},{"time":0.2,"x":-480.05,"y":85.85},{"time":0.3,"x":-641.99,"y":290.99},{"time":0.4,"x":-630.55,"y":360.98},{"time":0.5,"x":-560.06,"y":415.93},{"time":0.6,"x":-341.98,"y":228.69},{"time":0.7,"x":-251.83,"y":181.63},{"time":0.8,"x":-145.7,"y":70.09}]},"lhand":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-84.39},{"time":0.2,"angle":-88.18},{"time":0.3,"angle":-51.49},{"time":0.4,"angle":63.47},{"time":0.5,"angle":23.26},{"time":0.6,"angle":22.08},{"time":0.7,"angle":29.82},{"time":0.8,"angle":-13.41}],"translate":[{"x":-157.59,"y":-59.33},{"time":0.1,"x":-191.58,"y":197.82},{"time":0.2,"x":-10,"y":106.23},{"time":0.3,"x":239.36,"y":12.55},{"time":0.4,"x":558.49,"y":-39.96},{"time":0.5,"x":517.71,"y":-176.13},{"time":0.6,"x":249.12,"y":-178.34},{"time":0.7,"x":11.48,"y":-146.59},{"time":0.8,"x":-157.59,"y":-59.33}]},"l_upparm":{"rotate":[{"angle":121.1},{"time":0.1,"angle":113.65},{"time":0.2,"angle":153.35},{"time":0.3,"angle":138.84},{"time":0.4,"angle":121.54},{"time":0.5,"angle":114.98},{"time":0.6,"angle":121.16},{"time":0.7,"angle":148.41},{"time":0.8,"angle":121.1}],"translate":[{"x":-7.3,"y":263.84}]},"r_finger_b":{"rotate":[{"angle":-31.61},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-40.66},{"time":0.4,"angle":-120.95},{"time":0.7,"angle":-134.91},{"time":0.8,"angle":-31.61}],"translate":[{"x":78.27,"y":97.55},{"time":0.2,"x":144.96,"y":155.26},{"time":0.3,"x":129.1,"y":139.7},{"time":0.4,"x":188.45,"y":155.72},{"time":0.7,"x":171.78,"y":113.86},{"time":0.8,"x":78.27,"y":97.55}],"scale":[{"x":0.674}]},"r_finger_c":{"rotate":[{"angle":-22.53},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-31.17},{"time":0.4,"angle":-115.08},{"time":0.7,"angle":-125.53},{"time":0.8,"angle":-22.53}],"translate":[{"x":6.64,"y":106.41},{"time":0.2,"x":73.32,"y":164.13},{"time":0.3,"x":57.46,"y":148.57},{"time":0.4,"x":63.53,"y":172.35},{"time":0.7,"x":43.59,"y":126.34},{"time":0.8,"x":6.64,"y":106.41}],"scale":[{"x":0.674}]},"r_finger_d":{"rotate":[{"angle":1.61},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-6.04},{"time":0.4,"angle":-87.39},{"time":0.7,"angle":-118.41},{"time":0.8,"angle":1.61}],"translate":[{"x":-11.55,"y":135.14},{"time":0.2,"x":55.13,"y":192.85},{"time":0.3,"x":39.27,"y":177.3},{"time":0.4,"x":-13.43,"y":192.22},{"time":0.7,"x":25.4,"y":155.06},{"time":0.8,"x":-11.55,"y":135.14}],"scale":[{"x":0.674}]},"r_finger_a":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72}],"translate":[{"x":131.03,"y":-25.92}],"scale":[{"x":0.356,"y":0.528}]},"r_upparm2":{"rotate":[{"angle":4}],"translate":[{},{"time":0.1,"x":-23.06,"y":-56.12},{"time":0.2,"x":18.62,"y":-75.54},{"time":0.3,"x":38.71,"y":-22.49},{"time":0.4,"x":39.74,"y":16.28},{"time":0.5,"x":47.56,"y":21.53},{"time":0.6,"x":15.76,"y":-82.19},{"time":0.7,"x":53.32,"y":-22.94},{"time":0.8}],"scale":[{"x":0.874,"y":0.874}]},"l_finger_c":{"rotate":[{"angle":67.75},{"time":0.2,"angle":46.4},{"time":0.4,"angle":29.53},{"time":0.5,"angle":73.3,"curve":"stepped"},{"time":0.7,"angle":73.3},{"time":0.8,"angle":67.75}]},"l_finger_b":{"rotate":[{"angle":12.29},{"time":0.2,"angle":-9.05},{"time":0.4,"angle":-25.92},{"time":0.5,"angle":17.85,"curve":"stepped"},{"time":0.7,"angle":17.85},{"time":0.8,"angle":12.29}]},"l_finger_a":{"rotate":[{"angle":-21},{"time":0.2,"angle":-42.35},{"time":0.4,"angle":-59.21},{"time":0.5,"angle":-15.44,"curve":"stepped"},{"time":0.7,"angle":-15.44},{"time":0.8,"angle":-21}]},"l_finger_d":{"rotate":[{"angle":104.78},{"time":0.2,"angle":83.43},{"time":0.4,"angle":66.56},{"time":0.5,"angle":110.34,"curve":"stepped"},{"time":0.7,"angle":110.34},{"time":0.8,"angle":104.78}]},"l_finger_b2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l_finger_c2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l_finger_d2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l_finger_a2":{"rotate":[{"angle":19.49},{"time":0.2,"angle":-1.85},{"time":0.4,"angle":10.22},{"time":0.5,"angle":56.06},{"time":0.7,"angle":44.53},{"time":0.8,"angle":19.49}]},"l_ik2":{"translate":[{"x":91.54,"y":85.04},{"time":0.1,"x":57.37,"y":79.54},{"time":0.2,"x":46.58,"y":84.16},{"time":0.3,"x":43.88,"y":-108.48},{"time":0.4,"x":50.02,"y":-49.47},{"time":0.5,"x":61.7,"y":4.19},{"time":0.6,"x":69.69,"y":-9.68},{"time":0.7,"x":87.16,"y":32.39},{"time":0.8,"x":91.54,"y":85.04}]},"r_ik":{"rotate":[{"angle":102.66},{"time":0.1,"angle":27.72},{"time":0.2,"angle":-23.72},{"time":0.3,"angle":-35},{"time":0.4,"angle":-34.26},{"time":0.5},{"time":0.6,"angle":71.42},{"time":0.7,"angle":72.92},{"time":0.8,"angle":102.66}],"translate":[{"x":275.23,"y":-9.7},{"time":0.1,"x":9.93,"y":99.3},{"time":0.2,"x":-62.42,"y":126.65},{"time":0.3,"x":101.76,"y":271.14},{"time":0.4,"x":262.35,"y":318.34},{"time":0.5,"x":364.24,"y":281.87},{"time":0.6,"x":380.54,"y":150.47},{"time":0.7,"x":448.94,"y":120.68},{"time":0.8,"x":275.23,"y":-9.7}],"scale":[{"y":-1}]},"l_leg":{"rotate":[{"angle":67.12}]},"r_leg":{"rotate":[{"angle":125.66}],"scale":[{"x":0.787,"y":-1}]},"r_ik2":{"translate":[{"x":128.11,"y":-106.46},{"time":0.1,"x":78.5,"y":-78.71},{"time":0.2,"x":-2.33,"y":39.33},{"time":0.3,"x":87.53,"y":45.77},{"time":0.4,"x":81.77,"y":1.21},{"time":0.5,"x":108.09,"y":16.09},{"time":0.6,"x":105.52,"y":-61.86},{"time":0.7,"x":117.78,"y":-18.96},{"time":0.8,"x":128.11,"y":-106.46}]},"r_upparm3":{"rotate":[{"angle":-27.65},{"time":0.1,"angle":-53.5},{"time":0.2,"angle":-105.96},{"time":0.3,"angle":-138.28},{"time":0.4,"angle":-125.37},{"time":0.5,"angle":-109.13},{"time":0.6,"angle":-88.34},{"time":0.7,"angle":-34.45},{"time":0.8,"angle":-27.65}]},"r_hand":{"translate":[{"x":-108.92,"y":-86.21},{"time":0.1,"x":-231.8,"y":-34.01},{"time":0.2,"x":-257.1,"y":-45.29},{"time":0.3,"x":-225.91,"y":-67.47},{"time":0.4,"x":-184.87,"y":-44.92},{"time":0.5,"x":-188.82,"y":-80.85},{"time":0.6,"x":-168.25,"y":-121.48},{"time":0.7,"x":-163.45,"y":-119.28},{"time":0.8,"x":-108.92,"y":-86.21}]},"r_arm":{"rotate":[{"angle":-11.76}]},"l_upparm2":{"rotate":[{"angle":-76.23}],"translate":[{"x":-56.13,"y":20.55},{"time":0.1,"x":-86.33,"y":42.77},{"time":0.2,"curve":"stepped"},{"time":0.3},{"time":0.4,"x":-97.89,"y":54.46},{"time":0.5},{"time":0.6,"x":-50.26,"y":59.34},{"time":0.7,"x":-44.26,"y":70.92},{"time":0.8,"x":-56.13,"y":20.55}]},"shadow":{"translate":[{"x":195.38},{"time":0.0667,"x":178.18},{"time":0.4667,"x":274.91},{"time":0.7667,"x":203.98},{"time":0.8,"x":195.38}],"scale":[{"y":1.081},{"time":0.0667},{"time":0.4667,"y":1.458},{"time":0.7667,"y":1.122},{"time":0.8,"y":1.081}]},"r_finger_a2":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72}],"translate":[{"x":131.03,"y":-25.92}],"scale":[{"x":0.356,"y":0.528}]},"r_finger_b2":{"rotate":[{"angle":-72.05},{"time":0.3,"angle":-7.32},{"time":0.4,"angle":-56.97},{"time":0.5,"angle":-139.63},{"time":0.8,"angle":-72.05}],"translate":[{"x":171.78,"y":113.86},{"time":0.3,"x":144.96,"y":155.26},{"time":0.4,"x":129.1,"y":139.7},{"time":0.5,"x":188.45,"y":155.72},{"time":0.8,"x":171.78,"y":113.86}],"scale":[{"x":0.674}]},"r_finger_c2":{"rotate":[{"angle":-62.67},{"time":0.3,"angle":2.17},{"time":0.4,"angle":-47.48},{"time":0.5,"angle":-133.75},{"time":0.8,"angle":-62.67}],"translate":[{"x":43.59,"y":126.34},{"time":0.3,"x":73.32,"y":164.13},{"time":0.4,"x":57.46,"y":148.57},{"time":0.5,"x":63.53,"y":172.35},{"time":0.8,"x":43.59,"y":126.34}],"scale":[{"x":0.674}]},"r_finger_d2":{"rotate":[{"angle":-55.55},{"time":0.3,"angle":27.3},{"time":0.4,"angle":-22.35},{"time":0.5,"angle":-106.07},{"time":0.8,"angle":-55.55}],"translate":[{"x":25.4,"y":155.06},{"time":0.3,"x":55.13,"y":192.85},{"time":0.4,"x":39.27,"y":177.3},{"time":0.5,"x":-13.43,"y":192.22},{"time":0.8,"x":25.4,"y":155.06}],"scale":[{"x":0.674}]},"l_hand2":{"rotate":[{"angle":-5.46},{"time":0.1,"angle":19.32},{"time":0.2,"angle":21.77},{"time":0.3,"angle":22.05},{"time":0.4,"angle":-91.8},{"time":0.5,"angle":-68.35},{"time":0.6,"angle":-55.42},{"time":0.7,"angle":-53.84},{"time":0.8,"angle":-5.46}],"translate":[{"x":-23.89,"y":-2.05},{"time":0.1,"x":-28.71,"y":12.87},{"time":0.2,"x":-41.75,"y":-1.02},{"time":0.3,"x":-65.66,"y":-15.55},{"time":0.4,"x":98.13,"y":100.45},{"time":0.5,"x":44.43,"y":127.78},{"time":0.6,"x":43.38,"y":135.2},{"time":0.7,"x":18.48,"y":87.3},{"time":0.8,"x":-23.89,"y":-2.05}],"scale":[{"x":0.578,"y":-0.613}]},"l_hand":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":15.72,"curve":0.25,"c3":0.75},{"time":0.4,"angle":42.03,"curve":0.25,"c3":0.75},{"time":0.8,"angle":15.72}],"translate":[{"x":-130.42,"y":78.94}],"scale":[{"x":0.677}]},"tail2":{"rotate":[{"angle":7.09,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":14,"curve":0.25,"c3":0.75},{"time":0.5,"angle":-23.49,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":7.09}]},"tail3":{"rotate":[{"angle":21.47,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":50.3,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-7.35,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":21.47}]},"tail4":{"rotate":[{"angle":11.12,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":60.3,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.4,"angle":49.18,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":11.12}]},"tail5":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":13.76,"curve":0.25,"c3":0.75},{"time":0.8}]},"tail6":{"rotate":[{"angle":-24.36,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-17.3,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.4,"angle":-48.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.5,"angle":-55.58,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":-24.36}]},"skirt_f":{"rotate":[{"angle":16.01},{"time":0.1,"angle":37.11},{"time":0.4,"angle":72.86},{"time":0.5,"angle":79.35},{"time":0.8,"angle":16.01}],"scale":[{"x":0.554}]},"skirt_f2":{"rotate":[{"angle":8.67},{"time":0.2,"angle":26.26},{"time":0.6,"angle":-8.92},{"time":0.8,"angle":8.67}]},"skirt_f3":{"rotate":[{"angle":-8.92},{"time":0.4,"angle":26.26},{"time":0.8,"angle":-8.92}]},"r_leg5":{"rotate":[{"angle":-21.75},{"time":0.3},{"time":0.7,"angle":-26.67},{"time":0.8,"angle":-21.75}]},"l_leg5":{"rotate":[{"angle":7.51},{"time":0.1},{"time":0.5,"angle":40.71},{"time":0.8,"angle":7.51}]},"hair_t":{"rotate":[{"angle":4.07,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":17.13,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-8.99,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":4.07}]},"hair_t2":{"rotate":[{"angle":-2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":8.12,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":-2.92}]},"hair_t3":{"rotate":[{"angle":0.21,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-23.63,"curve":0.25,"c3":0.75},{"time":0.6,"angle":24.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":0.21}]},"hair_t4":{"rotate":[{"angle":15.32,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-41.21,"curve":0.25,"c3":0.75},{"time":0.7,"angle":28.11,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":15.32}]},"hair_t6":{"rotate":[{"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.4,"angle":26.71,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-5.42}]},"hair_t7":{"rotate":[{"angle":0.51,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":0.51}]},"hair_t8":{"rotate":[{"angle":10.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.6,"angle":26.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":10.65}]},"hair_t9":{"rotate":[{"angle":20.79,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.7,"angle":26.71,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":20.79}]},"hair_t5":{"rotate":[{"angle":30.87,"curve":0.25,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.87}]},"r_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8}]},"r_ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3}]},"l_ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8}]},"r_beard":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38}]},"r_beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88}]},"r_beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72}]},"l_beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72}]},"l_bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88}]},"l_bear":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"r_leg3":{"rotate":[{"angle":-24.54}]},"r_leg2":{"rotate":[{"angle":55.93}]},"l_leg3":{"rotate":[{"angle":-46.18}]},"l_leg2":{"rotate":[{"angle":-42.4}]},"l_armour":{"rotate":[{"angle":-39.8}]},"bodyroot":{"translate":[{"x":-126.34}]},"tailstop":{"rotate":[{"angle":-30.29,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-47.74,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-12.84,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":-30.29}],"translate":[{"x":-181.44,"y":-83.48,"curve":0.25,"c3":0.75},{"time":0.4,"x":-107.24,"y":230.63,"curve":0.25,"c3":0.75},{"time":0.8,"x":-181.44,"y":-83.48}],"scale":[{"x":0.677,"curve":0.25,"c3":0.75},{"time":0.4,"x":0.716,"y":1.223,"curve":0.25,"c3":0.75},{"time":0.8,"x":0.677}]}},"ik":{"r_ik2":[{"softness":50,"bendPositive":false}]},"transform":{"tailstop":[{}]},"deform":{"default":{"body":{"body":[{"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,23.4961,-62.50654,62.42265,-22.3002,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,49.89716,22.95819,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.74295,37.16302,155.17085,-24.09232,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-3.7588,-102.26871,75.48494,-69.10156,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321]}]},"l_hand2":{"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}],"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r_arm":{"r_arm":[{"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043]}]},"r_armour_u":{"r_armour_u":[{"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]},{"time":0.4,"offset":4,"vertices":[163.9654,-45.00104,177.28926,99.94327,181.48798,-69.53613,202.98242,108.74658,140.53593,-68.87366,203.46579,65.00528,76.7599,-81.34448,151.37636,9.09085]},{"time":0.8,"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]}]},"r_hand":{"r_hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r_upparm":{"r_upparm":[{"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":0.1,"vertices":[-28.71144,-44.1958,56.25366,21.75468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88.93488,43.86108,51.64029,65.98203,0.65607,47.6413,-54.5849,17.91281,-131.43018,-29.84882]},{"time":0.2,"vertices":[-70.29115,-121.59358,129.93558,-53.69101,0,0,0,0,0,0,0,0,0,0,0,0,60.33824,12.40262,1.57361,70.47795,138.48999,146.07806,67.43813,181.56848,-45.18221,149.7756,-149.39273,46.96301,-219.99423,-105.85606,-43.01499,-68.8707,65.8432,-65.57346,-24.77599,-39.39505,37.61963,-37.69945]},{"time":0.3,"vertices":[-142.63615,-149.74637,47.56436,-137.68623,0,0,0,0,0,0,0,0,0,0,0,0,50.28187,10.33552,1.31134,58.73162,40.17482,138.09778,-59.78693,144.63666,-163.83813,74.89461,-232.30444,-49.23798,-259.16425,-211.93402,-35.84583,-57.39225,54.86933,-54.64455,-20.64665,-32.82921,31.34969,-31.41621,12.45225,-6.3985,16.0213,-0.0816]},{"time":0.4,"vertices":[-114.10892,-119.7971,38.05149,-110.14899,0,0,0,0,0,0,0,0,0,0,0,0,40.22549,8.26841,1.04907,46.9853,17.968,82.77934,-63.6477,81.75819,-145.03168,21.48185,-197.31894,-77.27264,-203.24228,-209.83081,-28.67666,-45.9138,43.89547,-43.71564,-16.51732,-26.26337,25.07975,-25.13297,9.9618,-5.1188,12.81704,-0.06528]},{"time":0.5,"vertices":[-85.5817,-89.84782,28.53862,-82.61174,0,0,0,0,0,0,0,0,0,0,0,0,30.16912,6.20131,0.7868,35.23898,11.92402,64.56107,-49.2754,62.96702,-109.30013,16.21414,-146.1988,-59.89482,-150.68185,-159.84299,-21.5075,-34.43535,32.9216,-32.78673,-12.38799,-19.69753,18.80981,-18.84972,7.47135,-3.8391,9.61278,-0.04896]},{"time":0.6,"vertices":[-57.05446,-59.89854,19.02575,-55.07449,0,0,0,0,0,0,0,0,0,0,0,0,20.11275,4.13421,0.52454,23.49265,85.12775,89.96481,24.06255,114.93831,-62.65114,98.66886,-151.15407,45.04043,-190.00272,-40.19608,-14.33833,-22.9569,21.94773,-21.85782,-8.25866,-13.13168,12.53988,-12.56648,4.9809,-2.5594,6.40852,-0.03264]},{"time":0.7,"vertices":[-28.52724,-29.94928,9.51288,-27.53725,0,0,0,0,0,0,0,0,0,0,0,0,10.05638,2.0671,0.26227,11.74633,97.34462,37.31192,50.5202,69.83792,-27.32924,70.25962,-114.90354,35.7408,-166.87126,-25.32079,-7.16917,-11.47845,10.97387,-10.92891,-4.12933,-6.56584,6.26994,-6.28324,2.49045,-1.2797,3.20426,-0.01632]},{"time":0.8,"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]}]},"skirt_f":{"skirt_f":[{"vertices":[35.81818,-3.6875,39.17149,-3.98846,2.36737,-0.86804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28.52529,-22.64508,24.78587,-26.6861,28.62631,-22.51886,67.57469,-48.15497,59.54384,-57.79132,83.82215,-53.5672,74.78942,-65.59021,-43.89932,46.33734,-18.26237,7.9278,0,0,0,0,0,0,11.983,-6.11731,-13.72738,3.23785,-13.0817,5.27094,25.99117,-19.65289,22.73274,-23.34479,0,0,0,0,0,0,0,0,-0.11163,0.02496,-0.10563,0.04224,27.33977,-2.78223,9.39142,13.24054,0,0,0,0,0,0,0,0,0,0,4.02523,-3.20117,3.49873,-3.76947,2.99234,-0.21301,64.49009,-39.26947,57.83382,-48.54248]},{"time":0.1,"vertices":[29.77103,5.39417,30.0675,-3.43262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74.49672,-23.86407,63.89751,-45.12604,82.84251,-46.12787,65.17497,-68.86804,-3.84917,2.3681,-24.82707,-23.53223,0,0,0,0,0,0,-1.31363,0.83984,-8.37158,5.35114,-6.37955,7.61755,21.60481,-10.06567,17.58562,-16.08618,0,0,0,0,0,0,0,0,0,0,0,0,18.72389,-2.96655,19.30846,1.07959,-3.83809,2.36029,-3.84302,2.35248,0,0,0,0,0,0,-6.52203,1.63745,-5.73038,3.5202,2.70682,-0.42847,72.03828,-37.46112,57.46828,-57.35541]},{"time":0.2,"vertices":[-10.04969,2.73807,11.70756,13.7414,-18.09149,2.26469,-19.20455,5.93506,-11.55451,-12.96573,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.3334,-0.83588,0.20313,-0.87646,24.80927,-22.33905,12.36267,-31.01239,7.54532,-32.52161,44.9576,-40.38214,22.44687,-56.10919,47.03943,-38.67505,25.06897,-55.50098,-6.95396,22.94112,-36.46767,2.33705,0,0,0,0,0,0,13.88802,-10.00909,0,0,0,0,18.66487,-16.08008,9.62213,-22.68195,0,0,0,0,0,0,0,0,0,0,0,0,21.18966,-3.96492,17.27429,17.16789,0,0,0,0,0,0,0,0,0,0,0.59949,-0.53894,0.29929,-0.74969,10.05263,-0.3857,43.32411,-36.52094,22.6911,-51.92395]},{"time":0.3,"vertices":[32.96143,42.9007,36.27815,35.07705,-6.40857,21.45368,-38.4091,11.87012,-23.10901,-25.93146,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13.66522,-11.19592,9.67724,-14.77771,4.79333,-17.00208,42.37201,-35.92627,29.63678,-46.98547,60.88477,-51.64868,42.57747,-67.53815,17.2459,34.70853,-0.27335,27.82636,-62.52094,-35.15393,-70.1869,-14.76245,-71.38336,6.9856,-65.36993,-19.04333,-147.13306,-16.39813,-145.26855,28.52521,-13.59222,-27.56677,-21.23542,-22.20966,-17.08845,-7.50128,-18.55252,-2.02631,-2.00135,-0.87878,-2.17343,-0.23834,-138.15216,-23.08295,-138.70569,19.45636,60.18911,5.80254,57.08116,27.12878,-18.29591,-8.03143,-19.86368,-2.16962,-103.66052,-14.96423,-103.36949,16.84503,-93.54749,47.0957,-37.90393,-26.94879,-44.24208,-14.32513,25.86692,0.85528,29.33148,-46.22931,14.10792,-52.89557]},{"time":0.4,"vertices":[85.03808,92.0652,60.84875,56.4127,5.27435,40.64267,-60.38025,15.18234,-37.98126,-42.51804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24.50174,-6.88995,23.18378,-10.50537,39.7272,-11.17102,37.58984,-17.03296,169.01555,100.40013,102.75883,100.44009,0,0,0,0,0,0,-148.26126,9.08026,-179.54529,25.46252,-173.65207,52.24176,-72.85404,16.16473,-69.58151,26.96375,0,0,0,0,0,0,0,0,-140.4855,11.33417,-137.16751,32.38611,117.11499,32.16437,145.49597,70.59102,0,0,0,0,-105.47204,9.21844,-102.8735,25.01575,-81.18507,67.95551,-19.56075,0.50739,-19.25989,3.45074,77.78021,3.76645,-73.41949,41.85291,-66.26471,52.44482]},{"time":0.5,"vertices":[98.97076,122.33449,71.14431,75.21844,6.45155,34.72729,-43.21024,13.35388,-25.99763,-29.17289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2.90942,-0.15887,2.90927,-0.15295,2.72858,-1.0188,6.39044,17.90192,6.34564,17.91156,7.17944,23.72333,7.12088,23.7345,197.09889,137.91492,126.121,172.19183,-94.86169,-6.23267,-94.84933,-6.43994,-92.40857,22.32886,-162.70685,28.44037,-224.23279,42.28723,-224.32718,41.79688,-91.37616,15.74432,-91.41458,15.54291,-31.54678,-2.14349,-30.73615,7.42535,-19.24805,-1.30878,-18.75409,4.53033,-183.96515,31.53412,-184.03857,31.13214,126.82291,44.03753,175.29443,89.89668,-50.26117,-3.41376,-48.96826,11.83069,-161.44751,24.45978,-161.5062,24.10504,-146.82385,71.47552,-54.05664,-0.23596,-54.05936,-0.35535,66.0486,18.34165,-56.79108,22.65503,-56.84888,22.526]},{"time":0.6,"vertices":[70.55106,80.51097,47.42953,50.14563,4.30104,23.15152,-28.80682,8.90259,-17.33176,-19.44859,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.93962,-0.10592,1.93951,-0.10197,1.81905,-0.6792,4.26029,11.93461,4.23043,11.94104,0.45826,21.08649,-0.34637,20.35883,167.47198,82.80629,96.28879,112.00243,-77.90076,-1.48645,-76.72931,-13.54907,-77.89581,-1.82489,-139.95065,20.5493,-160.04181,7.89392,-159.33154,-17.01953,-77.87032,11.26345,-78.92719,-0.50081,-14.89178,-2.35162,-15.07574,-0.07941,-11.81348,-1.86609,-11.96008,-0.06354,-135.43759,12.97308,-135.81561,-8.18652,94.24568,30.76365,134.06992,60.45961,-45.53186,-8.38275,-46.27618,-1.42163,-119.92587,2.16119,-118.81512,-16.46234,-119.9386,1.64038,-72.12686,-1.35559,-71.0481,-12.52502,48.064,15.98153,-61.56853,23.28792,-63.73883,15.60138]},{"time":0.7,"vertices":[25.43316,38.42686,23.71478,25.07282,2.15052,11.57577,-14.40342,4.4513,-8.66588,-9.7243,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.96981,-0.05296,0.96976,-0.05098,0.90953,-0.3396,9.2871,4.79262,9.27464,4.81153,13.23838,8.40812,12.84045,8.07267,49.86007,25.83252,21.53345,50.97621,-30.03882,-13.7832,-30.00909,-13.84845,-29.97913,-13.9137,-22.32333,-8.63523,-74.55142,-23.59625,-74.50015,-23.75842,-28.49702,-13.06856,-28.4693,-13.13053,0,0,0,0,-0.20227,-0.0929,-0.20227,-0.09393,-37.01572,-12.8902,-36.98819,-12.97009,29.6137,6.47106,44.05499,18.03541,-29.31354,-13.52759,-29.28421,-13.59149,-35.31091,-11.17645,-35.28683,-11.25311,-35.26239,-11.3299,-59.13733,-27.13458,-59.07843,-27.26324,8.63378,0.39027,4.58519,0.96617,4.58145,0.97473]},{"time":0.8,"vertices":[35.81818,-3.6875,39.17149,-3.98846,2.36737,-0.86804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28.52529,-22.64508,24.78587,-26.6861,28.62631,-22.51886,67.57469,-48.15497,59.54384,-57.79132,83.82215,-53.5672,74.78942,-65.59021,-43.89932,46.33734,-18.26237,7.9278,0,0,0,0,0,0,11.983,-6.11731,-13.72738,3.23785,-13.0817,5.27094,25.99117,-19.65289,22.73274,-23.34479,0,0,0,0,0,0,0,0,-0.11163,0.02496,-0.10563,0.04224,27.33977,-2.78223,9.39142,13.24054,0,0,0,0,0,0,0,0,0,0,4.02523,-3.20117,3.49873,-3.76947,2.99234,-0.21301,64.49009,-39.26947,57.83382,-48.54248]}]}}},"drawOrder":[{"offsets":[{"slot":"body","offset":7},{"slot":"r_leg","offset":6},{"slot":"l_hand2","offset":-35},{"slot":"r_finger_d2","offset":-37},{"slot":"r_finger_c2","offset":-38},{"slot":"r_finger_b2","offset":-39},{"slot":"r_finger_a2","offset":-40}]}]},"win":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00002"},{"time":0.1,"name":"eyefire/eyefire_00003"},{"time":0.1333,"name":"eyefire/eyefire_00004"},{"time":0.1667,"name":"eyefire/eyefire_00005"},{"time":0.2,"name":"eyefire/eyefire_00006"},{"time":0.2333,"name":"eyefire/eyefire_00007"},{"time":0.2667,"name":"eyefire/eyefire_00009"},{"time":0.3,"name":"eyefire/eyefire_00010"},{"time":0.3333,"name":"eyefire/eyefire_00011"},{"time":0.3667,"name":"eyefire/eyefire_00012"},{"time":0.4,"name":"eyefire/eyefire_00013"},{"time":0.4333,"name":"eyefire/eyefire_00014"},{"time":0.4667,"name":"eyefire/eyefire_00015"},{"time":0.5,"name":"eyefire/eyefire_00016"},{"time":0.5333,"name":"eyefire/eyefire_00017"},{"time":0.5667,"name":"eyefire/eyefire_00018"},{"time":0.6,"name":"eyefire/eyefire_00019"},{"time":0.6333,"name":"eyefire/eyefire_00020"},{"time":0.6667,"name":"eyefire/eyefire_00021"},{"time":0.7,"name":"eyefire/eyefire_00022"},{"time":0.7333,"name":"eyefire/eyefire_00023"},{"time":0.7667,"name":"eyefire/eyefire_00024"},{"time":0.8,"name":"eyefire/eyefire_00025"},{"time":0.8333,"name":"eyefire/eyefire_00027"},{"time":0.8667,"name":"eyefire/eyefire_00028"},{"time":0.9,"name":"eyefire/eyefire_00029"},{"time":0.9333,"name":"eyefire/eyefire_00030"},{"time":0.9667,"name":"eyefire/eyefire_00031"},{"time":1,"name":"eyefire/eyefire_00032"},{"time":1.0333,"name":"eyefire/eyefire_00033"},{"time":1.0667,"name":"eyefire/eyefire_00034"},{"time":1.1,"name":"eyefire/eyefire_00035"},{"time":1.1333,"name":"eyefire/eyefire_00036"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00001"},{"time":1.2333,"name":"eyefire/eyefire_00002"},{"time":1.2667,"name":"eyefire/eyefire_00003"},{"time":1.3,"name":"eyefire/eyefire_00004"},{"time":1.3333,"name":"eyefire/eyefire_00005"},{"time":1.3667,"name":"eyefire/eyefire_00006"},{"time":1.4,"name":"eyefire/eyefire_00008"},{"time":1.4333,"name":"eyefire/eyefire_00009"},{"time":1.4667,"name":"eyefire/eyefire_00010"},{"time":1.5,"name":"eyefire/eyefire_00011"},{"time":1.5333,"name":"eyefire/eyefire_00012"},{"time":1.5667,"name":"eyefire/eyefire_00013"},{"time":1.6,"name":"eyefire/eyefire_00014"},{"time":1.6333,"name":"eyefire/eyefire_00015"},{"time":1.6667,"name":"eyefire/eyefire_00016"},{"time":1.7,"name":"eyefire/eyefire_00017"},{"time":1.7333,"name":"eyefire/eyefire_00018"},{"time":1.7667,"name":"eyefire/eyefire_00019"},{"time":1.8,"name":"eyefire/eyefire_00020"},{"time":1.8333,"name":"eyefire/eyefire_00021"},{"time":1.8667,"name":"eyefire/eyefire_00022"},{"time":1.9,"name":"eyefire/eyefire_00023"},{"time":1.9333,"name":"eyefire/eyefire_00025"},{"time":1.9667,"name":"eyefire/eyefire_00026"},{"time":2,"name":"eyefire/eyefire_00027"},{"time":2.0333,"name":"eyefire/eyefire_00028"},{"time":2.0667,"name":"eyefire/eyefire_00029"},{"time":2.1,"name":"eyefire/eyefire_00030"},{"time":2.1333,"name":"eyefire/eyefire_00031"},{"time":2.1667,"name":"eyefire/eyefire_00032"},{"time":2.2,"name":"eyefire/eyefire_00033"},{"time":2.2333,"name":"eyefire/eyefire_00034"},{"time":2.2667,"name":"eyefire/eyefire_00035"},{"time":2.3,"name":"eyefire/eyefire_00036"},{"time":2.3333,"name":"eyefire/eyefire_00037"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"l_hand2":{"scale":[{"x":0,"y":0}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"angle":-9.73,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-30.86,"curve":0.345,"c2":0.38,"c3":0.68,"c4":0.72},{"time":0.6333,"angle":5.05,"curve":0.374,"c2":0.62,"c3":0.715},{"time":1.0333,"angle":19.96},{"time":2.3333,"angle":-11.07},{"time":2.7,"angle":-43.99},{"time":3.0667,"angle":-6.52,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":3.3333,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":51.72,"y":-127.82,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"x":224.95,"y":-231.56,"curve":0.332,"c2":0.33,"c3":0.671,"c4":0.68},{"time":0.6333,"x":184.79,"y":-158.2,"curve":0.382,"c2":0.55,"c3":0.741},{"time":1.0333,"x":0.45,"y":-6.94},{"time":2.3333,"x":-250.97,"y":25.77},{"time":2.7,"x":-119.46,"y":-47.4},{"time":3.0667,"x":81.17,"y":-163.11,"curve":0.298,"c3":0.635,"c4":0.36},{"time":3.3333}]},"r_upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.1333,"angle":2.59,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"angle":1.66,"curve":0.332,"c2":0.33,"c3":0.671,"c4":0.68},{"time":0.6333,"angle":-2.35,"curve":0.382,"c2":0.55,"c3":0.741},{"time":1.0333,"angle":-40.6},{"time":2.3333,"angle":-77.76},{"time":2.7,"angle":-33.43},{"time":3.0667,"angle":4.36,"curve":0.298,"c3":0.635,"c4":0.36},{"time":3.3333,"angle":-6.74}],"translate":[{"curve":0.287,"c3":0.627,"c4":0.38},{"time":0.4333,"x":5.01,"y":-41.99,"curve":0.321,"c2":0.29,"c3":0.656,"c4":0.62},{"time":0.6333,"x":-9.95,"y":-24.83,"curve":0.32,"c2":0.29,"c3":0.658,"c4":0.64},{"time":1.0333,"x":3.71,"y":-101.32,"curve":0.369,"c2":0.47,"c3":0.753},{"time":2.3333,"x":-81.96,"y":-113.61},{"time":3.0667}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"angle":53.47,"curve":0.34,"c2":0.35,"c3":0.676,"c4":0.69},{"time":0.4,"angle":41.4,"curve":0.382,"c2":0.58,"c3":0.732},{"time":1.0333,"angle":44.02},{"time":2.3333,"angle":83.52},{"time":3.0667,"angle":14.41}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.0333,"x":24.67,"y":-27.07,"curve":"stepped"},{"time":2.3333,"x":24.67,"y":-27.07},{"time":3.0667}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":-0.87,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-12.03,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1.0333,"angle":-22.37},{"time":2.3333,"angle":-48.57},{"time":3.0667,"angle":-9.49}],"translate":[{"curve":0.287,"c3":0.627,"c4":0.38},{"time":0.4333,"x":-57.53,"y":51.05,"curve":0.316,"c2":0.27,"c3":0.757},{"time":2.3333,"x":8.72,"y":10.39},{"time":3.0667}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":-3.02,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-6.1,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1.0333,"angle":-68.02},{"time":2.3333,"angle":-92.77},{"time":3.0667,"angle":-8.92}],"translate":[{"curve":0.287,"c3":0.627,"c4":0.38},{"time":0.4333,"x":14.84,"y":94.75,"curve":0.306,"c2":0.24,"c3":0.649,"c4":0.61},{"time":1.0333,"x":30.23,"y":34.59,"curve":0.369,"c2":0.47,"c3":0.753},{"time":2.3333,"x":60.48,"y":5.29},{"time":3.0667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1333,"angle":-11.3,"curve":0.345,"c2":0.38,"c3":0.679,"c4":0.72},{"time":0.4333,"angle":4.57,"curve":0.368,"c2":0.63,"c3":0.705},{"time":1.0333,"angle":41.65},{"time":2.3333,"angle":53.63},{"time":3.0667,"angle":31.13,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":3.3333,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.0333,"x":79.8,"y":3.04,"curve":"stepped"},{"time":2.3333,"x":79.8,"y":3.04},{"time":3.0667,"x":-7.85,"y":2.92}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.246,"c3":0.719,"c4":0.87},{"time":0.4,"angle":-4.29,"curve":0.355,"c2":0.65,"c3":0.689},{"time":0.4333,"angle":14.93,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.5,"angle":-17.7,"curve":0.338,"c2":0.35,"c3":0.677,"c4":0.7},{"time":0.7,"angle":47.15,"curve":0.382,"c2":0.58,"c3":0.734},{"time":1.0333,"angle":93.16},{"time":2.3333,"angle":121.01},{"time":3.0667,"angle":75.19,"curve":0.317,"c3":0.651,"c4":0.35},{"time":3.1,"angle":-0.62,"curve":0.274,"c2":0.1,"c3":0.63,"c4":0.52},{"time":3.3333,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":-137.1,"y":88.66,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"x":-128.25,"y":2.45,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.5,"x":22.97,"y":-65.1,"curve":0.342,"c2":0.37,"c3":0.676,"c4":0.7},{"time":0.6333,"x":245.04,"y":69.41,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.7,"x":342.17,"y":219.97,"curve":0.37,"c2":0.63,"c3":0.709},{"time":1.0333,"x":367.31,"y":389.36},{"time":2.3333,"x":241.87,"y":504.5},{"time":3.0667,"x":196.33,"y":-13.7,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":3.3333,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":0.95,"y":0.46,"curve":0.34,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.4333,"y":-1.069,"curve":"stepped"},{"time":1.0333,"y":-1.069},{"time":2.3333,"y":-0.581},{"time":3.0667,"y":-1.069},{"time":3.1,"x":0.95,"y":0.95}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"angle":-4.04,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-20.74,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1.0333,"angle":28.13},{"time":2.3333,"angle":51.94},{"time":3.0667,"angle":-4.31}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"angle":21.72,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"angle":14.59,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"angle":-23.03},{"time":2.3333,"angle":-38.61},{"time":3.0667}],"translate":[{"time":0.1333,"curve":0.296,"c2":0.21,"c3":0.648,"c4":0.6},{"time":0.4333,"x":-28.84,"y":103.01},{"time":1.0333,"x":-62.58,"y":33.68},{"time":2.3333,"x":-76.87,"y":3.58},{"time":3.0667}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.4333,"x":-13.16,"y":17.34,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"x":-83.56,"y":-14.11},{"time":2.3333,"x":-117.51,"y":6.9},{"time":3.0667}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"angle":-0.38},{"time":0.4333,"angle":-14.97},{"time":1.0333,"angle":-3.36},{"time":2.3333,"angle":6.3},{"time":3.0667,"angle":-17.69,"curve":0.25,"c3":0.75},{"time":3.3333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":3.97,"y":-59.43,"curve":0.307,"c2":0.25,"c3":0.651,"c4":0.62},{"time":0.4333,"x":71.54,"y":-90.8,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1.0333,"x":63.57,"y":67.54},{"time":2.3333,"x":55.62,"y":119.19},{"time":3.0667,"x":-8.66,"y":-38.97,"curve":0.284,"c3":0.625,"c4":0.38},{"time":3.3333}]},"l_leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":25.1},{"time":3.0667}]},"l_leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-30.32},{"time":3.0667}]},"r_leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":7.26},{"time":3.0667}]},"l_leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-2.67},{"time":3.0667}]},"r_leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-30.14},{"time":3.0667}]},"r_ik2":{"translate":[{"time":0.4333},{"time":1.0333,"x":-92.02,"y":14.21,"curve":"stepped"},{"time":2.3333,"x":-92.02,"y":14.21},{"time":3.0667}]},"r_leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":2.3333,"angle":13.63},{"time":3.0667}]},"r_finger_c2":{"rotate":[{"angle":-9.49}]},"l_armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":2.46},{"time":3.0667,"curve":0.25,"c3":0.75},{"time":3.3333,"angle":1.84}]},"l_finger_c2":{"rotate":[{"angle":16.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":63.06,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"angle":68.89,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.0333,"angle":31.22,"curve":0.381,"c2":0.59,"c3":0.729},{"time":2.3333,"angle":-15.84},{"time":3.0667,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"x":8.79,"y":4.59,"curve":0.381,"c2":0.54,"c3":0.743},{"time":2.3333,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"r_upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-0.29},{"time":3.0667,"curve":0.25,"c3":0.75},{"time":3.3333,"angle":12.65}],"translate":[{"time":2.3333},{"time":3.0667,"x":-94.88,"y":12.66,"curve":0.25,"c3":0.75},{"time":3.3333}]},"l_upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":50.9},{"time":3.0667,"curve":0.25,"c3":0.75},{"time":3.3333,"angle":-6.45}]},"r_finger_d2":{"rotate":[{"angle":7.12}]},"l_finger_a":{"rotate":[{"angle":-2.5,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":-15.93,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.4333,"angle":17.56,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":1.0333,"angle":-32.51,"curve":0.367,"c2":0.63,"c3":0.705},{"time":2.3333,"angle":-55.11},{"time":3.0667,"angle":-2.5}]},"l_finger_a2":{"rotate":[{"angle":5.32,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":43.19,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"angle":50.61,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.0333,"angle":15.96,"curve":0.381,"c2":0.59,"c3":0.729},{"time":2.3333,"angle":-27.06},{"time":3.0667,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"x":-5.22,"y":-2.81,"curve":0.381,"c2":0.54,"c3":0.743},{"time":2.3333,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"r_finger_a2":{"rotate":[{"angle":14.41}]},"l_finger_b2":{"rotate":[{"angle":16.78,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":63.3,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"angle":69.13,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.0333,"angle":31.46,"curve":0.381,"c2":0.59,"c3":0.729},{"time":2.3333,"angle":-15.6},{"time":3.0667,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"x":1.23,"y":-2.03,"curve":0.381,"c2":0.54,"c3":0.743},{"time":2.3333,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l_finger_c":{"rotate":[{"angle":-2.5,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":16.93,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.4333,"angle":43.53,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":1.0333,"angle":30.53,"curve":0.367,"c2":0.63,"c3":0.705},{"time":2.3333,"angle":-55.11},{"time":3.0667,"angle":-2.5}]},"r_finger_b2":{"rotate":[{"angle":-8.92}]},"l_finger_d":{"rotate":[{"angle":-2.5,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":16.93,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.4333,"angle":43.53,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":1.0333,"angle":51.75,"curve":0.367,"c2":0.63,"c3":0.705},{"time":2.3333,"angle":-55.11},{"time":3.0667,"angle":-2.5}]},"l_finger_d2":{"rotate":[{"angle":26.01,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":72.52,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"angle":78.35,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.0333,"angle":40.68,"curve":0.381,"c2":0.59,"c3":0.729},{"time":2.3333,"angle":-6.38},{"time":3.0667,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"x":11.04,"y":13.94,"curve":0.381,"c2":0.54,"c3":0.743},{"time":2.3333,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r_arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":23.59},{"time":3.0667,"curve":0.25,"c3":0.75},{"time":3.3333,"angle":-7.98}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":16.48,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.4333,"angle":-4.85,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.0333,"angle":27.03,"curve":0.375,"c2":0.62,"c3":0.716},{"time":2.3333,"angle":53.33},{"time":3.0667,"angle":7.12}],"translate":[{"curve":0.287,"c3":0.627,"c4":0.38},{"time":0.4333,"x":-19.99,"y":14.24,"curve":0.316,"c2":0.27,"c3":0.757},{"time":2.3333}]},"r_ear":{"rotate":[{"time":0.0667,"curve":0.332,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":9.26,"curve":0.331,"c2":0.21,"c3":0.665,"c4":0.55},{"time":0.4333,"angle":27.19,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":41.03,"curve":0.331,"c2":0.26,"c3":0.664,"c4":0.6},{"time":1.0333,"angle":1.48,"curve":0.331,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":-37.47,"curve":0.326,"c2":0.24,"c3":0.66,"c4":0.58},{"time":2.3333,"angle":-13.02},{"time":3.0667}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-17.45,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-9.68,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":37.92,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-2.28,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":21.36,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":13.37,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.5333,"angle":-27.42,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-2.28},{"time":2.7333,"angle":22.55},{"time":3.0667,"angle":-15.23,"curve":0.375,"c2":0.5,"c3":0.75},{"time":3.3333,"angle":-2.28}]},"l_ear":{"rotate":[{"time":0.0667,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":9.26,"curve":0.332,"c2":0.21,"c3":0.666,"c4":0.54},{"time":0.4333,"angle":27.19,"curve":0.332,"c2":0.26,"c3":0.666,"c4":0.6},{"time":0.6667,"angle":41.03,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":1.48,"curve":0.332,"c2":0.3,"c3":0.666,"c4":0.63},{"time":1.3,"angle":-37.47,"curve":0.329,"c2":0.24,"c3":0.663,"c4":0.57},{"time":2.3333,"angle":-13.02},{"time":3.0667}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-11.9,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-4.12,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":43.47,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":3.27,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":26.91,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":18.93,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.5333,"angle":-21.87,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":3.27},{"time":2.7333,"angle":28.1},{"time":3.0667,"angle":-9.68,"curve":0.375,"c2":0.5,"c3":0.75},{"time":3.3333,"angle":3.27}]},"l_ik":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-14.25,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":127.95,"y":68.89,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":167.31,"curve":"stepped"},{"time":3.0667,"x":167.31},{"time":3.1667,"x":39.62,"y":56.29},{"time":3.3333}]},"l_finger_b":{"rotate":[{"angle":-2.5,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1333,"angle":16.93,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.4333,"angle":43.53,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":1.0333,"angle":8.58,"curve":0.367,"c2":0.63,"c3":0.705},{"time":2.3333,"angle":-55.11},{"time":3.0667,"angle":-2.5}]},"head2":{"scale":[{"time":0.6,"curve":0.32,"c2":0.29,"c3":0.66,"c4":0.65},{"time":1.0333,"x":1.035,"curve":0.375,"c2":0.5,"c3":0.75},{"time":3.0667}]},"r_upparm3":{"rotate":[{"time":0.1333},{"time":0.4333,"angle":-7.75},{"time":0.6333,"angle":-2.41},{"time":1.0333,"angle":25.14},{"time":2.3333,"angle":79.33},{"time":3.0667}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"headmouth":{"rotate":[{},{"time":0.2333,"angle":-11.46},{"time":0.6,"angle":-38.32},{"time":1.0333,"angle":-3.97},{"time":2.3333,"angle":-0.86},{"time":3.3333}],"translate":[{"time":0.2333},{"time":0.6,"x":-21.09,"y":14.18},{"time":1.0333,"x":-36.67,"y":19.76},{"time":3.3333}],"scale":[{"time":0.6},{"time":1.0333,"x":1.035},{"time":3.3333}]},"hair_t":{"rotate":[{"time":0.2,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":6.66,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":5.55,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-1.21,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":0.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":3.96,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":2.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-18.82,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-16.81,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":9.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":3.7,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":16.08,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":10.03,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":4.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-13.72,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":3.7,"curve":0.344,"c2":0.4,"c3":0.678,"c4":0.73},{"time":2.7,"angle":20.12,"curve":0.347,"c2":0.46,"c3":0.681,"c4":0.8},{"time":3.0667,"angle":18.79,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3.3333,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-1.02,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.2,"angle":7.89,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4333,"angle":10.25,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":28.73,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0333,"angle":16.91,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.3,"angle":-11.53,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":2.3333,"angle":5.88,"curve":0.346,"c2":0.39,"c3":0.681,"c4":0.73},{"time":2.7,"angle":22.3,"curve":0.351,"c2":0.45,"c3":0.686,"c4":0.79},{"time":3.0667,"angle":20.98,"curve":0.351,"c2":0.65,"c3":0.685},{"time":3.3333,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":"stepped"},{"time":0.0667,"angle":63.33,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":75.19,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":63.33,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":84.06,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-5.57,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":10.44,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":37.25,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":15.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-18.64,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":6.2,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":54.46,"curve":0.341,"c2":0.41,"c3":0.675,"c4":0.75},{"time":2.7333,"angle":44.94,"curve":0.341,"c2":0.46,"c3":0.674,"c4":0.79},{"time":3.0667,"angle":-19.18,"curve":0.34,"c2":0.66,"c3":0.673},{"time":3.3333,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":14.86,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":30.87,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":57.68,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":35.51,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":1.79,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":26.63,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":74.89,"curve":0.346,"c2":0.4,"c3":0.68,"c4":0.74},{"time":2.7333,"angle":66.05,"curve":0.346,"c2":0.45,"c3":0.68,"c4":0.79},{"time":3.0667,"angle":1.25,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3.3333,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":11.62,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":27.63,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":54.44,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":32.27,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-1.45,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":23.39,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":71.65,"curve":0.346,"c2":0.4,"c3":0.68,"c4":0.74},{"time":2.7333,"angle":62.81,"curve":0.346,"c2":0.45,"c3":0.68,"c4":0.79},{"time":3.0667,"angle":-1.99,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3.3333,"angle":23.39}],"translate":[{"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":47.25,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":63.26,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":90.07,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":67.9,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":34.18,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":59.01,"curve":0.328,"c2":0.24,"c3":0.661,"c4":0.58},{"time":2.3333,"angle":107.28,"curve":0.347,"c2":0.39,"c3":0.683,"c4":0.73},{"time":2.7333,"angle":99.59,"curve":0.353,"c2":0.44,"c3":0.688,"c4":0.78},{"time":3.0667,"angle":33.63,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":11.34,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.2,"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4333,"angle":-8.71,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":-15.11,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0333,"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.3,"angle":-11.17,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":2.3333,"angle":-90.8,"curve":0.363,"c2":0.48,"c3":0.701,"c4":0.84},{"time":3.0667,"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":18.29,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":9.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-1.77,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-8.17,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":9.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-4.23,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-33.96,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":9.54}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":12.42,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":3.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-7.64,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-14.04,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":3.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-10.1,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-13.04,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-8.8,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.2,"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4333,"angle":43.88,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":4.04,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0333,"angle":-12.1,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.3,"angle":6.67,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":2.3333,"angle":-22.1,"curve":0.363,"c2":0.48,"c3":0.701,"c4":0.84},{"time":3.0667,"angle":6.67}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":-23.71,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":-15.02,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":-7.19,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":13.69,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":49.86,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":30.25,"curve":0.328,"c2":0.24,"c3":0.661,"c4":0.58},{"time":2.3333,"angle":-26.11,"curve":0.364,"c2":0.47,"c3":0.706,"c4":0.84},{"time":3.0667,"angle":8.76}]},"r_ear_s":{"rotate":[{"angle":-5.67}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-4.58,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-39.59,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-2.84,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-0.15,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.8333,"angle":-27.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-64.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":25.33,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.6667,"angle":-30.41,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-55.32,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":1.76,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":12.87,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":18.34,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":-11.06,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":-57.06,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":-64.03,"curve":0.328,"c2":0.24,"c3":0.661,"c4":0.58},{"time":2.3333,"angle":-94.92,"curve":0.347,"c2":0.39,"c3":0.683,"c4":0.73},{"time":2.7333,"angle":-61.87,"curve":0.353,"c2":0.44,"c3":0.688,"c4":0.78},{"time":3.0667,"angle":-10.34,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333,"angle":8.77}],"scale":[{"x":0.88}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-12.52,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-17.39,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":15,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":12.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":18.61,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-12.71,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.5667,"angle":7.47,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.8,"angle":1.48,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-0.61,"curve":0.346,"c2":0.4,"c3":0.68,"c4":0.74},{"time":2.7333,"angle":-33.17,"curve":0.346,"c2":0.45,"c3":0.68,"c4":0.79},{"time":3.0667,"angle":15.08,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3.3333,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":11.95,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":-18.55,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":-18.19,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":40.46,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":52.24,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":-10,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.64},{"time":1.5667,"angle":-12.46,"curve":0.332,"c2":0.31,"c3":0.665,"c4":0.64},{"time":1.8,"angle":19.09,"curve":0.331,"c2":0.29,"c3":0.664,"c4":0.63},{"time":2.3333,"angle":-10,"curve":0.347,"c2":0.39,"c3":0.683,"c4":0.73},{"time":2.7333,"angle":-42.55,"curve":0.353,"c2":0.44,"c3":0.688,"c4":0.78},{"time":3.0667,"angle":-10,"curve":0.341,"c2":0.4,"c3":0.675,"c4":0.74},{"time":3.1667,"angle":16.67,"curve":0.348,"c2":0.66,"c3":0.682},{"time":3.3333,"angle":-10}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":-22.71,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":-11.82}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-9.88,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-23.48,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":24.67,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":-22.54,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":15.47}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":11.76,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":3.01,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":-8.3,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":-14.7,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":3.01,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":-10.76,"curve":0.328,"c2":0.24,"c3":0.661,"c4":0.58},{"time":2.3333,"angle":-13.7,"curve":0.364,"c2":0.47,"c3":0.706,"c4":0.84},{"time":3.0667,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-20.13,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-4.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":32.55,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-7.29,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-23.43,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-4.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-33.44,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-33.06,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.2,"angle":-24.37,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4333,"angle":-16.54,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":4.34,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0333,"angle":40.5,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.3,"angle":20.9,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":2.3333,"angle":-35.46,"curve":0.363,"c2":0.48,"c3":0.701,"c4":0.84},{"time":3.0667,"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":44.77,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":36.02,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":24.71,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":18.31,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":36.02,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":22.25,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":19.31,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":25.52,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.2,"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.4333,"angle":78.2,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":38.36,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0333,"angle":51.74,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.3,"angle":40.99,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":2.3333,"angle":12.21,"curve":0.363,"c2":0.48,"c3":0.701,"c4":0.84},{"time":3.0667,"angle":40.99}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":4.59,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":0.32,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":18.19,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":22.51,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":9.15,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":2.89,"curve":0.328,"c2":0.24,"c3":0.661,"c4":0.58},{"time":2.3333,"angle":9.15}],"scale":[{"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.2,"x":0.765,"curve":0.303,"c2":0.17,"c3":0.64,"c4":0.52},{"time":0.6667,"x":0.926,"curve":0.32,"c2":0.29,"c3":0.757},{"time":3.3333}],"shear":[{"y":-15.36,"curve":0.327,"c3":0.66,"c4":0.34},{"time":0.0667,"y":-17.38,"curve":0.322,"c2":0.17,"c3":0.655,"c4":0.51},{"time":0.2,"y":-11.33,"curve":0.317,"c2":0.22,"c3":0.651,"c4":0.56},{"time":0.4333,"y":-6.15,"curve":0.321,"c2":0.27,"c3":0.655,"c4":0.61},{"time":0.6667,"y":19.75,"curve":0.319,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.0333,"y":9.63,"curve":0.327,"c2":0.31,"c3":0.662,"c4":0.65},{"time":1.3,"y":-4.76,"curve":0.332,"c2":0.33,"c3":0.68,"c4":0.71},{"time":2.3333,"y":9.11,"curve":0.382,"c2":0.58,"c3":0.731},{"time":3.3333,"y":-15.36}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":27.19,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":33.9,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-26.8,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-14.92,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":9.83,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":13.99,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.6333,"angle":-7.81,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.9333,"angle":-6.3,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-11.07,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":35.19,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3.3333,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.0667,"angle":-36.95,"curve":0.333,"c2":0.17,"c3":0.666,"c4":0.5},{"time":0.2,"angle":53.74,"curve":0.332,"c2":0.21,"c3":0.665,"c4":0.54},{"time":0.4333,"angle":25.62,"curve":0.332,"c2":0.26,"c3":0.665,"c4":0.6},{"time":0.6667,"angle":-37.65,"curve":0.331,"c2":0.26,"c3":0.665,"c4":0.6},{"time":1.0333,"angle":-5.89,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.3,"angle":13.13,"curve":0.332,"c2":0.3,"c3":0.665,"c4":0.63},{"time":1.6333,"angle":16.84,"curve":0.332,"c2":0.31,"c3":0.665,"c4":0.64},{"time":1.9333,"angle":-14.42,"curve":0.331,"c2":0.3,"c3":0.665,"c4":0.64},{"time":2.3333,"angle":-5.04,"curve":0.364,"c2":0.47,"c3":0.706,"c4":0.84},{"time":3.0667,"angle":18.71,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":39.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":19.58,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-33.62,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.6667,"angle":-33.41,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.0333,"angle":10.54,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.3,"angle":27.82,"curve":0.352,"c2":0.41,"c3":0.69,"c4":0.76},{"time":2.3333,"angle":1.81,"curve":0.358,"c2":0.5,"c3":0.693,"c4":0.85},{"time":3.0667,"angle":7.98}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-38.05,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-26.74,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.2,"angle":-20.39,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":26.78,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.6667,"angle":-0.82,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-24.82,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.3,"angle":-2.84,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.3333,"angle":-9.62}],"translate":[{"curve":0.327,"c3":0.66,"c4":0.34},{"time":0.0667,"x":-15.31,"y":-28.85,"curve":0.327,"c2":0.22,"c3":0.661,"c4":0.56},{"time":0.1333,"x":0.27,"y":-5.73,"curve":0.267,"c2":0.07,"c3":0.752},{"time":3.3333}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.1333,"angle":-0.94,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.4333,"angle":-28.9,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.7667,"angle":-23.55,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.0333,"angle":-7.41,"curve":0.305,"c2":0.24,"c3":0.65,"c4":0.61},{"time":2.3333,"angle":-4.61,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":2.6667,"angle":-3.56,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667,"angle":-2.59,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-12.02,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.4333,"angle":31.84,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"angle":6.93,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":3.26,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.7,"angle":-16.24,"curve":0.34,"c2":0.37,"c3":0.674,"c4":0.7},{"time":2.3333,"angle":-20.33,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.6667,"angle":-5.53,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":3.0667,"angle":4.52}],"translate":[{"time":2.6667,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":3.0667,"x":-29.54,"y":15.36,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-39.69,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":15.06,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":19.09,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-1.39,"curve":0.337,"c2":0.34,"c3":0.671,"c4":0.68},{"time":1.7,"angle":-25.1,"curve":0.34,"c2":0.35,"c3":0.674,"c4":0.69},{"time":2.3333,"angle":-31.25,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.6667,"angle":28.93,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":3.0667,"angle":-1.85}],"translate":[{"time":0.7667,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.0333,"x":-47.16,"y":11.55,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":1.7,"x":-35.02,"y":-4.91,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":2.3333,"curve":"stepped"},{"time":2.6667,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667,"x":-7.86,"y":30.55,"curve":0.355,"c2":0.65,"c3":0.69},{"time":3.3333}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":20.68,"curve":0.327,"c2":0.31,"c3":0.661,"c4":0.65},{"time":0.4333,"angle":0.07,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7667,"angle":16.7,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":1.0333,"angle":-6.5,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":1.7,"angle":-1.03,"curve":0.335,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2.3333,"angle":-2.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.6667,"angle":-9.14,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":3.0667,"angle":-8.22}],"translate":[{"time":0.1333,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.4333,"x":16.25,"y":8.66,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.7667,"x":12.56,"y":25.25,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.0333,"x":35.13,"y":-2.75,"curve":0.305,"c2":0.24,"c3":0.65,"c4":0.61},{"time":2.3333,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":2.6667,"x":-30.72,"y":-65.95,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.333,"c3":0.666,"c4":0.33},{"time":0.1333,"angle":-32.28,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.4333,"angle":-68.99,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.7667,"angle":-5.77,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.0333,"angle":12.2,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":1.7,"angle":34.07,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":2.3333,"angle":30.36,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":2.6667,"angle":-18.57,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667,"angle":-11.95}],"translate":[{"time":0.4333,"curve":0.325,"c2":0.29,"c3":0.659,"c4":0.62},{"time":0.7667,"x":-33.43,"y":58.71,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":1.0333,"x":20.14,"y":56.86,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":1.7,"x":66.7,"y":19.3,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":2.3333,"x":-33.19,"y":15.58,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":2.6667,"x":-11.49,"y":-19.88,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-64.05,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.4333,"angle":-96.39,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"angle":-6.08,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.0333,"angle":-5.68,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":1.7,"angle":-9.01,"curve":0.34,"c2":0.36,"c3":0.673,"c4":0.7},{"time":2.3333,"angle":-45.78,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.6667,"angle":-61.3,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":3.0667,"angle":-8.22}],"translate":[{"time":1.0333,"curve":0.316,"c2":0.27,"c3":0.652,"c4":0.61},{"time":1.7,"x":42.33,"y":67.72,"curve":0.325,"c2":0.31,"c3":0.661,"c4":0.65},{"time":2.3333,"x":-33.57,"y":-54.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":2.6667,"x":-32.71,"y":-32.32,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":3.0667}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{},{"time":0.1333,"x":6.12},{"time":0.4333,"x":42.81},{"time":1.0333,"x":61.15},{"time":2.3333,"x":30.57},{"time":3.0667}],"scale":[{},{"time":0.1333,"y":1.122},{"time":0.4333,"y":1.245},{"time":1.0333,"y":1.016},{"time":2.3333}]}},"deform":{"default":{"body":{"body":[{"curve":0.32,"c3":0.654,"c4":0.34},{"time":0.1333,"offset":86,"vertices":[5.0451,9.44527,-2.20056,10.4798,50.30701,22.42905,20.53204,26.96085,-1.58185,33.85263,0,0,0,0,35.66898,31.30115,7.23157,46.90298,0,0,0,0,-22.31396,56.04346,20.81387,22.35218,1.59439,30.50159,18.83447,35.95617,-8.66095,39.65601,22.93472,35.70688,-6.77682,17.55869,12.27841,-16.26207,19.85712,-4.57477,55.97604,37.60203,18.74817,64.77686,0,0,0,0,-16.82413,88.45566,12.42499,47.09189,-3.7731,14.27698,8.87115,-8.12851,12.0206,-0.53107,0,0,0,0,27.24997,44.06665,-7.42084,51.27863,38.70151,22.3745,15.28995,42.01016,0,0,0,0,20.33279,21.28975,1.90793,29.37775,7.47998,3.76376,3.31512,7.68945,35.72745,45.13236,-1.6084,57.54132,5.88739,3.10464,2.51825,6.16132],"curve":0.31,"c2":0.17,"c3":0.645,"c4":0.51},{"time":0.4333,"offset":86,"vertices":[4.73384,8.86253,-2.06479,9.83323,26.87006,-24.04652,19.165,22.61443,-0.47986,29.27431,0,0,0,0,35.44618,17.04835,11.06592,32.22263,0,0,0,0,-20.93726,52.58574,21.89874,21.22692,3.55632,29.81953,19.48387,31.73614,-5.65656,36.12146,26.41525,-22.72219,-6.35872,16.47537,-10.07715,-52.65356,6.99599,-50.26956,53.78038,25.40161,17.45874,49.96786,0,0,0,0,-10.7193,73.3888,11.39966,38.56055,-3.54031,13.39613,1.40461,-24.44805,8.52391,-20.42131,0,0,0,0,45.21333,-14.20671,37.69485,8.21214,25.02014,-28.8812,25.37322,-8.2935,0,0,0,0,22.8875,8.94796,9.77081,19.054,7.01849,3.53155,3.11059,7.21504,46.03043,14.41865,22.57002,34.80567,6.45772,0.21033,4.31869,3.69546],"curve":0.305,"c2":0.23,"c3":0.645,"c4":0.58},{"time":1.0333,"offset":86,"vertices":[3.67002,6.87089,-1.60078,7.62345,42.91488,-66.81319,24.91246,46.08875,15.83916,48.26409,0,0,0,0,63.48355,-36.33538,39.8381,-32.49761,0,0,0,0,-16.23212,40.76839,38.7455,-40.15594,16.21701,-37.80553,32.14561,-19.75468,6.13155,-19.7484,56.5175,-74.91769,-4.92975,12.77293,25.00377,-82.35127,23.34612,-85.83865,50.82815,-13.37669,20.22428,3.28735,0,0,0,0,7.0525,38.93486,42.26579,-119.77338,-2.74471,10.38568,44.05338,52.23011,68.38272,43.53645,1.35504,-2.78005,0.69617,-3.0135,70.82879,-83.42051,44.33086,-72.66207,63.21143,-83.61024,14.92519,-72.75403,0,0,0,0,26.09718,-11.18406,11.64458,-4.7623,5.44126,2.73792,2.41156,5.59363,55.97274,-33.50873,26.6702,-21.654,7.05326,-4.27803,4.34506,-1.92236],"curve":0.329,"c2":0.32,"c3":0.69,"c4":0.74},{"time":2.3333,"offset":86,"vertices":[-25.62516,62.18784,1.12145,67.9025,114.18182,-15.37035,35.79253,69.00364,55.24915,51.55732,60.84436,1.42628,55.76654,-24.38074,56.64198,41.07287,68.11708,19.909,15.61835,-2.05224,13.29596,-8.45123,-11.02475,77.6469,68.45376,-23.66485,51.6032,-46.73033,-9.43093,70.08747,17.48695,70.35064,37.28479,-17.59408,-1.74013,48.26374,77.98535,96.21485,119.86847,54.1683,136.19525,-4.082,116.88104,-52.27032,0,0,0,0,20.18226,110.3807,64.37734,-72.53389,-16.2317,67.32346,100.29227,98.23074,133.93224,50.30305,19.79016,-4.80744,16.07018,-12.69051,47.02468,-16.89116,39.20758,-27.22472,93.58087,-14.52135,77.00798,-45.47858,-2.65961,5.56114,-0.06366,6.16376,89.88593,-8.88429,75.98369,-42.02557,-13.20778,36.60072,2.58455,40.06048,79.75575,-5.65309,67.52733,-30.97015,71.20314,-5.85992,62.02469,-34.16682],"curve":0.379,"c2":0.6,"c3":0.722},{"time":3.0667}]},"r_arm":{"r_arm":[{"time":0.4333},{"time":1.0333,"vertices":[27.62976,-60.673,10.26263,-20.51413,0,0,6.23724,17.05249,23.46643,16.677,27.62976,-60.673,-7.14594,-20.8938,-15.88745,-29.24149,-15.80322,-63.74347,-15.78021,-73.2547,13.43665,-93.7583,-6.80847,-51.03955]},{"time":3.3333}]}}}},"winloop":{"slots":{"lock":{"color":[{"color":"ffffffff"}]},"lock_2":{"color":[{"color":"ffffffff"}]},"r_eye_fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"}]},"s1":{"color":[{"color":"49b3ff81"}]},"s2":{"color":[{"color":"49b3ff81"}]},"s3":{"color":[{"color":"49b3ff81"}]},"s4":{"color":[{"color":"49b3ff81"}]},"s5":{"color":[{"color":"49b3ff81"}]},"s6":{"color":[{"color":"49b3ff81"}]},"skill":{"color":[{"color":"1fffe1ff"}]}},"bones":{"l_hand2":{"scale":[{"x":0,"y":0}]},"r_upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":12.97}]},"r_beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.19,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.77}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":9.4,"y":-12.46,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":0.88}]},"r_finger_b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r_ear_s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":8.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-5.67}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":12.16,"y":-17.99,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"skirt_f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.75,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":9.15}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":5.8,"y":-22.14,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.9333,"y":16.45,"curve":0.25,"c3":0.75},{"time":1.8667,"y":-15.36}]},"r_finger_a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-45.72,"y":-64.16,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_finger_c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"lock":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.41}]},"shadow":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.97,"y":0.895,"curve":0.25,"c3":0.75},{"time":1.8667}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6333,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-8.22}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"r_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":10.23,"y":32.42,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-14.9,"y":-20.45,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_finger_d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":-11.96,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-40.32,"y":-0.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-7.85,"y":2.92}]},"l_upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-13.07,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":-32.01,"y":36.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.9,"y":0.9,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_upparm2":{"rotate":[{"angle":-6.45}]},"l_bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":15.47,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-22.67,"y":24.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.819,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_finger_a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.63,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.31}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":12.82,"y":6.27,"curve":0.25,"c3":0.75},{"time":1.8667}]},"hair_t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard_b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.76}]},"l_finger_a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":17.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-7.5,"y":19.61,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l_finger_b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.16,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-5.23,"y":20.34,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l_finger_d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l_finger_d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":59.08,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.33,"y":20.87,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"r_upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":2.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":36.1,"y":-45.18,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.2}]},"r_finger_a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r_finger_b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r_finger_c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r_finger_d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"r_ear":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-3.09,"y":-14.86,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.842,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":14.28,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-16.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":12.07,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-2.28}]},"l_ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":18.73,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":3.59,"y":24.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"l_ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.76,"curve":0.25,"c3":0.75},{"time":1.4,"angle":24.3,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.27}]},"hair_t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":0.61}]},"hair_t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-2.51,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.7}]},"hair_t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-11.93,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":9.92,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":5.88}]},"hair_t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":63.33}]},"hair_t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-0.31,"y":4.06}]},"hair_t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.63}]},"hair_t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":1.49,"y":10.12}]},"hair_t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":-2.26,"y":14.51}]},"hair_t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-32.32,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":10.5,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":2.6}]},"hair_t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":9.54}]},"head2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":4.6,"y":-21.12,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.7,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_armour":{"rotate":[{"angle":1.84}]},"headbeard_b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.67}]},"headbeard_b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.8667}]},"r_ear_ring_b":{"rotate":[{"angle":8.97,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-10.98,"curve":0.25,"c3":0.75},{"time":1.4,"angle":28.93,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":8.97}]},"r_ear_ringb_s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.4,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.4,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":5.7,"y":-8.17}]},"r_ear_ringa":{"rotate":[{"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.4667,"angle":-29.16,"curve":0.314,"c2":0.27,"c3":0.686,"c4":0.73},{"time":1.4,"angle":16.48,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.8667}]},"r_beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.61}]},"r_beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-10}]},"l_bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.4,"angle":15.47,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":1.82}]},"l_beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":15.47}]},"headbeard_f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":3.01}]},"headbeard_f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.66}]},"headbeard_f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-0.6}]},"headbeard_f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":36.02}]},"headbeard_f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":40.99}]},"l_leg":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-2.29,"y":50.63,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l_finger_b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.64,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.59,"y":20.84,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"skirt_f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":10.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10.83,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.1}]},"skirt_f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":27.49,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-16.58}]},"r_leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":27.96,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-12.01,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.98}]},"l_leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-30.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":11.31,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.62}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.1667,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":4.52}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-8.22}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-1.85}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.95}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":16.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":5.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":-98.01,"y":-10.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":0.9,"y":0.9,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.95,"y":0.95}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-3.18,"curve":0.25,"c3":0.75},{"time":1.4,"angle":14.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":59.09,"y":-135.37,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":1.8667}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.9333,"offset":36,"vertices":[-2.41049,14.08145,-10.63983,9.53357,11.41489,0.51631,8.62204,7.49872,20.82419,30.77104,-2.80862,37.0488,53.80902,21.06067,29.06711,49.94165,43.71988,54.54894,0.35004,69.90634,-0.88062,19.47218,-12.7916,14.70761,5.71973,30.41342,-14.42053,27.38129,2.25964,28.48312,-15.93155,23.71869,-5.14142,35.24371,-25.93134,24.41534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-21.39771,-31.9695,3.10556,-38.34393,-32.63104,-64.54259,-2.67554,-49.07106,28.40125,-40.10614,15.19,-39.32011,36.33786,-21.36356,-0.30249,-29.38377,18.0249,-23.20792,0.36182,-7.9995,5.25519,-6.04211,8.23709,-14.43842,-6.16132,-80.23037,45.0358,-66.68332,-11.18542,-41.29755,16.90335,-39.30496,-2.67551,-49.07107,0,0,-4.45917,-81.78522,47.33566,-66.84366,-8.74689,-59.13564,29.90024,-51.76413,-2.25064,10.54112,-8.31439,6.85941,14.49524,-24.1174,30.06024,-49.46475,0,0,0,0,0,0,-4.30402,-49.14474,27.1712,-41.17593,-2.44653,-18.05902,9.30701,-15.6683,2.06238,-45.59348,29.95184,-34.43707,0,0,0,0,-20.05573,10.5144,-22.24652,-4.22729,0,0,0,0,0,0,0,0,3.87411,11.61391,-4.18277,11.50629],"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt_f":{"skirt_f":[{"curve":0.25,"c3":0.75},{"time":0.9333,"vertices":[-1.8898,-25.58164,0.47333,-28.95829,-1.18393,-41.18966,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.78281,5.60857,0,0,0,0,11.63187,18.17604,12.89143,17.3054,0,0,0,0,0,0,0,0,0,0,0,0,-0.37607,-29.25813,5.20969,-17.44646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.98029,-21.54911],"curve":0.25,"c3":0.75},{"time":1.8667}]}}}}}}
\ No newline at end of file
diff --git a/tests/cpp-tests/Resources/spine/11105.png b/tests/cpp-tests/Resources/spine/11105.png
new file mode 100644
index 000000000000..8d51b524b7b5
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/11105.png differ
diff --git a/tests/cpp-tests/Resources/spine/11105.skel b/tests/cpp-tests/Resources/spine/11105.skel
new file mode 100644
index 000000000000..84d8bb11d4d3
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/11105.skel differ
diff --git a/tests/cpp-tests/Resources/spine/3895.rar b/tests/cpp-tests/Resources/spine/3895.rar
new file mode 100644
index 000000000000..a7bba587da90
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/3895.rar differ
diff --git a/tests/cpp-tests/Resources/spine/fenrir.atlas b/tests/cpp-tests/Resources/spine/fenrir.atlas
new file mode 100644
index 000000000000..d7b896f96b0b
--- /dev/null
+++ b/tests/cpp-tests/Resources/spine/fenrir.atlas
@@ -0,0 +1,776 @@
+
+fenrir.png
+size: 1128,1128
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+attack/0
+  rotate: true
+  xy: 388, 255
+  size: 27, 32
+  orig: 154, 63
+  offset: 127, 18
+  index: -1
+attack/a
+  rotate: false
+  xy: 1022, 872
+  size: 27, 32
+  orig: 154, 63
+  offset: 127, 18
+  index: -1
+attack/b
+  rotate: true
+  xy: 937, 275
+  size: 131, 57
+  orig: 154, 63
+  offset: 10, 6
+  index: -1
+attack/c
+  rotate: false
+  xy: 1017, 502
+  size: 109, 52
+  orig: 154, 63
+  offset: 5, 4
+  index: -1
+attack/d
+  rotate: false
+  xy: 1039, 558
+  size: 77, 46
+  orig: 154, 63
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 2, 803
+  size: 290, 323
+  orig: 302, 323
+  offset: 12, 0
+  index: -1
+canying/s1
+  rotate: true
+  xy: 847, 548
+  size: 125, 142
+  orig: 125, 142
+  offset: 0, 0
+  index: -1
+canying/s3
+  rotate: false
+  xy: 431, 255
+  size: 135, 130
+  orig: 135, 130
+  offset: 0, 0
+  index: -1
+canying/s4
+  rotate: true
+  xy: 570, 639
+  size: 158, 106
+  orig: 158, 106
+  offset: 0, 0
+  index: -1
+canying/s5
+  rotate: false
+  xy: 600, 17
+  size: 146, 107
+  orig: 146, 107
+  offset: 0, 0
+  index: -1
+canying/s6
+  rotate: true
+  xy: 548, 799
+  size: 137, 106
+  orig: 137, 106
+  offset: 0, 0
+  index: -1
+eyefire/eyefire_00000
+  rotate: false
+  xy: 767, 911
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00001
+  rotate: false
+  xy: 767, 911
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00002
+  rotate: false
+  xy: 997, 420
+  size: 12, 26
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00003
+  rotate: true
+  xy: 1088, 782
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00004
+  rotate: false
+  xy: 721, 691
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00005
+  rotate: true
+  xy: 1022, 859
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00006
+  rotate: true
+  xy: 1022, 859
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00007
+  rotate: false
+  xy: 953, 18
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00008
+  rotate: false
+  xy: 753, 909
+  size: 12, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00009
+  rotate: false
+  xy: 656, 811
+  size: 12, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00010
+  rotate: false
+  xy: 1114, 471
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00011
+  rotate: false
+  xy: 1114, 471
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00012
+  rotate: false
+  xy: 1114, 440
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00013
+  rotate: false
+  xy: 1114, 409
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00014
+  rotate: false
+  xy: 230, 284
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00015
+  rotate: false
+  xy: 244, 284
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00016
+  rotate: false
+  xy: 258, 284
+  size: 12, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00017
+  rotate: false
+  xy: 996, 262
+  size: 11, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00018
+  rotate: false
+  xy: 827, 504
+  size: 11, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00019
+  rotate: false
+  xy: 997, 448
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00020
+  rotate: false
+  xy: 925, 17
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00021
+  rotate: false
+  xy: 925, 17
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00022
+  rotate: false
+  xy: 939, 17
+  size: 12, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00023
+  rotate: true
+  xy: 925, 2
+  size: 13, 27
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00024
+  rotate: true
+  xy: 662, 2
+  size: 13, 28
+  orig: 16, 32
+  offset: 1, 0
+  index: -1
+eyefire/eyefire_00025
+  rotate: true
+  xy: 692, 2
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00026
+  rotate: true
+  xy: 692, 2
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00027
+  rotate: true
+  xy: 600, 2
+  size: 13, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00028
+  rotate: true
+  xy: 631, 2
+  size: 13, 29
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00029
+  rotate: true
+  xy: 136, 10
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00030
+  rotate: true
+  xy: 680, 380
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00031
+  rotate: true
+  xy: 680, 380
+  size: 13, 28
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00032
+  rotate: false
+  xy: 1106, 1099
+  size: 13, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00033
+  rotate: false
+  xy: 937, 246
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00034
+  rotate: true
+  xy: 166, 11
+  size: 12, 27
+  orig: 16, 32
+  offset: 2, 0
+  index: -1
+eyefire/eyefire_00035
+  rotate: true
+  xy: 710, 381
+  size: 12, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00036
+  rotate: true
+  xy: 710, 381
+  size: 12, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+eyefire/eyefire_00037
+  rotate: false
+  xy: 966, 18
+  size: 11, 27
+  orig: 16, 32
+  offset: 3, 0
+  index: -1
+hair t
+  rotate: true
+  xy: 2, 253
+  size: 313, 145
+  orig: 313, 145
+  offset: 0, 0
+  index: -1
+head
+  rotate: false
+  xy: 680, 395
+  size: 145, 138
+  orig: 145, 138
+  offset: 0, 0
+  index: -1
+head beard b
+  rotate: true
+  xy: 996, 293
+  size: 113, 66
+  orig: 113, 66
+  offset: 0, 0
+  index: -1
+head beard f
+  rotate: true
+  xy: 656, 841
+  size: 96, 95
+  orig: 96, 95
+  offset: 0, 0
+  index: -1
+headmouth
+  rotate: true
+  xy: 1064, 268
+  size: 86, 55
+  orig: 86, 55
+  offset: 0, 0
+  index: -1
+l arm
+  rotate: false
+  xy: 1017, 409
+  size: 95, 91
+  orig: 96, 92
+  offset: 1, 1
+  index: -1
+l armour
+  rotate: false
+  xy: 829, 130
+  size: 91, 99
+  orig: 92, 100
+  offset: 1, 0
+  index: -1
+l beard
+  rotate: false
+  xy: 991, 556
+  size: 46, 117
+  orig: 46, 117
+  offset: 0, 0
+  index: -1
+l ear
+  rotate: true
+  xy: 1009, 135
+  size: 23, 51
+  orig: 23, 51
+  offset: 0, 0
+  index: -1
+l eye
+  rotate: false
+  xy: 827, 398
+  size: 9, 8
+  orig: 9, 8
+  offset: 0, 0
+  index: -1
+l finger a
+  rotate: true
+  xy: 922, 135
+  size: 94, 85
+  orig: 94, 85
+  offset: 0, 0
+  index: -1
+l finger b
+  rotate: false
+  xy: 678, 774
+  size: 73, 65
+  orig: 73, 65
+  offset: 0, 0
+  index: -1
+l finger c
+  rotate: false
+  xy: 149, 254
+  size: 63, 59
+  orig: 63, 59
+  offset: 0, 0
+  index: -1
+l finger d
+  rotate: true
+  xy: 1009, 160
+  size: 71, 49
+  orig: 71, 49
+  offset: 0, 0
+  index: -1
+l hand
+  rotate: true
+  xy: 847, 11
+  size: 117, 76
+  orig: 118, 76
+  offset: 0, 0
+  index: -1
+l leg
+  rotate: true
+  xy: 273, 634
+  size: 160, 227
+  orig: 160, 227
+  offset: 0, 0
+  index: -1
+l upparm
+  rotate: false
+  xy: 276, 400
+  size: 153, 232
+  orig: 153, 232
+  offset: 0, 0
+  index: -1
+lock
+  rotate: false
+  xy: 847, 478
+  size: 168, 68
+  orig: 168, 68
+  offset: 0, 0
+  index: -1
+lock 2
+  rotate: false
+  xy: 827, 408
+  size: 168, 68
+  orig: 168, 68
+  offset: 0, 0
+  index: -1
+r arm
+  rotate: false
+  xy: 216, 86
+  size: 170, 196
+  orig: 170, 196
+  offset: 0, 0
+  index: -1
+r armour t
+  rotate: false
+  xy: 587, 939
+  size: 234, 187
+  orig: 234, 187
+  offset: 0, 0
+  index: -1
+r armour u
+  rotate: true
+  xy: 388, 123
+  size: 130, 193
+  orig: 130, 193
+  offset: 0, 0
+  index: -1
+r beard
+  rotate: false
+  xy: 753, 235
+  size: 83, 158
+  orig: 83, 158
+  offset: 0, 0
+  index: -1
+r ear
+  rotate: false
+  xy: 730, 126
+  size: 97, 107
+  orig: 97, 107
+  offset: 0, 0
+  index: -1
+r ear ringa
+  rotate: false
+  xy: 954, 2
+  size: 15, 14
+  orig: 15, 14
+  offset: 0, 0
+  index: -1
+r ear ringb
+  rotate: false
+  xy: 1088, 823
+  size: 38, 36
+  orig: 38, 36
+  offset: 0, 0
+  index: -1
+r ear ringb s
+  rotate: false
+  xy: 678, 683
+  size: 41, 35
+  orig: 41, 35
+  offset: 0, 0
+  index: -1
+r ear s
+  rotate: true
+  xy: 1039, 606
+  size: 78, 67
+  orig: 78, 67
+  offset: 0, 0
+  index: -1
+r eye
+  rotate: true
+  xy: 214, 284
+  size: 29, 14
+  orig: 30, 14
+  offset: 1, 0
+  index: -1
+r eye hurt
+  rotate: true
+  xy: 1088, 796
+  size: 25, 38
+  orig: 25, 39
+  offset: 0, 0
+  index: -1
+r finger a
+  rotate: false
+  xy: 502, 634
+  size: 66, 160
+  orig: 66, 161
+  offset: 0, 1
+  index: -1
+r finger b
+  rotate: false
+  xy: 838, 231
+  size: 97, 175
+  orig: 98, 176
+  offset: 0, 0
+  index: -1
+r finger c
+  rotate: true
+  xy: 388, 13
+  size: 108, 210
+  orig: 109, 211
+  offset: 0, 1
+  index: -1
+r finger d
+  rotate: false
+  xy: 136, 25
+  size: 78, 226
+  orig: 78, 226
+  offset: 0, 0
+  index: -1
+r hand
+  rotate: false
+  xy: 568, 262
+  size: 183, 113
+  orig: 183, 113
+  offset: 0, 0
+  index: -1
+r leg
+  rotate: false
+  xy: 2, 568
+  size: 269, 233
+  orig: 269, 233
+  offset: 0, 0
+  index: -1
+r upparm
+  rotate: false
+  xy: 294, 938
+  size: 291, 188
+  orig: 291, 188
+  offset: 0, 0
+  index: -1
+skill/0
+  rotate: true
+  xy: 216, 2
+  size: 82, 108
+  orig: 267, 145
+  offset: 130, 18
+  index: -1
+skill/1
+  rotate: false
+  xy: 276, 284
+  size: 153, 114
+  orig: 267, 145
+  offset: 43, 0
+  index: -1
+skill/10
+  rotate: false
+  xy: 1002, 48
+  size: 72, 85
+  orig: 267, 145
+  offset: 93, 30
+  index: -1
+skill/11
+  rotate: false
+  xy: 925, 47
+  size: 75, 86
+  orig: 267, 145
+  offset: 92, 30
+  index: -1
+skill/12
+  rotate: false
+  xy: 583, 126
+  size: 145, 134
+  orig: 267, 145
+  offset: 56, 11
+  index: -1
+skill/13
+  rotate: true
+  xy: 431, 387
+  size: 245, 135
+  orig: 267, 145
+  offset: 11, 10
+  index: -1
+skill/14
+  rotate: true
+  xy: 2, 2
+  size: 249, 132
+  orig: 267, 145
+  offset: 9, 12
+  index: -1
+skill/15
+  rotate: true
+  xy: 149, 315
+  size: 251, 125
+  orig: 267, 145
+  offset: 8, 15
+  index: -1
+skill/16
+  rotate: true
+  xy: 568, 377
+  size: 255, 110
+  orig: 267, 145
+  offset: 6, 22
+  index: -1
+skill/17
+  rotate: false
+  xy: 753, 675
+  size: 257, 90
+  orig: 267, 145
+  offset: 5, 34
+  index: -1
+skill/18
+  rotate: false
+  xy: 753, 767
+  size: 261, 90
+  orig: 267, 145
+  offset: 3, 34
+  index: -1
+skill/19
+  rotate: true
+  xy: 1051, 861
+  size: 265, 53
+  orig: 267, 145
+  offset: 1, 62
+  index: -1
+skill/2
+  rotate: true
+  xy: 748, 3
+  size: 121, 97
+  orig: 267, 145
+  offset: 58, 12
+  index: -1
+skill/20
+  rotate: false
+  xy: 753, 859
+  size: 267, 45
+  orig: 267, 145
+  offset: 0, 68
+  index: -1
+skill/3
+  rotate: false
+  xy: 1012, 686
+  size: 78, 79
+  orig: 267, 145
+  offset: 76, 27
+  index: -1
+skill/4
+  rotate: true
+  xy: 1064, 356
+  size: 51, 62
+  orig: 267, 145
+  offset: 103, 37
+  index: -1
+skill/5
+  rotate: false
+  xy: 1064, 212
+  size: 55, 54
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/6
+  rotate: false
+  xy: 1009, 233
+  size: 53, 58
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/7
+  rotate: true
+  xy: 678, 720
+  size: 52, 73
+  orig: 267, 145
+  offset: 103, 38
+  index: -1
+skill/8
+  rotate: false
+  xy: 326, 4
+  size: 60, 80
+  orig: 267, 145
+  offset: 103, 32
+  index: -1
+skill/9
+  rotate: false
+  xy: 1016, 775
+  size: 70, 82
+  orig: 267, 145
+  offset: 94, 31
+  index: -1
+skirt b
+  rotate: false
+  xy: 680, 535
+  size: 165, 138
+  orig: 165, 138
+  offset: 0, 0
+  index: -1
+skirt f
+  rotate: true
+  xy: 294, 796
+  size: 140, 252
+  orig: 140, 252
+  offset: 0, 0
+  index: -1
+tail
+  rotate: false
+  xy: 823, 906
+  size: 226, 220
+  orig: 226, 220
+  offset: 0, 0
+  index: -1
diff --git a/tests/cpp-tests/Resources/spine/fenrir.json b/tests/cpp-tests/Resources/spine/fenrir.json
new file mode 100644
index 000000000000..0d7ecb983744
--- /dev/null
+++ b/tests/cpp-tests/Resources/spine/fenrir.json
@@ -0,0 +1 @@
+{"skeleton":{"hash":"+DQzIA0eXfSetpRgAF946l9QrG0","spine":"3.8.99","x":-813.41,"y":-125.16,"width":2088.89,"height":2360.03,"images":"./images/","audio":"E:/正在制作中/芬里尔"},"bones":[{"name":"root"},{"name":"zroot","parent":"root","scaleX":0.5,"scaleY":0.5},{"name":"body","parent":"zroot","length":177.73,"rotation":82.1,"x":82.98,"y":475.22,"color":"0000ffff"},{"name":"body2","parent":"body","length":241.58,"rotation":-28.67,"x":177.73,"color":"0000ffff"},{"name":"l upparm","parent":"body2","length":153.97,"rotation":-139.16,"x":228.65,"y":-180.36,"color":"0000ffff"},{"name":"l upparm2","parent":"l upparm","length":223.22,"rotation":-34.8,"x":153.97,"color":"0000ffff"},{"name":"l armour","parent":"l upparm2","length":121.38,"rotation":54.27,"x":224.35,"y":1.51,"color":"0000ffff"},{"name":"lhand","parent":"zroot","rotation":-66.25,"x":336.2,"y":268.79,"color":"0000ffff"},{"name":"l hand","parent":"lhand","length":155.21,"rotation":16.9,"x":1.02,"y":-0.45,"color":"0000ffff"},{"name":"l finger a","parent":"l hand","length":123.4,"rotation":51.42,"x":67.26,"y":27.18,"color":"0000ffff"},{"name":"l finger a2","parent":"l finger a","length":97.57,"rotation":-62,"x":124.51,"y":-0.04,"color":"0000ffff"},{"name":"l finger b","parent":"l hand","length":76.3,"rotation":7.31,"x":200.91,"y":31.05,"color":"0000ffff"},{"name":"l finger b2","parent":"l finger b","length":64.11,"rotation":-75.85,"x":76.3,"color":"0000ffff"},{"name":"l finger c","parent":"l hand","length":70.21,"rotation":-45.18,"x":160.62,"y":-19.28,"color":"0000ffff"},{"name":"l finger c2","parent":"l finger c","length":68.53,"rotation":-68.5,"x":70.21,"color":"0000ffff"},{"name":"l finger d","parent":"l hand","length":85.66,"rotation":-87.22,"x":124.69,"y":-44.08,"color":"0000ffff"},{"name":"l finger d2","parent":"l finger d","length":65.02,"rotation":-76.57,"x":85.66,"color":"0000ffff"},{"name":"r upparm","parent":"body2","length":179.64,"rotation":138.9,"x":235.44,"y":186.79,"color":"0000ffff"},{"name":"r upparm2","parent":"r upparm","length":352.22,"rotation":16.52,"x":179.64,"color":"0000ffff"},{"name":"r arm","parent":"r upparm2","length":205.31,"rotation":66.89,"x":351.56,"y":-1.2,"color":"0000ffff"},{"name":"rhand","parent":"zroot","rotation":-84.25,"x":-365.78,"y":540.34,"color":"0000ffff"},{"name":"r hand","parent":"rhand","length":129.6,"rotation":0.32,"x":1.36,"y":-0.14,"color":"0000ffff"},{"name":"r finger a","parent":"r hand","length":216.23,"rotation":-11.53,"x":31.12,"y":141.46,"color":"0000ffff"},{"name":"r finger b","parent":"r hand","length":199.56,"rotation":6.63,"x":-15.93,"y":-93.44,"color":"0000ffff"},{"name":"r finger c","parent":"r hand","length":244.47,"rotation":6.56,"x":69.12,"y":-149.36,"color":"0000ffff"},{"name":"r finger d","parent":"r hand","length":234.37,"rotation":-12.12,"x":113.12,"y":-202.3,"color":"0000ffff"},{"name":"head","parent":"body2","length":140.56,"rotation":-11,"x":240.46,"y":-1.18,"color":"0000ffff"},{"name":"r ear","parent":"head","length":110.31,"rotation":78.26,"x":135.56,"y":-69.9,"color":"0000ffff"},{"name":"r ear2","parent":"r ear","length":127.52,"rotation":9.9,"x":110.31,"color":"0000ffff"},{"name":"l ear","parent":"head","length":49.88,"rotation":55.53,"x":236.87,"y":-130.4,"color":"0000ffff"},{"name":"l ear2","parent":"l ear","length":44.37,"rotation":-19.53,"x":49.88,"color":"0000ffff"},{"name":"hair t","parent":"head","length":161.15,"rotation":102.8,"x":226.83,"y":-89.39,"color":"ffff00ff"},{"name":"hair t2","parent":"hair t","length":161.66,"rotation":26.68,"x":161.15,"color":"ffff00ff"},{"name":"hair t3","parent":"hair t2","length":145.45,"rotation":4.97,"x":161.66,"color":"ffff00ff"},{"name":"hair t4","parent":"hair t3","length":126.46,"rotation":3.12,"x":145.45,"color":"ffff00ff"},{"name":"hair t5","parent":"hair t4","length":41.55,"rotation":-72,"x":126.46,"color":"ffff00ff"},{"name":"hair t6","parent":"hair t","length":45.45,"rotation":-55.24,"x":105.17,"y":-54.49,"color":"ffff00ff"},{"name":"hair t7","parent":"hair t6","length":45.25,"rotation":-36.12,"x":45.45,"color":"ffff00ff"},{"name":"hair t8","parent":"hair t2","length":41.68,"rotation":-50.49,"x":77.2,"y":-72.86,"color":"ffff00ff"},{"name":"hair t9","parent":"hair t3","length":45.54,"rotation":-46.28,"x":58.31,"y":-53.23,"color":"ffff00ff"},{"name":"hair t10","parent":"hair t3","length":52.14,"rotation":83.3,"x":53.88,"y":100.89,"color":"ffff00ff"},{"name":"hair t11","parent":"hair t2","length":73.36,"rotation":33.61,"x":70.23,"y":102.78,"color":"ffff00ff"},{"name":"r eye","parent":"head","length":55.66,"rotation":117.62,"x":162.34,"y":-173.01},{"name":"l eye","parent":"head","length":19.01,"rotation":-8.36,"x":186.18,"y":-200.45},{"name":"head2","parent":"head","length":110.58,"rotation":-77.71,"x":140.45,"y":-199.34,"color":"0000ffff"},{"name":"headbeard b","parent":"head","length":84.61,"rotation":141.54,"x":125.94,"y":-206.96,"color":"ffff00ff"},{"name":"headbeard b2","parent":"headbeard b","length":59.45,"rotation":16.25,"x":84.61,"color":"ffff00ff"},{"name":"headbeard b3","parent":"headbeard b2","length":32.2,"rotation":22.93,"x":59.45,"color":"ffff00ff"},{"name":"r eye3","parent":"r eye","x":23.27,"y":0.16},{"name":"r ear s","parent":"head","length":107.77,"rotation":93.23,"x":116.77,"y":-59.98,"color":"002d6cff"},{"name":"r ear ring b","parent":"r ear","length":70.73,"rotation":107.11,"x":65.47,"y":42.89,"color":"ff0000ff"},{"name":"r ear ringb s","parent":"r ear","length":80.52,"rotation":93.81,"x":62.65,"y":56.6,"color":"5d0000ff"},{"name":"r ear ringa","parent":"r ear","length":27.09,"rotation":114.5,"x":106.19,"y":33.19,"color":"ff0000ff"},{"name":"r beard","parent":"head","length":131.38,"rotation":-142.97,"x":52.1,"y":-9.02,"color":"ff0000ff"},{"name":"r beard2","parent":"r beard","length":87.59,"x":131.38,"color":"ff0000ff"},{"name":"r beard3","parent":"r beard2","length":43.79,"x":87.59,"color":"ff0000ff"},{"name":"l bear","parent":"head","length":109.23,"rotation":-137,"x":127.26,"y":-156.27,"color":"ff0000ff"},{"name":"l bear2","parent":"l bear","length":72.82,"x":109.23,"color":"ff0000ff"},{"name":"l beard3","parent":"l bear2","length":36.41,"x":72.82,"color":"ff0000ff"},{"name":"headbeard f","parent":"head","length":69.03,"rotation":150.34,"x":76.63,"y":-138.99,"color":"ffff00ff"},{"name":"headbeard f2","parent":"headbeard f","length":47.75,"rotation":19.76,"x":69.03,"color":"ffff00ff"},{"name":"headbeard f3","parent":"headbeard f2","length":42.28,"rotation":34.27,"x":47.75,"color":"ffff00ff"},{"name":"headbeard f4","parent":"headbeard f","length":52.36,"rotation":-47.52,"x":78.43,"y":-52.66,"color":"ffff00ff"},{"name":"headbeard f5","parent":"headbeard f4","length":40.38,"rotation":5.98,"x":52.36,"color":"ffff00ff"},{"name":"l leg","parent":"body","length":259.69,"rotation":-131.1,"x":-96.06,"y":-6.15,"color":"0000ffff"},{"name":"l leg2","parent":"l leg","length":85.2,"rotation":-94.14,"x":259.69,"color":"0000ffff"},{"name":"l leg3","parent":"l leg2","length":131.52,"rotation":84.89,"x":85.2,"color":"0000ffff"},{"name":"l ik","parent":"zroot","rotation":-58.24,"x":247.34,"y":20.32,"color":"0000ffff"},{"name":"l leg4","parent":"l ik","length":115.52,"rotation":46,"color":"0000ffff"},{"name":"r leg","parent":"body","length":322.61,"rotation":129.46,"x":-78.5,"y":21.46,"color":"0000ffff"},{"name":"r leg2","parent":"r leg","length":99.8,"rotation":75.21,"x":322.61,"color":"0000ffff"},{"name":"r leg3","parent":"r leg2","length":151.51,"rotation":-67.03,"x":99.8,"color":"0000ffff"},{"name":"r ik","parent":"zroot","rotation":-140.26,"x":-311.65,"y":39.13,"color":"0000ffff"},{"name":"r leg4","parent":"r ik","length":153.02,"rotation":-29.39,"color":"0000ffff"},{"name":"skirt f","parent":"body","length":148.8,"rotation":-177.03,"x":-79.11,"y":-6.29,"color":"ff0000ff"},{"name":"skirt f2","parent":"skirt f","length":99.2,"x":148.8,"color":"ff0000ff"},{"name":"skirt f3","parent":"skirt f2","length":49.6,"x":99.2,"color":"ff0000ff"},{"name":"r leg5","parent":"r leg","length":77.69,"rotation":37.22,"x":164.63,"y":68.04,"color":"ff0000ff"},{"name":"l leg5","parent":"l leg","length":70.74,"rotation":-39.63,"x":135.91,"y":-24.6,"color":"ff0000ff"},{"name":"tail","parent":"body","length":147.59,"rotation":142.64,"x":-53.6,"y":15.95,"color":"ffff00ff"},{"name":"tail2","parent":"tail","length":153.62,"rotation":27.15,"x":147.59,"color":"ffff00ff"},{"name":"tail3","parent":"tail2","length":145.02,"rotation":-65.6,"x":153.62,"color":"ffff00ff"},{"name":"tail4","parent":"tail3","length":121.56,"rotation":-86.55,"x":145.02,"color":"ffff00ff"},{"name":"tail5","parent":"tail4","length":63.05,"rotation":31.03,"x":119.56,"y":-0.61,"color":"ffff00ff"},{"name":"tail6","parent":"tail5","length":80.54,"rotation":100.35,"x":63.05,"color":"ffff00ff"},{"name":"l ik2","parent":"l ik","rotation":-84.89,"x":-131.52,"color":"0000ffff"},{"name":"r ik2","parent":"r ik","rotation":67.03,"x":-151.51,"color":"0000ffff"},{"name":"r eye fire","parent":"r eye","rotation":23.99,"x":19.98,"y":-4.53,"scaleX":2.4368,"scaleY":2.4368},{"name":"r ear s2","parent":"r ear s","length":89.01,"rotation":12.12,"x":107.77,"color":"002d6cff"},{"name":"shadow","parent":"zroot","length":150,"rotation":-90,"scaleX":0.2986,"scaleY":1.4317},{"name":"r upparm3","parent":"r upparm","length":91.08,"rotation":111.51,"x":74.13,"y":76.86,"color":"0000ffff"},{"name":"l hand2","parent":"lhand","length":129.6,"rotation":-17.68,"x":-0.3,"y":-1.4,"color":"0000ffff"},{"name":"r finger a2","parent":"l hand2","length":216.23,"rotation":-11.53,"x":31.12,"y":141.46,"color":"0000ffff"},{"name":"r finger b2","parent":"l hand2","length":199.56,"rotation":6.63,"x":-15.93,"y":-93.44,"color":"0000ffff"},{"name":"r finger c2","parent":"l hand2","length":244.47,"rotation":6.56,"x":69.12,"y":-149.36,"color":"0000ffff"},{"name":"r finger d2","parent":"l hand2","length":234.37,"rotation":-12.12,"x":113.12,"y":-202.3,"color":"0000ffff"},{"name":"headmouth","parent":"head","length":133,"rotation":-81.22,"x":92.69,"y":-150.77,"color":"0000ffff"},{"name":"lock","parent":"body","rotation":-105.65,"x":-8.77,"y":-14.12,"scaleX":4,"scaleY":4},{"name":"lock2","parent":"body","rotation":-105.65,"x":-8.77,"y":-14.12,"scaleX":4,"scaleY":4},{"name":"effectroot","parent":"root","scaleX":0.5,"scaleY":0.5},{"name":"s","parent":"effectroot"},{"name":"s1","parent":"s"},{"name":"s2","parent":"s"},{"name":"s3","parent":"s"},{"name":"s4","parent":"s"},{"name":"s5","parent":"s"},{"name":"s6","parent":"s"},{"name":"zhuaji","parent":"effectroot","x":2396.97,"y":2272.11},{"name":"skill","parent":"effectroot","x":284.53,"y":3231.33,"scaleX":7.3877,"scaleY":7.3877},{"name":"zhuaji2","parent":"effectroot","x":2396.97,"y":2272.11}],"slots":[{"name":"s1","bone":"s1","color":"49b3ff81","attachment":"s1"},{"name":"s2","bone":"s2","color":"49b3ff81","attachment":"s2"},{"name":"s3","bone":"s3","color":"49b3ff81","attachment":"s3"},{"name":"s4","bone":"s4","color":"49b3ff81","attachment":"s4"},{"name":"s5","bone":"s5","color":"49b3ff81","attachment":"s5"},{"name":"s6","bone":"s6","color":"49b3ff81","attachment":"s6"},{"name":"shadow","bone":"shadow","color":"ffffff37"},{"name":"tail","bone":"tail","attachment":"tail"},{"name":"l upparm","bone":"l upparm","attachment":"l upparm"},{"name":"l arm","bone":"l armour","attachment":"l arm"},{"name":"l hand","bone":"l hand","attachment":"l hand"},{"name":"l finger d","bone":"l finger d","attachment":"l finger d"},{"name":"l finger c","bone":"l finger c","attachment":"l finger c"},{"name":"l finger b","bone":"l finger b","attachment":"l finger b"},{"name":"l finger a","bone":"l finger a","attachment":"l finger a"},{"name":"l armour","bone":"l armour","attachment":"l armour"},{"name":"body","bone":"body","attachment":"body"},{"name":"l leg","bone":"l leg","attachment":"l leg"},{"name":"r leg","bone":"r leg","attachment":"r leg"},{"name":"skirt b","bone":"body","attachment":"skirt b"},{"name":"skirt f","bone":"skirt f","attachment":"skirt f"},{"name":"l beard","bone":"l bear","attachment":"l beard"},{"name":"head beard b","bone":"headbeard b","attachment":"head beard b"},{"name":"l ear","bone":"l ear","attachment":"l ear"},{"name":"headmouth","bone":"headmouth","attachment":"headmouth"},{"name":"head","bone":"head","attachment":"head"},{"name":"r eye hurt","bone":"head","attachment":"r eye hurt"},{"name":"r eye","bone":"r eye3","attachment":"r eye"},{"name":"l eye","bone":"l eye","attachment":"l eye"},{"name":"head beard f","bone":"headbeard f","attachment":"head beard f"},{"name":"r beard","bone":"r beard","attachment":"r beard"},{"name":"hair t","bone":"hair t","attachment":"hair t"},{"name":"r ear ringb s","bone":"r ear ringb s","attachment":"r ear ringb s"},{"name":"r ear s","bone":"r ear s","attachment":"r ear s"},{"name":"r ear","bone":"r ear","attachment":"r ear"},{"name":"r ear ringb","bone":"r ear ring b","attachment":"r ear ringb"},{"name":"r ear ringa","bone":"r ear ringa","attachment":"r ear ringa"},{"name":"r beard2","bone":"r beard","attachment":"r beard"},{"name":"r upparm","bone":"r upparm2","attachment":"r upparm"},{"name":"r eye fire","bone":"r eye fire","attachment":"eyefire/eyefire_00000"},{"name":"r armour u","bone":"r upparm","attachment":"r armour u"},{"name":"r upparm 2","bone":"r upparm2","attachment":"r upparm"},{"name":"r armour t","bone":"r upparm","attachment":"r armour t"},{"name":"r arm","bone":"r arm","attachment":"r arm"},{"name":"r hand","bone":"r hand","attachment":"r hand"},{"name":"l hand2","bone":"l hand2","attachment":"r hand"},{"name":"skill","bone":"skill","color":"1fffe1ff","attachment":"skill/9"},{"name":"r finger d","bone":"r finger d","attachment":"r finger d"},{"name":"r finger d2","bone":"r finger d2","attachment":"r finger d"},{"name":"r finger c","bone":"r finger c","attachment":"r finger c"},{"name":"r finger c2","bone":"r finger c2","attachment":"r finger c"},{"name":"r finger b","bone":"r finger b","attachment":"r finger b"},{"name":"r finger b2","bone":"r finger b2","attachment":"r finger b"},{"name":"r finger a","bone":"r finger a","attachment":"r finger a"},{"name":"r finger a2","bone":"r finger a2","attachment":"r finger a"},{"name":"lock","bone":"lock","attachment":"lock"},{"name":"lock 2","bone":"lock2","attachment":"Lock"},{"name":"zhuaji","bone":"zhuaji","color":"5168f3b4","attachment":"attack/3"},{"name":"zhuaji2","bone":"zhuaji2","color":"5168f3b4","attachment":"attack/3"}],"ik":[{"name":"lhand","order":4,"bones":["l upparm2","l armour"],"target":"lhand","softness":50},{"name":"l ik","order":2,"bones":["l leg3"],"target":"l ik"},{"name":"l ik2","bones":["l leg","l leg2"],"target":"l ik2","softness":50,"bendPositive":false},{"name":"rhand","order":5,"bones":["r upparm2","r arm"],"target":"rhand","softness":50},{"name":"r ik","order":3,"bones":["r leg3"],"target":"r ik"},{"name":"r ik2","order":1,"bones":["r leg","r leg2"],"target":"r ik2","softness":50}],"skins":[{"name":"default","attachments":{"body":{"body":{"type":"mesh","uvs":[0.14905,0,0.05732,0.13531,0.05112,0.24871,0.04492,0.3621,0.05236,0.5565,0.07468,0.72081,0.11434,0.80644,0.04245,0.96612,0.17633,0.98306,0.31021,1,0.49615,1,0.52094,0.87355,0.62096,0.87601,0.70937,0.87818,0.81598,0.85041,0.93746,0.75784,0.95482,0.56576,0.99201,0.50327,0.996,0.40145,1,0.29962,0.91763,0.17465,0.76143,0.05662,0.57797,0,0.46144,0,0.34492,0,0.24699,0,0.72556,0.35848,0.34726,0.66029,0.28537,0.25931,0.71399,0.70628,0.36451,0.42609,0.81777,0.58214,0.5104,0.18357,0.58203,0.60122,0.61379,0.39127,0.25729,0.84069,0.68418,0.19439,0.17677,0.54516,0.47638,0.7008,0.9013,0.41399,0.48908,0.33191,0.43889,0.52353,0.30185,0.09637,0.16255,0.3997,0.72568,0.50893,0.40138,0.84587,0.2286,0.73657,0.84575,0.28844,0.56737,0.76759,0.18221,0.12361,0.48257,0.78604,0.60565,0.79327],"triangles":[42,25,24,49,0,25,49,25,42,1,0,49,32,23,22,36,22,21,36,21,20,32,22,36,28,49,42,47,36,20,47,20,19,23,42,24,26,36,47,36,40,32,34,36,26,34,40,36,2,49,28,49,2,1,43,2,28,3,2,43,23,32,42,32,28,42,19,39,47,18,39,19,26,47,39,32,40,28,30,28,40,43,28,30,17,39,18,44,26,39,34,26,44,41,30,40,41,40,34,37,43,30,4,3,43,4,43,37,16,39,17,31,44,39,16,31,39,33,41,34,33,34,44,41,27,37,41,37,30,38,41,33,29,33,44,29,44,31,15,31,16,29,31,15,48,38,33,48,33,29,14,29,15,13,51,29,29,14,13,27,41,38,5,4,37,46,5,37,27,46,37,50,38,48,51,48,29,50,48,51,6,5,46,45,35,46,6,46,35,50,45,27,50,27,38,45,46,27,11,50,51,45,50,11,13,12,51,11,51,12,8,6,35,7,6,8,9,35,45,8,35,9,10,45,11,9,45,10],"vertices":[1,3,250.05,350.93,1,2,2,471.3,230.72,0.00204,3,146.89,343.28,0.99796,2,2,398.23,224.36,0.02147,3,85.83,302.64,0.97853,2,2,325.16,218,0.09153,3,24.76,262.01,0.90847,2,2,201.38,196.31,0.45201,3,-73.43,183.59,0.54799,2,2,98.09,168.4,0.86474,3,-150.66,109.55,0.13526,2,2,46.59,137.11,0.97903,3,-180.84,57.38,0.02097,1,2,-61.54,165.88,1,1,2,-61.29,84.41,1,1,2,-61.04,2.95,1,2,2,-45.64,-108.12,0.99445,3,-144.12,-202.02,0.00555,2,2,37.32,-111.7,0.85541,3,-69.6,-165.37,0.14459,2,2,44.04,-171.66,0.65507,3,-34.95,-214.75,0.34493,2,2,49.97,-224.66,0.478,3,-4.32,-258.41,0.522,2,2,76.57,-285.87,0.36681,3,48.39,-299.35,0.63319,2,2,145.87,-350.21,0.25392,3,140.06,-322.56,0.74608,2,2,270.21,-343.53,0.10251,3,245.96,-257.05,0.89749,2,2,313.28,-360.2,0.05898,3,291.74,-251.01,0.94102,2,2,378.76,-353.55,0.02402,3,346.01,-213.76,0.97598,2,2,444.25,-346.9,0.00659,3,400.28,-176.51,0.99341,2,2,517.39,-286.61,8.0E-5,3,435.53,-88.52,0.99992,1,3,440.66,32.55,1,1,3,404.13,143.2,1,1,3,362.27,199.63,1,1,3,320.41,256.07,1,1,3,285.23,303.5,1,2,2,383.85,-188.21,0.00687,3,271.15,-66.24,0.99313,1,2,159.4,10.96,1,2,2,410.85,83.51,0.00305,3,164.47,185.11,0.99695,2,2,160.35,-212.16,0.32405,3,86.53,-194.49,0.67595,2,2,310.69,21.44,0.00408,3,106.37,82.6,0.99592,2,2,248.38,-263.13,0.13495,3,188.23,-196.98,0.86505,1,3,284.61,105.27,1,2,2,216.65,-124.02,0.17899,3,93.65,-90.15,0.82101,2,2,353.62,-124.36,0.00291,3,213.98,-24.73,0.99709,1,2,36.52,48.69,1,1,3,341.42,16.95,1,2,2,218.95,123.01,0.3835,3,-22.85,127.7,0.6165,2,2,144.17,-69.75,0.64637,3,4.02,-77.3,0.35363,2,2,362.9,-298.1,0.02818,3,305.48,-172.72,0.97182,1,3,199.98,58.51,1,1,3,82.53,9.08,1,1,3,254.93,239.84,1,2,2,310.85,144.41,0.10338,3,47.51,190.57,0.89662,2,2,287.6,-201.63,0.07053,3,193.13,-124.2,0.92947,2,2,45.13,-37.83,0.98,3,-98.19,-96.81,0.02,2,2,100.76,75.06,0.96519,3,-103.55,28.93,0.03481,2,2,438.63,-253.78,0.00324,3,350.66,-97.5,0.99676,2,2,108.97,-130.03,0.61934,3,2.06,-147.08,0.38066,2,2,489.14,157.17,2.6E-4,3,197.83,287.3,0.99974,2,2,90.14,-81.02,0.77008,3,-37.98,-113.11,0.22992,2,2,95.71,-155.17,0.58803,3,2.48,-175.5,0.41197],"hull":26,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,0,22,24,24,26,22,100,100,102,102,24],"width":603,"height":646}},"hair t":{"hair t":{"type":"mesh","uvs":[1,1,1,0.93655,1,0.8731,1,0.80965,1,0.74621,0.97867,0.65134,0.95734,0.55648,0.93166,0.49324,0.90598,0.43,0.89938,0.35095,0.89278,0.27189,0.91919,0.18968,0.9412,0.12644,0.88104,0.13593,0.82969,0.20233,0.82089,0.29087,0.78127,0.21182,0.70644,0.16755,0.65363,0.11063,0.62512,0.04678,0.60457,0,0.5777,0.03826,0.57295,0.10469,0.57295,0.15409,0.51661,0.1587,0.47709,0.16551,0.42097,0.17914,0.38224,0.15018,0.35774,0.10589,0.34114,0.05138,0.33008,0.14166,0.34193,0.2081,0.35853,0.23706,0.31337,0.26952,0.27385,0.3104,0.23907,0.33936,0.19243,0.35639,0.14027,0.3581,0.09047,0.34447,0.05886,0.3104,0.05095,0.26952,0.07387,0.2593,0.09601,0.26441,0.07545,0.20819,0.03752,0.19116,0.00116,0.23545,0,0.33936,0.02645,0.39216,0.06755,0.40068,0.11735,0.4092,0.16556,0.41772,0.20824,0.41601,0.24934,0.41772,0.29044,0.42964,0.32285,0.44838,0.3513,0.48756,0.36632,0.55059,0.35339,0.62355,0.34707,0.71554,0.34628,0.80071,0.35577,0.8944,0.36841,0.96765,0.39054,1,0.38659,0.93188,0.39608,0.87226,0.41505,0.82286,0.44824,0.80071,0.48381,0.80071,0.50831,0.80412,0.52807,0.81263,0.50989,0.85352,0.49092,0.8961,0.48618,0.96765,0.52175,0.92166,0.55653,0.92506,0.60501,0.9455,0.63821,0.96595,0.68168,0.9932,0.71962,1,0.73306,0.96254,0.72515,0.91995,0.71509,0.88104,0.69121,0.836,0.71509,0.85638,0.74395,0.8982,0.7748,0.93467,0.77431,0.87247,0.82738,0.92009,0.88046,0.96772,0.90235,0.92053,0.88494,0.87227,0.92923,0.92804,0.94067,0.92911,0.98545,1,0.56916,0.64447,0.82587,0.6385,0.70306,0.38182,0.45682,0.41814,0.62948,0.33442,0.74222,0.63473,0.66662,0.56659,0.53681,0.3129,0.43869,0.68673,0.93205,0.74328,0.7731,0.45982,0.87323,0.4955,0.48291,0.62679,0.55701,0.48373,0.60783,0.81374,0.37064,0.34021,0.61036,0.45399,0.41112,0.51834,0.65541,0.69911,0.91643,0.5967,0.77713,0.75995,0.5023,0.50074,0.87749,0.72979,0.82792,0.79865],"triangles":[94,67,106,68,67,94,69,68,94,108,94,112,69,94,108,82,112,99,108,112,82,73,70,69,71,70,73,74,69,108,73,69,74,75,74,108,76,75,108,82,76,108,72,71,73,77,76,82,77,82,81,77,81,80,78,77,80,79,78,80,102,111,106,57,56,102,67,66,102,67,102,106,102,58,57,65,102,66,65,58,102,59,58,65,64,59,65,60,59,64,63,60,64,61,60,63,61,63,62,30,29,28,31,30,28,31,28,27,32,31,27,26,109,32,26,32,27,97,26,25,98,23,22,101,24,23,19,22,21,98,18,17,19,18,22,19,21,20,22,18,98,11,13,12,10,13,11,14,13,10,15,14,10,104,16,15,9,105,15,9,15,10,105,9,8,105,8,7,104,15,105,113,105,7,43,40,44,41,43,42,41,40,43,45,44,40,46,45,40,46,40,39,47,46,39,48,39,38,47,39,48,49,38,37,48,38,49,51,36,35,50,37,36,50,36,51,49,37,50,51,35,52,33,32,109,52,35,34,109,26,97,97,25,101,53,34,33,54,53,33,52,34,53,109,54,33,55,54,109,111,55,109,97,111,109,56,55,111,115,111,97,56,111,102,96,98,17,96,17,16,25,24,101,98,101,23,110,101,98,104,96,16,107,101,110,115,97,101,107,115,101,96,110,98,100,96,104,100,110,96,106,111,115,94,107,110,94,110,100,112,94,100,112,100,99,106,115,94,94,115,107,113,7,6,99,100,104,95,104,105,95,105,113,99,104,95,116,95,113,5,103,113,5,113,6,116,113,103,103,5,4,114,99,95,117,95,116,114,95,117,103,4,3,83,82,99,114,83,99,90,116,103,117,116,90,86,83,114,86,114,117,92,91,103,86,84,83,87,86,117,87,117,90,90,103,91,92,103,3,2,92,3,84,86,85,92,2,1,88,87,90,88,90,89,93,92,1,93,1,0],"vertices":[1,31,-61.6,28.58,1,1,31,-51.11,13.46,1,2,31,-40.62,-1.65,1,35,-322.22,-524.55,0,3,31,-30.13,-16.77,0.99737,35,-304.72,-530.24,0,36,-108.13,-89.64,0.00263,3,31,-19.64,-31.89,0.98371,35,-287.22,-535.93,0,36,-89.73,-89.64,0.01629,3,31,7,-46.88,0.8976,35,-256.94,-531.75,0,36,-62.22,-76.31,0.1024,3,31,33.64,-61.88,0.68276,35,-226.66,-527.57,0,36,-34.71,-62.97,0.31724,3,31,57.28,-67.8,0.41463,35,-204.26,-517.98,0,36,-16.37,-46.93,0.58537,3,31,80.92,-73.71,0.08773,35,-181.85,-508.38,0,36,1.97,-30.88,0.91227,4,31,97.38,-90.19,0.00184,35,-158.78,-511.54,0,36,24.89,-26.75,0.92623,37,-0.83,-33.72,0.07193,3,35,-135.7,-514.7,0,36,47.82,-22.62,0.23199,37,15.25,-16.88,0.76801,2,35,-118.12,-537.77,0,37,44.24,-16.16,1,2,35,-104.93,-556.52,0,37,67.16,-16.46,1,1,37,42.78,12.29,1,5,31,157.74,-100.77,0.00179,32,-48.3,-88.5,0.0031,36,67.99,16.81,0.07896,37,8.3,26.87,0.91389,38,-67.78,-106.77,0.00226,5,31,147.62,-76.53,0.06218,32,-46.46,-62.31,0.06667,36,42.32,22.31,0.71947,37,-15.68,16.18,0.10635,38,-86.82,-88.69,0.04533,4,31,181.03,-81.25,0.07264,32,-18.72,-81.52,0.23909,36,65.24,47.07,0.47841,38,-54.35,-79.52,0.20986,4,31,226.77,-65.13,0.00828,32,29.39,-87.66,0.22154,36,78.08,93.84,0.16765,38,-19.01,-46.31,0.60253,3,32,64.39,-99.36,0.00589,36,94.58,126.85,0.02029,38,12.29,-26.74,0.97382,2,36,113.1,144.67,5.6E-4,38,37.38,-21.2,0.99944,1,38,55.65,-17.31,1,3,32,114.33,-113.47,1.1E-4,38,54.95,2.81,0.99985,39,-39.4,-121.83,4.0E-5,5,32,114.55,-93.98,0.02542,33,-55.07,-89.55,2.5E-4,35,-27.8,-339.59,0,38,40.05,15.38,0.96866,39,-52.1,-107.04,0.00566,5,32,112.54,-79.79,0.15157,33,-55.85,-75.24,0.00374,35,-41.43,-335.16,0,38,27.83,22.85,0.8135,39,-62.98,-97.72,0.03119,5,32,147.21,-73.52,0.39051,33,-20.76,-71.99,0.07899,35,-31.82,-301.26,0,38,45.05,53.59,0.3286,39,-41.07,-70.12,0.2019,5,32,171.39,-68.09,0.28816,33,3.8,-68.68,0.16807,35,-26.06,-277.15,0,38,56.24,75.7,0.149,39,-26.5,-50.08,0.39477,5,32,205.56,-59.25,0.04629,33,38.61,-62.83,0.08654,35,-18.98,-242.58,0,38,71.16,107.69,0.02133,39,-6.68,-20.87,0.84583,4,32,230.71,-64.16,5.8E-4,35,-3.51,-222.15,0,38,90.95,123.97,3.2E-4,39,15.45,-7.96,0.99911,1,39,35.17,-4.69,1,2,35,31.68,-206.58,0,39,53.92,-7.1,1,1,39,38.55,15.19,1,2,33,87.48,-51.75,0.05177,39,19.1,22.1,0.94823,2,33,76.66,-43.93,0.26237,39,5.97,19.69,0.73763,3,33,104.34,-33,0.85622,35,-23.12,-170.51,0,39,17.19,47.25,0.14378,4,33,128.36,-19.82,0.98032,34,-18.15,-18.86,0.00805,35,-26.76,-143.36,0,39,24.26,73.72,0.01163,4,33,149.6,-10.25,0.40644,34,3.59,-10.46,0.59355,35,-28.03,-120.09,0,39,32.03,95.69,1.0E-5,4,33,178.44,-3.73,0.001,34,32.74,-5.52,0.999,35,-23.72,-90.85,0,39,47.25,121.03,0,1,34,65.34,-5.03,1,2,34,96.46,-8.98,0.99158,35,-0.74,-31.31,0.00842,2,34,116.22,-18.86,0.3722,35,14.77,-15.57,0.6278,2,34,121.16,-30.71,0.03643,35,27.57,-14.53,0.96357,2,34,106.84,-33.68,0.00113,35,25.96,-29.08,0.99887,2,33,240.07,-27.09,0,35,20.28,-41.77,1,1,35,39.75,-34.6,1,1,35,51.78,-13.57,1,3,33,299.72,-32.26,0,35,46.58,12.01,1,39,151.68,188.98,0,3,33,298.8,-2.13,0,35,18.15,22.01,1,39,129.27,209.14,0,4,33,281.46,12.27,0,34,136.48,4.86,0.23392,35,-1.52,11.02,0.76608,39,106.88,206.55,0,3,33,255.68,13.34,0,34,110.79,7.33,1,39,88.29,188.65,0,2,34,79.66,9.79,1,35,-23.78,-41.48,0,1,34,49.53,12.26,1,1,34,22.85,11.77,1,2,33,141.96,12.09,0.64231,34,-2.83,12.26,0.35769,2,33,116.12,14.15,0.99984,40,-78.88,-71.94,1.6E-4,2,33,95.6,18.47,0.98705,40,-76.98,-51.06,0.01295,3,33,77.22,28.85,0.89321,40,-68.82,-31.6,0.10673,41,100.86,-147.9,6.0E-5,4,32,224.23,52.2,0.00163,33,66.86,46.59,0.61689,40,-52.41,-19.23,0.37782,41,100.26,-127.37,0.00366,4,32,229.26,74.29,2.6E-4,33,73.77,68.16,0.27919,40,-30.18,-23.58,0.71925,41,116.67,-111.75,0.0013,2,33,76.27,95.01,0.03669,40,-3.22,-22.93,0.96331,2,35,-175.98,-142.47,0,40,21.2,-19.2,1,1,40,46.96,-8.72,1,1,40,66.54,2.69,1,2,40,73.43,17.92,1,41,142.77,-3.24,0,3,35,-219.94,-154.67,0,40,54.38,12.11,0.99995,41,136.48,-22.13,5.0E-5,4,32,192.71,141.95,0.00202,35,-205.33,-165.65,0,40,36.33,15.01,0.99209,41,123.68,-35.17,0.00589,5,32,182.98,126.1,0.02187,33,32.16,123.78,0.00508,35,-195.37,-181.36,0,40,20.2,24.24,0.91897,41,106.81,-42.99,0.05408,5,32,163.34,116.82,0.08233,33,11.79,116.24,0.03959,35,-195.68,-203.07,0,40,10.33,43.59,0.6777,41,85.32,-39.85,0.20038,5,32,141.34,113.7,0.12842,33,-10.41,115.03,0.04255,35,-202.55,-224.22,0,40,6.54,65.5,0.39976,41,65.26,-30.27,0.42926,5,32,126.03,112.52,0.12147,33,-25.75,115.18,0.02779,35,-208.22,-238.48,0,40,4.9,80.75,0.22502,41,51.87,-22.77,0.62571,5,32,113.46,113.23,0.05717,33,-38.22,116.98,0.00949,35,-214.39,-249.46,0,40,5.23,93.34,0.07499,41,41.79,-15.22,0.85834,5,32,123.04,126.57,0.00259,33,-27.52,129.43,4.1E-4,35,-222.15,-234.99,0,40,18.85,84.17,0.00392,41,57.15,-9.42,0.99308,5,32,133.04,140.46,1.0E-5,33,-16.35,142.41,0,35,-230.23,-219.9,0,40,33.04,74.6,2.0E-5,41,73.17,-3.39,0.99997,4,32,133.06,161.42,1.0E-5,33,-14.52,163.29,0,40,53.99,75.21,1.0E-5,41,84.79,14.06,0.99998,1,41,58.98,11.6,1,1,41,39.79,21.86,1,2,31,150.21,156.36,0.0168,41,15,40.27,0.9832,2,31,129.79,149.4,0.05254,41,-1.16,54.56,0.94746,2,31,102.96,140.4,0.08571,41,-22.28,73.4,0.91429,2,31,82.36,128.5,0.09209,41,-42.82,85.4,0.90791,2,31,81.65,114.78,0.09581,41,-55.08,79.22,0.90419,3,31,92.75,107.45,0.10785,32,-12.87,126.73,0.00181,41,-55.95,65.94,0.89035,3,31,104.35,101.77,0.13824,32,-5.06,116.44,0.00828,41,-55.14,53.05,0.85348,3,31,124.06,99.55,0.27556,32,11.56,105.6,0.04416,41,-47.3,34.83,0.68028,3,31,108.43,95.89,0.54334,32,-4.05,109.36,0.03887,41,-58.22,46.6,0.41779,3,31,86.7,95.57,0.7217,32,-23.61,118.83,0.01395,41,-69.27,65.32,0.26435,3,31,64.83,93.26,0.76976,32,-44.19,126.59,0.00579,41,-82.11,83.17,0.22445,3,31,75.37,78.62,0.80256,32,-41.35,108.77,0.00679,41,-89.61,66.76,0.19066,2,31,40.24,71.06,0.9487,41,-113.59,93.52,0.0513,2,31,5.11,63.49,0.98325,41,-137.57,120.27,0.01675,2,31,1.67,44.44,0.98561,41,-155.81,113.82,0.01439,2,31,18.6,39.15,0.98849,41,-152.02,96.5,0.01151,2,31,-13.36,36.66,0.99971,41,-170.03,123.03,2.9E-4,1,31,-19.42,32.83,1,1,31,-54.13,33.76,1,6,31,218.4,97.42,0.00197,32,94.89,61.34,0.46454,33,-61.21,66.89,0.01013,35,-175.94,-288.95,0,40,-47.21,110.33,0.04658,41,-2.4,-48.16,0.47677,3,31,87.58,4.51,0.99612,32,-63.71,37.06,4.0E-5,41,-147.92,19.42,0.00384,4,31,193.08,-12.88,0.00105,32,22.75,-25.84,0.7646,36,15.94,95.95,0.08638,38,-70.92,-12.1,0.14798,4,32,173.63,6.22,0.00578,33,12.47,5.16,0.97992,40,-99.9,29.95,0.01114,41,32.67,-137.65,0.00316,5,32,70.21,-32.99,0.63018,35,-102.08,-352.6,0,36,29.68,141.94,0.00919,38,-35.22,19.97,0.35978,39,-125.67,-90.52,8.4E-4,4,31,131.15,33.42,0.74875,32,-11.8,43.33,0.13476,35,-206.69,-392.69,0,41,-101.22,-4.1,0.11649,4,31,181.23,44.13,0.11995,32,37.76,30.41,0.71938,35,-173.29,-353.86,0,41,-67.1,-42.29,0.16067,5,32,128.43,-31.02,0.73318,33,-35.8,-28.03,0.02197,35,-78.25,-299.44,0,38,0.31,66.14,0.18983,39,-83.25,-50.6,0.05502,4,32,173.9,84.93,0.10715,33,19.55,83.56,0.15377,40,-21.22,32.07,0.6024,41,76.46,-72.24,0.13668,3,31,15.74,-8.37,0.98676,35,-273.29,-495.8,0,36,-88.88,-47.17,0.01324,4,31,144.22,-19.25,0.73181,32,-23.78,-9.6,0.03897,36,-6.68,52.17,0.21206,38,-113.05,-37.66,0.01715,3,31,86.91,-46.44,0.25332,35,-193.59,-483.05,0,36,-17.03,-10.41,0.74668,4,32,148.98,63.84,0.31834,33,-7.11,64.7,0.18251,40,-43.07,56.34,0.27716,41,44.03,-76.02,0.22199,5,32,108.96,16.25,0.92743,33,-51.09,20.75,0.00237,35,-129.26,-296.14,0,40,-91.84,94.9,0.01205,41,-15.64,-93.5,0.05816,2,31,170.55,123.96,0.00933,41,-3.06,6.55,0.99067,2,33,67.48,-14.47,0.82256,39,-21.67,33.41,0.17744,5,31,228.74,37.35,2.5E-4,32,77.17,3.03,0.99114,35,-131.37,-330.51,0,40,-106.03,126.28,2.3E-4,41,-49.44,-86.91,0.00838,4,32,197.83,39.01,0.02891,33,39.41,35.73,0.72157,40,-66.4,6.76,0.23214,41,70.97,-123.74,0.01738,5,31,165.08,79.7,0.17404,32,39.29,69.45,0.29033,35,-207.67,-335.32,0,40,-40.79,166.15,2.0E-5,41,-44.21,-10.63,0.53561,3,31,47.99,-37.72,0.71699,35,-229.85,-499.65,0,36,-46.38,-37.41,0.28301,3,31,92.52,50.81,0.83996,32,-38.51,76.22,0.01729,41,-105.26,38.07,0.14276,4,32,142.13,25.94,0.71705,33,-17.22,27.54,0.14769,40,-81.15,62.04,0.06442,41,17.35,-103.78,0.07084,2,31,45.98,7.86,0.99735,41,-165.63,57.21,0.00265,2,31,60.04,41.93,0.94849,41,-129.07,61.88,0.05151],"hull":94,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,62,64,64,66,66,68,68,70,70,72,72,74,74,76,76,78,78,80,80,82,82,84,84,86,86,88,88,90,90,92,92,94,94,96,96,98,98,100,100,102,102,104,104,106,106,108,108,110,110,112,112,114,114,116,116,118,118,120,120,122,122,124,124,126,126,128,128,130,130,132,132,134,134,136,136,138,138,140,140,142,142,144,144,146,146,148,148,150,150,152,152,154,154,156,156,158,158,160,160,162,162,164,164,166,166,168,168,170,170,172,172,174,174,176,176,178,178,180,180,182,182,184,184,186,186,0],"width":625,"height":290}},"head":{"head":{"type":"mesh","uvs":[0.23467,0.78444,0.37718,0.76636,0.53048,0.8274,0.67514,1,1,1,1,0.83418,0.88674,0.69401,0.7939,0.6307,0.77014,0.5787,0.84356,0.51314,0.84356,0.38427,0.62764,0.04062,0.49161,0,0.3016,0,0.12023,0.07227,0.02523,0.19436,0,0.3187,0,0.45888,0.02523,0.60809,0.1116,0.71888,0.23035,0.6194,0.31888,0.40462,0.52832,0.30062,0.69889,0.32096,0.42252,0.63975,0.57366,0.54479,0.69026,0.54931,0.58446,0.75505,0.64492,0.71209,0.72049,0.66914],"triangles":[4,3,5,6,5,3,3,29,6,29,7,6,2,27,3,27,28,3,3,28,29,27,2,24,19,20,0,0,20,1,2,1,24,1,20,24,28,27,25,19,18,20,27,24,25,28,26,29,28,25,26,29,8,7,29,26,8,25,24,21,24,20,21,21,20,17,20,18,17,8,26,9,10,9,26,21,22,25,26,25,23,25,22,23,26,23,10,17,16,21,16,15,21,15,14,21,14,13,21,22,13,12,22,21,13,22,11,23,10,23,11,22,12,11],"vertices":[1,26,40.53,-149.57,1,1,26,74.3,-173.68,1,2,26,95.63,-216.01,0.5,44,6.75,-47.35,0.5,1,44,68.39,-62.1,1,1,44,145.04,-7.88,1,1,44,118.61,29.48,1,1,44,69.54,42.16,1,2,26,188.44,-227.31,0.5,44,37.55,40.93,0.5,1,26,193.06,-212.09,1,1,26,220.93,-213.05,1,1,26,244.93,-186.8,1,1,26,262.88,-74.69,1,1,26,241.43,-39.89,1,1,26,200.9,-2.84,1,1,26,148.76,17.81,1,1,26,105.76,11.47,1,1,26,77.22,-8.94,1,1,26,51.11,-37.5,1,1,26,28.7,-72.81,1,1,26,26.49,-112.22,1,1,26,70.35,-115.11,1,1,26,129.23,-88.63,1,1,26,193.27,-108.28,1,1,26,225.86,-145.69,1,1,26,107.55,-156.73,1,1,26,157.47,-166.86,1,1,26,181.5,-190.52,1,2,26,120.61,-211.8,0.5,44,7.95,-22.04,0.5,2,26,141.51,-214.84,0.5,44,15.37,-2.27,0.5,2,26,165.63,-220.83,0.5,44,26.35,20.02,0.5],"hull":20,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,0,38,0,40,40,42,42,44,44,46,46,20,2,48,48,50,50,52,52,16,4,54,54,56,56,58,58,14],"width":289,"height":276}},"head beard b":{"head beard b":{"type":"mesh","uvs":[0.4976,1,0.52707,0.87968,0.55654,0.75936,0.66851,0.5911,0.78048,0.42284,1,0.38265,1,0.2822,0.92413,0.18426,0.84826,0.08631,0.6803,0,0.44014,0,0.19999,0,0.09999,0.09589,0,0.19179,0,0.3274,0.08802,0.42284,0.04401,0.58105,0,0.73927,0.14106,0.63379,0.16168,0.74931,0.35911,0.71415,0.38268,0.88493,0.43278,1,0.49157,0.44396,0.86158,0.28706,0.24567,0.34296,0.6811,0.26133,0.38276,0.27419,0.26709,0.51149,0.53512,0.19559,0.31718,0.15384,0.59552,0.47699,0.45436,0.66692,0.13585,0.21936,0.58411,0.11415],"triangles":[13,12,33,14,13,33,15,14,33,15,33,25,15,25,28,18,15,28,16,15,18,17,16,18,19,18,28,19,28,20,30,11,10,33,12,11,33,11,30,27,30,10,27,10,29,25,33,30,25,30,27,23,27,29,23,29,31,28,25,27,28,27,23,32,28,23,20,28,32,31,32,23,2,32,31,1,32,2,21,20,32,21,32,1,1,22,21,0,22,1,34,10,9,29,10,34,26,9,8,34,9,26,24,8,7,26,8,24,24,7,6,5,24,6,4,26,24,4,24,5,26,29,34,31,26,4,31,29,26,3,31,4,2,31,3],"vertices":[3,45,98.89,87.12,0.00523,46,38.08,79.65,0.93692,47,11.35,81.68,0.05785,3,45,91.18,71.74,0.03882,46,26.37,67.04,0.90884,47,-4.35,74.63,0.05234,3,45,83.46,56.35,0.16909,46,14.66,54.43,0.8013,47,-20.05,67.58,0.02962,3,45,56.79,35.95,0.74597,46,-16.66,42.3,0.25397,47,-53.62,68.6,5.0E-5,2,45,30.11,15.54,0.99819,46,-47.98,30.16,0.00181,1,45,-19.53,13.67,1,1,45,-20.45,0.45,1,1,45,-4.32,-13.64,1,1,45,11.82,-27.72,1,2,45,48.73,-41.71,0.97579,46,-46.12,-30,0.02421,3,45,102.63,-45.46,0.23509,46,4.58,-48.68,0.76089,47,-69.5,-23.46,0.00402,3,45,156.53,-49.21,3.0E-5,46,55.28,-67.36,0.71012,47,-30.08,-60.42,0.28985,2,46,80.77,-63.26,0.466,47,-5.01,-66.57,0.534,2,46,106.26,-59.16,0.30578,47,20.06,-72.72,0.69422,2,46,112.45,-42.37,0.26865,47,32.31,-59.66,0.73135,2,46,98.22,-23.7,0.14867,47,26.47,-36.93,0.85133,2,46,114.73,-7.52,0.00351,47,47.98,-28.47,0.99649,1,47,69.49,-20,1,1,47,36.81,-8.45,1,1,47,43.86,5.85,1,3,45,127.36,47.32,0.00236,46,54.28,33.47,0.67009,47,8.28,32.84,0.32755,3,45,123.63,70.17,5.9E-4,46,57.09,56.46,0.90424,47,19.82,52.91,0.09517,3,45,113.44,86.11,3.1E-4,46,51.77,74.61,0.93533,47,21.99,71.7,0.06436,3,45,95.15,13.81,0.07184,46,13.98,10.31,0.92713,47,-37.86,27.21,0.00102,1,45,10.67,-1.08,1,2,46,61.29,-21.33,0.6048,47,-6.62,-20.36,0.3952,1,45,50.94,-7.28,1,3,45,118.02,-10.25,0.00992,46,29.21,-19.18,0.98469,47,-35.33,-5.89,0.00539,1,47,5.08,-0.84,1,2,45,83.1,-18.22,0.61725,46,-6.55,-17.07,0.38275,3,45,131.64,-27.12,0.01237,46,37.56,-39.19,0.89658,47,-35.43,-27.57,0.09106,2,45,72.12,19.78,0.69962,46,-6.46,22.49,0.30038,3,45,105.55,42.59,0.05542,46,32.01,35.03,0.8662,47,-11.62,42.95,0.07838,2,46,78.83,-45.18,0.43351,47,0.25,-49.16,0.56649,2,45,71.36,-28.18,0.82384,46,-20.61,-23.34,0.17616],"hull":23,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,0],"width":225,"height":132}},"head beard f":{"head beard f":{"type":"mesh","uvs":[0.50254,0.11314,0.53275,0.21387,0.56295,0.31461,0.65962,0.4245,0.82981,0.45656,1,0.48861,0.96877,0.58782,0.93754,0.68703,0.82879,0.7084,0.72004,0.72977,0.60827,0.86103,0.4391,0.87324,0.32733,0.93124,0.279,1,0.21254,1,0.17327,0.89156,0.17025,0.73282,0.22462,0.58019,0.34545,0.51914,0.24275,0.44587,0.07056,0.36956,0,0.38482,0,0.30545,0.10077,0.26882,0.27295,0.25661,0.15212,0.16503,0.08264,0.07956,0.02223,0,0.12191,0,0.29108,0.06124,0.39681,0.08719,0.53297,0.509,0.41058,0.35977,0.49354,0.70647,0.31084,0.74766,0.69703,0.58386,0.61046,0.67755,0.38149,0.61256,0.40608,0.19882,0.87698,0.58537,0.21941,0.33999,0.44655,0.46301,0.39065,0.77425],"triangles":[26,27,28,25,28,29,26,28,25,38,30,0,38,0,1,24,25,29,38,24,29,38,29,30,40,23,24,32,38,1,32,1,2,24,38,32,40,24,32,20,22,23,20,23,40,21,22,20,19,40,32,20,40,19,41,32,2,31,41,2,18,19,32,41,18,32,15,16,34,12,42,11,15,34,12,13,14,15,12,13,15,37,18,41,37,41,31,17,18,37,33,37,31,34,17,37,42,34,37,16,17,34,33,42,37,10,33,36,11,42,33,11,33,10,12,34,42,3,31,2,35,3,4,31,3,35,39,4,5,35,4,39,6,39,5,36,31,35,7,39,6,36,33,31,8,35,39,8,39,7,9,36,35,8,9,35,10,36,9],"vertices":[1,62,15.26,-48.85,1,2,59,51.28,-76.95,0.01729,62,-0.42,-36.43,0.98271,2,59,49.86,-57.01,0.17834,62,-16.09,-24.01,0.82166,2,59,36.38,-32.54,0.75033,62,-43.24,-17.43,0.24967,2,59,5.86,-19.37,0.99558,62,-73.56,-31.05,0.00442,1,59,-24.66,-6.2,1,1,59,-14.64,10.85,1,1,59,-4.63,27.91,1,2,59,16.63,27.25,0.9988,60,-40.1,43.36,0.0012,2,59,37.89,26.59,0.90812,60,-20.31,35.55,0.09188,3,59,64.34,46.17,0.39602,60,11.19,45.03,0.58793,61,-4.85,57.8,0.01605,3,59,96.53,41.25,0.04257,60,39.82,29.52,0.58388,61,10.08,28.86,0.37355,3,59,119.89,47.25,6.0E-5,60,63.84,27.27,0.03318,61,28.66,13.47,0.96676,1,61,44.32,10.09,1,1,61,49.35,-1.64,1,1,61,33.38,-16.68,1,3,60,68.99,-20.73,0.22226,61,5.89,-29.1,0.77404,62,0.58,84.26,0.0037,3,60,44.6,-39.57,0.79105,61,-24.88,-30.93,0.13414,62,8.53,54.48,0.07482,4,59,99.18,-28.34,0.00977,60,18.8,-36.87,0.52807,61,-44.68,-14.17,0.00191,62,-3.92,31.72,0.46025,2,60,27.94,-59.21,0.06339,62,20.22,31.52,0.93661,1,62,55.65,38.45,1,1,62,65.12,48.55,1,1,62,73.72,36.16,1,1,62,61.79,19.42,1,1,62,35.94,-1.33,1,1,62,64.92,-2.41,1,1,62,85.14,-8.15,1,1,62,103.29,-13.96,1,1,62,87.56,-24.87,1,1,62,54.24,-33.82,1,1,62,34.75,-41.33,1,3,59,63.64,-22.26,0.55276,60,-12.59,-19.13,0.14794,62,-32.41,9.62,0.29931,1,62,3.06,-0.29,1,3,59,79.33,12.66,0.07857,60,13.97,8.43,0.91718,61,-23.17,25.98,0.00425,3,60,47.75,-3.84,0.63078,61,-2.15,-3.18,0.36745,62,-23.2,71.19,0.00176,2,59,36.07,-1.42,0.99794,62,-66.4,3.36,0.00206,2,59,56.22,12.26,0.83826,60,-7.91,15.87,0.16174,4,59,96.36,-9.5,0.00145,60,22.51,-18.18,0.87545,61,-31.09,-0.82,8.6E-4,62,-19.72,42.37,0.12225,1,62,21.2,-24.92,1,1,59,2.44,6.5,1,2,60,20.9,-78.58,0.00594,62,35.36,17.55,0.99406,3,59,77.89,-34.45,0.14305,60,-3.3,-35.42,0.22133,62,-13.79,11.9,0.63561,3,59,101.44,20.85,0.00551,60,37.55,8.66,0.83489,61,-3.55,12.9,0.1596],"hull":31,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,0],"width":192,"height":190}},"headmouth":{"headmouth":{"x":60.98,"y":0.2,"rotation":38.79,"width":172,"height":109}},"l arm":{"l arm":{"x":86.74,"y":-13.25,"rotation":66.25,"width":191,"height":184}},"l armour":{"l armour":{"x":67.24,"y":-12.87,"rotation":66.25,"width":184,"height":200}},"l beard":{"l beard":{"type":"mesh","uvs":[0.27682,0,0.14862,0.08845,0,0.19099,0,0.37968,0,0.56265,0.03753,0.69116,0.07098,0.80567,0,1,0.90171,1,0.78409,0.83426,0.77745,0.72847,0.76938,0.59982,0.94582,0.45401,0.86496,0.33965,0.94485,0.19418,1,0.09378],"triangles":[14,0,15,1,0,14,14,2,1,7,6,9,8,7,9,3,11,4,5,4,11,5,11,10,6,5,10,6,10,9,13,2,14,3,2,13,12,3,13,12,11,3],"vertices":[1,26,112.99,-125.71,1,1,26,90.42,-133.11,1,1,56,36.14,-53.64,1,2,56,80.16,-50.12,0.93755,57,-29.07,-50.12,0.06245,2,56,122.84,-46.72,0.32047,57,13.61,-46.72,0.67953,3,56,152.54,-40.92,0.02686,57,43.31,-40.92,0.94911,58,-29.51,-40.92,0.02402,2,57,69.78,-35.75,0.59075,58,-3.04,-35.75,0.40925,1,58,42.8,-38.57,1,1,58,36.27,43.23,1,2,57,71.28,29.47,0.37868,58,-1.54,29.47,0.62132,2,57,46.66,26.9,0.94433,58,-26.16,26.9,0.05567,2,56,125.93,23.77,0.17361,57,16.71,23.77,0.82639,2,56,90.65,37.06,0.95658,57,-18.58,37.06,0.04342,1,56,64.56,27.59,1,1,26,127.2,-200.26,1,1,26,146.75,-186.31,1],"hull":16,"edges":[12,14,14,16,16,18,22,24,24,26,0,30,4,6,6,8,8,10,10,12,18,20,20,22,0,2,2,4,26,28,28,30,2,28],"width":91,"height":234}},"l ear":{"l ear":{"type":"mesh","uvs":[0.23839,0.76519,0.44833,1,1,1,1,0.76193,1,0.49441,1,0.25796,1,0,0.71964,0,0.36855,0.24323,0,0.49855],"triangles":[8,5,4,8,7,5,7,6,5,1,3,2,1,0,3,3,0,4,0,9,4,9,8,4],"vertices":[1,29,20.15,15.41,1,1,29,-4.88,9.38,1,1,29,-8.32,-15.21,1,1,29,15.73,-18.58,1,2,29,42.75,-22.36,0.73651,30,0.76,-23.46,0.26349,2,29,66.64,-25.7,0.03658,30,24.38,-18.62,0.96342,1,30,50.16,-13.35,1,1,30,47.63,-0.99,1,2,29,72.07,2.23,0.02184,30,20.16,9.52,0.97816,2,29,48.57,22.26,0.92807,30,-8.68,20.55,0.07193],"hull":10,"edges":[2,4,12,14,14,16,16,18,8,10,10,12,2,0,0,18,4,6,6,8],"width":45,"height":102}},"l eye":{"l eye":{"x":8.91,"y":-0.86,"rotation":-34.08,"width":17,"height":15}},"l finger a":{"l finger a":{"type":"mesh","uvs":[1,1,0.86727,1,0.66479,0.53694,0.51568,0.58383,0,0.65185,0,0,0.19829,0,0.47673,0,1,0,0.15557,0.27187],"triangles":[9,6,7,3,9,7,9,5,6,4,5,9,4,9,3,2,7,8,0,1,2,8,0,2,3,7,2],"vertices":[1,10,130,-12.23,1,1,10,117.56,-33.71,1,2,9,114.94,-39.63,0.45352,10,30.46,-27.04,0.54648,1,8,157.81,65.97,1,1,8,103.77,-14.73,1,1,8,19.69,57.45,1,1,8,43.85,85.59,1,2,9,83.09,52.85,0.8084,10,-66.15,-11.74,0.1916,1,10,-17.12,72.94,1,1,8,73.71,49.42,1],"hull":9,"edges":[8,10,0,16,0,2,2,4,4,16,10,12,12,18,4,6,6,8,18,6,12,14,14,16,4,14],"width":187,"height":170}},"l finger b":{"l finger b":{"type":"mesh","uvs":[1,0.51051,0.78902,0.99999,0.57176,1,0.12581,0.80863,0.53734,0.60657,0.06593,0.28854,0,0,0.65224,0,1,0.36769],"triangles":[5,6,7,4,5,7,3,4,2,2,4,1,1,4,0,0,4,8,4,7,8],"vertices":[2,11,94.37,22.26,0.62846,12,-17.17,22.96,0.37154,1,12,53.38,25.7,1,1,12,68.12,-2.14,1,2,11,26.2,-91.41,0,12,76.39,-70.93,1,2,11,52.92,-31.94,0.45304,12,25.26,-30.48,0.54696,1,8,181.56,-18.83,1,1,8,146.88,-1.65,1,1,8,208.48,70.11,1,2,11,81.94,36.05,0.91025,12,-33.58,14.28,0.08975],"hull":9,"edges":[8,10,10,12,12,14,14,16,10,14,16,8,6,8,2,4,4,6,2,0,0,16,8,0],"width":145,"height":130}},"l finger c":{"l finger c":{"type":"mesh","uvs":[1,0.2059,0.91275,0.83391,0.81682,0.99998,0,1,1.0E-5,0.59484,0.44765,0.60693,0.50456,0.19374,0.54629,1.0E-5,1,0],"triangles":[6,7,0,7,8,0,0,5,6,1,5,0,2,5,1,3,4,5,3,5,2],"vertices":[1,8,188.86,-0.79,1,2,13,81.53,27.97,0.64282,14,-21.87,20.78,0.35718,2,13,102.02,17.48,0.20684,14,-4.6,36,0.79316,1,14,93.85,5.97,1,1,14,79.89,-39.76,1,2,13,59.47,-32.57,0.23965,14,26.36,-21.93,0.76035,1,8,147.11,-47.23,1,1,8,133.19,-28.34,1,1,8,170.43,15.03,1],"hull":9,"edges":[14,16,12,14,2,0,0,16,10,12,2,10,6,8,8,10,12,0,2,4,4,6,10,4],"width":126,"height":118}},"l finger d":{"l finger d":{"type":"mesh","uvs":[1,0.2697,1,0.43237,0.49844,0.99999,0.27323,1,0.05049,0.68462,0,0.25986,0.35345,0.51742,0.30353,0,1,0],"triangles":[7,8,0,0,6,7,3,4,6,4,5,6,3,6,2,2,6,1,1,6,0],"vertices":[1,8,151.75,-26.93,1,1,15,-4.98,39.32,1,2,15,84.6,30.35,0.98314,16,-29.77,6.01,0.01686,2,15,107.82,8.37,0.23589,16,-3,23.5,0.76411,1,16,40.21,15.18,1,1,16,68.74,-15.4,1,2,15,67.37,-17.79,0.6513,16,13.06,-21.92,0.3487,1,8,67.48,-84.92,1,1,8,131.9,-9.88,1],"hull":9,"edges":[12,14,14,16,0,16,14,0,12,4,10,12,0,2,2,4,4,6,6,8,12,6,8,10],"width":142,"height":97}},"l hand":{"l hand":{"x":85.5,"y":12.82,"rotation":49.35,"width":236,"height":152}},"l hand2":{"r hand":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[221.31,134.74,182.59,-229.21,-41.15,-205.41,-2.43,158.54],"hull":4,"edges":[0,2,2,4,4,6,0,6],"width":366,"height":225}},"l leg":{"l leg":{"type":"mesh","uvs":[0,0,0.38747,0,0.74199,0.28564,0.83631,0.64779,0.75522,0.68707,0.59861,0.66926,0.57636,0.70766,0.69103,0.84858,0.76802,0.88789,0.99222,0.93764,1,1,0.48373,0.98435,0.52022,0.89414,0.49957,0.85583,0.28127,0.68446,0.30726,0.60179,0.41697,0.55447,0.36977,0.4857,0,0.37108],"triangles":[12,7,8,11,12,8,8,9,10,10,11,8,6,14,15,13,14,6,13,6,7,12,13,7,5,16,2,3,5,2,15,16,5,4,5,3,5,6,15,18,0,1,17,18,1,2,17,1,16,17,2],"vertices":[1,64,-64.32,15.84,1,1,64,17.04,109.4,1,1,64,189.12,110.1,1,2,64,332.72,25.23,0.16781,65,-30.44,71.02,0.83219,3,64,329.12,-6.03,0.07378,65,1,69.69,0.92561,66,61.91,90.07,6.1E-4,2,65,36.25,33.17,0.83025,66,28.68,51.71,0.16975,2,65,52.39,42.81,0.39548,66,39.72,36.5,0.60452,2,66,113.31,34.1,0.75,68,11.88,36.78,0.25,2,66,141.42,45.67,0.35,68,39.73,24.61,0.65,1,68,114.62,17.79,1,1,68,123.05,-9.28,1,1,68,-39.91,-37.39,1,2,66,102.09,-23.24,0.35,68,-37.16,5.02,0.65,2,66,83.86,-19.73,0.75,68,-47.3,20.58,0.25,3,64,228.71,-119.7,3.0E-4,65,121.62,-22.25,0.29172,66,-18.92,-38.26,0.70798,3,64,205.91,-88.85,0.03635,65,92.5,-47.22,0.74889,66,-46.38,-11.48,0.21476,3,64,212.77,-48.29,0.39835,65,51.55,-43.31,0.6009,66,-46.13,29.66,7.5E-4,2,64,179.35,-39.25,0.90959,65,44.94,-77.29,0.09041,1,64,62.53,-94.47,1],"hull":19,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,0,36,32,10,12,30,28,12,26,14,24,16,30,10,34,4],"width":320,"height":453}},"lock":{"lock":{"width":335,"height":136}},"lock 2":{"Lock":{"path":"lock 2","width":335,"height":136}},"l upparm":{"l upparm":{"type":"mesh","uvs":[0.09978,0.58733,0,0.85791,0,1,0.5004,1,0.53419,0.85154,0.66934,0.66373,0.9686,0.47911,1,0.32313,0.90585,0,0.40386,0,0.1046,0.10986,0,0.29448,0,0.47911],"triangles":[4,3,1,3,2,1,1,0,4,4,0,5,7,5,11,6,5,7,11,5,0,0,12,11,11,9,7,9,11,10,7,9,8],"vertices":[2,4,231.14,-151.98,0.08056,5,150.1,-80.76,0.91944,1,5,273.75,-43.3,1,1,5,330.55,-9.82,1,1,5,252.78,122.09,1,1,5,188.19,96.01,1,2,4,279.48,19.18,0.0028,5,92.12,87.38,0.9972,2,4,200.88,116.89,0.51255,5,-28.18,122.76,0.48745,2,4,129.43,131.87,0.84804,5,-95.41,94.28,0.15196,1,4,-22.23,114.32,1,2,4,-33.69,-38.86,0.99553,5,-131.92,-139.01,0.00447,2,4,10.32,-133.98,0.87229,5,-41.51,-192.01,0.12771,2,4,93.36,-172.29,0.59756,5,48.55,-176.07,0.40244,2,4,178.78,-178.68,0.27264,5,122.34,-132.57,0.72736],"hull":13,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,0,24],"width":306,"height":464}},"r arm":{"r arm":{"type":"mesh","uvs":[0.07385,1.0E-5,0,0.37872,0,0.54104,0.3259,1,0.43316,1,0.76024,0.99999,0.87402,0.90654,1,0.80308,1,0.37409,1,0.25582,0.58064,0,0.87023,0.53173],"triangles":[1,4,2,0,5,1,11,10,9,8,11,9,11,0,10,11,8,7,6,11,7,5,11,6,5,0,11,5,4,1,3,2,4],"vertices":[-95.66,-146.16,49.55,-185.94,112.86,-192.31,302.93,-100.41,306.58,-64.23,317.72,46.09,285.11,88.14,249.01,134.69,81.69,151.54,35.57,156.18,-78.45,24.77,138.79,101.57],"hull":11,"edges":[0,2,2,4,4,6,18,20,0,20,10,0,6,8,8,10,2,8,14,16,16,18,16,22,10,12,12,14,22,12],"width":339,"height":392}},"r armour t":{"r armour t":{"x":198.55,"y":-8.44,"rotation":167.66,"width":467,"height":373}},"r armour u":{"r armour u":{"type":"mesh","uvs":[0.64487,0,0.52295,0.27447,0.97536,0.85789,0.99999,0.99857,0.77321,1,0.68978,0.84141,0.1636,0.36489,0,0.31322,0,0],"triangles":[6,1,5,1,6,8,6,7,8,1,8,0,4,2,3,4,5,2,5,1,2],"vertices":[1,90,51.37,111.96,1,1,90,121.77,26.73,1,2,2,96.14,-154.1,0.59,3,2.34,-174.35,0.41,2,2,43.22,-167.88,0.66,3,-37.48,-211.83,0.34,2,2,34.61,-109.77,0.86,3,-72.91,-164.98,0.14,2,2,92.27,-79.96,0.78,3,-36.62,-111.16,0.22,1,90,98.92,-70.01,1,1,90,58.76,-94.1,1,1,90,-41.66,-26.76,1],"hull":9,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,0,16,10,4,2,12],"width":259,"height":386}},"r beard":{"r beard":{"type":"mesh","uvs":[0.2079,0,0.15063,0.16618,0.15584,0.39316,0.47841,0.49333,0.66864,0.49374,0.74412,0.35647,0.95237,0.28307,0.96803,0.21333,1,0.07104,0.70248,0,0.45519,0,0.42371,0.36333,0.59611,0.17744,0.35657,0.22015,0.76263,0.19178,0.57726,0.26196,0.43861,0.12192,0.68143,0.12191,0.87714,0.17112],"triangles":[7,14,18,13,1,16,7,18,8,14,17,18,12,16,17,18,17,8,1,0,16,16,10,17,16,0,10,17,9,8,17,10,9,5,4,11,2,11,3,4,3,11,2,13,11,2,1,13,11,15,5,11,13,15,5,14,6,6,14,7,5,15,14,15,12,14,15,13,12,13,16,12,12,17,14],"vertices":[1,26,45.68,67.27,1,1,26,3.27,34.89,1,2,53,82.89,-50.5,0.99951,54,-48.49,-50.5,4.9E-4,1,53,104.28,7.61,1,2,53,98.68,38.5,0.99208,54,-32.7,38.5,0.00792,1,53,53.75,42.81,1,1,53,24.67,72.36,1,1,26,92.76,-67.12,1,1,26,126.99,-37.49,1,1,26,105.91,12.2,1,1,26,75.79,39.73,1,1,53,65.55,-8.77,1,1,53,2.6,8.46,1,1,53,23.09,-27.93,1,1,53,2.03,36.3,1,1,53,29.42,10.29,1,1,26,47.78,13.15,1,1,26,77.35,-13.89,1,1,26,90.69,-47.15,1],"hull":11,"edges":[0,2,2,4,8,10,10,12,16,18,18,20,20,0,2,32,32,34,34,36,12,14,14,16,36,14,4,6,6,8],"width":165,"height":316}},"r beard2":{"r beard":{"type":"mesh","uvs":[0.47841,0.49333,0.15584,0.39316,0.16105,0.62015,0.08295,0.7914,0,0.88655,0,1,0.1561,1,0.31219,1,0.62438,1,0.5515,0.8213,0.59315,0.63102,0.66864,0.49374,0.32382,0.86705,0.36613,0.70389,0.3626,0.53397],"triangles":[7,12,8,12,9,8,7,6,12,12,6,4,6,5,4,4,3,12,12,13,9,12,3,13,9,13,10,3,2,13,2,14,13,13,14,10,14,0,10,10,0,11,2,1,14,14,1,0],"vertices":[1,53,104.28,7.61,1,2,53,82.89,-50.5,0.99951,54,-48.49,-50.5,4.9E-4,2,53,153.25,-36.55,0.14444,54,21.87,-36.55,0.85556,2,54,77.43,-39.32,0.6598,55,-10.15,-39.32,0.3402,2,54,109.49,-47.29,0.13046,55,21.91,-47.29,0.86954,1,55,57.16,-40.73,1,1,55,52.45,-15.41,1,1,55,47.74,9.91,1,2,54,125.91,60.56,0.02568,55,38.33,60.56,0.97432,2,54,72.6,38.41,0.75452,55,-14.99,38.41,0.24548,2,53,143.6,34.18,0.27152,54,12.22,34.18,0.72848,2,53,98.68,38.5,0.99208,54,-32.7,38.5,0.00792,2,54,93.67,4.12,0.00469,55,6.08,4.12,0.99531,1,54,41.71,1.56,1,2,53,120.4,-8.83,0.9936,54,-10.98,-8.83,0.0064],"hull":12,"edges":[2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,2,0,0,22],"width":165,"height":316}},"r ear":{"r ear":{"type":"mesh","uvs":[0.69857,1,0.77644,0.96287,0.91662,0.9418,1,0.85986,1,0.73812,0.88287,0.63745,0.70269,0.44043,0.52251,0.24341,0.2811,0.12171,0.03969,0,0,0,0,0.05846,0.1565,0.26916,0.21101,0.42017,0.26552,0.57117,0.37455,0.87317,0.53809,0.98321,0.62894,1,0.51919,0.55974,0.34907,0.35226,0.64304,0.85127,0.45082,0.71211,0.67328,0.66834,0.84166,0.8086,0.49564,0.42023,0.38232,0.50585],"triangles":[23,4,3,2,23,3,1,23,2,20,0,17,1,0,20,11,10,9,8,11,9,12,11,8,19,8,7,12,8,19,13,12,19,24,19,7,24,7,6,25,19,24,13,19,25,25,24,18,14,13,25,18,24,6,22,18,6,22,6,5,21,25,18,21,18,22,14,25,21,23,22,5,23,5,4,20,21,22,20,22,23,15,14,21,15,21,20,1,20,23,16,15,20,17,16,20],"vertices":[1,26,115.29,-72.26,1,1,26,131.75,-76.54,1,1,26,154.76,-91.46,1,1,26,178.47,-89.38,1,1,26,196.05,-70.15,1,1,27,42.12,-50.83,1,2,27,96.13,-42.46,0.83404,28,-21.27,-39.39,0.16596,2,27,150.13,-34.08,0.01342,28,33.37,-40.42,0.98658,1,28,83.47,-22,1,1,28,133.57,-3.57,1,1,28,138.55,2.25,1,1,28,129.05,10.39,1,1,28,75.16,16.8,1,2,27,148.3,36.92,0.02051,28,43.78,29.84,0.97949,2,27,115.14,44.37,0.41739,28,12.4,42.88,0.58261,2,27,48.83,59.28,0.99749,28,-50.37,68.97,0.00251,1,27,12.47,44.16,1,1,26,105.38,-63.19,1,2,27,92.25,1.03,0.99824,28,-17.61,4.12,0.00176,2,27,147.19,6.59,1.0E-5,28,37.47,0.15,0.99999,1,27,26.41,12.33,1,2,27,70.95,29.02,0.97013,28,-33.78,35.36,0.02987,1,27,57.09,-12.68,1,1,27,14.69,-25.3,1,2,27,120.24,-10.3,0.11084,28,8.02,-11.86,0.88916,2,27,115.66,17.86,0.2898,28,8.34,16.67,0.7102],"hull":18,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,0],"width":193,"height":214}},"r ear ringa":{"r ear ringa":{"x":10.4,"y":3.04,"rotation":124.8,"width":30,"height":27}},"r ear ringb":{"r ear ringb":{"x":30.77,"y":3.76,"rotation":132.19,"width":76,"height":71}},"r ear ringb s":{"r ear ringb s":{"x":30.54,"y":-0.5,"rotation":145.49,"width":81,"height":69}},"r ear s":{"r ear s":{"type":"mesh","uvs":[0.67463,1,0.83732,1,1,1,1,0.8169,0.89791,0.56359,0.79359,0.43694,0.68927,0.31029,0.55018,0.21155,0.41109,0.1128,0.22808,0.02265,0,0,0,0.06987,0.10729,0.1772,0.20978,0.34464,0.37083,0.54642,0.42756,0.67736,0.4843,0.80831,0.67692,0.53182,0.48551,0.40941,0.75579,0.76242,0.55491,0.61196,0.86068,0.86604,0.37591,0.27458,0.62957,0.74313,0.87756,0.75199,0.27876,0.21553,0.77193,0.63155,0.34357,0.35862,0.625,0.41865],"triangles":[13,27,14,14,27,18,27,22,18,18,22,7,13,25,27,27,25,22,13,12,25,22,8,7,22,25,8,12,9,25,25,9,8,12,11,9,11,10,9,1,21,2,21,3,2,1,0,21,16,23,0,0,19,21,0,23,19,21,24,3,21,19,24,24,4,3,16,20,23,16,15,20,19,26,24,19,23,26,24,26,4,23,17,26,23,20,17,15,14,20,26,5,4,26,17,5,14,18,20,20,28,17,20,18,28,17,28,5,28,6,5,6,28,7,28,18,7],"vertices":[1,49,28.97,39.58,1,1,49,10.82,21.85,1,1,49,-7.33,4.11,1,1,49,9.68,-13.31,1,1,49,44.62,-26.28,1,1,49,68.03,-26.95,1,2,49,91.44,-27.63,0.95502,88,-21.77,-23.58,0.04498,2,49,116.14,-21.86,0.28599,88,3.59,-23.13,0.71401,1,88,28.95,-22.68,1,1,88,59.5,-17.61,1,1,88,91.21,-1.19,1,1,88,86.26,6.67,1,1,88,64.49,9.83,1,2,49,141.76,27.91,1.0E-5,88,39.09,20.15,0.99999,2,49,105.03,29.55,0.54673,88,3.53,29.47,0.45327,2,49,86.53,35.82,0.92801,88,-13.24,39.48,0.07199,2,49,68.03,42.09,0.99741,88,-30.02,49.5,0.00259,1,49,72.23,-5.21,1,2,49,104.97,4.01,0.79655,88,-1.9,4.51,0.20345,1,49,42,8.13,1,2,49,78.4,15.72,0.98808,88,-25.42,21.54,0.01192,1,49,20.66,6.56,1,1,88,22.13,-1.55,1,1,49,57.88,20.06,1,1,49,29.38,-6.13,1,1,88,39.14,-0.12,1,1,49,52.36,-6.08,1,2,49,125.53,14.65,0.01846,88,20.44,10.6,0.98154,2,49,88.54,-10.31,0.99669,88,-20.97,-6.05,0.00331],"hull":17,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,0],"width":156,"height":133}},"r eye":{"r eye":{"x":5.72,"y":0.66,"rotation":-160.06,"width":60,"height":27}},"r eye fire":{"eyefire/eyefire_00000":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00001":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00002":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00003":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00004":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00005":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00006":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00007":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00008":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00009":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00010":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00011":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00012":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00013":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00014":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00015":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00016":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00017":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00018":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00019":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00020":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00021":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00022":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00023":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00024":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00025":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00026":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00027":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00028":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00029":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00030":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00031":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00032":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00033":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00034":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00035":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00036":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64},"eyefire/eyefire_00037":{"x":2.08,"y":-24.76,"rotation":-177.67,"width":32,"height":64}},"r eye hurt":{"r eye hurt":{"x":162.63,"y":-138.57,"rotation":-42.44,"width":49,"height":78}},"r finger a":{"r finger a":{"x":112.78,"y":0.67,"rotation":95.46,"width":131,"height":321}},"r finger a2":{"r finger a":{"x":112.78,"y":0.67,"rotation":95.46,"width":131,"height":321}},"r finger b":{"r finger b":{"x":119.22,"y":11.56,"rotation":77.3,"width":195,"height":352}},"r finger b2":{"r finger b":{"x":119.22,"y":11.56,"rotation":77.3,"width":195,"height":352}},"r finger c":{"r finger c":{"x":134.42,"y":6.36,"rotation":77.37,"width":218,"height":421}},"r finger c2":{"r finger c":{"x":134.42,"y":6.36,"rotation":77.37,"width":218,"height":421}},"r finger d":{"r finger d":{"x":159.42,"y":8.42,"rotation":96.04,"width":156,"height":451}},"r finger d2":{"r finger d":{"x":159.42,"y":8.42,"rotation":96.04,"width":156,"height":451}},"r hand":{"r hand":{"type":"mesh","uvs":[1,1,0,1,0,0,1,0],"triangles":[1,2,3,1,3,0],"vertices":[221.31,134.74,182.59,-229.21,-41.15,-205.41,-2.43,158.54],"hull":4,"edges":[0,2,2,4,4,6,0,6],"width":366,"height":225}},"r leg":{"r leg":{"type":"mesh","uvs":[0.7409,0,0.62921,0.07564,0.39813,0.34299,0.31726,0.519,0.36347,0.60144,0.41181,0.60462,0.4,0.64394,0.27725,0.78161,0,0.90594,0,1,0.40262,1,0.38919,0.87659,0.5877,0.69354,0.59069,0.62619,0.55636,0.57266,0.58181,0.50632,0.79153,0.40491,0.93929,0.34965,1,0.20631,1,0.07507,0.88407,0],"triangles":[7,11,10,9,8,7,9,7,10,11,7,6,11,6,12,3,5,4,3,2,5,15,14,5,6,5,14,6,14,13,12,6,13,20,19,18,17,20,18,16,0,20,16,20,17,1,0,16,15,2,1,16,15,1,2,15,5],"vertices":[1,69,78.53,-106.62,1,1,69,148.14,-108.1,1,2,69,319.14,-67.25,0.93733,70,-65.9,-13.81,0.06267,3,69,399.06,-20.28,0.04469,70,-0.1,-79.09,0.95386,71,33.83,-122.84,0.00145,2,70,43.78,-66.34,0.95046,71,39.22,-77.47,0.04954,2,70,52.7,-41.87,0.81033,71,20.17,-59.7,0.18967,2,70,68.37,-53.23,0.40278,71,36.74,-49.71,0.59722,2,71,128.45,-42.71,0.5,73,0.87,-48.53,0.5,1,73,157.99,-18.45,1,1,73,165.85,24.58,1,1,73,-47.24,63.49,1,2,71,110.38,29.76,0.5,73,-50.44,5.74,0.5,2,70,119.6,36.8,0.72619,71,-26.16,32.59,0.27381,3,69,299.8,99.18,0.00796,70,90.07,47.38,0.96436,71,-47.42,9.53,0.02768,2,69,302.51,68.31,0.11979,70,60.91,36.88,0.88021,2,69,274.69,49.19,0.68231,70,35.32,58.89,0.31769,1,69,153.87,68.07,1,1,69,72.68,87.78,1,1,69,9.97,48.09,1,1,69,-21.97,-3.92,1,1,69,12.9,-66.31,1],"hull":21,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,0,40,10,30,10,28,12,24,26,12,14,22,4,30,32,2],"width":538,"height":465}},"r upparm":{"r upparm":{"type":"mesh","uvs":[0.5629,0,0.44107,0.13245,0.33446,0.35768,0,0.70057,0,1,0.50416,1,0.55593,0.91151,0.79695,0.90142,0.93211,0.83091,1,0.68376,1,0.44172,0.92622,0.17615,0.79786,0,0.65662,0.27214,0.71933,0.47436,0.75204,0.72291,0.40813,0.72836,0.31878,0.50647],"triangles":[1,0,13,17,3,2,13,16,2,13,2,1,16,13,14,6,16,14,17,2,16,15,6,14,6,15,7,16,4,3,16,3,17,5,16,6,4,16,5,13,0,12,13,12,11,14,13,11,14,11,10,15,14,10,9,15,10,8,15,9,7,15,8],"vertices":[2,3,191.71,419.51,0.5,18,-35.67,-142.37,0.5,1,18,50.36,-132.92,1,1,18,145.48,-88.64,1,1,18,377.9,-69.52,1,1,18,432.24,29.08,1,1,18,175.7,170.46,1,1,18,133.29,155.84,1,2,3,0.5,108.37,0.5,18,8.83,220.11,0.5,1,3,68.57,61.1,1,1,3,136.51,62.38,1,1,3,209.6,116.59,1,1,3,264.27,210.51,1,1,3,273.04,309.87,1,2,3,141.97,314.81,0.5,18,-33.97,-26.47,0.5,2,3,102.6,240.26,0.5,18,-29.18,57.7,0.5,2,3,38.86,169.32,0.5,18,-0.72,148.73,0.5,1,18,175.27,54.08,1,1,18,180.46,-44.04,1],"hull":13,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,16,18,18,20,20,22,22,24,0,24,0,26,26,28,28,30,30,14,14,16,12,32,32,34,34,4],"width":581,"height":376}},"r upparm 2":{"r upparm":{"type":"mesh","uvs":[0.40813,0.72836,0.31878,0.50647,0.33446,0.35768,0,0.70057,0,1,0.50416,1,0.55593,0.91151],"triangles":[1,3,2,0,4,3,0,3,1,5,0,6,4,0,5],"vertices":[1,18,175.27,54.08,1,1,18,180.46,-44.04,1,1,18,145.48,-88.64,1,1,18,377.9,-69.52,1,1,18,432.24,29.08,1,1,18,175.7,170.46,1,1,18,133.29,155.84,1],"hull":7,"edges":[4,6,6,8,8,10,10,12,12,0,0,2,2,4],"width":581,"height":376}},"s1":{"s1":{"path":"canying/s1","width":249,"height":284}},"s2":{"s2":{"path":"canying/s1","width":249,"height":284}},"s3":{"s3":{"path":"canying/s3","width":270,"height":260}},"s4":{"s4":{"path":"canying/s4","width":316,"height":211}},"s5":{"s5":{"path":"canying/s5","width":292,"height":214}},"s6":{"s6":{"path":"canying/s6","width":273,"height":212}},"skill":{"skill/0":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/1":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/2":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/3":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/4":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/5":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/6":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/7":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/8":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/9":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/10":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/11":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/12":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/13":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/14":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/15":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/16":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/17":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/18":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/19":{"x":8.28,"y":23.13,"width":534,"height":289},"skill/20":{"x":8.28,"y":23.13,"width":534,"height":289}},"skirt b":{"skirt b":{"type":"mesh","uvs":[0.55483,0.0745,0.27158,0,0.10839,0,0.07042,0.04782,0,0.13651,0,0.24672,0.07943,0.36639,0.08934,0.56514,0.09847,0.74821,0.10432,0.86567,0.11102,1,0.13246,1,0.22417,0.91358,0.33284,0.81118,0.43649,0.7135,0.5086,0.64554,0.58606,0.73603,0.66628,0.82975,0.72654,0.90014,0.81201,1,0.83809,1,0.86946,0.87562,0.89354,0.78014,0.92519,0.65463,0.95637,0.53101,0.97065,0.47438,0.98229,0.4282,1,0.35799,0.99881,0.28119,0.88446,0.16119,0.54426,0.20515,0.53488,0.32098,0.5287,0.39736,0.52041,0.49974],"triangles":[23,17,16,22,17,23,22,18,17,21,18,22,19,18,21,20,19,21,13,8,7,14,13,7,12,9,8,13,12,8,11,10,9,12,11,9,30,29,28,31,30,28,31,28,27,26,31,27,32,31,26,25,32,26,33,32,25,24,33,25,15,33,24,24,16,15,23,16,24,30,1,0,2,1,30,5,33,6,31,2,30,3,2,31,4,3,32,33,5,32,31,32,3,4,32,5,6,14,7,33,15,6,15,14,6,30,0,29],"vertices":[2,69,-29.26,-28.11,0.882,64,-55.27,28.56,0.118,1,69,39.43,-94.34,1,1,69,85.18,-122.44,1,1,69,102.7,-117.78,1,1,69,135.21,-109.12,1,1,69,151.07,-83.29,1,1,69,146.03,-41.58,1,2,69,171.86,6.7,0.9105,77,-31.34,-53.22,0.0895,2,69,195.65,51.17,0.10647,77,14.5,-32.2,0.89353,2,69,210.92,79.7,6.7E-4,77,43.92,-18.71,0.99933,1,77,77.56,-3.29,1,1,77,75,3.29,1,3,64,47.47,-204.95,4.1E-4,77,41.93,22.81,0.99946,78,46.91,-195.32,1.3E-4,4,69,139.02,106.28,0.05243,64,49.68,-159.49,0.03263,77,2.74,45.95,0.90459,78,19.62,-158.9,0.01035,4,69,95.9,101.25,0.26312,64,51.79,-116.13,0.16773,77,-34.64,68.02,0.51089,78,-6.41,-124.16,0.05826,4,69,65.9,97.74,0.23503,64,53.25,-85.96,0.37814,77,-60.65,83.37,0.19912,78,-24.52,-99.99,0.18771,4,69,57.21,132.28,0.05687,64,88.75,-83.06,0.32056,77,-46.68,116.13,0.05051,78,0.97,-75.11,0.57206,4,69,48.21,168.06,0.00712,64,125.52,-80.06,0.0588,77,-32.2,150.06,0.0109,78,27.37,-49.35,0.92318,4,69,41.45,194.93,2.6E-4,64,153.13,-77.8,1.5E-4,77,-21.33,175.55,0.00173,78,47.2,-30,0.99786,1,78,75.33,-2.54,1,1,78,75.54,6.03,1,2,64,178.9,-37.9,0.02489,78,41.59,17.17,0.97511,2,64,164.29,-14.69,0.42853,78,15.53,25.73,0.57147,1,64,145.07,15.82,1,1,64,126.15,45.87,1,1,64,117.48,59.63,1,1,64,110.41,70.85,1,1,64,99.67,87.92,1,1,64,83.47,101.48,1,2,69,-109.18,48.97,8.3E-4,64,33.88,94.75,0.99917,2,69,-7.48,0.69,0.88955,64,-30.44,2.36,0.11045,4,69,11.82,26.21,0.46467,64,-8.43,-20.87,0.52721,77,-146.98,59.13,0.00502,78,-113.54,-89.2,0.0031,4,69,24.55,43.05,0.38003,64,6.09,-36.19,0.57426,77,-126.67,64.83,0.02605,78,-92.59,-91.74,0.01966,4,69,41.61,65.61,0.32084,64,25.54,-56.72,0.5139,77,-99.43,72.48,0.08787,78,-64.51,-95.14,0.0774],"hull":30,"edges":[2,4,8,10,20,22,38,40,54,56,56,58,4,6,6,8,16,26,12,30,12,14,14,16,26,28,28,30,14,28,16,18,18,20,22,24,24,26,18,24,30,48,30,32,46,48,32,46,32,34,44,46,34,44,34,36,36,38,40,42,42,44,36,42,10,12,52,54,48,50,50,52,2,0,0,58,0,60,60,56,62,60,54,62,64,62,52,64,30,66,66,64,66,50,60,4,6,62,64,8,10,66],"width":329,"height":275}},"skirt f":{"skirt f":{"type":"mesh","uvs":[0.76659,0.10516,0.53321,0.09018,0.31685,0,0.11097,0,0,0.15158,0,0.18723,0.11172,0.28589,0.12084,0.3891,0.12749,0.46441,0.14327,0.64294,0.15904,0.82147,0.17482,1,0.28922,1,0.40363,1,0.63244,1,0.72433,0.8302,0.81622,0.6604,0.90811,0.4906,0.94806,0.40504,0.99999,0.29383,1,0.07988,0.46626,0.67526,0.59829,0.42794,0.36219,0.39794,0.72087,0.52069,0.30873,0.80022,0.45151,0.88401,0.45759,0.53275,0.44099,0.2974,0.71835,0.32344,0.55373,0.76966,0.31134,0.54266,0.60346,0.63165,0.22468,0.23695,0.8356,0.39205],"triangles":[22,28,29,28,23,33,34,29,19,28,1,29,29,0,19,29,1,0,28,33,1,19,0,20,2,33,4,33,2,1,2,4,3,33,5,4,13,26,14,14,26,15,13,12,26,26,12,10,26,10,25,10,12,11,26,30,15,26,25,30,15,30,16,10,9,25,25,21,30,25,9,21,30,32,16,30,21,32,9,31,21,31,27,21,21,27,32,32,24,16,16,24,17,9,8,31,32,27,24,27,31,23,31,8,23,27,22,24,27,23,22,24,34,17,24,22,34,17,34,18,8,7,23,23,28,22,22,29,34,18,34,19,33,23,6,23,7,6,6,5,33],"vertices":[1,2,8.55,-46.79,1,1,2,7.07,18.74,1,1,2,43.71,84.76,1,1,2,35.82,141.66,1,1,2,-43.96,161.85,1,1,74,-25.95,-164.56,1,2,74,20.82,-129.24,0.991,75,-127.98,-129.24,0.009,2,74,72.32,-122.25,0.9168,75,-76.48,-122.25,0.0832,2,74,109.91,-117.14,0.77199,75,-38.89,-117.14,0.22801,3,74,199,-105.04,0.17387,75,50.2,-105.04,0.72762,76,-49,-105.04,0.09851,3,74,288.09,-92.95,3.7E-4,75,139.29,-92.95,0.25441,76,40.09,-92.95,0.74522,2,75,228.38,-80.85,5.6E-4,76,129.18,-80.85,0.99944,1,76,126.44,-49.05,1,1,76,123.7,-17.25,1,1,76,118.21,46.36,1,2,75,130.12,64.56,0.22231,76,30.92,64.56,0.77769,3,74,191.62,82.77,0.16701,75,42.82,82.77,0.81073,76,-56.38,82.77,0.02226,2,74,104.32,100.98,0.87402,75,-44.47,100.98,0.12598,2,74,60.49,108.39,0.98435,75,-88.31,108.39,0.01565,1,2,-76.5,-124.33,1,1,2,30.09,-109.55,1,3,74,207.45,-13.87,0.00222,75,58.65,-13.87,0.99232,76,-40.55,-13.87,0.00547,1,74,80.34,12.15,1,2,74,70.97,-54.78,0.96235,75,-77.83,-54.78,0.03765,2,74,123.89,50.23,0.79891,75,-24.91,50.23,0.20109,2,75,125.05,-52.26,0.27119,76,25.85,-52.26,0.72881,2,75,163.62,-8.95,9.4E-4,76,64.42,-8.95,0.99906,2,74,136.24,-22.43,0.7678,75,-12.56,-22.43,0.2322,1,2,-99.7,29.91,1,1,2,-102.05,-48.54,1,2,75,103.87,14.53,0.33551,76,4.67,14.53,0.66449,3,74,144.71,-62.66,0.53214,75,-4.09,-62.66,0.46626,76,-103.28,-62.66,0.0016,2,74,182.31,22.39,0.03446,75,33.51,22.39,0.96554,1,2,-77.88,93.87,1,2,74,56.67,76.56,0.98952,75,-92.13,76.56,0.01048],"hull":21,"edges":[6,8,8,10,10,12,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,8,66,66,56,56,58,58,38,34,36,36,38,12,14,14,16,38,40,6,4,66,4,4,2,56,2,2,0,0,40,58,0],"width":279,"height":503}},"tail":{"tail":{"type":"mesh","uvs":[0.86601,0,0.77697,0.0272,0.68794,0.05441,0.58182,0.11908,0.50537,0.23825,0.42893,0.35743,0.45231,0.41102,0.40195,0.44612,0.34979,0.41656,0.28504,0.32048,0.2005,0.28722,0.08359,0.32602,0,0.43688,0,0.5302,0,0.62351,0.0602,0.56068,0.11376,0.59366,0.10476,0.69159,0.12994,0.7886,0.15512,0.8856,0.23427,0.9428,0.31341,1,0.41863,1,0.52385,1,0.67134,0.94658,0.74239,0.89115,0.81344,0.83572,0.92496,0.71007,0.99151,0.60475,0.99575,0.49019,1,0.37563,1,0.27406,1,0.17249,0.98047,0.08624,0.96093,0,0.77729,0.55777,0.31623,0.71699,0.5658,0.70194,0.6858,0.26757,0.8362,0.23794,0.57194,0.45103,0.47806,0.87273,0.4433,0.52477,0.22564,0.46302,0.72838,0.72388,0.81124,0.39667,0.61736,0.59178,0.32775,0.54978,0.35419,0.86041,0.44331,0.68815,0.83926,0.12218,0.62985,0.84682,0.66152,0.41712,0.20303,0.63394,0.91514,0.485,0.73469,0.13814,0.85807,0.65295,0.23248,0.80486,0.91228,0.35372,0.5283,0.59155,0.55111,0.35677,0.09778,0.45666,0.68787,0.48294],"triangles":[14,13,15,15,61,16,15,13,61,13,12,61,12,11,61,43,61,11,53,43,47,16,61,43,47,7,42,47,8,7,47,43,8,43,11,10,43,9,8,43,10,9,19,18,57,36,57,53,57,18,53,18,17,53,36,53,47,17,16,53,53,16,43,22,41,23,23,51,24,23,41,51,21,48,22,22,48,41,21,20,48,24,51,25,19,57,20,20,57,48,48,49,41,41,37,51,41,49,37,57,36,48,48,36,49,36,47,49,47,42,49,26,25,44,25,51,44,51,37,44,26,56,27,26,44,56,37,46,44,44,35,56,44,46,35,27,56,28,49,59,37,37,59,46,49,42,59,56,54,28,56,35,54,59,40,46,46,62,35,62,40,52,62,46,40,59,42,40,35,62,45,42,6,40,42,7,6,62,52,45,6,60,40,40,60,52,6,5,60,28,54,29,35,45,54,29,54,30,45,58,54,54,58,30,52,38,45,52,60,38,45,39,58,45,38,39,58,31,30,5,4,60,60,4,38,58,39,31,31,39,32,32,39,50,50,33,32,4,3,38,38,55,39,38,3,55,50,0,33,0,34,33,39,55,50,3,2,55,55,1,50,55,2,1,50,1,0],"vertices":[1,79,-42.87,-71.32,1,1,79,-5.86,-91.15,1,3,79,31.15,-110.98,0.99893,80,-154.26,-45.6,4.5E-4,83,13.88,-297.41,6.3E-4,3,79,85.25,-124.53,0.95456,80,-112.31,-82.35,0.03695,83,23.67,-242.51,0.00849,4,79,146.7,-111.61,0.69671,80,-51.73,-98.9,0.25579,81,5.22,-227.87,2.0E-5,83,6.53,-182.09,0.04748,4,79,208.16,-98.69,0.31032,80,8.85,-115.45,0.53865,81,45.32,-179.54,0.00956,83,-10.6,-121.68,0.14146,5,79,217.25,-74.5,0.16641,80,27.98,-98.08,0.57721,81,37.4,-154.94,0.03031,82,148.18,-116.75,0.00162,83,-35.36,-114.28,0.22444,5,79,244.29,-79.55,0.02905,80,49.73,-114.91,0.38417,81,61.73,-142.09,0.06291,82,136.81,-91.7,0.01309,83,-32.18,-86.95,0.51077,5,79,251.88,-105.39,0.00302,80,44.69,-141.37,0.15618,81,83.73,-157.6,0.0301,82,153.62,-70.67,6.8E-4,83,-6.93,-77.6,0.81003,3,80,13.6,-182.32,0.02712,81,108.19,-202.83,8.4E-4,83,44.2,-83.05,0.97204,3,80,11.57,-223.19,0.0048,83,80.24,-63.68,0.94097,84,-65.73,-5.47,0.05423,2,83,101.83,-12.51,0.2921,84,-19.28,-35.91,0.7079,1,84,42.41,-34.71,1,1,84,74.38,-8.95,1,1,84,106.34,16.82,1,3,82,113.3,69.08,0.07266,83,30.56,62.94,0.08176,84,67.75,20.66,0.84558,3,82,94.9,47.68,0.57185,83,3.76,54.09,0.17221,84,63.86,48.61,0.25594,3,82,53.12,58.98,0.97648,83,-26.21,85.31,0.00456,84,99.96,72.48,0.01896,3,81,200.46,-5.8,0.09295,82,9.13,54.99,0.90704,84,126.05,108.13,1.0E-5,2,81,193.83,37.88,0.54563,82,-34.87,51.01,0.45437,2,81,161.04,66.82,0.91652,82,-65.73,20.02,0.08348,1,81,128.25,95.76,1,1,81,80.97,100.98,1,2,80,264.25,13.19,0.01246,81,33.7,106.19,0.98754,3,79,312.81,162.56,2.4E-4,80,221.19,69.25,0.31653,81,-35.14,90.15,0.68323,3,79,272.83,167.84,0.00866,80,188.03,92.19,0.62689,81,-69.74,69.43,0.36445,3,79,232.85,173.13,0.04125,80,154.87,115.14,0.83373,81,-104.34,48.71,0.12502,3,79,158.13,169.34,0.21227,80,86.66,145.87,0.78597,81,-160.5,-0.71,0.00175,2,79,104.15,157.6,0.4043,80,33.27,160.06,0.5957,2,79,67.3,123.15,0.62991,80,-15.24,146.22,0.37009,2,79,30.46,88.7,0.8698,80,-63.75,132.38,0.1302,2,79,-1,56.96,0.97761,80,-106.23,118.5,0.02239,2,79,-32.46,25.22,0.99981,80,-148.71,104.61,1.9E-4,1,79,-52.9,-7.95,1,1,79,-73.35,-41.12,1,2,79,158.37,74.76,0.23918,80,43.71,61.61,0.76082,4,80,175.05,-114.71,0.01481,81,113.31,-27.87,0.55454,82,25.91,-33.33,0.41217,83,-97.11,20.24,0.01848,4,80,133.71,-9.55,0.84984,81,0.46,-22.08,0.14613,82,13.33,-145.62,8.7E-4,83,-165.79,-69.5,0.00316,3,79,97.86,-45.04,0.97689,80,-64.81,-17.38,0.01798,83,-56.51,-235.41,0.00514,1,79,40.4,-6.45,1,5,79,191.23,-23.93,0.08553,80,27.91,-41.21,0.83201,81,-14.41,-131.51,0.01142,82,121.67,-167.06,1.6E-4,83,-84.01,-143.71,0.07087,1,81,48.13,48.26,1,5,79,255.37,-41.82,0.01222,80,76.82,-86.4,0.50088,81,46.95,-105.64,0.13185,82,99.54,-104.26,0.04564,83,-70.59,-78.49,0.30941,4,80,81.56,-188.35,0.01759,81,141.75,-143.44,0.00241,82,142.98,-11.9,0.03233,83,14.25,-21.76,0.94767,3,79,225.52,111.12,0.03643,80,120.05,63.31,0.92236,81,-71.52,-4.42,0.04122,2,79,97.57,35.22,0.86912,80,-28.44,54.17,0.13088,4,80,80.39,-2.45,0.99635,81,-28.02,-67.7,0.00187,82,57.16,-176.8,1.4E-4,83,-144.31,-118.81,0.00164,5,79,300.22,-70.77,2.0E-4,80,103.5,-132.62,0.14731,81,100.07,-100.43,0.10732,82,97.54,-50.92,0.2557,83,-44.81,-31.76,0.48947,1,81,103.18,36.73,1,4,80,145.14,-64.05,0.18193,81,54.83,-34.18,0.70539,82,28.69,-92.09,0.06015,83,-125.03,-31.54,0.05253,1,79,3.56,-41.65,1,3,79,295.23,118.18,5.0E-4,80,185.3,37.78,0.36535,81,-21.32,44.46,0.63415,4,79,151.97,-6.03,0.367,80,1.14,-7.36,0.62916,81,-56.29,-141.9,3.0E-5,83,-99.16,-184.12,0.00381,2,82,70.6,10.91,0.99072,84,52.33,91.15,0.00928,2,79,91.57,95.88,0.62265,80,-6.09,110.88,0.37735,3,79,42.07,-69.93,0.99938,80,-125.81,-14.07,1.4E-4,83,-27.82,-289.34,4.7E-4,3,79,161.92,130.21,0.21468,80,72.17,109.32,0.78462,81,-133.21,-29.01,6.9E-4,2,81,155.18,6.4,0.44908,82,-5.77,10.53,0.55092,2,79,51.83,53.94,0.91358,80,-60.59,91.7,0.08642,4,80,92.81,-40.75,0.76617,81,11.98,-72.22,0.13802,82,64.07,-137.15,0.01562,83,-117.94,-88.39,0.0802,4,79,168.73,-60.02,0.43901,80,-8.59,-63.05,0.48475,81,-9.6,-173.76,0.00298,83,-46.46,-163.68,0.07326,3,82,155.53,44.58,3.4E-4,83,54.12,20.17,0.11655,84,21.45,5.16,0.88311,2,79,163.9,22.92,0.07152,80,24.97,12.96,0.92848],"hull":35,"edges":[0,2,2,4,4,6,6,8,8,10,10,12,12,14,14,16,16,18,18,20,20,22,22,24,24,26,26,28,28,30,30,32,32,34,34,36,36,38,38,40,40,42,42,44,44,46,46,48,48,50,50,52,52,54,54,56,56,58,58,60,60,62,62,64,64,66,66,68,68,0],"width":452,"height":440}},"zhuaji":{"attack/0":{"x":0.5,"y":0.5,"width":307,"height":125},"attack/1":{"path":"attack/b","x":0.5,"y":0.5,"width":307,"height":125},"attack/2":{"path":"attack/c","x":0.5,"y":0.5,"width":307,"height":125},"attack/3":{"path":"attack/d","x":0.5,"y":0.5,"width":307,"height":125}},"zhuaji2":{"attack/0":{"path":"attack/a","x":0.5,"y":0.5,"width":307,"height":125},"attack/1":{"path":"attack/b","x":0.5,"y":0.5,"width":307,"height":125},"attack/2":{"path":"attack/c","x":0.5,"y":0.5,"width":307,"height":125},"attack/3":{"path":"attack/d","x":0.5,"y":0.5,"width":307,"height":125}}}}],"animations":{"animation":{},"attack":{"slots":{"r eye fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00004"},{"time":0.1,"name":"eyefire/eyefire_00006"},{"time":0.1333,"name":"eyefire/eyefire_00008"},{"time":0.1667,"name":"eyefire/eyefire_00010"},{"time":0.2,"name":"eyefire/eyefire_00012"},{"time":0.2333,"name":"eyefire/eyefire_00014"},{"time":0.2667,"name":"eyefire/eyefire_00016"},{"time":0.3,"name":"eyefire/eyefire_00018"},{"time":0.3333,"name":"eyefire/eyefire_00020"},{"time":0.3667,"name":"eyefire/eyefire_00022"},{"time":0.4,"name":"eyefire/eyefire_00024"},{"time":0.4333,"name":"eyefire/eyefire_00026"},{"time":0.4667,"name":"eyefire/eyefire_00028"},{"time":0.5,"name":"eyefire/eyefire_00030"},{"time":0.5333,"name":"eyefire/eyefire_00032"},{"time":0.5667,"name":"eyefire/eyefire_00034"},{"time":0.6,"name":"eyefire/eyefire_00036"},{"time":0.6333,"name":"eyefire/eyefire_00000"},{"time":0.6667,"name":"eyefire/eyefire_00002"},{"time":0.7,"name":"eyefire/eyefire_00004"},{"time":0.7333,"name":"eyefire/eyefire_00006"},{"time":0.7667,"name":"eyefire/eyefire_00008"},{"time":0.8,"name":"eyefire/eyefire_00010"},{"time":0.8333,"name":"eyefire/eyefire_00012"},{"time":0.8667,"name":"eyefire/eyefire_00014"},{"time":0.9,"name":"eyefire/eyefire_00016"},{"time":0.9333,"name":"eyefire/eyefire_00018"},{"time":0.9667,"name":"eyefire/eyefire_00020"},{"time":1,"name":"eyefire/eyefire_00022"},{"time":1.0333,"name":"eyefire/eyefire_00024"},{"time":1.0667,"name":"eyefire/eyefire_00026"},{"time":1.1,"name":"eyefire/eyefire_00028"},{"time":1.1333,"name":"eyefire/eyefire_00030"},{"time":1.1667,"name":"eyefire/eyefire_00032"},{"time":1.2,"name":"eyefire/eyefire_00034"},{"time":1.2333,"name":"eyefire/eyefire_00036"},{"time":1.2667,"name":"eyefire/eyefire_00000"},{"time":1.3,"name":"eyefire/eyefire_00002"},{"time":1.3333,"name":"eyefire/eyefire_00000"}]},"s1":{"color":[{"color":"4951ff00"},{"time":0.5667,"color":"49faff00"},{"time":0.6,"color":"49d8ff81"},{"time":0.7333,"color":"4951ff00"}]},"s2":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6,"color":"4951ff00"},{"time":0.6333,"color":"49b8ff81"},{"time":0.7667,"color":"4951ff00"}]},"s3":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6333,"color":"4951ff00"},{"time":0.6667,"color":"49f0ff81"},{"time":0.8,"color":"4951ff00"}]},"s4":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.6667,"color":"4951ff00"},{"time":0.7,"color":"49f7ff81"},{"time":0.8333,"color":"4951ff00"}]},"s5":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.7,"color":"4951ff00"},{"time":0.7333,"color":"49ebff81"},{"time":0.8667,"color":"4951ff00"}]},"s6":{"color":[{"color":"4951ff00","curve":"stepped"},{"time":0.7333,"color":"4951ff00"},{"time":0.7667,"color":"49e1ff81"},{"time":0.9,"color":"4951ff00"}]},"zhuaji":{"attachment":[{"name":null},{"time":0.6667,"name":"attack/0"},{"time":0.7333,"name":"attack/1"},{"time":0.8,"name":"attack/2"},{"time":0.8667,"name":"attack/3"},{"time":0.9333,"name":null}]},"zhuaji2":{"attachment":[{"name":null},{"time":0.6667,"name":"attack/0"},{"time":0.7333,"name":"attack/1"},{"time":0.8,"name":"attack/2"},{"time":0.8667,"name":"attack/3"},{"time":0.9333,"name":null}]}},"bones":{"r ik":{"rotate":[{"time":0.1333,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1667,"angle":38.69},{"time":0.2667,"angle":2.56,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"angle":31.51},{"time":0.6667,"angle":-22.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.7}],"translate":[{"time":0.1333,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.1667,"x":24.02,"y":22.96},{"time":0.2667,"x":170.96,"y":133.44,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":127.36,"y":286.82},{"time":0.6667,"x":150,"y":122.9,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7}],"scale":[{"time":0.1333,"curve":0.25,"c3":0.75},{"time":0.1667,"x":0.503,"y":-0.381},{"time":0.2667,"y":-1,"curve":"stepped"},{"time":0.6333,"y":-1},{"time":0.6667,"y":-1.629,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.7}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":-59.77,"y":49.83,"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.1667,"x":-178.66,"y":-151.92},{"time":0.2667,"x":-3.42,"y":47.53,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":0.16,"y":17.95},{"time":0.6667,"x":80.42,"y":-14.4,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"x":-20.57,"y":2.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"x":67.02,"y":-70.19,"curve":0.349,"c2":0.39,"c3":0.69,"c4":0.75},{"time":1.0667,"x":29.46,"y":-24.29,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"x":-59.3,"y":6,"curve":0.364,"c2":0.64,"c3":0.701},{"time":1.3333}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":82.85,"y":-12.22,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"x":47.4,"y":-37.21,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"x":-17.65,"y":-32.13,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.6667,"x":43.49,"y":42.81,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"x":21.85,"y":9.36,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7667,"x":-62.69,"y":-76.55,"curve":0.342,"c2":0.36,"c3":0.687,"c4":0.73},{"time":1.0667,"x":3.36,"y":12.83,"curve":0.379,"c2":0.6,"c3":0.723},{"time":1.3333}]},"l ik":{"rotate":[{"time":0.0667,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1333,"angle":-34.28,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"angle":-63.4,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.6667,"angle":2.03,"curve":"stepped"},{"time":0.7,"angle":2.03,"curve":0.365,"c2":0.45,"c3":0.754},{"time":1.3333}],"translate":[{"time":0.0667,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1333,"x":-60.34,"y":70.73,"curve":0.297,"c2":0.18,"c3":0.638,"c4":0.55},{"time":0.6,"x":-151.67,"y":380.94,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":29.71,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1333,"angle":7.38,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.6,"angle":36.02,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":76.11,"curve":0.338,"c2":0.36,"c3":0.671,"c4":0.69},{"time":0.7667,"angle":13.31,"curve":0.348,"c2":0.44,"c3":0.682,"c4":0.78},{"time":1.0667,"angle":21.11,"curve":0.35,"c2":0.65,"c3":0.684},{"time":1.3333,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":"stepped"},{"time":0.1333,"x":-7.85,"y":2.92,"curve":0.347,"c2":0.39,"c3":0.682,"c4":0.73},{"time":0.6,"x":99.36,"y":8.92,"curve":0.367,"c2":0.63,"c3":0.704},{"time":1.3333,"x":-7.85,"y":2.92}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":37.22,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":73.39,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":77.65,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":22.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":50.48,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":48.95,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":59.93,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":1.54,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-6.68,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"angle":-4.77,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}],"translate":[{"time":0.0667,"curve":0.325,"c2":0.23,"c3":0.659,"c4":0.56},{"time":0.1333,"x":39.49,"y":101.31,"curve":0.305,"c2":0.17,"c3":0.641,"c4":0.52},{"time":0.6,"x":6.66,"y":41.87,"curve":0.329,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.6667,"x":28.08,"y":83.67,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"x":5.91,"y":37.16,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7333,"x":-29.5,"y":109.03,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7667,"x":-21.98,"y":129.19,"curve":0.322,"c2":0.3,"c3":0.658,"c4":0.64},{"time":1.0333,"x":0.7,"y":-13.01,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.0667,"x":-19.75,"y":-19.42,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.1667,"x":-16.77,"y":-3.81,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.3333}]},"l upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":8.27,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":1.52,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":-25.71,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":37.43,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":30.18,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":8.56,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":-4.37,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":-2.06,"curve":0.38,"c2":0.6,"c3":0.725},{"time":1.3333,"angle":-6.45}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":45.87,"y":-1.01,"curve":0.287,"c2":0.15,"c3":0.634,"c4":0.54},{"time":0.6,"x":12.36,"y":-44.52,"curve":0.329,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.7,"x":-15.16,"y":-9.56,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"x":-100.98,"y":22.47,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-34.69,"y":12.67,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"x":-54.29,"y":-30.69,"curve":0.38,"c2":0.6,"c3":0.725},{"time":1.3333}]},"l finger a":{"rotate":[{"angle":-2.5}]},"l finger a2":{"rotate":[{"angle":5.32}],"translate":[{"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5}]},"l finger b2":{"rotate":[{"angle":16.78}],"translate":[{"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5}]},"l finger c2":{"rotate":[{"angle":16.54}],"translate":[{"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"l finger d":{"rotate":[{"angle":-2.5}]},"l finger d2":{"rotate":[{"angle":26.01}],"translate":[{"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r upparm":{"rotate":[{"angle":-6.94,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-42.16,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"angle":2.03,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":47.11,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":79.85,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":55.18,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":6.04,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":-0.99,"curve":0.337,"c2":0.35,"c3":0.674,"c4":0.69},{"time":0.9333,"angle":-35.06,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"angle":-32.65,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-28.99,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"angle":-6.33,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":25.34,"y":-85.66,"curve":0.289,"c2":0.17,"c3":0.641,"c4":0.57},{"time":0.6,"x":65.74,"y":35.42,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"x":117.09,"y":-47.26,"curve":0.34,"c2":0.35,"c3":0.679,"c4":0.71},{"time":0.9333,"x":-13.82,"y":-152.47,"curve":0.341,"c2":0.36,"c3":0.676,"c4":0.7},{"time":1.0333,"x":3.6,"y":-136.8,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":30.12,"y":-113.75,"curve":0.375,"c2":0.62,"c3":0.715},{"time":1.3333}]},"r upparm2":{"rotate":[{"angle":12.97,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-1.38,"curve":0.322,"c2":0.23,"c3":0.656,"c4":0.56},{"time":0.0667,"angle":12.97,"curve":0.308,"c3":0.643,"c4":0.35},{"time":0.1,"angle":42.24,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":59,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":24.1,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":18.81,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":0.7,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":14.3,"curve":0.337,"c2":0.35,"c3":0.674,"c4":0.69},{"time":0.9333,"angle":15.51,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"angle":31.74,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":35.18,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333,"angle":12.97}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.6,"x":122.67,"y":45.28,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":73.71,"y":95.62,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":-46.55,"y":-38.81,"curve":0.335,"c2":0.34,"c3":0.675,"c4":0.69},{"time":0.9333,"x":-24.66,"y":-20.56,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"x":42.13,"y":20.67,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":25.48,"y":11.95,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333}]},"r finger a":{"rotate":[{"angle":14.41}]},"r finger b":{"rotate":[{"angle":-8.92}]},"r finger c":{"rotate":[{"angle":-9.49}]},"r finger d":{"rotate":[{"angle":7.12}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-28.12,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":44.43,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-3.92,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":-9.95,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.7667,"angle":-4.89,"curve":0.353,"c2":0.42,"c3":0.689,"c4":0.77},{"time":1.0667,"angle":-2.65,"curve":0.343,"c2":0.4,"c3":0.677,"c4":0.74},{"time":1.1667,"angle":-6.58,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"angle":-4.31}],"translate":[{"time":0.1333,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"x":-82.09,"y":-2.66,"curve":0.333,"c2":0.33,"c3":0.669,"c4":0.67},{"time":0.7667}]},"r ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":23.99,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"angle":5.22,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"angle":-18.84,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"angle":7.33,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"angle":-13.57,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"angle":19.53,"curve":0.349,"c2":0.39,"c3":0.69,"c4":0.75},{"time":1.0667,"angle":-8.27,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":7.25,"curve":0.364,"c2":0.64,"c3":0.701},{"time":1.3333}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-17.47,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-7.31,"curve":0.336,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.3667,"angle":19.96,"curve":0.34,"c2":0.36,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-21.12,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":13.14,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":-13.39,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-41.77,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.9333,"angle":27.48,"curve":0.343,"c2":0.39,"c3":0.677,"c4":0.73},{"time":1.0667,"angle":-3.74,"curve":0.342,"c2":0.4,"c3":0.676,"c4":0.74},{"time":1.1667,"angle":-17.22,"curve":0.351,"c2":0.65,"c3":0.686},{"time":1.3333,"angle":-2.28}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0667,"angle":23.99,"curve":0.326,"c2":0.23,"c3":0.66,"c4":0.56},{"time":0.1333,"angle":5.22,"curve":0.296,"c2":0.14,"c3":0.635,"c4":0.5},{"time":0.6,"angle":-18.84,"curve":0.33,"c2":0.32,"c3":0.664,"c4":0.65},{"time":0.6667,"angle":7.33,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.7,"angle":-13.57,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.7667,"angle":19.53,"curve":0.324,"c2":0.3,"c3":0.66,"c4":0.64},{"time":1.0667,"angle":-8.27,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.1667,"angle":7.25,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.3333}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-11.92,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":-1.76,"curve":0.336,"c2":0.34,"c3":0.671,"c4":0.68},{"time":0.3667,"angle":25.52,"curve":0.34,"c2":0.36,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-15.57,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.6667,"angle":18.69,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":-7.84,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-36.22,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":0.9333,"angle":33.03,"curve":0.343,"c2":0.39,"c3":0.677,"c4":0.73},{"time":1.0667,"angle":1.81,"curve":0.342,"c2":0.4,"c3":0.676,"c4":0.74},{"time":1.1667,"angle":-11.67,"curve":0.351,"c2":0.65,"c3":0.686},{"time":1.3333,"angle":3.27}]},"head2":{"rotate":[{"time":0.6667,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"angle":5.87,"curve":0.377,"c2":0.51,"c3":0.748},{"time":1.0667}]},"r leg":{"scale":[{"time":0.1333,"curve":0.25,"c3":0.75},{"time":0.1667,"x":0.787,"y":-1,"curve":"stepped"},{"time":0.6333,"x":0.787,"y":-1},{"time":0.6667}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":25.34,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"angle":-42.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-24.81,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"angle":161.27,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"angle":-143.61,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.6667,"angle":108.86,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"angle":36.8,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"angle":-4.25,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.8,"angle":-31.24,"curve":0.342,"c2":0.37,"c3":0.676,"c4":0.7},{"time":0.9333,"angle":-58.68,"curve":0.341,"c2":0.37,"c3":0.675,"c4":0.71},{"time":1.0333,"angle":-90.06,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"angle":-48.42,"curve":0.343,"c2":0.4,"c3":0.677,"c4":0.74},{"time":1.1667,"angle":-6.5,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-135.88,"y":5.39,"curve":0.325,"c2":0.23,"c3":0.659,"c4":0.56},{"time":0.0667,"x":-256.76,"y":63.87,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"x":318.1,"y":-171.89,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"x":1082.98,"y":45.2,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"x":754.88,"y":728.06,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":1273.35,"y":-53.61,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":455.27,"y":-180.44,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-64.06,"y":-103.48,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.8,"x":-68.82,"y":-25.93,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9333,"x":-153.32,"y":121.18,"curve":0.341,"c2":0.36,"c3":0.675,"c4":0.7},{"time":1.0333,"x":-58.69,"y":40.26,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.0667,"x":-44.28,"y":-55.53,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"x":122.47,"y":-55.31,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":0.803,"y":0.682,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"y":-1,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"x":0.994,"y":-0.844,"curve":"stepped"},{"time":0.7,"x":0.994,"y":-0.844,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7667,"x":0.831,"y":-0.93,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.8,"x":0.789,"y":-0.755,"curve":"stepped"},{"time":1.0333,"x":0.789,"y":-0.755,"curve":0.33,"c2":0.32,"c3":0.665,"c4":0.66},{"time":1.0667,"x":0.695,"curve":0.25,"c3":0.75},{"time":1.3333}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-9.73,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"angle":-23.13,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":4.69,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":-61.02,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7667,"angle":-32.79,"curve":0.345,"c2":0.37,"c3":0.689,"c4":0.74},{"time":1.0667,"angle":-13.92,"curve":0.378,"c2":0.61,"c3":0.721},{"time":1.3333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":-186.25,"curve":0.319,"c2":0.23,"c3":0.653,"c4":0.57},{"time":0.1333,"x":48.5,"y":40.9,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"y":345.15,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"x":248.34,"y":-36.38,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"x":61.3,"y":-61.66,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"x":-206.23,"y":-101.45,"curve":0.345,"c2":0.37,"c3":0.689,"c4":0.74},{"time":1.0667,"x":2.79,"y":-19.68,"curve":0.347,"c2":0.39,"c3":0.681,"c4":0.73},{"time":1.1667,"x":29.1,"y":32.67,"curve":0.367,"c2":0.63,"c3":0.705},{"time":1.3333}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-31,"curve":0.326,"c2":0.27,"c3":0.66,"c4":0.61},{"time":0.1,"angle":78.45,"curve":0.327,"c2":0.29,"c3":0.66,"c4":0.62},{"time":0.1333,"angle":-152.46,"curve":0.295,"c2":0.19,"c3":0.64,"c4":0.56},{"time":0.6,"angle":-87.67,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.6667,"angle":-9.66,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.66},{"time":0.7,"angle":-105.82,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.7333,"angle":41.72,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7667,"angle":27.63,"curve":0.343,"c2":0.36,"c3":0.684,"c4":0.72},{"time":1.0333,"angle":3.14,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.3333,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":103.03,"y":16.59,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.0667,"x":349.17,"y":93.6,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":377,"y":129.38,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"x":432.04,"y":252.54,"curve":0.339,"c2":0.35,"c3":0.675,"c4":0.69},{"time":0.6,"x":-13.24,"y":1029.9,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.6667,"x":532.83,"y":177.15,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7,"x":362.28,"y":224.75,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7333,"x":252.8,"y":12.37,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.7667,"x":80.29,"y":-97.37,"curve":0.351,"c2":0.41,"c3":0.686,"c4":0.75},{"time":1.0333,"x":15.48,"y":-24.23,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.1667,"x":-52.17,"y":55.03,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1.3333,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":"stepped"},{"time":0.0667,"x":0.95,"y":0.95,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":0.95,"y":-0.95,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1333,"x":1.29,"y":-1.29,"curve":0.347,"c2":0.38,"c3":0.688,"c4":0.74},{"time":0.6,"x":1.232,"y":-1.232,"curve":0.347,"c2":0.38,"c3":0.689,"c4":0.74},{"time":0.6667,"x":-0.647,"y":-0.95,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":0.7,"x":0.875,"y":-0.95,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7333,"x":0.975,"y":0.844,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":0.7667,"curve":0.37,"c2":0.63,"c3":0.708},{"time":1.3333,"x":0.95,"y":0.95}]},"shadow":{"scale":[{"curve":0.318,"c3":0.652,"c4":0.34},{"time":0.0667,"y":0.757,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1333,"y":0.811,"curve":0.285,"c2":0.16,"c3":0.638,"c4":0.56},{"time":0.6,"y":1.253,"curve":0.333,"c2":0.33,"c3":0.666,"c4":0.67},{"time":0.6667,"y":1.164,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.7,"y":0.986,"curve":0.377,"c2":0.51,"c3":0.748},{"time":0.7667}]},"r arm":{"rotate":[{"angle":-8.2,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-13.93},{"time":0.0667,"angle":-60.51},{"time":0.1,"angle":-62.71},{"time":0.1333,"angle":16.39},{"time":0.6,"angle":27.68},{"time":0.6667,"angle":3.05},{"time":0.7,"angle":-137.79},{"time":0.7667,"angle":171.9},{"time":0.8,"angle":157.91},{"time":0.9333,"angle":144.13},{"time":1.0333,"angle":124.02},{"time":1.0667,"angle":-32.36},{"time":1.3333,"angle":-8.2}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-41.06,"y":-16.61},{"time":0.1,"x":-27.22,"y":52.6},{"time":0.1333,"x":5.47,"y":50.88},{"time":0.6,"x":-26.72,"y":-9.06},{"time":0.6667,"x":-136.32,"y":1.61},{"time":0.7,"x":80.65,"y":75.26},{"time":0.7667,"x":84.81,"y":71.67},{"time":0.8,"x":9.26,"y":-15.84},{"time":0.9333,"x":7.48,"y":-9.84},{"time":1.0333,"x":6.15,"y":-5.35},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":0.708},{"time":0.1,"x":0.717},{"time":0.1333,"x":0.803},{"time":0.6,"x":0.817,"y":0.762},{"time":0.6667,"x":1.37},{"time":0.7,"x":-1.065},{"time":0.9333,"x":-1.368},{"time":1.0333,"x":-1.021},{"time":1.0667}]},"l armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-70.14},{"time":0.1,"angle":-13.03},{"time":0.1333,"angle":115.4},{"time":0.6,"angle":147.71},{"time":0.6667,"angle":139.35},{"time":0.7,"angle":144.7},{"time":0.7333,"angle":179.91},{"time":0.7667,"angle":-15.92},{"time":1.0333,"angle":-2.99},{"time":1.3333,"angle":1.84}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-47.04,"y":42.46},{"time":0.1,"x":11.52,"y":-6.65},{"time":0.1333,"x":53.7,"y":-2.86},{"time":0.6,"x":61.61,"y":1.75},{"time":0.6667,"x":61.32,"y":5.82},{"time":0.7,"x":85.02,"y":2.27},{"time":0.7333,"x":25.94,"y":7.26},{"time":0.7667,"x":-46.14,"y":-10.29},{"time":1.0333,"x":-0.75,"y":-10.81},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":1.09},{"time":0.1333,"x":0.706,"y":0.847},{"time":0.6,"x":2.248},{"time":0.7,"x":1.63},{"time":0.7333,"x":-1.044},{"time":0.7667,"x":1.584},{"time":1.0333,"x":1.27},{"time":1.3333}]},"r finger a2":{"rotate":[{"angle":14.41}]},"r finger b2":{"rotate":[{"angle":-8.92}]},"r finger c2":{"rotate":[{"angle":-9.49}]},"r finger d2":{"rotate":[{"angle":7.12}]},"l hand2":{"scale":[{"x":0,"y":0}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":15.59},{"time":0.1333,"angle":18.42},{"time":0.6,"angle":13.11},{"time":0.6667,"angle":57.13},{"time":0.7,"angle":7.32},{"time":0.7667,"angle":15.43},{"time":1.0667,"angle":15.55},{"time":1.1667},{"time":1.3333,"angle":9.15}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"y":0.751},{"time":0.1333,"y":0.853},{"time":0.6,"x":0.659,"y":0.822},{"time":1.3333}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0667,"x":26.77},{"time":0.1333,"x":16.87},{"time":0.6,"x":29.56},{"time":0.6667,"x":-0.2},{"time":0.7667,"x":-0.17,"y":-10.27},{"time":1.0667,"x":-0.08,"y":8.78},{"time":1.3333,"y":-15.36}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":44.9},{"time":0.1333,"angle":-45.16},{"time":0.6,"angle":11.27},{"time":0.6667,"angle":54.79},{"time":0.7,"angle":35.24},{"time":0.7667,"angle":19.05},{"time":1.0667,"angle":-20.9},{"time":1.1667,"angle":14.34},{"time":1.3333,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":44.9},{"time":0.1333,"angle":38.44},{"time":0.3,"angle":-18.77},{"time":0.6,"angle":7.41},{"time":0.6667,"angle":-24.12},{"time":0.7,"angle":35.24},{"time":0.7667,"angle":31.85},{"time":1.0667,"angle":-20.9},{"time":1.1667,"angle":-20.36},{"time":1.3333,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-12.38},{"time":0.1333,"angle":-36.29},{"time":0.3,"angle":-24.56},{"time":0.6,"angle":-31.83},{"time":0.6667,"angle":-110.13},{"time":0.7,"angle":-83.67},{"time":0.7667},{"time":1.0667,"angle":26.37},{"time":1.1667,"angle":-10.6},{"time":1.3333,"angle":7.98}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-112.87,"y":-109.8},{"time":0.1333,"x":-133.67,"y":-105.23},{"time":0.1667,"x":-101.04,"y":-49.3},{"time":0.3,"x":-176.77,"y":-36.51},{"time":0.6,"x":-99.31,"y":-37.52},{"time":0.6667,"x":-100.9,"y":-138.3},{"time":0.7,"x":-72.09,"y":-142.33},{"time":0.7667,"x":-110.87,"y":-78.71},{"time":1.0667,"x":-24.67,"y":-48.57},{"time":1.3333}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":2.138,"y":2.138},{"time":0.1333,"x":2.823,"y":1.854},{"time":0.6,"x":2.967,"y":1.522},{"time":0.6667,"x":1.934,"y":1.474},{"time":1.3333}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":33.36},{"time":0.1333,"angle":7.96},{"time":0.6,"angle":24.88},{"time":0.6667,"angle":45.51},{"time":0.7,"angle":21.47},{"time":0.7667,"angle":-9.31},{"time":1.0667,"angle":-33.22},{"time":1.1667,"angle":29.51},{"time":1.3333,"angle":-9.62}]},"r upparm3":{"rotate":[{},{"time":0.0667,"angle":56.14},{"time":0.1333,"angle":-50.51},{"time":0.6,"angle":-135.48},{"time":0.6667,"angle":-136.3},{"time":0.7,"angle":-23.42},{"time":0.7667,"angle":-21.34},{"time":1.0667,"angle":6.75},{"time":1.1667,"angle":4.67},{"time":1.3333}],"translate":[{},{"time":0.6,"x":127.5,"y":81.83},{"time":0.6667,"x":135.42,"y":147.68},{"time":0.7},{"time":0.7667,"x":-12.2,"y":-20.68},{"time":1.0667}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":15.49},{"time":0.1333},{"time":0.6,"angle":-31.98},{"time":0.6667,"angle":10.06},{"time":0.7,"curve":"stepped"},{"time":0.7667},{"time":1.0667,"angle":-9.17},{"time":1.1667},{"time":1.3333,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-42.06},{"time":0.1333,"angle":18.35},{"time":0.6,"angle":-45.41},{"time":0.6667,"angle":-50.42},{"time":0.7,"curve":"stepped"},{"time":0.7667},{"time":1.0667,"angle":6.4},{"time":1.1667},{"time":1.3333,"angle":4.52}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-91.9},{"time":0.1333,"angle":-74.48},{"time":0.6,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-56.28},{"time":0.1333,"angle":-77.8},{"time":0.6,"angle":33.91},{"time":0.6667},{"time":0.7,"angle":-18.96},{"time":0.7667,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-11.95}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":39.84},{"time":0.1333,"angle":31.32},{"time":0.6,"angle":86.4},{"time":0.6667,"angle":83.56},{"time":0.7,"angle":26.29},{"time":0.7667,"curve":"stepped"},{"time":1.1667},{"time":1.3333,"angle":-8.22}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":19.89,"y":-14.88},{"time":0.1333,"x":32.79,"y":-41.73},{"time":0.6,"x":19.38,"y":-35.79},{"time":0.6667,"x":2.31,"y":-7.7},{"time":1.3333}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667},{"time":0.1333,"angle":43.27},{"time":0.6,"angle":88.47},{"time":0.6667},{"time":0.7,"angle":-67.87},{"time":0.7667,"angle":4.09},{"time":1.0667,"angle":20.21},{"time":1.1667},{"time":1.3333,"angle":-1.85}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":4.88,"y":-43.61},{"time":0.1333,"x":-11.93,"y":65},{"time":0.6,"x":15.3,"y":52.26},{"time":0.6667,"x":-54.15,"y":41.88},{"time":0.7,"x":21.7,"y":68.45},{"time":0.7667,"x":32.71,"y":67.25},{"time":1.0667,"x":-47.13,"y":35.86},{"time":1.3333}]},"hair t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":8.52},{"time":0.1333,"angle":-8.98},{"time":0.6,"angle":0.79},{"time":0.6667,"angle":-1.02},{"time":0.7,"angle":-8.68},{"time":0.7667},{"time":1.0667,"angle":-6.38},{"time":1.1667}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":12.22},{"time":0.1333,"angle":-7.25},{"time":0.6,"angle":-5.48},{"time":0.6667,"angle":-12.84},{"time":0.7,"angle":5.93},{"time":0.7667},{"time":1.0667,"angle":-10.87},{"time":1.1667},{"time":1.3333,"angle":0.61}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-21.87},{"time":0.1333,"angle":32.23},{"time":0.3333,"angle":21.14},{"time":0.6,"angle":40.57},{"time":0.6667,"angle":13.45},{"time":0.7,"angle":14.83},{"time":0.7667,"angle":14.44},{"time":1.0667,"angle":10.66},{"time":1.1667,"angle":11.02},{"time":1.3333,"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-29.51},{"time":0.1333,"angle":-41.13},{"time":0.3333,"angle":22.09},{"time":0.6,"angle":26.89},{"time":0.6667,"angle":-3.93},{"time":0.7,"angle":-23.54},{"time":0.7667,"angle":12.73},{"time":1.0667,"angle":5.46},{"time":1.1667,"angle":-0.83},{"time":1.3333,"angle":5.88}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":44.78},{"time":0.1333,"angle":28.47},{"time":0.3333,"angle":48.31},{"time":0.6,"angle":85.29},{"time":0.6667,"angle":9.1},{"time":0.7,"angle":29.31},{"time":0.7667,"angle":56.03},{"time":1.0667,"angle":95.45},{"time":1.1667,"angle":18.9},{"time":1.3333,"angle":63.33}]},"headmouth":{"rotate":[{"time":0.6667},{"time":0.7,"angle":0.32},{"time":0.7667,"angle":-7.36},{"time":1,"angle":-15.78},{"time":1.1667,"angle":-4.46},{"time":1.3333}],"translate":[{"time":0.6667},{"time":0.7,"x":-9.23,"y":5.08},{"time":0.7667,"x":-14.87,"y":16.6},{"time":1,"x":-7.26,"y":35.86},{"time":1.3333}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-13.02},{"time":0.1333,"angle":-24.09},{"time":0.6,"angle":-18.83},{"time":0.6667,"angle":-10.89},{"time":0.7,"angle":-19.1},{"time":0.7667,"angle":-21.93},{"time":1.0667,"angle":-5.66},{"time":1.1667,"angle":-2.83},{"time":1.3333,"angle":8.77}],"scale":[{"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-13.02},{"time":0.1333,"angle":-24.09},{"time":0.6,"angle":9.35},{"time":0.6667,"angle":-23.49},{"time":0.7,"angle":14.32},{"time":0.7667,"angle":-3.09},{"time":0.8333,"angle":-32.51},{"time":1.0667,"angle":2.58},{"time":1.1667,"angle":-4.79},{"time":1.3333,"angle":-0.61}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-53.23,"y":-6.97},{"time":0.6,"x":-73.04,"y":-5.93},{"time":0.6667,"x":-86.38,"y":19.37},{"time":0.7,"x":-62.23,"y":-13.36},{"time":0.7667,"x":-6.3,"y":2.44},{"time":1.3333}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":26.12},{"time":0.1333,"angle":-33.86},{"time":0.6,"angle":17.96},{"time":0.6667,"angle":-30.75},{"time":0.7,"angle":14.32},{"time":0.7667,"angle":44.83},{"time":0.8333,"angle":32.69},{"time":1.0667,"angle":-51.59},{"time":1.1667,"angle":8.36},{"time":1.3333,"angle":-10}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.93},{"time":0.1333,"angle":-10.83},{"time":0.3,"angle":-17.1},{"time":0.6,"angle":-16.9},{"time":0.6667,"angle":20.79},{"time":0.7,"angle":13.57},{"time":0.7667,"curve":"stepped"},{"time":1.0667},{"time":1.1667,"angle":-5.03},{"time":1.3333,"angle":-11.82}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":41.46},{"time":0.1333,"angle":-31.95},{"time":0.3,"angle":10.84},{"time":0.6},{"time":0.6667,"angle":45.5},{"time":0.7,"angle":-15.56},{"time":0.7667,"angle":-27.01},{"time":1.0667,"angle":13.84},{"time":1.1667,"angle":2.84},{"time":1.3333,"angle":1.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-58.71,"y":-18.28},{"time":0.3,"x":-43.07,"y":-3.13},{"time":0.6,"x":-8.1,"y":-1.98},{"time":0.6667,"x":-84.71,"y":-4.69},{"time":0.7,"x":-54.46,"y":-33.89},{"time":0.7667,"x":-3.81,"y":-47.8},{"time":1.0667,"x":-40.87,"y":-40.97},{"time":1.1667,"x":1.02,"y":-5.62},{"time":1.3333}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":23.83},{"time":0.1333,"angle":-25.44},{"time":0.6,"angle":24.3},{"time":0.6667,"angle":45.5},{"time":0.7,"angle":29.05},{"time":0.7667,"angle":13.4},{"time":0.8667,"angle":-24.92},{"time":1.0667,"angle":-20.59},{"time":1.1667,"angle":11.55},{"time":1.3333,"angle":15.47}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-19.5},{"time":0.1333,"angle":16.7},{"time":0.6,"angle":7.2},{"time":0.6667,"angle":39.42},{"time":0.7,"angle":-34.68},{"time":0.7667,"angle":34.93},{"time":1.0667,"angle":-21.35},{"time":1.1667},{"time":1.3333,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-35.8},{"time":0.1333,"angle":68.99},{"time":0.6,"angle":-26.98},{"time":0.6667,"angle":56.47},{"time":0.7,"angle":-44.29},{"time":0.7667,"angle":-15.83},{"time":1.0667,"angle":37.68},{"time":1.1667},{"time":1.3333,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":6.21,"y":10.67},{"time":0.6,"x":9.81,"y":-25.6},{"time":0.7,"x":-26.54,"y":-20.81},{"time":0.7667,"x":-1.22,"y":-7.58},{"time":1.3333,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":37.1},{"time":0.1333,"angle":-42.72},{"time":0.6,"angle":72.54},{"time":0.6667,"angle":-44.71},{"time":0.7,"angle":14.62},{"time":0.7667,"angle":43.02},{"time":1.0667,"angle":-30.54},{"time":1.1667,"angle":-2.06},{"time":1.3333,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":13.87},{"time":0.1333,"angle":16.7},{"time":0.2667,"angle":56.98},{"time":0.6,"angle":16.82},{"time":0.6667,"angle":-4.21},{"time":0.7,"angle":52.49},{"time":0.7667,"angle":80.81},{"time":1.0667,"angle":63.64},{"time":1.1667,"angle":-20.36},{"time":1.3333,"angle":26.63}]},"hair t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":9.54}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":40.99}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":8.76}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":-10.54},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-27.86},{"time":0.1333,"angle":-18},{"time":0.3,"angle":5.72},{"time":0.6,"angle":-56.01},{"time":0.6667,"angle":-29.21},{"time":0.7,"angle":-9.22},{"time":0.7667,"angle":-14.74},{"time":1.0667,"angle":-44.39},{"time":1.1667,"angle":6.94},{"time":1.3333,"angle":-0.6}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":12.92},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":6.67}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-8.27},{"time":0.1333,"angle":-2.3},{"time":0.6,"angle":16.69},{"time":0.6667,"angle":-3.67},{"time":0.7,"angle":-7.74},{"time":0.7667,"angle":6.04},{"time":1.0667,"angle":-10.54},{"time":1.1667,"angle":-4.13},{"time":1.3333,"angle":3.67}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"r ear s":{"rotate":[{"angle":-5.67}]},"r ear ring b":{"rotate":[{"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"r ear s2":{"rotate":[{"angle":-7.49}]},"s1":{"translate":[{"x":44.14,"y":871.69},{"time":0.6,"x":39.16,"y":905.66}],"scale":[{"x":5,"y":5}]},"s2":{"translate":[{"x":250.1,"y":731.92},{"time":0.6333,"x":278.27,"y":730.27}],"scale":[{"x":5,"y":5}]},"s3":{"translate":[{"x":522.28,"y":518.6},{"time":0.6667,"x":313.28,"y":707.08}],"scale":[{"x":5,"y":5}]},"s4":{"translate":[{"x":257.46,"y":525.95}],"scale":[{"x":5,"y":5}]},"s5":{"translate":[{"x":217,"y":511.24}],"scale":[{"x":5,"y":5}]},"s6":{"translate":[{"x":189.08,"y":511.24}],"scale":[{"x":5,"y":5}]},"zhuaji":{"rotate":[{"angle":-35.1}],"translate":[{"x":-1862.83,"y":-1618.32}],"scale":[{"x":-6.27,"y":6.27}]},"zhuaji2":{"rotate":[{"angle":-35.1},{"time":0.6667,"angle":-90.76}],"translate":[{"x":-1862.83,"y":-1618.32}],"scale":[{"x":-6.27,"y":6.27}]},"s":{"scale":[{"x":0,"y":0},{"time":0.0333,"curve":"stepped"},{"time":1.3},{"time":1.3333,"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]}},"ik":{"lhand":[{"softness":50},{"time":0.0333,"mix":0,"softness":50,"curve":"stepped"},{"time":1.0333,"mix":0,"softness":50},{"time":1.3333,"softness":50}],"r ik":[{"time":0.6}],"r ik2":[{"time":0.1333,"softness":50,"curve":"stepped"},{"time":0.1667,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":0.6,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":0.6667,"softness":50}],"rhand":[{"softness":50},{"time":0.0333,"mix":0,"softness":50,"curve":"stepped"},{"time":1.0333,"mix":0,"softness":50},{"time":1.0667,"softness":50}]},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.2,"vertices":[-31.93134,-81.1846,-42.60324,-50.47324,-21.36816,-62.50143,-20.28406,-38.41428,-4.95038,-43.16226,1.75409,-26.59991,11.29492,-24.15213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14.02216,-58.32932,1.53766,-64.53867,-10.9469,-70.74783,-21.43884,-75.96606,0,0,0,0,0,0,9.83972,-34.66701,21.75732,-28.73352,0,0,0,0,0,0,0,0,0,0,0,0,34.44312,-29.9411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1.04004,-56.24902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-30.10202,-50.38266,-9.75293,-57.8786],"curve":0.328,"c2":0.27,"c3":0.661,"c4":0.6},{"time":0.6,"vertices":[-7.16339,-66.76302,5.08936,-49.54437,-1.29144,-49.78841,4.49988,-18.28939,2.12268,-18.7148,9.95319,-12.1902,8.31146,-13.36357,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25.71436,-29.77234,17.19019,-34.88861,-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,55.4898,-115.34093,44.22822,-137.56801]},{"time":0.6667,"vertices":[3.6321,-100.9129,62.7143,-54.9528,12.52618,-87.53851,61.60427,-40.45278,16.05284,-73.74738,80.50346,-26.3567,38.5543,-76.38689,18.67151,22.63937,29.30438,1.55887,-5.25476,-10.40659,-11.2193,-3.168,-2.58197,-0.24799,-1.92908,1.73404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-19.46552,-13.89214,-5.67834,-52.09679,11.59296,-45.30103,28.76481,-58.07358,21.99501,-68.80438,-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,37.42488,-76.73364,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,58.73687,-116.59249,45.50251,-140.80627]},{"time":0.7,"offset":86,"vertices":[-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,55.4898,-115.34093,44.22822,-137.56801]},{"time":1.0667}]},"r upparm":{"r upparm":[{},{"time":0.0667,"vertices":[43.13046,-13.27382,-36.1978,-26.94739,5.74899,22.31195,0,0,0,0,0,0,0,0,0,0,31.6051,18.1186,-4.06282,-36.20312,38.16904,39.10783,37.80072,30.64732,43.97684,21.13391,55.23495,13.60487,67.52536,11.74265]},{"time":0.1333,"vertices":[60.07882,-69.59204,19.27461,1.86738,5.44641,21.13764,0,0,0,0,0,0,0,0,0,0,66.70468,20.39863,-12.45708,1.58896,184.55437,33.34988,148.37286,83.35548,67.07377,93.50201,-36.5234,56.99421,-120.72923,-18.50066,12.30743,-14.77753,12.80518,14.34698,24.56116,-5.73856,2.06067,25.13708,31.05945,12.91113,-17.34119,28.82153]},{"time":0.6,"vertices":[-2.76124,-163.20505,137.66345,-15.41998,3.32836,12.91745,0,0,0,0,0,0,0,0,0,0,91.91296,-18.69115,13.58247,56.98287,196.27774,40.69681,101.71411,88.45444,-28.87119,64.12794,-155.66006,-30.5406,-222.00279,-166.49883,-7.98074,-106.22893,106.21513,11.44228,19.44185,-73.45589,69.19238,32.60618,49.33606,-42.82529,33.65353,56.79309]},{"time":0.7,"vertices":[-13.96832,-199.53496,111.97314,45.99949,72.60979,33.76303,0,0,0,0,0,0,0,0,0,0,79.37938,-16.14236,11.73032,49.21249,138.32974,-78.16116,102.05568,-47.90683,40.54369,-51.69243,-17.7495,-95.54425,-39.05264,-155.89218,-6.89246,-91.74317,91.73126,9.88197,-3.60842,-58.27855,80.75627,29.49527,42.60842,-36.98548,29.06442,49.04858]},{"time":1.3333}]}}},"drawOrder":[{"time":0.0667,"offsets":[{"slot":"body","offset":1},{"slot":"r beard2","offset":3}]},{"time":0.1333,"offsets":[{"slot":"l arm","offset":39},{"slot":"l hand","offset":39},{"slot":"l finger d","offset":39},{"slot":"l finger c","offset":39},{"slot":"l finger b","offset":39},{"slot":"l finger a","offset":39},{"slot":"l armour","offset":39},{"slot":"l beard","offset":-6},{"slot":"r beard","offset":-14},{"slot":"r upparm","offset":-20},{"slot":"r armour u","offset":-23},{"slot":"r upparm 2","offset":-22},{"slot":"r arm","offset":-23},{"slot":"r hand","offset":-35},{"slot":"r finger d","offset":-37},{"slot":"r finger c","offset":-38},{"slot":"r finger b","offset":-39},{"slot":"r finger a","offset":-40}]},{"time":0.6333,"offsets":[{"slot":"body","offset":1}]},{"time":0.6667,"offsets":[{"slot":"l armour","offset":-5},{"slot":"body","offset":-5}]},{"time":0.7,"offsets":[{"slot":"l armour","offset":-5},{"slot":"body","offset":-5},{"slot":"r beard2","offset":4}]},{"time":1.3333,"offsets":[{"slot":"r beard2","offset":3}]}]},"die":{"slots":{"lock":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":0.8333,"color":"ffffffff"}]},"lock 2":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":1.3333,"color":"ffffff00"},{"time":1.4,"color":"ffffffff"}]},"r eye":{"color":[{"time":2.7667,"color":"ffffffff"},{"time":3,"color":"000000ff"}]},"r eye fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"},{"time":1.9333,"name":"eyefire/eyefire_00002"},{"time":1.9667,"name":"eyefire/eyefire_00003"},{"time":2,"name":"eyefire/eyefire_00004"},{"time":2.0333,"name":"eyefire/eyefire_00006"},{"time":2.0667,"name":"eyefire/eyefire_00007"},{"time":2.1,"name":"eyefire/eyefire_00008"},{"time":2.1333,"name":"eyefire/eyefire_00010"},{"time":2.1667,"name":"eyefire/eyefire_00011"},{"time":2.2,"name":"eyefire/eyefire_00012"},{"time":2.2333,"name":"eyefire/eyefire_00014"},{"time":2.2667,"name":"eyefire/eyefire_00015"},{"time":2.3,"name":"eyefire/eyefire_00017"},{"time":2.3333,"name":"eyefire/eyefire_00018"},{"time":2.3667,"name":"eyefire/eyefire_00019"},{"time":2.4,"name":"eyefire/eyefire_00021"},{"time":2.4333,"name":"eyefire/eyefire_00022"},{"time":2.4667,"name":"eyefire/eyefire_00023"},{"time":2.5,"name":"eyefire/eyefire_00025"},{"time":2.5333,"name":"eyefire/eyefire_00026"},{"time":2.5667,"name":"eyefire/eyefire_00028"},{"time":2.6,"name":"eyefire/eyefire_00029"},{"time":2.6333,"name":"eyefire/eyefire_00030"},{"time":2.6667,"name":"eyefire/eyefire_00032"},{"time":2.7,"name":"eyefire/eyefire_00033"},{"time":2.7333,"name":"eyefire/eyefire_00034"},{"time":2.7667,"name":null}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":16.49},{"time":0.1,"angle":-16.57},{"time":0.3,"angle":1.8},{"time":0.7667,"angle":-16.9},{"time":0.8333,"angle":3.76},{"time":0.9667,"angle":1.33},{"time":1.3333,"angle":1.68},{"time":1.4,"angle":-16.6},{"time":1.6333,"angle":-6.02},{"time":1.8667,"angle":-0.35},{"time":1.9333,"angle":-13.61},{"time":2.0333,"angle":-5.47},{"time":2.6667,"angle":-9.54},{"time":2.7667,"angle":-7.05},{"time":2.8333,"angle":-15.47},{"time":3,"angle":2.5}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-184.28,"y":-59.89},{"time":0.1,"x":55.28,"y":-92.14},{"time":0.3,"x":115.18,"y":4.61},{"time":0.7667,"x":198.1,"y":64.5},{"time":0.8333,"x":-364.72,"y":-0.95},{"time":0.9667,"x":-270.68,"y":6.37},{"time":1.3333,"x":-164.46,"y":78.32},{"time":1.4,"x":61.15,"y":-24.61},{"time":1.6333,"x":96.07,"y":-109.25},{"time":1.8667,"x":15.4,"y":-158.17},{"time":1.9333,"x":-35.28,"y":-151.53},{"time":2.0333,"x":23.8,"y":14.69},{"time":2.6667,"x":-96.75,"y":119.78},{"time":2.7667,"x":-96.75,"y":-257.99},{"time":2.8333,"x":-96.75,"y":-175.07},{"time":3,"x":-96.75,"y":-216.53}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":40.56},{"time":0.1,"angle":48.46},{"time":0.1667,"angle":36.57},{"time":0.3,"angle":30.02},{"time":0.7667,"angle":21.83},{"time":0.8333,"angle":12.42},{"time":0.9,"angle":34.56},{"time":0.9333,"angle":71.56},{"time":0.9667,"angle":44.82},{"time":1.0667,"angle":16.51},{"time":1.3333,"angle":-27.67},{"time":1.4,"angle":-49.08},{"time":1.5,"angle":-39.13},{"time":1.6333,"angle":-47.16},{"time":1.8667,"angle":-37.47},{"time":1.9333,"angle":-55.66},{"time":2.0333,"angle":-8.32},{"time":2.6667,"angle":-18.72},{"time":2.7667,"angle":-9.15},{"time":2.8333,"angle":-36.31},{"time":3,"angle":-15.71}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-98.46,"y":-24.61},{"time":0.0667,"x":74.49,"y":72.73},{"time":0.1,"x":286.77,"y":-3.16},{"time":0.1667,"x":388.95,"y":-330.47},{"time":0.3,"x":320.72,"y":-272.48},{"time":0.7667,"x":328.07,"y":-224.33},{"time":0.8333,"x":269.63,"y":-170.96},{"time":0.9,"x":77.59,"y":-240.96},{"time":0.9333,"x":-99.14,"y":-246.25},{"time":0.9667,"x":-171.61,"y":-179.86},{"time":1.0667,"x":-116.17,"y":-43},{"time":1.3333,"x":34.67,"y":23.83},{"time":1.4,"x":316.86,"y":-73.41},{"time":1.5,"x":380.06,"y":-201.1},{"time":1.6333,"x":346.97,"y":-293.06},{"time":1.8667,"x":323.56,"y":-321.08},{"time":1.9333,"x":386.93,"y":-386},{"time":2.0333,"x":376.07,"y":-344.42},{"time":2.6667,"x":260.01,"y":-271.8},{"time":2.7667,"x":14.09,"y":-439.51},{"time":2.8333,"x":27.11,"y":-364.85},{"time":3,"x":35.95,"y":-382.46}],"scale":[{"time":0.0333},{"time":0.0667,"y":-1,"curve":"stepped"},{"time":0.9,"y":-1},{"time":0.9333,"x":0.679,"y":0.679}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-21.28},{"time":0.1,"angle":29.83},{"time":0.3,"angle":-22.81},{"time":0.7667,"angle":36.27},{"time":0.8333,"angle":-13.81},{"time":0.9667,"angle":4.9},{"time":1.3333,"angle":17.12},{"time":1.4,"angle":62.03},{"time":1.6333,"angle":16.28},{"time":1.8667,"angle":-4},{"time":1.9333,"angle":5.81},{"time":2.0333,"angle":-2.56},{"time":2.6667,"angle":61.08},{"time":2.7667,"angle":41.63},{"time":2.8333,"angle":37.23},{"time":3,"angle":2.61}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"x":18.45,"y":-42.62},{"time":0.1,"x":-43.9,"y":-0.68},{"time":0.3,"x":-58.59,"y":-2.25},{"time":0.7667,"x":11.9,"y":-2.22,"curve":"stepped"},{"time":0.8333,"x":11.9,"y":-2.22},{"time":0.9667,"x":6.27,"y":6.41},{"time":1.3333,"x":33.65,"y":8.73},{"time":1.4,"x":7.7,"y":32.35},{"time":1.6333,"x":-4.69,"y":-13.44},{"time":1.8667,"x":8.33,"y":-6.9},{"time":1.9333,"x":-19.99,"y":-23.01},{"time":2.0333,"x":-15.28,"y":-2.95},{"time":2.6667,"x":-0.46,"y":11.36}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":2.76},{"time":0.1,"angle":-18.51},{"time":0.3,"angle":48.94},{"time":0.7667,"angle":17.78},{"time":0.8333,"angle":5.37},{"time":0.9667,"angle":5.68},{"time":1.3333,"angle":-0.07},{"time":1.4,"angle":1.28},{"time":1.6333,"angle":4.18},{"time":1.8667,"angle":-4.85},{"time":1.9333,"angle":1.88},{"time":2.0333,"angle":34.7},{"time":2.6667,"angle":0.77},{"time":2.7667,"angle":29.95},{"time":2.8333,"angle":1.95},{"time":3,"angle":-10.36}],"translate":[{"time":0.1},{"time":0.3,"x":-14.48,"y":30.27},{"time":0.8333}]},"r upparm":{"rotate":[{"angle":-6.94,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":0.83},{"time":0.1,"angle":-12.63},{"time":0.1667,"angle":28.26},{"time":0.3,"angle":39.35},{"time":0.7667,"angle":-0.67},{"time":0.8333,"angle":53.95},{"time":0.9,"angle":28.66},{"time":0.9667,"angle":9.43},{"time":1.0667,"angle":-13.21},{"time":1.3333,"angle":-41.05},{"time":1.4,"angle":-64.3},{"time":1.5,"angle":-18.04},{"time":1.6333,"angle":2.94},{"time":1.8667,"angle":21.32},{"time":1.9333,"angle":31.47},{"time":2.0333,"angle":59.01},{"time":2.6667,"angle":7.47},{"time":2.7667,"angle":-19.11},{"time":2.8333,"angle":-5.56},{"time":3,"angle":4.52}],"translate":[{"time":0.1},{"time":0.1667,"x":57.8,"y":22.76},{"time":0.3,"x":31.87,"y":44.86},{"time":0.7667,"x":42.14,"y":-13.87},{"time":0.8333,"x":39.83,"y":-36.83},{"time":0.9,"x":18.62,"y":-33.41,"curve":"stepped"},{"time":1.5,"x":18.62,"y":-33.41},{"time":1.6333,"x":43.93,"y":-21.89},{"time":1.8667,"x":47.72,"y":15.61},{"time":2.6667,"x":7.84,"y":-7.41},{"time":3}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":16.11},{"time":0.1,"angle":-35.23},{"time":0.1667,"angle":82.25},{"time":0.3,"angle":116.74},{"time":0.7667,"angle":82.7},{"time":0.8333,"angle":82.18},{"time":0.8667,"angle":57.67},{"time":0.9667,"angle":-26.21},{"time":1.3333,"angle":-85.18},{"time":1.4,"angle":-78.37},{"time":1.5,"angle":-30.79},{"time":1.6333,"angle":-39.33,"curve":"stepped"},{"time":1.8667,"angle":-39.33},{"time":1.9333,"angle":-9.78},{"time":2.0333,"angle":-7.75},{"time":2.6667,"angle":-10.01},{"time":2.7667,"angle":4.29},{"time":2.8333,"angle":34.82},{"time":3,"angle":37.42}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":-150.81,"y":24.49},{"time":0.1,"x":-76.17,"y":120.73},{"time":0.1667,"x":131.02,"y":104.78},{"time":0.3,"x":518.03,"y":344.46},{"time":0.7667,"x":758.79,"y":560.74},{"time":0.8333,"x":77.5,"y":434.32},{"time":0.8667,"x":-262.6,"y":159.04},{"time":0.9,"x":-573.86,"y":162.62},{"time":0.9667,"x":-428.45,"y":161.24},{"time":1.3333,"x":-380.12,"y":197.16},{"time":1.4,"x":-110.57,"y":161.24},{"time":1.5,"x":-67.63,"y":142.65},{"time":1.6333,"x":-87.53,"y":32.25},{"time":1.8667,"x":-133.6,"y":-18.43},{"time":1.9333,"x":-152.03,"y":-32.25},{"time":2.0333,"x":-181.18,"y":85.36},{"time":2.1333,"x":-235.29,"y":123.69},{"time":2.6667,"x":-322.46,"y":196.08},{"time":2.7667,"x":-367.32,"y":-41.73},{"time":2.8333,"x":-362.56,"y":-83.63},{"time":3,"x":-359.32,"y":-106.64}],"scale":[{"x":0.95,"y":0.95}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-19.75},{"time":0.1,"angle":11.41},{"time":0.1667,"angle":40.75},{"time":0.3,"angle":111.94},{"time":0.7667,"angle":70.86},{"time":0.8333,"angle":81.86},{"time":0.9667,"angle":5.88},{"time":1.3333,"angle":-11.53},{"time":1.4,"angle":-24.45},{"time":1.5,"curve":"stepped"},{"time":1.8667},{"time":1.9333,"angle":5.49},{"time":2.0333,"angle":8.95},{"time":2.6667,"angle":-41.62},{"time":2.7667,"angle":-2.49},{"time":2.8333,"angle":-23.36},{"time":2.9333,"angle":-2.1},{"time":3}],"translate":[{"time":0.0333},{"time":0.1,"x":-32.08,"y":138.93},{"time":0.1667,"x":-24.98,"y":138.16},{"time":0.3,"x":-57.9,"y":74.7},{"time":0.7667,"x":-39.31,"y":141.16},{"time":2.0333},{"time":2.6667,"x":-41.56,"y":-12.73},{"time":2.7667,"x":-30.06,"y":148.44}],"scale":[{"time":0.3},{"time":0.7667,"x":1.275},{"time":0.8333,"curve":"stepped"},{"time":2.0333},{"time":2.6667,"x":1.827},{"time":2.7667}],"shear":[{"time":2.0333},{"time":2.6667,"x":-3.87,"y":28.69},{"time":2.7667}]},"r upparm3":{"rotate":[{"time":0.0333},{"time":0.1,"angle":-21.47},{"time":0.1667,"angle":-27.88},{"time":0.3,"angle":-33.47},{"time":0.7667,"angle":-5.69},{"time":0.8333,"angle":-57.95},{"time":0.9,"angle":-24.73},{"time":0.9667,"angle":-7.42},{"time":1.0667,"angle":28.95},{"time":1.3333,"angle":53.49},{"time":1.4,"angle":79.29},{"time":1.5,"angle":27.55},{"time":1.6333,"angle":0.33},{"time":1.8667,"angle":-23.2},{"time":1.9333,"angle":-32.54},{"time":2.0333,"angle":-58.89},{"time":2.6667,"angle":-1.39},{"time":2.7667,"angle":33.34},{"time":2.8333,"angle":19.02},{"time":3}],"translate":[{},{"time":0.1,"x":22.99,"y":-32.47},{"time":0.1667,"x":74.29,"y":2.56},{"time":0.3,"x":34.41,"y":49.49},{"time":0.7667,"x":69.3,"y":30.53},{"time":0.8333,"x":64.16,"y":28.43},{"time":0.9,"x":37.93,"y":34.06},{"time":0.9667,"x":49.12,"y":1.88},{"time":1.0667,"x":64.85,"y":-31.31},{"time":1.6333,"x":80.3,"y":9.26},{"time":1.8667,"x":91.3,"y":14.17},{"time":2.6667,"x":100.79,"y":-26.46}]},"l ik":{"rotate":[{"time":2.6667},{"time":2.7333,"angle":-34.2},{"time":2.8333,"angle":-127.38}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":4.61,"curve":"stepped"},{"time":0.1667,"x":4.61},{"time":0.2333,"x":172.76,"y":64.5},{"time":0.3,"x":165.85,"curve":"stepped"},{"time":0.7667,"x":165.85},{"time":0.8333,"x":-225.74,"y":69.11},{"time":0.9,"x":-400.81,"curve":"stepped"},{"time":1.3333,"x":-400.81},{"time":1.4,"x":9.21,"y":87.53},{"time":1.4667,"x":87.53,"y":96.75},{"time":1.5333,"x":105.96,"y":4.61,"curve":"stepped"},{"time":2.6667,"x":105.96,"y":4.61},{"time":2.7333,"x":-122.32,"y":40.88},{"time":2.8333,"x":-273.74,"y":20.43},{"time":3,"x":-264.7,"y":23.44}]},"r ik":{"rotate":[{"time":2.6667},{"time":2.7667,"angle":139.62},{"time":3,"angle":178.71}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8333,"x":4.61,"curve":"stepped"},{"time":0.9667,"x":4.61},{"time":1.0333,"x":-184.28,"y":42.93},{"time":1.1333,"x":-214.34,"curve":"stepped"},{"time":1.2667,"x":-214.34},{"time":1.3,"x":-9.32,"y":94.45},{"time":1.3667,"x":69.58,"curve":"stepped"},{"time":2.6667,"x":69.58},{"time":2.7667,"x":155.07,"y":0.5},{"time":3,"x":136.39,"y":-39.99}]},"l ik2":{"translate":[{"time":0.1667},{"time":0.2333,"x":28.91,"y":-23.32},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"x":2.98,"y":-12.68},{"time":0.9,"x":43.46,"y":0.19},{"time":1.3333,"x":15.3,"y":77.22},{"time":1.4,"x":35.04,"y":42.45},{"time":1.4667,"x":27.23,"y":26.49},{"time":1.5333,"x":7.88,"y":58.56},{"time":1.6333,"x":22.2,"y":62.12},{"time":1.8667,"x":41.41,"y":-7.11},{"time":1.9333,"x":57.27,"y":-30.03},{"time":2.0333,"x":-26.86,"y":0.37},{"time":2.6667,"x":-131.88,"y":-108},{"time":2.7333,"x":68.19,"y":9.9},{"time":2.8333,"x":17.31,"y":6.26},{"time":3,"x":-3.16,"y":28.58}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":119.88,"y":-43.84},{"time":0.1,"x":56.38,"y":18.74},{"time":0.7667,"x":37.11,"y":12.33},{"time":0.8333,"x":102.75,"y":-72.41},{"time":0.9667,"x":145.32,"y":-93.43},{"time":1.0333,"x":56.33,"y":-22.09},{"time":1.1333,"x":16.21,"y":-23.93},{"time":1.2667,"x":14.63,"y":-21.59},{"time":1.3,"x":128.62,"y":-71.45},{"time":1.3667,"x":63.44},{"time":2.6667},{"time":2.7667,"x":89.2,"y":2.13},{"time":2.8333,"x":128.84,"y":-9.59},{"time":3,"x":135.19,"y":26.05}]},"l hand2":{"scale":[{"x":0,"y":0}]},"r upparm2":{"rotate":[{"angle":12.97,"curve":0.25,"c3":0.75},{"time":0.1,"angle":21.5},{"time":0.3,"angle":17.38},{"time":0.7667,"angle":28.93},{"time":0.8333,"angle":15.91},{"time":0.9,"angle":22.08},{"time":0.9667,"angle":47.05},{"time":1.0667,"angle":69.38},{"time":1.6333,"angle":55.09},{"time":1.8667,"angle":60.16},{"time":2.6667,"angle":34.95},{"time":3,"angle":52.06}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1,"x":-12.47,"y":-65.76},{"time":0.1667,"x":38.83,"y":-30.73},{"time":0.3,"x":38.26,"y":-28.45},{"time":0.7667,"x":59.51,"y":18.64},{"time":0.8333,"x":47.97,"y":10.09},{"time":0.9,"x":27.01,"y":20.96},{"time":0.9667,"x":48.86,"y":1.53},{"time":1.0667,"x":42.04,"y":-55.44},{"time":1.6333,"x":71.88,"y":-0.06},{"time":1.8667,"x":67.73,"y":-10.59},{"time":2.6667,"x":30.39,"y":-75.33}]},"lock":{"rotate":[{},{"time":0.7667,"angle":33.15},{"time":0.8333,"angle":12.05},{"time":0.9667,"angle":5.02},{"time":1.3333,"angle":-6.27},{"time":1.4,"angle":22.68},{"time":1.5,"angle":17.17},{"time":1.6333,"angle":-3.53},{"time":1.8667,"angle":6.47},{"time":1.9333,"angle":10.48},{"time":2.0333,"angle":15.89},{"time":2.6667,"angle":41.03},{"time":2.7667,"angle":23.73},{"time":2.8333,"angle":33.96},{"time":3,"angle":15.35}],"translate":[{"time":0.7667},{"time":0.8333,"x":28.21,"y":-55.96},{"time":0.9667,"x":66.08,"y":79.4},{"time":1.3333,"x":110.87,"y":113.37},{"time":1.4,"x":69.74,"y":83.77},{"time":1.5,"x":39.7,"y":39.04},{"time":1.8667,"x":13.03,"y":-41.58},{"time":1.9333,"x":12.89,"y":-68.2},{"time":2.0333,"x":-21.33,"y":-63.12},{"time":2.6667,"x":-22.19,"y":3.95},{"time":2.7667,"x":-74.3,"y":5.84},{"time":2.8333,"x":-153.69,"y":-31.86},{"time":3,"x":-131.13,"y":2.54}],"scale":[{"x":0,"y":0},{"time":0.7667,"x":2,"y":2},{"time":0.8333,"x":0.309,"y":0.309},{"time":0.9667,"x":0.508,"y":0.508},{"time":1.3333,"x":0.626,"y":0.572},{"time":1.4,"x":0.681,"y":0.917}]},"lock2":{"rotate":[{},{"time":1.3333,"angle":26.76,"curve":"stepped"},{"time":1.4,"angle":26.76},{"time":1.5,"angle":17.08},{"time":1.6333,"angle":-3.95},{"time":1.8667,"angle":-7.56},{"time":1.9333,"angle":2.43},{"time":2.0333,"angle":2.8},{"time":2.6667,"angle":40.34},{"time":2.7667,"angle":16.77},{"time":2.8333,"angle":11.01},{"time":3,"angle":-5.08}],"translate":[{},{"time":1.3333,"x":198.13,"y":193.19,"curve":"stepped"},{"time":1.4,"x":198.13,"y":193.19},{"time":1.5,"x":162.47,"y":108.28},{"time":1.6333,"x":207.63,"y":64.45},{"time":1.8667,"x":184.34,"y":3.51},{"time":1.9333,"x":169.05,"y":-31.92},{"time":2.0333,"x":112.27,"y":-31.4},{"time":2.6667,"x":145.34,"y":117.01},{"time":2.7667,"x":221.78,"y":144.78},{"time":2.8333,"x":167.65,"y":123},{"time":3,"x":197.32,"y":97.4}],"scale":[{"x":0,"y":0},{"time":1.3333,"x":-2,"y":2},{"time":1.4,"x":-0.671,"y":0.859},{"time":1.5,"x":-0.751,"y":0.917,"curve":"stepped"},{"time":2.7333,"x":-0.751,"y":0.917},{"time":2.7667,"x":-0.836,"y":0.917}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":-17.28},{"time":0.3,"angle":-24.69},{"time":0.7667,"angle":-24.78},{"time":0.8333,"angle":-24.51},{"time":0.9667},{"time":1.3333,"angle":-43.74},{"time":1.4,"angle":-65.84},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1},{"time":0.1667,"x":33.54,"y":-5.99},{"time":0.3,"x":40.27,"y":49.7},{"time":0.7667,"x":42.99,"y":4.1},{"time":0.8333}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":68.98},{"time":0.1,"angle":69.57},{"time":0.1667,"angle":80.32},{"time":0.3,"angle":60.85},{"time":0.7667,"angle":56.27},{"time":0.8333,"angle":42.87},{"time":0.9667,"angle":27.14},{"time":1.3333,"angle":49.52},{"time":1.4,"angle":39.01},{"time":1.6333,"angle":32.12},{"time":1.8667,"angle":4.56},{"time":1.9333,"angle":4.29},{"time":2.0333,"angle":23.86},{"time":2.6667,"angle":50.59},{"time":2.7667,"angle":26.41},{"time":2.8333,"angle":35.92},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":15.69,"y":-42.72},{"time":0.1,"x":29.26,"y":-74.82},{"time":0.1667,"x":-64.57,"y":-135.91},{"time":0.3,"x":-27.47,"y":-144.54},{"time":0.7667,"x":-7.52,"y":-129.4}]},"r finger d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":5.46},{"time":0.3,"angle":-10.65},{"time":0.7667,"angle":-8.36},{"time":0.8333,"curve":"stepped"},{"time":1.3333},{"time":1.4,"angle":-22.1},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1667},{"time":0.3,"x":69.31,"y":13.25},{"time":0.7667,"x":33.77,"y":-24.7},{"time":0.8333}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.1667,"angle":-14.73},{"time":0.3,"angle":-22.7},{"time":0.7667,"angle":-20.59},{"time":0.8333,"angle":-34.81},{"time":0.9667},{"time":1.3333,"angle":-40.05},{"time":1.4,"angle":-62.15},{"time":1.6333,"angle":2.05},{"time":1.8667,"angle":17.92},{"time":1.9333,"angle":19.06},{"time":2.0333,"angle":-61.01},{"time":2.6667},{"time":2.7667,"angle":-11.77},{"time":2.8333,"angle":-57.15},{"time":3,"angle":-47.95}],"translate":[{"time":0.1},{"time":0.1667,"x":121.04,"y":-31.75},{"time":0.3,"x":86.34,"y":46.01},{"time":0.7667,"x":96.48,"y":35.54},{"time":0.8333,"x":59.11,"y":-15.72},{"time":0.9667}]},"l finger a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":-8.74},{"time":0.8333,"angle":13.91},{"time":0.9667,"angle":10.78},{"time":1.3333}]},"l finger a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":-0.62,"curve":"stepped"},{"time":0.8333,"angle":-0.62},{"time":0.9667,"angle":18.9},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":35.95,"y":34.16},{"time":0.7667,"x":-65.9,"y":-20.58},{"time":0.8333,"x":-18.98,"y":-25.1},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":-46.37,"curve":"stepped"},{"time":0.8333,"angle":-46.37},{"time":0.9667,"angle":-26.85},{"time":1.3333}]},"l finger b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":70.98,"curve":"stepped"},{"time":0.8333,"angle":70.98},{"time":0.9667,"angle":90.5},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":2.03,"y":49.54},{"time":0.7667,"x":37.04,"y":7.14},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l finger c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":50.22,"curve":"stepped"},{"time":0.8333,"angle":50.22},{"time":0.9667,"angle":69.74},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":-38.06,"y":31.78},{"time":0.7667,"x":37.53,"y":3.76},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":11.31,"curve":"stepped"},{"time":0.8333,"angle":11.31},{"time":0.9667,"angle":30.84},{"time":1.3333}]},"l finger d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.1},{"time":0.3,"angle":-13.31},{"time":0.7667,"angle":37.45,"curve":"stepped"},{"time":0.8333,"angle":37.45},{"time":0.9667,"angle":56.97},{"time":1.3333}]},"l finger d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":54.61},{"time":0.1,"angle":16.16},{"time":0.3,"angle":-63.46},{"time":0.7667,"angle":62.3,"curve":"stepped"},{"time":0.8333,"angle":62.3},{"time":0.9667,"angle":81.83},{"time":1.3333,"curve":"stepped"},{"time":1.4},{"time":1.6333,"angle":-22.15},{"time":1.8667},{"time":1.9333,"angle":46.49},{"time":2.0333},{"time":2.6667,"angle":-61.6},{"time":2.7667,"angle":10.65},{"time":2.8333,"angle":-51.83},{"time":3}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.3,"x":-49.55,"y":-1.88},{"time":0.7667,"x":35.07,"y":13.9},{"time":3}],"scale":[{"x":0.925,"y":0.925}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-24.25},{"time":0.1,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":18.79},{"time":0.9667},{"time":1.3333,"angle":-7.62},{"time":1.4,"curve":"stepped"},{"time":2.8333},{"time":3,"angle":-20.01}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":15},{"time":0.1,"angle":-9.71},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":15.73},{"time":0.9667,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":13.37},{"time":1.9333,"angle":27.39},{"time":2.0333,"angle":-1.64},{"time":2.6667,"angle":-11.25},{"time":2.7667,"angle":-25.72},{"time":2.8333,"angle":3.52},{"time":3}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-40.42},{"time":0.1,"angle":-80.2},{"time":0.3,"curve":"stepped"},{"time":1.8667},{"time":1.9333,"angle":-24.44},{"time":2.0333,"angle":-77.3},{"time":2.6667,"angle":-13.9},{"time":2.7667}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"curve":"stepped"},{"time":0.3},{"time":0.7667,"angle":-64.49},{"time":0.8333,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":-18.41},{"time":1.9333,"angle":-37.26},{"time":2.0333,"angle":-67.74},{"time":2.6667,"angle":-58.8},{"time":2.7667,"angle":-57.84},{"time":2.8333}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-23.31},{"time":0.1,"angle":24.59},{"time":0.3},{"time":0.7667,"angle":13.06},{"time":0.8333,"angle":-1.7},{"time":0.9667},{"time":1.3333,"angle":33.27},{"time":1.4,"angle":6.41},{"time":1.6333},{"time":1.8667,"angle":-30.46},{"time":1.9333,"angle":-27.92},{"time":2.0333,"angle":15.55},{"time":2.6667,"angle":40.74},{"time":2.7667},{"time":2.8333,"angle":1.33},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-13.9,"y":32.14},{"time":0.3,"x":15.52,"y":-53.53},{"time":0.7667,"x":96.22,"y":-50.78},{"time":0.8333,"x":1.97,"y":-11.66},{"time":0.9667,"x":-19.97,"y":-17.52},{"time":1.3333,"x":-94.05,"y":113.18},{"time":1.4,"x":-103.02,"y":53.64},{"time":1.6333,"x":-4.96,"y":-0.23},{"time":1.9333,"x":-3.87,"y":-0.18},{"time":2.0333,"x":-67.59,"y":20.05},{"time":2.6667,"x":27.34,"y":-49.83},{"time":3}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333},{"time":0.1,"angle":35.69},{"time":0.3},{"time":0.7667,"angle":54.04},{"time":0.8333,"angle":-32.08},{"time":0.9667},{"time":1.3333,"angle":12.43},{"time":1.4,"angle":48.89},{"time":1.6333},{"time":1.8667,"angle":-5.58},{"time":1.9333,"angle":-34.21},{"time":2.0333,"angle":-9.74},{"time":2.6667,"angle":34.81},{"time":2.7667,"angle":44.18},{"time":2.8333,"angle":13.05},{"time":3}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-13.21},{"time":0.1,"angle":23.14},{"time":0.3,"angle":29.25},{"time":0.5,"angle":2.77},{"time":0.7667,"angle":-24.22},{"time":0.8333,"angle":-16.63},{"time":0.9667,"angle":21.53},{"time":1.3333,"angle":-7.86},{"time":1.4,"angle":39.09},{"time":1.6333,"angle":-12.88},{"time":1.8667,"angle":-1.91},{"time":1.9333,"angle":29.51},{"time":2.0333},{"time":2.6667,"angle":22.49},{"time":2.7667,"angle":26.71},{"time":2.8333,"angle":13.79},{"time":3,"angle":28.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":0.806,"curve":"stepped"},{"time":2.6667,"x":0.806},{"time":2.7667,"x":0.717}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0333,"x":10.51,"y":15.78},{"time":0.3,"x":-12.05,"y":-4.86},{"time":0.7667,"x":12.01,"y":5.63},{"time":0.8333,"x":25.98,"y":17.69},{"time":0.9667,"x":0.44,"y":17.69},{"time":1.3333,"x":4.31,"y":17.69},{"time":1.4,"x":30.99,"y":17.69},{"time":1.6333,"x":35.32,"y":31.2},{"time":1.8667,"x":23.94,"y":31.2,"curve":"stepped"},{"time":2.6667,"x":23.94,"y":31.2},{"time":2.7667,"x":23.94,"y":38.29},{"time":2.8333,"x":23.94,"y":23.92}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":26.87},{"time":0.1,"angle":-15.74},{"time":0.3,"angle":-27.27},{"time":0.5,"angle":25.21},{"time":0.7667,"angle":4.19},{"time":0.8333,"angle":24.92},{"time":0.9667,"angle":-26.3},{"time":1.1333,"angle":15.5},{"time":1.3333,"angle":5.56},{"time":1.4,"angle":-25.66},{"time":1.5,"angle":22.59},{"time":1.6333,"angle":19.98},{"time":1.8667,"angle":-10.7},{"time":1.9333,"angle":-6.66},{"time":2.0333,"angle":22.3},{"time":2.6667,"angle":-10.86},{"time":2.7667,"angle":24.66},{"time":2.8333,"angle":49.32},{"time":3,"angle":2.02}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":22.62},{"time":0.1,"angle":17.78},{"time":0.3,"angle":-27.7},{"time":0.7667,"angle":36.62},{"time":0.8333,"angle":35.15},{"time":0.9,"angle":-18.39},{"time":0.9667,"angle":-16.39},{"time":1.3333,"angle":13.16},{"time":1.4,"angle":-30.81},{"time":1.6333,"angle":30.96},{"time":1.8667,"angle":-9.54},{"time":1.9333,"angle":-31.08},{"time":2.0333,"angle":-16.04},{"time":2.2667,"angle":18.83},{"time":2.6667,"angle":-25.39},{"time":2.7667,"angle":44.23},{"time":2.8333,"angle":11.22},{"time":3,"angle":19.6}]},"hair t":{"rotate":[{"time":0.1},{"time":0.3,"angle":-19.21},{"time":0.7667,"angle":-5.78},{"time":0.8333},{"time":0.9667,"angle":-9.38},{"time":1.3333,"curve":"stepped"},{"time":1.6333},{"time":1.8667,"angle":10.8},{"time":1.9333},{"time":2.0333,"angle":-9.13},{"time":2.6667},{"time":2.7667,"angle":-13.97},{"time":2.8333}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":7.3},{"time":0.1,"angle":3.64},{"time":0.3,"angle":1.74},{"time":0.7667,"angle":-1.69},{"time":0.8333},{"time":0.9667,"angle":-9.58},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":-5.18},{"time":1.8667,"angle":-4.5},{"time":1.9333},{"time":2.0333,"angle":2.63},{"time":2.6667},{"time":2.7667,"angle":-8.41},{"time":2.8333,"angle":-9.13},{"time":3,"angle":-1.65}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-6.72},{"time":0.1,"angle":14.11},{"time":0.3,"angle":14.45},{"time":0.7667,"angle":25.58},{"time":0.8333,"angle":30.7},{"time":0.9667,"angle":25.88},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":20.83},{"time":1.8667,"angle":15.95},{"time":1.9333,"angle":19.25},{"time":2.0333,"angle":23.38},{"time":2.6667,"angle":22.61},{"time":2.7667,"angle":-34.4},{"time":2.8333,"angle":24.51},{"time":3,"angle":23.31}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":-21.29},{"time":0.1,"angle":-19.11},{"time":0.3,"angle":14.45},{"time":0.7667,"angle":19.91},{"time":0.8333,"angle":30.7},{"time":0.9667,"angle":28.91},{"time":1.3333,"angle":-11.47},{"time":1.4,"angle":-29.11},{"time":1.6333,"angle":-39.75},{"time":1.8667,"angle":24.75},{"time":1.9333,"angle":24.59},{"time":2.0333,"angle":23.38},{"time":2.6667,"angle":22.61},{"time":2.7667,"angle":-34.4},{"time":2.8333,"angle":-23.73},{"time":3,"angle":19.69}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":93.37},{"time":0.1,"angle":14.11},{"time":0.3,"curve":"stepped"},{"time":0.7667},{"time":0.8333,"angle":49.55},{"time":0.9667}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":-2.26,"y":14.51}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":1.49,"y":10.12}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-30.65},{"time":0.1},{"time":0.3,"angle":42.7},{"time":0.7667,"angle":-3.93},{"time":0.8333,"angle":-22.19},{"time":0.9667,"angle":42.69},{"time":1.3333,"angle":-0.5},{"time":1.4,"angle":40.28},{"time":1.6333,"angle":-47.96},{"time":1.8667,"angle":47.02},{"time":1.9333,"angle":41.22},{"time":2.0333,"angle":21.47},{"time":2.6667,"angle":-45.63},{"time":2.7667,"angle":-9.13},{"time":2.8333,"angle":42.04},{"time":3,"angle":57.46}],"translate":[{"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-9.24},{"time":0.1,"angle":42.73},{"time":0.3,"angle":25.78},{"time":0.5,"angle":80.97},{"time":0.7667,"angle":34.03},{"time":0.8333,"angle":-16.62},{"time":0.9667,"angle":-10.38},{"time":1.1,"angle":49.94},{"time":1.3333,"angle":39.12},{"time":1.4,"angle":-36.84},{"time":1.6333,"angle":90.97},{"time":1.8667,"angle":-36.46},{"time":1.9333,"angle":52.21},{"time":2.0333,"angle":79.24},{"time":2.2,"angle":30.05},{"time":2.6667,"angle":-28.63},{"time":2.7667,"angle":-4.12},{"time":2.8333,"angle":30.39},{"time":3,"angle":37.87}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"angle":19.46},{"time":0.1},{"time":0.3,"angle":-23.17},{"time":0.7667},{"time":0.8333,"angle":5.71},{"time":0.9667,"angle":16.32},{"time":1.3333},{"time":1.4,"angle":-21.2},{"time":1.6333},{"time":1.8667,"angle":33.35},{"time":1.9333,"angle":7.55},{"time":2.0333},{"time":2.6667,"angle":-21.03},{"time":2.7667,"angle":-16.96},{"time":2.8333,"angle":18.8},{"time":3,"angle":33.05}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-41.2},{"time":0.1,"angle":-50.03},{"time":0.3,"angle":5.43},{"time":0.7667,"angle":25.23},{"time":0.8333,"angle":-40.92},{"time":0.9667,"angle":-25.65},{"time":1.3333,"angle":29.67},{"time":1.4,"angle":22.01},{"time":1.6333,"angle":-37.44},{"time":1.8667,"angle":-14.65},{"time":1.9333,"angle":33.09},{"time":2.0333},{"time":2.6667,"angle":-24.86},{"time":2.7667,"angle":-37.16},{"time":2.8333,"angle":-10.32},{"time":3}]},"r ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.46},{"time":0.1},{"time":0.3,"angle":-23.17},{"time":0.7667},{"time":0.8333,"angle":5.71},{"time":0.9667,"angle":16.32},{"time":1.3333},{"time":1.4,"angle":-21.2},{"time":1.6333},{"time":1.8667,"angle":33.35},{"time":1.9333,"angle":7.55},{"time":2.0333},{"time":2.6667,"angle":-21.03},{"time":2.7667,"angle":-16.96},{"time":2.8333,"angle":18.8},{"time":3,"angle":33.05}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-41.2},{"time":0.1,"angle":-50.03},{"time":0.3,"angle":5.43},{"time":0.7667,"angle":25.23},{"time":0.8333,"angle":-40.92},{"time":0.9667,"angle":-25.65},{"time":1.3333,"angle":29.67},{"time":1.4,"angle":22.01},{"time":1.6333,"angle":-37.44},{"time":1.8667,"angle":-14.65},{"time":1.9333,"angle":33.09},{"time":2.0333},{"time":2.6667,"angle":-24.86},{"time":2.7667,"angle":-37.16},{"time":2.8333,"angle":-10.32},{"time":3}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-12.54},{"time":0.1,"angle":14.62},{"time":0.3,"angle":-35.54},{"time":0.7667,"angle":-32.14},{"time":0.8333,"angle":-7.04},{"time":0.9667,"angle":-11.61},{"time":1.3333},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-20.77},{"time":1.8667}],"scale":[{"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-21.33},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":0.78},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-5.05},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":3.48},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-25.81},{"time":3,"angle":6.58}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-6.15},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":-20.92},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-23.18},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-35.63},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-32.65},{"time":3,"angle":6.58}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-12.54},{"time":0.1,"angle":7},{"time":0.3,"angle":-35.54},{"time":0.7667,"angle":-21.7},{"time":0.8333,"angle":-7.04},{"time":0.9667,"angle":-11.61},{"time":1.3333},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-27.21},{"time":1.8667}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-21.33},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":18.51},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-5.05},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":3.48},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-25.81},{"time":3,"angle":6.58}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":19.13},{"time":0.1,"angle":-6.15},{"time":0.3,"angle":-21.7},{"time":0.7667,"angle":-20.92},{"time":0.8333,"angle":22.18},{"time":0.9667,"angle":-22.27},{"time":1.3333,"angle":-23.18},{"time":1.4,"angle":-33.24},{"time":1.6333,"angle":-35.63},{"time":1.8667,"angle":12.89},{"time":1.9333},{"time":2.0333,"angle":-17.69},{"time":2.6667,"angle":23.61},{"time":2.7667,"angle":43.08},{"time":2.8333,"angle":-32.65},{"time":3,"angle":6.58}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.0333}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.0333}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"hair t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333}]},"r finger b2":{"rotate":[{"angle":-8.92}]},"r finger c2":{"rotate":[{"angle":-9.49}]},"r finger d2":{"rotate":[{"angle":7.12}]},"l upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":3,"angle":-22.92}]},"l armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":3,"angle":-6.9}]},"r arm":{"rotate":[{"angle":-8.2,"curve":0.25,"c3":0.75},{"time":3,"angle":-84.98}]},"head2":{"rotate":[{"time":1.9333},{"time":2.0333,"angle":-15.66},{"time":2.6667},{"time":2.8333,"angle":0.67},{"time":3}],"scale":[{"time":1.9333},{"time":2.0333,"x":0.704,"curve":"stepped"},{"time":2.6667,"x":0.704},{"time":2.8333,"x":0.962}]},"r ear s":{"rotate":[{"angle":-5.67}]},"r ear ring b":{"rotate":[{"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"l leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":12.22}]},"l leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":-42.07}]},"l leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":-112.01}]},"r leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":2.27}]},"r finger a2":{"rotate":[{"angle":14.41}]},"r leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":78.83}]},"r leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":3,"angle":37.17}]},"r ear s2":{"rotate":[{"angle":-7.49}]},"headmouth":{"rotate":[{"time":1.9333},{"time":2.0333,"angle":-15.66},{"time":2.6667},{"time":2.8333,"angle":0.67},{"time":3}],"scale":[{"time":1.9333},{"time":2.0333,"x":0.704,"curve":"stepped"},{"time":2.6667,"x":0.704},{"time":2.8333,"x":0.962}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{},{"time":0.0333,"x":-52.19},{"time":0.1},{"time":0.3,"x":115.98},{"time":0.7667,"x":266.75},{"time":0.8333},{"time":0.9667,"x":-237.76},{"time":1.3333,"x":-231.96},{"time":1.4,"curve":"stepped"},{"time":2.6667},{"time":2.7667,"x":-92.78}],"scale":[{"time":0.1},{"time":0.3,"y":1.232},{"time":0.7667,"y":1.58},{"time":0.8333},{"time":0.9667,"y":0.536},{"time":1.3333,"y":0.652},{"time":1.4}]}},"ik":{"rhand":[{"time":0.9,"softness":50,"curve":"stepped"},{"time":0.9333,"softness":50,"bendPositive":false}]},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.3,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-1.11292,2.46487,-2.62152,0.66437,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.33542,-2.81793,7.39606,4.76642,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-86.42184,144.60709,-71.70786,96.86353,-73.50958,69.51074,-91.13928,50.4678,-105.95621,34.46371,18.44489,3.86809,8.46115,16.83865,-41.97913,-134.35272,-41.19659,-133.54768,78.82657,-115.40646,20.23096,-3.54591,15.37378,13.61917,-54.43726,-135.24458,71.90833,-126.82217,43.03165,-13.14539,37.08572,25.47952,-33.96228,47.75824,2.03949,1.65744,-0.02682,2.62775,10.05231,-0.81355,6.89728,7.35754,-6.62946,-43.74097,-34.93259,82.7384,-5.02664,-34.56741,23.91364,-25.46234,-11.69156,-43.56143,26.79962,-36.27829,149.85062,40.57056,61.5874,142.5073,2.47775,2.49991,35.65607,-52.29532,-51.13794,-2.1225,-26.75546,-146.7348,98.13779,-112.32092,8.5022,1.38368,4.2128,7.51306,-1.06296,-4.55374,2.90103,-3.66769,-17.72357,-119.58167,82.51889,-88.34344,100.19598,79.14415,0.48279,127.68155,0,0,0,0,-28.97784,35.3174,-45.68018,-0.67749,-2.30304,-8.52882,5.23767,-7.11429,4.44827,-1.50385,3.94696,2.54361]},{"time":0.8333,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-1.11292,2.46487,-2.62152,0.66437,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.33542,-2.81793,7.39606,4.76642,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-86.42184,144.60709,-71.70786,96.86353,-73.50958,69.51074,-91.13928,50.4678,-105.95621,34.46371,18.44489,3.86809,8.46115,16.83865,-3.9183,-113.68477,-1.60358,-84.10944,54.73862,-66.66803,20.23096,-3.54591,15.37378,13.61917,-10.85379,-103.38661,64.05984,-85.91092,43.03165,-13.14539,37.08572,25.47952,-33.96228,47.75824,2.03949,1.65744,-0.02682,2.62775,10.05231,-0.81355,6.89728,7.35754,3.82114,-40.98517,-34.93259,82.7384,-0.50278,-26.98291,18.32074,-20.40405,2.55304,-37.71628,27.71506,-25.87012,149.85062,40.57056,61.5874,142.5073,0.24445,9.84131,34.5827,-37.72894,-61.27515,10.12372,1.24237,-105.39186,73.16168,-77.69614,8.5022,1.38368,4.2128,7.51306,0.39243,-4.21655,3.13745,-2.84338,9.74438,-104.49744,77.75705,-70.48712,100.19598,79.14415,0.48279,127.68155,0,0,0,0,-27.42624,39.75204,-48.89328,2.37924,0.71335,-7.65024,5.69312,-5.15967,4.44827,-1.50385,3.94696,2.54361]},{"time":0.9667,"curve":"stepped"},{"time":1.9333,"curve":0.25,"c3":0.75},{"time":2.6667,"vertices":[-79.8519,17.83884,-10.54587,23.52505,-24.97342,6.40009,-1.11292,2.46487,-2.62152,0.66437,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8.33542,-2.81793,7.39606,4.76642,19.92917,-6.30809,17.34735,11.66339,51.21344,-15.23352,43.8143,30.58026,68.46072,-18.50168,57.11301,42.03894,93.98004,-17.59862,72.30005,62.56622,171.2547,2.88751,104.40018,135.7833,222.11719,78.6295,76.81943,222.74963,194.24219,141.6518,10.1507,240.19131,125.72101,131.19409,-24.34317,180.06897,-86.42184,144.60709,-71.70786,96.86353,-73.50958,69.51074,-91.13928,50.4678,-105.95621,34.46371,18.44489,3.86809,8.46115,16.83865,-13.66269,-9.18733,-11.34796,20.388,-23.01843,3.81909,20.23096,-3.54591,15.37378,13.61917,-20.59818,1.11082,-13.6972,-15.4238,43.03165,-13.14539,37.08572,25.47952,-33.96228,47.75824,2.03949,1.65744,-0.02682,2.62775,10.05231,-0.81355,6.89728,7.35754,0,0,-34.93259,82.7384,-2.89908,-1.27499,-0.80798,-3.06244,-0.72122,-2.60077,1.58545,-2.18445,149.85062,40.57056,61.5874,142.5073,-11.21695,20.23029,3.77939,-9.80554,-80.78256,27.80896,-8.50201,-0.89442,-4.59537,-7.20901,8.5022,1.38368,4.2128,7.51306,0,0,0,0,0,0,0,0,100.19598,79.14415,0.48279,127.68155,0,0,0,0,-28.11429,47.13446,-54.38657,7.35934,0,0,0,0,4.44827,-1.50385,3.94696,2.54361]},{"time":2.7667,"offset":90,"vertices":[34.13654,-127.86366,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13.38882,-50.14972,0,0,8.39827,-31.45702,1.12668,-32.53924,11.47104,-42.96606,1.53851,-44.44423,0,0,0,0,0.67459,-19.49482,1.814,-52.39503,1.14877,-33.18303,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,1.37723,-5.15866,0.18454,-5.33613,34.13654,-127.86366,4.58051,-132.26277,0,0,0,0,0,0,0,0,2.41159,-9.0331,0.32309,-9.34386,2.49876,-9.35932,0.33484,-9.68131]}]}}},"drawOrder":[{"offsets":[{"slot":"r beard2","offset":3}]}]},"dizzy":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00002"},{"time":0.1,"name":"eyefire/eyefire_00003"},{"time":0.1333,"name":"eyefire/eyefire_00004"},{"time":0.1667,"name":"eyefire/eyefire_00005"},{"time":0.2,"name":"eyefire/eyefire_00006"},{"time":0.2333,"name":"eyefire/eyefire_00007"},{"time":0.2667,"name":"eyefire/eyefire_00008"},{"time":0.3,"name":"eyefire/eyefire_00009"},{"time":0.3333,"name":"eyefire/eyefire_00010"},{"time":0.3667,"name":"eyefire/eyefire_00011"},{"time":0.4,"name":"eyefire/eyefire_00012"},{"time":0.4333,"name":"eyefire/eyefire_00013"},{"time":0.4667,"name":"eyefire/eyefire_00014"},{"time":0.5,"name":"eyefire/eyefire_00015"},{"time":0.5333,"name":"eyefire/eyefire_00016"},{"time":0.5667,"name":"eyefire/eyefire_00017"},{"time":0.6,"name":"eyefire/eyefire_00018"},{"time":0.6333,"name":"eyefire/eyefire_00019"},{"time":0.6667,"name":"eyefire/eyefire_00020"},{"time":0.7,"name":"eyefire/eyefire_00021"},{"time":0.7333,"name":"eyefire/eyefire_00022"},{"time":0.7667,"name":"eyefire/eyefire_00023"},{"time":0.8,"name":"eyefire/eyefire_00024"},{"time":0.8333,"name":"eyefire/eyefire_00025"},{"time":0.8667,"name":"eyefire/eyefire_00026"},{"time":0.9,"name":"eyefire/eyefire_00027"},{"time":0.9333,"name":"eyefire/eyefire_00028"},{"time":0.9667,"name":"eyefire/eyefire_00029"},{"time":1,"name":"eyefire/eyefire_00030"},{"time":1.0333,"name":"eyefire/eyefire_00031"},{"time":1.0667,"name":"eyefire/eyefire_00032"},{"time":1.1,"name":"eyefire/eyefire_00033"},{"time":1.1333,"name":"eyefire/eyefire_00034"},{"time":1.1667,"name":"eyefire/eyefire_00035"},{"time":1.2,"name":"eyefire/eyefire_00036"},{"time":1.2333,"name":"eyefire/eyefire_00037"},{"time":1.2667,"name":"eyefire/eyefire_00000"},{"time":1.3,"name":"eyefire/eyefire_00001"},{"time":1.3333,"name":"eyefire/eyefire_00002"},{"time":1.3667,"name":"eyefire/eyefire_00003"},{"time":1.4,"name":"eyefire/eyefire_00004"},{"time":1.4333,"name":"eyefire/eyefire_00005"},{"time":1.4667,"name":"eyefire/eyefire_00006"},{"time":1.5,"name":"eyefire/eyefire_00007"},{"time":1.5333,"name":"eyefire/eyefire_00008"},{"time":1.5667,"name":"eyefire/eyefire_00009"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"body":{"rotate":[{"angle":0.6,"curve":0.25,"c3":0.75},{"time":0.8,"angle":17.85,"curve":0.25,"c3":0.75},{"time":1.6,"angle":0.6}],"translate":[{"x":-103.58,"y":-38.84,"curve":0.25,"c3":0.75},{"time":0.8,"x":-170.24,"y":-75.87,"curve":0.25,"c3":0.75},{"time":1.6,"x":-103.58,"y":-38.84}],"scale":[{"x":0.98,"y":0.98,"curve":0.25,"c3":0.75},{"time":0.8,"x":1.02,"y":1.02,"curve":0.25,"c3":0.75},{"time":1.6,"x":0.98,"y":0.98}]},"body2":{"rotate":[{"angle":-39.45,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-46.98,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-31.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-39.45}]},"r upparm":{"rotate":[{"angle":33.1,"curve":0.25,"c3":0.75},{"time":0.8,"angle":15.15,"curve":0.25,"c3":0.75},{"time":1.6,"angle":33.1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":40.04,"y":-36.24,"curve":0.25,"c3":0.75},{"time":1.6}]},"lhand":{"rotate":[{"angle":143.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":139.77,"curve":0.25,"c3":0.75},{"time":1.2,"angle":147.52,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":143.65}],"translate":[{"x":121.33,"y":183.16,"curve":0.25,"c3":0.75},{"time":0.8,"x":8.16,"y":258.79,"curve":0.25,"c3":0.75},{"time":1.6,"x":121.33,"y":183.16}],"scale":[{"y":-1}],"shear":[{"x":18.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":15.59,"curve":0.25,"c3":0.75},{"time":1.2,"x":21.46,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":18.53}]},"head":{"rotate":[{"angle":8.82,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-13.83,"curve":0.25,"c3":0.75},{"time":1.6,"angle":8.82}]},"l upparm":{"rotate":[{"angle":50.38,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.55,"curve":0.25,"c3":0.75},{"time":1.6,"angle":50.38}],"translate":[{"x":-44.25,"y":75.09,"curve":0.25,"c3":0.75},{"time":0.8,"x":0.93,"y":104.69,"curve":0.25,"c3":0.75},{"time":1.6,"x":-44.25,"y":75.09}]},"l upparm2":{"rotate":[{"angle":88.28}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":-7.17,"y":-14.44,"curve":0.25,"c3":0.75},{"time":1.6}]},"l armour":{"rotate":[{"angle":52.64}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":1.348,"curve":0.25,"c3":0.75},{"time":1.6}]},"l ik2":{"translate":[{"x":-2.35,"y":-18.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"x":-4.71,"y":-36.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":-2.35,"y":-18.34}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":68.21,"y":-32.84,"curve":0.25,"c3":0.75},{"time":1.6}]},"r upparm3":{"rotate":[{"angle":-25.15,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-25.55,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-24.75,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-25.15}]},"rhand":{"rotate":[{"angle":-9.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-0.24,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-19.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-9.78}],"translate":[{"x":55.95,"y":-181.34,"curve":0.25,"c3":0.75},{"time":0.8,"x":-39.14,"y":-223.6,"curve":0.25,"c3":0.75},{"time":1.6,"x":55.95,"y":-181.34}]},"r hand":{"translate":[{"x":4.87,"y":-2.59,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":14.89,"y":-7.36,"curve":0.25,"c3":0.75},{"time":1.2,"x":-5.15,"y":2.18,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":4.87,"y":-2.59}]},"l hand2":{"translate":[{"x":4.87,"y":-2.59,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":14.89,"y":-7.36,"curve":0.25,"c3":0.75},{"time":1.2,"x":-5.15,"y":2.18,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":4.87,"y":-2.59}],"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"skirt f":{"rotate":[{"angle":-1.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":6.96,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-9.65,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-1.34}],"scale":[{"x":0.829,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":0.658,"curve":0.25,"c3":0.75},{"time":1.2,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":0.829}],"shear":[{"y":7.76,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"y":15.51,"curve":0.25,"c3":0.75},{"time":1.2,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"y":7.76}]},"skirt f2":{"rotate":[{"angle":-9.65,"curve":0.25,"c3":0.75},{"time":0.8,"angle":14.51,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.2,"angle":2.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.6,"angle":-9.65}]},"skirt f3":{"rotate":[{"angle":2.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-9.65,"curve":0.25,"c3":0.75},{"time":1.2,"angle":14.51,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":2.43}]},"l leg5":{"rotate":[{"angle":4.23,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":26.02,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-17.56,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.23}]},"r leg5":{"rotate":[{"angle":4.23,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":26.02,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-17.56,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":4.23}]},"headmouth":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.5333,"angle":-7.39,"curve":0.25,"c3":0.75},{"time":1.6}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.5333,"x":-5.29,"y":14.89,"curve":0.25,"c3":0.75},{"time":1.6}]},"head2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":-1.24,"curve":0.25,"c3":0.75},{"time":1.6}]},"r finger a":{"rotate":[{"angle":2.63,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":11.35,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":2.63}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r finger c":{"rotate":[{"angle":-1.34,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":-5.78,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":-1.34}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r finger d":{"rotate":[{"angle":2.14,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":9.22,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":2.14}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r finger b":{"rotate":[{"angle":-2.11,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"angle":-9.1,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"angle":-2.11}],"scale":[{"x":0.956,"curve":0.381,"c2":0.59,"c3":0.73},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.0333,"x":0.812,"curve":0.243,"c3":0.657,"c4":0.63},{"time":1.6,"x":0.956}]},"r beard":{"rotate":[{"angle":11.44,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1,"angle":-8.1,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":11.44}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":0.78,"curve":0.25,"c3":0.75},{"time":1.6}]},"r beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.88}]},"r beard3":{"rotate":[{"angle":-3.68,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.1,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-3.68}]},"l bear":{"rotate":[{"angle":11.44,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1,"angle":-8.1,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":11.44}],"scale":[{"x":0.744,"curve":0.25,"c3":0.75},{"time":0.7667,"curve":0.25,"c3":0.75},{"time":1.6,"x":0.744}]},"l bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-8.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.88}]},"l beard3":{"rotate":[{"angle":-3.68,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":15.86,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.1,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-3.68}]},"l finger d":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":10.96,"curve":0.25,"c3":0.75},{"time":1.6}]},"l finger c":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":-0.02,"curve":0.25,"c3":0.75},{"time":1.6}]},"l finger b":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":2.72,"curve":0.25,"c3":0.75},{"time":1.6}]},"l finger a":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":-38.23,"curve":0.25,"c3":0.75},{"time":1.6}]},"l finger d2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l finger c2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l finger b2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"l finger a2":{"rotate":[{"angle":-23.53,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":-47.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-23.53}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.8,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":-8.22}]},"hair t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.8,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.6}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":0.61}]},"hair t3":{"rotate":[{"angle":24.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":18.48,"curve":0.25,"c3":0.75},{"time":1.2,"angle":30.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":24.7}]},"hair t4":{"rotate":[{"angle":21.75,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":3.93,"curve":0.25,"c3":0.75},{"time":1.4,"angle":25.78,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":21.75}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"angle":63.33}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"curve":0.25,"c3":0.75},{"time":1,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":26.63}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.25,"c3":0.75},{"time":1.6,"x":-2.26,"y":14.51}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":1.2,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":9.54}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.2,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.6}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.6,"angle":8.76}]},"r ear ringb s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.2,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.2,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"x":5.7,"y":-8.17}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.8,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.6,"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.2,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.2,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":40.99}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.6,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.6,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.2,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6,"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.6,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.6,"angle":-8.22}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.8,"x":-46.39,"curve":0.25,"c3":0.75},{"time":1.6}]},"r leg3":{"rotate":[{"angle":-61.17}]},"r leg2":{"rotate":[{"angle":52}]},"r leg":{"rotate":[{"angle":8.57}]},"l leg3":{"rotate":[{"angle":-27.36}]},"l leg2":{"rotate":[{"angle":19.09}]},"l leg":{"rotate":[{"angle":15.47}]},"r arm":{"rotate":[{"angle":-49.77}]},"r upparm2":{"rotate":[{"angle":26.73}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.8,"offset":36,"vertices":[-1.33797,7.81604,-5.90574,5.2917,6.33594,0.28658,4.78575,4.16223,11.55866,17.07976,-1.55895,20.56429,29.86721,11.68993,16.13397,27.72059,24.26713,30.27791,0.19429,38.80218,-0.48879,10.80822,-7.1001,8.1636,3.17479,16.88126,-8.00425,15.19824,1.25424,15.80983,-8.84296,13.16528,-2.85379,19.56236,-14.39343,13.55197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-11.877,-17.74498,1.72377,-21.28316,-18.11217,-35.82497,-1.48508,-27.23736,15.76438,-22.26129,8.43136,-21.825,20.16967,-11.85804,-0.1679,-16.30974,10.00489,-12.88177,0.20083,-4.4402,2.91694,-3.35373,4.57208,-8.01418,-3.4199,-44.53263,24.99755,-37.01321,-6.20858,-22.9226,9.38237,-21.81659,-1.48507,-27.23736,0,0,-2.4751,-45.39566,26.27411,-37.10221,-4.85504,-32.8238,16.59641,-28.73217,-1.24924,5.85095,-4.61498,3.80738,8.04572,-13.38659,16.68522,-27.45588,0,0,0,0,0,0,-2.38898,-27.27825,15.08163,-22.85509,-1.35797,-10.02383,5.16594,-8.69684,1.14474,-25.30709,16.62506,-19.11462,0,0,0,0,-11.13212,5.83612,-12.34814,-2.3464,0,0,0,0,0,0,0,0,2.15036,6.44641,-2.32169,6.38667],"curve":0.25,"c3":0.75},{"time":1.6}]}}},"drawOrder":[{"offsets":[{"slot":"r beard2","offset":3}]}]},"enter":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00009"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00013"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00016"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00020"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00023"},{"time":0.5667,"name":"eyefire/eyefire_00024"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00027"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00030"},{"time":0.7333,"name":"eyefire/eyefire_00031"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00034"},{"time":0.8333,"name":"eyefire/eyefire_00035"},{"time":0.8667,"name":"eyefire/eyefire_00010"},{"time":0.9,"name":"eyefire/eyefire_00001"},{"time":0.9333,"name":"eyefire/eyefire_00002"},{"time":0.9667,"name":"eyefire/eyefire_00004"},{"time":1,"name":"eyefire/eyefire_00005"},{"time":1.0333,"name":"eyefire/eyefire_00007"},{"time":1.0667,"name":"eyefire/eyefire_00008"},{"time":1.1,"name":"eyefire/eyefire_00009"},{"time":1.1333,"name":"eyefire/eyefire_00011"},{"time":1.1667,"name":"eyefire/eyefire_00012"},{"time":1.2,"name":"eyefire/eyefire_00014"},{"time":1.2333,"name":"eyefire/eyefire_00015"},{"time":1.2667,"name":"eyefire/eyefire_00016"},{"time":1.3,"name":"eyefire/eyefire_00018"},{"time":1.3333,"name":"eyefire/eyefire_00019"},{"time":1.3667,"name":"eyefire/eyefire_00021"},{"time":1.4,"name":"eyefire/eyefire_00022"},{"time":1.4333,"name":"eyefire/eyefire_00023"},{"time":1.4667,"name":"eyefire/eyefire_00025"},{"time":1.5,"name":"eyefire/eyefire_00026"},{"time":1.5333,"name":"eyefire/eyefire_00028"},{"time":1.5667,"name":"eyefire/eyefire_00029"},{"time":1.6,"name":"eyefire/eyefire_00030"},{"time":1.6333,"name":"eyefire/eyefire_00032"},{"time":1.6667,"name":"eyefire/eyefire_00033"},{"time":1.7,"name":"eyefire/eyefire_00035"},{"time":1.7333,"name":"eyefire/eyefire_00036"},{"time":1.7667,"name":"eyefire/eyefire_00010"},{"time":1.8,"name":"eyefire/eyefire_00001"},{"time":1.8333,"name":"eyefire/eyefire_00002"},{"time":1.8667,"name":"eyefire/eyefire_00003"},{"time":1.9,"name":"eyefire/eyefire_00004"},{"time":1.9333,"name":"eyefire/eyefire_00005"},{"time":1.9667,"name":"eyefire/eyefire_00006"},{"time":2,"name":"eyefire/eyefire_00007"},{"time":2.0333,"name":"eyefire/eyefire_00008"},{"time":2.0667,"name":"eyefire/eyefire_00009"},{"time":2.1,"name":"eyefire/eyefire_00010"},{"time":2.1333,"name":"eyefire/eyefire_00011"},{"time":2.1667,"name":"eyefire/eyefire_00012"},{"time":2.2,"name":"eyefire/eyefire_00013"},{"time":2.2333,"name":"eyefire/eyefire_00014"},{"time":2.2667,"name":"eyefire/eyefire_00015"},{"time":2.3,"name":"eyefire/eyefire_00016"},{"time":2.3333,"name":"eyefire/eyefire_00017"},{"time":2.3667,"name":"eyefire/eyefire_00018"},{"time":2.4,"name":"eyefire/eyefire_00019"},{"time":2.4333,"name":"eyefire/eyefire_00020"},{"time":2.4667,"name":"eyefire/eyefire_00021"},{"time":2.5,"name":"eyefire/eyefire_00022"},{"time":2.5333,"name":"eyefire/eyefire_00023"},{"time":2.5667,"name":"eyefire/eyefire_00024"},{"time":2.6,"name":"eyefire/eyefire_00025"},{"time":2.6333,"name":"eyefire/eyefire_00026"},{"time":2.6667,"name":"eyefire/eyefire_00027"},{"time":2.7,"name":"eyefire/eyefire_00028"},{"time":2.7333,"name":"eyefire/eyefire_00029"},{"time":2.7667,"name":"eyefire/eyefire_00030"},{"time":2.8,"name":"eyefire/eyefire_00031"},{"time":2.8333,"name":"eyefire/eyefire_00032"},{"time":2.8667,"name":"eyefire/eyefire_00033"},{"time":2.9,"name":"eyefire/eyefire_00034"},{"time":2.9333,"name":"eyefire/eyefire_00035"},{"time":2.9667,"name":"eyefire/eyefire_00036"},{"time":3,"name":"eyefire/eyefire_00037"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"r finger a2":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72},{"time":3,"angle":14.41}],"translate":[{"x":131.03,"y":-25.92,"curve":"stepped"},{"time":0.8,"x":131.03,"y":-25.92},{"time":3}],"scale":[{"x":0.356,"y":0.528,"curve":"stepped"},{"time":0.8,"x":0.356,"y":0.528},{"time":3}]},"r finger d2":{"rotate":[{"angle":-55.55},{"time":0.3,"angle":27.3},{"time":0.4,"angle":-22.35},{"time":0.5,"angle":-106.07},{"time":0.6,"angle":-89.23,"curve":"stepped"},{"time":0.8,"angle":-89.23},{"time":3,"angle":7.12}],"translate":[{"x":25.4,"y":155.06},{"time":0.3,"x":55.13,"y":192.85},{"time":0.4,"x":39.27,"y":177.3},{"time":0.5,"x":-13.43,"y":192.22},{"time":0.6,"x":-0.48,"y":179.83,"curve":"stepped"},{"time":0.8,"x":-0.48,"y":179.83},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"r finger b2":{"rotate":[{"angle":-72.05},{"time":0.3,"angle":-7.32},{"time":0.4,"angle":-56.97},{"time":0.5,"angle":-139.63},{"time":0.6,"angle":-117.1,"curve":"stepped"},{"time":0.8,"angle":-117.1},{"time":3,"angle":-8.92}],"translate":[{"x":171.78,"y":113.86},{"time":0.3,"x":144.96,"y":155.26},{"time":0.4,"x":129.1,"y":139.7},{"time":0.5,"x":188.45,"y":155.72},{"time":0.6,"x":182.9,"y":141.76,"curve":"stepped"},{"time":0.8,"x":182.9,"y":141.76},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"r finger c2":{"rotate":[{"angle":-62.67},{"time":0.3,"angle":2.17},{"time":0.4,"angle":-47.48},{"time":0.5,"angle":-133.75},{"time":0.6,"angle":-110.06,"curve":"stepped"},{"time":0.8,"angle":-110.06},{"time":3,"angle":-9.49}],"translate":[{"x":43.59,"y":126.34},{"time":0.3,"x":73.32,"y":164.13},{"time":0.4,"x":57.46,"y":148.57},{"time":0.5,"x":63.53,"y":172.35},{"time":0.6,"x":56.88,"y":157.01,"curve":"stepped"},{"time":0.8,"x":56.88,"y":157.01},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":3}]},"body":{"rotate":[{"angle":-8.67},{"time":0.1,"angle":-57.16},{"time":0.2,"angle":-81.65},{"time":0.3,"angle":-101.77},{"time":0.4,"angle":-119.71},{"time":0.5,"angle":-130.33},{"time":0.6,"angle":-117.59},{"time":0.7,"angle":-79.13},{"time":0.8,"angle":-59.37},{"time":0.9333,"angle":-31.14},{"time":1.1333,"angle":-8.99},{"time":1.2333,"angle":-1.19},{"time":1.4667,"angle":1.56},{"time":1.9,"angle":-13.1},{"time":2,"angle":-41.48},{"time":2.0333,"angle":-42.2},{"time":2.4333,"angle":-34.12},{"time":2.6667,"angle":2.11},{"time":3}],"translate":[{"x":-3552.25,"y":-102.64,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.1,"x":-3277.91,"y":-75.73,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.2,"x":-2495.59,"y":-30.21,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.3,"x":-1391.07,"y":16.35,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.4,"x":-963.85,"y":43.22,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.5,"x":-791.92,"y":16.31,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.6,"x":-515.79,"y":-29.21,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.7,"x":-270.92,"y":-75.77,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"x":-197.98,"y":-102.64},{"time":0.9333,"x":-130.76,"y":-113.25},{"time":1.1333,"x":-79.12,"y":-106.01},{"time":1.2333,"x":-68.94,"y":-4.14},{"time":1.4667,"x":-79.19,"y":55.69},{"time":1.9,"x":-42.06,"y":43.32},{"time":2,"x":44.57,"y":-30.94},{"time":2.0333,"x":75.51,"y":-71.16},{"time":2.4333,"x":47.66,"y":-71.16},{"time":2.6667,"x":50.42,"y":-19.84},{"time":3}]},"l hand2":{"rotate":[{"angle":-5.46},{"time":0.1,"angle":19.32},{"time":0.2,"angle":21.77},{"time":0.3,"angle":22.05},{"time":0.4,"angle":-91.8},{"time":0.5,"angle":-68.35},{"time":0.6,"angle":-55.42,"curve":"stepped"},{"time":0.8,"angle":-55.42},{"time":3}],"translate":[{"x":-23.89,"y":-2.05},{"time":0.1,"x":-28.71,"y":12.87},{"time":0.2,"x":-41.75,"y":-1.02},{"time":0.3,"x":-65.66,"y":-15.55},{"time":0.4,"x":98.13,"y":100.45},{"time":0.5,"x":44.43,"y":127.78},{"time":0.6,"x":43.38,"y":135.2,"curve":"stepped"},{"time":0.8,"x":43.38,"y":135.2},{"time":3}],"scale":[{"x":0.578,"y":-0.613,"curve":"stepped"},{"time":1.0667,"x":0.578,"y":-0.613},{"time":1.1,"x":0,"y":0}]},"body2":{"rotate":[{"angle":-22.79},{"time":0.1,"angle":-10.08},{"time":0.2,"angle":16.6},{"time":0.3,"angle":38.66},{"time":0.4,"angle":52.44},{"time":0.5,"angle":59.18},{"time":0.6,"angle":41.89},{"time":0.7,"angle":-15.52},{"time":0.8,"angle":-13.97},{"time":0.9333,"angle":-38.77},{"time":1.1333,"angle":-42.93},{"time":1.2333,"angle":-26.53},{"time":1.4667,"angle":10.48},{"time":1.9,"angle":50.62},{"time":2,"angle":45.37},{"time":2.0333,"angle":12.98},{"time":2.4333,"angle":-20.67},{"time":2.6667,"angle":-35.35},{"time":3,"angle":-2.21}],"translate":[{"x":-80.64,"y":48.56},{"time":0.1,"x":-29.6,"y":11.44},{"time":0.2,"x":24.21,"y":6.83},{"time":0.3,"x":87.48,"y":24.44},{"time":0.4,"x":76.26,"y":17.25},{"time":0.5,"x":26.63,"y":100.63},{"time":0.6,"x":-89.25,"y":-3.33},{"time":0.7,"x":-119.7,"y":79.08},{"time":0.8,"x":-10.26,"y":16.06},{"time":0.9333,"x":28.57,"y":-3.29},{"time":3,"x":-7.85,"y":2.92}]},"head":{"rotate":[{"angle":54.91},{"time":0.1,"angle":57.8},{"time":0.2,"angle":61.64},{"time":0.3,"angle":73.6},{"time":0.4,"angle":89.11},{"time":0.5,"angle":87.54},{"time":0.6,"angle":81.54},{"time":0.7,"angle":92.91},{"time":0.8,"angle":54.91},{"time":0.9333,"angle":42.93},{"time":1.1333,"angle":17.02},{"time":1.2333,"angle":13.18},{"time":1.4667,"angle":4.73},{"time":1.9,"angle":16.82},{"time":2,"angle":33.14},{"time":2.0333,"angle":36.1},{"time":2.4333,"angle":66.37},{"time":2.6667,"angle":29.02},{"time":3,"angle":-4.31}],"translate":[{"x":20.04,"y":114.02,"curve":"stepped"},{"time":1.1333,"x":20.04,"y":114.02},{"time":1.2333,"x":-9.67,"y":27.62},{"time":1.4667,"x":-20.75,"y":35.91,"curve":"stepped"},{"time":1.9,"x":-20.75,"y":35.91},{"time":2,"x":-33.53,"y":5.13},{"time":2.0333,"x":23.53,"y":45.69,"curve":"stepped"},{"time":2.6667,"x":23.53,"y":45.69},{"time":3}]},"rhand":{"rotate":[{"angle":-61.96},{"time":0.1,"angle":-73.08},{"time":0.2,"angle":-53.34},{"time":0.3,"angle":-7.68},{"time":0.4,"angle":-29.8},{"time":0.5,"angle":-28.8},{"time":0.6,"angle":-23.59},{"time":0.7,"angle":-38.24},{"time":0.8,"angle":-31.8},{"time":0.9333,"angle":-54.75},{"time":1.1333,"angle":-97.12},{"time":1.2667,"angle":-59.09},{"time":1.3,"angle":-164.78},{"time":1.4667,"angle":-173.44},{"time":1.9,"angle":149.12},{"time":2,"angle":21.91},{"time":2.0333,"angle":-53.26,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-21.83},{"time":2.6667,"angle":-25.48},{"time":3,"angle":5.78}],"translate":[{"x":-3139.48,"y":-265.49},{"time":0.1,"x":-2597.5,"y":-287.15},{"time":0.2,"x":-1538.08,"y":-271.75},{"time":0.3,"x":-156.59,"y":-302.33},{"time":0.4,"x":162.82,"y":-415.03},{"time":0.5,"x":333.89,"y":-405.4},{"time":0.6,"x":362.68,"y":-451.02},{"time":0.7,"x":341.39,"y":-449.56},{"time":0.8,"x":363.74,"y":-468.24},{"time":0.9333,"x":436.4,"y":-362.08},{"time":1.1333,"x":449.16,"y":-326.78},{"time":1.2667,"x":362.78,"y":-209.31},{"time":1.3,"x":335.64,"y":-198.55},{"time":1.4667,"x":131.27,"y":-121.58},{"time":1.9,"x":2.3,"y":-135.16},{"time":2,"x":126.95,"y":24.83},{"time":2.0333,"x":215.53,"y":202.48,"curve":0.25,"c3":0.75},{"time":2.4333,"x":271.51,"y":181.5},{"time":2.6667,"x":215.79,"y":82.37},{"time":3}],"scale":[{"x":0.445,"y":-0.647,"curve":"stepped"},{"time":0.7,"x":0.445,"y":-0.647},{"time":0.8,"x":0.445,"y":-0.648},{"time":1.2667,"x":0.665,"y":-0.968},{"time":1.3,"x":0.492,"y":0.694},{"time":1.4667,"x":1.263,"y":1.104},{"time":1.9}]},"r upparm":{"rotate":[{"angle":56.42,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.1,"angle":74.64,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.2,"angle":73.29,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.3,"angle":101.63,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.4,"angle":104.15,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.5,"angle":99.53,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.6,"angle":87.72,"curve":0.343,"c2":0.36,"c3":0.686,"c4":0.73},{"time":0.7,"angle":95.14,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"angle":80.25},{"time":0.9333,"angle":71.45},{"time":1.1333,"angle":66.47},{"time":1.3,"angle":27.63},{"time":1.4667,"angle":-6.25},{"time":1.7333,"angle":-24.81},{"time":1.9,"angle":-40.77},{"time":2,"angle":-23.48},{"time":2.0333,"angle":-19.48},{"time":2.4333,"angle":-10.17},{"time":2.6667,"angle":-0.31},{"time":3,"angle":-6.94}],"translate":[{},{"time":0.4,"x":-23.64,"y":21.09},{"time":0.8,"curve":"stepped"},{"time":1.1333},{"time":1.3,"x":-37.82,"y":-33.24},{"time":1.4667,"x":-30.27,"y":-75.09},{"time":1.7333,"x":-8,"y":-64.19},{"time":1.9,"x":-1.33,"y":-79.96,"curve":"stepped"},{"time":2,"x":-1.33,"y":-79.96},{"time":2.0333,"x":-0.65,"y":-149.57},{"time":2.4333,"x":24.58,"y":-147.44},{"time":2.6667,"x":-50.71,"y":-70.12},{"time":3}]},"l ik":{"rotate":[{"angle":-2.64},{"time":0.1,"angle":3.05},{"time":0.2,"angle":-46.63},{"time":0.3,"angle":-134.68},{"time":0.4,"angle":-137.5},{"time":0.5,"angle":-127.9},{"time":0.6,"angle":-79.41},{"time":0.7,"angle":-68.78},{"time":0.8,"angle":-2.64},{"time":0.8667,"angle":-18.59},{"time":0.9333,"angle":3.59,"curve":"stepped"},{"time":1.9333,"angle":3.59},{"time":2.0333}],"translate":[{"x":-3697.95,"y":70.09},{"time":0.1,"x":-3528.29,"y":-2.76},{"time":0.2,"x":-2975.64,"y":85.85},{"time":0.3,"x":-2033.06,"y":290.99},{"time":0.4,"x":-1594.4,"y":360.98},{"time":0.5,"x":-1351.98,"y":415.93},{"time":0.6,"x":-857.77,"y":228.69},{"time":0.7,"x":-522.75,"y":181.63},{"time":0.8,"x":-222.27,"y":109.6},{"time":0.8667,"x":-119.44,"y":50.83},{"time":0.9333,"x":-86.11,"y":9.27,"curve":"stepped"},{"time":1.9333,"x":-86.11,"y":9.27},{"time":2,"x":-36.61,"y":102.09},{"time":2.0333}]},"lhand":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-84.39},{"time":0.2,"angle":-88.18},{"time":0.3,"angle":-51.49},{"time":0.4,"angle":63.47},{"time":0.5,"angle":23.26},{"time":0.6,"angle":22.08,"curve":"stepped"},{"time":0.7,"angle":22.08},{"time":0.8,"angle":13.43},{"time":0.9333,"angle":13.68},{"time":1,"angle":-64.87},{"time":1.2333,"angle":-72.6},{"time":1.2667,"angle":-44.35},{"time":1.4667,"angle":-14.78},{"time":1.9,"angle":85.83},{"time":2,"angle":36.86},{"time":2.0333,"angle":-97.53},{"time":2.4333,"angle":-72.24},{"time":2.6667,"angle":-27.8},{"time":3,"angle":-6.06}],"translate":[{"x":-3709.84,"y":-59.33},{"time":0.1,"x":-3469.49,"y":197.82},{"time":0.2,"x":-2505.59,"y":106.23},{"time":0.3,"x":-1151.71,"y":12.55},{"time":0.4,"x":-405.36,"y":-39.96},{"time":0.5,"x":-202.6,"y":-176.13},{"time":0.6,"x":-75.62,"y":-178.34},{"time":0.7,"x":-33.78,"y":-178.34,"curve":"stepped"},{"time":0.9333,"x":-33.78,"y":-178.34},{"time":1,"x":-142.05,"y":-61.94},{"time":1.1333,"x":-282.59,"y":176.33},{"time":1.2333,"x":-276.56,"y":345.61},{"time":1.4667,"x":-151.63,"y":252.03},{"time":1.9,"x":139.85,"y":309.89},{"time":2,"x":135.73,"y":256.73},{"time":2.0333,"x":-128.65,"y":48.02},{"time":2.4333,"x":-132.78,"y":-49.13},{"time":2.6667,"x":-69.38,"y":-48.69},{"time":3,"x":-49.01,"y":-5.46}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.525,"y":-0.516},{"time":1.4667,"y":-0.582},{"time":1.6667,"y":-1},{"time":1.9,"x":1.175,"y":-0.725},{"time":2,"y":-0.983},{"time":2.0333,"curve":"stepped"},{"time":2.6667},{"time":3,"x":0.95,"y":0.95}]},"l upparm":{"rotate":[{"angle":121.1},{"time":0.1,"angle":113.65},{"time":0.2,"angle":153.35},{"time":0.3,"angle":138.84},{"time":0.4,"angle":121.54},{"time":0.5,"angle":114.98},{"time":0.6,"angle":121.16},{"time":0.7,"angle":148.41},{"time":0.8,"angle":106.3},{"time":0.9333,"angle":74.35},{"time":1.9,"angle":24.26},{"time":2,"angle":52.64},{"time":2.6667,"angle":24.26},{"time":3}],"translate":[{"x":-7.3,"y":263.84,"curve":"stepped"},{"time":0.8,"x":-7.3,"y":263.84},{"time":1.9,"x":4.3,"y":132.76,"curve":"stepped"},{"time":2.6667,"x":4.3,"y":132.76},{"time":3}]},"r finger b":{"rotate":[{"angle":-31.61},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-40.66},{"time":0.4,"angle":-120.95},{"time":0.7,"angle":-134.91,"curve":"stepped"},{"time":0.8,"angle":-134.91},{"time":0.9333,"angle":-144.5},{"time":1.1333,"angle":-91.5},{"time":1.2667,"angle":-130.98},{"time":1.3,"angle":-148.54},{"time":1.4667,"angle":-142.86},{"time":1.9,"angle":-149.27},{"time":2,"angle":-130.98},{"time":2.0333,"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-80.56},{"time":2.6667,"angle":-65.19},{"time":3,"angle":-8.92}],"translate":[{"x":78.27,"y":97.55},{"time":0.2,"x":144.96,"y":155.26},{"time":0.3,"x":129.1,"y":139.7},{"time":0.4,"x":188.45,"y":155.72},{"time":0.7,"x":171.78,"y":113.86,"curve":"stepped"},{"time":0.9333,"x":171.78,"y":113.86},{"time":1.1333,"x":84.68,"y":122.05},{"time":1.2667,"x":153.6,"y":158.11,"curve":"stepped"},{"time":2,"x":153.6,"y":158.11},{"time":2.0333,"curve":0.25,"c3":0.75},{"time":2.4333,"x":49.96,"y":19.95},{"time":2.6667,"x":80.79,"y":37.55},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.9333,"x":0.674},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.307,"y":0.895},{"time":2,"x":0.674},{"time":2.0333}]},"r finger c":{"rotate":[{"angle":-22.53},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-31.17},{"time":0.4,"angle":-115.08},{"time":0.7,"angle":-125.53,"curve":"stepped"},{"time":0.8,"angle":-125.53},{"time":0.9333,"angle":-118.27},{"time":1.1333,"angle":-82.13},{"time":1.2667,"angle":-121.6},{"time":1.3,"angle":-121.62},{"time":1.4667,"angle":-133.48},{"time":1.9,"angle":-115.45},{"time":2,"angle":-121.6},{"time":2.0333,"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-66.51},{"time":2.6667,"angle":-35.74},{"time":3,"angle":-9.49}],"translate":[{"x":6.64,"y":106.41},{"time":0.2,"x":73.32,"y":164.13},{"time":0.3,"x":57.46,"y":148.57},{"time":0.4,"x":63.53,"y":172.35},{"time":0.7,"x":43.59,"y":126.34,"curve":"stepped"},{"time":0.9333,"x":43.59,"y":126.34},{"time":1.1333,"x":-43.51,"y":134.53},{"time":1.2667,"x":25.41,"y":170.59,"curve":"stepped"},{"time":2,"x":25.41,"y":170.59},{"time":2.0333,"curve":"stepped"},{"time":2.4333,"curve":0.382,"c2":0.56,"c3":0.739},{"time":2.6667,"x":30.83,"y":17.59},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":0.9333,"x":0.534},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.399,"y":0.679},{"time":2,"x":0.674},{"time":2.0333}]},"r finger d":{"rotate":[{"angle":1.61},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-6.04},{"time":0.4,"angle":-87.39},{"time":0.7,"angle":-118.41,"curve":"stepped"},{"time":0.8,"angle":-118.41},{"time":0.9333,"angle":-94.23},{"time":1.1333,"angle":-75.01},{"time":1.2667,"angle":-93.5},{"time":1.3,"angle":-58.49},{"time":1.4667,"angle":-126.36},{"time":1.9,"angle":-79.35},{"time":2,"angle":-114.48},{"time":2.0333,"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":-49.17},{"time":2.6667,"angle":7.68},{"time":3,"angle":7.12}],"translate":[{"x":-11.55,"y":135.14},{"time":0.2,"x":55.13,"y":192.85},{"time":0.3,"x":39.27,"y":177.3},{"time":0.4,"x":-13.43,"y":192.22},{"time":0.7,"x":25.4,"y":155.06,"curve":"stepped"},{"time":0.9333,"x":25.4,"y":155.06},{"time":1.1333,"x":-61.7,"y":163.26},{"time":1.2667,"x":7.22,"y":199.32},{"time":1.3,"x":-6.92,"y":192.44},{"time":2,"x":7.22,"y":199.32},{"time":2.0333,"curve":"stepped"},{"time":2.4333,"curve":0.382,"c2":0.56,"c3":0.739},{"time":2.6667,"x":30.83,"y":17.59},{"time":3}],"scale":[{"x":0.674,"curve":"stepped"},{"time":0.8,"x":0.674},{"time":0.9333,"x":0.434,"y":0.747},{"time":1.1333,"x":0.465},{"time":1.3,"x":0.458,"y":0.679},{"time":2,"x":0.674},{"time":2.0333}]},"r finger a":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72},{"time":0.9333,"angle":-9.99},{"time":1.1333,"angle":-1.21},{"time":1.4667,"angle":-42.33},{"time":1.9,"angle":-28.83},{"time":2,"angle":-1.21},{"time":2.0333,"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.4333,"angle":45.08},{"time":2.6667,"angle":39.22},{"time":3,"angle":14.41}],"translate":[{"x":131.03,"y":-25.92,"curve":"stepped"},{"time":1.2667,"x":131.03,"y":-25.92},{"time":1.3,"x":188.98,"y":-2.29,"curve":"stepped"},{"time":2,"x":188.98,"y":-2.29},{"time":2.0333,"curve":0.25,"c3":0.75},{"time":2.4333,"x":33.92,"y":-37.24},{"time":2.6667,"x":13.46,"y":-38.48},{"time":3}],"scale":[{"x":0.356,"y":0.528,"curve":"stepped"},{"time":0.8,"x":0.356,"y":0.528},{"time":1.3,"x":0.512,"y":0.759,"curve":"stepped"},{"time":2,"x":0.512,"y":0.759},{"time":2.0333}]},"r upparm2":{"rotate":[{"angle":2.65},{"time":1.1333,"angle":38.25},{"time":1.4667,"angle":55.72},{"time":1.7333,"angle":27.54},{"time":1.9,"angle":6.41},{"time":2.4333,"angle":25.98},{"time":3,"angle":12.97}],"translate":[{},{"time":0.1,"x":-23.06,"y":-56.12},{"time":0.2,"x":18.62,"y":-75.54},{"time":0.3,"x":58.57,"y":-61.11},{"time":0.4,"x":21.93,"y":-102.93},{"time":0.5,"x":56.85,"y":-62.14},{"time":0.6,"x":63.16,"y":-55.04},{"time":0.7,"x":-2.02,"y":-22.9},{"time":0.8,"x":-12.36,"y":-30.77},{"time":0.9333,"x":-18.04,"y":-30.53},{"time":1.1333,"x":-32.01,"y":-71.98},{"time":1.3,"x":14.33,"y":3.83},{"time":1.4667,"x":-0.34,"y":5.85},{"time":1.5,"x":10.13,"y":4.27},{"time":1.7333,"x":-15.82,"y":-3.94},{"time":1.9,"x":-16.38,"y":5.99},{"time":2.4333,"x":-19.28,"y":-33.74},{"time":3}],"scale":[{"x":0.874,"y":0.874,"curve":"stepped"},{"time":0.9333,"x":0.874,"y":0.874},{"time":3}]},"l finger c":{"rotate":[{"angle":67.75},{"time":0.2,"angle":46.4},{"time":0.4,"angle":29.53},{"time":0.5,"angle":73.3,"curve":"stepped"},{"time":0.7,"angle":73.3},{"time":0.8,"angle":67.75,"curve":"stepped"},{"time":1.2333,"angle":67.75},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l finger b":{"rotate":[{"angle":12.29},{"time":0.2,"angle":-9.05},{"time":0.4,"angle":-25.92},{"time":0.5,"angle":17.85,"curve":"stepped"},{"time":0.7,"angle":17.85},{"time":0.8,"angle":12.29,"curve":"stepped"},{"time":1.2333,"angle":12.29},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l finger a":{"rotate":[{"angle":-21},{"time":0.2,"angle":-42.35},{"time":0.4,"angle":-59.21},{"time":0.5,"angle":-15.44,"curve":"stepped"},{"time":0.7,"angle":-15.44},{"time":0.8,"angle":-21,"curve":"stepped"},{"time":1.2333,"angle":-21},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l finger d":{"rotate":[{"angle":104.78},{"time":0.2,"angle":83.43},{"time":0.4,"angle":66.56},{"time":0.5,"angle":110.34,"curve":"stepped"},{"time":0.7,"angle":110.34},{"time":0.8,"angle":104.78,"curve":"stepped"},{"time":1.2333,"angle":104.78},{"time":1.2667,"angle":-2.5,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.4667,"angle":35.81,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.9,"angle":-32.58,"curve":0.367,"c2":0.63,"c3":0.704},{"time":2.6667,"angle":-2.5}]},"l finger b2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":16.78,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":79.08,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-11.64,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":16.78}],"translate":[{"time":1.2333},{"time":1.2667,"x":-1.29,"y":10.42}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l finger a2":{"rotate":[{"angle":19.49},{"time":0.2,"angle":-1.85},{"time":0.4,"angle":10.22},{"time":0.5,"angle":56.06},{"time":0.7,"angle":44.53},{"time":0.8,"angle":19.49,"curve":"stepped"},{"time":1.2333,"angle":19.49},{"time":1.2667,"angle":5.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":67.62,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-23.1,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":5.32}],"translate":[{"time":1.2333},{"time":1.2667,"x":-3.75,"y":9.81}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l finger c2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":16.54,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":78.84,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-11.88,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":16.54}],"translate":[{"time":1.2333},{"time":1.2667,"x":-2.62,"y":10.17}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"l finger d2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88,"curve":"stepped"},{"time":1.2333,"angle":40.88},{"time":1.2667,"angle":26.01,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4667,"angle":88.3,"curve":0.342,"c2":0.36,"c3":0.679,"c4":0.71},{"time":1.9,"angle":-2.42,"curve":0.381,"c2":0.59,"c3":0.728},{"time":2.6667,"angle":26.01}],"translate":[{"time":1.2333},{"time":1.2667,"x":-1.16,"y":10.43}],"scale":[{"time":1.2333},{"time":1.2667,"x":0.925,"y":0.925}]},"r ik":{"rotate":[{"angle":102.66},{"time":0.1,"angle":27.72},{"time":0.2,"angle":-23.72},{"time":0.3,"angle":-35},{"time":0.4,"angle":-34.26},{"time":0.5},{"time":0.6,"angle":71.42},{"time":0.7,"angle":72.92},{"time":0.8,"angle":82.14},{"time":0.9333,"angle":102.66,"curve":"stepped"},{"time":1.1667,"angle":102.66},{"time":1.3,"angle":28.42},{"time":1.5333}],"translate":[{"x":-3273.98,"y":-6.67},{"time":0.1,"x":-3267.98,"y":99.3},{"time":0.2,"x":-2558.01,"y":126.65},{"time":0.3,"x":-1289.31,"y":271.14},{"time":0.4,"x":-701.5,"y":318.34},{"time":0.5,"x":-427.68,"y":281.87},{"time":0.6,"x":-135.25,"y":150.47},{"time":0.7,"x":34.7,"y":120.68},{"time":0.8,"x":91.94,"y":49.04},{"time":0.9333,"x":77.25,"y":-9.7,"curve":"stepped"},{"time":1.1667,"x":77.25,"y":-9.7},{"time":1.3,"x":140.65,"y":110.58},{"time":1.5333}],"scale":[{"y":-1,"curve":"stepped"},{"time":1.1667,"y":-1},{"time":1.3}]},"l ik2":{"translate":[{"x":91.54,"y":85.04},{"time":0.1,"x":57.37,"y":79.54},{"time":0.2,"x":46.58,"y":84.16},{"time":0.3,"x":43.88,"y":-108.48},{"time":0.4,"x":50.02,"y":-49.47},{"time":0.5,"x":61.7,"y":4.19},{"time":0.6,"x":69.69,"y":-9.68},{"time":0.7,"x":87.16,"y":32.39},{"time":0.8,"x":40.89,"y":17.54},{"time":0.8667,"x":36.41,"y":-39.33},{"time":0.9333,"x":57.87,"y":16.78},{"time":1.1333,"x":37.58,"y":-6.79},{"time":1.2333,"x":1.78,"y":6.73},{"time":1.4667,"x":-27.38,"y":7.96},{"time":1.9333,"x":-17.93,"y":-28.08},{"time":2,"x":52.27,"y":21.93},{"time":2.0333,"x":39.5,"y":-2.99},{"time":2.4333,"x":28.53,"y":-14.33},{"time":3}]},"r arm":{"rotate":[{"angle":22.15},{"time":3,"angle":-8.2}],"scale":[{},{"time":0.9333,"y":1.378,"curve":"stepped"},{"time":2,"y":1.378},{"time":2.0333}]},"l leg":{"rotate":[{"angle":7.96},{"time":3}]},"r ik2":{"rotate":[{"time":1.0333},{"time":1.2333,"angle":11.17},{"time":1.5333}],"translate":[{"x":128.11,"y":-106.46},{"time":0.1,"x":78.5,"y":-78.71},{"time":0.2,"x":-2.33,"y":39.33},{"time":0.3,"x":87.53,"y":45.77},{"time":0.4,"x":81.77,"y":1.21},{"time":0.5,"x":108.09,"y":16.09},{"time":0.6,"x":105.52,"y":-61.86},{"time":0.7,"x":167.96,"y":-36.84},{"time":0.8,"x":112.19,"y":-79.33},{"time":0.9333,"x":101.11,"y":-61.8},{"time":1.0333,"x":135.3,"y":-65.86},{"time":1.1667,"x":115.72,"y":-49.39},{"time":1.3,"x":104.91,"y":-7.44},{"time":1.5333,"x":89.47,"y":-33.56,"curve":0.26,"c3":0.618,"c4":0.44},{"time":3}]},"r leg":{"rotate":[{"angle":63.83,"curve":"stepped"},{"time":1.3,"angle":63.83},{"time":1.5333}],"translate":[{"x":3.77,"y":-2.04},{"time":1.0333}],"scale":[{"x":0.787,"y":-1,"curve":"stepped"},{"time":1.1667,"x":0.787,"y":-1},{"time":1.3}]},"r hand":{"rotate":[{"time":1.2667},{"time":1.3,"angle":22.22,"curve":"stepped"},{"time":2,"angle":22.22},{"time":2.0333}],"translate":[{"x":-108.92,"y":-86.21},{"time":0.1,"x":-231.8,"y":-34.01},{"time":0.2,"x":-257.1,"y":-45.29},{"time":0.3,"x":-225.91,"y":-67.47},{"time":0.4,"x":-184.87,"y":-44.92},{"time":0.5,"x":-188.82,"y":-80.85},{"time":0.6,"x":-168.25,"y":-121.48},{"time":0.7,"x":-209.89,"y":-75.36},{"time":0.8,"x":-202.11,"y":-101.44},{"time":0.9333,"x":-119.87,"y":-108.71},{"time":1.1333,"x":-205.04,"y":-50.37},{"time":1.2667,"x":-212.95,"y":-50.19},{"time":1.3,"x":-185.79,"y":-148.06},{"time":1.4667,"x":-119.62,"y":-101.72,"curve":"stepped"},{"time":2,"x":-119.62,"y":-101.72},{"time":2.0333}]},"r upparm3":{"rotate":[{"angle":-27.65},{"time":0.1,"angle":-53.5},{"time":0.2,"angle":-105.96},{"time":0.3,"angle":-138.28},{"time":0.4,"angle":-125.37},{"time":0.5,"angle":-109.13},{"time":0.6,"angle":-88.34},{"time":0.7,"angle":-34.45},{"time":0.8,"angle":-67.94},{"time":0.9333,"angle":-57.34},{"time":1.1333,"angle":-44.48},{"time":1.3,"angle":-19.31},{"time":1.4667,"angle":16.01},{"time":1.9,"angle":43.83},{"time":2,"angle":16.04},{"time":2.0333,"angle":22.11},{"time":2.4333,"angle":27.19},{"time":2.6667,"angle":16.64},{"time":3}],"translate":[{},{"time":1.1333,"x":-0.49,"y":-9.64},{"time":1.3,"x":-5.15,"y":-12.45},{"time":1.4667,"x":-5.55,"y":-5.54},{"time":1.9,"x":13.19,"y":-8.62},{"time":2,"x":13.75,"y":-10.47},{"time":2.0333,"x":10.82,"y":10.91},{"time":3}]},"l upparm2":{"rotate":[{"angle":-78.32},{"time":2.6667,"angle":1.59},{"time":3,"angle":-6.45}],"translate":[{"x":-56.13,"y":20.55},{"time":0.1,"x":-86.33,"y":42.77},{"time":0.2,"curve":"stepped"},{"time":0.3},{"time":0.4,"x":-97.89,"y":54.46},{"time":0.5,"x":10.44,"y":22.48},{"time":0.6,"x":-13,"y":90.89},{"time":0.7,"x":-44.26,"y":70.92},{"time":0.8,"x":-56.13,"y":20.55},{"time":1.9,"x":2.61,"y":-9.89,"curve":"stepped"},{"time":2.6667,"x":2.61,"y":-9.89},{"time":3}]},"l hand":{"scale":[{"x":0,"y":0,"curve":"stepped"},{"time":1.0667,"x":0,"y":0},{"time":1.1}]},"r leg2":{"rotate":[{"angle":93.27},{"time":1.5333}]},"r leg3":{"rotate":[{"angle":-83.89},{"time":1.5333}]},"l armour":{"rotate":[{"angle":-53.84},{"time":2.6667,"angle":19.71},{"time":3,"angle":1.84}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"r ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":19.13,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":41.37,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":37.65,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":16.4,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":-10.53,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":-4.8,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-31.05,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-27.47,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":-4.22,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3}]},"r ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":-0.23,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":-26.38,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-13.4,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":37.79,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.6333,"angle":-23.32,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.9,"angle":39.57,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":3.84,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":27.73,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":2.2,"angle":-25.17,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":2.4333,"angle":-8.23,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":15.32,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":-2.28}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":19.13,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":41.37,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":37.65,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":16.4,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":-10.53,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":-4.8,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-31.05,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-27.47,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":-4.22,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3}]},"l ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":0.22,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":-25.27,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":-11.95,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":40,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.6333,"angle":-20.58,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.9,"angle":43.11,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":7.66,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":31.64,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":2.2,"angle":-20.82,"curve":0.343,"c2":0.38,"c3":0.677,"c4":0.71},{"time":2.4333,"angle":-3.36,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":20.61,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":3.27}]},"hair t":{"rotate":[{"angle":4.07,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":17.13,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-8.99,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":4.07,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":13.41,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":7.98,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":2.46,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":1.48,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":1.28,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":1.21,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":0.5,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":0.19,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3}]},"hair t2":{"rotate":[{"angle":-2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":8.12,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":17.96,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.9333,"angle":9.4,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":1.1333,"angle":11.59,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":2.86,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":-7.32,"curve":0.342,"c2":0.38,"c3":0.676,"c4":0.71},{"time":1.9,"angle":-0.51,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":-14.93,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-12.73,"curve":0.344,"c2":0.41,"c3":0.678,"c4":0.75},{"time":2.4333,"angle":0.27,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":0.48,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":0.61}]},"hair t3":{"rotate":[{"angle":0.21,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-23.63,"curve":0.25,"c3":0.75},{"time":0.6,"angle":24.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":21.08,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":31.72,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":1.1333,"angle":29.69,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":9.21,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-1.61,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-26.31,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-11.28,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":15.95,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":-30.14,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":6.15,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":3.7}]},"hair t4":{"rotate":[{"angle":15.32,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-41.21,"curve":0.25,"c3":0.75},{"time":0.7,"angle":28.11,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":36.2,"curve":0.329,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.9333,"angle":32.22,"curve":0.332,"c2":0.33,"c3":0.666,"c4":0.66},{"time":1.1333,"angle":42.54,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.2333,"angle":49.92,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":9.97,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":-18.95,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":-4.6,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":22.41,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":-26.13,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":9.07,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":5.88}]},"hair t5":{"rotate":[{"angle":30.87,"curve":0.25,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.87,"curve":0.293,"c3":0.631,"c4":0.37},{"time":1.1333,"angle":33.5,"curve":0.311,"c2":0.25,"c3":0.648,"c4":0.59},{"time":1.4667,"angle":38.85,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":47.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":49,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":49.65,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":57.11,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":60.71,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3,"angle":63.33}]},"hair t6":{"rotate":[{"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.4,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.7,"angle":-0.67,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.8,"angle":-31.7,"curve":0.315,"c3":0.649,"c4":0.35},{"time":0.9333,"angle":-3.83,"curve":0.312,"c2":0.2,"c3":0.647,"c4":0.54},{"time":1.1333,"angle":35.91,"curve":0.325,"c2":0.3,"c3":0.659,"c4":0.63},{"time":1.2333,"angle":54.86,"curve":0.32,"c2":0.28,"c3":0.655,"c4":0.62},{"time":1.4667,"angle":-64.12,"curve":0.322,"c2":0.3,"c3":0.661,"c4":0.65},{"time":1.9,"angle":2.07,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2,"angle":34.91,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-26.89,"curve":0.343,"c2":0.37,"c3":0.682,"c4":0.72},{"time":2.4333,"angle":-34.03,"curve":0.348,"c2":0.39,"c3":0.683,"c4":0.74},{"time":2.6667,"angle":18.89,"curve":0.369,"c2":0.63,"c3":0.707},{"time":3,"angle":6.2}],"translate":[{},{"time":3,"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":0.51,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":0.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.9333,"angle":-30.83,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.68},{"time":1.1333,"angle":22.86,"curve":0.335,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":10.61,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":76.25,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":1.6,"angle":19.11,"curve":0.34,"c2":0.37,"c3":0.673,"c4":0.7},{"time":1.9,"angle":45.99,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":17.52,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":74.08,"curve":0.337,"c2":0.36,"c3":0.67,"c4":0.69},{"time":2.1667,"angle":-1.64,"curve":0.341,"c2":0.39,"c3":0.674,"c4":0.73},{"time":2.4333,"angle":12.71,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":48.39,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":26.63}]},"hair t8":{"rotate":[{"angle":10.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.6,"angle":26.71,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.7,"angle":19.65,"curve":0.314,"c2":0.27,"c3":0.657,"c4":0.64},{"time":0.8,"angle":-15.64,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":18.47,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":53.6,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":71.03,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-45.85,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":20.45,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":53.24,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":-8.58,"curve":0.348,"c2":0.4,"c3":0.683,"c4":0.74},{"time":2.4333,"angle":-16.16,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":36.42,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":23.39}],"translate":[{},{"time":3,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":20.79,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.7,"angle":25.53,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":-5.5,"curve":0.328,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.9333,"angle":29.47,"curve":0.328,"c2":0.31,"c3":0.662,"c4":0.65},{"time":1.1333,"angle":67.48,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.2333,"angle":86.62,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":-27.55,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":44.89,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":79.09,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":17.73,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":15.34,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":70.34,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":59.01}],"translate":[{},{"time":3,"x":-2.26,"y":14.51}]},"hair t10":{"rotate":[{},{"time":1.1333,"angle":0.98},{"time":1.4667,"angle":1.27},{"time":1.9,"angle":1.65},{"time":2,"angle":1.73},{"time":2.0333,"angle":1.76},{"time":2.4333,"angle":2.11},{"time":2.6667,"angle":2.31},{"time":3,"angle":2.6}]},"hair t11":{"rotate":[{},{"time":1.1333,"angle":3.61},{"time":1.4667,"angle":4.67},{"time":1.9,"angle":6.04},{"time":2,"angle":6.36},{"time":2.0333,"angle":6.47},{"time":2.4333,"angle":7.74},{"time":2.6667,"angle":8.48},{"time":3,"angle":9.54}]},"head2":{"rotate":[{"time":1.9},{"time":2.0333,"angle":3.15},{"time":3}],"translate":[{"time":1.9},{"time":2.0333,"x":23.71,"y":-27.59},{"time":3}]},"headbeard b":{"rotate":[{},{"time":1.1333,"angle":1.39},{"time":1.4667,"angle":1.79},{"time":1.9,"angle":2.32},{"time":2,"angle":2.45},{"time":2.0333,"angle":2.49},{"time":2.4333,"angle":2.98},{"time":2.6667,"angle":3.26},{"time":3,"angle":3.67}]},"headbeard b2":{"rotate":[{},{"time":1.1333,"angle":2.52},{"time":1.4667,"angle":3.26},{"time":1.9,"angle":4.23},{"time":2,"angle":4.45},{"time":2.0333,"angle":4.52},{"time":2.4333,"angle":5.41},{"time":2.6667,"angle":5.93},{"time":3,"angle":6.67}]},"headbeard b3":{"rotate":[{},{"time":1.1333,"angle":3.31},{"time":1.4667,"angle":4.28},{"time":1.9,"angle":5.55},{"time":2,"angle":5.84},{"time":2.0333,"angle":5.93},{"time":2.4333,"angle":7.1},{"time":2.6667,"angle":7.78},{"time":3,"angle":8.76}]},"r ear s":{"rotate":[{},{"time":3,"angle":-5.67}]},"r ear ring b":{"rotate":[{},{"time":3,"angle":8.97}]},"r ear ringb s":{"rotate":[{},{"time":3,"angle":15.92}],"translate":[{},{"time":3,"x":5.7,"y":-8.17}]},"r beard":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38},{"time":1.1333,"angle":1.69},{"time":1.4667,"angle":-6.56},{"time":1.9,"angle":-51.71},{"time":2,"angle":-50.66},{"time":2.0333,"angle":-1.36},{"time":2.1667,"angle":3.87},{"time":2.4333,"angle":-10.16},{"time":2.6667,"angle":3.59},{"time":3,"angle":8.77}],"scale":[{},{"time":3,"x":0.88}]},"r beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":23.26,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":31.09,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-23.54,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-2.37,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-43.11,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":-24.88,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":2.1667,"angle":17.77,"curve":0.344,"c2":0.38,"c3":0.678,"c4":0.72},{"time":2.4333,"angle":11.18,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":-9.8,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":-0.61}]},"r beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72},{"time":1.1333,"angle":-6.27},{"time":1.2333,"angle":29.04},{"time":1.4667,"angle":30.42},{"time":1.9,"angle":-2.19},{"time":2,"angle":-34.94},{"time":2.0333,"angle":-54.22},{"time":2.1667,"angle":-34.76},{"time":2.4333,"angle":15.5},{"time":2.6667,"angle":-13.08},{"time":3,"angle":-10}]},"l bear":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38},{"time":0.9333,"angle":-9.76},{"time":1.1333,"angle":-0.57},{"time":1.2333,"angle":7.72},{"time":1.4667,"angle":-0.77},{"time":1.9,"angle":-46.51},{"time":2,"angle":-50.69},{"time":2.0333,"angle":-29.9},{"time":2.1333,"angle":-23.51},{"time":2.4333,"angle":-24.86},{"time":2.6667,"angle":-19.49},{"time":3,"angle":-11.82}]},"l bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.9333,"angle":-29.64,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.1333,"angle":22.7,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.2333,"angle":18.77,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":1.4667,"angle":-24.33,"curve":0.342,"c2":0.36,"c3":0.677,"c4":0.7},{"time":1.9,"angle":-10.77,"curve":0.336,"c2":0.34,"c3":0.67,"c4":0.68},{"time":2,"angle":-31.53,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":34.58,"curve":0.337,"c2":0.35,"c3":0.67,"c4":0.68},{"time":2.1333,"angle":35.65,"curve":0.345,"c2":0.39,"c3":0.679,"c4":0.72},{"time":2.4333,"angle":0.16,"curve":0.345,"c2":0.41,"c3":0.679,"c4":0.75},{"time":2.6667,"angle":17.9,"curve":0.355,"c2":0.65,"c3":0.689},{"time":3,"angle":1.82}]},"l beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72},{"time":0.9333,"angle":-37.29},{"time":1.1333,"angle":-16.24},{"time":1.2333,"angle":37.88},{"time":1.4667,"angle":18.31},{"time":1.9,"angle":-12.28},{"time":2,"angle":-26.03},{"time":2.0333,"angle":-28.49},{"time":2.1333,"angle":36.65},{"time":2.4333,"angle":37.07},{"time":2.6667,"angle":-6.49},{"time":3,"angle":15.47}]},"headbeard f":{"rotate":[{},{"time":1.1333,"angle":1.14},{"time":1.4667,"angle":1.47},{"time":1.9,"angle":1.91},{"time":2,"angle":2.01},{"time":2.0333,"angle":2.04},{"time":2.4333,"angle":2.44},{"time":2.6667,"angle":2.67},{"time":3,"angle":3.01}]},"headbeard f2":{"rotate":[{},{"time":1.1333,"angle":-1.76},{"time":1.4667,"angle":-2.28},{"time":1.9,"angle":-2.95},{"time":2,"angle":-3.11},{"time":2.0333,"angle":-3.16},{"time":2.4333,"angle":-3.78},{"time":2.6667,"angle":-4.14},{"time":3,"angle":-4.66}]},"headbeard f3":{"rotate":[{},{"time":1.1333,"angle":-0.23},{"time":1.4667,"angle":-0.29},{"time":1.9,"angle":-0.38},{"time":2,"angle":-0.4},{"time":2.0333,"angle":-0.41},{"time":2.4333,"angle":-0.49},{"time":2.6667,"angle":-0.53},{"time":3,"angle":-0.6}]},"headbeard f4":{"rotate":[{},{"time":1.1333,"angle":13.61},{"time":1.4667,"angle":17.61},{"time":1.9,"angle":22.81},{"time":2,"angle":24.01},{"time":2.0333,"angle":24.42},{"time":2.4333,"angle":29.22},{"time":2.6667,"angle":32.02},{"time":3,"angle":36.02}]},"headbeard f5":{"rotate":[{},{"time":1.1333,"angle":15.48},{"time":1.4667,"angle":20.04},{"time":1.9,"angle":25.96},{"time":2,"angle":27.33},{"time":2.0333,"angle":27.78},{"time":2.4333,"angle":33.25},{"time":2.6667,"angle":36.43},{"time":3,"angle":40.99}]},"l leg2":{"rotate":[{"angle":-85.86},{"time":3}]},"l leg3":{"rotate":[{"angle":2.06},{"time":3}]},"skirt f":{"rotate":[{"angle":16.01},{"time":0.1,"angle":37.11},{"time":0.4,"angle":72.86},{"time":0.5,"angle":79.35},{"time":0.8,"angle":16.01},{"time":0.9333,"angle":31.78},{"time":1.1333,"angle":25.95},{"time":1.2333,"angle":-3.48},{"time":1.4667,"angle":2},{"time":1.9,"angle":1.29},{"time":2,"angle":-0.42},{"time":2.0333,"angle":9.72},{"time":2.4333,"angle":21.18},{"time":2.6667,"angle":3.49},{"time":3,"angle":9.15}],"scale":[{"x":0.554,"curve":"stepped"},{"time":0.8,"x":0.554},{"time":3}],"shear":[{},{"time":3,"y":-15.36}]},"skirt f2":{"rotate":[{"angle":8.67},{"time":0.2,"angle":26.26},{"time":0.6,"angle":-8.92},{"time":0.8,"angle":8.67},{"time":0.9333,"angle":-25.83},{"time":1.1333,"angle":-6.53},{"time":1.2333,"angle":20.3},{"time":1.4667,"angle":0.81},{"time":1.9,"angle":12.72},{"time":2,"angle":31.36},{"time":2.0333,"angle":-12.77},{"time":2.4333,"angle":-2.08},{"time":2.6667,"angle":-27.26},{"time":3,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-8.92},{"time":0.4,"angle":26.26},{"time":0.8,"angle":-8.92},{"time":0.9333,"angle":-26.44},{"time":1.1333,"angle":-8.67},{"time":1.2333,"angle":17.39},{"time":1.4667,"angle":-3.9},{"time":1.9,"angle":4.69},{"time":2,"angle":22.56},{"time":2.0333,"angle":-21.83},{"time":2.4333,"angle":-14.22},{"time":3,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":-21.75},{"time":0.3},{"time":0.7,"angle":-26.67},{"time":0.8,"angle":-21.75,"curve":0.328,"c2":0.32,"c3":0.662,"c4":0.65},{"time":0.9333,"angle":-19.83,"curve":0.325,"c2":0.31,"c3":0.66,"c4":0.65},{"time":1.2333,"angle":-16.8,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":1.4667,"angle":18.96,"curve":0.335,"c2":0.34,"c3":0.672,"c4":0.68},{"time":1.9,"angle":6.38,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":2,"angle":-6.93,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.0333,"angle":2.29,"curve":0.348,"c2":0.38,"c3":0.684,"c4":0.73},{"time":2.4333,"angle":22.58,"curve":0.347,"c2":0.4,"c3":0.682,"c4":0.74},{"time":2.6667,"angle":-12.72,"curve":0.362,"c2":0.64,"c3":0.698},{"time":3,"angle":7.98}]},"l leg5":{"rotate":[{"angle":7.51},{"time":0.1},{"time":0.5,"angle":40.71},{"time":0.8,"angle":7.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.9333,"angle":5.91,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.2333,"angle":3.57,"curve":0.338,"c2":0.35,"c3":0.671,"c4":0.69},{"time":1.4667,"angle":32.52,"curve":0.342,"c2":0.38,"c3":0.676,"c4":0.71},{"time":1.9,"angle":5.8,"curve":0.336,"c2":0.35,"c3":0.669,"c4":0.68},{"time":2,"angle":-10.08,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":2.0333,"angle":-1.56,"curve":0.344,"c2":0.41,"c3":0.678,"c4":0.75},{"time":2.4333,"angle":10.52,"curve":0.34,"c2":0.41,"c3":0.674,"c4":0.75},{"time":2.6667,"angle":-28.82,"curve":0.345,"c2":0.66,"c3":0.679},{"time":3,"angle":-9.62}]},"tail":{"rotate":[{"angle":-11.38},{"time":0.1,"angle":0.98},{"time":0.2,"angle":21.9},{"time":0.3,"angle":42.82},{"time":0.4,"angle":66.9},{"time":0.5,"angle":82.78},{"time":0.6,"angle":73.27},{"time":0.7,"angle":22.12},{"time":0.8,"angle":5.63,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":6.83},{"time":1.1333,"angle":-3.18},{"time":1.2333,"angle":4},{"time":1.4667,"angle":-4.11},{"time":1.9,"angle":-5.33},{"time":2,"angle":-5.61},{"time":2.0333,"angle":-5.7},{"time":2.4333,"angle":-6.82},{"time":2.6667,"angle":-7.47},{"time":3,"angle":-8.41}]},"tail2":{"rotate":[{"angle":21.88},{"time":0.1,"angle":16.73},{"time":0.2,"angle":28.65},{"time":0.3,"angle":30.6},{"time":0.4,"angle":39.52},{"time":0.5,"angle":35.58},{"time":0.6,"angle":25.54},{"time":0.7,"angle":30.68},{"time":0.8,"angle":25.76,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.9333,"angle":14.17},{"time":1.1333,"angle":1.71},{"time":1.2333,"angle":6.71},{"time":1.4667,"angle":2.21},{"time":1.9,"angle":2.86},{"time":2,"angle":3.01},{"time":2.0333,"angle":3.06},{"time":2.4333,"angle":-7.59},{"time":2.6667,"angle":-21.43},{"time":3,"angle":4.52}]},"tail3":{"rotate":[{"angle":9.68},{"time":0.1,"angle":-0.06},{"time":0.2,"angle":16.73},{"time":0.3,"angle":-0.19},{"time":0.4,"angle":-0.25},{"time":0.5,"angle":-0.31},{"time":0.6,"angle":2.63},{"time":0.7,"angle":-0.43},{"time":0.8,"angle":24.08,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.9333,"angle":7.46},{"time":1.1333,"angle":-0.7},{"time":1.2333,"angle":26.36},{"time":1.4667,"angle":-0.91},{"time":1.9,"angle":-1.17},{"time":2,"angle":23.89},{"time":2.0333,"angle":-1.26},{"time":2.4333,"angle":29.51},{"time":2.6667,"angle":-1.65},{"time":3,"angle":-1.85}],"translate":[{},{"time":0.4,"x":-8.99,"y":-3.86},{"time":0.8}]},"tail4":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-0.27},{"time":0.2,"angle":-0.55},{"time":0.3,"angle":16.73},{"time":0.4,"angle":-1.1},{"time":0.5,"angle":-1.37},{"time":0.6,"angle":-1.64},{"time":0.7,"angle":34.38},{"time":0.8,"angle":34.35,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.9333,"angle":32.05},{"time":1.1333,"angle":-3.11},{"time":1.2333,"angle":-33.57},{"time":1.4667,"angle":35.01},{"time":1.9,"angle":-30.93},{"time":2,"angle":-32.01},{"time":2.0333,"angle":18.49},{"time":2.4333,"angle":50.3},{"time":2.6667,"angle":29.73},{"time":3,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-20.23},{"time":0.1,"angle":-0.4},{"time":0.2,"angle":-0.8},{"time":0.3,"angle":-1.19},{"time":0.4,"angle":16.73},{"time":0.5,"angle":-1.99},{"time":0.6,"angle":-2.39},{"time":0.7,"angle":-2.79},{"time":0.8,"angle":-20.23,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-39.18},{"time":1.1333,"angle":-4.51},{"time":1.2333,"angle":-4.91},{"time":1.4667,"angle":33.19},{"time":1.9,"angle":-33.29},{"time":2,"angle":-14.52},{"time":2.0333,"angle":-8.1},{"time":2.4333,"angle":-24.82},{"time":2.6667,"angle":-10.62},{"time":3,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-20.23},{"time":0.2,"angle":-0.55},{"time":0.3,"angle":-0.82},{"time":0.4,"angle":-1.1},{"time":0.5,"angle":16.73},{"time":0.6,"angle":-1.64},{"time":0.7,"angle":-1.92},{"time":0.8,"angle":-37.57,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.9333,"angle":-32.92},{"time":1.1333,"angle":-3.11},{"time":1.2333,"angle":-52.46},{"time":1.4667,"angle":35.01},{"time":1.9,"angle":-30.93},{"time":2,"angle":-12.04},{"time":2.0333,"angle":-5.57},{"time":2.4333,"angle":-62.19},{"time":2.6667,"angle":-7.31},{"time":3,"angle":-8.22}]},"r ear s2":{"rotate":[{},{"time":3,"angle":-7.49}]},"headmouth":{"rotate":[{"time":1.9},{"time":2,"angle":-3.81},{"time":2.0333,"angle":-8.16},{"time":2.0667,"angle":-12.2},{"time":2.1,"angle":-7.9},{"time":2.1333,"angle":-12.39},{"time":2.1667,"angle":-11.44},{"time":2.2333,"angle":-17.98},{"time":2.3,"angle":-13.71},{"time":2.4333,"angle":-24.39},{"time":2.6667,"angle":1.02},{"time":3}],"translate":[{"time":1.9},{"time":2,"x":-13.44,"y":11.31},{"time":2.0333,"x":-29.23,"y":22.85},{"time":2.0667,"x":-25.45,"y":24.41},{"time":2.1,"x":-32.91,"y":16.54},{"time":2.1333,"x":-28.89,"y":18.24},{"time":2.1667,"x":-30.6,"y":15.24},{"time":3}],"scale":[{"time":1.9},{"time":2.0333,"x":1.207},{"time":3}]},"shadow":{"translate":[{"x":-3453.81},{"time":0.1,"x":-3037.09},{"time":0.2,"x":-2203.66},{"time":0.3,"x":-1179.52},{"time":0.4,"x":-565.04},{"time":0.5,"x":-317.84},{"time":0.6,"x":-36.69},{"time":0.7},{"time":0.8,"x":61.15},{"time":0.9333,"x":67.27},{"time":1.1333,"x":48.92},{"time":1.2333},{"time":1.4667,"x":-79.5},{"time":1.9},{"time":2,"x":91.72},{"time":2.0333,"x":134.53},{"time":2.4333,"x":91.73},{"time":2.6667}],"scale":[{"y":0.576},{"time":0.1,"y":1.071},{"time":0.2,"y":1.353},{"time":0.3,"y":1.424},{"time":0.4,"y":1.212},{"time":0.5,"y":1.283},{"time":0.6,"y":1.183},{"time":0.7,"y":1.245},{"time":0.8,"y":1.122},{"time":0.9333,"y":1.061},{"time":1.1333,"y":0.817,"curve":"stepped"},{"time":1.2333,"y":0.817},{"time":1.4667,"y":0.755},{"time":1.9},{"time":2,"y":1.122},{"time":2.0333,"y":1.183},{"time":2.4333,"y":1.256},{"time":2.6667}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]}},"ik":{"r ik2":[{"softness":50,"bendPositive":false,"curve":"stepped"},{"time":1.0333,"softness":50,"bendPositive":false,"curve":"stepped"},{"time":1.3,"softness":50}]},"deform":{"default":{"body":{"body":[{"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,23.4961,-62.50654,62.42265,-22.3002,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,49.89716,22.95819,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.74295,37.16302,155.17085,-24.09232,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-3.7588,-102.26871,75.48494,-69.10156,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321],"curve":"stepped"},{"time":1.1333,"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,23.4961,-62.50654,62.42265,-22.3002,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,49.89716,22.95819,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.74295,37.16302,155.17085,-24.09232,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-3.7588,-102.26871,75.48494,-69.10156,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321]},{"time":1.2333,"vertices":[15.73206,-19.10012,-3.65614,-13.89171,8.21622,-11.78294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1.02841,-14.95192,0,0,0,0,0,0,0,0,6.79175,4.0816,1.28926,7.81836,19.0617,14.16509,1.55389,23.69785,23.27552,21.47573,-1.28674,31.6435,20.77935,33.39001,-11.64886,37.53635,9.45075,27.82674,-15.07984,25.22443,10.60612,31.22893,-16.92344,28.3082,10.46921,30.82592,-16.70508,27.94291,10.31026,30.35767,-16.45131,27.51845,6.96428,20.50637,-11.11265,18.58848,0,0,-3.96477,4.6761,1.38646,-1.78326,6.7376,-8.2428,11.2348,-13.67148,0.82433,2.42787,-1.31567,2.20115,-10.5059,-44.22236,6.65168,-18.72021,18.57133,-7.05695,13.70272,6.06801,5.00837,14.31902,-3.26551,-29.1581,20.10072,-21.3733,4.65753,13.71403,-7.4318,12.43166,7.84324,-2.34049,-1.80564,-10.00681,6.45476,-7.85692,-4.2534,-7.05144,2.61776,-7.80749,-10.67647,-32.21683,1.95824,-3.2751,-7.142,-67.93263,47.13231,-49.44061,-8.98315,-28.01286,15.52479,-24.98783,7.15484,21.0674,-11.41671,19.09711,12.67016,-3.55518,20.31413,-22.71037,16.61763,-15.54735,3.48098,-3.04037,4.57146,0.68358,1.68552,1.055,0.2882,1.96816,-2.10653,-6.98407,3.95685,-6.12842,-10.11516,-45.41711,28.05194,-37.12286,4.82944,14.22039,-7.7062,12.89057,0,0,0,0,-1.12764,-30.68062,22.64549,-20.73047,-2.59161,-8.41229,4.73084,-7.42304,2.56753,5.42152,-2.46764,5.46788]},{"time":1.4667,"curve":0.271,"c3":0.619,"c4":0.41},{"time":1.9,"offset":60,"vertices":[37.48517,62.19609,58.01733,43.6738,13.45941,74.05562,40.16711,63.65485,-9.40399,84.27005,22.77954,81.67564,-42.74304,78.72104,-10.21722,88.99184,0.15021,15.37225,0,0,0,0,0,0,0,0,-18.41156,25.91011,-7.39111,30.91399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12.12845,3.8064,12.67126,-1.00376,-4.67511,2.56232,0,0,0,0,-14.9501,1.44153,-13.32825,6.92537,0,0,-16.55725,22.66578,0,0,0,0,0,0,0,0,8.89136,54.56642,28.6449,47.28631,-11.92657,1.74176,0,0,0,0,0,0,0,0,5.03729,3.62621,6.02765,1.47992,0,0,0,0,0,0,0,0,-24.07605,55.22311,-1.68732,60.21938],"curve":0.326,"c2":0.31,"c3":0.66,"c4":0.65},{"time":2.0333,"offset":52,"vertices":[87.80539,-3.36305,86.0305,26.09262,130.83118,-21.90453,125.22055,52.53799,231.09903,59.91956,159.18552,171.53738,139.97455,62.84583,105.13766,121.96976,101.75116,59.44374,53.0515,105.1792,29.55228,46.22049,15.95096,52.49091,1.58522,66.16406,0,0,0,0,0,0,0,0,99.92578,15.82083,81.96442,72.44122,-8.27121,-59.20851,-13.54034,-95.89952,63.9221,-72.7597,57.12891,-35.91383,79.75745,-2.03003,-12.68851,-75.12286,48.71669,-58.57599,248.4389,26.41142,200.59967,151.51443,32.05046,-23.61557,-11.67401,-69.22443,45.22089,-54.46356,0.49945,-87.57159,71.31328,-58.93054,-13.29416,-95.16391,18.18263,51.32007,-13.29416,-95.16391,63.52454,-72.09381,-6.30997,-42.96962,28.483,-32.78632,234.6795,96.40231,152.50386,196.57257,48.24133,-58.27618,71.33318,-84.88074,34.19733,-38.8103,-8.07059,-57.77269,38.56491,-43.76678,151.72177,-27.3723,154.17879,64.48386,-8.21057,-58.77573,39.23445,-44.52594,-13.29416,-95.16391,63.52454,-72.09381,136.71231,74.96933,76.5536,138.8316,-2.34671,-16.79988,11.21426,-12.72662,-7.04813,-50.45514,33.68033,-38.22357,-4.77377,-34.17123,22.81015,-25.88733,5.27451,-8.41873,11.83421,-4.42062],"curve":0.358,"c2":0.42,"c3":0.756},{"time":2.4333,"offset":52,"vertices":[121.78693,-17.43251,118.8455,42.70169,121.45566,-21.26025,118.62239,45.84622,175.42584,40.20203,137.86493,116.45798,141.89926,62.06236,106.98592,122.91977,142.46075,91.74541,55.07549,157.10797,55.44174,78.74402,8.14989,93.32208,-9.89001,32.80634,0,0,0,0,0,0,0,0,131.74475,82.10487,52.01645,139.483,25.79602,-85.88007,97.53918,-163.19644,91.48434,-110.04504,85.04752,-65.79146,108.91766,-5.57858,60.92096,-78.17427,44.11397,-49.71747,262.46606,36.98798,201.71605,169.0477,26.32883,-4.14645,18.63394,-132.9446,67.16234,-96.28162,105.9787,-70.70122,89.06021,7.86621,14.16776,-118.22227,-2.03976,94.02371,49.73306,-140.92178,70.21329,-118.33276,8.70432,-76.16702,34.98631,-61.9126,248.1388,155.0454,116.789,244.99268,45.33655,0.63382,80.07954,-173.95483,58.1859,-87.73584,52.98373,-80.64719,53.52129,-63.22638,182.49146,-3.64156,144.65237,96.48193,2.49295,-81.07822,31.68808,-73.56509,26.83438,-132.03143,60.44763,-115.29529,157.94473,132.68073,46.61153,192.5437,2.67133,-46.40553,26.008,-34.77368,44.24838,-114.66135,69.61789,-97.22211,2.86493,-60.93796,27.50298,-51.37921,8.84415,-38.44814,31.4649,-24.35187],"curve":0.358,"c2":0.42,"c3":0.756},{"time":2.6667,"offset":52,"vertices":[87.80539,-3.36305,86.0305,26.09262,130.83118,-21.90453,125.22055,52.53799,231.09903,59.91956,159.18552,171.53738,139.97455,62.84583,105.13766,121.96976,101.75116,59.44374,53.0515,105.1792,29.55228,46.22049,15.95096,52.49091,1.58522,66.16406,0,0,0,0,0,0,0,0,99.97629,16.18695,81.71991,72.71924,0,0,-0.24619,-0.73561,0.39757,-0.66589,58.98053,-22.65485,70.90659,8.0141,-3.87582,-12.03766,6.60556,-10.78387,248.4389,26.41142,200.59967,151.51443,5.0999,6.97037,-4.35648,-16.8421,10.25435,-14.78021,5.65866,-50.63797,46.65887,-30.95007,0,0,15.91461,53.89301,0,0,0,0,-0.5282,-1.57901,0.85345,-1.42944,234.6795,96.40231,152.50386,196.57257,19.63693,-25.81274,7.80864,-12.78693,0,0,0,0,0,0,153.23071,-16.5722,146.96951,72.66568,0,0,0,0,0,0,0,0,136.71231,74.96933,76.5536,138.8316,0,0,0,0,0,0,0,0,0,0,0,0,6.44553,-0.03372,6.23685,1.93149],"curve":0.358,"c2":0.42,"c3":0.756},{"time":3}]},"l hand2":{"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}],"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r arm":{"r arm":[{"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043],"curve":"stepped"},{"time":2,"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043]},{"time":2.0333}]},"r armour u":{"r armour u":[{"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576],"curve":0.25,"c3":0.75},{"time":0.4,"offset":4,"vertices":[163.9654,-45.00104,177.28926,99.94327,181.48798,-69.53613,202.98242,108.74658,140.53593,-68.87366,203.46579,65.00528,76.7599,-81.34448,151.37636,9.09085],"curve":0.25,"c3":0.75},{"time":0.8,"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]},{"time":0.9333,"offset":4,"vertices":[86.15086,-86.93385,131.65134,16.42305,98.35374,-87.21111,139.04272,20.50257,72.67327,-88.64056,118.05659,-0.91488,47.05607,-96.31017,106.23074,-20.62051]},{"time":1.1333,"offset":4,"vertices":[76.72326,-75.8345,106.16136,31.64257,76.53687,-57.70183,90.38624,33.82039,57.22791,-59.38353,79.41578,16.51402,46.80376,-80.84232,91.47905,3.04135]},{"time":1.1667,"offset":4,"vertices":[61.37862,-60.66761,84.92911,25.31406,51.66551,-48.59739,70.66653,17.3245,36.21834,-49.94276,61.89016,3.4794,37.44302,-64.67386,73.18325,2.43308]},{"time":1.2,"offset":4,"vertices":[46.03392,-45.50067,63.69678,18.98553,31.84498,-37.87653,50.86269,6.27486,20.25962,-38.88556,44.28042,-4.10896,28.08224,-48.50535,54.88739,1.82481]},{"time":1.2333,"offset":4,"vertices":[30.68928,-30.33378,42.46452,12.65702,24.77088,-24.68441,35.46425,7.4142,17.04731,-25.35709,31.07607,0.49165,18.72149,-32.3369,36.59159,1.21654]},{"time":1.3}]},"r hand":{"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052],"curve":"stepped"},{"time":2,"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]},{"time":2.0333}]},"r upparm":{"r upparm":[{"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":0.1,"vertices":[-28.71144,-44.1958,56.25366,21.75468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88.93488,43.86108,51.64029,65.98203,0.65607,47.6413,-54.5849,17.91281,-131.43018,-29.84882]},{"time":0.2,"vertices":[-70.29115,-121.59358,129.93558,-53.69101,0,0,0,0,0,0,0,0,0,0,0,0,60.33824,12.40262,1.57361,70.47795,138.48999,146.07806,67.43813,181.56848,-45.18221,149.7756,-149.39273,46.96301,-219.99423,-105.85606,-43.01499,-68.8707,65.8432,-65.57346,-24.77599,-39.39505,37.61963,-37.69945]},{"time":0.3,"vertices":[-142.63615,-149.74637,47.56436,-137.68623,0,0,0,0,0,0,0,0,0,0,0,0,50.28187,10.33552,1.31134,58.73162,40.17482,138.09778,-59.78693,144.63666,-163.83813,74.89461,-232.30444,-49.23798,-259.16425,-211.93402,-35.84583,-57.39225,54.86933,-54.64455,-20.64665,-32.82921,31.34969,-31.41621,12.45225,-6.3985,16.0213,-0.0816]},{"time":0.4,"vertices":[-114.10892,-119.7971,38.05149,-110.14899,0,0,0,0,0,0,0,0,0,0,0,0,40.22549,8.26841,1.04907,46.9853,17.968,82.77934,-63.6477,81.75819,-145.03168,21.48185,-197.31894,-77.27264,-203.24228,-209.83081,-28.67666,-45.9138,43.89547,-43.71564,-16.51732,-26.26337,25.07975,-25.13297,9.9618,-5.1188,12.81704,-0.06528]},{"time":0.7,"vertices":[-28.52724,-29.94928,9.51288,-27.53725,0,0,0,0,0,0,0,0,0,0,0,0,10.05638,2.0671,0.26227,11.74633,97.34462,37.31192,50.5202,69.83792,-27.32924,70.25962,-114.90354,35.7408,-166.87126,-25.32079,-7.16917,-11.47845,10.97387,-10.92891,-4.12933,-6.56584,6.26994,-6.28324,2.49045,-1.2797,3.20426,-0.01632]},{"time":0.8,"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":2.0333,"vertices":[-14.41787,-22.19356,28.24859,10.92443,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31.91917,-11.54503,15.38733,-3.67176,5.42368,5.79634,-24.18028,6.86073,-50.13742,-7.49749]},{"time":3}]}}},"drawOrder":[{"offsets":[{"slot":"body","offset":6},{"slot":"r leg","offset":6},{"slot":"l hand2","offset":-34},{"slot":"r finger d2","offset":-36},{"slot":"r finger c2","offset":-37},{"slot":"r finger b2","offset":-38},{"slot":"r finger a2","offset":-39}]},{"time":1.2333,"offsets":[{"slot":"r beard2","offset":3}]}]},"hit":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00005"},{"time":0.1667,"name":"eyefire/eyefire_00006"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00009"},{"time":0.2667,"name":"eyefire/eyefire_00010"},{"time":0.3,"name":"eyefire/eyefire_00011"},{"time":0.3333,"name":"eyefire/eyefire_00012"},{"time":0.3667,"name":"eyefire/eyefire_00014"},{"time":0.4,"name":"eyefire/eyefire_00015"},{"time":0.4333,"name":"eyefire/eyefire_00016"},{"time":0.4667,"name":"eyefire/eyefire_00017"},{"time":0.5,"name":"eyefire/eyefire_00019"},{"time":0.5333,"name":"eyefire/eyefire_00020"},{"time":0.5667,"name":"eyefire/eyefire_00021"},{"time":0.6,"name":"eyefire/eyefire_00022"},{"time":0.6333,"name":"eyefire/eyefire_00024"},{"time":0.6667,"name":"eyefire/eyefire_00025"},{"time":0.7,"name":"eyefire/eyefire_00026"},{"time":0.7333,"name":"eyefire/eyefire_00027"},{"time":0.7667,"name":"eyefire/eyefire_00029"},{"time":0.8,"name":"eyefire/eyefire_00030"},{"time":0.8333,"name":"eyefire/eyefire_00031"},{"time":0.8667,"name":"eyefire/eyefire_00032"},{"time":0.9,"name":"eyefire/eyefire_00034"},{"time":0.9333,"name":"eyefire/eyefire_00035"},{"time":0.9667,"name":"eyefire/eyefire_00036"},{"time":1,"name":"eyefire/eyefire_00037"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"r ik":{"rotate":[{"time":0.0333,"curve":0.305,"c3":0.64,"c4":0.36},{"time":0.1,"angle":25.21,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"curve":"stepped"},{"time":0.7,"curve":0.352,"c2":0.41,"c3":0.689,"c4":0.75},{"time":0.7667,"angle":9.64,"curve":0.369,"c2":0.63,"c3":0.706},{"time":0.8333}],"translate":[{"time":0.0333,"curve":0.324,"c2":0.23,"c3":0.658,"c4":0.56},{"time":0.1,"x":-101.79,"y":48.93,"curve":0.325,"c2":0.27,"c3":0.659,"c4":0.61},{"time":0.1667,"x":-80.39,"curve":"stepped"},{"time":0.7,"x":-80.39,"curve":0.289,"c2":0.17,"c3":0.637,"c4":0.56},{"time":0.7667,"x":1.39,"y":24.46,"curve":0.333,"c2":0.33,"c3":0.68,"c4":0.71},{"time":0.8333}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":12.92,"y":48.34,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":65.28,"y":-16.92,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":74.96,"y":-32.61,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":-2.67,"y":33.81,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":30.14,"y":55.33,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-15.63,"y":47.49,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":-51.28,"y":-15.43,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":9.84,"y":-19.54,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.5333,"x":46.76,"y":-38.04,"curve":0.34,"c2":0.35,"c3":0.678,"c4":0.7},{"time":0.7,"x":42.59,"y":2.41,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"l ik":{"rotate":[{"time":0.4667,"curve":0.333,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.5333,"angle":-13.4,"curve":0.34,"c2":0.35,"c3":0.678,"c4":0.7},{"time":0.7}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-90.87,"curve":"stepped"},{"time":0.4667,"x":-90.87,"curve":0.291,"c2":0.1,"c3":0.631,"c4":0.47},{"time":0.5333,"x":7.14,"y":90.87,"curve":0.308,"c2":0.25,"c3":0.676,"c4":0.7},{"time":0.7}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-23.46,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.1,"angle":15.41,"curve":0.336,"c2":0.34,"c3":0.669,"c4":0.68},{"time":0.1667,"angle":43.89,"curve":0.346,"c2":0.39,"c3":0.68,"c4":0.73},{"time":0.4667,"angle":70.49,"curve":0.346,"c2":0.41,"c3":0.68,"c4":0.75},{"time":0.7,"angle":19.6,"curve":0.354,"c2":0.65,"c3":0.688},{"time":1,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":34.99,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":42.13,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":-8.35,"curve":0.314,"c2":0.27,"c3":0.651,"c4":0.61},{"time":0.3333,"angle":9.48,"curve":0.329,"c2":0.32,"c3":0.681,"c4":0.71},{"time":0.7,"angle":2.12,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"x":-52.34,"y":46.37,"curve":0.324,"c2":0.23,"c3":0.658,"c4":0.56},{"time":0.1,"x":-57.03,"y":72.75,"curve":0.309,"c2":0.19,"c3":0.644,"c4":0.54},{"time":0.3333,"x":-104.82,"y":61.44,"curve":0.311,"c2":0.25,"c3":0.649,"c4":0.6},{"time":0.7,"x":-20.34,"y":18.01,"curve":0.327,"c2":0.31,"c3":0.664,"c4":0.66},{"time":1}]},"l upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":0.7,"angle":-28,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":-6.45}]},"l finger a":{"rotate":[{"angle":-2.5}]},"l finger a2":{"rotate":[{"angle":5.32}],"translate":[{"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5}]},"l finger b2":{"rotate":[{"angle":16.78}],"translate":[{"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5}]},"l finger c2":{"rotate":[{"angle":16.54}],"translate":[{"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"l finger d":{"rotate":[{"angle":-2.5}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":164.73,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1,"angle":56.93,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-2.31,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.4667,"angle":-48.64,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-60.78,"curve":0.369,"c2":0.63,"c3":0.707},{"time":1,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":769.74,"y":-4.16,"curve":0.331,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.1,"x":-38.06,"y":-43.54,"curve":0.332,"c2":0.33,"c3":0.665,"c4":0.66},{"time":0.1667,"x":-293.89,"y":-78.91,"curve":0.328,"c2":0.32,"c3":0.663,"c4":0.65},{"time":0.4667,"x":-319.95,"y":69.94,"curve":0.337,"c2":0.34,"c3":0.679,"c4":0.7},{"time":0.7,"x":-52.78,"y":-127.22,"curve":0.382,"c2":0.58,"c3":0.732},{"time":1}]},"l finger d2":{"rotate":[{"angle":26.01}],"translate":[{"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":87.31,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":-15.69,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":-58.76,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-108.56,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-38.56,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1,"angle":-6.74}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":25.92,"y":124.89,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"x":-3.54,"y":-53.5,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"x":-26.77,"y":-128.17,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"x":-62.12,"y":-136.89,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":4.04,"y":-103.39,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}]},"r upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":0.7,"angle":42.78,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":12.65}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":73.73,"y":-9.65,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":49.53,"y":-9.85,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":82.59,"y":-14.08,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":96.88,"y":-28.67,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":54.66,"y":-48.55,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":28.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.3,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":58.28,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":67.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":101.84,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.4,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-19.98,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-43.93,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-57.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-18.62,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":-8.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":10.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":1.48,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-3.19,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-34.21,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-9.49}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":36.4,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":57.75,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":39.01,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":20.82,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":7.12}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.64,"curve":0.334,"c2":0.34,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-23.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-55.53,"curve":0.343,"c2":0.37,"c3":0.68,"c4":0.71},{"time":0.4667,"angle":-33.3,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":5.38,"curve":0.368,"c2":0.63,"c3":0.705},{"time":1,"angle":-4.31}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-69.32,"y":62.19,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-21.53,"y":24.11,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":14.64,"y":-70.3,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":-13.03,"y":-34.66,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":36.17,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"angle":39.42,"curve":0.314,"c2":0.24,"c3":0.649,"c4":0.58},{"time":0.1667,"angle":16.9,"curve":0.306,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-24.36,"curve":0.339,"c2":0.35,"c3":0.679,"c4":0.71},{"time":0.7,"angle":14.42,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-25.52,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.95,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1667,"angle":34.72,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":28.88,"curve":0.344,"c2":0.37,"c3":0.678,"c4":0.71},{"time":0.6333,"angle":-29.04,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.7,"angle":-12.45,"curve":0.347,"c2":0.41,"c3":0.681,"c4":0.75},{"time":0.8333,"angle":13.31,"curve":0.356,"c2":0.65,"c3":0.691},{"time":1,"angle":-2.28}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.0333,"angle":36.17,"curve":0.323,"c2":0.17,"c3":0.657,"c4":0.51},{"time":0.1,"angle":39.42,"curve":0.321,"c2":0.23,"c3":0.654,"c4":0.57},{"time":0.1667,"angle":16.9,"curve":0.307,"c2":0.21,"c3":0.644,"c4":0.56},{"time":0.4667,"angle":-24.36,"curve":0.322,"c2":0.29,"c3":0.657,"c4":0.63},{"time":0.7,"angle":14.42,"curve":0.327,"c2":0.31,"c3":0.663,"c4":0.66},{"time":1}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-19.97,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":22.51,"curve":0.335,"c2":0.34,"c3":0.669,"c4":0.67},{"time":0.1667,"angle":40.27,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":34.43,"curve":0.344,"c2":0.37,"c3":0.678,"c4":0.71},{"time":0.6333,"angle":-23.49,"curve":0.339,"c2":0.36,"c3":0.672,"c4":0.69},{"time":0.7,"angle":-6.9,"curve":0.347,"c2":0.41,"c3":0.681,"c4":0.75},{"time":0.8333,"angle":18.86,"curve":0.356,"c2":0.65,"c3":0.691},{"time":1,"angle":3.27}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"angle":30.35,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"angle":1.75,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"angle":4.65,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"angle":-6.59,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-3.61,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":-58.43,"y":-54.32,"curve":0.318,"c2":0.23,"c3":0.652,"c4":0.57},{"time":0.1,"x":-260.66,"y":9.12,"curve":0.322,"c2":0.28,"c3":0.656,"c4":0.62},{"time":0.1667,"x":-230.19,"y":5.77,"curve":0.305,"c2":0.24,"c3":0.652,"c4":0.62},{"time":0.4667,"x":-37.59,"y":-15.4,"curve":0.339,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"x":24.51,"y":-84.79,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":67.62,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"angle":123.9,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"angle":46.02,"curve":0.311,"c2":0.25,"c3":0.649,"c4":0.6},{"time":0.3333,"angle":-8.31,"curve":0.326,"c2":0.31,"c3":0.662,"c4":0.65},{"time":0.4667,"angle":-43.48,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7,"angle":-5.26,"curve":0.382,"c2":0.58,"c3":0.731},{"time":1,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"x":-32.58,"y":323.02,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"x":-52.71,"y":368.77,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"x":-78.73,"y":205.05,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.68},{"time":0.3333,"x":-204.38,"y":122.23,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.4667,"x":-88.19,"y":158.14,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"x":48.72,"y":-37.23,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95}]},"shadow":{"translate":[{"time":0.0333,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":-132.37,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":-127.28,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":-56,"curve":0.338,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.7}],"scale":[{"curve":0.323,"c3":0.656,"c4":0.34},{"time":0.0333,"y":0.796,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"y":0.844,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"y":1.131,"curve":0.311,"c2":0.25,"c3":0.757},{"time":1}]},"r upparm3":{"rotate":[{},{"time":0.0333,"angle":-102.88},{"time":0.1,"angle":7.97},{"time":0.1667,"angle":51.87},{"time":0.4667,"angle":88.15},{"time":0.7,"angle":35.32},{"time":1}],"translate":[{},{"time":0.0333,"x":-11.7,"y":10.92},{"time":0.1,"x":-8.78,"y":-0.12},{"time":0.4667,"x":-22.85,"y":-27.98},{"time":0.7,"x":18.84,"y":1.59},{"time":1}]},"r finger a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":28.08,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":16.3,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":58.28,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":67.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":101.84,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-7.4,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":-19.98,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-43.93,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-57.16,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-18.62,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":-8.92}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":10.34,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.1,"angle":1.48,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":-3.19,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":-34.21,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":-9.49}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"r finger d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":36.4,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.1667,"angle":57.75,"curve":0.343,"c2":0.36,"c3":0.679,"c4":0.71},{"time":0.4667,"angle":39.01,"curve":0.349,"c2":0.4,"c3":0.685,"c4":0.74},{"time":0.7,"angle":20.82,"curve":0.369,"c2":0.63,"c3":0.706},{"time":1,"angle":7.12}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":1.142,"curve":0.316,"c2":0.17,"c3":0.65,"c4":0.51},{"time":0.1,"x":0.709,"curve":0.32,"c2":0.26,"c3":0.654,"c4":0.6},{"time":0.1667,"x":0.692,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"x":0.527,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]},"l hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-19.79},{"time":0.1,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-10.97},{"time":0.7},{"time":1,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":-32.84},{"time":0.1},{"time":0.1667,"angle":-12.75},{"time":0.4667,"angle":-10.69},{"time":0.7,"angle":-17.17},{"time":1,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-48.54},{"time":0.1},{"time":0.1667,"angle":10.41},{"time":0.4667,"angle":11.72},{"time":0.7,"angle":42.67},{"time":1,"angle":-1.85}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":-61.9},{"time":0.1667,"curve":"stepped"},{"time":0.7},{"time":1,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333},{"time":0.1,"angle":-75.34},{"time":0.1667,"angle":-21.66},{"time":0.4667},{"time":0.7,"angle":-54.92},{"time":1,"angle":-8.22}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":23.05},{"time":0.1,"angle":38.94},{"time":0.1667,"angle":40.08},{"time":0.4667,"angle":66.43},{"time":0.7,"angle":-37.39},{"time":1,"angle":-8.22}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":-37.07},{"time":0.1,"angle":4.09},{"time":0.1667},{"time":0.4667,"angle":9.33},{"time":0.7,"angle":-23.32},{"time":0.8333,"angle":-14.82},{"time":1,"angle":9.15}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0333,"x":0.729},{"time":0.1,"x":0.864},{"time":0.1667,"x":1.304},{"time":0.4667,"x":1.094},{"time":0.7,"x":0.831},{"time":1}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.0333,"x":10.19,"y":11.92},{"time":0.1,"x":6.58,"y":-9.31},{"time":0.1667,"x":-14.72,"y":-8.62},{"time":0.4667,"x":-8.71,"y":-5.52},{"time":0.7,"x":11.07,"y":25.64},{"time":1,"y":-15.36}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":33.85},{"time":0.1,"angle":3.29},{"time":0.1667,"angle":-42.38},{"time":0.4667,"angle":-24.67},{"time":0.7,"angle":15.69},{"time":0.8333,"angle":13.56},{"time":1,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":33.85},{"time":0.1,"angle":20.17},{"time":0.1667,"angle":34.82},{"time":0.3,"angle":-41.81},{"time":0.4667,"angle":-60.29},{"time":0.6,"angle":-42.16},{"time":0.7,"angle":-10.93},{"time":0.8333,"angle":16.66},{"time":1,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":-28.82},{"time":0.1},{"time":0.1667,"angle":38.87},{"time":0.4667},{"time":0.7,"angle":-32.16},{"time":1,"angle":7.98}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":27.64},{"time":0.1667,"angle":-9.15},{"time":0.4667,"angle":-16.72},{"time":0.7,"angle":31.14},{"time":1,"angle":-9.62}]},"headmouth":{"rotate":[{},{"time":0.1333,"angle":-27.08},{"time":0.5333,"angle":-7.87},{"time":1}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-30.45},{"time":0.7,"angle":-18.66},{"time":0.8333,"angle":-22.58},{"time":1,"angle":8.77}],"scale":[{"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.45},{"time":0.1,"angle":-16.16},{"time":0.1667,"angle":-31.14},{"time":0.4667,"angle":-21.04},{"time":0.7,"angle":17},{"time":1,"angle":-0.61}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":26.3},{"time":0.1,"angle":30.94},{"time":0.1667,"angle":15.76},{"time":0.2667,"angle":-40.58},{"time":0.4667,"angle":-37.74},{"time":0.7,"angle":-32.12},{"time":0.8333,"angle":16.53},{"time":1,"angle":-10}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.1667},{"time":0.4667,"angle":-30.45},{"time":0.7,"angle":-18.66},{"time":0.8333,"angle":-22.58},{"time":1,"angle":-11.82}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":19.45},{"time":0.1,"angle":-16.16},{"time":0.1667,"angle":-31.14},{"time":0.4667,"angle":-21.04},{"time":0.7,"angle":17},{"time":1,"angle":1.82}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":26.3},{"time":0.1,"angle":30.94},{"time":0.1667,"angle":15.76},{"time":0.2667,"angle":-40.58},{"time":0.4667,"angle":-37.74},{"time":0.7,"angle":-32.12},{"time":0.8333,"angle":16.53},{"time":1,"angle":15.47}]},"hair t":{"rotate":[{"time":0.1667},{"time":0.4667,"angle":-7.53},{"time":0.7}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":8.83},{"time":0.1,"angle":10.81},{"time":0.1667,"angle":12.21},{"time":0.4667,"angle":-9.5},{"time":0.7,"angle":-15.08},{"time":1,"angle":0.61}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333},{"time":0.1,"angle":83.56},{"time":0.1667,"angle":96.33},{"time":0.4667,"angle":96.83},{"time":0.7,"angle":51},{"time":1,"angle":26.63}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":34.16},{"time":0.1,"angle":10.81},{"time":0.1667,"angle":19.55},{"time":0.4667,"angle":-19.87},{"time":0.7,"angle":-31.29},{"time":1,"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.0333,"angle":34.16},{"time":0.1,"angle":14.59},{"time":0.1667,"angle":12.21},{"time":0.4667,"angle":19.46},{"time":0.7,"angle":-20.89},{"time":1,"angle":5.88}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":23.39}],"translate":[{"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.0333,"angle":55.16},{"time":0.1,"angle":43.7},{"time":0.1667,"angle":13.63},{"time":0.4667,"angle":8.52},{"time":0.7,"angle":-24.68},{"time":1,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.0333,"curve":"stepped"},{"time":0.7},{"time":1,"angle":63.33}]},"s":{"scale":[{"x":0,"y":0}]},"l armour":{"rotate":[{"angle":1.84}]},"r arm":{"rotate":[{"angle":-7.98}]},"hair t10":{"rotate":[{"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54}]},"headbeard b":{"rotate":[{"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67}]},"headbeard b3":{"rotate":[{"angle":8.76}]},"r ear s":{"rotate":[{"angle":-5.67}]},"r ear ring b":{"rotate":[{"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"headbeard f":{"rotate":[{"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99}]},"r ear s2":{"rotate":[{"angle":-7.49}]},"skill":{"scale":[{"x":0,"y":0}]}},"deform":{"default":{"body":{"body":[{"time":0.1667,"curve":0.3,"c2":0.22,"c3":0.648,"c4":0.6},{"time":0.4667,"vertices":[50.96356,-63.95969,125.297,9.36234,99.62122,-76.56879,137.16132,12.42788,110.50739,-82.19516,96.17535,1.83795,72.90155,-62.75839,33.88568,20.26118,38.76379,-7.49484,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28.43463,-34.76004,37.47375,-29.39993,51.36212,-34.07013,59.93573,-63.58115,0,0,0,0,0,0,92.04196,-22.24189,53.76447,-77.94763,0,0,0,0,0,0,0,0,0,0,0,0,4.94843,-2.55756,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50.45117,-64.9491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100.59836,-10.82629,67.75372,-75.1456],"curve":0.372,"c2":0.48,"c3":0.752},{"time":1}]}}}},"idle":{"slots":{"r eye fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":10.23,"y":32.42,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-14.9,"y":-20.45,"curve":0.25,"c3":0.75},{"time":1.8667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":-11.96,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-40.32,"y":-0.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-7.85,"y":2.92}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-13.07,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":-32.01,"y":36.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.9,"y":0.9,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l upparm2":{"rotate":[{"angle":-6.45}]},"l armour":{"rotate":[{"angle":1.84}]},"l finger a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":17.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-7.5,"y":19.61,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.64,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.59,"y":20.84,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.16,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-5.23,"y":20.34,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l finger d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":59.08,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.33,"y":20.87,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"r upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":2.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":36.1,"y":-45.18,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":12.97}]},"r arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.2}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r finger d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.63,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.31}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":12.82,"y":6.27,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r ear":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-3.09,"y":-14.86,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.842,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":14.28,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-16.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":12.07,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-2.28}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":18.73,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":3.59,"y":24.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.76,"curve":0.25,"c3":0.75},{"time":1.4,"angle":24.3,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.27}]},"hair t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.8667}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":0.61}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-2.51,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-11.93,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":9.92,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":5.88}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":63.33}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.63}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":-2.26,"y":14.51}]},"hair t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-32.32,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":10.5,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":9.54}]},"head2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":4.6,"y":-21.12,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.7,"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.76}]},"r ear s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":8.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-5.67}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":12.16,"y":-17.99,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"r ear ring b":{"rotate":[{"angle":8.97,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-10.98,"curve":0.25,"c3":0.75},{"time":1.4,"angle":28.93,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.4,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.4,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":5.7,"y":-8.17}]},"r ear ringa":{"rotate":[{"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.4667,"angle":-29.16,"curve":0.314,"c2":0.27,"c3":0.686,"c4":0.73},{"time":1.4,"angle":16.48,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.8667}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.19,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.77}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":9.4,"y":-12.46,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.61}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-10}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":15.47,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-22.67,"y":24.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.819,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.4,"angle":15.47,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":1.82}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":15.47}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":40.99}]},"l leg":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-2.29,"y":50.63,"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.75,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":9.15}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":5.8,"y":-22.14,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.9333,"y":16.45,"curve":0.25,"c3":0.75},{"time":1.8667,"y":-15.36}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":10.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10.83,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":27.49,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":27.96,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-12.01,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.98}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-30.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":11.31,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.62}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.1667,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6333,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-8.22}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-45.72,"y":-64.16,"curve":0.25,"c3":0.75},{"time":1.8667}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":16.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":5.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":-98.01,"y":-10.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":0.9,"y":0.9,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.95,"y":0.95}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-3.18,"curve":0.25,"c3":0.75},{"time":1.4,"angle":14.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":59.09,"y":-135.37,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r ear s2":{"rotate":[{"angle":-7.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-18.83,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.85,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-7.49}]},"shadow":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.97,"y":0.895,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r finger a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r finger b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r finger c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r finger d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"l hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.9333,"offset":36,"vertices":[-2.41049,14.08145,-10.63983,9.53357,11.41489,0.51631,8.62204,7.49872,20.82419,30.77104,-2.80862,37.0488,53.80902,21.06067,29.06711,49.94165,43.71988,54.54894,0.35004,69.90634,-0.88062,19.47218,-12.7916,14.70761,5.71973,30.41342,-14.42053,27.38129,2.25964,28.48312,-15.93155,23.71869,-5.14142,35.24371,-25.93134,24.41534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-21.39771,-31.9695,3.10556,-38.34393,-32.63104,-64.54259,-2.67554,-49.07106,28.40125,-40.10614,15.19,-39.32011,36.33786,-21.36356,-0.30249,-29.38377,18.0249,-23.20792,0.36182,-7.9995,5.25519,-6.04211,8.23709,-14.43842,-6.16132,-80.23037,45.0358,-66.68332,-11.18542,-41.29755,16.90335,-39.30496,-2.67551,-49.07107,0,0,-4.45917,-81.78522,47.33566,-66.84366,-8.74689,-59.13564,29.90024,-51.76413,-2.25064,10.54112,-8.31439,6.85941,14.49524,-24.1174,30.06024,-49.46475,0,0,0,0,0,0,-4.30402,-49.14474,27.1712,-41.17593,-2.44653,-18.05902,9.30701,-15.6683,2.06238,-45.59348,29.95184,-34.43707,0,0,0,0,-20.05573,10.5144,-22.24652,-4.22729,0,0,0,0,0,0,0,0,3.87411,11.61391,-4.18277,11.50629],"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt f":{"skirt f":[{"curve":0.25,"c3":0.75},{"time":0.9333,"vertices":[-1.8898,-25.58164,0.47333,-28.95829,-1.18393,-41.18966,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.78281,5.60857,0,0,0,0,11.63187,18.17604,12.89143,17.3054,0,0,0,0,0,0,0,0,0,0,0,0,-0.37607,-29.25813,5.20969,-17.44646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.98029,-21.54911],"curve":0.25,"c3":0.75},{"time":1.8667}]}}},"drawOrder":[{"offsets":[{"slot":"r beard2","offset":3}]}]},"skill":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00005"},{"time":0.1667,"name":"eyefire/eyefire_00006"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00009"},{"time":0.2667,"name":"eyefire/eyefire_00010"},{"time":0.3,"name":"eyefire/eyefire_00011"},{"time":0.3333,"name":"eyefire/eyefire_00012"},{"time":0.3667,"name":"eyefire/eyefire_00014"},{"time":0.4,"name":"eyefire/eyefire_00015"},{"time":0.4333,"name":"eyefire/eyefire_00016"},{"time":0.4667,"name":"eyefire/eyefire_00017"},{"time":0.5,"name":"eyefire/eyefire_00019"},{"time":0.5333,"name":"eyefire/eyefire_00020"},{"time":0.5667,"name":"eyefire/eyefire_00021"},{"time":0.6,"name":"eyefire/eyefire_00022"},{"time":0.6333,"name":"eyefire/eyefire_00024"},{"time":0.6667,"name":"eyefire/eyefire_00025"},{"time":0.7,"name":"eyefire/eyefire_00026"},{"time":0.7333,"name":"eyefire/eyefire_00027"},{"time":0.7667,"name":"eyefire/eyefire_00029"},{"time":0.8,"name":"eyefire/eyefire_00030"},{"time":0.8333,"name":"eyefire/eyefire_00031"},{"time":0.8667,"name":"eyefire/eyefire_00032"},{"time":0.9,"name":"eyefire/eyefire_00033"},{"time":0.9333,"name":"eyefire/eyefire_00035"},{"time":0.9667,"name":"eyefire/eyefire_00036"},{"time":1,"name":"eyefire/eyefire_00010"},{"time":1.0333,"name":"eyefire/eyefire_00001"},{"time":1.0667,"name":"eyefire/eyefire_00003"},{"time":1.1,"name":"eyefire/eyefire_00004"},{"time":1.1333,"name":"eyefire/eyefire_00005"},{"time":1.1667,"name":"eyefire/eyefire_00006"},{"time":1.2,"name":"eyefire/eyefire_00008"},{"time":1.2333,"name":"eyefire/eyefire_00009"},{"time":1.2667,"name":"eyefire/eyefire_00010"},{"time":1.3,"name":"eyefire/eyefire_00011"},{"time":1.3333,"name":"eyefire/eyefire_00013"},{"time":1.3667,"name":"eyefire/eyefire_00014"},{"time":1.4,"name":"eyefire/eyefire_00015"},{"time":1.4333,"name":"eyefire/eyefire_00016"},{"time":1.4667,"name":"eyefire/eyefire_00018"},{"time":1.5,"name":"eyefire/eyefire_00019"},{"time":1.5333,"name":"eyefire/eyefire_00020"},{"time":1.5667,"name":"eyefire/eyefire_00021"},{"time":1.6,"name":"eyefire/eyefire_00022"},{"time":1.6333,"name":"eyefire/eyefire_00024"},{"time":1.6667,"name":"eyefire/eyefire_00025"},{"time":1.7,"name":"eyefire/eyefire_00026"},{"time":1.7333,"name":"eyefire/eyefire_00027"},{"time":1.7667,"name":"eyefire/eyefire_00029"},{"time":1.8,"name":"eyefire/eyefire_00030"},{"time":1.8333,"name":"eyefire/eyefire_00031"},{"time":1.8667,"name":"eyefire/eyefire_00032"},{"time":1.9,"name":"eyefire/eyefire_00034"},{"time":1.9333,"name":"eyefire/eyefire_00035"},{"time":1.9667,"name":"eyefire/eyefire_00036"},{"time":2,"name":"eyefire/eyefire_00010"},{"time":2.0333,"name":"eyefire/eyefire_00002"},{"time":2.0667,"name":"eyefire/eyefire_00003"},{"time":2.1,"name":"eyefire/eyefire_00004"},{"time":2.1333,"name":"eyefire/eyefire_00005"},{"time":2.1667,"name":"eyefire/eyefire_00006"},{"time":2.2,"name":"eyefire/eyefire_00008"},{"time":2.2333,"name":"eyefire/eyefire_00009"},{"time":2.2667,"name":"eyefire/eyefire_00010"},{"time":2.3,"name":"eyefire/eyefire_00011"},{"time":2.3333,"name":"eyefire/eyefire_00013"},{"time":2.3667,"name":"eyefire/eyefire_00014"},{"time":2.4,"name":"eyefire/eyefire_00015"},{"time":2.4333,"name":"eyefire/eyefire_00016"},{"time":2.4667,"name":"eyefire/eyefire_00018"},{"time":2.5,"name":"eyefire/eyefire_00019"},{"time":2.5333,"name":"eyefire/eyefire_00020"},{"time":2.5667,"name":"eyefire/eyefire_00021"},{"time":2.6,"name":"eyefire/eyefire_00023"},{"time":2.6333,"name":"eyefire/eyefire_00024"},{"time":2.6667,"name":"eyefire/eyefire_00025"},{"time":2.7,"name":"eyefire/eyefire_00026"},{"time":2.7333,"name":"eyefire/eyefire_00027"},{"time":2.7667,"name":"eyefire/eyefire_00029"},{"time":2.8,"name":"eyefire/eyefire_00030"},{"time":2.8333,"name":"eyefire/eyefire_00031"},{"time":2.8667,"name":"eyefire/eyefire_00032"},{"time":2.9,"name":"eyefire/eyefire_00034"},{"time":2.9333,"name":"eyefire/eyefire_00035"},{"time":2.9667,"name":"eyefire/eyefire_00036"},{"time":3,"name":"eyefire/eyefire_00037"}]},"skill":{"attachment":[{"name":null},{"time":0.5333,"name":"skill/5"},{"time":0.7333,"name":"skill/6"},{"time":0.7667,"name":"skill/7"},{"time":0.8667,"name":"skill/8"},{"time":0.9333,"name":"skill/9"},{"time":1.0333,"name":"skill/10"},{"time":1.1333,"name":"skill/11"},{"time":1.2333,"name":"skill/12"},{"time":1.2667,"name":"skill/13"},{"time":1.3,"name":"skill/14"},{"time":1.3333,"name":"skill/15"},{"time":1.3667,"name":"skill/16"},{"time":1.4,"name":"skill/17"},{"time":1.4333,"name":"skill/18"},{"time":1.4667,"name":"skill/19"},{"time":1.5,"name":"skill/20"},{"time":1.5333,"name":null}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.03},{"time":0.2667,"angle":8.71},{"time":0.3667,"angle":0.42},{"time":0.4333,"angle":-4.13},{"time":0.4667,"angle":-1.03},{"time":1.1667,"angle":12.46},{"time":1.2667,"angle":0.27},{"time":1.4,"angle":-4.27},{"time":1.9667,"angle":-10.87},{"time":2.5,"angle":-23.32},{"time":2.6667,"angle":-11.3},{"time":2.7333,"angle":0.46},{"time":2.8667,"angle":5.04},{"time":3}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-61.4,"y":-89.91},{"time":0.2667,"x":-143.8,"y":-26.64},{"time":0.3667,"x":-224.94,"y":77},{"time":0.4333,"x":22.87,"y":-15.17},{"time":0.4667,"x":109.65,"y":-48.74},{"time":1.1667,"x":6.62,"y":-44.84},{"time":1.2667,"x":111.06,"y":13.19},{"time":1.4,"x":24.54,"y":54.39},{"time":1.9667,"x":17.67,"y":-6.04},{"time":2.5,"x":41.02,"y":-19.77},{"time":2.6667,"x":22.37,"y":-10.79},{"time":2.7333,"x":14.92,"y":-7.19},{"time":2.8667}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":6.03},{"time":0.2667,"angle":44.43},{"time":0.3667,"angle":-77.68},{"time":0.4333,"angle":-3.17},{"time":0.4667,"angle":95.02},{"time":0.5333,"angle":113.32},{"time":1.1667,"angle":90.81},{"time":1.2667,"angle":45.14},{"time":1.3333,"angle":16.95},{"time":1.9667,"angle":7.45},{"time":2.5,"angle":-13.6},{"time":2.6667,"angle":16.35},{"time":2.8667},{"time":3,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":120.37,"y":40.89},{"time":0.2667,"x":-226.83,"y":262.85},{"time":0.3667,"x":-613.37,"y":525.86},{"time":0.4333,"x":228.17,"y":161.45},{"time":0.4667,"x":1219.84,"y":-322.34},{"time":0.5333,"x":1223.81,"y":-222.21},{"time":0.6,"x":1125.92,"y":-164.04},{"time":0.6667,"x":1100.6,"y":-199.89},{"time":0.7,"x":1098.74,"y":-164.49},{"time":0.7333,"x":1085.31,"y":-185.2},{"time":0.7667,"x":1089.89,"y":-146.31},{"time":0.8,"x":1056.94,"y":-182.19},{"time":0.8333,"x":1054.45,"y":-142.4},{"time":0.8667,"x":1047.28,"y":-177.92},{"time":0.9333,"x":1031.34,"y":-121.25},{"time":1,"x":982.45,"y":-147.96},{"time":1.0667,"x":953.74,"y":-100.45},{"time":1.1667,"x":910.67,"y":-101.25},{"time":1.2667,"x":70.18,"y":-60.67},{"time":1.3333,"x":60.37,"y":121.19},{"time":1.9667,"x":-48.93,"y":26.13},{"time":2.5,"x":33.5,"y":-81.54},{"time":2.6667,"x":-76.89,"y":-16.48},{"time":2.7333,"x":-171.19,"y":89.85},{"time":2.8667,"x":63.81,"y":-25.52},{"time":3}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.5333,"x":0.751,"y":0.751,"curve":"stepped"},{"time":2.5,"x":0.751,"y":0.751},{"time":2.8667}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":21.11},{"time":0.2667,"angle":34.4},{"time":0.3667,"angle":41.26},{"time":0.4333,"angle":-50.06},{"time":0.4667,"angle":-50.83},{"time":1.1333,"angle":-95.12},{"time":1.1667,"angle":-146.98},{"time":1.2333,"angle":-38.36},{"time":1.2667,"angle":-23.14},{"time":1.3,"angle":1.54},{"time":1.3333,"angle":72.8},{"time":1.4,"angle":103.52},{"time":1.5333,"angle":111.69},{"time":1.9667,"angle":154.79},{"time":2.5,"angle":176.43},{"time":2.6667,"angle":108.32},{"time":2.7,"angle":15.14},{"time":2.7333,"angle":-8.23},{"time":2.8667,"angle":-13.63},{"time":3,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"x":-31.25,"y":-37.5},{"time":0.2667,"x":-60.05,"y":105.72},{"time":0.3667,"x":-131.25,"y":225},{"time":0.4333,"x":-100.52,"y":153.09},{"time":0.4667,"x":-535.02,"y":442.88},{"time":1.1333,"x":-670.18,"y":422.97},{"time":1.1667,"x":-642.6,"y":573.81},{"time":1.2333,"x":-213.4,"y":332.2},{"time":1.2667,"x":-105.03,"y":260.32},{"time":1.3,"x":-38.13,"y":244.9},{"time":1.3333,"x":371.64,"y":122.17},{"time":1.4,"x":407.25,"y":278.83},{"time":1.5333,"x":417.36,"y":402.07},{"time":1.9667,"x":434.51,"y":566.11},{"time":2.5,"x":290.33,"y":243.81},{"time":2.6667,"x":240.04,"y":62.11},{"time":2.7333,"x":20.51,"y":42.38},{"time":2.8667,"x":-76.46,"y":5.13},{"time":3,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4333},{"time":0.4667,"y":-1,"curve":"stepped"},{"time":1.9667,"y":-1},{"time":2.5,"y":-0.565},{"time":2.6667,"x":0.711,"y":-0.766},{"time":2.7},{"time":3,"x":0.95,"y":0.95}]},"r upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-24.35},{"time":0.2667,"angle":-37.26},{"time":0.3667,"angle":-37.23},{"time":0.4333,"angle":-62.7},{"time":0.4667,"angle":95.46},{"time":0.5333,"angle":107.56},{"time":1.1667,"angle":92.09},{"time":1.2667,"angle":-34.17},{"time":1.9667,"angle":-43.69},{"time":2.5,"angle":-60.1},{"time":2.6667,"angle":-70.15},{"time":2.7333,"angle":-37.86},{"time":2.8667,"angle":-5.8},{"time":3,"angle":-6.74}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":-7.31,"y":-20.37},{"time":0.2667,"x":6.31,"y":56.99},{"time":0.3667,"x":24.31,"y":8.76},{"time":0.4333,"x":-72.1,"y":-142.92},{"time":0.4667,"x":68.98,"y":-167.34},{"time":0.5333,"x":33.11,"y":-180.49},{"time":1.1667,"x":24.31,"y":8.2},{"time":1.2667,"x":-0.19,"y":-140.11},{"time":1.9667,"x":-26.37,"y":-161.8,"curve":"stepped"},{"time":2.5,"x":-26.37,"y":-161.8},{"time":2.8667}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"angle":-12.19},{"time":0.2667,"angle":6.53},{"time":0.3667,"angle":24.69},{"time":0.4333,"angle":54.22},{"time":0.4667,"angle":0.87},{"time":1.1667,"angle":-26.44},{"time":1.2667,"angle":-13.84},{"time":1.4,"angle":14.64},{"time":1.9667,"angle":43.3},{"time":2.5,"angle":56.68},{"time":2.6667,"angle":39.49},{"time":2.7333,"angle":16.66},{"time":2.8667,"angle":-5.11},{"time":3,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.0667,"x":14.34,"y":-20.85},{"time":0.2667,"x":-9.76,"y":36.53},{"time":0.3667,"x":-0.26,"y":-3.78},{"time":0.4333,"x":-0.25,"y":-3.66},{"time":0.4667,"x":-27.41,"y":-59.88},{"time":1.1667,"x":1.56,"y":6.75},{"time":1.2667,"x":-25.1,"y":-4.85},{"time":1.4,"x":13.01,"y":0.94},{"time":1.9667,"x":32.32,"y":15.52},{"time":2.5,"x":-40.3,"y":2.78},{"time":2.6667,"x":0.88,"y":0.43},{"time":2.7333,"x":8.07,"y":-13.87},{"time":2.8667},{"time":3,"x":-7.85,"y":2.92}]},"r upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":2.5,"angle":-1.68},{"time":2.8667},{"time":3,"angle":12.65}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.48,"y":-51.78},{"time":0.2667,"x":-51.18,"y":55.67},{"time":0.3667,"x":19.29,"y":-28.02},{"time":0.4333,"x":26.15,"y":-98.44},{"time":0.4667,"x":87.29,"y":30.31},{"time":0.5333,"x":4.79,"y":-48.18},{"time":1.1667,"x":46.4,"y":-127.16},{"time":1.2667,"x":22.49,"y":-35.79},{"time":1.9667,"x":-23.7,"y":-52.16,"curve":"stepped"},{"time":2.5,"x":-23.7,"y":-52.16},{"time":2.8667}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":17.16},{"time":0.2667,"angle":-3.01},{"time":0.3667,"angle":-32.36},{"time":0.4333,"angle":-50.81},{"time":0.4667,"angle":-2.27},{"time":1.1667,"angle":25.66},{"time":1.2667,"angle":-16.29},{"time":1.4,"angle":-20.46},{"time":1.9667,"angle":-20.91},{"time":2.5,"angle":-18.68},{"time":2.6667,"angle":-16.09},{"time":2.7333,"angle":-10.97},{"time":2.8667,"angle":3.9},{"time":3,"angle":-4.31}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":12.74},{"time":0.2667,"angle":26.02},{"time":0.3667,"angle":-12.97},{"time":0.4333,"angle":-28.46},{"time":0.4667,"angle":-84.46},{"time":1.1333,"angle":-53.97},{"time":1.1667,"angle":-16.7},{"time":1.2333,"angle":23.44},{"time":1.2667,"angle":2.88},{"time":1.3,"angle":44.72},{"time":1.3333,"angle":58.53},{"time":1.9667,"angle":36.88},{"time":2.5,"angle":18.71},{"time":2.6667,"angle":23.41},{"time":2.7333,"angle":14.65},{"time":2.8667,"angle":9.4},{"time":3}],"translate":[{"time":0.0667},{"time":0.2667,"x":-0.07,"y":60.35},{"time":0.3667,"x":-43.08,"y":70.98},{"time":0.4333,"x":50.21,"y":235.41},{"time":0.4667,"x":-20.77,"y":339.32},{"time":1.1333,"x":-48.52,"y":286.89},{"time":1.1667,"x":-119.99,"y":423.7},{"time":1.2333,"x":-82.01,"y":66.55},{"time":1.2667,"x":-103.21,"y":60.51},{"time":1.3,"x":-134.41,"y":86.04},{"time":1.3333,"x":-124.32,"y":75.41},{"time":1.9667,"x":-132.91,"y":25.84},{"time":2.5,"x":-100.45,"y":13.55},{"time":2.6667,"x":-93.32,"y":26.52},{"time":2.7333,"x":-67.2,"y":-4.84},{"time":2.8667,"x":-8.95,"y":-18},{"time":3}]},"l ik":{"rotate":[{"time":2.5},{"time":2.7333,"angle":-17.05},{"time":2.8667}],"translate":[{"time":0.2667},{"time":0.3667,"x":-201.34},{"time":0.4333,"x":131.25,"y":34.23},{"time":0.4667,"x":221.88,"curve":"stepped"},{"time":2.5,"x":221.88},{"time":2.6667,"x":121.02,"y":41.2},{"time":2.7333,"x":18.88,"y":37.08},{"time":2.8667}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":8.22,"y":13.29},{"time":0.2667,"x":-90.32,"y":-99.12},{"time":0.3667,"x":-88.9,"y":34.14},{"time":0.4333,"x":-66.3,"y":11.64},{"time":0.4667,"x":-9.53,"y":-7.72},{"time":1.1667,"x":-100.44,"y":-126.62},{"time":1.2667,"x":10.53,"y":-7.63},{"time":1.4,"x":-59.11,"y":-81.07},{"time":1.9667,"x":-28.56,"y":-53.45},{"time":2.5,"x":-4.01,"y":-49.13},{"time":2.8667}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":53.57,"y":0.46},{"time":0.2667,"x":42.73,"y":-27.34},{"time":0.3667,"x":11.36,"y":-74.91},{"time":0.4333,"x":-32.64,"y":14.87},{"time":0.4667,"x":-1.63,"y":17.72},{"time":1.1667},{"time":1.2667,"x":-61.69,"y":-29.08},{"time":1.4,"x":-63.95,"y":-56.02},{"time":1.9667,"x":-69.01,"y":-36.85},{"time":2.5}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":31.41},{"time":0.2667,"angle":26.63},{"time":0.3667,"angle":25.07},{"time":0.5333,"angle":59.28},{"time":1.1667,"angle":-4.98},{"time":1.2667,"angle":4.28},{"time":1.3333,"angle":33.29},{"time":1.9667,"angle":39.84},{"time":2.5,"angle":64.76},{"time":2.6667,"angle":35.33},{"time":2.8667},{"time":3,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.751},{"time":1.1667,"x":1.552},{"time":1.9667,"x":1.167},{"time":2.5,"x":0.835},{"time":2.6667,"x":0.653},{"time":2.7333,"x":0.506},{"time":2.8,"x":1.232},{"time":2.8667}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-14.7},{"time":0.2667},{"time":0.3667,"angle":-23.72},{"time":0.4667,"angle":-54.57},{"time":0.5333,"angle":-65.12},{"time":1.2667,"angle":8.43},{"time":1.3333,"angle":-55.31},{"time":1.9667,"angle":-36.86},{"time":2.5,"angle":-9.95},{"time":2.6667,"angle":-5.43},{"time":2.8,"angle":-23.47},{"time":3,"angle":-8.92}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.1,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.1},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-4.33},{"time":0.2667},{"time":0.3667,"angle":-21.35},{"time":0.4667,"angle":-56.6},{"time":0.5333,"angle":-67.46},{"time":1.2667,"angle":21.7},{"time":1.3333,"angle":-53.94},{"time":1.9667,"angle":-11.99},{"time":2.5,"angle":-5.02},{"time":2.6667,"angle":-2.74},{"time":2.8,"angle":-18.4},{"time":3,"angle":-9.49}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r finger d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":18.15},{"time":0.2667,"angle":1.92},{"time":0.3667},{"time":0.5333,"angle":-53},{"time":1.2667,"angle":46.29},{"time":1.3333,"angle":-17.24},{"time":1.9667,"angle":20.97},{"time":2.5,"angle":20.38},{"time":2.6667,"angle":11.12},{"time":2.8667},{"time":3,"angle":7.12}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"l upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":2.5,"angle":56.15},{"time":2.8667},{"time":3,"angle":-6.45}]},"l finger a":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":-7.83,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l finger a2":{"rotate":[{"angle":5.32,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":4.27,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":-2.9,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-29.33,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":46.48,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":16.31,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":40.05,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":68.88,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":24.23,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l finger b2":{"rotate":[{"angle":16.78,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":13.48,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":5.9,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-20.73,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":52.54,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":20.91,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":43.48,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":71.65,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":25.24,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l finger c2":{"rotate":[{"angle":16.54,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":13.28,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":5.71,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-20.92,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":52.41,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":20.81,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":43.4,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":71.6,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":25.22,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"l finger d":{"rotate":[{"angle":-2.5,"curve":0.339,"c2":0.36,"c3":0.673,"c4":0.69},{"time":0.4333,"angle":-1.83,"curve":0.345,"c2":0.39,"c3":0.68,"c4":0.73},{"time":1.1667,"angle":13.29,"curve":0.338,"c2":0.36,"c3":0.672,"c4":0.69},{"time":1.4,"angle":34.54,"curve":0.336,"c2":0.35,"c3":0.67,"c4":0.69},{"time":1.5333,"angle":-0.51,"curve":0.344,"c2":0.42,"c3":0.678,"c4":0.76},{"time":1.9667,"angle":-0.17,"curve":0.349,"c2":0.65,"c3":0.683},{"time":2.5,"angle":-32.2},{"time":2.8667},{"time":3,"angle":-2.5}]},"l finger d2":{"rotate":[{"angle":26.01,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":0.3667,"angle":20.88,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4333,"angle":12.98,"curve":0.334,"c2":0.33,"c3":0.667,"c4":0.67},{"time":0.4667,"angle":-13.82,"curve":0.338,"c2":0.35,"c3":0.673,"c4":0.69},{"time":0.9,"angle":57.4,"curve":0.338,"c2":0.35,"c3":0.672,"c4":0.69},{"time":1.1667,"angle":24.6,"curve":0.339,"c2":0.35,"c3":0.673,"c4":0.69},{"time":1.4,"angle":46.23,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"angle":73.89,"curve":0.349,"c2":0.41,"c3":0.683,"c4":0.75},{"time":1.9667,"angle":26.05,"curve":0.361,"c2":0.64,"c3":0.697},{"time":2.5,"angle":-30.35},{"time":2.8667},{"time":3,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.925,"y":0.925}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-2.28}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.27}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":0.61}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":5.88}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":63.33}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":26.63}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":-2.26,"y":14.51}]},"hair t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":9.54}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":6.67}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":8.76}]},"r ear s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-5.67}]},"r ear ring b":{"rotate":[{"angle":8.97,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":5.7,"y":-8.17}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":8.77}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-0.61}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-10}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-11.82}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":1.82}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":15.47}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":40.99}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":9.15}],"shear":[{"y":-15.36}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":7.98}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-9.62}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-8.22}]},"r ear s2":{"rotate":[{"angle":-7.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.5,"curve":"stepped"},{"time":2.8667},{"time":3,"angle":-7.49}]},"shadow":{"translate":[{"time":0.0667,"curve":0.312,"c2":0.14,"c3":0.647,"c4":0.49},{"time":0.3667,"x":-145,"curve":0.329,"c2":0.31,"c3":0.662,"c4":0.64},{"time":0.4333,"curve":0.331,"c2":0.32,"c3":0.664,"c4":0.66},{"time":0.4667,"x":78.72,"curve":"stepped"},{"time":2.5,"x":78.72,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":2.6667}],"scale":[{"time":1.2667,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":1.4,"y":1.153,"curve":"stepped"},{"time":2.5,"y":1.153,"curve":0.348,"c2":0.38,"c3":0.689,"c4":0.74},{"time":2.8667}]},"r upparm3":{"rotate":[{},{"time":0.0667,"angle":22.9},{"time":0.2667,"angle":50.67},{"time":0.3667,"angle":52.68},{"time":0.4333,"angle":68.19},{"time":0.4667,"angle":-155},{"time":0.5333,"angle":-145.55},{"time":1.1667,"angle":-120.43},{"time":1.2667,"angle":35.02},{"time":1.9667,"angle":21.53},{"time":2.5,"angle":56.21},{"time":2.6667,"angle":63.35},{"time":2.7333,"angle":13.6},{"time":2.8667}]},"r finger a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":31.41},{"time":0.2667,"angle":26.63},{"time":0.3667,"angle":25.07},{"time":1.1667},{"time":1.2667,"angle":4.28},{"time":1.3333,"angle":33.29},{"time":1.9667,"angle":39.84},{"time":2.5,"angle":64.76},{"time":2.6667,"angle":35.33},{"time":2.8667},{"time":3,"angle":14.41}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.751},{"time":1.1667,"x":1.552},{"time":1.9667,"x":1.167},{"time":2.5,"x":0.835},{"time":2.6667,"x":0.653},{"time":2.7333,"x":0.506},{"time":2.8,"x":1.232},{"time":2.8667}]},"r finger b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-14.7},{"time":0.2667},{"time":0.3667,"angle":-23.72},{"time":0.4667,"angle":-54.57},{"time":0.5333,"angle":-35.92},{"time":1.2667,"angle":8.43},{"time":1.3333,"angle":-55.31},{"time":1.9667,"angle":-36.86},{"time":2.5,"angle":-9.95},{"time":2.6667,"angle":-5.43},{"time":2.8,"angle":-23.47},{"time":3,"angle":-8.92}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.1,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.1},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r finger c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":-4.33},{"time":0.2667},{"time":0.3667,"angle":-21.35},{"time":0.4667,"angle":-56.6},{"time":0.5333,"angle":-38.26},{"time":1.2667,"angle":21.7},{"time":1.3333,"angle":-53.94},{"time":1.9667,"angle":-11.99},{"time":2.5,"angle":-5.02},{"time":2.6667,"angle":-2.74},{"time":2.8,"angle":-18.4},{"time":3,"angle":-9.49}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"r finger d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.0667,"angle":18.15},{"time":0.2667,"angle":1.92},{"time":0.3667},{"time":0.5333,"angle":-23.8},{"time":1.2667,"angle":46.29},{"time":1.3333,"angle":-17.24},{"time":1.9667,"angle":20.97},{"time":2.5,"angle":20.38},{"time":2.6667,"angle":11.12},{"time":2.8667},{"time":3,"angle":7.12}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.3667,"x":-43.03,"y":20.11,"curve":"stepped"},{"time":2.5,"x":-43.03,"y":20.11},{"time":2.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":1.392},{"time":0.2667,"x":0.734},{"time":0.3667,"x":0.509},{"time":0.5333,"x":1.552},{"time":1.2667,"x":0.954,"curve":"stepped"},{"time":2.5,"x":0.954},{"time":2.6667,"x":0.699},{"time":2.7333,"x":0.529},{"time":2.8,"x":1.251},{"time":2.8667}]},"l hand2":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"skill":{"rotate":[{"angle":-90},{"time":0.5333},{"time":0.6667,"angle":-90},{"time":0.7}],"translate":[{"x":1258.69,"y":-2863.22},{"time":0.5333,"x":1945.62,"y":-3005.98},{"time":0.7,"x":1904.42,"y":-2704.6},{"time":0.8667,"x":1483.93,"y":-2472.17},{"time":1.0333,"x":1244.46,"y":-2497.27},{"time":1.1333,"x":1114.58,"y":-2650.25},{"time":1.1667,"x":333.03,"y":-2816.05},{"time":1.2,"x":173.45,"y":-2798.68},{"time":1.2333,"x":675.4,"y":-3114.3},{"time":1.2667,"x":748.69,"y":-3016.22}],"scale":[{"x":0,"y":0},{"time":0.0333,"x":0.937,"y":0.937},{"time":0.5333,"x":0,"y":0},{"time":0.6667,"x":0.414,"y":0.414},{"time":0.7,"x":0.414,"y":0.414},{"time":1.2,"x":0.877,"y":0.877},{"time":1.2333,"x":0.948,"y":0.948,"curve":"stepped"},{"time":2.9667,"x":0.948,"y":0.948},{"time":3,"x":0,"y":0}]},"s":{"scale":[{"x":0,"y":0}]},"l armour":{"rotate":[{"angle":1.84}]},"r arm":{"rotate":[{"angle":-7.98}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.0667,"offset":92,"vertices":[2.20322,30.46043,-18.26239,24.47815,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2.20322,30.46043,0,0,1.46875,20.30699,-12.17502,16.31879,0,0,0,0,0,0,0,0,0,0,0,0,-18.26239,24.47815,1.46875,20.30699,-12.17502,16.31879,0,0,0,0,0,0,0,0,2.20322,30.46043,-18.26239,24.47815,0,0,0,0,0,0,0,0,2.20322,30.46043,-18.26239,24.47815]},{"time":0.3667,"offset":90,"vertices":[1.22015,85.50305,8.85266,63.22167,-11.04908,62.60259,0,0,0,0,-6.34235,126.33496,-53.48529,114.63028,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-3.36218,63.396,0,0,1.15774,53.59198,-21.08538,49.06215,0,0,0,0,0,0,0,0,0,0,-26.46741,90.20621,-22.42884,58.16097,1.15774,53.59198,-21.08538,49.06215,0,0,0,0,0,0,0,0,-3.01361,87.82533,-31.31251,80.92049,0,0,0,0,0,0,0,0,-3.36218,63.396,-22.42884,58.16097]},{"time":0.4333,"offset":90,"vertices":[11.28321,29.56786,64.24847,-1.59769,15.38139,-20.66391,0,0,0,0,30.03378,63.63551,-37.9719,42.57151,0,0,0,0,21.52234,-32.401,0,0,0,0,0,0,0,0,11.37859,-10.34697,0,0,10.04763,-32.86191,-46.04496,-32.88637,0,0,0,0,0,0,0,0,-6.04218,-42.5224,-6.48686,6.21558,13.33047,-7.81927,74.10146,18.25119,33.79031,-14.39904,0,0,0,0,0,0,0,0,10.88204,44.88947,-30.96428,36.15376,0,0,0,0,0,0,0,0,63.57747,-1.31068,14.50655,-29.04317]},{"time":0.4667,"offset":86,"vertices":[-5.34116,-25.95972,2.87909,-26.34647,28.35921,-123.78532,69.57217,-109.37783,55.94293,-119.57079,0.04346,-13.60001,4.21307,-12.93097,35.08938,-126.22038,27.55061,-135.14969,-4.74298,-16.4455,0.53021,-17.10747,48.12115,-135.29684,-9.32477,-33.91261,1.52692,-35.13792,-2.17447,-32.78903,7.98785,-31.87531,6.41131,-47.5862,0,0,6.78776,-144.91539,-11.31966,-140.2913,-9.76276,-44.44829,4.3418,-45.3,0,0,0,0,-5.72417,-40.28438,48.14679,-137.76016,25.5317,-46.50949,79.68276,-43.04897,59.54434,-68.16386,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-3.65679,-91.57052,-1.49492,-97.66589,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,55.4898,-115.34093,44.22822,-137.56801]},{"time":1.1667,"offset":44,"vertices":[13.68317,13.3293,-1.79593,19.0177,40.93475,29.97415,2.33765,50.68173,45.62729,58.9476,-17.28067,72.51294,5.87097,28.37482,-18.41379,22.37299,9.02417,22.71495,-12.02777,21.27783,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-5.34116,-25.95972,2.87909,-26.34647,21.36486,-151.78146,69.57217,-109.37783,55.94293,-119.57079,-9.27048,-25.94392,7.98193,-27.92816,21.33434,-164.38474,48.64049,-169.80396,-10.8429,-18.338,-1.82306,-23.04482,48.12115,-135.29684,-21.33124,-65.07796,18.26343,-64.03969,-10.16232,-58.32629,22.86304,-54.1167,-4.32936,-91.79655,0,0,-10.19131,-230.23357,44.46687,-207.03862,-13.73187,-64.35754,17.35513,-60.88112,0,0,0,0,24.02046,-94.70818,55.50031,-161.04776,64.36263,-117.89432,52.18075,-116.5673,99.54089,-135.70296,-8.40555,-26.44122,0.11011,-27.74472,-0.67172,-35.69271,10.30896,-34.1781,-6.65829,-158.96844,49.1057,-142.28601,0,0,0,0,-5.18076,-26.98122,3.34515,-27.26952,50.47698,-132.96794,54.80964,-152.53014]},{"time":1.2667,"offset":44,"vertices":[4.56106,4.4431,-0.59864,6.33924,13.64492,9.99139,0.77922,16.89392,15.2091,19.64921,-5.76023,24.17099,1.95699,9.45827,-6.13793,7.45766,3.00806,7.57165,-4.00926,7.09261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1.78039,-8.65324,0.9597,-8.78216,7.12162,-50.59383,23.19073,-36.45929,18.64765,-39.85694,-3.09016,-8.64797,2.66065,-9.30939,7.11145,-54.79493,16.2135,-56.60133,-3.6143,-6.11267,-0.60769,-7.68161,16.04039,-45.09896,-7.11041,-21.69266,6.08781,-21.34657,-3.38744,-19.4421,7.62101,-18.03891,-1.44312,-30.59886,0,0,-3.3971,-76.74454,14.82229,-69.01289,-4.57729,-21.45252,5.78505,-20.29371,0,0,0,0,8.00682,-31.5694,18.50011,-53.6826,21.45422,-39.29812,17.39359,-38.85578,33.18031,-45.23433,-2.80185,-8.81374,0.0367,-9.24824,-0.22391,-11.89757,3.43632,-11.3927,-2.21943,-52.98949,16.36857,-47.42869,0,0,0,0,-1.72692,-8.99374,1.11505,-9.08984,16.82566,-44.32266,18.26989,-50.84339]},{"time":2.8667}]}}}},"walk":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00005"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00008"},{"time":0.2,"name":"eyefire/eyefire_00010"},{"time":0.2333,"name":"eyefire/eyefire_00011"},{"time":0.2667,"name":"eyefire/eyefire_00013"},{"time":0.3,"name":"eyefire/eyefire_00014"},{"time":0.3333,"name":"eyefire/eyefire_00016"},{"time":0.3667,"name":"eyefire/eyefire_00017"},{"time":0.4,"name":"eyefire/eyefire_00019"},{"time":0.4333,"name":"eyefire/eyefire_00020"},{"time":0.4667,"name":"eyefire/eyefire_00022"},{"time":0.5,"name":"eyefire/eyefire_00023"},{"time":0.5333,"name":"eyefire/eyefire_00025"},{"time":0.5667,"name":"eyefire/eyefire_00027"},{"time":0.6,"name":"eyefire/eyefire_00028"},{"time":0.6333,"name":"eyefire/eyefire_00030"},{"time":0.6667,"name":"eyefire/eyefire_00031"},{"time":0.7,"name":"eyefire/eyefire_00033"},{"time":0.7333,"name":"eyefire/eyefire_00034"},{"time":0.7667,"name":"eyefire/eyefire_00036"},{"time":0.8,"name":"eyefire/eyefire_00037"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"body":{"rotate":[{"angle":-46.01},{"time":0.1,"angle":-57.16},{"time":0.2,"angle":-81.65},{"time":0.3,"angle":-101.77},{"time":0.4,"angle":-119.71},{"time":0.5,"angle":-130.33},{"time":0.6,"angle":-117.59},{"time":0.7,"angle":-79.13},{"time":0.8,"angle":-46.01}],"translate":[{"y":-102.64},{"time":0.4,"y":43.22},{"time":0.8,"y":-102.64}]},"body2":{"rotate":[{"angle":-22.79},{"time":0.1,"angle":-10.08},{"time":0.2,"angle":16.6},{"time":0.3,"angle":38.66},{"time":0.4,"angle":52.44},{"time":0.5,"angle":59.18},{"time":0.6,"angle":41.89},{"time":0.7,"angle":-15.52},{"time":0.8,"angle":-22.79}],"translate":[{"x":-80.64,"y":48.56},{"time":0.1,"x":-29.6,"y":11.44},{"time":0.2,"x":24.21,"y":6.83},{"time":0.3,"x":87.48,"y":24.44},{"time":0.4,"x":76.26,"y":17.25},{"time":0.5,"x":-2.05,"y":-11.35},{"time":0.6,"x":-89.25,"y":-3.33},{"time":0.7,"x":-119.7,"y":79.08},{"time":0.8,"x":-80.64,"y":48.56}]},"head":{"rotate":[{"angle":54.91},{"time":0.1,"angle":57.8},{"time":0.2,"angle":61.64},{"time":0.3,"angle":73.6},{"time":0.4,"angle":89.11},{"time":0.5,"angle":87.54},{"time":0.6,"angle":81.54},{"time":0.7,"angle":92.91},{"time":0.8,"angle":54.91}],"translate":[{"x":20.04,"y":114.02}]},"rhand":{"rotate":[{"angle":-61.96},{"time":0.1,"angle":-73.08},{"time":0.2,"angle":-53.34},{"time":0.3,"angle":-7.68},{"time":0.4,"angle":-29.8},{"time":0.5,"angle":-31.51},{"time":0.6,"angle":-40.31},{"time":0.7,"angle":-69.63},{"time":0.8,"angle":-61.96}],"translate":[{"x":262.77,"y":-233.79},{"time":0.1,"x":680.4,"y":-287.15},{"time":0.2,"x":957.51,"y":-271.75},{"time":0.3,"x":1234.48,"y":-302.33},{"time":0.4,"x":1221.78,"y":-462.7},{"time":0.5,"x":1093.17,"y":-495.57},{"time":0.6,"x":634.16,"y":-422.65},{"time":0.7,"x":326.51,"y":-326.65},{"time":0.8,"x":262.77,"y":-233.79}],"scale":[{"x":0.445,"y":-0.647}]},"r upparm":{"rotate":[{"angle":56.42},{"time":0.4,"angle":110.55},{"time":0.8,"angle":56.42}],"translate":[{},{"time":0.4,"x":-23.64,"y":21.09},{"time":0.8}]},"l ik":{"rotate":[{"angle":-2.64},{"time":0.1,"angle":3.05},{"time":0.2,"angle":-46.63},{"time":0.3,"angle":-134.68},{"time":0.4,"angle":-137.5},{"time":0.5,"angle":-127.9},{"time":0.6,"angle":-79.41},{"time":0.7,"angle":-68.78},{"time":0.8,"angle":-2.64}],"translate":[{"x":-145.7,"y":70.09},{"time":0.1,"x":-250.39,"y":-2.76},{"time":0.2,"x":-480.05,"y":85.85},{"time":0.3,"x":-641.99,"y":290.99},{"time":0.4,"x":-630.55,"y":360.98},{"time":0.5,"x":-560.06,"y":415.93},{"time":0.6,"x":-341.98,"y":228.69},{"time":0.7,"x":-251.83,"y":181.63},{"time":0.8,"x":-145.7,"y":70.09}]},"lhand":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-84.39},{"time":0.2,"angle":-88.18},{"time":0.3,"angle":-51.49},{"time":0.4,"angle":63.47},{"time":0.5,"angle":23.26},{"time":0.6,"angle":22.08},{"time":0.7,"angle":29.82},{"time":0.8,"angle":-13.41}],"translate":[{"x":-157.59,"y":-59.33},{"time":0.1,"x":-191.58,"y":197.82},{"time":0.2,"x":-10,"y":106.23},{"time":0.3,"x":239.36,"y":12.55},{"time":0.4,"x":558.49,"y":-39.96},{"time":0.5,"x":517.71,"y":-176.13},{"time":0.6,"x":249.12,"y":-178.34},{"time":0.7,"x":11.48,"y":-146.59},{"time":0.8,"x":-157.59,"y":-59.33}]},"l upparm":{"rotate":[{"angle":121.1},{"time":0.1,"angle":113.65},{"time":0.2,"angle":153.35},{"time":0.3,"angle":138.84},{"time":0.4,"angle":121.54},{"time":0.5,"angle":114.98},{"time":0.6,"angle":121.16},{"time":0.7,"angle":148.41},{"time":0.8,"angle":121.1}],"translate":[{"x":-7.3,"y":263.84}]},"r finger b":{"rotate":[{"angle":-31.61},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-40.66},{"time":0.4,"angle":-120.95},{"time":0.7,"angle":-134.91},{"time":0.8,"angle":-31.61}],"translate":[{"x":78.27,"y":97.55},{"time":0.2,"x":144.96,"y":155.26},{"time":0.3,"x":129.1,"y":139.7},{"time":0.4,"x":188.45,"y":155.72},{"time":0.7,"x":171.78,"y":113.86},{"time":0.8,"x":78.27,"y":97.55}],"scale":[{"x":0.674}]},"r finger c":{"rotate":[{"angle":-22.53},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-31.17},{"time":0.4,"angle":-115.08},{"time":0.7,"angle":-125.53},{"time":0.8,"angle":-22.53}],"translate":[{"x":6.64,"y":106.41},{"time":0.2,"x":73.32,"y":164.13},{"time":0.3,"x":57.46,"y":148.57},{"time":0.4,"x":63.53,"y":172.35},{"time":0.7,"x":43.59,"y":126.34},{"time":0.8,"x":6.64,"y":106.41}],"scale":[{"x":0.674}]},"r finger d":{"rotate":[{"angle":1.61},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-6.04},{"time":0.4,"angle":-87.39},{"time":0.7,"angle":-118.41},{"time":0.8,"angle":1.61}],"translate":[{"x":-11.55,"y":135.14},{"time":0.2,"x":55.13,"y":192.85},{"time":0.3,"x":39.27,"y":177.3},{"time":0.4,"x":-13.43,"y":192.22},{"time":0.7,"x":25.4,"y":155.06},{"time":0.8,"x":-11.55,"y":135.14}],"scale":[{"x":0.674}]},"r finger a":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72}],"translate":[{"x":131.03,"y":-25.92}],"scale":[{"x":0.356,"y":0.528}]},"r upparm2":{"rotate":[{"angle":4}],"translate":[{},{"time":0.1,"x":-23.06,"y":-56.12},{"time":0.2,"x":18.62,"y":-75.54},{"time":0.3,"x":38.71,"y":-22.49},{"time":0.4,"x":39.74,"y":16.28},{"time":0.5,"x":47.56,"y":21.53},{"time":0.6,"x":15.76,"y":-82.19},{"time":0.7,"x":53.32,"y":-22.94},{"time":0.8}],"scale":[{"x":0.874,"y":0.874}]},"l finger c":{"rotate":[{"angle":67.75},{"time":0.2,"angle":46.4},{"time":0.4,"angle":29.53},{"time":0.5,"angle":73.3,"curve":"stepped"},{"time":0.7,"angle":73.3},{"time":0.8,"angle":67.75}]},"l finger b":{"rotate":[{"angle":12.29},{"time":0.2,"angle":-9.05},{"time":0.4,"angle":-25.92},{"time":0.5,"angle":17.85,"curve":"stepped"},{"time":0.7,"angle":17.85},{"time":0.8,"angle":12.29}]},"l finger a":{"rotate":[{"angle":-21},{"time":0.2,"angle":-42.35},{"time":0.4,"angle":-59.21},{"time":0.5,"angle":-15.44,"curve":"stepped"},{"time":0.7,"angle":-15.44},{"time":0.8,"angle":-21}]},"l finger d":{"rotate":[{"angle":104.78},{"time":0.2,"angle":83.43},{"time":0.4,"angle":66.56},{"time":0.5,"angle":110.34,"curve":"stepped"},{"time":0.7,"angle":110.34},{"time":0.8,"angle":104.78}]},"l finger b2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger c2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger d2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger a2":{"rotate":[{"angle":19.49},{"time":0.2,"angle":-1.85},{"time":0.4,"angle":10.22},{"time":0.5,"angle":56.06},{"time":0.7,"angle":44.53},{"time":0.8,"angle":19.49}]},"l ik2":{"translate":[{"x":91.54,"y":85.04},{"time":0.1,"x":57.37,"y":79.54},{"time":0.2,"x":46.58,"y":84.16},{"time":0.3,"x":43.88,"y":-108.48},{"time":0.4,"x":50.02,"y":-49.47},{"time":0.5,"x":61.7,"y":4.19},{"time":0.6,"x":69.69,"y":-9.68},{"time":0.7,"x":87.16,"y":32.39},{"time":0.8,"x":91.54,"y":85.04}]},"root":{"translate":[{"x":-273.37}]},"r ik":{"rotate":[{"angle":102.66},{"time":0.1,"angle":27.72},{"time":0.2,"angle":-23.72},{"time":0.3,"angle":-35},{"time":0.4,"angle":-34.26},{"time":0.5},{"time":0.6,"angle":71.42},{"time":0.7,"angle":72.92},{"time":0.8,"angle":102.66}],"translate":[{"x":275.23,"y":-9.7},{"time":0.1,"x":9.93,"y":99.3},{"time":0.2,"x":-62.42,"y":126.65},{"time":0.3,"x":101.76,"y":271.14},{"time":0.4,"x":262.35,"y":318.34},{"time":0.5,"x":364.24,"y":281.87},{"time":0.6,"x":380.54,"y":150.47},{"time":0.7,"x":448.94,"y":120.68},{"time":0.8,"x":275.23,"y":-9.7}],"scale":[{"y":-1}]},"l leg":{"rotate":[{"angle":67.12}]},"r leg":{"rotate":[{"angle":125.66}],"scale":[{"x":0.787,"y":-1}]},"r ik2":{"translate":[{"x":128.11,"y":-106.46},{"time":0.1,"x":78.5,"y":-78.71},{"time":0.2,"x":-2.33,"y":39.33},{"time":0.3,"x":87.53,"y":45.77},{"time":0.4,"x":81.77,"y":1.21},{"time":0.5,"x":108.09,"y":16.09},{"time":0.6,"x":105.52,"y":-61.86},{"time":0.7,"x":117.78,"y":-18.96},{"time":0.8,"x":128.11,"y":-106.46}]},"r upparm3":{"rotate":[{"angle":-27.65},{"time":0.1,"angle":-53.5},{"time":0.2,"angle":-105.96},{"time":0.3,"angle":-138.28},{"time":0.4,"angle":-125.37},{"time":0.5,"angle":-109.13},{"time":0.6,"angle":-88.34},{"time":0.7,"angle":-34.45},{"time":0.8,"angle":-27.65}]},"r hand":{"translate":[{"x":-108.92,"y":-86.21},{"time":0.1,"x":-231.8,"y":-34.01},{"time":0.2,"x":-257.1,"y":-45.29},{"time":0.3,"x":-225.91,"y":-67.47},{"time":0.4,"x":-184.87,"y":-44.92},{"time":0.5,"x":-188.82,"y":-80.85},{"time":0.6,"x":-168.25,"y":-121.48},{"time":0.7,"x":-163.45,"y":-119.28},{"time":0.8,"x":-108.92,"y":-86.21}]},"r arm":{"rotate":[{"angle":-11.76}]},"l upparm2":{"rotate":[{"angle":-76.23}],"translate":[{"x":-56.13,"y":20.55},{"time":0.1,"x":-86.33,"y":42.77},{"time":0.2,"curve":"stepped"},{"time":0.3},{"time":0.4,"x":-97.89,"y":54.46},{"time":0.5},{"time":0.6,"x":-50.26,"y":59.34},{"time":0.7,"x":-44.26,"y":70.92},{"time":0.8,"x":-56.13,"y":20.55}]},"shadow":{"translate":[{"x":195.38},{"time":0.0667,"x":178.18},{"time":0.4667,"x":274.91},{"time":0.7667,"x":203.98},{"time":0.8,"x":195.38}],"scale":[{"y":1.081},{"time":0.0667},{"time":0.4667,"y":1.458},{"time":0.7667,"y":1.122},{"time":0.8,"y":1.081}]},"r finger a2":{"rotate":[{"angle":2.72},{"time":0.2,"angle":40.56},{"time":0.3,"angle":31.06},{"time":0.4,"angle":33.88},{"time":0.5,"angle":49.3},{"time":0.7,"angle":21.2},{"time":0.8,"angle":2.72}],"translate":[{"x":131.03,"y":-25.92}],"scale":[{"x":0.356,"y":0.528}]},"r finger b2":{"rotate":[{"angle":-72.05},{"time":0.3,"angle":-7.32},{"time":0.4,"angle":-56.97},{"time":0.5,"angle":-139.63},{"time":0.8,"angle":-72.05}],"translate":[{"x":171.78,"y":113.86},{"time":0.3,"x":144.96,"y":155.26},{"time":0.4,"x":129.1,"y":139.7},{"time":0.5,"x":188.45,"y":155.72},{"time":0.8,"x":171.78,"y":113.86}],"scale":[{"x":0.674}]},"r finger c2":{"rotate":[{"angle":-62.67},{"time":0.3,"angle":2.17},{"time":0.4,"angle":-47.48},{"time":0.5,"angle":-133.75},{"time":0.8,"angle":-62.67}],"translate":[{"x":43.59,"y":126.34},{"time":0.3,"x":73.32,"y":164.13},{"time":0.4,"x":57.46,"y":148.57},{"time":0.5,"x":63.53,"y":172.35},{"time":0.8,"x":43.59,"y":126.34}],"scale":[{"x":0.674}]},"r finger d2":{"rotate":[{"angle":-55.55},{"time":0.3,"angle":27.3},{"time":0.4,"angle":-22.35},{"time":0.5,"angle":-106.07},{"time":0.8,"angle":-55.55}],"translate":[{"x":25.4,"y":155.06},{"time":0.3,"x":55.13,"y":192.85},{"time":0.4,"x":39.27,"y":177.3},{"time":0.5,"x":-13.43,"y":192.22},{"time":0.8,"x":25.4,"y":155.06}],"scale":[{"x":0.674}]},"l hand2":{"rotate":[{"angle":-5.46},{"time":0.1,"angle":19.32},{"time":0.2,"angle":21.77},{"time":0.3,"angle":22.05},{"time":0.4,"angle":-91.8},{"time":0.5,"angle":-68.35},{"time":0.6,"angle":-55.42},{"time":0.7,"angle":-53.84},{"time":0.8,"angle":-5.46}],"translate":[{"x":-23.89,"y":-2.05},{"time":0.1,"x":-28.71,"y":12.87},{"time":0.2,"x":-41.75,"y":-1.02},{"time":0.3,"x":-65.66,"y":-15.55},{"time":0.4,"x":98.13,"y":100.45},{"time":0.5,"x":44.43,"y":127.78},{"time":0.6,"x":43.38,"y":135.2},{"time":0.7,"x":18.48,"y":87.3},{"time":0.8,"x":-23.89,"y":-2.05}],"scale":[{"x":0.578,"y":-0.613}]},"l hand":{"scale":[{"x":0,"y":0}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":-11.38},{"time":0.1,"angle":0.98},{"time":0.2,"angle":21.9},{"time":0.3,"angle":42.82},{"time":0.4,"angle":66.9},{"time":0.5,"angle":82.78},{"time":0.6,"angle":73.27},{"time":0.7,"angle":22.12},{"time":0.8,"angle":-11.38}]},"tail2":{"rotate":[{"angle":21.88},{"time":0.1,"angle":16.73},{"time":0.2,"angle":28.65},{"time":0.3,"angle":30.6},{"time":0.4,"angle":39.52},{"time":0.5,"angle":35.58},{"time":0.6,"angle":25.54},{"time":0.7,"angle":30.68},{"time":0.8,"angle":21.88}]},"tail3":{"rotate":[{"angle":9.68},{"time":0.2,"angle":16.73},{"time":0.6,"angle":2.63},{"time":0.8,"angle":9.68}],"translate":[{},{"time":0.4,"x":-8.99,"y":-3.86},{"time":0.8}]},"tail4":{"rotate":[{"angle":-13.41},{"time":0.3,"angle":16.73},{"time":0.7,"angle":-20.23},{"time":0.8,"angle":-13.41}]},"tail5":{"rotate":[{"angle":-20.23},{"time":0.4,"angle":16.73},{"time":0.8,"angle":-20.23}]},"tail6":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-20.23},{"time":0.5,"angle":16.73},{"time":0.8,"angle":-13.41}]},"skirt f":{"rotate":[{"angle":16.01},{"time":0.1,"angle":37.11},{"time":0.4,"angle":72.86},{"time":0.5,"angle":79.35},{"time":0.8,"angle":16.01}],"scale":[{"x":0.554}]},"skirt f2":{"rotate":[{"angle":8.67},{"time":0.2,"angle":26.26},{"time":0.6,"angle":-8.92},{"time":0.8,"angle":8.67}]},"skirt f3":{"rotate":[{"angle":-8.92},{"time":0.4,"angle":26.26},{"time":0.8,"angle":-8.92}]},"r leg5":{"rotate":[{"angle":-21.75},{"time":0.3},{"time":0.7,"angle":-26.67},{"time":0.8,"angle":-21.75}]},"l leg5":{"rotate":[{"angle":7.51},{"time":0.1},{"time":0.5,"angle":40.71},{"time":0.8,"angle":7.51}]},"hair t":{"rotate":[{"angle":4.07,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":17.13,"curve":0.25,"c3":0.75},{"time":0.6,"angle":-8.99,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":4.07}]},"hair t2":{"rotate":[{"angle":-2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":8.12,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":-2.92}]},"hair t3":{"rotate":[{"angle":0.21,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-23.63,"curve":0.25,"c3":0.75},{"time":0.6,"angle":24.05,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":0.21}]},"hair t4":{"rotate":[{"angle":15.32,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-41.21,"curve":0.25,"c3":0.75},{"time":0.7,"angle":28.11,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":15.32}]},"hair t6":{"rotate":[{"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.4,"angle":26.71,"curve":0.25,"c3":0.75},{"time":0.8,"angle":-5.42}]},"hair t7":{"rotate":[{"angle":0.51,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.5,"angle":26.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":0.8,"angle":0.51}]},"hair t8":{"rotate":[{"angle":10.65,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.6,"angle":26.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":10.65}]},"hair t9":{"rotate":[{"angle":20.79,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.3,"angle":-5.42,"curve":0.25,"c3":0.75},{"time":0.7,"angle":26.71,"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.8,"angle":20.79}]},"hair t5":{"rotate":[{"angle":30.87,"curve":0.25,"c3":0.75},{"time":0.4,"curve":0.25,"c3":0.75},{"time":0.8,"angle":30.87}]},"r ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8}]},"r ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3}]},"l ear2":{"rotate":[{"angle":9.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"curve":0.25,"c3":0.75},{"time":0.6,"angle":18.59,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":9.3}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.4,"angle":18.59,"curve":0.25,"c3":0.75},{"time":0.8}]},"r beard":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38}]},"r beard2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88}]},"r beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72}]},"l beard3":{"rotate":[{"angle":31.72},{"time":0.4,"angle":-30.78},{"time":0.8,"angle":31.72}]},"l bear2":{"rotate":[{"angle":3.88,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.2,"angle":-27.48,"curve":0.25,"c3":0.75},{"time":0.6,"angle":35.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.8,"angle":3.88}]},"l bear":{"rotate":[{"angle":-25.38},{"time":0.4,"angle":-25.49},{"time":0.8,"angle":-25.38}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"r leg3":{"rotate":[{"angle":-24.54}]},"r leg2":{"rotate":[{"angle":55.93}]},"l leg3":{"rotate":[{"angle":-46.18}]},"l leg2":{"rotate":[{"angle":-42.4}]},"l armour":{"rotate":[{"angle":-39.8}]}},"ik":{"r ik2":[{"softness":50,"bendPositive":false}]},"deform":{"default":{"body":{"body":[{"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,73.02119,28.04686,27.64014,106.09567,81.50483,51.28856,7.86224,121.12152,92.1498,54.9428,7.28735,131.9566,76.07975,44.30603,2.46509,104.53262,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,142.30887,-61.974,106.15457,117.64508,4.18413,-193.21259,23.4961,-62.50654,62.42265,-22.3002,110.69176,-50.68269,104.50172,87.03677,41.56684,-128.7578,113.5101,-31.4375,123.3315,-60.03928,109.60432,110.3493,49.89716,22.95819,51.672,-94.72869,97.96159,9.17746,106.22954,-94.49485,114.09559,65.8175,-35.58823,-107.3894,81.10829,64.54388,15.7094,-260.59818,201.99127,-138.08838,5.19271,-138.24823,105.41862,-64.11746,178.94919,-21.79572,98.22049,181.77829,85.74295,37.16302,155.17085,-24.09232,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,133.17087,-96.95332,136.55838,95.87506,-7.02176,-23.28021,13.18948,-20.42807,-31.03684,-156.80276,99.4881,-122.90707,149.05884,-22.85312,82.94714,146.95276,9.20917,-16.10992,18.19316,3.65289,-3.7588,-102.26871,75.48494,-69.10156,-3.0832,-39.2578,28.16641,-23.01251,15.95902,3.12903,8.28933,20.5321]}]},"l hand2":{"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}],"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r arm":{"r arm":[{"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043]}]},"r armour u":{"r armour u":[{"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]},{"time":0.4,"offset":4,"vertices":[163.9654,-45.00104,177.28926,99.94327,181.48798,-69.53613,202.98242,108.74658,140.53593,-68.87366,203.46579,65.00528,76.7599,-81.34448,151.37636,9.09085]},{"time":0.8,"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]}]},"r hand":{"r hand":[{"vertices":[106.49825,72.85461,61.83717,234.74945,69.7912,101.20599,99.5771,-42.22052]}]},"r upparm":{"r upparm":[{"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]},{"time":0.1,"vertices":[-28.71144,-44.1958,56.25366,21.75468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88.93488,43.86108,51.64029,65.98203,0.65607,47.6413,-54.5849,17.91281,-131.43018,-29.84882]},{"time":0.2,"vertices":[-70.29115,-121.59358,129.93558,-53.69101,0,0,0,0,0,0,0,0,0,0,0,0,60.33824,12.40262,1.57361,70.47795,138.48999,146.07806,67.43813,181.56848,-45.18221,149.7756,-149.39273,46.96301,-219.99423,-105.85606,-43.01499,-68.8707,65.8432,-65.57346,-24.77599,-39.39505,37.61963,-37.69945]},{"time":0.3,"vertices":[-142.63615,-149.74637,47.56436,-137.68623,0,0,0,0,0,0,0,0,0,0,0,0,50.28187,10.33552,1.31134,58.73162,40.17482,138.09778,-59.78693,144.63666,-163.83813,74.89461,-232.30444,-49.23798,-259.16425,-211.93402,-35.84583,-57.39225,54.86933,-54.64455,-20.64665,-32.82921,31.34969,-31.41621,12.45225,-6.3985,16.0213,-0.0816]},{"time":0.4,"vertices":[-114.10892,-119.7971,38.05149,-110.14899,0,0,0,0,0,0,0,0,0,0,0,0,40.22549,8.26841,1.04907,46.9853,17.968,82.77934,-63.6477,81.75819,-145.03168,21.48185,-197.31894,-77.27264,-203.24228,-209.83081,-28.67666,-45.9138,43.89547,-43.71564,-16.51732,-26.26337,25.07975,-25.13297,9.9618,-5.1188,12.81704,-0.06528]},{"time":0.5,"vertices":[-85.5817,-89.84782,28.53862,-82.61174,0,0,0,0,0,0,0,0,0,0,0,0,30.16912,6.20131,0.7868,35.23898,11.92402,64.56107,-49.2754,62.96702,-109.30013,16.21414,-146.1988,-59.89482,-150.68185,-159.84299,-21.5075,-34.43535,32.9216,-32.78673,-12.38799,-19.69753,18.80981,-18.84972,7.47135,-3.8391,9.61278,-0.04896]},{"time":0.6,"vertices":[-57.05446,-59.89854,19.02575,-55.07449,0,0,0,0,0,0,0,0,0,0,0,0,20.11275,4.13421,0.52454,23.49265,85.12775,89.96481,24.06255,114.93831,-62.65114,98.66886,-151.15407,45.04043,-190.00272,-40.19608,-14.33833,-22.9569,21.94773,-21.85782,-8.25866,-13.13168,12.53988,-12.56648,4.9809,-2.5594,6.40852,-0.03264]},{"time":0.7,"vertices":[-28.52724,-29.94928,9.51288,-27.53725,0,0,0,0,0,0,0,0,0,0,0,0,10.05638,2.0671,0.26227,11.74633,97.34462,37.31192,50.5202,69.83792,-27.32924,70.25962,-114.90354,35.7408,-166.87126,-25.32079,-7.16917,-11.47845,10.97387,-10.92891,-4.12933,-6.56584,6.26994,-6.28324,2.49045,-1.2797,3.20426,-0.01632]},{"time":0.8,"vertices":[-32.81308,-50.50949,64.2899,24.86249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72.64363,-26.2749,35.01944,-8.35641,12.34354,13.19168,-55.03098,15.61407,-114.10587,-17.06326]}]}}},"drawOrder":[{"offsets":[{"slot":"body","offset":6},{"slot":"r leg","offset":6},{"slot":"l hand2","offset":-34},{"slot":"r finger d2","offset":-36},{"slot":"r finger c2","offset":-37},{"slot":"r finger b2","offset":-38},{"slot":"r finger a2","offset":-39}]}]},"win":{"slots":{"r eye fire":{"attachment":[{"name":"eyefire/eyefire_00010"},{"time":0.0333,"name":"eyefire/eyefire_00001"},{"time":0.0667,"name":"eyefire/eyefire_00002"},{"time":0.1,"name":"eyefire/eyefire_00003"},{"time":0.1333,"name":"eyefire/eyefire_00004"},{"time":0.1667,"name":"eyefire/eyefire_00005"},{"time":0.2,"name":"eyefire/eyefire_00006"},{"time":0.2333,"name":"eyefire/eyefire_00007"},{"time":0.2667,"name":"eyefire/eyefire_00009"},{"time":0.3,"name":"eyefire/eyefire_00010"},{"time":0.3333,"name":"eyefire/eyefire_00011"},{"time":0.3667,"name":"eyefire/eyefire_00012"},{"time":0.4,"name":"eyefire/eyefire_00013"},{"time":0.4333,"name":"eyefire/eyefire_00014"},{"time":0.4667,"name":"eyefire/eyefire_00015"},{"time":0.5,"name":"eyefire/eyefire_00016"},{"time":0.5333,"name":"eyefire/eyefire_00017"},{"time":0.5667,"name":"eyefire/eyefire_00018"},{"time":0.6,"name":"eyefire/eyefire_00019"},{"time":0.6333,"name":"eyefire/eyefire_00020"},{"time":0.6667,"name":"eyefire/eyefire_00021"},{"time":0.7,"name":"eyefire/eyefire_00022"},{"time":0.7333,"name":"eyefire/eyefire_00023"},{"time":0.7667,"name":"eyefire/eyefire_00024"},{"time":0.8,"name":"eyefire/eyefire_00025"},{"time":0.8333,"name":"eyefire/eyefire_00027"},{"time":0.8667,"name":"eyefire/eyefire_00028"},{"time":0.9,"name":"eyefire/eyefire_00029"},{"time":0.9333,"name":"eyefire/eyefire_00030"},{"time":0.9667,"name":"eyefire/eyefire_00031"},{"time":1,"name":"eyefire/eyefire_00032"},{"time":1.0333,"name":"eyefire/eyefire_00033"},{"time":1.0667,"name":"eyefire/eyefire_00034"},{"time":1.1,"name":"eyefire/eyefire_00035"},{"time":1.1333,"name":"eyefire/eyefire_00036"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00001"},{"time":1.2333,"name":"eyefire/eyefire_00002"},{"time":1.2667,"name":"eyefire/eyefire_00003"},{"time":1.3,"name":"eyefire/eyefire_00004"},{"time":1.3333,"name":"eyefire/eyefire_00005"},{"time":1.3667,"name":"eyefire/eyefire_00006"},{"time":1.4,"name":"eyefire/eyefire_00008"},{"time":1.4333,"name":"eyefire/eyefire_00009"},{"time":1.4667,"name":"eyefire/eyefire_00010"},{"time":1.5,"name":"eyefire/eyefire_00011"},{"time":1.5333,"name":"eyefire/eyefire_00012"},{"time":1.5667,"name":"eyefire/eyefire_00013"},{"time":1.6,"name":"eyefire/eyefire_00014"},{"time":1.6333,"name":"eyefire/eyefire_00015"},{"time":1.6667,"name":"eyefire/eyefire_00016"},{"time":1.7,"name":"eyefire/eyefire_00017"},{"time":1.7333,"name":"eyefire/eyefire_00018"},{"time":1.7667,"name":"eyefire/eyefire_00019"},{"time":1.8,"name":"eyefire/eyefire_00020"},{"time":1.8333,"name":"eyefire/eyefire_00021"},{"time":1.8667,"name":"eyefire/eyefire_00022"},{"time":1.9,"name":"eyefire/eyefire_00023"},{"time":1.9333,"name":"eyefire/eyefire_00025"},{"time":1.9667,"name":"eyefire/eyefire_00026"},{"time":2,"name":"eyefire/eyefire_00027"},{"time":2.0333,"name":"eyefire/eyefire_00028"},{"time":2.0667,"name":"eyefire/eyefire_00029"},{"time":2.1,"name":"eyefire/eyefire_00030"},{"time":2.1333,"name":"eyefire/eyefire_00031"},{"time":2.1667,"name":"eyefire/eyefire_00032"},{"time":2.2,"name":"eyefire/eyefire_00033"},{"time":2.2333,"name":"eyefire/eyefire_00034"},{"time":2.2667,"name":"eyefire/eyefire_00035"},{"time":2.3,"name":"eyefire/eyefire_00036"},{"time":2.3333,"name":"eyefire/eyefire_00037"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"l hand2":{"scale":[{"x":0,"y":0}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"angle":9.3,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-41.35,"curve":0.345,"c2":0.38,"c3":0.68,"c4":0.72},{"time":0.6333,"angle":-12.68,"curve":0.374,"c2":0.62,"c3":0.715},{"time":1.0333,"angle":18.46},{"time":1.7,"angle":21},{"time":2.0667,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":-21.31,"y":54.01,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"x":203.36,"y":-162.81,"curve":0.332,"c2":0.33,"c3":0.671,"c4":0.68},{"time":0.6333,"x":205.79,"y":-89.37,"curve":0.382,"c2":0.55,"c3":0.741},{"time":1.0333,"x":11.92,"y":11.92},{"time":1.7,"x":-110.25,"y":39.82},{"time":2.0667,"x":0.79,"y":-46.91,"curve":0.298,"c3":0.635,"c4":0.36},{"time":2.3333}]},"r upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.1333,"angle":2.59,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"angle":14.07,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"angle":-46.21},{"time":1.7,"angle":-68.13},{"time":2.0667,"angle":-18.17,"curve":0.298,"c3":0.635,"c4":0.36},{"time":2.3333,"angle":-6.74}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.0333,"angle":65.68,"curve":"stepped"},{"time":1.7,"angle":65.68},{"time":2.0667,"angle":14.41}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.0333,"x":24.67,"y":-27.07,"curve":"stepped"},{"time":1.7,"x":24.67,"y":-27.07},{"time":2.0667}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.0333,"angle":-13.17,"curve":"stepped"},{"time":1.7,"angle":-13.17},{"time":2.0667,"angle":-9.49}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.0333,"angle":-3.49,"curve":"stepped"},{"time":1.7,"angle":-3.49},{"time":2.0667,"angle":-8.92}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.1333,"angle":-11.3,"curve":0.345,"c2":0.38,"c3":0.679,"c4":0.72},{"time":0.4333,"angle":4.57,"curve":0.368,"c2":0.63,"c3":0.705},{"time":1.0333,"angle":41.65},{"time":1.7,"angle":53.63},{"time":2.0667,"angle":31.13,"curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":2.3333,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.0333,"x":79.8,"y":3.04,"curve":"stepped"},{"time":1.7,"x":79.8,"y":3.04},{"time":2.0667,"x":-7.85,"y":2.92}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.4333,"angle":-24.78,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"angle":76.39},{"time":1.7,"angle":113.74},{"time":1.7333,"angle":55.84},{"time":2.0667,"angle":-11.64,"curve":0.256,"c3":0.619,"c4":0.46},{"time":2.3333,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":-137.1,"y":88.66,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"x":-128.25,"y":2.45,"curve":0.349,"c2":0.4,"c3":0.686,"c4":0.74},{"time":0.7,"x":182.63,"y":76.38,"curve":0.37,"c2":0.63,"c3":0.709},{"time":1.0333,"x":346.03,"y":330.86},{"time":1.7,"x":246.39,"y":504.5},{"time":1.7333,"x":224.92,"y":364.09},{"time":2.0667,"x":116.85,"y":41.93,"curve":0.334,"c2":0.34,"c3":0.668,"c4":0.67},{"time":2.3333,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4,"x":0.95,"y":0.46,"curve":0.34,"c2":0.35,"c3":0.68,"c4":0.71},{"time":0.4333,"y":-1.069,"curve":"stepped"},{"time":1.7,"y":-1.069},{"time":1.7333},{"time":2.3333,"x":0.95,"y":0.95}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"angle":-4.04,"curve":0.341,"c2":0.36,"c3":0.677,"c4":0.7},{"time":0.4333,"angle":-20.74,"curve":0.381,"c2":0.59,"c3":0.73},{"time":1.0333,"angle":28.13},{"time":1.7,"angle":31.71},{"time":2.0667,"angle":-4.31}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"angle":21.72,"curve":0.295,"c2":0.2,"c3":0.642,"c4":0.58},{"time":0.4333,"angle":14.59,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"angle":-23.03},{"time":1.7,"angle":-38.61},{"time":2.0667}],"translate":[{"time":0.1333,"curve":0.296,"c2":0.21,"c3":0.648,"c4":0.6},{"time":0.4333,"x":-28.84,"y":103.01},{"time":1.0333,"x":-62.58,"y":33.68},{"time":1.7,"x":-76.87,"y":3.58},{"time":2.0667}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.4333,"x":-13.16,"y":17.34,"curve":0.366,"c2":0.46,"c3":0.754},{"time":1.0333,"x":-83.56,"y":-14.11},{"time":1.7,"x":-117.51,"y":6.9},{"time":2.0667}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"angle":-0.38},{"time":0.4333,"angle":-14.97},{"time":1.0333,"angle":-3.36},{"time":1.7,"angle":6.3},{"time":2.0667,"angle":-17.69,"curve":0.25,"c3":0.75},{"time":2.3333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.1333,"x":3.97,"y":-59.43,"curve":0.307,"c2":0.25,"c3":0.651,"c4":0.62},{"time":0.4333,"x":71.54,"y":-90.8,"curve":0.372,"c2":0.48,"c3":0.752},{"time":1.0333,"x":63.57,"y":67.54},{"time":1.7,"x":55.62,"y":119.19},{"time":2.0667,"x":-8.66,"y":-38.97,"curve":0.284,"c3":0.625,"c4":0.38},{"time":2.3333}]},"l leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":25.1},{"time":2.0667}]},"l leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":-30.32},{"time":2.0667}]},"r leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":7.26},{"time":2.0667}]},"l leg":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":-2.67},{"time":2.0667}]},"r leg2":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":-30.14},{"time":2.0667}]},"r ik2":{"translate":[{"time":0.4333},{"time":1.0333,"x":-92.02,"y":14.21,"curve":"stepped"},{"time":1.7,"x":-92.02,"y":14.21},{"time":2.0667}]},"r leg3":{"rotate":[{"curve":0.25,"c3":0.75},{"time":1.7,"angle":13.63},{"time":2.0667}]},"r finger c2":{"rotate":[{"angle":-9.49}]},"l armour":{"rotate":[{"angle":1.84,"curve":0.25,"c3":0.75},{"time":1.7,"angle":2.46},{"time":2.0667,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":1.84}]},"l finger c2":{"rotate":[{"angle":16.54}],"translate":[{"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925}]},"r upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":1.7,"angle":-0.29},{"time":2.0667,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":12.65}]},"l upparm2":{"rotate":[{"angle":-6.45,"curve":0.25,"c3":0.75},{"time":1.7,"angle":50.9},{"time":2.0667,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-6.45}]},"r finger d2":{"rotate":[{"angle":7.12}]},"l finger a":{"rotate":[{"angle":-2.5}]},"l finger a2":{"rotate":[{"angle":5.32}],"translate":[{"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925}]},"r finger a2":{"rotate":[{"angle":14.41}]},"l finger b2":{"rotate":[{"angle":16.78}],"translate":[{"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925}]},"l finger c":{"rotate":[{"angle":-2.5}]},"r finger b2":{"rotate":[{"angle":-8.92}]},"l finger d":{"rotate":[{"angle":-2.5}]},"l finger d2":{"rotate":[{"angle":26.01}],"translate":[{"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925}]},"r arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":1.7,"angle":23.59},{"time":2.0667,"curve":0.25,"c3":0.75},{"time":2.3333,"angle":-7.98}]},"r finger d":{"rotate":[{"angle":7.12}]},"r ear2":{"rotate":[{"angle":-2.28}]},"l ear2":{"rotate":[{"angle":3.27}]},"l ik":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"angle":-14.25,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.0667,"x":127.95,"y":68.89,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.1333,"x":167.31,"curve":"stepped"},{"time":2.0667,"x":167.31},{"time":2.1667,"x":39.62,"y":56.29},{"time":2.3333}]},"l finger b":{"rotate":[{"angle":-2.5}]},"head2":{"scale":[{"time":0.6,"curve":0.32,"c2":0.29,"c3":0.66,"c4":0.65},{"time":1.0333,"x":1.035,"curve":0.375,"c2":0.5,"c3":0.75},{"time":2.0667}]},"r upparm3":{"rotate":[{"time":0.4333},{"time":1.0333,"angle":49.31},{"time":1.7,"angle":59.31},{"time":2.0667}]},"lock":{"scale":[{"x":0,"y":0}]},"lock2":{"scale":[{"x":0,"y":0}]},"headmouth":{"rotate":[{},{"time":0.2333,"angle":-11.46},{"time":0.6,"angle":-38.32},{"time":1.0333,"angle":-3.97},{"time":1.7,"angle":-0.86},{"time":2.3333}],"translate":[{"time":0.2333},{"time":0.6,"x":-21.09,"y":14.18},{"time":1.0333,"x":-36.67,"y":19.76},{"time":2.3333}],"scale":[{"time":0.6},{"time":1.0333,"x":1.035},{"time":2.3333}]},"r ear s2":{"rotate":[{"angle":-7.49}]},"hair t2":{"rotate":[{"angle":0.61}]},"hair t3":{"rotate":[{"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88}]},"hair t5":{"rotate":[{"angle":63.33}]},"hair t6":{"rotate":[{"angle":6.2}],"translate":[{"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63}]},"hair t8":{"rotate":[{"angle":23.39}],"translate":[{"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01}],"translate":[{"x":-2.26,"y":14.51}]},"hair t10":{"rotate":[{"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54}]},"headbeard b":{"rotate":[{"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67}]},"headbeard b3":{"rotate":[{"angle":8.76}]},"r ear s":{"rotate":[{"angle":-5.67}]},"r ear ring b":{"rotate":[{"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92}],"translate":[{"x":5.7,"y":-8.17}]},"r beard":{"rotate":[{"angle":8.77}],"scale":[{"x":0.88}]},"r beard2":{"rotate":[{"angle":-0.61}]},"r beard3":{"rotate":[{"angle":-10}]},"l bear":{"rotate":[{"angle":-11.82}]},"l bear2":{"rotate":[{"angle":1.82}]},"l beard3":{"rotate":[{"angle":15.47}]},"headbeard f":{"rotate":[{"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99}]},"skirt f":{"rotate":[{"angle":9.15}],"shear":[{"y":-15.36}]},"skirt f2":{"rotate":[{"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98}]},"l leg5":{"rotate":[{"angle":-9.62}]},"tail":{"rotate":[{"angle":-8.41}]},"tail2":{"rotate":[{"angle":4.52}]},"tail3":{"rotate":[{"angle":-1.85}]},"tail4":{"rotate":[{"angle":-8.22}]},"tail5":{"rotate":[{"angle":-11.95}]},"tail6":{"rotate":[{"angle":-8.22}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"shadow":{"translate":[{},{"time":0.1333,"x":6.12},{"time":0.4333,"x":42.81},{"time":1.0333,"x":61.15},{"time":1.7,"x":30.57},{"time":2.0667}],"scale":[{},{"time":0.1333,"y":1.122},{"time":0.4333,"y":1.245},{"time":1.0333,"y":1.016},{"time":1.7}]}}},"winloop":{"slots":{"r eye fire":{"attachment":[{"time":0.0333,"name":"eyefire/eyefire_00002"},{"time":0.0667,"name":"eyefire/eyefire_00003"},{"time":0.1,"name":"eyefire/eyefire_00004"},{"time":0.1333,"name":"eyefire/eyefire_00006"},{"time":0.1667,"name":"eyefire/eyefire_00007"},{"time":0.2,"name":"eyefire/eyefire_00008"},{"time":0.2333,"name":"eyefire/eyefire_00010"},{"time":0.2667,"name":"eyefire/eyefire_00011"},{"time":0.3,"name":"eyefire/eyefire_00012"},{"time":0.3333,"name":"eyefire/eyefire_00014"},{"time":0.3667,"name":"eyefire/eyefire_00015"},{"time":0.4,"name":"eyefire/eyefire_00017"},{"time":0.4333,"name":"eyefire/eyefire_00018"},{"time":0.4667,"name":"eyefire/eyefire_00019"},{"time":0.5,"name":"eyefire/eyefire_00021"},{"time":0.5333,"name":"eyefire/eyefire_00022"},{"time":0.5667,"name":"eyefire/eyefire_00023"},{"time":0.6,"name":"eyefire/eyefire_00025"},{"time":0.6333,"name":"eyefire/eyefire_00026"},{"time":0.6667,"name":"eyefire/eyefire_00028"},{"time":0.7,"name":"eyefire/eyefire_00029"},{"time":0.7333,"name":"eyefire/eyefire_00030"},{"time":0.7667,"name":"eyefire/eyefire_00032"},{"time":0.8,"name":"eyefire/eyefire_00033"},{"time":0.8333,"name":"eyefire/eyefire_00034"},{"time":0.8667,"name":"eyefire/eyefire_00036"},{"time":0.9,"name":"eyefire/eyefire_00037"},{"time":0.9333,"name":"eyefire/eyefire_00000"},{"time":0.9667,"name":"eyefire/eyefire_00002"},{"time":1,"name":"eyefire/eyefire_00003"},{"time":1.0333,"name":"eyefire/eyefire_00005"},{"time":1.0667,"name":"eyefire/eyefire_00006"},{"time":1.1,"name":"eyefire/eyefire_00007"},{"time":1.1333,"name":"eyefire/eyefire_00009"},{"time":1.1667,"name":"eyefire/eyefire_00010"},{"time":1.2,"name":"eyefire/eyefire_00011"},{"time":1.2333,"name":"eyefire/eyefire_00013"},{"time":1.2667,"name":"eyefire/eyefire_00014"},{"time":1.3,"name":"eyefire/eyefire_00015"},{"time":1.3333,"name":"eyefire/eyefire_00017"},{"time":1.3667,"name":"eyefire/eyefire_00018"},{"time":1.4,"name":"eyefire/eyefire_00020"},{"time":1.4333,"name":"eyefire/eyefire_00021"},{"time":1.4667,"name":"eyefire/eyefire_00022"},{"time":1.5,"name":"eyefire/eyefire_00024"},{"time":1.5333,"name":"eyefire/eyefire_00025"},{"time":1.5667,"name":"eyefire/eyefire_00026"},{"time":1.6,"name":"eyefire/eyefire_00028"},{"time":1.6333,"name":"eyefire/eyefire_00029"},{"time":1.6667,"name":"eyefire/eyefire_00031"},{"time":1.7,"name":"eyefire/eyefire_00032"},{"time":1.7333,"name":"eyefire/eyefire_00033"},{"time":1.7667,"name":"eyefire/eyefire_00035"},{"time":1.8,"name":"eyefire/eyefire_00036"},{"time":1.8333,"name":"eyefire/eyefire_00037"},{"time":1.8667,"name":"eyefire/eyefire_00000"}]},"zhuaji":{"attachment":[{"name":null}]},"zhuaji2":{"attachment":[{"name":null}]}},"bones":{"l hand2":{"scale":[{"x":0,"y":0}]},"r upparm2":{"rotate":[{"angle":12.65,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":12.97}]},"r beard":{"rotate":[{"angle":8.77,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.19,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.77}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":9.4,"y":-12.46,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"x":0.88,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":0.88}]},"r finger b2":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r ear s":{"rotate":[{"angle":-5.67,"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":8.3,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-5.67}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":12.16,"y":-17.99,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"skirt f":{"rotate":[{"angle":9.15,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-4.75,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":9.15}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":5.8,"y":-22.14,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"y":-15.36,"curve":0.25,"c3":0.75},{"time":0.9333,"y":16.45,"curve":0.25,"c3":0.75},{"time":1.8667,"y":-15.36}]},"r finger a2":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"body":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-45.72,"y":-64.16,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r finger c2":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r ear s2":{"rotate":[{"angle":-7.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-18.83,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.85,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-7.49}]},"lock":{"scale":[{"x":0,"y":0}]},"tail":{"rotate":[{"angle":-8.41,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-28.6,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.41}]},"shadow":{"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.97,"y":0.895,"curve":0.25,"c3":0.75},{"time":1.8667}]},"lock2":{"scale":[{"x":0,"y":0}]},"tail4":{"rotate":[{"angle":-8.22,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.6333,"angle":-11.95,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-8.22}]},"s":{"scale":[{"x":0,"y":0}]},"skill":{"scale":[{"x":0,"y":0}]},"r ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":10.23,"y":32.42,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l ik2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-14.9,"y":-20.45,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r finger d2":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"body2":{"rotate":[{"angle":-2.21,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":-11.96,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.21}],"translate":[{"x":-7.85,"y":2.92,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-40.32,"y":-0.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-7.85,"y":2.92}]},"l upparm":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-13.07,"curve":0.25,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":-32.01,"y":36.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.9,"y":0.9,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l upparm2":{"rotate":[{"angle":-6.45}]},"l bear":{"rotate":[{"angle":-11.82,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":15.47,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.82}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-22.67,"y":24.31,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.819,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l finger a":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"head":{"rotate":[{"angle":-4.31,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-8.63,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.31}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":12.82,"y":6.27,"curve":0.25,"c3":0.75},{"time":1.8667}]},"hair t":{"rotate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"angle":5.91,"curve":0.25,"c3":0.75},{"time":1.8667}]},"headbeard b3":{"rotate":[{"angle":8.76,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-18.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":8.76}]},"l finger a2":{"rotate":[{"angle":5.32,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":17.71,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.32}],"translate":[{"x":-3.75,"y":9.81,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-7.5,"y":19.61,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-3.75,"y":9.81}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l finger b":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger c":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger c2":{"rotate":[{"angle":16.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.16,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.54}],"translate":[{"x":-2.62,"y":10.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-5.23,"y":20.34,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-2.62,"y":10.17}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"l finger d":{"rotate":[{"angle":-2.5,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":17.71,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-2.5}]},"l finger d2":{"rotate":[{"angle":26.01,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":59.08,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.01}],"translate":[{"x":-1.16,"y":10.43,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.33,"y":20.87,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.16,"y":10.43}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"r upparm":{"rotate":[{"angle":-6.74,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":2.84,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-6.94}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":36.1,"y":-45.18,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r arm":{"rotate":[{"angle":-7.98,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-8.2}]},"r finger a":{"rotate":[{"angle":14.41,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":35.15,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-6.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":14.41}]},"r finger b":{"rotate":[{"angle":-8.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.53,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-0.32,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-8.92}]},"r finger c":{"rotate":[{"angle":-9.49,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-13.23,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-5.74,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.49}]},"r finger d":{"rotate":[{"angle":7.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":4.29,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.94,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.12}]},"r ear":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-3.09,"y":-14.86,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.842,"curve":0.25,"c3":0.75},{"time":1.8667}],"shear":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":14.28,"curve":0.25,"c3":0.75},{"time":1.8667}]},"r ear2":{"rotate":[{"angle":-2.28,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-16.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":12.07,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-2.28}]},"l ear":{"rotate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"angle":18.73,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}],"translate":[{"curve":0.25,"c3":0.625,"c4":0.5},{"time":0.9333,"x":3.59,"y":24.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667}]},"l ear2":{"rotate":[{"angle":3.27,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-17.76,"curve":0.25,"c3":0.75},{"time":1.4,"angle":24.3,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.27}]},"hair t2":{"rotate":[{"angle":0.61,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":3.31,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":0.61}]},"hair t3":{"rotate":[{"angle":3.7,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-2.51,"curve":0.25,"c3":0.75},{"time":1.4,"angle":9.92,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.7}]},"hair t4":{"rotate":[{"angle":5.88,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-11.93,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":9.92,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":5.88}]},"hair t5":{"rotate":[{"angle":63.33,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":63.33}]},"hair t6":{"rotate":[{"angle":6.2,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":33.6,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":6.2}],"translate":[{"x":-0.31,"y":4.06,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"curve":0.25,"c3":0.75},{"time":1.1667,"x":-1.69,"y":22.01,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"x":-0.31,"y":4.06}]},"hair t7":{"rotate":[{"angle":26.63,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":53.25,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":26.63}]},"hair t8":{"rotate":[{"angle":23.39,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":46.78,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":23.39}],"translate":[{"x":1.49,"y":10.12,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":2.98,"y":20.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":1.49,"y":10.12}]},"hair t9":{"rotate":[{"angle":59.01,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":59.01}],"translate":[{"x":-2.26,"y":14.51,"curve":0.25,"c3":0.75},{"time":0.9333,"curve":0.25,"c3":0.75},{"time":1.8667,"x":-2.26,"y":14.51}]},"hair t10":{"rotate":[{"angle":2.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-32.32,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":10.5,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":2.6}]},"hair t11":{"rotate":[{"angle":9.54,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"angle":19.09,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":9.54}]},"head2":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":4.6,"y":-21.12,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":0.7,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l armour":{"rotate":[{"angle":1.84}]},"headbeard b":{"rotate":[{"angle":3.67,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-1.42,"curve":0.25,"c3":0.75},{"time":1.4,"angle":8.76,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":3.67}]},"headbeard b2":{"rotate":[{"angle":6.67,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-2.54,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":8.76,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":6.67}],"translate":[{"curve":0.25,"c3":0.75},{"time":1.8667}]},"r ear ring b":{"rotate":[{"angle":8.97,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-10.98,"curve":0.25,"c3":0.75},{"time":1.4,"angle":28.93,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":8.97}]},"r ear ringb s":{"rotate":[{"angle":15.92,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-5.28,"curve":0.25,"c3":0.75},{"time":1.4,"angle":37.11,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":15.92}],"translate":[{"x":5.7,"y":-8.17,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":7.3,"y":-11.94,"curve":0.25,"c3":0.75},{"time":1.4,"x":1.09,"y":-11.1,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":5.7,"y":-8.17}]},"r ear ringa":{"rotate":[{"curve":0.276,"c3":0.621,"c4":0.4},{"time":0.4667,"angle":-29.16,"curve":0.314,"c2":0.27,"c3":0.686,"c4":0.73},{"time":1.4,"angle":16.48,"curve":0.379,"c2":0.6,"c3":0.724},{"time":1.8667}]},"r beard2":{"rotate":[{"angle":-0.61,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.61}]},"r beard3":{"rotate":[{"angle":-10,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.77,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-10}]},"l bear2":{"rotate":[{"angle":1.82,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.4,"angle":15.47,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":1.82}]},"l beard3":{"rotate":[{"angle":15.47,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":-11.82,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":15.47}]},"headbeard f":{"rotate":[{"angle":3.01,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":0.55,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":3.01}]},"headbeard f2":{"rotate":[{"angle":-4.66,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-12.65,"curve":0.25,"c3":0.75},{"time":1.4,"angle":3.33,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-4.66}]},"headbeard f3":{"rotate":[{"angle":-0.6,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":-17.95,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":3.33,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":-0.6}]},"headbeard f4":{"rotate":[{"angle":36.02,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":22.46,"curve":0.25,"c3":0.75},{"time":1.4,"angle":49.58,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":36.02}]},"headbeard f5":{"rotate":[{"angle":40.99,"curve":0.333,"c2":0.33,"c3":0.758},{"time":0.7,"angle":3.01,"curve":0.25,"c3":0.75},{"time":1.6333,"angle":49.58,"curve":0.276,"c3":0.621,"c4":0.4},{"time":1.8667,"angle":40.99}]},"l leg":{"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":-2.29,"y":50.63,"curve":0.25,"c3":0.75},{"time":1.8667}]},"l finger b2":{"rotate":[{"angle":16.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-7.07,"curve":0.25,"c3":0.75},{"time":1.4,"angle":40.64,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":16.78}],"translate":[{"x":-1.29,"y":10.42,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":-2.59,"y":20.84,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-1.29,"y":10.42}],"scale":[{"x":0.925,"y":0.925,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"x":0.85,"y":0.85,"curve":0.25,"c3":0.75},{"time":1.4,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.925,"y":0.925}]},"skirt f2":{"rotate":[{"angle":-0.1,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":10.63,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-10.83,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-0.1}]},"skirt f3":{"rotate":[{"angle":-16.58,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":27.49,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-16.58}]},"r leg5":{"rotate":[{"angle":7.98,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":27.96,"curve":0.25,"c3":0.75},{"time":1.4,"angle":-12.01,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":7.98}]},"l leg5":{"rotate":[{"angle":-9.62,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-30.54,"curve":0.25,"c3":0.75},{"time":1.4,"angle":11.31,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-9.62}]},"tail2":{"rotate":[{"angle":4.52,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.1667,"angle":-11.95,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":4.52}]},"tail6":{"rotate":[{"angle":-8.22,"curve":0.379,"c2":0.6,"c3":0.724},{"time":0.2333,"angle":-11.95,"curve":0.25,"c3":0.75},{"time":1.1667,"angle":8.24,"curve":0.242,"c3":0.667,"c4":0.67},{"time":1.8667,"angle":-8.22}]},"tail3":{"rotate":[{"angle":-1.85,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":8.24,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":-11.95,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":-1.85}]},"tail5":{"rotate":[{"angle":-11.95,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":8.24,"curve":0.25,"c3":0.75},{"time":1.8667,"angle":-11.95}]},"lhand":{"rotate":[{"angle":-6.06,"curve":0.25,"c3":0.75},{"time":0.9333,"angle":16.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.4,"angle":5.34,"curve":0.375,"c2":0.5,"c3":0.75},{"time":1.8667,"angle":-6.06}],"translate":[{"x":-49.01,"y":-5.46,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":-98.01,"y":-10.91,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":-49.01,"y":-5.46}],"scale":[{"x":0.95,"y":0.95,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"curve":0.25,"c3":0.75},{"time":1.4,"x":0.9,"y":0.9,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"x":0.95,"y":0.95}]},"rhand":{"rotate":[{"angle":5.78,"curve":0.375,"c2":0.5,"c3":0.75},{"time":0.4667,"angle":-3.18,"curve":0.25,"c3":0.75},{"time":1.4,"angle":14.73,"curve":0.25,"c3":0.625,"c4":0.5},{"time":1.8667,"angle":5.78}],"translate":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":59.09,"y":-135.37,"curve":0.25,"c3":0.75},{"time":1.8667}],"scale":[{"curve":0.25,"c3":0.75},{"time":0.9333,"x":1.1,"y":1.1,"curve":0.25,"c3":0.75},{"time":1.8667}]}},"deform":{"default":{"body":{"body":[{"curve":0.25,"c3":0.75},{"time":0.9333,"offset":36,"vertices":[-2.41049,14.08145,-10.63983,9.53357,11.41489,0.51631,8.62204,7.49872,20.82419,30.77104,-2.80862,37.0488,53.80902,21.06067,29.06711,49.94165,43.71988,54.54894,0.35004,69.90634,-0.88062,19.47218,-12.7916,14.70761,5.71973,30.41342,-14.42053,27.38129,2.25964,28.48312,-15.93155,23.71869,-5.14142,35.24371,-25.93134,24.41534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-21.39771,-31.9695,3.10556,-38.34393,-32.63104,-64.54259,-2.67554,-49.07106,28.40125,-40.10614,15.19,-39.32011,36.33786,-21.36356,-0.30249,-29.38377,18.0249,-23.20792,0.36182,-7.9995,5.25519,-6.04211,8.23709,-14.43842,-6.16132,-80.23037,45.0358,-66.68332,-11.18542,-41.29755,16.90335,-39.30496,-2.67551,-49.07107,0,0,-4.45917,-81.78522,47.33566,-66.84366,-8.74689,-59.13564,29.90024,-51.76413,-2.25064,10.54112,-8.31439,6.85941,14.49524,-24.1174,30.06024,-49.46475,0,0,0,0,0,0,-4.30402,-49.14474,27.1712,-41.17593,-2.44653,-18.05902,9.30701,-15.6683,2.06238,-45.59348,29.95184,-34.43707,0,0,0,0,-20.05573,10.5144,-22.24652,-4.22729,0,0,0,0,0,0,0,0,3.87411,11.61391,-4.18277,11.50629],"curve":0.25,"c3":0.75},{"time":1.8667}]},"skirt f":{"skirt f":[{"curve":0.25,"c3":0.75},{"time":0.9333,"vertices":[-1.8898,-25.58164,0.47333,-28.95829,-1.18393,-41.18966,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.78281,5.60857,0,0,0,0,11.63187,18.17604,12.89143,17.3054,0,0,0,0,0,0,0,0,0,0,0,0,-0.37607,-29.25813,5.20969,-17.44646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.98029,-21.54911],"curve":0.25,"c3":0.75},{"time":1.8667}]}}}},"za":{"bones":{"r finger d":{"rotate":[{"angle":4.88},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-44.03},{"time":0.4,"angle":-86.33,"curve":"stepped"},{"time":0.7,"angle":-86.33},{"time":0.8,"angle":4.88}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]},"r finger c":{"rotate":[{"angle":-20.25},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-69.15},{"time":0.4,"angle":-111.46,"curve":"stepped"},{"time":0.7,"angle":-111.46},{"time":0.8,"angle":-20.25}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]},"r ik":{"rotate":[{"angle":102.66},{"time":0.1,"angle":27.72},{"time":0.2,"angle":-23.72},{"time":0.3,"angle":-35},{"time":0.4,"angle":-34.26},{"time":0.5},{"time":0.6,"angle":71.42},{"time":0.7,"angle":72.92},{"time":0.8,"angle":102.66}],"translate":[{"x":275.23,"y":-9.7},{"time":0.1,"x":9.93,"y":99.3},{"time":0.2,"x":-62.42,"y":126.65},{"time":0.3,"x":101.76,"y":271.14},{"time":0.4,"x":262.35,"y":318.34},{"time":0.5,"x":364.24,"y":281.87},{"time":0.6,"x":380.54,"y":150.47},{"time":0.7,"x":448.94,"y":120.68},{"time":0.8,"x":275.23,"y":-9.7}],"scale":[{"y":-1}]},"body":{"rotate":[{"angle":-46.01},{"time":0.1,"angle":-57.16},{"time":0.2,"angle":-81.65},{"time":0.3,"angle":-101.77},{"time":0.4,"angle":-119.71},{"time":0.5,"angle":-130.33},{"time":0.6,"angle":-117.59},{"time":0.7,"angle":-79.13},{"time":0.8,"angle":-46.01}],"translate":[{"y":-102.64,"curve":0.25,"c3":0.75},{"time":0.4,"y":43.22,"curve":0.25,"c3":0.75},{"time":0.8,"y":-102.64}]},"rhand":{"rotate":[{"angle":-61.96},{"time":0.1,"angle":-73.08},{"time":0.2,"angle":-53.34},{"time":0.3,"angle":-7.68},{"time":0.4,"angle":-6.95},{"time":0.5,"angle":-9.55},{"time":0.6,"angle":-40.31},{"time":0.7,"angle":-69.63},{"time":0.8,"angle":-61.96}],"translate":[{"x":262.77,"y":-233.79},{"time":0.1,"x":680.4,"y":-287.15},{"time":0.2,"x":957.51,"y":-271.75},{"time":0.3,"x":1234.48,"y":-302.33},{"time":0.4,"x":1221.78,"y":-462.7},{"time":0.5,"x":1093.17,"y":-495.57},{"time":0.6,"x":634.16,"y":-422.65},{"time":0.7,"x":326.51,"y":-326.65},{"time":0.8,"x":262.77,"y":-233.79}],"scale":[{"x":0.445,"y":-0.647}]},"r leg":{"scale":[{"x":0.787,"y":-1}]},"r finger b":{"rotate":[{"angle":-29.74},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-78.64},{"time":0.4,"angle":-120.95,"curve":"stepped"},{"time":0.7,"angle":-120.95},{"time":0.8,"angle":-29.74}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]},"r ik2":{"translate":[{"x":128.11,"y":-106.46},{"time":0.1,"x":78.5,"y":-78.71},{"time":0.2,"x":-2.33,"y":39.33},{"time":0.3,"x":87.53,"y":45.77},{"time":0.4,"x":81.77,"y":1.21},{"time":0.5,"x":108.09,"y":16.09},{"time":0.6,"x":105.52,"y":-61.86},{"time":0.7,"x":117.78,"y":-18.96},{"time":0.8,"x":128.11,"y":-106.46}]},"r finger a":{"rotate":[{"angle":41.48}],"scale":[{"x":0.674}]},"r upparm2":{"translate":[{},{"time":0.1,"x":-19.41,"y":-38.23},{"time":0.2,"x":70.15,"y":4.15},{"time":0.3,"x":65.08,"y":-39.08},{"time":0.4,"x":15.42,"y":-18.44},{"time":0.5,"x":52.86,"y":31.48},{"time":0.6,"x":19.38,"y":-89.99},{"time":0.7,"x":53.32,"y":-22.94},{"time":0.8}],"scale":[{"x":0.874,"y":0.874}]},"r upparm3":{"rotate":[{"angle":-42.68},{"time":0.2,"angle":-132.51},{"time":0.8,"angle":-42.68}]},"body2":{"rotate":[{"angle":-22.79},{"time":0.1,"angle":-10.08},{"time":0.2,"angle":16.6},{"time":0.3,"angle":38.66},{"time":0.4,"angle":52.44},{"time":0.5,"angle":59.18},{"time":0.6,"angle":41.89},{"time":0.7,"angle":-15.52},{"time":0.8,"angle":-22.79}],"translate":[{"x":-80.64,"y":48.56},{"time":0.1,"x":-29.6,"y":11.44},{"time":0.2,"x":24.21,"y":6.83},{"time":0.3,"x":87.48,"y":24.44},{"time":0.4,"x":76.26,"y":17.25},{"time":0.5,"x":-2.05,"y":-11.35},{"time":0.6,"x":-89.25,"y":-3.33},{"time":0.7,"x":-119.7,"y":79.08},{"time":0.8,"x":-80.64,"y":48.56}]},"head":{"rotate":[{"angle":54.91},{"time":0.1,"angle":57.8},{"time":0.2,"angle":61.64},{"time":0.3,"angle":73.6},{"time":0.4,"angle":89.11},{"time":0.5,"angle":87.54},{"time":0.6,"angle":81.54},{"time":0.7,"angle":92.91},{"time":0.8,"angle":54.91}],"translate":[{"x":20.04,"y":114.02}]},"r upparm":{"rotate":[{"angle":56.42},{"time":0.4,"angle":101.77},{"time":0.8,"angle":56.42}]},"l ik":{"rotate":[{"angle":-2.64},{"time":0.1,"angle":3.05},{"time":0.2,"angle":-46.63},{"time":0.3,"angle":-134.68},{"time":0.4,"angle":-137.5},{"time":0.5,"angle":-127.9},{"time":0.6,"angle":-79.41},{"time":0.7,"angle":-68.78},{"time":0.8,"angle":-2.64}],"translate":[{"x":-145.7,"y":70.09},{"time":0.1,"x":-250.39,"y":-2.76},{"time":0.2,"x":-480.05,"y":85.85},{"time":0.3,"x":-641.99,"y":290.99},{"time":0.4,"x":-630.55,"y":360.98},{"time":0.5,"x":-560.06,"y":415.93},{"time":0.6,"x":-341.98,"y":228.69},{"time":0.7,"x":-251.83,"y":181.63},{"time":0.8,"x":-145.7,"y":70.09}]},"lhand":{"rotate":[{"angle":-13.41},{"time":0.1,"angle":-84.39},{"time":0.2,"angle":-88.18},{"time":0.3,"angle":-51.49},{"time":0.4,"angle":63.47},{"time":0.5,"angle":23.26},{"time":0.6,"angle":22.08},{"time":0.7,"angle":7.83},{"time":0.8,"angle":-13.41}],"translate":[{"x":-193.67,"y":14.63},{"time":0.1,"x":-191.58,"y":197.82},{"time":0.2,"x":-10,"y":106.23},{"time":0.3,"x":239.36,"y":12.55},{"time":0.4,"x":566.66,"y":-50.17},{"time":0.5,"x":517.71,"y":-176.13},{"time":0.6,"x":249.12,"y":-178.34},{"time":0.7,"x":0.66,"y":-103.29},{"time":0.8,"x":-193.67,"y":14.63}]},"l upparm":{"rotate":[{"angle":121.1},{"time":0.1,"angle":113.65},{"time":0.2,"angle":153.35},{"time":0.3,"angle":138.84},{"time":0.4,"angle":121.54},{"time":0.5,"angle":114.98},{"time":0.6,"angle":121.16},{"time":0.7,"angle":148.41},{"time":0.8,"angle":121.1}],"translate":[{"x":-7.3,"y":263.84}]},"l finger c":{"rotate":[{"angle":67.75},{"time":0.2,"angle":46.4},{"time":0.4,"angle":29.53},{"time":0.5,"angle":73.3,"curve":"stepped"},{"time":0.7,"angle":73.3},{"time":0.8,"angle":67.75}]},"l finger b":{"rotate":[{"angle":12.29},{"time":0.2,"angle":-9.05},{"time":0.4,"angle":-25.92},{"time":0.5,"angle":17.85,"curve":"stepped"},{"time":0.7,"angle":17.85},{"time":0.8,"angle":12.29}]},"l finger a":{"rotate":[{"angle":-21},{"time":0.2,"angle":-42.35},{"time":0.4,"angle":-59.21},{"time":0.5,"angle":-15.44,"curve":"stepped"},{"time":0.7,"angle":-15.44},{"time":0.8,"angle":-21}]},"l finger d":{"rotate":[{"angle":104.78},{"time":0.2,"angle":83.43},{"time":0.4,"angle":66.56},{"time":0.5,"angle":110.34,"curve":"stepped"},{"time":0.7,"angle":110.34},{"time":0.8,"angle":104.78}]},"l finger b2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger c2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger d2":{"rotate":[{"angle":40.88},{"time":0.2,"angle":19.53},{"time":0.4,"angle":31.61},{"time":0.5,"angle":77.44},{"time":0.7,"angle":65.91},{"time":0.8,"angle":40.88}]},"l finger a2":{"rotate":[{"angle":19.49},{"time":0.2,"angle":-1.85},{"time":0.4,"angle":10.22},{"time":0.5,"angle":56.06},{"time":0.7,"angle":44.53},{"time":0.8,"angle":19.49}]},"l ik2":{"translate":[{"x":91.54,"y":85.04},{"time":0.1,"x":57.37,"y":79.54},{"time":0.2,"x":46.58,"y":84.16},{"time":0.3,"x":43.88,"y":-108.48},{"time":0.4,"x":50.02,"y":-49.47},{"time":0.5,"x":61.7,"y":4.19},{"time":0.6,"x":69.69,"y":-9.68},{"time":0.7,"x":87.16,"y":32.39},{"time":0.8,"x":91.54,"y":85.04}]},"root":{"translate":[{"x":-273.37}]},"shadow":{"translate":[{"x":203.98},{"time":0.1,"x":178.18},{"time":0.5,"x":274.91},{"time":0.8,"x":203.98}],"scale":[{"y":1.122},{"time":0.1},{"time":0.5,"y":1.458},{"time":0.8,"y":1.122}]},"r finger a2":{"rotate":[{"angle":41.48}],"scale":[{"x":0.674}]},"r finger b2":{"rotate":[{"angle":-29.74},{"time":0.2,"angle":-25.95},{"time":0.3,"angle":-78.64},{"time":0.4,"angle":-120.95,"curve":"stepped"},{"time":0.7,"angle":-120.95},{"time":0.8,"angle":-29.74}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]},"r finger c2":{"rotate":[{"angle":-20.25},{"time":0.2,"angle":-16.45},{"time":0.3,"angle":-69.15},{"time":0.4,"angle":-111.46,"curve":"stepped"},{"time":0.7,"angle":-111.46},{"time":0.8,"angle":-20.25}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]},"r finger d2":{"rotate":[{"angle":4.88},{"time":0.2,"angle":8.67},{"time":0.3,"angle":-44.03},{"time":0.4,"angle":-86.33,"curve":"stepped"},{"time":0.7,"angle":-86.33},{"time":0.8,"angle":4.88}],"translate":[{"x":44.52,"y":60.51}],"scale":[{"x":0.674}]}},"ik":{"r ik2":[{"softness":50,"bendPositive":false}]},"deform":{"default":{"body":{"body":[{"vertices":[52.44019,-63.66705,-12.18713,-46.30569,27.38737,-39.27646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3.42802,-49.83972,0,0,0,0,0,0,0,0,22.63917,13.60535,4.29755,26.06119,63.53899,47.21695,5.17964,78.9928,77.58504,71.58575,-4.28914,105.4783,69.26449,111.30002,-38.82953,125.12112,31.50249,92.7558,-50.26611,84.08142,35.35371,104.09641,-56.41144,94.36063,34.89735,102.75305,-55.68358,93.14301,34.36752,101.1922,-54.83769,91.72815,23.21427,68.35455,-37.04214,61.96158,0,0,-13.2159,15.58701,4.62152,-5.94421,22.45866,-27.47598,37.44933,-45.57159,2.74778,8.0929,-4.38556,7.33716,-35.01967,-147.40784,22.17225,-62.4007,61.9044,-23.52316,45.67571,20.22668,16.69455,47.73007,-10.88503,-97.19366,67.00238,-71.24432,15.52511,45.71341,-24.77264,41.43884,26.14412,-7.80164,-6.01879,-33.35602,21.51585,-26.18973,-14.17799,-23.50479,8.72586,-26.02496,-35.58823,-107.3894,6.52748,-10.91699,-23.80665,-226.44205,157.10765,-164.802,-29.94382,-93.37616,51.7493,-83.29276,23.84945,70.22464,-38.05568,63.65701,42.23387,-11.85059,67.71373,-75.7012,55.39209,-51.82449,11.60326,-10.13455,15.2382,2.27859,5.61839,3.51666,0.96066,6.56055,-7.02176,-23.28021,13.18948,-20.42807,-33.7172,-151.39035,93.50644,-123.74283,16.09814,47.40128,-25.68732,42.96857,0,0,0,0,-3.7588,-102.26871,75.48494,-69.10156,-8.63871,-28.04095,15.76945,-24.74347,8.55842,18.07172,-8.22548,18.22626]}]},"r arm":{"r arm":[{"vertices":[15.44727,30.00027,-3.32779,52.10394,-10.84784,58.07742,-26.68137,38.92474,-24.89618,27.06427,-19.45175,-9.10559,-13.2243,-25.12997,-6.32959,-42.8717,13.54465,-58.65851,19.02359,-63.01065,23.88965,-26.04678,4.07788,-38.5043]}]},"r armour u":{"r armour u":[{"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]},{"time":0.4,"offset":4,"vertices":[163.9654,-45.00104,177.28926,99.94327,181.48798,-69.53613,202.98242,108.74658,140.53593,-68.87366,203.46579,65.00528,76.7599,-81.34448,151.37636,9.09085]},{"time":0.8,"offset":4,"vertices":[151.61502,-80.10638,157.12215,68.66666,179.63031,-103.90335,193.19212,75.75,119.94261,-122.9281,170.87941,17.21213,64.40953,-116.44983,131.20924,-22.18576]}]}}},"drawOrder":[{"offsets":[{"slot":"body","offset":1}]}]}}}
\ No newline at end of file
diff --git a/tests/cpp-tests/Resources/spine/fenrir.png b/tests/cpp-tests/Resources/spine/fenrir.png
new file mode 100644
index 000000000000..64d6bc3d6eea
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/fenrir.png differ
diff --git a/tests/cpp-tests/Resources/spine/fenrir.skel b/tests/cpp-tests/Resources/spine/fenrir.skel
new file mode 100644
index 000000000000..24acd09165f9
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/fenrir.skel differ
diff --git a/tests/cpp-tests/Resources/spine/spinetestkl.rar b/tests/cpp-tests/Resources/spine/spinetestkl.rar
new file mode 100644
index 000000000000..ac1de9f05a9a
Binary files /dev/null and b/tests/cpp-tests/Resources/spine/spinetestkl.rar differ
diff --git a/tests/cpp-tests/proj.android/app/jni/main.cpp b/tests/cpp-tests/proj.android/app/jni/main.cpp
index 6cab47cbb306..ccd4757e4c78 100644
--- a/tests/cpp-tests/proj.android/app/jni/main.cpp
+++ b/tests/cpp-tests/proj.android/app/jni/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,14 +29,16 @@
 
 #include "AppDelegate.h"
 
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#define LOG_TAG "main"
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-namespace {
+namespace
+{
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env) {
+void cocos_android_app_init(JNIEnv* env)
+{
     LOGD("cocos_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-tests/proj.ios/Classes/RootViewController.h b/tests/cpp-tests/proj.ios/Classes/RootViewController.h
index b291b78a03d3..e172880c2199 100644
--- a/tests/cpp-tests/proj.ios/Classes/RootViewController.h
+++ b/tests/cpp-tests/proj.ios/Classes/RootViewController.h
@@ -26,9 +26,7 @@
 
 #import <UIKit/UIKit.h>
 
-
 @interface RootViewController : UIViewController {
-
 }
 - (BOOL)prefersStatusBarHidden;
 @end
diff --git a/tests/cpp-tests/proj.ios/Classes/RootViewController.mm b/tests/cpp-tests/proj.ios/Classes/RootViewController.mm
index 3f484988f3a8..28d2cca40a6d 100644
--- a/tests/cpp-tests/proj.ios/Classes/RootViewController.mm
+++ b/tests/cpp-tests/proj.ios/Classes/RootViewController.mm
@@ -26,11 +26,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "RootViewController.h"
 
-
 @implementation RootViewController
 
 /*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+ // The designated initializer.  Override if you create the controller programmatically and want to perform
+customization that is not appropriate for viewDidLoad.
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
         // Custom initialization
@@ -50,53 +50,58 @@ - (void)loadView {
 - (void)viewDidLoad {
     [super viewDidLoad];
 }
- 
+
 */
 // Override to allow orientations other than the default portrait orientation.
 // This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
 }
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
+- (NSUInteger)supportedInterfaceOrientations
+{
 #ifdef __IPHONE_6_0
     return UIInterfaceOrientationMaskAllButUpsideDown;
 #endif
 }
 
-- (BOOL) shouldAutorotate {
+- (BOOL)shouldAutorotate
+{
     return YES;
 }
 
-//fix not hide status on ios7
+// fix not hide status on ios7
 - (BOOL)prefersStatusBarHidden
 {
     return YES;
 }
 
 // Controls the application's preferred home indicator auto-hiding when this view controller is shown.
-- (BOOL)prefersHomeIndicatorAutoHidden {
+- (BOOL)prefersHomeIndicatorAutoHidden
+{
     return YES;
 }
 
-- (void)didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning
+{
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
-    
+
     // Release any cached data, images, etc that aren't in use.
 }
 
-- (void)viewDidUnload {
+- (void)viewDidUnload
+{
     [super viewDidUnload];
     // Release any retained subviews of the main view.
     // e.g. self.myOutlet = nil;
 }
 
-
-- (void)dealloc {
+- (void)dealloc
+{
     [super dealloc];
 }
 
-
 @end
diff --git a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.h b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.h
index da488ccd7290..c679dbf8ea38 100644
--- a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.h
+++ b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.h
@@ -29,9 +29,8 @@
 @class RootViewController;
 
 @interface AppController : NSObject <UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
+    UIWindow* window;
+    RootViewController* viewController;
 }
 
 @end
-
diff --git a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm
index 061027154bcf..1eefe497729c 100644
--- a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm
+++ b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm
@@ -39,26 +39,26 @@ @implementation AppController
 // cocos2d application instance
 static AppDelegate s_sharedApplication;
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
 {
 
-    cocos2d::Application *app = cocos2d::Application::getInstance();
+    cocos2d::Application* app = cocos2d::Application::getInstance();
     app->initGLContextAttrs();
     cocos2d::GLViewImpl::convertAttrs();
 
     // Override point for customization after application launch.
 
     // Add the view controller's view to the window and display.
-    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
+    window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
     // Init the CCEAGLView
-    CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds]
-                                         pixelFormat: (NSString*)cocos2d::GLViewImpl::_pixelFormat
-                                         depthFormat: cocos2d::GLViewImpl::_depthFormat
-                                  preserveBackbuffer: NO
-                                          sharegroup: nil
-                                       multiSampling: cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
-                                     numberOfSamples: cocos2d::GLViewImpl::_multisamplingCount ];
+    CCEAGLView* eaglView = [CCEAGLView viewWithFrame:[window bounds]
+                                         pixelFormat:(NSString*)cocos2d::GLViewImpl::_pixelFormat
+                                         depthFormat:cocos2d::GLViewImpl::_depthFormat
+                                  preserveBackbuffer:NO
+                                          sharegroup:nil
+                                       multiSampling:cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
+                                     numberOfSamples:cocos2d::GLViewImpl::_multisamplingCount];
 
 #if !defined(CC_TARGET_OS_TVOS)
     [eaglView setMultipleTouchEnabled:YES];
@@ -72,25 +72,25 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     viewController.view = eaglView;
 
     // Set RootViewController to window
-    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
+    if ([[UIDevice currentDevice].systemVersion floatValue] < 6.0)
     {
         // warning: addSubView doesn't work on iOS6
-        [window addSubview: viewController.view];
+        [window addSubview:viewController.view];
     }
     else
     {
         // use this method on ios6
         [window setRootViewController:viewController];
     }
-    
+
     [window makeKeyAndVisible];
 
 #if !defined(CC_TARGET_OS_TVOS)
     [viewController prefersStatusBarHidden];
 #endif
-    
+
     // IMPORTANT: Setting the GLView should be done after creating the RootViewController
-    cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView);
+    cocos2d::GLView* glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView);
     cocos2d::Director::getInstance()->setOpenGLView(glview);
 
     app->run();
@@ -98,61 +98,70 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
-
-- (void)applicationWillResignActive:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication*)application
+{
     /*
-     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+     Sent when the application is about to move from active to inactive state. This can occur for certain types of
+     temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and
+     it begins the transition to the background state. Use this method to pause ongoing tasks, disable timers, and
+     throttle down OpenGL ES frame rates. Games should use this method to pause the game.
      */
-    //We don't need to call this method any more. It will interrupt user defined game pause&resume logic
-//    cocos2d::Director::getInstance()->pause();
+    // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
+    //    cocos2d::Director::getInstance()->pause();
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application {
+- (void)applicationDidBecomeActive:(UIApplication*)application
+{
     /*
-     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was
+     previously in the background, optionally refresh the user interface.
      */
-    //We don't need to call this method any more. It will interrupt user defined game pause&resume logic
-//    cocos2d::Director::getInstance()->resume();
+    // We don't need to call this method any more. It will interrupt user defined game pause&resume logic
+    //    cocos2d::Director::getInstance()->resume();
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationDidEnterBackground:(UIApplication*)application
+{
     /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state
+     information to restore your application to its current state in case it is terminated later. If your application
+     supports background execution, called instead of applicationWillTerminate: when the user quits.
      */
     cocos2d::Application::getInstance()->applicationDidEnterBackground();
 }
 
-- (void)applicationWillEnterForeground:(UIApplication *)application {
+- (void)applicationWillEnterForeground:(UIApplication*)application
+{
     /*
-     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made
+     on entering the background.
      */
     cocos2d::Application::getInstance()->applicationWillEnterForeground();
 }
 
-- (void)applicationWillTerminate:(UIApplication *)application {
+- (void)applicationWillTerminate:(UIApplication*)application
+{
     /*
      Called when the application is about to terminate.
      See also applicationDidEnterBackground:.
      */
 }
 
-
 #pragma mark -
 #pragma mark Memory management
 
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+- (void)applicationDidReceiveMemoryWarning:(UIApplication*)application
+{
     /*
-     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk)
+     later.
      */
 }
 
-
-- (void)dealloc {
+- (void)dealloc
+{
     [window release];
     [super dealloc];
 }
 
-
 @end
diff --git a/tests/cpp-tests/proj.linux/main.cpp b/tests/cpp-tests/proj.linux/main.cpp
index 042c94fef689..c03ce74184e9 100644
--- a/tests/cpp-tests/proj.linux/main.cpp
+++ b/tests/cpp-tests/proj.linux/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     // create the application instance
     AppDelegate app;
diff --git a/tests/cpp-tests/proj.mac/main.cpp b/tests/cpp-tests/proj.mac/main.cpp
index 832be47ee5fb..1fdbdb2b12af 100644
--- a/tests/cpp-tests/proj.mac/main.cpp
+++ b/tests/cpp-tests/proj.mac/main.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2010 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,7 +26,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     AppDelegate app;
     return Application::getInstance()->run();
diff --git a/tests/cpp-tests/proj.win32/main.cpp b/tests/cpp-tests/proj.win32/main.cpp
index 208289a61953..887d55ca1ff7 100644
--- a/tests/cpp-tests/proj.win32/main.cpp
+++ b/tests/cpp-tests/proj.win32/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,10 +27,7 @@
 
 USING_NS_CC;
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-					   HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
diff --git a/tests/cpp-tests/proj.win32/main.h b/tests/cpp-tests/proj.win32/main.h
index 13b6f36fd230..64d684e652a4 100644
--- a/tests/cpp-tests/proj.win32/main.h
+++ b/tests/cpp-tests/proj.win32/main.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,7 +25,7 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
 
 // Windows Header Files:
 #include <windows.h>
@@ -34,4 +34,4 @@
 // C RunTime Header Files
 #include "platform/CCStdC.h"
 
-#endif    // __MAIN_H__
+#endif  // __MAIN_H__
diff --git a/tests/fairygui-tests/CMakeLists.txt b/tests/fairygui-tests/CMakeLists.txt
index 79860ee1c8f9..45cd00b9218a 100644
--- a/tests/fairygui-tests/CMakeLists.txt
+++ b/tests/fairygui-tests/CMakeLists.txt
@@ -114,16 +114,14 @@ set(all_code_files
 # mark app complie info
 if(NOT ANDROID)
     add_executable(${APP_NAME} ${all_code_files})
+    target_link_libraries(${APP_NAME} ${ADXE_CORE_LIB})
 else()
     add_library(${APP_NAME} SHARED ${all_code_files})
-    add_subdirectory(${ADXE_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
-    target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
-
+    # whole archive ${ADXE_LUA_LIB} to make sure JNI_Onload can be invoke from java
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive ${ADXE_CORE_LIB} -Wl,--no-whole-archive)
     config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
 endif()
 
-target_link_libraries(${APP_NAME} ${ADXE_CORE_LIB})
-
 target_include_directories(${APP_NAME} PRIVATE Classes)
 
 setup_cocos_app_config(${APP_NAME})
diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt
index d99dc3cf9714..4a584a28532d 100644
--- a/tests/lua-tests/project/CMakeLists.txt
+++ b/tests/lua-tests/project/CMakeLists.txt
@@ -104,10 +104,9 @@ set(APP_SRC ${GAME_HEADER} ${GAME_SOURCE})
 
 if(NOT ANDROID)
     add_executable(${APP_NAME} ${APP_SRC})
+    target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
 else()
     add_library(${APP_NAME} SHARED ${APP_SRC})
-    add_subdirectory(${ADXE_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/cpp-android)
-    target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
     add_subdirectory(${ADXE_ROOT_PATH}/extensions/scripting/lua-bindings/proj.android ${ENGINE_BINARY_PATH}/cocos/lua-android)
     if(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86")
         #add `-Wl,--no-warn-shared-textrel` to fix warning "shared library text segment is not shareable clang"
@@ -116,9 +115,11 @@ else()
         target_link_libraries(${APP_NAME} -Wl,--whole-archive lua_android_spec -Wl,--no-whole-archive)
     endif()
 
+    # whole archive ${ADXE_LUA_LIB} to make sure JNI_Onload can be invoke from java
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive ${ADXE_CORE_LIB} -Wl,--no-whole-archive)
     config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
 endif()
-target_link_libraries(${APP_NAME} ${ADXE_LUA_LIB})
+
 target_include_directories(${APP_NAME} PRIVATE Classes)
 
 if(WIN64)
diff --git a/tests/lua-tests/project/Classes/AppDelegate.cpp b/tests/lua-tests/project/Classes/AppDelegate.cpp
index 5e294048da8e..b2239ed652e0 100644
--- a/tests/lua-tests/project/Classes/AppDelegate.cpp
+++ b/tests/lua-tests/project/Classes/AppDelegate.cpp
@@ -3,17 +3,17 @@
  Copyright (c) 2021 Bytedance Inc.
 
  https://adxe.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,13 +32,9 @@
 
 USING_NS_CC;
 
-AppDelegate::AppDelegate()
-{
-}
+AppDelegate::AppDelegate() {}
 
-AppDelegate::~AppDelegate()
-{
-}
+AppDelegate::~AppDelegate() {}
 
 void AppDelegate::initGLContextAttrs()
 {
@@ -53,16 +49,16 @@ bool AppDelegate::applicationDidFinishLaunching()
     LuaEngine* pEngine = LuaEngine::getInstance();
     ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
 
-    
     LuaStack* stack = pEngine->getLuaStack();
-    lua_State* L = stack->getLuaState();
-    
+    lua_State* L    = stack->getLuaState();
+
     lua_module_register(L);
 
     lua_getglobal(L, "_G");
-    if (lua_istable(L,-1))//stack:...,_G,
+    if (lua_istable(L, -1))  // stack:...,_G,
     {
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID ||CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || \
+     CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
         register_assetsmanager_test_sample(L);
 #endif
         register_test_binding(L);
diff --git a/tests/lua-tests/project/Classes/AppDelegate.h b/tests/lua-tests/project/Classes/AppDelegate.h
index fd8b0d1e48ba..0776bf01ae66 100644
--- a/tests/lua-tests/project/Classes/AppDelegate.h
+++ b/tests/lua-tests/project/Classes/AppDelegate.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 Private inheritance here hides part of interface from Director.
 */
-class  AppDelegate : private cocos2d::Application
+class AppDelegate : private cocos2d::Application
 {
 public:
     AppDelegate();
@@ -60,4 +60,3 @@ class  AppDelegate : private cocos2d::Application
 };
 
 #endif  // __APP_DELEGATE_H__
-
diff --git a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp
index 7f4bb8f7ad89..2c4f6d1c525b 100644
--- a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp
+++ b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,31 +36,30 @@ extern "C" {
 #include "extensions/cocos-ext.h"
 
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32)
-#include <dirent.h>
-#include <sys/stat.h>
+#    include <dirent.h>
+#    include <sys/stat.h>
 #endif
 
 USING_NS_CC;
 USING_NS_CC_EXT;
 
-
 static int lua_cocos2dx_createDownloadDir(lua_State* L)
 {
     if (nullptr == L)
         return 0;
-    
+
     int argc = lua_gettop(L);
 
     if (0 == argc)
     {
         std::string pathToSave = FileUtils::getInstance()->getWritablePath();
         pathToSave += "tmpdir";
-        
+
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32)
-        DIR *pDir = NULL;
-        
-        pDir = opendir (pathToSave.c_str());
-        if (! pDir)
+        DIR* pDir = NULL;
+
+        pDir = opendir(pathToSave.c_str());
+        if (!pDir)
         {
             mkdir(pathToSave.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
         }
@@ -73,7 +72,7 @@ static int lua_cocos2dx_createDownloadDir(lua_State* L)
         tolua_pushstring(L, pathToSave.c_str());
         return 1;
     }
-    
+
     CCLOG("'createDownloadDir' function wrong number of arguments: %d, was expecting %d\n", argc, 0);
     return 0;
 }
@@ -82,17 +81,18 @@ static int lua_cocos2dx_deleteDownloadDir(lua_State* L)
 {
     if (nullptr == L)
         return 0;
-    
+
     int argc = lua_gettop(L);
-    
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
+
     if (1 == argc)
     {
 #if COCOS2D_DEBUG >= 1
-        if (!tolua_isstring(L, 1, 0, &tolua_err)) goto tolua_lerror;
+        if (!tolua_isstring(L, 1, 0, &tolua_err))
+            goto tolua_lerror;
 #endif
         std::string pathToSave = tolua_tostring(L, 1, "");
 
@@ -105,13 +105,13 @@ static int lua_cocos2dx_deleteDownloadDir(lua_State* L)
         FileUtils::getInstance()->removeDirectory(pathToSave);
         return 0;
     }
-    
+
     CCLOG("'resetDownloadDir' function wrong number of arguments: %d, was expecting %d\n", argc, 1);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'resetDownloadDir'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'resetDownloadDir'.", &tolua_err);
     return 0;
 #endif
 }
@@ -120,23 +120,21 @@ static int lua_cocos2dx_addSearchPath(lua_State* L)
 {
     if (nullptr == L)
         return 0;
-    
+
     int argc = lua_gettop(L);
-    
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
     if (2 == argc)
     {
 #if COCOS2D_DEBUG >= 1
-        if (!tolua_isstring(L, 1, 0, &tolua_err) ||
-            !tolua_isboolean(L, 2, 0, &tolua_err))
+        if (!tolua_isstring(L, 1, 0, &tolua_err) || !tolua_isboolean(L, 2, 0, &tolua_err))
             goto tolua_lerror;
 #endif
         std::string pathToSave = tolua_tostring(L, 1, "");
-        bool before           = tolua_toboolean(L, 2, 0);
+        bool before            = tolua_toboolean(L, 2, 0);
         FileUtils::getInstance()->addSearchPath(pathToSave, before);
         return 0;
     }
@@ -145,7 +143,7 @@ static int lua_cocos2dx_addSearchPath(lua_State* L)
 
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'addSearchPath'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'addSearchPath'.", &tolua_err);
     return 0;
 #endif
 }
diff --git a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h
index 37f711ae98c4..22ddaf5822ca 100644
--- a/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h
+++ b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,8 +34,9 @@ extern "C" {
 #endif
 
 /**
- * The apis which are bound in this file are temporary for the assetsmanager test sample.After the completion of some systems like fileutils,these apis will be deprecated
+ * The apis which are bound in this file are temporary for the assetsmanager test sample.After the completion of some
+ * systems like fileutils,these apis will be deprecated
  */
 TOLUA_API int register_assetsmanager_test_sample(lua_State* tolua_S);
 
-#endif // #ifndef COCOS2DX_COCOS_SCRIPTING_LUA_BINDINGS_LUA_ASSETSMANAGER_TEST_SAMPLE_H
+#endif  // #ifndef COCOS2DX_COCOS_SCRIPTING_LUA_BINDINGS_LUA_ASSETSMANAGER_TEST_SAMPLE_H
diff --git a/tests/lua-tests/project/Classes/lua_test_bindings.cpp b/tests/lua-tests/project/Classes/lua_test_bindings.cpp
index e3eafa0a5fd8..54d6cf6908f5 100644
--- a/tests/lua-tests/project/Classes/lua_test_bindings.cpp
+++ b/tests/lua-tests/project/Classes/lua_test_bindings.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,17 +31,17 @@ NS_CC_BEGIN
 /**
  * Copy DrawNode for 3D geometry drawing.
  */
-class DrawNode3D: public Node
+class DrawNode3D : public Node
 {
 public:
     /** creates and initialize a DrawNode3D node */
     static DrawNode3D* create();
-    
+
     /**
      * Draw 3D Line
      */
-    void drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color);
-    
+    void drawLine(const Vec3& from, const Vec3& to, const Color4F& color);
+
     /**
      * Draw 3D cube
      * @param point to a vertex array who has 8 element.
@@ -55,17 +55,17 @@ class DrawNode3D: public Node
      *        vertices[7]:Left-top-back.
      * @param color
      */
-    void drawCube(Vec3* vertices, const Color4F &color);
-    
+    void drawCube(Vec3* vertices, const Color4F& color);
+
     /** Clear the geometry in the node's buffer. */
     void clear();
-    
+
     /**
      * @js NA
      * @lua NA
      */
     const BlendFunc& getBlendFunc() const;
-    
+
     /**
      * @code
      * When this function bound into js or lua,the parameter will be changed
@@ -73,48 +73,41 @@ class DrawNode3D: public Node
      * @endcode
      * @lua NA
      */
-    void setBlendFunc(const BlendFunc &blendFunc);
-   
-    
+    void setBlendFunc(const BlendFunc& blendFunc);
+
     // Overrides
-    virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
-    
-CC_CONSTRUCTOR_ACCESS:
-    DrawNode3D();
+    virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
+
+    CC_CONSTRUCTOR_ACCESS : DrawNode3D();
     virtual ~DrawNode3D();
     virtual bool init() override;
-    
+
 protected:
     struct V3F_C4B
     {
-        Vec3     vertices;
-        Color4B  colors;
+        Vec3 vertices;
+        Color4B colors;
     };
     void ensureCapacity(int count);
-    
-    std::vector<V3F_C4B>        _buffer;
-    
-    BlendFunc                   _blendFunc          = BlendFunc::ALPHA_PREMULTIPLIED;
-    CustomCommand               _customCommand;
-    backend::ProgramState *     _programState       = nullptr;
-    bool                        _dirty              = false;
-    backend::UniformLocation    _locMVPMatrix;
-    
+
+    std::vector<V3F_C4B> _buffer;
+
+    BlendFunc _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
+    CustomCommand _customCommand;
+    backend::ProgramState* _programState = nullptr;
+    bool _dirty                          = false;
+    backend::UniformLocation _locMVPMatrix;
+
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(DrawNode3D);
 
-    bool                        _rendererDepthTestEnabled   = false;
+    bool _rendererDepthTestEnabled = false;
 
     void onBeforeDraw();
     void onAfterDraw();
 };
 
-
-
-
-DrawNode3D::DrawNode3D()
-{
-}
+DrawNode3D::DrawNode3D() {}
 
 DrawNode3D::~DrawNode3D()
 {
@@ -132,26 +125,26 @@ DrawNode3D* DrawNode3D::create()
     {
         CC_SAFE_DELETE(ret);
     }
-    
+
     return ret;
 }
 
 void DrawNode3D::ensureCapacity(int count)
 {
-    CCASSERT(count>=0, "capacity must be >= 0");
-    
-    if(_buffer.size() + count > _buffer.capacity())
+    CCASSERT(count >= 0, "capacity must be >= 0");
+
+    if (_buffer.size() + count > _buffer.capacity())
     {
-        auto newSize = MAX(_buffer.capacity() + (_buffer.capacity() >> 1) , count + _buffer.size());
+        auto newSize = MAX(_buffer.capacity() + (_buffer.capacity() >> 1), count + _buffer.size());
         _buffer.reserve(newSize);
-	}
+    }
 }
 
 bool DrawNode3D::init()
 {
 
-    _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
-    auto program = backend::Program::getBuiltinProgram(backend::ProgramType::LINE_COLOR_3D);
+    _blendFunc    = BlendFunc::ALPHA_PREMULTIPLIED;
+    auto program  = backend::Program::getBuiltinProgram(backend::ProgramType::LINE_COLOR_3D);
     _programState = new backend::ProgramState(program);
 
     _locMVPMatrix = _programState->getUniformLocation("u_MVPMatrix");
@@ -162,10 +155,11 @@ bool DrawNode3D::init()
     _customCommand.setDrawType(CustomCommand::DrawType::ARRAY);
     _customCommand.setPrimitiveType(CustomCommand::PrimitiveType::LINE);
 
-    auto layout = _programState->getVertexLayout();
-    const auto &attributeInfo = _programState->getProgram()->getActiveAttributes();
-    auto iter = attributeInfo.find("a_position");
-    if (iter != attributeInfo.end()) {
+    auto layout               = _programState->getVertexLayout();
+    const auto& attributeInfo = _programState->getProgram()->getActiveAttributes();
+    auto iter                 = attributeInfo.find("a_position");
+    if (iter != attributeInfo.end())
+    {
         layout->setAttribute(iter->first, iter->second.location, backend::VertexFormat::FLOAT3, 0, false);
     }
     iter = attributeInfo.find("a_color");
@@ -175,7 +169,8 @@ bool DrawNode3D::init()
     }
     layout->setLayout(sizeof(V3F_C4B));
 
-    _customCommand.createVertexBuffer(sizeof(V3F_C4B), INITIAL_VERTEX_BUFFER_LENGTH, CustomCommand::BufferUsage::DYNAMIC);
+    _customCommand.createVertexBuffer(sizeof(V3F_C4B), INITIAL_VERTEX_BUFFER_LENGTH,
+                                      CustomCommand::BufferUsage::DYNAMIC);
 
     _customCommand.getPipelineDescriptor().programState = _programState;
 
@@ -186,7 +181,7 @@ bool DrawNode3D::init()
 
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     // Need to listen the event only when not use batchnode, because it will use VBO
-    auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event){
+    auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event) {
         /** listen the event that coming to foreground on Android */
         this->init();
     });
@@ -197,17 +192,18 @@ bool DrawNode3D::init()
     return true;
 }
 
-void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
+void DrawNode3D::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
 {
     _customCommand.init(_globalZOrder);
-    //update mvp matrix
-    auto &matrixP = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-    auto mvp = matrixP * transform;
+    // update mvp matrix
+    auto& matrixP = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
+    auto mvp      = matrixP * transform;
     _programState->setUniform(_locMVPMatrix, mvp.m, sizeof(mvp.m));
 
-    if (_customCommand.getVertexCapacity() < _buffer.size()) {
+    if (_customCommand.getVertexCapacity() < _buffer.size())
+    {
         auto s = _buffer.size();
-        _customCommand.createVertexBuffer(sizeof(V3F_C4B), s + s/2, CustomCommand::BufferUsage::DYNAMIC);
+        _customCommand.createVertexBuffer(sizeof(V3F_C4B), s + s / 2, CustomCommand::BufferUsage::DYNAMIC);
     }
 
     if (_dirty && !_buffer.empty())
@@ -225,34 +221,36 @@ void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
     }
 }
 
-
-void DrawNode3D::drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color)
+void DrawNode3D::drawLine(const Vec3& from, const Vec3& to, const Color4F& color)
 {
     unsigned int vertex_count = 2;
     ensureCapacity(vertex_count);
-    
+
     Color4B col = Color4B(color);
-    V3F_C4B a = {Vec3(from.x, from.y, from.z), col};
-    V3F_C4B b = {Vec3(to.x, to.y, to.z), col, };
+    V3F_C4B a   = {Vec3(from.x, from.y, from.z), col};
+    V3F_C4B b   = {
+        Vec3(to.x, to.y, to.z),
+        col,
+    };
     _buffer.emplace_back(a);
     _buffer.emplace_back(b);
     _dirty = true;
 }
 
-void DrawNode3D::drawCube(Vec3* vertices, const Color4F &color)
+void DrawNode3D::drawCube(Vec3* vertices, const Color4F& color)
 {
     // front face
     drawLine(vertices[0], vertices[1], color);
     drawLine(vertices[1], vertices[2], color);
     drawLine(vertices[2], vertices[3], color);
     drawLine(vertices[3], vertices[0], color);
-    
+
     // back face
     drawLine(vertices[4], vertices[5], color);
     drawLine(vertices[5], vertices[6], color);
     drawLine(vertices[6], vertices[7], color);
     drawLine(vertices[7], vertices[4], color);
-    
+
     // edge
     drawLine(vertices[0], vertices[7], color);
     drawLine(vertices[1], vertices[6], color);
@@ -271,26 +269,26 @@ const BlendFunc& DrawNode3D::getBlendFunc() const
     return _blendFunc;
 }
 
-void DrawNode3D::setBlendFunc(const BlendFunc &blendFunc)
+void DrawNode3D::setBlendFunc(const BlendFunc& blendFunc)
 {
     _blendFunc = blendFunc;
-    //update blend mode
-    auto &blend = _customCommand.getPipelineDescriptor().blendDescriptor;
-    blend.blendEnabled = true;
+    // update blend mode
+    auto& blend                = _customCommand.getPipelineDescriptor().blendDescriptor;
+    blend.blendEnabled         = true;
     blend.sourceRGBBlendFactor = blend.sourceAlphaBlendFactor = _blendFunc.src;
     blend.destinationRGBBlendFactor = blend.destinationAlphaBlendFactor = _blendFunc.dst;
 }
 
 void DrawNode3D::onBeforeDraw()
 {
-    auto *renderer = Director::getInstance()->getRenderer();
+    auto* renderer            = Director::getInstance()->getRenderer();
     _rendererDepthTestEnabled = renderer->getDepthTest();
     renderer->setDepthTest(true);
 }
 
 void DrawNode3D::onAfterDraw()
 {
-    auto *renderer = Director::getInstance()->getRenderer();
+    auto* renderer = Director::getInstance()->getRenderer();
     renderer->setDepthTest(_rendererDepthTestEnabled);
 }
 
@@ -301,7 +299,7 @@ void DrawNode3D::onAfterDraw()
  If call `create` by passing {index1 = 111, index2 = 112, index3 = 113} from lua,
  the type 111,112,113 would be judged as string type before 3.3rc1
  **/
-class ValueTypeJudgeInTable:public Node
+class ValueTypeJudgeInTable : public Node
 {
 public:
     static ValueTypeJudgeInTable* create(ValueMap valueMap);
@@ -311,245 +309,247 @@ ValueTypeJudgeInTable* ValueTypeJudgeInTable::create(ValueMap valueMap)
 {
     ValueTypeJudgeInTable* ret = new ValueTypeJudgeInTable();
     ret->autorelease();
-    
+
     int index = 0;
     for (const auto& iter : valueMap)
     {
         Value::Type type = iter.second.getTypeFamily();
-        if (type == Value::Type::STRING) {
+        if (type == Value::Type::STRING)
+        {
             CCLOG("The type of index %d is string", index);
         }
-        
-        if (type == Value::Type::INTEGER || type == Value::Type::DOUBLE || type == Value::Type::FLOAT) {
+
+        if (type == Value::Type::INTEGER || type == Value::Type::DOUBLE || type == Value::Type::FLOAT)
+        {
             CCLOG("The type of index %d is number", index);
         }
-        
+
         ++index;
     }
-    
+
     return ret;
 }
 NS_CC_END
 
 int lua_cocos2dx_DrawNode3D_getBlendFunc(lua_State* L)
 {
-    int argc = 0;
+    int argc                  = 0;
     cocos2d::DrawNode3D* cobj = nullptr;
-    bool ok  = true;
-    
+    bool ok                   = true;
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertype(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
-    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L,1,0);
-    
+
+    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L, 1, 0);
+
 #if COCOS2D_DEBUG >= 1
     if (!cobj)
     {
-        tolua_error(L,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_getBlendFunc'", nullptr);
+        tolua_error(L, "invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_getBlendFunc'", nullptr);
         return 0;
     }
 #endif
-    
-    argc = lua_gettop(L)-1;
+
+    argc = lua_gettop(L) - 1;
     if (argc == 0)
     {
-        if(!ok)
+        if (!ok)
             return 0;
         const cocos2d::BlendFunc& ret = cobj->getBlendFunc();
         blendfunc_to_luaval(L, ret);
         return 1;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:getBlendFunc",argc, 0);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:getBlendFunc", argc, 0);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_getBlendFunc'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_getBlendFunc'.", &tolua_err);
 #endif
-    
+
     return 0;
 }
 
 int lua_cocos2dx_DrawNode3D_setBlendFunc(lua_State* L)
 {
-    int argc = 0;
+    int argc                  = 0;
     cocos2d::DrawNode3D* cobj = nullptr;
-    bool ok = true;
-    
+    bool ok                   = true;
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertype(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
-    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L,1,0);
-    
+
+    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L, 1, 0);
+
 #if COCOS2D_DEBUG >= 1
     if (!cobj)
     {
-        tolua_error(L,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'", nullptr);
+        tolua_error(L, "invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'", nullptr);
         return 0;
     }
 #endif
-    
-    argc = lua_gettop(L)-1;
+
+    argc = lua_gettop(L) - 1;
     if (argc == 1)
     {
         cocos2d::BlendFunc arg0;
-        
+
         ok &= luaval_to_blendfunc(L, 2, &arg0, "cc.Sprite3D:setBlendFunc");
-        if(!ok)
+        if (!ok)
         {
-            tolua_error(L,"invalid arguments in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'", nullptr);
+            tolua_error(L, "invalid arguments in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'", nullptr);
             return 0;
         }
         cobj->setBlendFunc(arg0);
         return 0;
     }
-    
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:setBlendFunc",argc, 1);
+
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:setBlendFunc", argc, 1);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_setBlendFunc'.", &tolua_err);
 #endif
-    
+
     return 0;
 }
 
 int lua_cocos2dx_DrawNode3D_drawLine(lua_State* L)
 {
-    int argc = 0;
+    int argc                  = 0;
     cocos2d::DrawNode3D* cobj = nullptr;
-    bool ok  = true;
-    
+    bool ok                   = true;
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertype(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
-    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L,1,0);
-    
+
+    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L, 1, 0);
+
 #if COCOS2D_DEBUG >= 1
     if (!cobj)
     {
-        tolua_error(L,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_drawLine'", nullptr);
+        tolua_error(L, "invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_drawLine'", nullptr);
         return 0;
     }
 #endif
-    
-    argc = lua_gettop(L)-1;
+
+    argc = lua_gettop(L) - 1;
     if (argc == 3)
     {
         cocos2d::Vec3 arg0;
         cocos2d::Vec3 arg1;
         cocos2d::Color4F arg2;
-        
+
         ok &= luaval_to_vec3(L, 2, &arg0, "cc.DrawNode3D:drawLine");
-        
+
         ok &= luaval_to_vec3(L, 3, &arg1, "cc.DrawNode3D:drawLine");
-        
-        ok &=luaval_to_color4f(L, 4, &arg2, "cc.DrawNode3D:drawLine");
-        if(!ok)
+
+        ok &= luaval_to_color4f(L, 4, &arg2, "cc.DrawNode3D:drawLine");
+        if (!ok)
             return 0;
         cobj->drawLine(arg0, arg1, arg2);
         return 0;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:drawLine",argc, 3);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:drawLine", argc, 3);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_drawLine'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_drawLine'.", &tolua_err);
 #endif
-    
+
     return 0;
 }
 
 int lua_cocos2dx_DrawNode3D_clear(lua_State* L)
 {
-    int argc = 0;
+    int argc                  = 0;
     cocos2d::DrawNode3D* cobj = nullptr;
-    bool ok  = true;
-    
+    bool ok                   = true;
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertype(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
-    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L,1,0);
-    
+
+    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L, 1, 0);
+
 #if COCOS2D_DEBUG >= 1
     if (!cobj)
     {
-        tolua_error(L,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_clear'", nullptr);
+        tolua_error(L, "invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_clear'", nullptr);
         return 0;
     }
 #endif
-    
-    argc = lua_gettop(L)-1;
+
+    argc = lua_gettop(L) - 1;
     if (argc == 0)
     {
-        if(!ok)
+        if (!ok)
             return 0;
         cobj->clear();
         return 0;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:clear",argc, 0);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:clear", argc, 0);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_clear'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_clear'.", &tolua_err);
 #endif
-    
+
     return 0;
 }
 
 int lua_cocos2dx_DrawNode3D_drawCube(lua_State* L)
 {
-    int argc = 0;
+    int argc                  = 0;
     cocos2d::DrawNode3D* cobj = nullptr;
-    bool ok  = true;
-    
+    bool ok                   = true;
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertype(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
-    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L,1,0);
-    
+
+    cobj = (cocos2d::DrawNode3D*)tolua_tousertype(L, 1, 0);
+
 #if COCOS2D_DEBUG >= 1
     if (!cobj)
     {
-        tolua_error(L,"invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_drawCube'", nullptr);
+        tolua_error(L, "invalid 'cobj' in function 'lua_cocos2dx_DrawNode3D_drawCube'", nullptr);
         return 0;
     }
 #endif
-    
-    argc = lua_gettop(L)-1;
+
+    argc = lua_gettop(L) - 1;
     if (argc == 2)
     {
         std::vector<cocos2d::Vec3> arg0;
@@ -572,7 +572,7 @@ int lua_cocos2dx_DrawNode3D_drawCube(lua_State* L)
             }
 #endif
             ok &= luaval_to_vec3(L, lua_gettop(L), &vec3);
-            
+
 #if COCOS2D_DEBUG >= 1
             if (!ok)
             {
@@ -580,25 +580,25 @@ int lua_cocos2dx_DrawNode3D_drawCube(lua_State* L)
                 goto tolua_lerror;
             }
 #endif
-            //arg0[i] = vec3;
+            // arg0[i] = vec3;
             arg0.push_back(vec3);
             lua_pop(L, 1);
         }
-        
-        ok &=luaval_to_color4f(L, 3, &arg1, "cc.DrawNode3D:drawCube");
-        if(!ok)
+
+        ok &= luaval_to_color4f(L, 3, &arg1, "cc.DrawNode3D:drawCube");
+        if (!ok)
             return 0;
         cobj->drawCube(&arg0[0], arg1);
         return 0;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:drawCube",argc, 2);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode3D:drawCube", argc, 2);
     return 0;
-    
+
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_drawCube'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_drawCube'.", &tolua_err);
 #endif
-    
+
     return 0;
 }
 
@@ -606,47 +606,48 @@ int lua_cocos2dx_DrawNode3D_create(lua_State* L)
 {
     int argc = 0;
     bool ok  = true;
-    
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertable(L,1,"cc.DrawNode3D",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertable(L, 1, "cc.DrawNode3D", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
+
     argc = lua_gettop(L) - 1;
-    
+
     if (argc == 0)
     {
-        if(!ok)
+        if (!ok)
             return 0;
         cocos2d::DrawNode3D* ret = cocos2d::DrawNode3D::create();
-        object_to_luaval<cocos2d::DrawNode3D>(L, "cc.DrawNode3D",(cocos2d::DrawNode3D*)ret);
+        object_to_luaval<cocos2d::DrawNode3D>(L, "cc.DrawNode3D", (cocos2d::DrawNode3D*)ret);
         return 1;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DrawNode3D:create",argc, 0);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DrawNode3D:create", argc, 0);
     return 0;
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L,"#ferror in function 'lua_cocos2dx_DrawNode3D_create'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_DrawNode3D_create'.", &tolua_err);
 #endif
     return 0;
 }
 
 int lua_register_cocos2dx_DrawNode3D(lua_State* L)
 {
-    tolua_usertype(L,"cc.DrawNode3D");
-    tolua_cclass(L,"DrawNode3D","cc.DrawNode3D","cc.Node",nullptr);
-    
-    tolua_beginmodule(L,"DrawNode3D");
-    tolua_function(L,"getBlendFunc",lua_cocos2dx_DrawNode3D_getBlendFunc);
-    tolua_function(L,"drawLine",lua_cocos2dx_DrawNode3D_drawLine);
-    tolua_function(L,"clear",lua_cocos2dx_DrawNode3D_clear);
-    tolua_function(L,"drawCube",lua_cocos2dx_DrawNode3D_drawCube);
-    tolua_function(L,"create", lua_cocos2dx_DrawNode3D_create);
+    tolua_usertype(L, "cc.DrawNode3D");
+    tolua_cclass(L, "DrawNode3D", "cc.DrawNode3D", "cc.Node", nullptr);
+
+    tolua_beginmodule(L, "DrawNode3D");
+    tolua_function(L, "getBlendFunc", lua_cocos2dx_DrawNode3D_getBlendFunc);
+    tolua_function(L, "drawLine", lua_cocos2dx_DrawNode3D_drawLine);
+    tolua_function(L, "clear", lua_cocos2dx_DrawNode3D_clear);
+    tolua_function(L, "drawCube", lua_cocos2dx_DrawNode3D_drawCube);
+    tolua_function(L, "create", lua_cocos2dx_DrawNode3D_create);
     tolua_endmodule(L);
-    auto typeName = typeid(cocos2d::DrawNode3D).name();
+    auto typeName                                    = typeid(cocos2d::DrawNode3D).name();
     g_luaType[reinterpret_cast<uintptr_t>(typeName)] = "cc.DrawNode3D";
     g_typeCast[typeName]                             = "cc.DrawNode3D";
     return 1;
@@ -656,47 +657,49 @@ int lua_cocos2dx_ValueTypeJudgeInTable_create(lua_State* L)
 {
     int argc = 0;
     bool ok  = true;
-    
+
 #if COCOS2D_DEBUG >= 1
     tolua_Error tolua_err;
 #endif
-    
+
 #if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertable(L,1,"cc.ValueTypeJudgeInTable",0,&tolua_err)) goto tolua_lerror;
+    if (!tolua_isusertable(L, 1, "cc.ValueTypeJudgeInTable", 0, &tolua_err))
+        goto tolua_lerror;
 #endif
-    
+
     argc = lua_gettop(L) - 1;
-    
+
     if (argc == 1)
     {
         cocos2d::ValueMap arg0;
         ok &= luaval_to_ccvaluemap(L, 2, &arg0, "cc.ValueTypeJudgeInTable:create");
-        if(!ok)
+        if (!ok)
             return 0;
         cocos2d::ValueTypeJudgeInTable* ret = cocos2d::ValueTypeJudgeInTable::create(arg0);
-        object_to_luaval<cocos2d::ValueTypeJudgeInTable>(L, "cc.ValueTypeJudgeInTable",(cocos2d::ValueTypeJudgeInTable*)ret);
+        object_to_luaval<cocos2d::ValueTypeJudgeInTable>(L, "cc.ValueTypeJudgeInTable",
+                                                         (cocos2d::ValueTypeJudgeInTable*)ret);
         return 1;
     }
-    CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ValueTypeJudgeInTable:create",argc, 1);
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ValueTypeJudgeInTable:create", argc, 1);
     return 0;
 #if COCOS2D_DEBUG >= 1
 tolua_lerror:
-    tolua_error(L, "#ferror in function 'lua_cocos2dx_ValueTypeJudgeInTable_create'.",&tolua_err);
+    tolua_error(L, "#ferror in function 'lua_cocos2dx_ValueTypeJudgeInTable_create'.", &tolua_err);
 #endif
     return 0;
 }
 
 int lua_register_cocos2dx_ValueTypeJudgeInTable(lua_State* L)
 {
-    tolua_usertype(L,"cc.ValueTypeJudgeInTable");
-    tolua_cclass(L,"ValueTypeJudgeInTable","cc.ValueTypeJudgeInTable","cc.Node",nullptr);
-    
-    tolua_beginmodule(L,"ValueTypeJudgeInTable");
-        tolua_function(L,"create", lua_cocos2dx_ValueTypeJudgeInTable_create);
+    tolua_usertype(L, "cc.ValueTypeJudgeInTable");
+    tolua_cclass(L, "ValueTypeJudgeInTable", "cc.ValueTypeJudgeInTable", "cc.Node", nullptr);
+
+    tolua_beginmodule(L, "ValueTypeJudgeInTable");
+    tolua_function(L, "create", lua_cocos2dx_ValueTypeJudgeInTable_create);
     tolua_endmodule(L);
-    auto typeName = typeid(cocos2d::ValueTypeJudgeInTable).name();
+    auto typeName                                    = typeid(cocos2d::ValueTypeJudgeInTable).name();
     g_luaType[reinterpret_cast<uintptr_t>(typeName)] = "cc.ValueTypeJudgeInTable";
-    g_typeCast[typeName] = "cc.ValueTypeJudgeInTable";
+    g_typeCast[typeName]                             = "cc.ValueTypeJudgeInTable";
     return 1;
 }
 
@@ -705,8 +708,8 @@ int register_test_binding(lua_State* L)
     tolua_open(L);
     tolua_module(L, "cc", 0);
     tolua_beginmodule(L, "cc");
-        lua_register_cocos2dx_DrawNode3D(L);
-        lua_register_cocos2dx_ValueTypeJudgeInTable(L);
+    lua_register_cocos2dx_DrawNode3D(L);
+    lua_register_cocos2dx_ValueTypeJudgeInTable(L);
     tolua_endmodule(L);
     return 0;
 }
diff --git a/tests/lua-tests/project/Classes/lua_test_bindings.h b/tests/lua-tests/project/Classes/lua_test_bindings.h
index 738bba49c480..9315698713a5 100644
--- a/tests/lua-tests/project/Classes/lua_test_bindings.h
+++ b/tests/lua-tests/project/Classes/lua_test_bindings.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,4 +35,4 @@ extern "C" {
 
 TOLUA_API int register_test_binding(lua_State* tolua_S);
 
-#endif // #ifndef COCOS2DX_TEST_LUA_TESTS_PROJECT_CLASSES_LUA_TEST_BINDINGS_H
+#endif  // #ifndef COCOS2DX_TEST_LUA_TESTS_PROJECT_CLASSES_LUA_TEST_BINDINGS_H
diff --git a/tests/lua-tests/project/proj.android/app/jni/main.cpp b/tests/lua-tests/project/proj.android/app/jni/main.cpp
index 6cab47cbb306..ccd4757e4c78 100644
--- a/tests/lua-tests/project/proj.android/app/jni/main.cpp
+++ b/tests/lua-tests/project/proj.android/app/jni/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,14 +29,16 @@
 
 #include "AppDelegate.h"
 
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#define LOG_TAG "main"
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 
-namespace {
+namespace
+{
 std::unique_ptr<AppDelegate> appDelegate;
 }
 
-void cocos_android_app_init(JNIEnv* env) {
+void cocos_android_app_init(JNIEnv* env)
+{
     LOGD("cocos_android_app_init");
     appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.h b/tests/lua-tests/project/proj.ios_mac/ios/AppController.h
index d7906fbfd9a0..ce24366200ea 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/AppController.h
+++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.h
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2010 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,9 +26,8 @@
 @class RootViewController;
 
 @interface AppController : NSObject <UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
+    UIWindow* window;
+    RootViewController* viewController;
 }
 
 @end
-
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm
index 260767392cc8..b25b63f68ff3 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm
+++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm
@@ -38,22 +38,23 @@ @implementation AppController
 // cocos2d application instance
 static AppDelegate s_sharedApplication;
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{
 
-    cocos2d::Application *app = cocos2d::Application::getInstance();
+    cocos2d::Application* app = cocos2d::Application::getInstance();
     app->initGLContextAttrs();
     cocos2d::GLViewImpl::convertAttrs();
     // Override point for customization after application launch.
 
     // Add the view controller's view to the window and display.
-    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
-    CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds]
-                                         pixelFormat: (NSString*)cocos2d::GLViewImpl::_pixelFormat
-                                         depthFormat: cocos2d::GLViewImpl::_depthFormat
-                                  preserveBackbuffer: NO
-                                          sharegroup: nil
-                                       multiSampling: cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
-                                     numberOfSamples: cocos2d::GLViewImpl::_multisamplingCount ];
+    window               = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    CCEAGLView* eaglView = [CCEAGLView viewWithFrame:[window bounds]
+                                         pixelFormat:(NSString*)cocos2d::GLViewImpl::_pixelFormat
+                                         depthFormat:cocos2d::GLViewImpl::_depthFormat
+                                  preserveBackbuffer:NO
+                                          sharegroup:nil
+                                       multiSampling:cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
+                                     numberOfSamples:cocos2d::GLViewImpl::_multisamplingCount];
 
 #if !defined(CC_TARGET_OS_TVOS)
     [eaglView setMultipleTouchEnabled:YES];
@@ -67,91 +68,99 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     viewController.view = eaglView;
 
     // Set RootViewController to window
-    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
+    if ([[UIDevice currentDevice].systemVersion floatValue] < 6.0)
     {
         // warning: addSubView doesn't work on iOS6
-        [window addSubview: viewController.view];
+        [window addSubview:viewController.view];
     }
     else
     {
         // use this method on ios6
         [window setRootViewController:viewController];
     }
-    
+
     [window makeKeyAndVisible];
 
 #if !defined(CC_TARGET_OS_TVOS)
-    [[UIApplication sharedApplication] setStatusBarHidden: YES];
+    [[UIApplication sharedApplication] setStatusBarHidden:YES];
 #endif
 
-    //Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
-    if ( [[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
+    // Launching the app with the arguments -NSAllowsDefaultLineBreakStrategy NO to force back to the old behavior.
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 13.0f)
     {
         [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSAllowsDefaultLineBreakStrategy"];
     }
 
     // IMPORTANT: Setting the GLView should be done after creating the RootViewController
-    cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView);
+    cocos2d::GLView* glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView);
     cocos2d::Director::getInstance()->setOpenGLView(glview);
 
     app->run();
     return YES;
 }
 
-
-- (void)applicationWillResignActive:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication*)application
+{
     /*
-     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+     Sent when the application is about to move from active to inactive state. This can occur for certain types of
+     temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and
+     it begins the transition to the background state. Use this method to pause ongoing tasks, disable timers, and
+     throttle down OpenGL ES frame rates. Games should use this method to pause the game.
      */
     cocos2d::Director::getInstance()->pause();
 }
 
-- (void)applicationDidBecomeActive:(UIApplication *)application {
+- (void)applicationDidBecomeActive:(UIApplication*)application
+{
     /*
-     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was
+     previously in the background, optionally refresh the user interface.
      */
     cocos2d::Director::getInstance()->resume();
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application {
+- (void)applicationDidEnterBackground:(UIApplication*)application
+{
     /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
+     Use this method to release shared resources, save user data, invalidate timers, and store enough application state
+     information to restore your application to its current state in case it is terminated later. If your application
+     supports background execution, called instead of applicationWillTerminate: when the user quits.
      */
     cocos2d::Application::getInstance()->applicationDidEnterBackground();
 }
 
-- (void)applicationWillEnterForeground:(UIApplication *)application {
+- (void)applicationWillEnterForeground:(UIApplication*)application
+{
     /*
-     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
+     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made
+     on entering the background.
      */
     cocos2d::Application::getInstance()->applicationWillEnterForeground();
 }
 
-- (void)applicationWillTerminate:(UIApplication *)application {
+- (void)applicationWillTerminate:(UIApplication*)application
+{
     /*
      Called when the application is about to terminate.
      See also applicationDidEnterBackground:.
      */
 }
 
-
 #pragma mark -
 #pragma mark Memory management
 
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+- (void)applicationDidReceiveMemoryWarning:(UIApplication*)application
+{
     /*
-     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk)
+     later.
      */
-     cocos2d::Director::getInstance()->purgeCachedData();
+    cocos2d::Director::getInstance()->purgeCachedData();
 }
 
-
-- (void)dealloc {
+- (void)dealloc
+{
     [super dealloc];
 }
 
-
 @end
-
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h
index cbeac2bb740f..9302af48bf4b 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h
+++ b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,18 +29,18 @@
 @interface LuaObjectCBridgeTest : NSObject {
     int _scriptHandler;
 }
-+ (LuaObjectCBridgeTest*) getInstance;
-+ (void) destroyInstance;
++ (LuaObjectCBridgeTest*)getInstance;
++ (void)destroyInstance;
 
-+ (void) registerScriptHandler:(NSDictionary *)dict;
-+ (void) unregisterScriptHandler;
++ (void)registerScriptHandler:(NSDictionary*)dict;
++ (void)unregisterScriptHandler;
 
-+ (int)  addTwoNumbers:(NSDictionary *)dict;
-+ (void) callbackScriptHandler;
++ (int)addTwoNumbers:(NSDictionary*)dict;
++ (void)callbackScriptHandler;
 
-+ (void) printLuaTableToDictionary:(NSDictionary *)dict;
++ (void)printLuaTableToDictionary:(NSDictionary*)dict;
 
-- (id) init;
+- (id)init;
 @end
 
 #endif  //  COCOS2DX_SAMPLES_TESTLUA_PROJ_IOS_LUAOBJECTCBRIDGETEST_H
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm
index 07c722752fd6..f715a6b69dce 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm
+++ b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,23 +34,23 @@ @implementation LuaObjectCBridgeTest
 
 static LuaObjectCBridgeTest* s_instance = nil;
 
-+ (LuaObjectCBridgeTest*) getInstance
++ (LuaObjectCBridgeTest*)getInstance
 {
     if (!s_instance)
     {
         s_instance = [LuaObjectCBridgeTest alloc];
         [s_instance init];
     }
-    
+
     return s_instance;
 }
 
-+ (void) destroyInstance
++ (void)destroyInstance
 {
     [s_instance release];
 }
 
-- (void) setScriptHandler:(int)scriptHandler
+- (void)setScriptHandler:(int)scriptHandler
 {
     if (_scriptHandler)
     {
@@ -60,45 +60,44 @@ - (void) setScriptHandler:(int)scriptHandler
     _scriptHandler = scriptHandler;
 }
 
-- (int) getScriptHandler
+- (int)getScriptHandler
 {
     return _scriptHandler;
 }
 
-
-+(void) registerScriptHandler:(NSDictionary *)dict
++ (void)registerScriptHandler:(NSDictionary*)dict
 {
     [[LuaObjectCBridgeTest getInstance] setScriptHandler:[[dict objectForKey:@"scriptHandler"] intValue]];
 }
 
-
-+ (void) unregisterScriptHandler
++ (void)unregisterScriptHandler
 {
     [[LuaObjectCBridgeTest getInstance] setScriptHandler:0];
 }
 
-+ (int)  addTwoNumbers:(NSDictionary *)dict
++ (int)addTwoNumbers:(NSDictionary*)dict
 {
     int num1 = [[dict objectForKey:@"num1"] intValue];
     int num2 = [[dict objectForKey:@"num2"] intValue];
-    
+
     return num1 + num2;
 }
 
-+ (void) callbackScriptHandler
++ (void)callbackScriptHandler
 {
     int scriptHandler = [[LuaObjectCBridgeTest getInstance] getScriptHandler];
     if (scriptHandler)
     {
         LuaBridge::pushLuaFunctionById(scriptHandler);
-        LuaStack *stack = LuaBridge::getStack();
+        LuaStack* stack = LuaBridge::getStack();
         stack->pushString("success");
         stack->executeFunction(1);
     }
 }
 
-+(void) printLuaTableToDictionary:(NSDictionary *)dict{
-    NSLog(@"lua to OC data is :%@",dict);
++ (void)printLuaTableToDictionary:(NSDictionary*)dict
+{
+    NSLog(@"lua to OC data is :%@", dict);
 }
 
 - (id)init
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h
index 1c51096c578c..1b70ba81b1c2 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h
+++ b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2011 cocos2d-x.org
  Copyright (c) 2010      Ricardo Quesada
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,9 +26,7 @@
 
 #import <UIKit/UIKit.h>
 
-
 @interface RootViewController : UIViewController {
-
 }
 - (BOOL)prefersStatusBarHidden;
 @end
diff --git a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm
index 8002ff82d09b..abfc10af528c 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm
+++ b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm
@@ -2,19 +2,19 @@
  Copyright (c) 2010-2011 cocos2d-x.org
  Copyright (c) 2010      Ricardo Quesada
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,11 +26,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "RootViewController.h"
 
-
 @implementation RootViewController
 
 /*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+ // The designated initializer.  Override if you create the controller programmatically and want to perform
+customization that is not appropriate for viewDidLoad.
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
         // Custom initialization
@@ -50,53 +50,58 @@ - (void)loadView {
 - (void)viewDidLoad {
     [super viewDidLoad];
 }
- 
+
 */
 // Override to allow orientations other than the default portrait orientation.
 // This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return UIInterfaceOrientationIsLandscape(interfaceOrientation);
 }
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
+- (NSUInteger)supportedInterfaceOrientations
+{
 #ifdef __IPHONE_6_0
     return UIInterfaceOrientationMaskAllButUpsideDown;
 #endif
 }
 
-- (BOOL) shouldAutorotate {
+- (BOOL)shouldAutorotate
+{
     return YES;
 }
 
-//fix not hide status on ios7
+// fix not hide status on ios7
 - (BOOL)prefersStatusBarHidden
 {
     return YES;
 }
 
 // Controls the application's preferred home indicator auto-hiding when this view controller is shown.
-- (BOOL)prefersHomeIndicatorAutoHidden {
+- (BOOL)prefersHomeIndicatorAutoHidden
+{
     return YES;
 }
 
-- (void)didReceiveMemoryWarning {
+- (void)didReceiveMemoryWarning
+{
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
-    
+
     // Release any cached data, images, etc that aren't in use.
 }
 
-- (void)viewDidUnload {
+- (void)viewDidUnload
+{
     [super viewDidUnload];
     // Release any retained subviews of the main view.
     // e.g. self.myOutlet = nil;
 }
 
-
-- (void)dealloc {
+- (void)dealloc
+{
     [super dealloc];
 }
 
-
 @end
diff --git a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h
index cbeac2bb740f..9302af48bf4b 100644
--- a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h
+++ b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,18 +29,18 @@
 @interface LuaObjectCBridgeTest : NSObject {
     int _scriptHandler;
 }
-+ (LuaObjectCBridgeTest*) getInstance;
-+ (void) destroyInstance;
++ (LuaObjectCBridgeTest*)getInstance;
++ (void)destroyInstance;
 
-+ (void) registerScriptHandler:(NSDictionary *)dict;
-+ (void) unregisterScriptHandler;
++ (void)registerScriptHandler:(NSDictionary*)dict;
++ (void)unregisterScriptHandler;
 
-+ (int)  addTwoNumbers:(NSDictionary *)dict;
-+ (void) callbackScriptHandler;
++ (int)addTwoNumbers:(NSDictionary*)dict;
++ (void)callbackScriptHandler;
 
-+ (void) printLuaTableToDictionary:(NSDictionary *)dict;
++ (void)printLuaTableToDictionary:(NSDictionary*)dict;
 
-- (id) init;
+- (id)init;
 @end
 
 #endif  //  COCOS2DX_SAMPLES_TESTLUA_PROJ_IOS_LUAOBJECTCBRIDGETEST_H
diff --git a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm
index 07c722752fd6..f715a6b69dce 100644
--- a/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm
+++ b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -34,23 +34,23 @@ @implementation LuaObjectCBridgeTest
 
 static LuaObjectCBridgeTest* s_instance = nil;
 
-+ (LuaObjectCBridgeTest*) getInstance
++ (LuaObjectCBridgeTest*)getInstance
 {
     if (!s_instance)
     {
         s_instance = [LuaObjectCBridgeTest alloc];
         [s_instance init];
     }
-    
+
     return s_instance;
 }
 
-+ (void) destroyInstance
++ (void)destroyInstance
 {
     [s_instance release];
 }
 
-- (void) setScriptHandler:(int)scriptHandler
+- (void)setScriptHandler:(int)scriptHandler
 {
     if (_scriptHandler)
     {
@@ -60,45 +60,44 @@ - (void) setScriptHandler:(int)scriptHandler
     _scriptHandler = scriptHandler;
 }
 
-- (int) getScriptHandler
+- (int)getScriptHandler
 {
     return _scriptHandler;
 }
 
-
-+(void) registerScriptHandler:(NSDictionary *)dict
++ (void)registerScriptHandler:(NSDictionary*)dict
 {
     [[LuaObjectCBridgeTest getInstance] setScriptHandler:[[dict objectForKey:@"scriptHandler"] intValue]];
 }
 
-
-+ (void) unregisterScriptHandler
++ (void)unregisterScriptHandler
 {
     [[LuaObjectCBridgeTest getInstance] setScriptHandler:0];
 }
 
-+ (int)  addTwoNumbers:(NSDictionary *)dict
++ (int)addTwoNumbers:(NSDictionary*)dict
 {
     int num1 = [[dict objectForKey:@"num1"] intValue];
     int num2 = [[dict objectForKey:@"num2"] intValue];
-    
+
     return num1 + num2;
 }
 
-+ (void) callbackScriptHandler
++ (void)callbackScriptHandler
 {
     int scriptHandler = [[LuaObjectCBridgeTest getInstance] getScriptHandler];
     if (scriptHandler)
     {
         LuaBridge::pushLuaFunctionById(scriptHandler);
-        LuaStack *stack = LuaBridge::getStack();
+        LuaStack* stack = LuaBridge::getStack();
         stack->pushString("success");
         stack->executeFunction(1);
     }
 }
 
-+(void) printLuaTableToDictionary:(NSDictionary *)dict{
-    NSLog(@"lua to OC data is :%@",dict);
++ (void)printLuaTableToDictionary:(NSDictionary*)dict
+{
+    NSLog(@"lua to OC data is :%@", dict);
 }
 
 - (id)init
diff --git a/tests/lua-tests/project/proj.ios_mac/mac/main.cpp b/tests/lua-tests/project/proj.ios_mac/mac/main.cpp
index 32debbd1c94f..820418a1678e 100644
--- a/tests/lua-tests/project/proj.ios_mac/mac/main.cpp
+++ b/tests/lua-tests/project/proj.ios_mac/mac/main.cpp
@@ -1,19 +1,19 @@
 /****************************************************************************
  Copyright (c) 2010 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     AppDelegate app;
     return Application::getInstance()->run();
diff --git a/tests/lua-tests/project/proj.linux/main.cpp b/tests/lua-tests/project/proj.linux/main.cpp
index 042c94fef689..c03ce74184e9 100644
--- a/tests/lua-tests/project/proj.linux/main.cpp
+++ b/tests/lua-tests/project/proj.linux/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@
 
 USING_NS_CC;
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     // create the application instance
     AppDelegate app;
diff --git a/tests/lua-tests/project/proj.win32/main.cpp b/tests/lua-tests/project/proj.win32/main.cpp
index a0ed7a9a4212..0c8360204bba 100644
--- a/tests/lua-tests/project/proj.win32/main.cpp
+++ b/tests/lua-tests/project/proj.win32/main.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,10 +31,7 @@ USING_NS_CC;
 // uncomment below line, open debug console
 #define USE_WIN32_CONSOLE
 
-int WINAPI _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
diff --git a/tests/lua-tests/project/proj.win32/main.h b/tests/lua-tests/project/proj.win32/main.h
index 34889a4540cd..059e4dccacbf 100644
--- a/tests/lua-tests/project/proj.win32/main.h
+++ b/tests/lua-tests/project/proj.win32/main.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,10 +25,10 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
 
 // Windows Header Files:
 #include <windows.h>
 #include <tchar.h>
 
-#endif    // __WINMAIN_H__
+#endif  // __WINMAIN_H__
diff --git a/tests/lua-tests/project/proj.win32/resource.h b/tests/lua-tests/project/proj.win32/resource.h
index 2cbcafdca9e8..558baed6e6ad 100644
--- a/tests/lua-tests/project/proj.win32/resource.h
+++ b/tests/lua-tests/project/proj.win32/resource.h
@@ -1,18 +1,18 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
- 
+
  http://www.cocos2d-x.org
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,18 +27,18 @@
 // Used by lua-tests.RC
 //
 
-#define IDS_PROJNAME                100
-#define IDR_TESTLUA    100
+#define IDS_PROJNAME 100
+#define IDR_TESTLUA 100
 
-#define ID_FILE_NEW_WINDOW            32771
+#define ID_FILE_NEW_WINDOW 32771
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
+#    ifndef APSTUDIO_READONLY_SYMBOLS
+#        define _APS_NEXT_RESOURCE_VALUE 201
+#        define _APS_NEXT_CONTROL_VALUE 1000
+#        define _APS_NEXT_SYMED_VALUE 101
+#        define _APS_NEXT_COMMAND_VALUE 32775
+#    endif
 #endif
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 1b875f49fb98..655eb63d834e 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -65,6 +65,17 @@ endif()
 
 add_library(thirdparty STATIC empty.cpp)
 
+# header only libs
+target_include_directories(thirdparty
+	INTERFACE "robin-map/include"
+)
+
+if (ANDROID)
+    target_include_directories(thirdparty
+        INTERFACE "jni.hpp/include"
+    )
+endif()
+
 if(MACOSX OR ANDROID OR WINDOWS)
     add_subdirectory(zlib)
     target_link_libraries(thirdparty 
@@ -304,6 +315,7 @@ if(BUILD_DEP_LLHTTP)
     target_link_libraries(thirdparty llhttp)
 endif()
 
+# yaml
 if(BUILD_DEP_YAML_CPP)
     set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
@@ -316,6 +328,7 @@ if(BUILD_DEP_YAML_CPP)
     # target_link_libraries(thirdparty yaml-cpp)
 endif()
 
+# kcp
 if(BUILD_DEP_KCP)
     add_subdirectory(kcp)
     configure_target_outdir(kcp)
@@ -323,6 +336,7 @@ if(BUILD_DEP_KCP)
     target_compile_definitions(thirdparty PUBLIC YASIO_HAVE_KCP=1)
 endif()
 
+# fmt-lib
 add_subdirectory(fmt)
 target_link_libraries(thirdparty fmt-header-only)
 configure_target_outdir(fmt)
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 7c206677ea8c..79cd1af021c6 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -79,6 +79,11 @@
 - Version: git d78c3d2
 - License: MIT
 
+## jni.hpp
+- Upstream: https://github.com/mapbox/jni.hpp
+- Version: v4.0.0
+- License: MIT-like
+
 ## jpeg (libjpeg-turbo)
 - Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo
 - Version: 2.1.2
@@ -181,6 +186,13 @@
 - Version: git 65b314a (747) with dtCrowd::getEditableAgentAnim
 - License: zlib
 
+## robin-map
+- Upstream: https://github.com/Tessil/robin-map
+- Version: git 0.6.3-84c1bee (101) with modified for more compatible with stl
+    - Modify `robin_map::iterator->second` to mutable same with `stl map/unordered_map`
+    - Forward `robin_map::operator[]` key by `std::forward` same with `stl map/unordered_map`
+- License: MIT
+
 ## stb (stb_image)
 - Upstream: https://github.com/nothings/stb
 - Version: 2.27
@@ -191,11 +203,6 @@
 - Version: git 1.2.4-ec6bff2 (168)
 - License: BSD-2-Clause
 
-## tsl (robin-map)
-- Upstream: https://github.com/Tessil/robin-map
-- Version: git 0.6.3-84c1bee (100)
-- License: MIT
-
 ## unzip (minizip-1.2)
 - Upstream: https://github.com/simdsoft/mz12
 - Version: 1.2 with bugfixs & improvements
diff --git a/thirdparty/jni.hpp/LICENSE.txt b/thirdparty/jni.hpp/LICENSE.txt
new file mode 100644
index 000000000000..b55eda305dda
--- /dev/null
+++ b/thirdparty/jni.hpp/LICENSE.txt
@@ -0,0 +1,17 @@
+Copyright © 2016, Mapbox
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+The above license excludes the files test/android/jni.h and test/openjdk/jni.h, which are
+included for testing purposes and covered by their respective copyrights and licenses.
diff --git a/thirdparty/jni.hpp/README.md b/thirdparty/jni.hpp/README.md
new file mode 100644
index 000000000000..f17e64f40736
--- /dev/null
+++ b/thirdparty/jni.hpp/README.md
@@ -0,0 +1,94 @@
+jni.hpp is a modern, type-safe, header-only, C++14  wrapper for [JNI (Java Native Interface)](http://docs.oracle.com/javase/7/docs/technotes/guides/jni/). Its aim is to make calling Java from C++, or C++ from Java, convenient and safe, without sacrificing low-level control, as you commonly do with code generation approaches.
+
+Two levels of wrappers are provided.
+
+## Low-level wrappers
+
+The low-level wrappers match JNI, type-for-type and function-for-function, with modern C++ equivalents in a `jni` namespace. The matching uniformly follows a set of rules.
+
+**Rules for Names**
+* Everything in jni.hpp is in the `jni` namespace.
+* When a name exists in JNI, the same name is used in the namespace.
+* When the original name is a macro, a lowercase name is used instead, e.g. `jni::jni_ok` for `JNI_OK`.
+
+**Rules for Types**
+* Types corresponding to Java primitive types (`jni::jboolean`, `jni::jint`, `jni::jdouble`, etc.) are matched unchanged.
+* Types corresponding to Java reference types (`jni::jobject`, `jni::jclass`, `jni::jarray`, etc.) are  non-copyable and non-constructible. Their references and pointers automatically convert to base types as expected. (These types do not hide pointer-ness behind a confusing typedef, like the underlying JNI headers do.)
+* `jni::jsize` is `std::size_t`, not a signed integer. jni.hpp checks for overflow in the necessary places.
+* Ownership types are instantiations of `unique_ptr`, and `using` declarations are provided for each specific instantiation, e.g. `jni::UniqueGlobalRef`.
+* Families of functions, such as `Call*Method` and `CallStatic*Method`, are matched with a single template function, such as `jni::CallMethod<ResultType>` and `jni::CallStaticMethod<ResultType>`.
+* `jni::jvalue` and the `Call*MethodV` and `Call*MethodA` function families are made redundant by type safety, and omitted.
+
+**Rules for Parameters and Results**
+* Parameters are passed, and results returned, by value or reference, not by pointer. An exception is made for possibly-null `jni::jobject` parameters and results, which _are_ pointers.
+* When transferring ownership out of a function, the return type is an ownership type.
+* When transferring ownership into a function, the parameter type is an ownership type.
+* Output parameters are returned, not passed as pointer-to-pointer. When there are multiple outputs, they are returned as a `std::tuple`.
+* Whenever a function receives paired "pointer to `T` and length" parameters, an overload is provided that accepts a statically-sized array, `std::array<T>`, `std::vector<T>`, or (if `T` is a character type) `std::basic_string<T>` argument. These overloads compute the length automatically.
+* In string-related functions, `char16_t` replaces `jchar`.
+
+**Rules for Error Handling**
+
+* Errors are thrown, not returned or otherwise left to be explicitly checked.
+* Pending Java exceptions are checked after every JNI call that may produce a pending Java exception, and thrown as `jni::PendingJavaException`.
+* [Invocation API](https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#wp9502) errors are thrown as `std::system_error`s containing `std::error_code`s with a custom category.
+
+## High-level wrappers
+
+The high-level wrappers provide additional syntactic convenience and type safety when working with non-primitive Java types. They are built around the concept of _class tags_. A class tag is a C++ type that provides a static `Name` method returning a fully-qualified Java class name, thus associating a unique C++ type with the corresponding Java class. For example:
+
+```C++
+struct Math { static constexpr auto Name() { return "java/lang/Math"; } };
+```
+
+The high-level wrappers consist of a set of classes templated on class tag:
+
+* `jni::Class<Tag>`, a wrapper for a reference to the Java class associated with the tag.
+* `jni::Object<Tag>`, a wrapper for a (possibly-null) reference to an instance of the Java class associated with the tag.
+* `jni::Array<E>`, a wrapper for a (possibly-null) reference to a Java array. The element type `E` is a jni.hpp primitive type or `Object<Tag>`.
+* `jni::Constructor<Tag, Args...>`, a wrapper for a constructor for the the Java class associated with the tag. The result type `R` and each argument type in `Args` is a jni.hpp primitive type or `Object<Tag>`.
+* `jni::Method<Tag, R (Args...)>`, a wrapper for an instance method of the Java class associated with the tag. The result type `R` and each argument type in `Args` is a jni.hpp primitive type or `Object<Tag>`.
+* `jni::StaticMethod<Tag, R (Args...)>`, a wrapper for a static method of the Java class associated with the tag. The result type `R` and each argument type in `Args` is a jni.hpp primitive type or `Object<Tag>`.
+* `jni::Field<Tag, T>`, a wrapper for an instance field of the Java class associated with the tag, and providing `Get` and `Set` methods. The field type `T` is a jni.hpp primitive type or `Object<Tag>`.
+* `jni::StaticField<Tag, T>`, a wrapper for a static field of the Java class associated with the tag, and providing `Get` and `Set` methods. The field type `T` is a jni.hpp primitive type or `Object<Tag>`.
+
+## Method Registration
+
+Registering native methods is a central part of JNI, and jni.hpp provides several features that make this task safer and more convenient. The jni.hpp wrapper method `jni::RegisterNatives` has the following signature:
+
+```C++
+template < class... Methods >
+void RegisterNatives(jni::JNIEnv& env, jni::jclass&, const Methods&... methods);
+```
+
+In other words, rather than receiving a length and pointer to an array of `JNIMethod`s, it takes a variable number of variable types. This allows `jni::RegisterNatives` to type check the methods, ensuring that their type signatures are valid for JNI.
+
+Use the helper function `jni::MakeNativeMethod` to construct method arguments for `jni::RegisterNatives`. `jni::MakeNativeMethod` wraps your method in a `try` / `catch` block that translates C++ exceptions to Java exceptions. It is overloaded on the following combinations of arguments:
+
+* A `const char *` name, `const char *` signature, and lambda. The type of the first parameter of the lambda must be `jni::JNIEnv&`. The type of the second parameter must be either `jni::jclass*` (for a native static method) or `jni::jobject*` (for a native instance method). The result type must be a JNI primitive type or type convertable to `jni::jobject*`. (These requirements are type checked.)
+* A `const char *` name, `const char *` signature, and function pointer. The function has the same  parameter and return type requirements as the lambda. In order to guarantee a unique exception-handling wrapper for each unique function pointer, the function pointer must be provided as a _template parameter_ rather than method parameter:
+
+ ```C++
+ jni::MakeNativeMethod<decltype(myFunction), myFunction>(name, signature)
+ ```
+
+ The repetition of `myFunction` with `decltype` is necessary because it is not possible to infer the function type from the non-type template parameter. You may wish to define and use a macro to avoid the repetition.
+* A `const char *` name and lamba whose parameter and return types use high-level jni.hpp wrapper types. In this case, jni.hpp will compute the signature automatically.
+* A `const char *` name and function pointer whose parameter and return types use high-level jni.hpp wrapper types. Again, jni.hpp will compute the signature automatically, and again, the function pointer must be provided as a template parameter rather than method parameter.
+
+Finally, jni.hpp provides a mechanism for registering a "native peer": a long-lived native object corresponding to a Java object, usually created when the Java object is created and destroyed when the Java object's finalizer runs. Between creation and finalization, a pointer to the native peer is stored in a `long` field on the Java object. jni.hpp will take care of wrapping lambdas, function pointers, or member function pointers with code that automatically gets the value of this field, casts it to a pointer to the peer, and calls the member function (or passes a reference to the peer as an argument to the lambda or function pointer). See the example code for details.
+
+## Example code
+
+Example code for both the low-level and high-level wrappers is provided in [the `examples` subdirectory](https://github.com/mapbox/jni.hpp/tree/master/examples). This code shows the use of jni.hpp for:
+
+* Registering native methods such that they can be called from Java.
+* Calling back into Java methods from native methods.
+* Native peer registration.
+
+## Prior art
+
+* Many code generation approaches. SWIG, [JavaCPP](https://github.com/bytedeco/javacpp), and so on. But jni.hpp is explicitly not a binding  generator.
+* [JniHelpers](https://github.com/spotify/JniHelpers) is similar in spirit. In comparison, jni.hpp takes advantage of modern C++ features such as `unique_ptr` and variadic templates, introduces no preprocessor macros, and is header-only -- no build step required.
+* I hear that Boost.Python is similar, but I did not reference it in building this library.
+* The low-level wrapping strategy is inspired by [Lisa Lippincott's presentation "How to call C libraries from C++"](https://github.com/jfirebaugh/PlusPlus) from Cppcon 2014, and by her previous work ["The Nitrogen Manifesto"](http://nitric.sourceforge.net/The%20Nitrogen%20Manifesto.pdf). However jni.hpp does not use "PlusPlus", the wrapping library abstraction mentioned in the presentation; I found it to be a poor economy compared to simply writing out the wrappers manually.
diff --git a/thirdparty/jni.hpp/include/jni/advanced_ownership.hpp b/thirdparty/jni.hpp/include/jni/advanced_ownership.hpp
new file mode 100644
index 000000000000..aada43fbce52
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/advanced_ownership.hpp
@@ -0,0 +1,112 @@
+#pragma once
+
+#include <jni/functions.hpp>
+
+namespace jni
+   {
+    // A deleter that gets the JNIEnv via GetEnv, rather than storing the value passed to the constructor.
+    // The deleting thread must have a JVM attachment.
+    //
+    // Useful when deletion will happen on an auxiliary thread, particularly the finalizer thread. In such
+    // cases, you may use one of the following:
+    //
+    //   low-level: UniqueGlobalRef<jobject, EnvGettingDeleter> and NewGlobalRef<EnvGettingDeleter>
+    //   high-level: Global<Object<Tag>, EnvGettingDeleter> and obj.NewGlobalRef<EnvGettingDeleter>
+    //
+    template < RefDeletionMethod DeleteRef >
+    class EnvGettingDeleter
+       {
+        private:
+            JavaVM* vm = nullptr;
+
+        public:
+            EnvGettingDeleter() = default;
+            EnvGettingDeleter(JNIEnv& e) : vm(&GetJavaVM(e)) {}
+
+            void operator()(jobject* p) const
+               {
+                if (p)
+                   {
+                    assert(vm);
+                    (GetEnv(*vm).*DeleteRef)(Unwrap(p));
+                   }
+               }
+       };
+
+    // A deleter that first tries GetEnv, but falls back to AttachCurrentThread if a JVM is not already attached.
+    // In the latter case, it detaches after deleting the reference.
+    //
+    // Useful when deletion will happen on an auxiliary thread which may or may not have a JVM attachment. In such
+    // cases, you may use one of the following:
+    //
+    //   low-level: UniqueGlobalRef<jobject, EnvAttachingDeleter> and NewGlobalRef<EnvAttachingDeleter>
+    //   high-level: Global<Object<Tag>, EnvAttachingDeleter> and obj.NewGlobalRef<EnvAttachingDeleter>
+    //
+    template < RefDeletionMethod DeleteRef >
+    class EnvAttachingDeleter
+       {
+        private:
+            JavaVM* vm = nullptr;
+
+        public:
+            EnvAttachingDeleter() = default;
+            EnvAttachingDeleter(JNIEnv& e) : vm(&GetJavaVM(e)) {}
+
+            void operator()(jobject* p) const
+               {
+                if (p)
+                   {
+                    assert(vm);
+                    JNIEnv* env = nullptr;
+                    jint err = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_1);
+                    if (err == JNI_OK)
+                       {
+                        (env->*DeleteRef)(Unwrap(p));
+                       }
+                    else if (err == JNI_EDETACHED)
+                       {
+                        ((*AttachCurrentThread(*vm)).*DeleteRef)(Unwrap(p));
+                       }
+                    else
+                       {
+                        CheckErrorCode(err);
+                       }
+                   }
+               }
+       };
+
+    // A deleter that tries to get the JNIEnv via GetEnv, and does nothing if that fails.
+    //
+    // This is used to ignore GlobalRef deletions that happen after a thread has been detached,
+    // for instance during process shutdown, when there's no need to release the reference anyway.
+    // Specifically, it's what Class<T>::Singleton uses.
+    //
+    template < RefDeletionMethod DeleteRef >
+    class EnvIgnoringDeleter
+       {
+        private:
+            JavaVM* vm = nullptr;
+
+        public:
+            EnvIgnoringDeleter() = default;
+            EnvIgnoringDeleter(JNIEnv& e) : vm(&GetJavaVM(e)) {}
+
+            void operator()(jobject* p) const
+               {
+                if (p)
+                   {
+                    assert(vm);
+                    JNIEnv* env = nullptr;
+                    jint err = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_1);
+                    if (err == JNI_OK)
+                       {
+                        (env->*DeleteRef)(Unwrap(p));
+                       }
+                    else if (err != JNI_EDETACHED)
+                       {
+                        CheckErrorCode(err);
+                       }
+                   }
+               }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/array.hpp b/thirdparty/jni.hpp/include/jni/array.hpp
new file mode 100644
index 000000000000..9c3338d79d66
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/array.hpp
@@ -0,0 +1,147 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/object.hpp>
+#include <jni/tagging.hpp>
+#include <jni/make.hpp>
+
+namespace jni
+   {
+    template < class E, class Enable >
+    class Array;
+
+    template < class E >
+    class Array< E, std::enable_if_t<IsPrimitive<E>::value> > : public Object< ArrayTag<E> >
+       {
+        public:
+            using SuperType = Object< ArrayTag<E> >;
+            using UntaggedType = typename SuperType::UntaggedType;
+            using ElementType = E;
+
+        protected:
+            explicit Array(std::nullptr_t = nullptr)
+               {}
+
+            explicit Array(UntaggedType* p)
+               : SuperType(p)
+               {}
+
+            Array(const Array&) = delete;
+            Array& operator=(const Array&) = delete;
+
+        public:
+            jsize Length(JNIEnv& env) const
+               {
+                return GetArrayLength(env, SafeDereference(env, this->get()));
+               }
+
+            ElementType Get(JNIEnv& env, jsize index) const
+               {
+                ElementType e;
+                GetArrayRegion(env, SafeDereference(env, this->get()), index, 1, &e);
+                return e;
+               }
+
+            void Set(JNIEnv& env, jsize index, const ElementType& value)
+               {
+                SetArrayRegion(env, SafeDereference(env, this->get()), index, 1, &value);
+               }
+
+            template < class Array >
+            void GetRegion(JNIEnv& env, jsize start, Array& buf) const
+               {
+                GetArrayRegion(env, SafeDereference(env, this->get()), start, buf);
+               }
+
+            template < class Array >
+            void SetRegion(JNIEnv& env, jsize start, const Array& buf)
+               {
+                SetArrayRegion(env, SafeDereference(env, this->get()), start, buf);
+               }
+
+            static Local<Array<E>> New(JNIEnv& env, jsize length)
+               {
+                return Local<Array<E>>(env, &NewArray<E>(env, length));
+               }
+       };
+
+    template < class TheTag >
+    class Array< Object<TheTag> > : public Object< ArrayTag<Object<TheTag>> >
+       {
+        public:
+            using SuperType = Object< ArrayTag<Object<TheTag>> >;
+            using UntaggedType = typename SuperType::UntaggedType;
+            using TagType = TheTag;
+            using ElementType = Object<TagType>;
+            using UntaggedElementType = typename ElementType::UntaggedType;
+
+        protected:
+            explicit Array(std::nullptr_t = nullptr)
+               {}
+
+            explicit Array(UntaggedType* p)
+               : SuperType(p)
+               {}
+
+            Array(const Array&) = delete;
+            Array& operator=(const Array&) = delete;
+
+        public:
+            jsize Length(JNIEnv& env) const
+               {
+                return GetArrayLength(env, SafeDereference(env, this->get()));
+               }
+
+            Local<ElementType> Get(JNIEnv& env, jsize index) const
+               {
+                return Local<ElementType>(env,
+                    reinterpret_cast<UntaggedElementType*>(
+                        GetObjectArrayElement(env, SafeDereference(env, this->get()), index)));
+               }
+
+            void Set(JNIEnv& env, jsize index, const ElementType& value)
+               {
+                SetObjectArrayElement(env, SafeDereference(env, this->get()), index, Untag(value));
+               }
+
+            static Local<Array<Object<TheTag>>> New(JNIEnv& env, jsize length, const Object<TheTag>* initialElement = nullptr)
+               {
+                return Local<Array<Object<TheTag>>>(env, &NewObjectArray(env, length, *Class<TheTag>::Singleton(env), initialElement ? initialElement->get() : nullptr));
+               }
+      };
+
+    template < class T >
+    std::vector<T> MakeAnything(ThingToMake<std::vector<T>>, JNIEnv& env, const Array<T>& array)
+       {
+        NullCheck(env, array.get());
+        std::vector<T> result(GetArrayLength(env, *array));
+        GetArrayRegion(env, *array, 0, result);
+        return result;
+       }
+
+    template < class T >
+    Local<Array<T>> MakeAnything(ThingToMake<Array<T>>, JNIEnv& env, const std::vector<T>& array)
+       {
+        Local<Array<T>> result = Local<Array<T>>(env, &NewArray<T>(env, array.size()));
+        SetArrayRegion(env, *result, 0, array);
+        return result;
+       }
+
+    inline
+    std::string MakeAnything(ThingToMake<std::string>, JNIEnv& env, const Array<jbyte>& array)
+       {
+        NullCheck(env, array.get());
+        std::string result;
+        result.resize(GetArrayLength(env, *array));
+        GetArrayRegion(env, *array, 0, result.size(), reinterpret_cast<jbyte*>(&result[0]));
+        return result;
+       }
+
+    inline
+    Local<Array<jbyte>> MakeAnything(ThingToMake<Array<jbyte>>, JNIEnv& env, const std::string& string)
+       {
+        Local<Array<jbyte>> result(env, &NewArray<jbyte>(env, string.size()));
+        SetArrayRegion(env, *result, 0, string.size(), reinterpret_cast<const jbyte*>(&string[0]));
+        return result;
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/arraylike.hpp b/thirdparty/jni.hpp/include/jni/arraylike.hpp
new file mode 100644
index 000000000000..d605f8493ed8
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/arraylike.hpp
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <type_traits>
+#include <string>
+#include <array>
+#include <vector>
+
+namespace jni
+   {
+    template < class T > struct IsArraylike: std::false_type {};
+
+    template < class E, std::size_t n >    struct IsArraylike< E[n]                     > : std::true_type {};
+    template < class E, std::size_t n >    struct IsArraylike< std::array<E,n>          > : std::true_type {};
+    template < class E, class A >          struct IsArraylike< std::vector<E,A>         > : std::true_type {};
+    template < class C, class T, class A > struct IsArraylike< std::basic_string<C,T,A> > : std::true_type {};
+
+
+    template < class T > struct ArraylikeElementType;
+
+    template < class E, std::size_t n >    struct ArraylikeElementType< E[n]                     > { using Type = E; };
+    template < class E, std::size_t n >    struct ArraylikeElementType< std::array<E,n>          > { using Type = E; };
+    template < class E, class A >          struct ArraylikeElementType< std::vector<E,A>         > { using Type = E; };
+    template < class C, class T, class A > struct ArraylikeElementType< std::basic_string<C,T,A> > { using Type = C; };
+
+    template < class T > using ArraylikeElement = typename ArraylikeElementType<T>::type;
+
+
+    template < class E, std::size_t n >    E       * ArraylikeData(E(&a)[n])                              { return a; }
+    template < class E, std::size_t n >    E       * ArraylikeData(      std::array<E,n>& a)              { return a.data(); }
+    template < class E, std::size_t n >    E const * ArraylikeData(const std::array<E,n>& a)              { return a.data(); }
+    template < class E, class A >          E       * ArraylikeData(      std::vector<E,A>& a)             { return a.data(); }
+    template < class E, class A >          E const * ArraylikeData(const std::vector<E,A>& a)             { return a.data(); }
+    template < class C, class T, class A > C       * ArraylikeData(      std::basic_string<C,T,A>& a)     { return &a[0]; }
+    template < class C, class T, class A > C const * ArraylikeData(const std::basic_string<C,T,A>& a)     { return &a[0]; }
+
+
+    template < class E, std::size_t n >    std::size_t ArraylikeSize(E(&)[n])                            { return n; }
+    template < class E, std::size_t n >    std::size_t ArraylikeSize(const std::array<E,n>&)             { return n; }
+    template < class E, class A >          std::size_t ArraylikeSize(const std::vector<E,A>& a)          { return a.size(); }
+    template < class C, class T, class A > std::size_t ArraylikeSize(const std::basic_string<C,T,A>& a)  { return a.size(); }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/boxing.hpp b/thirdparty/jni.hpp/include/jni/boxing.hpp
new file mode 100644
index 000000000000..566036164101
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/boxing.hpp
@@ -0,0 +1,159 @@
+#pragma once
+
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+
+namespace jni
+   {
+    template < class > struct Boxer;
+    template < class > struct Unboxer;
+
+    template < class Unboxed >
+    decltype(auto) Box(JNIEnv& env, Unboxed&& unboxed)
+       {
+        return Boxer<typename std::decay<Unboxed>::type>().Box(env, std::forward<Unboxed>(unboxed));
+       }
+
+    template < class T >
+    decltype(auto) Unbox(JNIEnv& env, const T& boxed)
+       {
+        return Unboxer<typename T::TagType>().Unbox(env, boxed);
+       }
+
+
+    struct BooleanTag
+       {
+        using SuperTag = ObjectTag;
+        static constexpr auto Name() { return "java/lang/Boolean"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "booleanValue"; }
+       };
+
+    struct CharacterTag
+       {
+        using SuperTag = ObjectTag;
+        static constexpr auto Name() { return "java/lang/Character"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "charValue"; }
+       };
+
+    struct NumberTag
+       {
+        using SuperTag = ObjectTag;
+        static constexpr auto Name() { return "java/lang/Number"; }
+       };
+
+    struct ByteTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Byte"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "byteValue"; }
+       };
+
+    struct ShortTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Short"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "shortValue"; }
+       };
+
+    struct IntegerTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Integer"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "intValue"; }
+       };
+
+    struct LongTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Long"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "longValue"; }
+       };
+
+    struct FloatTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Float"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "floatValue"; }
+       };
+
+    struct DoubleTag
+       {
+        using SuperTag = NumberTag;
+        static constexpr auto Name() { return "java/lang/Double"; }
+        static constexpr auto BoxStaticMethodName() { return "valueOf"; }
+        static constexpr auto UnboxMethodName() { return "doubleValue"; }
+       };
+
+
+    using Boolean   = Object<BooleanTag>;
+    using Character = Object<CharacterTag>;
+    using Number    = Object<NumberTag>;
+    using Byte      = Object<ByteTag>;
+    using Short     = Object<ShortTag>;
+    using Integer   = Object<IntegerTag>;
+    using Long      = Object<LongTag>;
+    using Float     = Object<FloatTag>;
+    using Double    = Object<DoubleTag>;
+
+
+    template < class Tag, class Unboxed >
+    struct PrimitiveTypeBoxer
+       {
+        Local<Object<Tag>> Box(JNIEnv& env, Unboxed unboxed) const
+           {
+            static auto& klass = Class<Tag>::Singleton(env);
+            static auto box = klass.template GetStaticMethod<Object<Tag> (Unboxed)>(env, Tag::BoxStaticMethodName());
+            return klass.Call(env, box, unboxed);
+           }
+       };
+
+    template <> struct Boxer< jboolean > : PrimitiveTypeBoxer< BooleanTag   , jboolean > {};
+    template <> struct Boxer< jbyte    > : PrimitiveTypeBoxer< ByteTag      , jbyte    > {};
+    template <> struct Boxer< jchar    > : PrimitiveTypeBoxer< CharacterTag , jchar    > {};
+    template <> struct Boxer< jshort   > : PrimitiveTypeBoxer< ShortTag     , jshort   > {};
+    template <> struct Boxer< jint     > : PrimitiveTypeBoxer< IntegerTag   , jint     > {};
+    template <> struct Boxer< jlong    > : PrimitiveTypeBoxer< LongTag      , jlong    > {};
+    template <> struct Boxer< jfloat   > : PrimitiveTypeBoxer< FloatTag     , jfloat   > {};
+    template <> struct Boxer< jdouble  > : PrimitiveTypeBoxer< DoubleTag    , jdouble  > {};
+
+
+    template < class Tag, class Unboxed >
+    struct PrimitiveTypeUnboxer
+       {
+        Unboxed Unbox(JNIEnv& env, const Object<Tag>& boxed) const
+           {
+            static auto& klass = Class<Tag>::Singleton(env);
+            static auto unbox = klass.template GetMethod<Unboxed ()>(env, Tag::UnboxMethodName());
+            return boxed.Call(env, unbox);
+           }
+       };
+
+    template <> struct Unboxer< BooleanTag   > : PrimitiveTypeUnboxer< BooleanTag   , jboolean > {};
+    template <> struct Unboxer< ByteTag      > : PrimitiveTypeUnboxer< ByteTag      , jbyte    > {};
+    template <> struct Unboxer< CharacterTag > : PrimitiveTypeUnboxer< CharacterTag , jchar    > {};
+    template <> struct Unboxer< ShortTag     > : PrimitiveTypeUnboxer< ShortTag     , jshort   > {};
+    template <> struct Unboxer< IntegerTag   > : PrimitiveTypeUnboxer< IntegerTag   , jint     > {};
+    template <> struct Unboxer< LongTag      > : PrimitiveTypeUnboxer< LongTag      , jlong    > {};
+    template <> struct Unboxer< FloatTag     > : PrimitiveTypeUnboxer< FloatTag     , jfloat   > {};
+    template <> struct Unboxer< DoubleTag    > : PrimitiveTypeUnboxer< DoubleTag    , jdouble  > {};
+
+
+    template < class Tag >
+    struct Boxer<jni::Object<Tag>>
+       {
+        const Object<Tag>& Box(JNIEnv&, const jni::Object<Tag>& o) const { return o; }
+       };
+
+    template < class Tag >
+    struct Unboxer
+       {
+        const Object<Tag>& Unbox(JNIEnv&, const jni::Object<Tag>& o) const { return o; }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/class.hpp b/thirdparty/jni.hpp/include/jni/class.hpp
new file mode 100644
index 000000000000..6cf96c2caacc
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/class.hpp
@@ -0,0 +1,137 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/tagging.hpp>
+#include <jni/advanced_ownership.hpp>
+#include <jni/object.hpp>
+
+namespace jni
+   {
+    template < class TheTag, class... > class Constructor;
+    template < class TheTag, class > class Field;
+    template < class TheTag, class > class StaticField;
+    template < class TheTag, class > class Method;
+    template < class TheTag, class > class StaticMethod;
+
+    template < class TheTag >
+    class Class : public Object<ClassTag>
+       {
+        public:
+            using TagType = TheTag;
+            using SuperType = Object<ClassTag>;
+            using UntaggedType = jclass;
+
+        protected:
+            explicit Class(std::nullptr_t = nullptr)
+               {}
+
+            explicit Class(UntaggedType* p)
+               : SuperType(p)
+               {}
+
+            Class(const Class&) = delete;
+            Class& operator=(const Class&) = delete;
+
+        public:
+            template < class... ExpectedArgs, class... ActualArgs >
+            auto New(JNIEnv& env, const Constructor<TagType, ExpectedArgs...>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, Local<Object<TagType>> >
+               {
+                return Local<Object<TagType>>(env, &NewObject(env, *this->get(), method, Untag(args)...));
+               }
+
+            template < class T >
+            auto Get(JNIEnv& env, const StaticField<TagType, T>& field) const
+               -> std::enable_if_t< IsPrimitive<T>::value, T >
+               {
+                return jni::GetStaticField<T>(env, *this->get(), field);
+               }
+
+            template < class T >
+            auto Get(JNIEnv& env, const StaticField<TagType, T>& field) const
+               -> std::enable_if_t< !IsPrimitive<T>::value, Local<T> >
+               {
+                return Local<T>(env, reinterpret_cast<typename T::UntaggedType*>(jni::GetStaticField<jobject*>(env, *this->get(), field)));
+               }
+
+            template < class T >
+            auto Set(JNIEnv& env, const StaticField<TagType, T>& field, T value) const
+               -> std::enable_if_t< IsPrimitive<T>::value >
+               {
+                SetStaticField<T>(env, *this->get(), field, value);
+               }
+
+            template < class Expected, class Actual >
+            auto Set(JNIEnv& env, const StaticField<TagType, Expected>& field, const Actual& value) const
+               -> std::enable_if_t< !IsPrimitive<Expected>::value
+                                 && std::is_convertible<const Actual&, const Expected&>::value >
+               {
+                SetStaticField<jobject*>(env, *this->get(), field, value.get());
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const StaticMethod<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< IsPrimitive<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, R >
+               {
+                return CallStaticMethod<R>(env, *this->get(), method, Untag(args)...);
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const StaticMethod<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< !IsPrimitive<R>::value
+                                 && !std::is_void<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, Local<R> >
+               {
+                return Local<R>(env, reinterpret_cast<typename R::UntaggedType*>(CallStaticMethod<jobject*>(env, *this->get(), method, Untag(args)...)));
+               }
+
+            template < class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const StaticMethod<TagType, void (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value >
+               {
+                CallStaticMethod<void>(env, *this->get(), method, Untag(args)...);
+               }
+
+            static Local<Class> Find(JNIEnv& env)
+               {
+                return Local<Class>(env, &FindClass(env, TagType::Name()));
+               }
+
+            static const Class& Singleton(JNIEnv& env)
+               {
+                static Global<Class, EnvIgnoringDeleter> singleton = NewGlobal<EnvIgnoringDeleter>(env, Find(env));
+                return singleton;
+               }
+
+            template < class... Args >
+            Constructor<TagType, Args...> GetConstructor(JNIEnv& env) const
+               {
+                return Constructor<TagType, Args...>(env, *this);
+               }
+
+            template < class T >
+            Field<TagType, T> GetField(JNIEnv& env, const char* name) const
+               {
+                return Field<TagType, T>(env, *this, name);
+               }
+
+            template < class T >
+            StaticField<TagType, T> GetStaticField(JNIEnv& env, const char* name) const
+               {
+                return StaticField<TagType, T>(env, *this, name);
+               }
+
+            template < class T >
+            Method<TagType, T> GetMethod(JNIEnv& env, const char* name) const
+               {
+                return Method<TagType, T>(env, *this, name);
+               }
+
+            template < class T >
+            StaticMethod<TagType, T> GetStaticMethod(JNIEnv& env, const char* name) const
+               {
+                return StaticMethod<TagType, T>(env, *this, name);
+               }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/constructor.hpp b/thirdparty/jni.hpp/include/jni/constructor.hpp
new file mode 100644
index 000000000000..97896c95acee
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/constructor.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <jni/method.hpp>
+
+namespace jni
+   {
+    template < class TagType, class... Args >
+    class Constructor : public Method<TagType, void (Args...)>
+       {
+        public:
+            Constructor(JNIEnv& env, const Class<TagType>& clazz)
+               : Method<TagType, void (Args...)>(env, clazz, "<init>")
+               {}
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/errors.hpp b/thirdparty/jni.hpp/include/jni/errors.hpp
new file mode 100644
index 000000000000..3d91f0d03c73
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/errors.hpp
@@ -0,0 +1,125 @@
+#pragma once
+
+#include <jni/types.hpp>
+#include <jni/traits.hpp>
+
+#include <system_error>
+#include <string>
+
+namespace std
+   {
+    template <> struct is_error_code_enum<jni::error> : public true_type {};
+   }
+
+namespace jni
+   {
+    inline const std::error_category& ErrorCategory()
+       {
+        class Impl : public std::error_category
+           {
+            public:
+                const char* name() const noexcept override
+                   {
+                    return "JNI";
+                   }
+
+                std::string message(int ev) const override
+                   {
+                    switch (static_cast<error>(ev))
+                       {
+                        case jni_ok:        return "OK";
+                        case jni_err:       return "Unspecified error";
+                        case jni_edetached: return "Detached error";
+                        case jni_eversion:  return "Version error";
+                       }
+                    return "Unknown error";
+                   }
+           };
+
+        static Impl impl;
+        return impl;
+       }
+
+    inline void CheckErrorCode(jint err)
+       {
+        if (err != JNI_OK) throw std::system_error(err, ErrorCategory());
+       }
+
+
+    // An exception class indicating the presence of a pending Java exception.
+    // Note that it does not extract the message or other information from the
+    // Java exception; it's not possible to do so without clearing the pending
+    // Java exception, and the calling code needs the option not to do that.
+    // In most cases, the desired behavior is that the thrown PendingJavaException
+    // is caught by an exception handler just before returning to JVM control, and
+    // discarded there. Upon returning to JVM control, Java exception handling
+    // will take over, processing the still-pending Java exception.
+
+    class PendingJavaException {};
+
+    template < class R >
+    R CheckJavaException(JNIEnv& env, R&& r)
+       {
+        if (env.ExceptionCheck()) {
+            env.ExceptionDescribe();
+            throw PendingJavaException();
+        }
+        return std::move(r);
+       }
+
+    inline void CheckJavaException(JNIEnv& env)
+       {
+        if (env.ExceptionCheck()) {
+            env.ExceptionDescribe();
+            throw PendingJavaException();
+        }
+       }
+
+    inline void CheckJavaExceptionThenErrorCode(JNIEnv& env, jint err)
+       {
+        CheckJavaException(env);
+        CheckErrorCode(err);
+       }
+
+
+    inline ::jclass JavaErrorClass(JNIEnv& env)
+       {
+        return env.FindClass("java/lang/Error");
+       }
+
+    // A function to be called from within a try / catch wrapper for a native method:
+    //
+    //   void nativeMethod(JNIEnv* env, ...)
+    //      {
+    //       try
+    //          {
+    //           ...
+    //          }
+    //       catch (...)
+    //          {
+    //           jni::ThrowJavaError(*env, std::current_exception());
+    //          }
+    //      }
+    //
+    // `PendingJavaException` is caught and ignored, other exceptions are converted to
+    // a pending Java exception of class `java.lang.Error`.
+
+    inline void ThrowJavaError(JNIEnv& env, std::exception_ptr e)
+       {
+        try
+           {
+            std::rethrow_exception(e);
+           }
+        catch (const PendingJavaException&)
+           {
+           }
+        catch (const std::exception& e)
+           {
+            env.ThrowNew(JavaErrorClass(env), e.what());
+           }
+        catch (...)
+           {
+            env.ThrowNew(JavaErrorClass(env), "unknown native exception");
+           }
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/field.hpp b/thirdparty/jni.hpp/include/jni/field.hpp
new file mode 100644
index 000000000000..0f7b7140955d
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/field.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+#include <jni/type_signature.hpp>
+#include <jni/tagging.hpp>
+
+namespace jni
+   {
+    template < class TheTag, class T >
+    class Field
+       {
+        private:
+            jfieldID& field;
+
+        public:
+            using TagType = TheTag;
+            using FieldType = T;
+
+            Field(JNIEnv& env, const Class<TagType>& clazz, const char* name)
+              : field(GetFieldID(env, *clazz, name, TypeSignature<T>()()))
+               {}
+
+            operator jfieldID&() const { return field; }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/functions.hpp b/thirdparty/jni.hpp/include/jni/functions.hpp
new file mode 100644
index 000000000000..b559d205628f
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/functions.hpp
@@ -0,0 +1,684 @@
+#pragma once
+
+#include <jni/types.hpp>
+#include <jni/errors.hpp>
+#include <jni/wrapping.hpp>
+#include <jni/ownership.hpp>
+#include <jni/typed_methods.hpp>
+#include <jni/arraylike.hpp>
+
+#include <type_traits>
+#include <cstdlib>
+
+namespace jni
+   {
+    inline jint GetVersion(JNIEnv& env)
+       {
+        return env.GetVersion();
+       }
+
+
+    inline jclass& DefineClass(JNIEnv& env, const char* name, jobject& loader, const jbyte* buf, jsize size)
+       {
+        return *CheckJavaException(env,
+            Wrap<jclass*>(env.DefineClass(name, Unwrap(loader), buf, Unwrap(size))));
+       }
+
+    template < class Array >
+    auto DefineClass(JNIEnv& env, const char* name, jobject& loader, const Array& buf)
+       -> std::enable_if_t< IsArraylike<Array>::value, jclass& >
+       {
+        return DefineClass(env, name, loader, ArraylikeData(buf), ArraylikeSize(buf));
+       }
+
+    inline jclass& FindClass(JNIEnv& env, const char* name)
+       {
+        return *CheckJavaException(env, Wrap<jclass*>(env.FindClass(name)));
+       }
+
+
+    inline jmethodID* FromReflectedMethod(JNIEnv& env, jobject* obj)
+       {
+        return CheckJavaException(env,
+            Wrap<jmethodID*>(env.FromReflectedMethod(Unwrap(obj))));
+       }
+
+    inline jfieldID* FromReflectedField(JNIEnv& env, jobject* obj)
+       {
+        return CheckJavaException(env,
+            Wrap<jfieldID*>(env.FromReflectedField(Unwrap(obj))));
+       }
+
+    inline jobject& ToReflectedMethod(JNIEnv& env, jclass& clazz, jmethodID& method, bool isStatic)
+       {
+        return *CheckJavaException(env,
+            Wrap<jobject*>(env.ToReflectedMethod(Unwrap(clazz), Unwrap(method), isStatic)));
+       }
+
+    inline jobject& ToReflectedField(JNIEnv& env, jclass& clazz, jfieldID& field, bool isStatic)
+       {
+        return *CheckJavaException(env,
+            Wrap<jobject*>(env.ToReflectedField(Unwrap(clazz), Unwrap(field), isStatic)));
+       }
+
+
+    inline jclass* GetSuperclass(JNIEnv& env, jclass& clazz)
+       {
+        return CheckJavaException(env,
+            Wrap<jclass*>(env.GetSuperclass(Unwrap(clazz))));
+       }
+
+    inline bool IsAssignableFrom(JNIEnv& env, jclass& clazz1, jclass& clazz2)
+       {
+        return CheckJavaException(env,
+            env.IsAssignableFrom(Unwrap(clazz1), Unwrap(clazz2)));
+       }
+
+
+    [[noreturn]] inline void Throw(JNIEnv& env, jthrowable& obj)
+       {
+        CheckErrorCode(env.Throw(Unwrap(obj)));
+        throw PendingJavaException();
+       }
+
+    [[noreturn]] inline void ThrowNew(JNIEnv& env, jclass& clazz, const char* msg = nullptr)
+       {
+        CheckErrorCode(env.ThrowNew(Unwrap(clazz), msg));
+        throw PendingJavaException();
+       }
+
+    inline bool ExceptionCheck(JNIEnv& env)
+       {
+        return env.ExceptionCheck();
+       }
+
+    inline jthrowable* ExceptionOccurred(JNIEnv& env)
+       {
+        return Wrap<jthrowable*>(env.ExceptionOccurred());
+       }
+
+    inline void ExceptionDescribe(JNIEnv& env)
+       {
+        env.ExceptionDescribe();
+       }
+
+    inline void ExceptionClear(JNIEnv& env)
+       {
+        env.ExceptionClear();
+       }
+
+    [[noreturn]] inline void FatalError(JNIEnv& env, const char* msg)
+       {
+        env.FatalError(msg);
+        std::abort();
+       }
+
+
+    inline UniqueLocalFrame PushLocalFrame(JNIEnv& env, jint capacity)
+       {
+        CheckJavaExceptionThenErrorCode(env, env.PushLocalFrame(capacity));
+        return UniqueLocalFrame(&env, LocalFrameDeleter());
+       }
+
+    inline jobject* PopLocalFrame(JNIEnv& env, UniqueLocalFrame&& frame, jobject* result = nullptr)
+       {
+        frame.release();
+        return CheckJavaException(env,
+            Wrap<jobject*>(env.PopLocalFrame(Unwrap(result))));
+       }
+
+
+    template < template < RefDeletionMethod > class Deleter, class T >
+    UniqueGlobalRef<T, Deleter> NewGlobalRef(JNIEnv& env, T* t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewGlobalRef(Unwrap(t)));
+        CheckJavaException(env);
+        if (t && !obj)
+            throw std::bad_alloc();
+        return UniqueGlobalRef<T, Deleter>(reinterpret_cast<T*>(obj), Deleter<&JNIEnv::DeleteGlobalRef>(env));
+       }
+
+    template < class T >
+    UniqueGlobalRef<T> NewGlobalRef(JNIEnv& env, T* t)
+       {
+        return NewGlobalRef<DefaultRefDeleter>(env, t);
+       }
+
+    // Attempt to promote a weak reference to a strong one. Returns an empty result
+    // if the weak reference has expired.
+    template < template < RefDeletionMethod > class Deleter, class T, template < RefDeletionMethod > class WeakDeleter >
+    UniqueGlobalRef<T, Deleter> NewGlobalRef(JNIEnv& env, const UniqueWeakGlobalRef<T, WeakDeleter>& t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewGlobalRef(Unwrap(t)));
+        CheckJavaException(env);
+        return UniqueGlobalRef<T, Deleter>(reinterpret_cast<T*>(obj), Deleter<&JNIEnv::DeleteGlobalRef>(env));
+       }
+
+    template < class T, template < RefDeletionMethod > class WeakDeleter >
+    UniqueGlobalRef<T> NewGlobalRef(JNIEnv& env, const UniqueWeakGlobalRef<T, WeakDeleter>& t)
+       {
+        return NewGlobalRef<DefaultRefDeleter>(env, t);
+       }
+
+    template < class T, template < RefDeletionMethod > class Deleter >
+    void DeleteGlobalRef(JNIEnv& env, UniqueGlobalRef<T, Deleter>&& ref)
+       {
+        env.DeleteGlobalRef(Unwrap(ref.release()));
+        CheckJavaException(env);
+       }
+
+
+    template < class T >
+    UniqueLocalRef<T> NewLocalRef(JNIEnv& env, T* t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewLocalRef(Unwrap(t)));
+        CheckJavaException(env);
+        if (t && !obj)
+            throw std::bad_alloc();
+        return UniqueLocalRef<T>(reinterpret_cast<T*>(obj), DefaultRefDeleter<&JNIEnv::DeleteLocalRef>(env));
+       }
+
+    // Attempt to promote a weak reference to a strong one. Returns an empty result
+    // if the weak reference has expired.
+    template < class T, template < RefDeletionMethod > class WeakDeleter >
+    UniqueLocalRef<T> NewLocalRef(JNIEnv& env, const UniqueWeakGlobalRef<T, WeakDeleter>& t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewLocalRef(Unwrap(t)));
+        CheckJavaException(env);
+        return UniqueLocalRef<T>(reinterpret_cast<T*>(obj), DefaultRefDeleter<&JNIEnv::DeleteLocalRef>(env));
+       }
+
+    template < class T >
+    void DeleteLocalRef(JNIEnv& env, UniqueLocalRef<T>&& ref)
+       {
+        env.DeleteLocalRef(Unwrap(ref.release()));
+        CheckJavaException(env);
+       }
+
+    inline void EnsureLocalCapacity(JNIEnv& env, jint capacity)
+       {
+        CheckJavaExceptionThenErrorCode(env, env.EnsureLocalCapacity(capacity));
+       }
+
+
+    template < template < RefDeletionMethod > class Deleter, class T >
+    UniqueWeakGlobalRef<T, Deleter> NewWeakGlobalRef(JNIEnv& env, T* t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewWeakGlobalRef(Unwrap(t)));
+        CheckJavaException(env);
+        if (t && !obj)
+            throw std::bad_alloc();
+        return UniqueWeakGlobalRef<T, Deleter>(reinterpret_cast<T*>(obj), Deleter<&JNIEnv::DeleteWeakGlobalRef>(env));
+       }
+
+    template < class T >
+    UniqueWeakGlobalRef<T> NewWeakGlobalRef(JNIEnv& env, T* t)
+       {
+        return NewWeakGlobalRef<DefaultRefDeleter>(env, t);
+       }
+
+    template < class T, template < RefDeletionMethod > class Deleter >
+    void DeleteWeakGlobalRef(JNIEnv& env, UniqueWeakGlobalRef<T, Deleter>&& ref)
+       {
+        env.DeleteWeakGlobalRef(Unwrap(ref.release()));
+        CheckJavaException(env);
+       }
+
+
+    inline bool IsSameObject(JNIEnv& env, jobject* ref1, jobject* ref2)
+       {
+        return CheckJavaException(env,
+            env.IsSameObject(Unwrap(ref1), Unwrap(ref2)));
+       }
+
+    inline jobject& AllocObject(JNIEnv& env, jclass& clazz)
+       {
+        return *CheckJavaException(env,
+            Wrap<jobject*>(env.AllocObject(Unwrap(clazz))));
+       }
+
+    template < class... Args >
+    jobject& NewObject(JNIEnv& env, jclass& clazz, jmethodID& method, Args&&... args)
+       {
+        return *CheckJavaException(env,
+            Wrap<jobject*>(env.NewObject(Unwrap(clazz), Unwrap(method), Unwrap(std::forward<Args>(args))...)));
+       }
+
+    inline jclass& GetObjectClass(JNIEnv& env, jobject& obj)
+       {
+        return *CheckJavaException(env,
+            Wrap<jclass*>(env.GetObjectClass(Unwrap(obj))));
+       }
+
+    inline bool IsInstanceOf(JNIEnv& env, jobject* obj, jclass& clazz)
+       {
+        return CheckJavaException(env,
+            env.IsInstanceOf(Unwrap(obj), Unwrap(clazz))) == JNI_TRUE;
+       }
+
+
+    inline jmethodID& GetMethodID(JNIEnv& env, jclass& clazz, const char* name, const char* sig)
+       {
+        return *CheckJavaException(env,
+            Wrap<jmethodID*>(env.GetMethodID(Unwrap(clazz), name, sig)));
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<!std::is_void<R>::value, R>
+    CallMethod(JNIEnv& env, jobject* obj, jmethodID& method, Args&&... args)
+       {
+        return CheckJavaException(env,
+            Wrap<R>((env.*(TypedMethods<R>::CallMethod))(Unwrap(obj), Unwrap(method), Unwrap(std::forward<Args>(args))...)));
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<std::is_void<R>::value, R>
+    CallMethod(JNIEnv& env, jobject* obj, jmethodID& method, Args&&... args)
+       {
+        env.CallVoidMethod(Unwrap(obj), Unwrap(method), Unwrap(std::forward<Args>(args))...);
+        CheckJavaException(env);
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<!std::is_void<R>::value, R>
+    CallNonvirtualMethod(JNIEnv& env, jobject* obj, jclass& clazz, jmethodID& method, Args&&... args)
+       {
+        return CheckJavaException(env,
+            Wrap<R>((env.*(TypedMethods<R>::CallNonvirtualMethod))(Unwrap(obj), Unwrap(clazz), Unwrap(method), Unwrap(std::forward<Args>(args))...)));
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<std::is_void<R>::value, R>
+    CallNonvirtualMethod(JNIEnv& env, jobject* obj, jclass& clazz, jmethodID& method, Args&&... args)
+       {
+        env.CallNonvirtualVoidMethod(Unwrap(obj), Unwrap(clazz), Unwrap(method), Unwrap(std::forward<Args>(args))...);
+        CheckJavaException(env);
+       }
+
+
+    inline jfieldID& GetFieldID(JNIEnv& env, jclass& clazz, const char* name, const char* sig)
+       {
+        return *CheckJavaException(env,
+            Wrap<jfieldID*>(env.GetFieldID(Unwrap(clazz), name, sig)));
+       }
+
+    template < class T >
+    T GetField(JNIEnv& env, jobject* obj, jfieldID& field)
+       {
+        return CheckJavaException(env,
+            Wrap<T>((env.*(TypedMethods<T>::GetField))(Unwrap(obj), Unwrap(field))));
+       }
+
+    template < class T >
+    void SetField(JNIEnv& env, jobject* obj, jfieldID& field, T value)
+       {
+        (env.*(TypedMethods<T>::SetField))(Unwrap(obj), Unwrap(field), Unwrap(value));
+        CheckJavaException(env);
+       }
+
+
+    inline jmethodID& GetStaticMethodID(JNIEnv& env, jclass& clazz, const char* name, const char* sig)
+       {
+        return *CheckJavaException(env,
+            Wrap<jmethodID*>(env.GetStaticMethodID(Unwrap(clazz), name, sig)));
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<!std::is_void<R>::value, R>
+    CallStaticMethod(JNIEnv& env, jclass& clazz, jmethodID& method, Args&&... args)
+       {
+        return CheckJavaException(env,
+            Wrap<R>((env.*(TypedMethods<R>::CallStaticMethod))(Unwrap(clazz), Unwrap(method), Unwrap(std::forward<Args>(args))...)));
+       }
+
+    template < class R, class... Args >
+    std::enable_if_t<std::is_void<R>::value, R>
+    CallStaticMethod(JNIEnv& env, jclass& clazz, jmethodID& method, Args&&... args)
+       {
+        env.CallStaticVoidMethod(Unwrap(clazz), Unwrap(method), Unwrap(std::forward<Args>(args))...);
+        CheckJavaException(env);
+       }
+
+
+    inline jfieldID& GetStaticFieldID(JNIEnv& env, jclass& clazz, const char* name, const char* sig)
+       {
+        return *CheckJavaException(env,
+            Wrap<jfieldID*>(env.GetStaticFieldID(Unwrap(clazz), name, sig)));
+       }
+
+    template < class T >
+    T GetStaticField(JNIEnv& env, jclass& clazz, jfieldID& field)
+       {
+        return CheckJavaException(env,
+            Wrap<T>((env.*(TypedMethods<T>::GetStaticField))(Unwrap(clazz), Unwrap(field))));
+       }
+
+    template < class T >
+    void SetStaticField(JNIEnv& env, jclass& clazz, jfieldID& field, T value)
+       {
+        (env.*(TypedMethods<T>::SetStaticField))(Unwrap(clazz), Unwrap(field), Unwrap(value));
+        CheckJavaException(env);
+       }
+
+
+    inline jstring& NewString(JNIEnv& env, const char16_t* chars, jsize len)
+       {
+        return *CheckJavaException(env,
+            Wrap<jstring*>(env.NewString(Unwrap(chars), Unwrap(len))));
+       }
+
+    template < class Array >
+    auto NewString(JNIEnv& env, const Array& chars)
+       -> std::enable_if_t< IsArraylike<Array>::value, jstring& >
+       {
+        return NewString(env, ArraylikeData(chars), ArraylikeSize(chars));
+       }
+
+    inline jsize GetStringLength(JNIEnv& env, jstring& string)
+       {
+        return CheckJavaException(env,
+            Wrap<jsize>(env.GetStringLength(Unwrap(string))));
+       }
+
+    inline std::tuple<UniqueStringChars, bool> GetStringChars(JNIEnv& env, jstring& string)
+       {
+        ::jboolean isCopy = JNI_FALSE;
+        const char16_t* result = CheckJavaException(env,
+            Wrap<const char16_t*>(env.GetStringChars(Unwrap(string), &isCopy)));
+        return std::make_tuple(UniqueStringChars(result, StringCharsDeleter(env, string)), isCopy);
+       }
+
+    inline void ReleaseStringChars(JNIEnv& env, jstring& string, UniqueStringChars&& chars)
+       {
+        env.ReleaseStringChars(Unwrap(string), Unwrap(chars.release()));
+        CheckJavaException(env);
+       }
+
+    inline jstring& NewStringUTF(JNIEnv& env, const char* bytes)
+       {
+        return *CheckJavaException(env,
+            Wrap<jstring*>(env.NewStringUTF(bytes)));
+       }
+
+    inline jsize GetStringUTFLength(JNIEnv& env, jstring& string)
+       {
+        return CheckJavaException(env,
+            Wrap<jsize>(env.GetStringUTFLength(Unwrap(string))));
+       }
+
+    inline std::tuple<UniqueStringUTFChars, bool> GetStringUTFChars(JNIEnv& env, jstring& string)
+       {
+        ::jboolean isCopy = JNI_FALSE;
+        const char* result = CheckJavaException(env,
+            env.GetStringUTFChars(Unwrap(string), &isCopy));
+        return std::make_tuple(UniqueStringUTFChars(result, StringUTFCharsDeleter(env, string)), isCopy);
+       }
+
+    inline void ReleaseStringUTFChars(JNIEnv& env, jstring& string, UniqueStringUTFChars&& chars)
+       {
+        env.ReleaseStringUTFChars(Unwrap(string), chars.release());
+        CheckJavaException(env);
+       }
+
+    inline void GetStringRegion(JNIEnv& env, jstring& string, jsize start, jsize len, char16_t* buf)
+       {
+        env.GetStringRegion(Unwrap(string), Unwrap(start), Unwrap(len), Unwrap(buf));
+        CheckJavaException(env);
+       }
+
+    template < class Array >
+    auto GetStringRegion(JNIEnv& env, jstring& string, jsize start, Array& buf)
+       -> std::enable_if_t< IsArraylike<Array>::value >
+       {
+        GetStringRegion(env, string, start, ArraylikeSize(buf), ArraylikeData(buf));
+       }
+
+    inline void GetStringUTFRegion(JNIEnv& env, jstring& string, jsize start, jsize len, char* buf)
+       {
+        env.GetStringUTFRegion(Unwrap(string), Unwrap(start), Unwrap(len), buf);
+        CheckJavaException(env);
+       }
+
+    template < class Array >
+    auto GetStringUTFRegion(JNIEnv& env, jstring& string, jsize start, Array& buf)
+       -> std::enable_if_t< IsArraylike<Array>::value >
+       {
+        GetStringUTFRegion(env, string, start, ArraylikeSize(buf), ArraylikeData(buf));
+       }
+
+    inline std::tuple<UniqueStringCritical, bool> GetStringCritical(JNIEnv& env, jstring& string)
+       {
+        ::jboolean isCopy = JNI_FALSE;
+        const char16_t* result = CheckJavaException(env,
+            Wrap<const char16_t*>(env.GetStringCritical(Unwrap(string), &isCopy)));
+        return std::make_tuple(UniqueStringCritical(result, StringCriticalDeleter(env, string)), isCopy);
+       }
+
+    inline void ReleaseStringCritical(JNIEnv& env, jstring& string, UniqueStringCritical&& chars)
+       {
+        env.ReleaseStringCritical(Unwrap(string), Unwrap(chars.release()));
+        CheckJavaException(env);
+       }
+
+
+    template < class E >
+    jsize GetArrayLength(JNIEnv& env, jarray<E>& array)
+       {
+        return CheckJavaException(env,
+            Wrap<jsize>(env.GetArrayLength(Unwrap(array))));
+       }
+
+    template < class E >
+    jarray<E>& NewArray(JNIEnv& env, jsize length)
+       {
+        return *CheckJavaException(env,
+            Wrap<jarray<E>*>((env.*(TypedMethods<E>::NewArray))(Unwrap(length))));
+       }
+
+    template < class E >
+    std::tuple<UniqueArrayElements<E>, bool> GetArrayElements(JNIEnv& env, jarray<E>& array)
+       {
+        ::jboolean isCopy = JNI_FALSE;
+        E* result = CheckJavaException(env,
+            (env.*(TypedMethods<E>::GetArrayElements))(Unwrap(array), &isCopy));
+        return std::make_tuple(UniqueArrayElements<E>(result, ArrayElementsDeleter<E>(env, array)), isCopy);
+       }
+
+    template < class E >
+    void ReleaseArrayElements(JNIEnv& env, jarray<E>& array, E* elems)
+       {
+        (env.*(TypedMethods<E>::ReleaseArrayElements))(Unwrap(array), elems, JNI_COMMIT);
+        CheckJavaException(env);
+       }
+
+    template < class E >
+    void ReleaseArrayElements(JNIEnv& env, jarray<E>& array, UniqueArrayElements<E>&& elems)
+       {
+        (env.*(TypedMethods<E>::ReleaseArrayElements))(Unwrap(array), elems.release(), 0);
+        CheckJavaException(env);
+       }
+
+    template < class E >
+    std::tuple<UniquePrimitiveArrayCritical<E>, bool> GetPrimitiveArrayCritical(JNIEnv& env, jarray<E>& array)
+       {
+        ::jboolean isCopy = JNI_FALSE;
+        void* result = CheckJavaException(env,
+            env.GetPrimitiveArrayCritical(Unwrap(array), &isCopy));
+        return std::make_tuple(UniquePrimitiveArrayCritical<E>(result, PrimitiveArrayCriticalDeleter<E>(env, array)), isCopy);
+       }
+
+    template < class E >
+    void ReleasePrimitiveArrayCritical(JNIEnv& env, jarray<E>& array, void* carray)
+       {
+        env.ReleasePrimitiveArrayCritical(Unwrap(array), carray, 0);
+        CheckJavaException(env);
+       }
+
+    template < class E >
+    void ReleasePrimitiveArrayCritical(JNIEnv& env, jarray<E>& array, UniquePrimitiveArrayCritical<E>&& carray)
+       {
+        env.ReleasePrimitiveArrayCritical(Unwrap(array), carray.release(), JNI_COMMIT);
+        CheckJavaException(env);
+       }
+
+    template < class T >
+    void GetArrayRegion(JNIEnv& env, jarray<T>& array, jsize start, jsize len, T* buf)
+       {
+        (env.*(TypedMethods<T>::GetArrayRegion))(Unwrap(array), Unwrap(start), Unwrap(len), buf);
+        CheckJavaException(env);
+       }
+
+    template < class T, class Array >
+    auto GetArrayRegion(JNIEnv& env, jarray<T>& array, jsize start, Array& buf)
+       -> std::enable_if_t< IsArraylike<Array>::value >
+       {
+        GetArrayRegion(env, array, start, ArraylikeSize(buf), ArraylikeData(buf));
+       }
+
+    template < class T >
+    void SetArrayRegion(JNIEnv& env, jarray<T>& array, jsize start, jsize len, const T* buf)
+       {
+        (env.*(TypedMethods<T>::SetArrayRegion))(Unwrap(array), Unwrap(start), Unwrap(len), buf);
+        CheckJavaException(env);
+       }
+
+    template < class T, class Array >
+    auto SetArrayRegion(JNIEnv& env, jarray<T>& array, jsize start, const Array& buf)
+       -> std::enable_if_t< IsArraylike<Array>::value >
+       {
+        SetArrayRegion(env, array, start, ArraylikeSize(buf), ArraylikeData(buf));
+       }
+
+
+    inline jarray<jobject>& NewObjectArray(JNIEnv& env, jsize length, jclass& elementClass, jobject* initialElement = nullptr)
+       {
+        return *CheckJavaException(env,
+            Wrap<jarray<jobject>*>(env.NewObjectArray(Unwrap(length), Unwrap(elementClass), Unwrap(initialElement))));
+       }
+
+    inline jobject* GetObjectArrayElement(JNIEnv& env, jarray<jobject>& array, jsize index)
+       {
+        return CheckJavaException(env,
+            Wrap<jobject*>(env.GetObjectArrayElement(Unwrap(array), Unwrap(index))));
+       }
+
+    inline void SetObjectArrayElement(JNIEnv& env, jarray<jobject>& array, jsize index, jobject* value)
+       {
+        env.SetObjectArrayElement(Unwrap(array), Unwrap(index), Unwrap(value));
+        CheckJavaException(env);
+       }
+
+
+    template < class... Methods >
+    inline void RegisterNatives(JNIEnv& env, jclass& clazz, const Methods&... methods)
+       {
+        ::JNINativeMethod unwrapped[sizeof...(methods)] = { Unwrap(methods)... };
+        CheckJavaExceptionThenErrorCode(env,
+            env.RegisterNatives(Unwrap(clazz), unwrapped, sizeof...(methods)));
+       }
+
+    inline void UnregisterNatives(JNIEnv& env, jclass& clazz)
+       {
+        CheckJavaExceptionThenErrorCode(env, env.UnregisterNatives(Unwrap(clazz)));
+       }
+
+
+    inline UniqueMonitor MonitorEnter(JNIEnv& env, jobject* obj)
+       {
+        CheckJavaExceptionThenErrorCode(env, env.MonitorEnter(Unwrap(obj)));
+        return UniqueMonitor(obj, MonitorDeleter(env));
+       }
+
+    inline void MonitorExit(JNIEnv& env, UniqueMonitor&& monitor)
+       {
+        CheckJavaExceptionThenErrorCode(env, env.MonitorExit(Unwrap(monitor.release())));
+       }
+
+
+    inline JavaVM& GetJavaVM(JNIEnv& env)
+       {
+        JavaVM* result = nullptr;
+        CheckJavaExceptionThenErrorCode(env, env.GetJavaVM(&result));
+        return *result;
+       }
+
+
+    inline jobject& NewDirectByteBuffer(JNIEnv& env, void* address, jlong capacity)
+       {
+        return *CheckJavaException(env,
+            Wrap<jobject*>(env.NewDirectByteBuffer(address, Unwrap(capacity))));
+       }
+
+    inline void* GetDirectBufferAddress(JNIEnv& env, jobject& buf)
+       {
+        return CheckJavaException(env,
+            env.GetDirectBufferAddress(Unwrap(buf)));
+       }
+
+    inline jlong GetDirectBufferCapacity(JNIEnv& env, jobject& buf)
+       {
+        return CheckJavaException(env,
+            env.GetDirectBufferCapacity(Unwrap(buf)));
+       }
+
+
+    inline jobjectRefType GetObjectRefType(JNIEnv& env, jobject* obj)
+       {
+        return env.GetObjectRefType(Unwrap(obj));
+       }
+
+
+    namespace {
+      // Some implementations type the parameter as JNIEnv**, others as void**.
+      // See https://bugs.openjdk.java.net/browse/JDK-6569899
+      struct JNIEnvCast
+        {
+          using FunVoid = jint (JavaVM::*)(void**, void*);
+          using FunEnv = jint (JavaVM::*)(JNIEnv**, void*);
+
+          template <typename Fun, typename = std::enable_if_t<std::is_same<Fun, FunVoid>::value>>
+          void** operator()(JNIEnv** env, Fun) noexcept {
+            return reinterpret_cast<void**>(env);
+          }
+
+          template <typename Fun, typename = std::enable_if_t<std::is_same<Fun, FunEnv>::value>>
+          JNIEnv** operator()(JNIEnv** env, Fun) noexcept {
+            return env;
+          }
+        };
+    }
+
+    inline UniqueEnv AttachCurrentThread(JavaVM& vm)
+       {
+        JNIEnv* result;
+        CheckErrorCode(vm.AttachCurrentThread(JNIEnvCast()(&result, &JavaVM::AttachCurrentThread), nullptr));
+        return UniqueEnv(result, JNIEnvDeleter(vm));
+       }
+
+    inline void DetachCurrentThread(JavaVM& vm, UniqueEnv&& env)
+       {
+        env.release();
+        CheckErrorCode(vm.DetachCurrentThread());
+       }
+
+    inline JNIEnv& GetEnv(JavaVM& vm, version version = jni_version_1_1)
+       {
+        JNIEnv* env = nullptr;
+        CheckErrorCode(vm.GetEnv(reinterpret_cast<void**>(&env), Unwrap(version)));
+        return *env;
+       }
+
+    inline UniqueEnv GetAttachedEnv(JavaVM& vm, version version = jni_version_1_1)
+       {
+        JNIEnv* env = nullptr;
+        auto code = vm.GetEnv(reinterpret_cast<void**>(&env), Unwrap(version));
+        switch (code) 
+           {
+            case JNI_OK:        return UniqueEnv(env,JNIEnvDeleter(vm, false));
+            case JNI_EDETACHED: return AttachCurrentThread(vm);
+            default:            
+               CheckErrorCode(code); 
+               return nullptr;
+           }
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/jni.hpp b/thirdparty/jni.hpp/include/jni/jni.hpp
new file mode 100644
index 000000000000..e99325b1c164
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/jni.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+// Low-level
+
+#include <jni/types.hpp>
+#include <jni/functions.hpp>
+#include <jni/npe.hpp>
+
+
+// High-level
+
+#include <jni/unique.hpp>
+#include <jni/tagging.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+#include <jni/string.hpp>
+#include <jni/array.hpp>
+#include <jni/constructor.hpp>
+#include <jni/method.hpp>
+#include <jni/static_method.hpp>
+#include <jni/field.hpp>
+#include <jni/static_field.hpp>
+#include <jni/native_method.hpp>
+#include <jni/boxing.hpp>
+#include <jni/advanced_ownership.hpp>
+#include <jni/weak_reference.hpp>
diff --git a/thirdparty/jni.hpp/include/jni/make.hpp b/thirdparty/jni.hpp/include/jni/make.hpp
new file mode 100644
index 000000000000..f10c9e00bb27
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/make.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+namespace jni
+   {
+    template < class Result > struct ThingToMake {};
+
+    template < class Result, class... P >
+    auto Make(P&&... p)
+       {
+        return MakeAnything(ThingToMake<Result>(), std::forward<P>(p)...);
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/method.hpp b/thirdparty/jni.hpp/include/jni/method.hpp
new file mode 100644
index 000000000000..2e6b69b2f24e
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/method.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+#include <jni/type_signature.hpp>
+#include <jni/tagging.hpp>
+
+namespace jni
+   {
+    template < class TheTag, class >
+    class Method;
+
+    template < class TheTag, class R, class... Args >
+    class Method< TheTag, R (Args...) >
+       {
+        private:
+            jmethodID& method;
+
+        public:
+            using TagType = TheTag;
+            using MethodType = R (Args...);
+            using ReturnType = R;
+
+            Method(JNIEnv& env, const Class<TagType>& clazz, const char* name)
+              : method(GetMethodID(env, *clazz, name, TypeSignature<R (Args...)>()()))
+               {}
+
+            operator jmethodID&() const { return method; }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/native_method.hpp b/thirdparty/jni.hpp/include/jni/native_method.hpp
new file mode 100644
index 000000000000..192e301ca133
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/native_method.hpp
@@ -0,0 +1,381 @@
+#pragma once
+
+#include <jni/types.hpp>
+#include <jni/errors.hpp>
+#include <jni/functions.hpp>
+#include <jni/tagging.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+
+#include <exception>
+#include <type_traits>
+
+namespace jni
+   {
+    template < class M, class Enable = void >
+    struct NativeMethodTraits;
+
+    template < class R, class... Args >
+    struct NativeMethodTraits< R (Args...) >
+       {
+        using Type = R (Args...);
+        using ResultType = R;
+       };
+
+    template < class R, class... Args >
+    struct NativeMethodTraits< R (*)(Args...) >
+        : NativeMethodTraits< R (Args...) > {};
+
+    template < class T, class R, class... Args >
+    struct NativeMethodTraits< R (T::*)(Args...) const >
+        : NativeMethodTraits< R (Args...) > {};
+
+    template < class T, class R, class... Args >
+    struct NativeMethodTraits< R (T::*)(Args...) >
+        : NativeMethodTraits< R (Args...) > {};
+
+    template < class M >
+    struct NativeMethodTraits< M, std::enable_if_t< std::is_class<M>::value > >
+        : NativeMethodTraits< decltype(&M::operator()) > {};
+
+
+    /// Low-level, lambda
+
+    template < class M >
+    auto MakeNativeMethod(const char* name, const char* sig, const M& m,
+                          std::enable_if_t< std::is_class<M>::value >* = nullptr)
+       {
+        using FunctionType = typename NativeMethodTraits<M>::Type;
+        using ResultType = typename NativeMethodTraits<M>::ResultType;
+
+        static FunctionType* method = m;
+
+        auto wrapper = [] (JNIEnv* env, auto... args)
+           {
+            try
+               {
+                return method(env, args...);
+               }
+            catch (...)
+               {
+                ThrowJavaError(*env, std::current_exception());
+                return ResultType();
+               }
+           };
+
+        return JNINativeMethod< FunctionType > { name, sig, wrapper };
+       }
+
+
+    /// Low-level, function pointer
+
+    template < class M, M method >
+    auto MakeNativeMethod(const char* name, const char* sig)
+       {
+        using FunctionType = typename NativeMethodTraits<M>::Type;
+        using ResultType = typename NativeMethodTraits<M>::ResultType;
+
+        auto wrapper = [] (JNIEnv* env, auto... args)
+           {
+            try
+               {
+                return method(env, args...);
+               }
+            catch (...)
+               {
+                ThrowJavaError(*env, std::current_exception());
+                return ResultType();
+               }
+           };
+
+        return JNINativeMethod< FunctionType > { name, sig, wrapper };
+       }
+
+
+    /// High-level, lambda
+
+    template < class T, T*... >
+    struct NativeMethodMaker;
+
+    template < class T, class R, class Subject, class... Args >
+    struct NativeMethodMaker< R (T::*)(JNIEnv&, Subject, Args...) const >
+       {
+        template < class M >
+        auto operator()(const char* name, const M& m)
+           {
+            static M method(m);
+
+            auto wrapper = [] (JNIEnv* env, UntaggedType<Subject> subject, UntaggedType<Args>... args)
+               {
+                return ReleaseUnique(method(*env, AsLvalue(Tag<std::decay_t<Subject>>(*env, *subject)), AsLvalue(Tag<std::decay_t<Args>>(*env, args))...));
+               };
+
+            return MakeNativeMethod(name, TypeSignature<RemoveUniqueType<R> (std::decay_t<Args>...)>()(), wrapper);
+           }
+       };
+
+    template < class T, class Subject, class... Args >
+    struct NativeMethodMaker< void (T::*)(JNIEnv&, Subject, Args...) const >
+       {
+        template < class M >
+        auto operator()(const char* name, const M& m)
+           {
+            static M method(m);
+
+            auto wrapper = [] (JNIEnv* env, UntaggedType<Subject> subject, UntaggedType<Args>... args)
+               {
+                method(*env, AsLvalue(Tag<std::decay_t<Subject>>(*env, *subject)), AsLvalue(Tag<std::decay_t<Args>>(*env, args))...);
+               };
+
+            return MakeNativeMethod(name, TypeSignature<void (std::decay_t<Args>...)>()(), wrapper);
+           }
+       };
+
+    template < class M >
+    auto MakeNativeMethod(const char* name, const M& m)
+       {
+        return NativeMethodMaker<decltype(&M::operator())>()(name, m);
+       }
+
+
+    /// High-level, function pointer
+
+    template < class R, class Subject, class... Args, R (*method)(JNIEnv&, Subject, Args...) >
+    struct NativeMethodMaker< R (JNIEnv&, Subject, Args...), method >
+       {
+        auto operator()(const char* name)
+           {
+            auto wrapper = [] (JNIEnv* env, UntaggedType<Subject> subject, UntaggedType<Args>... args)
+               {
+                return ReleaseUnique(method(*env, AsLvalue(Tag<std::decay_t<Subject>>(*env, *subject)), AsLvalue(Tag<std::decay_t<Args>>(*env, args))...));
+               };
+
+            return MakeNativeMethod(name, TypeSignature<RemoveUniqueType<R> (std::decay_t<Args>...)>()(), wrapper);
+           }
+       };
+
+    template < class Subject, class... Args, void (*method)(JNIEnv&, Subject, Args...) >
+    struct NativeMethodMaker< void (JNIEnv&, Subject, Args...), method >
+       {
+        auto operator()(const char* name)
+           {
+            auto wrapper = [] (JNIEnv* env, UntaggedType<Subject> subject, UntaggedType<Args>... args)
+               {
+                method(*env, AsLvalue(Tag<std::decay_t<Subject>>(*env, *subject)), AsLvalue(Tag<std::decay_t<Args>>(*env, args))...);
+               };
+
+            return MakeNativeMethod(name, TypeSignature<void (std::decay_t<Args>...)>()(), wrapper);
+           }
+       };
+
+    template < class M, M method >
+    auto MakeNativeMethod(const char* name)
+       {
+        using FunctionType = typename NativeMethodTraits<M>::Type;
+        return NativeMethodMaker<FunctionType, method>()(name);
+       }
+
+
+    /// High-level peer, lambda
+
+    template < class L, class >
+    class NativePeerLambdaMethod;
+
+    template < class L, class R, class P, class... Args >
+    class NativePeerLambdaMethod< L, R (L::*)(JNIEnv&, P&, Args...) const >
+       {
+        private:
+            const char* name;
+            L lambda;
+
+        public:
+            NativePeerLambdaMethod(const char* n, const L& l)
+               : name(n), lambda(l)
+               {}
+
+            template < class Peer, class TagType, class = std::enable_if_t< std::is_same<P, Peer>::value > >
+            auto operator()(const Field<TagType, jlong>& field)
+               {
+                auto wrapper = [field, lambda = lambda] (JNIEnv& env, Object<TagType>& obj, Args... args)
+                   {
+                    return lambda(env, *reinterpret_cast<P*>(obj.Get(env, field)), args...);
+                   };
+
+                return MakeNativeMethod(name, wrapper);
+               }
+       };
+
+    template < class L >
+    auto MakeNativePeerMethod(const char* name, const L& lambda,
+                              std::enable_if_t< std::is_class<L>::value >* = nullptr)
+       {
+        return NativePeerLambdaMethod<L, decltype(&L::operator())>(name, lambda);
+       }
+
+
+    /// High-level peer, function pointer
+
+    template < class M, M* >
+    class NativePeerFunctionPointerMethod;
+
+    template < class R, class P, class... Args, R (*method)(JNIEnv&, P&, Args...) >
+    class NativePeerFunctionPointerMethod< R (JNIEnv&, P&, Args...), method >
+       {
+        private:
+            const char* name;
+
+        public:
+            NativePeerFunctionPointerMethod(const char* n)
+               : name(n)
+               {}
+
+            template < class Peer, class TagType, class = std::enable_if_t< std::is_same<P, Peer>::value > >
+            auto operator()(const Field<TagType, jlong>& field)
+               {
+                auto wrapper = [field] (JNIEnv& env, Object<TagType>& obj, Args... args)
+                   {
+                    auto ptr = reinterpret_cast<P*>(obj.Get(env, field));
+                    if (ptr) return method(env, *ptr, args...);
+                    ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"),
+                             "invalid native peer");
+                   };
+
+                return MakeNativeMethod(name, wrapper);
+               }
+       };
+
+    template < class M, M method >
+    auto MakeNativePeerMethod(const char* name,
+                              std::enable_if_t< !std::is_member_function_pointer<M>::value >* = nullptr)
+       {
+        using FunctionType = typename NativeMethodTraits<M>::Type;
+        return NativePeerFunctionPointerMethod<FunctionType, method>(name);
+       }
+
+    /// High-level peer, member function pointer
+
+    template < class M, M>
+    class NativePeerMemberFunctionMethod;
+
+    template < class R, class P, class... Args, R (P::*method)(JNIEnv&, Args...)>
+    class NativePeerMemberFunctionMethod< R (P::*)(JNIEnv&, Args...), method>
+       {
+        private:
+            const char* name;
+
+        public:
+            NativePeerMemberFunctionMethod(const char* n)
+               : name(n)
+               {}
+
+            template < class Peer, class TagType, class = std::enable_if_t< std::is_same<P, Peer>::value > >
+            auto operator()(const Field<TagType, jlong>& field)
+               {
+                auto wrapper = [field] (JNIEnv& env, Object<TagType>& obj, Args... args)
+                   {
+                    auto ptr = reinterpret_cast<P*>(obj.Get(env, field));
+                    if (ptr) return (ptr->*method)(env, args...);
+                    ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"),
+                             "invalid native peer");
+                   };
+                return MakeNativeMethod(name, wrapper);
+               }
+       };
+
+    template < class M, M method>
+    auto MakeNativePeerMethod(const char* name,
+                              std::enable_if_t< std::is_member_function_pointer<M>::value >* = nullptr)
+       {
+        return NativePeerMemberFunctionMethod<M, method>(name);
+       }
+
+
+    /**
+     * A registration function for native methods on a "native peer": a long-lived native
+     * object corresponding to a Java object, usually created when the Java object is created
+     * and destroyed when the Java object's finalizer runs.
+     *
+     * It assumes that the Java object has a field, named by `fieldName`, of Java type `long`,
+     * which is used to hold a pointer to the native peer.
+     *
+     * `Methods` must be a sequence of `NativePeerMethod` instances, instantiated with pointer
+     * to member functions of the native peer class. For each method in `methods`, a native
+     * method is bound with a signature corresponding to that of the member function. The
+     * wrapper for that native method obtains the native peer instance from the Java field and
+     * calls the native peer method on it, passing along any arguments.
+     *
+     * An overload is provided that accepts a Callable object with a unique_ptr result type and
+     * the names for native creation and finalization methods, allowing creation and disposal of
+     * the native peer from Java.
+     *
+     * For an example of all of the above, see the `examples` directory.
+     */
+
+    template < class Peer, class TagType, class... Methods >
+    void RegisterNativePeer(JNIEnv& env, const Class<TagType>& clazz, const char* fieldName, Methods&&... methods)
+       {
+        static Field<TagType, jni::jlong> field { env, clazz, fieldName };
+        RegisterNatives(env, *clazz, methods.template operator()<Peer>(field)...);
+       }
+
+    template < class Peer, class TagType, class >
+    struct NativePeerHelper;
+
+    template < class Peer, class TagType, class... Args >
+    struct NativePeerHelper< Peer, TagType, std::unique_ptr<Peer> (JNIEnv&, Args...) >
+       {
+        using UniquePeer = std::unique_ptr<Peer>;
+        using Initializer = UniquePeer (JNIEnv&, Args...);
+
+        auto MakeInitializer(const Field<TagType, jlong>& field, const char* name, Initializer* initializer) const
+           {
+            auto wrapper = [field, initializer] (JNIEnv& e, Object<TagType>& obj, std::decay_t<Args>&... args)
+               {
+                UniquePeer previous(reinterpret_cast<Peer*>(obj.Get(e, field)));
+                UniquePeer instance(initializer(e, args...));
+                obj.Set(e, field, reinterpret_cast<jlong>(instance.get()));
+                instance.release();
+               };
+
+            return MakeNativeMethod(name, wrapper);
+           }
+
+        auto MakeFinalizer(const Field<TagType, jlong>& field, const char* name) const
+           {
+            auto wrapper = [field] (JNIEnv& e, Object<TagType>& obj)
+               {
+                UniquePeer instance(reinterpret_cast<Peer*>(obj.Get(e, field)));
+                if (instance) obj.Set(e, field, jlong(0));
+                instance.reset();
+               };
+
+            return MakeNativeMethod(name, wrapper);
+           }
+       };
+
+    template < class Peer, class TagType, class Initializer, class... Methods >
+    void RegisterNativePeer(JNIEnv& env, const Class<TagType>& clazz, const char* fieldName,
+                            Initializer initialize,
+                            const char* initializeMethodName,
+                            const char* finalizeMethodName,
+                            Methods&&... methods)
+       {
+        static Field<TagType, jlong> field { env, clazz, fieldName };
+
+        using InitializerMethodType = typename NativeMethodTraits<Initializer>::Type;
+        NativePeerHelper<Peer, TagType, InitializerMethodType> helper;
+
+        RegisterNatives(env, *clazz,
+            helper.MakeInitializer(field, initializeMethodName, initialize),
+            helper.MakeFinalizer(field, finalizeMethodName),
+            methods.template operator()<Peer>(field)...);
+       }
+
+     // Like std::make_unique, but with non-universal reference arguments, so it can be
+     // explicitly specialized (jni::MakePeer<Peer, jni::jboolean, ...>).
+     template < class Peer, class... Args >
+     std::unique_ptr<Peer> MakePeer(jni::JNIEnv& env, Args... args)
+        {
+         return std::make_unique<Peer>(env, args...);
+        }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/npe.hpp b/thirdparty/jni.hpp/include/jni/npe.hpp
new file mode 100644
index 000000000000..e5fb9e51c698
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/npe.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <jni/functions.hpp>
+
+namespace jni
+   {
+    [[noreturn]] inline void ThrowNullPointerException(JNIEnv& env, const char* message = nullptr)
+       {
+        ThrowNew(env, FindClass(env, "java/lang/NullPointerException"), message);
+       }
+
+    template < class T >
+    void NullCheck(JNIEnv& env, T* ptr, const char* message = nullptr)
+       {
+        if (!ptr) ThrowNullPointerException(env, message);
+       }
+
+    template < class T >
+    T& SafeDereference(JNIEnv& env, T* ptr, const char* message = nullptr)
+       {
+        NullCheck(env, ptr, message);
+        return *ptr;
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/object.hpp b/thirdparty/jni.hpp/include/jni/object.hpp
new file mode 100644
index 000000000000..575a879f5351
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/object.hpp
@@ -0,0 +1,153 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/tagging.hpp>
+
+#include <cstddef>
+
+namespace jni
+   {
+    template < class TheTag > class Class;
+    template < class TheTag, class > class Field;
+    template < class TheTag, class > class Method;
+
+    class ObjectBase
+       {
+        protected:
+            jobject* ptr = nullptr;
+
+            explicit ObjectBase(std::nullptr_t = nullptr)
+               {}
+
+            explicit ObjectBase(jobject* p)
+               : ptr(p)
+               {}
+
+            ~ObjectBase() = default;
+
+            void reset(jobject* p) { ptr = p; }
+
+        public:
+            explicit operator bool() const { return ptr; }
+
+            friend bool operator==(const ObjectBase& a, const ObjectBase& b) { return a.ptr == b.ptr; }
+            friend bool operator!=(const ObjectBase& a, const ObjectBase& b) { return !( a == b ); }
+
+            template < class OtherTag >
+            bool IsInstanceOf(JNIEnv& env, const Class<OtherTag>& clazz) const
+               {
+                return jni::IsInstanceOf(env, ptr, *clazz);
+               }
+       };
+
+    template < class TheTag = ObjectTag >
+    class Object : public TagTraits<TheTag>::SuperType
+       {
+        public:
+            using TagType = TheTag;
+            using SuperType = typename TagTraits<TheTag>::SuperType;
+            using UntaggedType = typename TagTraits<TheTag>::UntaggedType;
+
+            explicit Object(UntaggedType* p)
+               : SuperType(p)
+               {}
+
+        protected:
+            explicit Object(std::nullptr_t = nullptr)
+               {}
+
+            Object(const Object&) = delete;
+            Object& operator=(const Object&) = delete;
+
+        public:
+            UntaggedType* get() const { return reinterpret_cast<UntaggedType*>(this->ptr); }
+            UntaggedType& operator*() const { return *get(); }
+
+            template < class T >
+            auto Get(JNIEnv& env, const Field<TagType, T>& field) const
+               -> std::enable_if_t< IsPrimitive<T>::value, T >
+               {
+                return GetField<T>(env, get(), field);
+               }
+
+            template < class T >
+            auto Get(JNIEnv& env, const Field<TagType, T>& field) const
+               -> std::enable_if_t< !IsPrimitive<T>::value, Local<T> >
+               {
+                return Local<T>(env, reinterpret_cast<typename T::UntaggedType*>(GetField<jobject*>(env, get(), field)));
+               }
+
+            template < class T >
+            auto Set(JNIEnv& env, const Field<TagType, T>& field, T value) const
+               -> std::enable_if_t< IsPrimitive<T>::value >
+               {
+                SetField<T>(env, get(), field, value);
+               }
+
+            template < class Expected, class Actual >
+            auto Set(JNIEnv& env, const Field<TagType, Expected>& field, const Actual& value) const
+               -> std::enable_if_t< !IsPrimitive<Expected>::value
+                                 && std::is_convertible<const Actual&, const Expected&>::value >
+               {
+                SetField<jobject*>(env, get(), field, value.get());
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const Method<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< IsPrimitive<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, R >
+               {
+                return CallMethod<R>(env, get(), method, Untag(args)...);
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const Method<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< !IsPrimitive<R>::value
+                                 && !std::is_void<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, Local<R> >
+               {
+                return Local<R>(env, reinterpret_cast<typename R::UntaggedType*>(CallMethod<jobject*>(env, get(), method, Untag(args)...)));
+               }
+
+            template < class... ExpectedArgs, class... ActualArgs >
+            auto Call(JNIEnv& env, const Method<TagType, void (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value >
+               {
+                CallMethod<void>(env, get(), method, Untag(args)...);
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto CallNonvirtual(JNIEnv& env, const Class<TagType>& clazz, const Method<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< IsPrimitive<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, R >
+               {
+                return CallNonvirtualMethod<R>(env, get(), clazz, method, Untag(args)...);
+               }
+
+            template < class R, class... ExpectedArgs, class... ActualArgs >
+            auto CallNonvirtual(JNIEnv& env, const Class<TagType>& clazz, const Method<TagType, R (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< !IsPrimitive<R>::value
+                                 && !std::is_void<R>::value
+                                 && Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value, Local<R> >
+               {
+                return Local<R>(env, reinterpret_cast<typename R::UntaggedType*>(CallNonvirtualMethod<jobject*>(env, get(), clazz, method, Untag(args)...)));
+               }
+
+            template < class... ExpectedArgs, class... ActualArgs >
+            auto CallNonvirtual(JNIEnv& env, const Class<TagType>& clazz, const Method<TagType, void (ExpectedArgs...)>& method, const ActualArgs&... args) const
+               -> std::enable_if_t< Conjunction<std::is_convertible<const ActualArgs&, const ExpectedArgs&>...>::value >
+               {
+                CallNonvirtualMethod<void>(env, get(), clazz, method, Untag(args)...);
+               }
+       };
+
+    template < class OutTagType, class T >
+    Local<Object<OutTagType>> Cast(JNIEnv& env, const Class<OutTagType>& clazz, const T& object)
+       {
+        if (!object.IsInstanceOf(env, clazz))
+           {
+            ThrowNew(env, FindClass(env, "java/lang/ClassCastException"));
+           }
+        return Local<Object<OutTagType>>(env, reinterpret_cast<typename Object<OutTagType>::UntaggedType*>(NewLocal(env, object).release()));
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/ownership.hpp b/thirdparty/jni.hpp/include/jni/ownership.hpp
new file mode 100644
index 000000000000..33a8f2408a1d
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/ownership.hpp
@@ -0,0 +1,225 @@
+#pragma once
+
+#include <jni/types.hpp>
+#include <jni/wrapping.hpp>
+#include <jni/typed_methods.hpp>
+
+namespace jni
+   {
+    struct LocalFrameDeleter
+       {
+        void operator()(JNIEnv* env) const
+           {
+            if (env)
+               {
+                env->PopLocalFrame(nullptr);
+               }
+           }
+       };
+
+    using UniqueLocalFrame = std::unique_ptr< JNIEnv, LocalFrameDeleter >;
+
+
+    using RefDeletionMethod = void (JNIEnv::*)(::jobject);
+
+    template < RefDeletionMethod DeleteRef >
+    class DefaultRefDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+
+        public:
+            DefaultRefDeleter() = default;
+            DefaultRefDeleter(JNIEnv& e) : env(&e) {}
+
+            void operator()(jobject* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    (env->*DeleteRef)(Unwrap(p));
+                   }
+               }
+       };
+
+
+    template < class T, template < RefDeletionMethod > class Deleter = DefaultRefDeleter >
+    using UniqueGlobalRef = std::unique_ptr< T, Deleter<&JNIEnv::DeleteGlobalRef> >;
+
+    template < class T, template < RefDeletionMethod > class Deleter = DefaultRefDeleter >
+    using UniqueWeakGlobalRef = std::unique_ptr< T, Deleter<&JNIEnv::DeleteWeakGlobalRef> >;
+
+    // Not parameterized by Deleter because local references should be short-lived enough
+    // that DefaultRefDeleter suffices in all cases.
+    template < class T >
+    using UniqueLocalRef = std::unique_ptr< T, DefaultRefDeleter<&JNIEnv::DeleteLocalRef> >;
+
+
+    class StringCharsDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+            jstring* string = nullptr;
+
+        public:
+            StringCharsDeleter() = default;
+            StringCharsDeleter(JNIEnv& e, jstring& s) : env(&e), string(&s) {}
+
+            void operator()(const char16_t* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    assert(string);
+                    env->ReleaseStringChars(Unwrap(string), Unwrap(p));
+                   }
+               }
+       };
+
+    using UniqueStringChars = std::unique_ptr< const char16_t, StringCharsDeleter >;
+
+
+    class StringUTFCharsDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+            jstring* string = nullptr;
+
+        public:
+            StringUTFCharsDeleter() = default;
+            StringUTFCharsDeleter(JNIEnv& e, jstring& s) : env(&e), string(&s) {}
+
+            void operator()(const char* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    assert(string);
+                    env->ReleaseStringUTFChars(Unwrap(string), p);
+                   }
+               }
+       };
+
+    using UniqueStringUTFChars = std::unique_ptr< const char, StringUTFCharsDeleter >;
+
+
+    class StringCriticalDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+            jstring* string = nullptr;
+
+        public:
+            StringCriticalDeleter() = default;
+            StringCriticalDeleter(JNIEnv& e, jstring& s) : env(&e), string(&s) {}
+
+            void operator()(const char16_t* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    assert(string);
+                    env->ReleaseStringCritical(Unwrap(string), Unwrap(p));
+                   }
+               }
+       };
+
+    using UniqueStringCritical = std::unique_ptr< const char16_t, StringCriticalDeleter >;
+
+
+    template < class E >
+    class ArrayElementsDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+            jarray<E>* array = nullptr;
+
+        public:
+            ArrayElementsDeleter() = default;
+            ArrayElementsDeleter(JNIEnv& e, jarray<E>& a) : env(&e), array(&a) {}
+
+            void operator()(E* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    assert(array);
+                    (env->*(TypedMethods<E>::ReleaseArrayElements))(Unwrap(array), p, JNI_ABORT);
+                   }
+               }
+       };
+
+    template < class E >
+    using UniqueArrayElements = std::unique_ptr< E, ArrayElementsDeleter<E> >;
+
+
+    template < class E >
+    class PrimitiveArrayCriticalDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+            jarray<E>* array = nullptr;
+
+        public:
+            PrimitiveArrayCriticalDeleter() = default;
+            PrimitiveArrayCriticalDeleter(JNIEnv& e, jarray<E>& a) : env(&e), array(&a) {}
+
+            void operator()(void* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    assert(array);
+                    env->ReleasePrimitiveArrayCritical(Unwrap(array), p, JNI_ABORT);
+                   }
+               }
+       };
+
+    template < class E >
+    using UniquePrimitiveArrayCritical = std::unique_ptr< void, PrimitiveArrayCriticalDeleter<E> >;
+
+
+    class MonitorDeleter
+       {
+        private:
+            JNIEnv* env = nullptr;
+
+        public:
+            MonitorDeleter() = default;
+            MonitorDeleter(JNIEnv& e) : env(&e) {}
+
+            void operator()(jobject* p) const
+               {
+                if (p)
+                   {
+                    assert(env);
+                    env->MonitorExit(Unwrap(p));
+                   }
+               }
+       };
+
+    using UniqueMonitor = std::unique_ptr< jobject, MonitorDeleter >;
+
+
+    class JNIEnvDeleter
+       {
+        private:
+            JavaVM* vm = nullptr;
+            bool detach = true;
+        
+        public:
+            JNIEnvDeleter() = default;
+            JNIEnvDeleter(JavaVM& v, bool d = true) : vm(&v), detach{d} {}
+
+            void operator()(JNIEnv* p) const
+               {
+                if (p && detach)
+                   {
+                    assert(vm);
+                    vm->DetachCurrentThread();
+                   }
+               }
+       };
+
+    using UniqueEnv = std::unique_ptr< JNIEnv, JNIEnvDeleter >;
+   }
diff --git a/thirdparty/jni.hpp/include/jni/static_field.hpp b/thirdparty/jni.hpp/include/jni/static_field.hpp
new file mode 100644
index 000000000000..137c9f6e1896
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/static_field.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+#include <jni/type_signature.hpp>
+#include <jni/tagging.hpp>
+
+namespace jni
+   {
+    template < class TheTag, class T >
+    class StaticField
+       {
+        private:
+            jfieldID& field;
+
+        public:
+            using TagType = TheTag;
+            using FieldType = T;
+
+            StaticField(JNIEnv& env, const Class<TagType>& clazz, const char* name)
+              : field(GetStaticFieldID(env, *clazz, name, TypeSignature<T>()()))
+               {}
+
+            operator jfieldID&() const { return field; }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/static_method.hpp b/thirdparty/jni.hpp/include/jni/static_method.hpp
new file mode 100644
index 000000000000..97d82741aa65
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/static_method.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+#include <jni/type_signature.hpp>
+#include <jni/tagging.hpp>
+
+namespace jni
+   {
+    template < class TheTag, class >
+    class StaticMethod;
+
+    template < class TheTag, class R, class... Args >
+    class StaticMethod< TheTag, R (Args...) >
+       {
+        private:
+            jmethodID& method;
+
+        public:
+            using TagType = TheTag;
+            using MethodType = R (Args...);
+            using ReturnType = R;
+
+            StaticMethod(JNIEnv& env, const Class<TagType>& clazz, const char* name)
+              : method(GetStaticMethodID(env, *clazz, name, TypeSignature<R (Args...)>()()))
+               {}
+
+            operator jmethodID&() const { return method; }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/string.hpp b/thirdparty/jni.hpp/include/jni/string.hpp
new file mode 100644
index 000000000000..5be4423e6f0e
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/string.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <jni/object.hpp>
+#include <jni/array.hpp>
+#include <jni/make.hpp>
+#include <jni/npe.hpp>
+#include <jni/string_conversion.hpp>
+
+namespace jni
+   {
+    using String = Object<StringTag>;
+
+    inline std::u16string MakeAnything(ThingToMake<std::u16string>, JNIEnv& env, const String& string)
+       {
+        NullCheck(env, string.get());
+        std::u16string result(jni::GetStringLength(env, *string), char16_t());
+        jni::GetStringRegion(env, *string, 0, result);
+        return result;
+       }
+
+    inline std::string MakeAnything(ThingToMake<std::string>, JNIEnv& env, const String& string)
+       {
+        return convertUTF16ToUTF8(Make<std::u16string>(env, string));
+       }
+
+    inline Local<String> MakeAnything(ThingToMake<String>, JNIEnv& env, const std::u16string& string)
+       {
+        return Local<String>(env, &NewString(env, string));
+       }
+
+    inline Local<String> MakeAnything(ThingToMake<String>, JNIEnv& env, const std::string& string)
+       {
+        return Make<String>(env, convertUTF8ToUTF16(string));
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/string_conversion.hpp b/thirdparty/jni.hpp/include/jni/string_conversion.hpp
new file mode 100644
index 000000000000..78974ef46fc9
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/string_conversion.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// If you want to supply your own UTF-8 <-> UTF-16 conversion routines, create a header file 
+// that can be found at <jni/string_conversion.hpp> and will be found first in the lookup chain.
+
+#include <string>
+#include <locale>
+#include <codecvt>
+
+namespace jni
+   {
+    inline std::u16string convertUTF8ToUTF16(const std::string& string)
+       {
+        return std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>().from_bytes(string);
+       }
+
+    inline std::string convertUTF16ToUTF8(const std::u16string& string)
+       {
+        return std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>().to_bytes(string);
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/tagging.hpp b/thirdparty/jni.hpp/include/jni/tagging.hpp
new file mode 100644
index 000000000000..15c911684394
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/tagging.hpp
@@ -0,0 +1,131 @@
+#pragma once
+
+#include <jni/traits.hpp>
+#include <jni/unique.hpp>
+
+#include <type_traits>
+
+namespace jni
+   {
+    class ObjectBase;
+    template < class Tag > class Object;
+    template < class E, class = void > class Array;
+    template < class > struct TypeSignature;
+
+
+    struct ObjectTag
+       {
+        static constexpr auto Name() { return "java/lang/Object"; }
+       };
+
+    struct StringTag
+       {
+        static constexpr auto Name() { return "java/lang/String"; }
+       };
+
+    struct ClassTag
+       {
+        static constexpr auto Name() { return "java/lang/Class"; }
+       };
+
+    template < class T >
+    struct ArrayTag
+       {
+        static constexpr auto Name() { return TypeSignature<Array<T>>()(); }
+       };
+
+
+    template < class Tag, class = int >
+    struct SuperTag
+       {
+        using Type = ObjectTag;
+       };
+
+    template < class Tag >
+    struct SuperTag< Tag, decltype(std::declval<typename Tag::SuperTag>(), 0) >
+       {
+        using Type = typename Tag::SuperTag;
+       };
+
+    template < class Tag, class Enable = void >
+    struct TagTraits
+       {
+        using SuperType = Object<typename SuperTag<Tag>::Type>;
+        using UntaggedType = jobject;
+       };
+
+    template <>
+    struct TagTraits< ObjectTag >
+        {
+         using SuperType = ObjectBase;
+         using UntaggedType = jobject;
+        };
+
+    template <>
+    struct TagTraits< StringTag >
+        {
+         using SuperType = Object<ObjectTag>;
+         using UntaggedType = jstring;
+        };
+
+    template <>
+    struct TagTraits< ClassTag >
+        {
+         using SuperType = Object<ObjectTag>;
+         using UntaggedType = jclass;
+        };
+
+    template < class E >
+    struct TagTraits< ArrayTag<E>, std::enable_if_t<IsPrimitive<E>::value> >
+        {
+         using SuperType = Object<ObjectTag>;
+         using UntaggedType = jarray<E>;
+        };
+
+    template < class Tag >
+    struct TagTraits< ArrayTag<Object<Tag>> >
+        {
+         using SuperType = Object<ObjectTag>;
+         using UntaggedType = jarray<jobject>;
+        };
+
+
+    template < class T >
+    auto Tag(JNIEnv&, T primitive)
+       -> std::enable_if_t< IsPrimitive<T>::value, T >
+       {
+        return primitive;
+       }
+
+    template < class T, class U >
+    auto Tag(JNIEnv& env, U* u)
+       -> std::enable_if_t< !IsPrimitive<T>::value, Input<T> >
+       {
+        return Input<T>(env, u);
+       }
+
+    template < class T, class U >
+    auto Tag(JNIEnv& env, U& u)
+       -> std::enable_if_t< !IsPrimitive<T>::value, Input<T> >
+       {
+        return Input<T>(env, &u);
+       }
+
+
+    template < class T >
+    auto Untag(T primitive)
+       -> std::enable_if_t< IsPrimitive<T>::value, T >
+       {
+        return primitive;
+       }
+
+    template < class T >
+    auto Untag(const T& t)
+       -> std::enable_if_t< !IsPrimitive<T>::value, decltype(t.get()) >
+       {
+        return t.get();
+       }
+
+    template < class T >
+    using UntaggedType = decltype(Untag(std::declval<T>()));
+   }
diff --git a/thirdparty/jni.hpp/include/jni/traits.hpp b/thirdparty/jni.hpp/include/jni/traits.hpp
new file mode 100644
index 000000000000..23e0b2fab57d
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/traits.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <jni/types.hpp>
+
+#include <type_traits>
+
+namespace jni
+   {
+    template < class T > struct IsPrimitive : std::false_type {};
+    template <> struct IsPrimitive< jboolean > : std::true_type {};
+    template <> struct IsPrimitive< jbyte    > : std::true_type {};
+    template <> struct IsPrimitive< jchar    > : std::true_type {};
+    template <> struct IsPrimitive< jshort   > : std::true_type {};
+    template <> struct IsPrimitive< jint     > : std::true_type {};
+    template <> struct IsPrimitive< jlong    > : std::true_type {};
+    template <> struct IsPrimitive< jfloat   > : std::true_type {};
+    template <> struct IsPrimitive< jdouble  > : std::true_type {};
+
+    template < class T > struct IsReference : std::false_type {};
+    template <> struct IsReference< jobject    > : std::true_type {};
+    template <> struct IsReference< jclass     > : std::true_type {};
+    template <> struct IsReference< jstring    > : std::true_type {};
+    template <> struct IsReference< jthrowable > : std::true_type {};
+
+    template < class T > struct IsArray : std::false_type {};
+    template < class E > struct IsArray< jarray<E> > : std::true_type {};
+
+    template < class... > struct Conjunction : std::true_type {};
+    template < class B1 > struct Conjunction<B1> : B1 {};
+    template < class B1, class... Bn > struct Conjunction<B1, Bn...>
+        : std::conditional_t<bool(B1::value), Conjunction<Bn...>, B1> {};
+
+    template < class T > T& AsLvalue(T&& x) { return x; }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/type_signature.hpp b/thirdparty/jni.hpp/include/jni/type_signature.hpp
new file mode 100644
index 000000000000..6c8320f2f41d
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/type_signature.hpp
@@ -0,0 +1,89 @@
+#pragma once
+
+#include <jni/functions.hpp>
+#include <jni/object.hpp>
+#include <jni/array.hpp>
+
+namespace jni
+   {
+    template < char... chars >
+    struct StringLiteral
+       {
+        operator const char *() const
+           {
+            static const char result[] = { chars..., 0 };
+            return result;
+           }
+       };
+
+    constexpr std::size_t StringLiteralLength(const char * str, std::size_t len = 0)
+       {
+        return str[0] ? StringLiteralLength(str + 1, len + 1) : len;
+       }
+
+    template < class, class >
+    struct TagLiteralImpl;
+
+    template < class Tag, std::size_t... Is >
+    struct TagLiteralImpl< Tag, std::index_sequence<Is...> >
+       {
+        using Value = StringLiteral< Tag::Name()[Is]... >;
+       };
+
+    template < class Tag >
+    using TagLiteral = typename TagLiteralImpl< Tag, std::make_index_sequence<StringLiteralLength(Tag::Name())> >::Value;
+
+    template < char... As, char... Bs >
+    constexpr auto Concat(const StringLiteral<As...>&,
+                          const StringLiteral<Bs...>&)
+       {
+        return StringLiteral<As..., Bs...>();
+       }
+
+    template < class A, class B, class... Rest >
+    constexpr auto Concat(const A& a,
+                          const B& b,
+                          const Rest&... rest)
+       {
+        return Concat(Concat(a, b), rest...);
+       }
+
+    template < class > struct TypeSignature;
+
+    template <> struct TypeSignature< jboolean > { constexpr auto operator()() const { return StringLiteral<'Z'>(); } };
+    template <> struct TypeSignature< jbyte    > { constexpr auto operator()() const { return StringLiteral<'B'>(); } };
+    template <> struct TypeSignature< jchar    > { constexpr auto operator()() const { return StringLiteral<'C'>(); } };
+    template <> struct TypeSignature< jshort   > { constexpr auto operator()() const { return StringLiteral<'S'>(); } };
+    template <> struct TypeSignature< jint     > { constexpr auto operator()() const { return StringLiteral<'I'>(); } };
+    template <> struct TypeSignature< jlong    > { constexpr auto operator()() const { return StringLiteral<'J'>(); } };
+    template <> struct TypeSignature< jfloat   > { constexpr auto operator()() const { return StringLiteral<'F'>(); } };
+    template <> struct TypeSignature< jdouble  > { constexpr auto operator()() const { return StringLiteral<'D'>(); } };
+    template <> struct TypeSignature< void     > { constexpr auto operator()() const { return StringLiteral<'V'>(); } };
+
+    template < class TheTag >
+    struct TypeSignature< Object<TheTag> >
+       {
+        constexpr auto operator()() const
+           {
+            return Concat(StringLiteral<'L'>(), TagLiteral<TheTag>(), StringLiteral<';'>());
+           }
+       };
+
+    template < class E >
+    struct TypeSignature< Array<E> >
+       {
+        constexpr auto operator()() const
+           {
+            return Concat(StringLiteral<'['>(), TypeSignature<E>()());
+           }
+       };
+
+    template < class R, class... Args >
+    struct TypeSignature< R (Args...) >
+       {
+        constexpr auto operator()() const
+           {
+            return Concat(StringLiteral<'('>(), TypeSignature<Args>()()..., StringLiteral<')'>(), TypeSignature<R>()());
+           }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/typed_methods.hpp b/thirdparty/jni.hpp/include/jni/typed_methods.hpp
new file mode 100644
index 000000000000..412c2d785e33
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/typed_methods.hpp
@@ -0,0 +1,147 @@
+#pragma once
+
+#include <jni.h>
+
+namespace jni
+   {
+    template < class R > struct TypedMethods;
+
+    template <> struct TypedMethods< jobject* >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallObjectMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualObjectMethod;
+        static constexpr auto GetField             = &JNIEnv::GetObjectField;
+        static constexpr auto SetField             = &JNIEnv::SetObjectField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticObjectMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticObjectField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticObjectField;
+       };
+
+    template <> struct TypedMethods< jboolean >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallBooleanMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualBooleanMethod;
+        static constexpr auto GetField             = &JNIEnv::GetBooleanField;
+        static constexpr auto SetField             = &JNIEnv::SetBooleanField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticBooleanMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticBooleanField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticBooleanField;
+        static constexpr auto NewArray             = &JNIEnv::NewBooleanArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetBooleanArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseBooleanArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetBooleanArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetBooleanArrayRegion;
+       };
+
+    template <> struct TypedMethods< jbyte >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallByteMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualByteMethod;
+        static constexpr auto GetField             = &JNIEnv::GetByteField;
+        static constexpr auto SetField             = &JNIEnv::SetByteField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticByteMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticByteField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticByteField;
+        static constexpr auto NewArray             = &JNIEnv::NewByteArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetByteArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseByteArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetByteArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetByteArrayRegion;
+       };
+
+    template <> struct TypedMethods< jchar >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallCharMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualCharMethod;
+        static constexpr auto GetField             = &JNIEnv::GetCharField;
+        static constexpr auto SetField             = &JNIEnv::SetCharField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticCharMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticCharField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticCharField;
+        static constexpr auto NewArray             = &JNIEnv::NewCharArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetCharArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseCharArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetCharArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetCharArrayRegion;
+       };
+
+    template <> struct TypedMethods< jshort >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallShortMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualShortMethod;
+        static constexpr auto GetField             = &JNIEnv::GetShortField;
+        static constexpr auto SetField             = &JNIEnv::SetShortField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticShortMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticShortField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticShortField;
+        static constexpr auto NewArray             = &JNIEnv::NewShortArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetShortArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseShortArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetShortArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetShortArrayRegion;
+       };
+
+    template <> struct TypedMethods< jint >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallIntMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualIntMethod;
+        static constexpr auto GetField             = &JNIEnv::GetIntField;
+        static constexpr auto SetField             = &JNIEnv::SetIntField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticIntMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticIntField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticIntField;
+        static constexpr auto NewArray             = &JNIEnv::NewIntArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetIntArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseIntArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetIntArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetIntArrayRegion;
+       };
+
+    template <> struct TypedMethods< jlong >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallLongMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualLongMethod;
+        static constexpr auto GetField             = &JNIEnv::GetLongField;
+        static constexpr auto SetField             = &JNIEnv::SetLongField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticLongMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticLongField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticLongField;
+        static constexpr auto NewArray             = &JNIEnv::NewLongArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetLongArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseLongArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetLongArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetLongArrayRegion;
+       };
+
+    template <> struct TypedMethods< jfloat >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallFloatMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualFloatMethod;
+        static constexpr auto GetField             = &JNIEnv::GetFloatField;
+        static constexpr auto SetField             = &JNIEnv::SetFloatField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticFloatMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticFloatField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticFloatField;
+        static constexpr auto NewArray             = &JNIEnv::NewFloatArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetFloatArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseFloatArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetFloatArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetFloatArrayRegion;
+       };
+
+    template <> struct TypedMethods< jdouble >
+       {
+        static constexpr auto CallMethod           = &JNIEnv::CallDoubleMethod;
+        static constexpr auto CallNonvirtualMethod = &JNIEnv::CallNonvirtualDoubleMethod;
+        static constexpr auto GetField             = &JNIEnv::GetDoubleField;
+        static constexpr auto SetField             = &JNIEnv::SetDoubleField;
+        static constexpr auto CallStaticMethod     = &JNIEnv::CallStaticDoubleMethod;
+        static constexpr auto GetStaticField       = &JNIEnv::GetStaticDoubleField;
+        static constexpr auto SetStaticField       = &JNIEnv::SetStaticDoubleField;
+        static constexpr auto NewArray             = &JNIEnv::NewDoubleArray;
+        static constexpr auto GetArrayElements     = &JNIEnv::GetDoubleArrayElements;
+        static constexpr auto ReleaseArrayElements = &JNIEnv::ReleaseDoubleArrayElements;
+        static constexpr auto GetArrayRegion       = &JNIEnv::GetDoubleArrayRegion;
+        static constexpr auto SetArrayRegion       = &JNIEnv::SetDoubleArrayRegion;
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/types.hpp b/thirdparty/jni.hpp/include/jni/types.hpp
new file mode 100644
index 000000000000..035155ec03ca
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/types.hpp
@@ -0,0 +1,97 @@
+#pragma once
+
+#include <cstddef>
+#include <cassert>
+#include <memory>
+#include <stdexcept>
+
+#include <jni.h>
+
+namespace jni
+   {
+    // Not using bool because its size is implementation-defined, and a defined size
+    // is necessary for array operations.
+
+    using ::jboolean;
+
+    const jboolean jni_false = 0;
+    const jboolean jni_true  = 1;
+
+    using ::jbyte;
+    using ::jchar;
+    using ::jshort;
+    using ::jint;
+    using ::jlong;
+    using ::jfloat;
+    using ::jdouble;
+
+    using jsize = std::size_t;
+
+    struct jobject
+       {
+         jobject()                          = delete;
+        ~jobject()                          = delete;
+         jobject(const jobject&)            = delete;
+         jobject& operator=(const jobject&) = delete;
+       };
+
+    struct jclass     : public jobject {};
+    struct jstring    : public jobject {};
+    struct jthrowable : public jobject {};
+
+    template < class T >
+    struct jarray : public jobject {};
+
+    using jobjectArray  = jarray< jobject  >;
+    using jbooleanArray = jarray< jboolean >;
+    using jbyteArray    = jarray< jbyte    >;
+    using jcharArray    = jarray< jchar    >;
+    using jshortArray   = jarray< jshort   >;
+    using jintArray     = jarray< jint     >;
+    using jlongArray    = jarray< jlong    >;
+    using jfloatArray   = jarray< jfloat   >;
+    using jdoubleArray  = jarray< jdouble  >;
+
+    using jfieldID  = std::pointer_traits< ::jfieldID  >::element_type;
+    using jmethodID = std::pointer_traits< ::jmethodID >::element_type;
+
+    using ::jobjectRefType;
+
+    using ::JavaVM;
+    using ::JNIEnv;
+
+    template < class T >
+    struct JNINativeMethod;
+
+    template < class R, class... Args >
+    struct JNINativeMethod< R (JNIEnv*, jclass*, Args...) >
+       {
+        const char* name;
+        const char* signature;
+        R (*fnPtr)(JNIEnv*, jclass*, Args...);
+       };
+
+    template < class R, class... Args >
+    struct JNINativeMethod< R (JNIEnv*, jobject*, Args...) >
+       {
+        const char* name;
+        const char* signature;
+        R (*fnPtr)(JNIEnv*, jobject*, Args...);
+       };
+
+    enum version : jint
+       {
+        jni_version_1_1 = version(JNI_VERSION_1_1),
+        jni_version_1_2 = version(JNI_VERSION_1_2),
+        jni_version_1_4 = version(JNI_VERSION_1_4),
+        jni_version_1_6 = version(JNI_VERSION_1_6),
+       };
+
+    enum error : jint
+       {
+        jni_ok        = error(JNI_OK),
+        jni_err       = error(JNI_ERR),
+        jni_edetached = error(JNI_EDETACHED),
+        jni_eversion  = error(JNI_EVERSION),
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/unique.hpp b/thirdparty/jni.hpp/include/jni/unique.hpp
new file mode 100644
index 000000000000..2abf4909492f
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/unique.hpp
@@ -0,0 +1,220 @@
+#pragma once
+
+namespace jni
+   {
+    /*
+        Ownership type and main interface for high-level references. Client code using the high-level
+        API will most often work with values of this class template, using the following aliases:
+
+            * Global<P>, a.k.a. Unique<T, DefaultRefDeleter<&JNIEnv::DeleteGlobalRef>>,
+            * Weak<P>, a.k.a. Unique<T, DefaultRefDeleter<&JNIEnv::DeleteWeakGlobalRef>>,
+            * Local<P>, a.k.a. Unique<T, LocalRefDeleter>,
+
+        where P is Object<>, Class<>, or Array<>.
+
+        `Unique` is an ownership class with a deletion policy that's parameterized both
+        by the appropriate method to delete the reference (global, weak, or local) and
+        (for global and weak references), a choice about how to obtain the JNIEnv that's
+        necessary to call the deletion method. The default policy is to delete the reference
+        using the same JNIEnv as was passed to the constructor, but in cases where the
+        object may be deleted on a different thread (commonly, the Java finalizer thread),
+        EnvGettingDeleter or EnvAttachingDeleter may be needed.
+
+        Object<>, Class<>, or Array<> -- the underlying and inherited types used for
+        the template parameter T -- are not publicly constructible or destructible. This
+        is to ensure that code works only with ownership types which release the reference
+        at an appropriate time. Our experience has shown that this is important even for
+        local references; the default JVM cleanup behaviors for local references are not
+        enough to ensure that the local reference table never overflows.
+
+        You may also pass or receive C++ references when you wish to borrow rather than take
+        ownership. For example, receiving parameters for a native method implementation should be
+        C++ references, reflecting the fact that JVM implementations prohibit explicitly releasing
+        this form of local reference. However, if you need to store or copy the reference, you
+        will need to use a method such as `NewGlobalRef` that copies at the reference level.
+        `Unique`, `Object<>`, etc., are not themselves copyable.
+    */
+    template < class T, class D >
+    class Unique : public T
+       {
+        private:
+            D deleter;
+
+            Unique(const Unique&) = delete;
+            Unique& operator=(const Unique&) = delete;
+
+        public:
+            using Base = T;
+            using UntaggedType = typename T::UntaggedType;
+
+            explicit Unique(std::nullptr_t ptr = nullptr)
+               : T(ptr),
+                 deleter() {}
+
+            explicit Unique(JNIEnv& env, UntaggedType* ptr)
+               : T(ptr),
+                 deleter(env) {}
+
+            Unique(Unique&& other)
+               : T(other.release()),
+                 deleter(std::move(other.get_deleter())) {}
+
+            template < class U >
+            Unique(Unique<U, D>&& other, std::enable_if_t<std::is_convertible<const U&, const T&>::value>* = nullptr)
+               : T(other.release()),
+                 deleter(std::move(other.get_deleter())) {}
+
+            ~Unique()
+               {
+                reset();
+               }
+
+            Unique& operator=(Unique&& other)
+               {
+                reset(other.release());
+                deleter = std::move(other.deleter);
+                return *this;
+               }
+
+            void reset(UntaggedType* ptr = nullptr)
+               {
+                UntaggedType* current = this->get();
+                T::reset(ptr);
+                if (current)
+                   {
+                    get_deleter()(current);
+                   }
+               }
+
+            UntaggedType* release()
+               {
+                UntaggedType* current = this->get();
+                T::reset(nullptr);
+                return current;
+               }
+
+                  D& get_deleter()         { return deleter; }
+            const D& get_deleter() const   { return deleter; }
+       };
+
+
+    template < class T, template < RefDeletionMethod > class Deleter = DefaultRefDeleter >
+    using Global = Unique< T, Deleter<&JNIEnv::DeleteGlobalRef> >;
+
+    template < class T, template < RefDeletionMethod > class Deleter = DefaultRefDeleter >
+    using Weak = Unique< T, Deleter<&JNIEnv::DeleteWeakGlobalRef> >;
+
+    // Not parameterized by Deleter because local references should be short-lived enough
+    // that DefaultRefDeleter suffices in all cases.
+    template < class T >
+    using Local = Unique< T, DefaultRefDeleter<&JNIEnv::DeleteLocalRef> >;
+
+
+    // Special case for JNI-provided input parameters to native methods, which apparently
+    // should not be explicitly deleted (https://bugs.chromium.org/p/chromium/issues/detail?id=506850).
+    struct NullDeleter
+       {
+        NullDeleter() = default;
+        NullDeleter(JNIEnv&) {}
+        void operator()(jobject*) const {}
+       };
+
+    template < class T >
+    using Input = Unique< T, NullDeleter >;
+
+
+    template < class T >
+    struct RemoveUnique
+       {
+        using Type = T;
+       };
+
+    template < class T, class D >
+    struct RemoveUnique< Unique<T, D> >
+       {
+        using Type = T;
+       };
+
+    template < class T >
+    using RemoveUniqueType = typename RemoveUnique<T>::Type;
+
+
+    template < class T >
+    auto ReleaseUnique(T primitive)
+       {
+        return primitive;
+       }
+
+    template < class T, class D >
+    auto ReleaseUnique(Unique<T, D>&& t)
+       {
+        return t.release();
+       }
+
+
+    template < template < RefDeletionMethod > class Deleter, class T >
+    auto NewGlobal(JNIEnv& env, const T& t)
+       {
+        return Global<RemoveUniqueType<T>, Deleter>(env, reinterpret_cast<typename T::UntaggedType*>(jni::NewGlobalRef(env, t.get()).release()));
+       }
+
+    template < class T >
+    auto NewGlobal(JNIEnv& env, const T& t)
+       {
+        return NewGlobal<DefaultRefDeleter>(env, t);
+       }
+
+    // Attempt to promote a weak reference to a strong one. Returns an empty result
+    // if the weak reference has expired.
+    //
+    // Beware that the semantics of JNI weak references are weaker than is typically
+    // desired: a JNI weak reference may still be promoted to a non-null strong reference
+    // even during finalization. Consider using jni::WeakReference<T> instead.
+    template < template < RefDeletionMethod > class Deleter, class T, template < RefDeletionMethod > class WeakDeleter >
+    Global<T, Deleter> NewGlobal(JNIEnv& env, const Weak<T, WeakDeleter>& t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewGlobalRef(Unwrap(t->get())));
+        CheckJavaException(env);
+        return Global<T, Deleter>(env, obj);
+       }
+
+    template < class T >
+    Global<T> NewGlobal(JNIEnv& env, const Weak<T>& t)
+       {
+        return NewGlobal<DefaultRefDeleter>(env, t);
+       }
+
+
+    template < template < RefDeletionMethod > class Deleter, class T >
+    auto NewWeak(JNIEnv& env, const T& t)
+       {
+        return Weak<RemoveUniqueType<T>, Deleter>(env, reinterpret_cast<typename T::UntaggedType*>(jni::NewWeakGlobalRef(env, t.get()).release()));
+       }
+
+    template < class T >
+    auto NewWeak(JNIEnv& env, const T& t)
+       {
+        return NewWeak<DefaultRefDeleter>(env, t);
+       }
+
+
+    template < class T >
+    auto NewLocal(JNIEnv& env, const T& t)
+       {
+        return Local<RemoveUniqueType<T>>(env, reinterpret_cast<typename T::UntaggedType*>(jni::NewLocalRef(env, t.get()).release()));
+       }
+
+    // Attempt to promote a weak reference to a strong one. Returns an empty result
+    // if the weak reference has expired.
+    //
+    // Beware that the semantics of JNI weak references are weaker than is typically
+    // desired: a JNI weak reference may still be promoted to a non-null strong reference
+    // even during finalization. Consider using jni::WeakReference<T> instead.
+    template < class T, template < RefDeletionMethod > class WeakDeleter >
+    Local<T> NewLocal(JNIEnv& env, const Weak<T, WeakDeleter>& t)
+       {
+        jobject* obj = Wrap<jobject*>(env.NewLocalRef(Unwrap(t->get())));
+        CheckJavaException(env);
+        return Local<T>(env, obj);
+       }
+   }
diff --git a/thirdparty/jni.hpp/include/jni/weak_reference.hpp b/thirdparty/jni.hpp/include/jni/weak_reference.hpp
new file mode 100644
index 000000000000..2536272a3e0e
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/weak_reference.hpp
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <jni/class.hpp>
+#include <jni/object.hpp>
+
+namespace jni
+   {
+    struct WeakReferenceTag { static constexpr auto Name() { return "java/lang/ref/WeakReference"; } };
+
+    // Wraps a JNI global reference to a java.lang.ref.WeakReference, producing an ownership class
+    // similar to jni::Weak<T> (JNI's weak global reference), but with more reliable promotion semantics.
+    // Whereas a JNI weak global reference may still be promoted to a strong reference even during
+    // finalization, leading to potential use-after-free errors, a WeakReference cannot.
+    template < class T, template < RefDeletionMethod > class Deleter = DefaultRefDeleter >
+    class WeakReference
+       {
+        private:
+            Global<Object<WeakReferenceTag>, Deleter> reference;
+
+        public:
+            WeakReference(JNIEnv& env, const T& referent)
+               {
+                static auto& klass = Class<WeakReferenceTag>::Singleton(env);
+                static auto constructor = klass.GetConstructor<Object<>>(env);
+                reference = NewGlobal<Deleter>(env, klass.New(env, constructor, referent));
+               }
+
+            Local<T> get(JNIEnv& env)
+               {
+                if (!reference)
+                   {
+                    return Local<T>();
+                   }
+
+                static auto& klass = Class<WeakReferenceTag>::Singleton(env);
+                static auto get = klass.template GetMethod<Object<> ()>(env, "get");
+                return Local<T>(env, reinterpret_cast<typename T::UntaggedType*>(reference.Call(env, get).release()));
+               }
+       };
+   }
diff --git a/thirdparty/jni.hpp/include/jni/wrapping.hpp b/thirdparty/jni.hpp/include/jni/wrapping.hpp
new file mode 100644
index 000000000000..be2989feb2d0
--- /dev/null
+++ b/thirdparty/jni.hpp/include/jni/wrapping.hpp
@@ -0,0 +1,152 @@
+#pragma once
+
+#include <cstddef>
+#include <cassert>
+#include <limits>
+#include <memory>
+#include <utility>
+
+#include <jni.h>
+
+namespace jni
+   {
+    template < class W > struct Wrapper;
+
+    template < class W, class U >
+    auto Wrap(U&& u)
+       {
+        return Wrapper<W>().Wrap(std::forward<U>(u));
+       }
+
+    template < class W >
+    auto Unwrap(W&& w)
+       {
+        return Wrapper<typename std::decay<W>::type>().Unwrap(std::forward<W>(w));
+       }
+
+    template < class T >
+    using UnwrappedType = decltype(Unwrap<T>(std::declval<T>()));
+
+
+    template < class T >
+    struct PrimitiveTypeWrapper
+       {
+        T Wrap(T t) const { return t; }
+        T Unwrap(T t) const { return t; }
+       };
+
+    template <> struct Wrapper< jboolean > : PrimitiveTypeWrapper< jboolean > {};
+    template <> struct Wrapper< jbyte    > : PrimitiveTypeWrapper< jbyte    > {};
+    template <> struct Wrapper< jchar    > : PrimitiveTypeWrapper< jchar    > {};
+    template <> struct Wrapper< jshort   > : PrimitiveTypeWrapper< jshort   > {};
+    template <> struct Wrapper< jint     > : PrimitiveTypeWrapper< jint     > {};
+    template <> struct Wrapper< jlong    > : PrimitiveTypeWrapper< jlong    > {};
+    template <> struct Wrapper< jfloat   > : PrimitiveTypeWrapper< jfloat   > {};
+    template <> struct Wrapper< jdouble  > : PrimitiveTypeWrapper< jdouble  > {};
+
+
+    template <>
+    struct Wrapper<const char16_t*>
+       {
+        const char16_t* Wrap(const jchar* s) const { return reinterpret_cast<const char16_t*>(s); }
+        const jchar* Unwrap(const char16_t* s) const { return reinterpret_cast<const jchar*>(s); }
+       };
+
+    template <>
+    struct Wrapper<char16_t*>
+       {
+        char16_t* Wrap(jchar* s) const { return reinterpret_cast<char16_t*>(s); }
+        jchar* Unwrap(char16_t* s) const { return reinterpret_cast<jchar*>(s); }
+       };
+
+
+    template <>
+    struct Wrapper<jsize>
+       {
+        jsize Wrap(::jsize s) const
+           {
+            if (s < 0)
+                throw std::range_error("::jsize < 0");
+            return static_cast<jsize>(s);
+           }
+
+        ::jsize Unwrap(jsize s) const
+           {
+            if (s > std::numeric_limits<::jsize>::max())
+                throw std::range_error("jsize > max");
+            return static_cast<::jsize>(s);
+           }
+       };
+
+
+    template < class W, class U >
+    struct ReferenceTypeWrapper
+       {
+        W* Wrap(U u) const { return reinterpret_cast<W*>(u); }
+        U Unwrap(W* w) const { return reinterpret_cast<U>(w); }
+       };
+
+    template <> struct Wrapper< jobject*    > : ReferenceTypeWrapper< jobject,    ::jobject    > {};
+    template <> struct Wrapper< jclass*     > : ReferenceTypeWrapper< jclass,     ::jclass     > {};
+    template <> struct Wrapper< jstring*    > : ReferenceTypeWrapper< jstring,    ::jstring    > {};
+    template <> struct Wrapper< jthrowable* > : ReferenceTypeWrapper< jthrowable, ::jthrowable > {};
+
+    template <> struct Wrapper< jarray< jobject  >* > : ReferenceTypeWrapper< jarray< jobject  >, ::jobjectArray  > {};
+    template <> struct Wrapper< jarray< jboolean >* > : ReferenceTypeWrapper< jarray< jboolean >, ::jbooleanArray > {};
+    template <> struct Wrapper< jarray< jbyte    >* > : ReferenceTypeWrapper< jarray< jbyte    >, ::jbyteArray    > {};
+    template <> struct Wrapper< jarray< jchar    >* > : ReferenceTypeWrapper< jarray< jchar    >, ::jcharArray    > {};
+    template <> struct Wrapper< jarray< jshort   >* > : ReferenceTypeWrapper< jarray< jshort   >, ::jshortArray   > {};
+    template <> struct Wrapper< jarray< jint     >* > : ReferenceTypeWrapper< jarray< jint     >, ::jintArray     > {};
+    template <> struct Wrapper< jarray< jlong    >* > : ReferenceTypeWrapper< jarray< jlong    >, ::jlongArray    > {};
+    template <> struct Wrapper< jarray< jfloat   >* > : ReferenceTypeWrapper< jarray< jfloat   >, ::jfloatArray   > {};
+    template <> struct Wrapper< jarray< jdouble  >* > : ReferenceTypeWrapper< jarray< jdouble  >, ::jdoubleArray  > {};
+
+    template <> struct Wrapper< jfieldID*  > : ReferenceTypeWrapper< jfieldID,  ::jfieldID  > {};
+    template <> struct Wrapper< jmethodID* > : ReferenceTypeWrapper< jmethodID, ::jmethodID > {};
+
+
+    // Allow references to be unwrapped to pointers to the underlying type, but not the
+    // reverse, because dereferences should be explicit, with null checks where necessary.
+
+    template < class W, class U >
+    struct ReferenceTypeUnwrapper
+       {
+        U Unwrap(W& w) const { return reinterpret_cast<U>(&w); }
+       };
+
+    template <> struct Wrapper< jobject    > : ReferenceTypeUnwrapper< jobject,    ::jobject    > {};
+    template <> struct Wrapper< jclass     > : ReferenceTypeUnwrapper< jclass,     ::jclass     > {};
+    template <> struct Wrapper< jstring    > : ReferenceTypeUnwrapper< jstring,    ::jstring    > {};
+    template <> struct Wrapper< jthrowable > : ReferenceTypeUnwrapper< jthrowable, ::jthrowable > {};
+
+    template <> struct Wrapper< jarray< jobject  > > : ReferenceTypeUnwrapper< jarray< jobject  >, ::jobjectArray  > {};
+    template <> struct Wrapper< jarray< jboolean > > : ReferenceTypeUnwrapper< jarray< jboolean >, ::jbooleanArray > {};
+    template <> struct Wrapper< jarray< jbyte    > > : ReferenceTypeUnwrapper< jarray< jbyte    >, ::jbyteArray    > {};
+    template <> struct Wrapper< jarray< jchar    > > : ReferenceTypeUnwrapper< jarray< jchar    >, ::jcharArray    > {};
+    template <> struct Wrapper< jarray< jshort   > > : ReferenceTypeUnwrapper< jarray< jshort   >, ::jshortArray   > {};
+    template <> struct Wrapper< jarray< jint     > > : ReferenceTypeUnwrapper< jarray< jint     >, ::jintArray     > {};
+    template <> struct Wrapper< jarray< jlong    > > : ReferenceTypeUnwrapper< jarray< jlong    >, ::jlongArray    > {};
+    template <> struct Wrapper< jarray< jfloat   > > : ReferenceTypeUnwrapper< jarray< jfloat   >, ::jfloatArray   > {};
+    template <> struct Wrapper< jarray< jdouble  > > : ReferenceTypeUnwrapper< jarray< jdouble  >, ::jdoubleArray  > {};
+
+    template <> struct Wrapper< jfieldID  > : ReferenceTypeUnwrapper< jfieldID,  ::jfieldID  > {};
+    template <> struct Wrapper< jmethodID > : ReferenceTypeUnwrapper< jmethodID, ::jmethodID > {};
+
+
+    template < class T, class R, class... Args >
+    struct Wrapper< JNINativeMethod< R (JNIEnv*, T*, Args...) > >
+       {
+        ::JNINativeMethod Unwrap(JNINativeMethod<R (JNIEnv*, T*, Args...)> method) const
+           {
+            return { const_cast<char*>(method.name), const_cast<char*>(method.signature), reinterpret_cast<void*>(method.fnPtr) };
+           }
+       };
+
+
+    template <>
+    struct Wrapper<version>
+       {
+        version Wrap(::jint v) const { return static_cast<version>(v); }
+        ::jint Unwrap(version v) const { return static_cast<::jint>(v); }
+       };
+   }
diff --git a/thirdparty/tsl/robin_growth_policy.h b/thirdparty/robin-map/include/tsl/robin_growth_policy.h
similarity index 100%
rename from thirdparty/tsl/robin_growth_policy.h
rename to thirdparty/robin-map/include/tsl/robin_growth_policy.h
diff --git a/thirdparty/tsl/robin_hash.h b/thirdparty/robin-map/include/tsl/robin_hash.h
similarity index 89%
rename from thirdparty/tsl/robin_hash.h
rename to thirdparty/robin-map/include/tsl/robin_hash.h
index 6e8dc7e7018b..70ef9e2d6d86 100644
--- a/thirdparty/tsl/robin_hash.h
+++ b/thirdparty/robin-map/include/tsl/robin_hash.h
@@ -344,7 +344,7 @@ class bucket_entry : public bucket_entry_hash<StoreHash> {
  *
  * Behaviour is undefined if the destructor of `ValueType` throws.
  */
-template <class ValueType, class KeySelect, class ValueSelect, class Hash,
+template <class ValueType, class IteratorValueType, class KeySelect, class ValueSelect, class Hash,
           class KeyEqual, class Allocator, bool StoreHash, class GrowthPolicy>
 class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
  private:
@@ -357,13 +357,10 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
       "GrowthPolicy::bucket_for_hash must be noexcept.");
   static_assert(noexcept(std::declval<GrowthPolicy>().clear()),
                 "GrowthPolicy::clear must be noexcept.");
-
  public:
-  template <bool IsConst>
-  class robin_iterator;
-
   using key_type = typename KeySelect::key_type;
   using value_type = ValueType;
+  using iterator_value_type = IteratorValueType;
   using size_type = std::size_t;
   using difference_type = std::ptrdiff_t;
   using hasher = Hash;
@@ -373,8 +370,7 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
   using const_reference = const value_type&;
   using pointer = value_type*;
   using const_pointer = const value_type*;
-  using iterator = robin_iterator<false>;
-  using const_iterator = robin_iterator<true>;
+
 
  private:
   /**
@@ -386,11 +382,9 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
       StoreHash ||
       ((sizeof(tsl::detail_robin_hash::bucket_entry<value_type, true>) ==
         sizeof(tsl::detail_robin_hash::bucket_entry<value_type, false>)) &&
-       (sizeof(std::size_t) == sizeof(truncated_hash_type) ||
-        is_power_of_two_policy<GrowthPolicy>::value) &&
+       (sizeof(std::size_t) == sizeof(truncated_hash_type) || is_power_of_two_policy<GrowthPolicy>::value) &&
        // Don't store the hash for primitive types with default hash.
-       (!std::is_arithmetic<key_type>::value ||
-        !std::is_same<Hash, std::hash<key_type>>::value));
+       (!std::is_arithmetic<key_type>::value || !std::is_same<Hash, std::hash<key_type>>::value));
 
   /**
    * Only use the stored hash on lookup if we are explicitly asked. We are not
@@ -405,29 +399,33 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
    * power of two modulo, we just mask the least significant bytes, we just have
    * to check that the truncated_hash_type didn't truncated more bytes.
    */
-  static bool USE_STORED_HASH_ON_REHASH(size_type bucket_count) {
-    if (STORE_HASH && sizeof(std::size_t) == sizeof(truncated_hash_type)) {
-      TSL_RH_UNUSED(bucket_count);
-      return true;
-    } else if (STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value) {
-      tsl_rh_assert(bucket_count > 0);
-      return (bucket_count - 1) <=
-             (std::numeric_limits<truncated_hash_type>::max)();
-    } else {
-      TSL_RH_UNUSED(bucket_count);
-      return false;
-    }
+  static bool USE_STORED_HASH_ON_REHASH(size_type bucket_count)
+  {
+      if (STORE_HASH && sizeof(std::size_t) == sizeof(truncated_hash_type))
+      {
+          TSL_RH_UNUSED(bucket_count);
+          return true;
+      }
+      else if (STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value)
+      {
+          tsl_rh_assert(bucket_count > 0);
+          return (bucket_count - 1) <= (std::numeric_limits<truncated_hash_type>::max)();
+      }
+      else
+      {
+          TSL_RH_UNUSED(bucket_count);
+          return false;
+      }
   }
 
+public:
   using bucket_entry =
       tsl::detail_robin_hash::bucket_entry<value_type, STORE_HASH>;
   using distance_type = typename bucket_entry::distance_type;
 
-  using buckets_allocator = typename std::allocator_traits<
-      allocator_type>::template rebind_alloc<bucket_entry>;
+  using buckets_allocator      = typename std::allocator_traits<allocator_type>::template rebind_alloc<bucket_entry>;
   using buckets_container_type = std::vector<bucket_entry, buckets_allocator>;
 
- public:
   /**
    * The 'operator*()' and 'operator->()' methods return a const reference and
    * const pointer respectively to the stored value type.
@@ -439,94 +437,156 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
    * instead of a `const std::pair<Key, T>&`, the user may modify the key which
    * will put the map in a undefined state.
    */
-  template <bool IsConst>
-  class robin_iterator {
-    friend class robin_hash;
-
-   private:
-    using bucket_entry_ptr =
-        typename std::conditional<IsConst, const bucket_entry*,
-                                  bucket_entry*>::type;
-
-    robin_iterator(bucket_entry_ptr bucket) noexcept : m_bucket(bucket) {}
-
-   public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = const typename robin_hash::value_type;
-    using difference_type = std::ptrdiff_t;
-    using reference = value_type&;
-    using pointer = value_type*;
-
-    robin_iterator() noexcept {}
-
-    // Copy constructor from iterator to const_iterator.
-    template <bool TIsConst = IsConst,
-              typename std::enable_if<TIsConst>::type* = nullptr>
-    robin_iterator(const robin_iterator<!TIsConst>& other) noexcept
-        : m_bucket(other.m_bucket) {}
-
-    robin_iterator(const robin_iterator& other) = default;
-    robin_iterator(robin_iterator&& other) = default;
-    robin_iterator& operator=(const robin_iterator& other) = default;
-    robin_iterator& operator=(robin_iterator&& other) = default;
-
-    const typename robin_hash::key_type& key() const {
-      return KeySelect()(m_bucket->value());
-    }
+  class robin_iterator
+  {
+      friend class robin_hash;
 
-    template <class U = ValueSelect,
-              typename std::enable_if<has_mapped_type<U>::value &&
-                                      IsConst>::type* = nullptr>
-    const typename U::value_type& value() const {
-      return U()(m_bucket->value());
-    }
+  private:
+      using bucket_entry_ptr = typename std::conditional<false, const bucket_entry*, bucket_entry*>::type;
 
-    template <class U = ValueSelect,
-              typename std::enable_if<has_mapped_type<U>::value &&
-                                      !IsConst>::type* = nullptr>
-    typename U::value_type& value() const {
-      return U()(m_bucket->value());
-    }
+      robin_iterator(bucket_entry_ptr bucket) noexcept : m_bucket(bucket) {}
 
-    reference operator*() const { return m_bucket->value(); }
+  public:
+      using iterator_category = std::forward_iterator_tag;
+      using value_type        = typename robin_hash::iterator_value_type;
+      using difference_type   = std::ptrdiff_t;
+      using reference         = value_type&;
+      using pointer           = value_type*;
 
-    pointer operator->() const { return std::addressof(m_bucket->value()); }
+      robin_iterator() noexcept {}
 
-    robin_iterator& operator++() {
-      while (true) {
-        if (m_bucket->last_bucket()) {
-          ++m_bucket;
-          return *this;
-        }
+      robin_iterator(const robin_iterator& other) = default;
+      robin_iterator(robin_iterator&& other)      = default;
+      robin_iterator& operator=(const robin_iterator& other) = default;
+      robin_iterator& operator=(robin_iterator&& other) = default;
 
-        ++m_bucket;
-        if (!m_bucket->empty()) {
-          return *this;
-        }
+      const typename robin_hash::key_type& key() const { return KeySelect()(m_bucket->value()); }
+
+      template <class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+      typename U::value_type& value() const
+      {
+          return U()(m_bucket->value());
       }
-    }
 
-    robin_iterator operator++(int) {
-      robin_iterator tmp(*this);
-      ++*this;
+      reference operator*() const { return *reinterpret_cast<pointer>(std::addressof(m_bucket->value())); }
 
-      return tmp;
-    }
+      pointer operator->() const { return reinterpret_cast<pointer>(std::addressof(m_bucket->value())); }
 
-    friend bool operator==(const robin_iterator& lhs,
-                           const robin_iterator& rhs) {
-      return lhs.m_bucket == rhs.m_bucket;
-    }
+      robin_iterator& operator++()
+      {
+          while (true)
+          {
+              if (m_bucket->last_bucket())
+              {
+                  ++m_bucket;
+                  return *this;
+              }
 
-    friend bool operator!=(const robin_iterator& lhs,
-                           const robin_iterator& rhs) {
-      return !(lhs == rhs);
-    }
+              ++m_bucket;
+              if (!m_bucket->empty())
+              {
+                  return *this;
+              }
+          }
+      }
+
+      robin_iterator operator++(int)
+      {
+          robin_iterator tmp(*this);
+          ++*this;
+
+          return tmp;
+      }
+
+      friend bool operator==(const robin_iterator& lhs, const robin_iterator& rhs)
+      {
+          return lhs.m_bucket == rhs.m_bucket;
+      }
 
-   private:
-    bucket_entry_ptr m_bucket;
+      friend bool operator!=(const robin_iterator& lhs, const robin_iterator& rhs) { return !(lhs == rhs); }
+
+  private:
+      bucket_entry_ptr m_bucket;
+  };
+
+  class robin_const_iterator
+  {
+      friend class robin_hash;
+
+  private:
+      using bucket_entry_ptr = typename std::conditional<true, const bucket_entry*, bucket_entry*>::type;
+
+      robin_const_iterator(bucket_entry_ptr bucket) noexcept : m_bucket(bucket) {}
+
+  public:
+      using iterator_category = std::forward_iterator_tag;
+      using value_type        = const typename robin_hash::value_type;
+      using difference_type   = std::ptrdiff_t;
+      using reference         = value_type&;
+      using pointer           = value_type*;
+
+      robin_const_iterator() noexcept {}
+
+      // Copy constructor from iterator to const_iterator.
+      robin_const_iterator(const robin_iterator& other) noexcept : m_bucket(other.m_bucket) {}
+
+      robin_const_iterator(const robin_const_iterator& other) = default;
+      robin_const_iterator(robin_const_iterator&& other) = default;
+      robin_const_iterator& operator=(const robin_const_iterator& other) = default;
+      robin_const_iterator& operator=(robin_const_iterator&& other) = default;
+
+      const typename robin_hash::key_type& key() const { return KeySelect()(m_bucket->value()); }
+
+      template <class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+      const typename U::value_type& value() const
+      {
+          return U()(m_bucket->value());
+      }
+
+      reference operator*() const { return m_bucket->value(); }
+
+      pointer operator->() const { return std::addressof(m_bucket->value()); }
+
+      robin_const_iterator& operator++()
+      {
+          while (true)
+          {
+              if (m_bucket->last_bucket())
+              {
+                  ++m_bucket;
+                  return *this;
+              }
+
+              ++m_bucket;
+              if (!m_bucket->empty())
+              {
+                  return *this;
+              }
+          }
+      }
+
+      robin_const_iterator operator++(int)
+      {
+          robin_iterator tmp(*this);
+          ++*this;
+
+          return tmp;
+      }
+
+      friend bool operator==(const robin_const_iterator& lhs, const robin_const_iterator& rhs)
+      {
+          return lhs.m_bucket == rhs.m_bucket;
+      }
+
+      friend bool operator!=(const robin_const_iterator& lhs, const robin_const_iterator& rhs) { return !(lhs == rhs); }
+
+  private:
+      bucket_entry_ptr m_bucket;
   };
 
+  using iterator = robin_iterator;
+  using const_iterator = robin_const_iterator;
+
  public:
 #if defined(__cplusplus) && __cplusplus >= 201402L
   robin_hash(size_type bucket_count, const Hash& hash, const KeyEqual& equal,
@@ -1075,14 +1135,14 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
     m_load_threshold = size_type(float(bucket_count()) * m_max_load_factor);
   }
 
-  void rehash(size_type n) {
-    n = (std::max)(n,
+  void rehash(size_type count_) {
+    count_ = (std::max)(count_,
                      size_type(std::ceil(float(size()) / max_load_factor())));
-    rehash_impl(n);
+    rehash_impl(count_);
   }
 
-  void reserve(size_type n) {
-    rehash(size_type(std::ceil(float(n) / max_load_factor())));
+  void reserve(size_type count_) {
+    rehash(size_type(std::ceil(float(count_) / max_load_factor())));
   }
 
   /*
@@ -1305,8 +1365,8 @@ class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
                                                  std::move(value));
   }
 
-  void rehash_impl(size_type n) {
-    robin_hash new_table(n, static_cast<Hash&>(*this),
+  void rehash_impl(size_type count_) {
+    robin_hash new_table(count_, static_cast<Hash&>(*this),
                          static_cast<KeyEqual&>(*this), get_allocator(),
                          m_min_load_factor, m_max_load_factor);
 
diff --git a/thirdparty/tsl/robin_map.h b/thirdparty/robin-map/include/tsl/robin_map.h
similarity index 97%
rename from thirdparty/tsl/robin_map.h
rename to thirdparty/robin-map/include/tsl/robin_map.h
index 3c9b8556837b..b6c1577c0ce1 100644
--- a/thirdparty/tsl/robin_map.h
+++ b/thirdparty/robin-map/include/tsl/robin_map.h
@@ -119,9 +119,11 @@ class robin_map {
     value_type& operator()(std::pair<Key, T>& key_value) noexcept {
       return key_value.second;
     }
+
+    value_type& operator()(std::pair<const Key, T>& key_value) noexcept { return key_value.second; }
   };
 
-  using ht = detail_robin_hash::robin_hash<std::pair<Key, T>, KeySelect,
+  using ht = detail_robin_hash::robin_hash<std::pair<Key, T>, std::pair<const Key, T>, KeySelect,
                                            ValueSelect, Hash, KeyEqual,
                                            Allocator, StoreHash, GrowthPolicy>;
 
@@ -129,6 +131,7 @@ class robin_map {
   using key_type = typename ht::key_type;
   using mapped_type = T;
   using value_type = typename ht::value_type;
+  using iterator_value_type = typename ht::iterator_value_type;
   using size_type = typename ht::size_type;
   using difference_type = typename ht::difference_type;
   using hasher = typename ht::hasher;
@@ -445,8 +448,15 @@ class robin_map {
     return m_ht.at(key, precalculated_hash);
   }
 
-  T& operator[](const Key& key) { return m_ht[key]; }
-  T& operator[](Key&& key) { return m_ht[std::move(key)]; }
+  template <
+      class K, class KE = KeyEqual,
+      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+  T& operator[](const K& key) { return m_ht[key]; }
+  
+  template <
+      class K, class KE = KeyEqual,
+      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
+  T& operator[](K&& key) { return m_ht[std::forward<K>(key)]; }
 
   size_type count(const Key& key) const { return m_ht.count(key); }
 
@@ -692,8 +702,8 @@ class robin_map {
   void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
   void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
 
-  void rehash(size_type n) { m_ht.rehash(n); }
-  void reserve(size_type n) { m_ht.reserve(n); }
+  void rehash(size_type count_) { m_ht.rehash(count_); }
+  void reserve(size_type count_) { m_ht.reserve(count_); }
 
   /*
    * Observers
diff --git a/thirdparty/tsl/robin_set.h b/thirdparty/robin-map/include/tsl/robin_set.h
similarity index 98%
rename from thirdparty/tsl/robin_set.h
rename to thirdparty/robin-map/include/tsl/robin_set.h
index 47d12ab3b2f7..0813966c8d69 100644
--- a/thirdparty/tsl/robin_set.h
+++ b/thirdparty/robin-map/include/tsl/robin_set.h
@@ -101,12 +101,13 @@ class robin_set {
     key_type& operator()(Key& key) noexcept { return key; }
   };
 
-  using ht = detail_robin_hash::robin_hash<Key, KeySelect, void, Hash, KeyEqual,
+  using ht = detail_robin_hash::robin_hash<Key, const Key, KeySelect, void, Hash, KeyEqual,
                                            Allocator, StoreHash, GrowthPolicy>;
 
  public:
   using key_type = typename ht::key_type;
   using value_type = typename ht::value_type;
+  using iterator_value_type = typename ht::iterator_value_type;
   using size_type = typename ht::size_type;
   using difference_type = typename ht::difference_type;
   using hasher = typename ht::hasher;
@@ -547,8 +548,8 @@ class robin_set {
   void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
   void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
 
-  void rehash(size_type n) { m_ht.rehash(n); }
-  void reserve(size_type n) { m_ht.reserve(n); }
+  void rehash(size_type count_) { m_ht.rehash(count_); }
+  void reserve(size_type count_) { m_ht.reserve(count_); }
 
   /*
    * Observers
diff --git a/thirdparty/robin-map/tsl-robin-map.natvis b/thirdparty/robin-map/tsl-robin-map.natvis
new file mode 100644
index 000000000000..f6eb842e29e3
--- /dev/null
+++ b/thirdparty/robin-map/tsl-robin-map.natvis
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+    <!-- Written in VC 2017 15.7 but is expected to be compatible with VC 2015 -->
+
+    <!-- Visualization that shows the index in the name column and the key-value pair in the value column -->
+    <Type Name="tsl::robin_map&lt;*&gt;" Priority="Medium">
+        <AlternativeType Name="tsl::robin_set&lt;*&gt;"/>
+        <DisplayString>{{ size={m_ht.m_nb_elements} }}</DisplayString>
+        <Expand>
+            <Item Name="[bucket_count]" IncludeView="detailed">m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst</Item>
+            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst != m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
+                ((float)m_ht.m_nb_elements) / ((float)(m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst))
+            </Item>
+            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst == m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
+                0
+            </Item>
+            <Item Name="[max_load_factor]" IncludeView="detailed">m_ht.m_max_load_factor</Item>
+            <CustomListItems>
+                <Variable Name="bucket" InitialValue="m_ht.m_buckets"/>
+
+                <Size>m_ht.m_nb_elements</Size>
+                <Loop>
+                    <Item Condition="bucket-&gt;m_dist_from_ideal_bucket != -1">*bucket</Item>
+                    <Break Condition="bucket-&gt;m_last_bucket"/>
+                    <Exec>++bucket</Exec>
+                </Loop>
+            </CustomListItems>
+        </Expand>
+    </Type>
+
+    <!-- Visualization that shows the key in the name column and the key-value pair in the value column -->
+    <Type Name="tsl::robin_map&lt;*&gt;" ExcludeView="ShowElementsByIndex" Priority="MediumHigh">
+        <DisplayString>{{ size={m_ht.m_nb_elements} }}</DisplayString>
+        <Expand>
+            <Item Name="[bucket_count]" IncludeView="detailed">m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst</Item>
+            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst != m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
+                ((float)m_ht.m_nb_elements) / ((float)(m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst))
+            </Item>
+            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst == m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
+                0
+            </Item>
+            <Item Name="[max_load_factor]" IncludeView="detailed">m_ht.m_max_load_factor</Item>
+            <CustomListItems>
+                <Variable Name="bucket" InitialValue="m_ht.m_buckets"/>
+
+                <Size>m_ht.m_nb_elements</Size>
+                <Loop>
+                    <Item Condition="bucket-&gt;m_dist_from_ideal_bucket != -1" Name="[{reinterpret_cast&lt;std::pair&lt;$T1,$T2&gt;*&gt;(&amp;bucket->m_value)->first}]">*bucket</Item>
+                    <Break Condition="bucket-&gt;m_last_bucket"/>
+                    <Exec>++bucket</Exec>
+                </Loop>
+            </CustomListItems>
+        </Expand>
+    </Type>
+
+    <Type Name="tsl::detail_robin_hash::robin_hash&lt;*&gt;::robin_iterator&lt;*&gt;">
+        <DisplayString>{*m_bucket}</DisplayString>
+        <Expand>
+            <ExpandedItem>*m_bucket</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <Type Name="tsl::detail_robin_hash::bucket_entry&lt;*&gt;">
+        <DisplayString Condition="m_dist_from_ideal_bucket == -1">empty</DisplayString>
+        <DisplayString Condition="m_dist_from_ideal_bucket != -1">{*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)}</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_dist_from_ideal_bucket != -1">*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <Type Name="tsl::detail_robin_hash::bucket_entry&lt;*&gt;" IncludeView="MapHelper">
+        <DisplayString Condition="m_dist_from_ideal_bucket == -1">empty</DisplayString>
+        <DisplayString Condition="m_dist_from_ideal_bucket != -1">{reinterpret_cast&lt;$T1*&gt;(&amp;m_value)->second}</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_dist_from_ideal_bucket != -1">*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)</ExpandedItem>
+        </Expand>
+    </Type>
+</AutoVisualizer>
diff --git a/tools/appveyor-scripts/before-build.ps1 b/tools/appveyor-scripts/before-build.ps1
deleted file mode 100644
index 93dc6673685f..000000000000
--- a/tools/appveyor-scripts/before-build.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-Set-PSDebug -Trace 1
-$python = "C:\\Python27\\python.exe"
-$git_retry = "$pyhon $env:APPVEYOR_BUILD_FOLDER\tools\appveyor-scripts\git_retry.py"
-
-
-function Download-Deps
-{
-    Write-Host "Download-Deps"
-    & $python $env:APPVEYOR_BUILD_FOLDER\download-deps.py --remove-download=False
-}
-
-function Generate-Binding-Codes
-{
-    $env:NDK_ROOT=$env:APPVEYOR_BUILD_FOLDER + "\..\android-ndk-r16b"
-
-    # install python module
-    & pip install PyYAML Cheetah
-    Write-Host "generating binding codes"
-
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\tools\tolua
-    & $python $env:APPVEYOR_BUILD_FOLDER\tools\tolua\genbindings.py
-    Pop-Location
-}
-
-function Update-SubModule
-{
-    Push-Location $env:APPVEYOR_BUILD_FOLDER
-    & $git_retry submodule init
-    & $git_retry submodule update --recursive --depth=1
-    Pop-Location
-}
-
-Update-SubModule
-
-Download-Deps
-
-& python -m pip install retry
-
-If ($env:build_type -eq "windows32_cmake_test" ) {
-    & $python -u .\tools\appveyor-scripts\setup_android.py --ndk_only
-    Generate-Binding-Codes
-}
-elseif ($env:build_type -like "android*") {
-    & choco install ninja
-    & ninja --version
-    & $python -u .\tools\appveyor-scripts\setup_android.py
-    If ($env:build_type -eq "android_lua_tests") {
-        Generate-Binding-Codes
-    }
-    if ($lastexitcode -ne 0) {throw}
-}
\ No newline at end of file
diff --git a/tools/appveyor-scripts/build.ps1 b/tools/appveyor-scripts/build.ps1
deleted file mode 100644
index c3682f5629db..000000000000
--- a/tools/appveyor-scripts/build.ps1
+++ /dev/null
@@ -1,124 +0,0 @@
-Set-PSDebug -Trace 1
-$python = "D:\\Python27\\python.exe"
-
-Write-Host "Set environment"
-# gradlew
-$env:ANDROID_HOME=$env:APPVEYOR_BUILD_FOLDER + "\..\android-sdk"
-$env:ANDROID_NDK_HOME=$env:APPVEYOR_BUILD_FOLDER + "\..\android-ndk-r16b"
-# gen-libs
-$env:ANDROID_SDK_ROOT=$env:APPVEYOR_BUILD_FOLDER + "\..\android-sdk"
-$env:NDK_ROOT=$env:APPVEYOR_BUILD_FOLDER + "\..\android-ndk-r16b"
-
-function Retry-Command {
-    [CmdletBinding()]
-    Param(
-        [Parameter(Position=0, Mandatory=$true)]
-        [scriptblock]$ScriptBlock,
-
-        [Parameter(Position=1, Mandatory=$false)]
-        [int]$Maximum = 5
-    )
-
-    Begin {
-        $cnt = 0
-    }
-
-    Process {
-        do {
-            $cnt++
-            try {
-                $ScriptBlock.Invoke()
-                return
-            } catch {
-                Write-Error $_.Exception.InnerException.Message -ErrorAction Continue
-            }
-        } while ($cnt -lt $Maximum)
-
-        # Throw an error after $Maximum unsuccessful invocations. Doesn't need
-        # a condition, since the function returns upon successful invocation.
-        throw 'Execution failed.'
-    }
-}
-
-function PushAndroidArtifacts
-{
-    # https://www.appveyor.com/docs/packaging-artifacts/
-    $root = Resolve-Path app\build\outputs\apk; [IO.Directory]::GetFiles($root.Path, '*.*', 'AllDirectories') | % { Push-AppveyorArtifact $_ -FileName $_.Substring($root.Path.Length + 1) -DeploymentName to-publish }
-}
-
-
-If ($env:build_type -eq "android_cpp_tests") {
-    Write-Host "Build tests\cpp-tests"
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\tests\cpp-tests\proj.android\
-    Retry-Command -ScriptBlock {
-        & ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --parallel --info
-    } -Maximum 5
-    if ($lastexitcode -ne 0) {throw}
-    PushAndroidArtifacts
-    Pop-Location
-
-} elseif ($env:build_type -eq "android_lua_tests") {
-    Write-Host "Build tests\lua-test"
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\tests\lua-tests\project\proj.android\
-    # tocheck, release mode failed on "LuaTests:mergeReleaseAssets"
-    Retry-Command -ScriptBlock {
-        & ./gradlew assembleDebug -PPROP_BUILD_TYPE=cmake --parallel --info
-    } -Maximum 5
-
-    if ($lastexitcode -ne 0) {throw}
-    PushAndroidArtifacts
-    Pop-Location
-
-} elseif ($env:build_type -eq "android_cpp_empty_test") {
-    Write-Host "Build tests\cpp-empty-test"
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\tests\cpp-empty-test\proj.android\
-    Retry-Command -ScriptBlock {
-        & ./gradlew assembleRelease
-    } -Maximum 5
-    if ($lastexitcode -ne 0) {throw}
-    PushAndroidArtifacts
-    Pop-Location
-
-} elseif ($env:build_type -eq "android_cocos_new_test") {
-    Write-Host "Create new project cocos_new_test"
-    & $python -u tools\console\bin\adxe.py --agreement n new -l cpp -p my.pack.qqqq cocos_new_test
-    if ($lastexitcode -ne 0) {throw}
-
-    Write-Host "Build cocos_new_test"
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\cocos_new_test\proj.android\
-    Retry-Command -ScriptBlock {
-        & ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --parallel --info
-    } -Maximum 5
-    
-    if ($lastexitcode -ne 0) {throw}
-    PushAndroidArtifacts
-    Pop-Location
-# TODO: uncomment when fixed
-# } elseif ($env:build_type -eq "android_gen_libs") {
-#     Write-Host "Build cocos gen-libs"
-#     & $python -u tools\console\bin\adxe.py gen-libs -p android -m release --ap android-15 --app-abi armeabi-v7a --agreement n
-#     if ($lastexitcode -ne 0) {throw}
-
-} elseif ($env:build_type -eq "windows32_cmake_test") {
-    Write-Host "Build tests project by cmake"
-
-    $ENV:PATH="$env:APPVEYOR_BUILD_FOLDER\tools\console\bin;$ENV:PATH"
-
-    & mkdir $env:APPVEYOR_BUILD_FOLDER\win32-build
-    # if ($lastexitcode -ne 0) {throw} # mkdir return no-zero
-
-    Push-Location $env:APPVEYOR_BUILD_FOLDER\win32-build
-    & cmake -A Win32 -DCMAKE_BUILD_TYPE=Release .. -DBUILD_EXTENSION_IMGUIEXT=ON
-    if ($lastexitcode -ne 0) {throw}
-
-    & cmake --build . --config Release --target cpp-tests
-    if ($lastexitcode -ne 0) {throw}
-
-    # & 7z a release_win32.7z $env:APPVEYOR_BUILD_FOLDER\win32-build\bin\
-    # if ($lastexitcode -ne 0) {throw}
-
-    # Push-AppveyorArtifact release_win32.7z
-    Pop-Location
-}
-Else {
-}
diff --git a/tools/appveyor-scripts/git_retry.py b/tools/appveyor-scripts/git_retry.py
deleted file mode 100644
index 45694ef9a9d4..000000000000
--- a/tools/appveyor-scripts/git_retry.py
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-import logging
-import optparse
-import subprocess
-import sys
-import threading
-import time
-import re
-
-GIT_EXE="git"
-GIT_TRANSIENT_ERRORS = (
-    # crbug.com/285832
-    r'!.*\[remote rejected\].*\(error in hook\)',
-    # crbug.com/289932
-    r'!.*\[remote rejected\].*\(failed to lock\)',
-    # crbug.com/307156
-    r'!.*\[remote rejected\].*\(error in Gerrit backend\)',
-    # crbug.com/285832
-    r'remote error: Internal Server Error',
-    # crbug.com/294449
-    r'fatal: Couldn\'t find remote ref ',
-    # crbug.com/220543
-    r'git fetch_pack: expected ACK/NAK, got',
-    # crbug.com/189455
-    r'protocol error: bad pack header',
-    # crbug.com/202807
-    r'The remote end hung up unexpectedly',
-    # crbug.com/298189
-    r'TLS packet with unexpected length was received',
-    # crbug.com/187444
-    r'RPC failed; result=\d+, HTTP code = \d+',
-    # crbug.com/388876
-    r'Connection timed out',
-    # crbug.com/430343
-    # TODO(dnj): Resync with Chromite.
-    r'The requested URL returned error: 5\d+',
-)
-GIT_TRANSIENT_ERRORS_RE = re.compile('|'.join(GIT_TRANSIENT_ERRORS),
-                                     re.IGNORECASE)
-
-class TeeThread(threading.Thread):
-  def __init__(self, fd, out_fd, name):
-    super(TeeThread, self).__init__(name='git-retry.tee.%s' % (name,))
-    self.data = None
-    self.fd = fd
-    self.out_fd = out_fd
-  def run(self):
-    chunks = []
-    for line in self.fd:
-      chunks.append(line)
-      self.out_fd.write(line)
-    self.data = ''.join(chunks)
-class GitRetry(object):
-  logger = logging.getLogger('git-retry')
-  DEFAULT_DELAY_SECS = 3.0
-  DEFAULT_RETRY_COUNT = 5
-  def __init__(self, retry_count=None, delay=None, delay_factor=None):
-    self.retry_count = retry_count or self.DEFAULT_RETRY_COUNT
-    self.delay = max(delay, 0) if delay else 0
-    self.delay_factor = max(delay_factor, 0) if delay_factor else 0
-  def shouldRetry(self, stderr):
-    m = GIT_TRANSIENT_ERRORS_RE.search(stderr)
-    if not m:
-      return False
-    self.logger.info("Encountered known transient error: [%s]",
-                     stderr[m.start(): m.end()])
-    return True
-  @staticmethod
-  def execute(*args):
-    args = (GIT_EXE,) + args
-    proc = subprocess.Popen(
-        args,
-        stderr=subprocess.PIPE,
-    )
-    stderr_tee = TeeThread(proc.stderr, sys.stderr, 'stderr')
-    # Start our process. Collect/tee 'stdout' and 'stderr'.
-    stderr_tee.start()
-    try:
-      proc.wait()
-    except KeyboardInterrupt:
-      proc.kill()
-      raise
-    finally:
-      stderr_tee.join()
-    return proc.returncode, None, stderr_tee.data
-  def computeDelay(self, iteration):
-    """Returns: the delay (in seconds) for a given iteration
-    The first iteration has a delay of '0'.
-    Args:
-      iteration: (int) The iteration index (starting with zero as the first
-          iteration)
-    """
-    if (not self.delay) or (iteration == 0):
-      return 0
-    if self.delay_factor == 0:
-      # Linear delay
-      return iteration * self.delay
-    # Exponential delay
-    return (self.delay_factor ** (iteration - 1)) * self.delay
-  def __call__(self, *args):
-    returncode = 0
-    for i in xrange(self.retry_count):
-      # If the previous run failed and a delay is configured, delay before the
-      # next run.
-      delay = self.computeDelay(i)
-      if delay > 0:
-        self.logger.info("Delaying for [%s second(s)] until next retry", delay)
-        time.sleep(delay)
-      self.logger.debug("Executing subprocess (%d/%d) with arguments: %s",
-                        (i+1), self.retry_count, args)
-      returncode, _, stderr = self.execute(*args)
-      self.logger.debug("Process terminated with return code: %d", returncode)
-      if returncode == 0:
-        break
-      if not self.shouldRetry(stderr):
-        self.logger.error("Process failure was not known to be transient; "
-                          "terminating with return code %d", returncode)
-        break
-    return returncode
-def main(args):
-  parser = optparse.OptionParser()
-  parser.disable_interspersed_args()
-  parser.add_option('-v', '--verbose',
-                    action='count', default=0,
-                    help="Increase verbosity; can be specified multiple times")
-  parser.add_option('-c', '--retry-count', metavar='COUNT',
-                    type=int, default=GitRetry.DEFAULT_RETRY_COUNT,
-                    help="Number of times to retry (default=%default)")
-  parser.add_option('-d', '--delay', metavar='SECONDS',
-                    type=float, default=GitRetry.DEFAULT_DELAY_SECS,
-                    help="Specifies the amount of time (in seconds) to wait "
-                         "between successive retries (default=%default). This "
-                         "can be zero.")
-  parser.add_option('-D', '--delay-factor', metavar='FACTOR',
-                    type=int, default=2,
-                    help="The exponential factor to apply to delays in between "
-                         "successive failures (default=%default). If this is "
-                         "zero, delays will increase linearly. Set this to "
-                         "one to have a constant (non-increasing) delay.")
-  opts, args = parser.parse_args(args)
-  # Configure logging verbosity
-  if opts.verbose == 0:
-    logging.getLogger().setLevel(logging.WARNING)
-  elif opts.verbose == 1:
-    logging.getLogger().setLevel(logging.INFO)
-  else:
-    logging.getLogger().setLevel(logging.DEBUG)
-  # Execute retries
-  retry = GitRetry(
-      retry_count=opts.retry_count,
-      delay=opts.delay,
-      delay_factor=opts.delay_factor,
-  )
-  return retry(*args)
-if __name__ == '__main__':
-  logging.basicConfig()
-  logging.getLogger().setLevel(logging.WARNING)
-  try:
-    sys.exit(main(sys.argv[1:]))
-  except KeyboardInterrupt:
-    sys.stderr.write('interrupted\n')
-    sys.exit(1)
\ No newline at end of file
diff --git a/tools/bindings-generator/generator.py b/tools/bindings-generator/generator.py
index 93b32fa0d9df..22122942de09 100644
--- a/tools/bindings-generator/generator.py
+++ b/tools/bindings-generator/generator.py
@@ -82,6 +82,8 @@
     'std::unordered_map': 2,
     'std::unordered_multimap': 2,
     'std::map': 2,
+    'tsl::robin_map': 2,
+    'hlookup::string_map': 2,
     'std::multimap': 2,
     'std::vector': 1,
     'std::list': 1,
@@ -91,6 +93,8 @@
     'std::multiset': 1,
     'std::unordered_set': 1,
     'std::unordered_multiset': 1,
+    'tsl::robin_set': 1,
+    'hlookup::string_set': 1,
     'std::stack': 1,
     'std::queue': 1,
     'std::deque': 1,
@@ -100,6 +104,8 @@
     'unordered_multimap': 2,
     'map': 2,
     'multimap': 2,
+    'robin_map': 2,
+    'string_map': 2,
     'vector': 1,
     'list': 1,
     'forward_list': 1,
@@ -108,6 +114,8 @@
     'multiset': 1,
     'unordered_set': 1,
     'unordered_multiset': 1,
+    'robin_set': 1,
+    'string_set': 1,
     'stack': 1,
     'queue': 1,
     'deque': 1,
@@ -221,8 +229,23 @@ def normalize_type_str(s, depth=1):
             return 'std::string' + last_section
         else:
             return 'std::string'
+
+    # for std::string_view
+    if sections[0] == 'const std::basic_string_view' or sections[0] == 'const basic_string_view':
+        last_section = sections[len(sections) - 1]
+        if last_section == '&' or last_section == '*' or last_section.startswith('::'):
+            return 'const std::string_view' + last_section
+        else:
+            return 'const std::string_view'
+
+    elif sections[0] == 'std::basic_string_view' or sections[0] == 'basic_string_view':
+        last_section = sections[len(sections) - 1]
+        if last_section == '&' or last_section == '*' or last_section.startswith('::'):
+            return 'std::string_view' + last_section
+        else:
+            return 'std::string_view'        
            
-    # for string_view
+    # for compatible cxx17::string_view
     if sections[0] == 'const cxx17::basic_string_view' or sections[0] == 'const basic_string_view':
         last_section = sections[len(sections) - 1]
         if last_section == '&' or last_section == '*' or last_section.startswith('::'):
@@ -455,6 +478,8 @@ def from_type(ntype):
                 and not nt.namespaced_name.startswith('std::function') \
                 and not nt.namespaced_name.startswith('std::string') \
                 and not nt.namespaced_name.startswith('std::basic_string') \
+                and not nt.namespaced_name.startswith('std::string_view') \
+                and not nt.namespaced_name.startswith('std::basic_string_view') \
                 and not nt.namespaced_name.startswith('cxx17::string_view') \
                 and not nt.namespaced_name.startswith('cxx17::basic_string_view'):
                 nt.is_object = True
@@ -634,6 +659,12 @@ def to_native(self, convert_opts):
         return "#pragma warning NO CONVERSION TO NATIVE FOR " + self.name + "\n" + convert_opts['level'] * "\t" +  "ok = false"
 
     def to_string(self, generator):
+
+        if self.name.find("robin_map<std::string, ") == 0:
+            self.name = self.name.replace(">", ", hlookup::string_hash, hlookup::equal_to>")
+            self.namespaced_name = self.namespaced_name.replace(">", ", hlookup::string_hash, hlookup::equal_to>")
+            self.whole_name = self.whole_name.replace(">", ", hlookup::string_hash, hlookup::equal_to>")
+
         conversions = generator.config['conversions']
         if conversions.has_key('native_types'):
             native_types_dict = conversions['native_types']
@@ -679,6 +710,9 @@ def get_whole_name(self, generator):
         if to_replace:
             name = to_replace
 
+        if name.find("tsl::robin_map<std::string, ") >= 0:
+            name = name.replace(">", ", hlookup::string_hash, hlookup::equal_to>")
+
         return name
 
     def object_can_convert(self, generator, is_to_native = True):
@@ -1628,6 +1662,8 @@ def scriptname_from_native(self, namespace_class_name, namespace_name):
         if namespace_class_name.find("::") >= 0:
             if namespace_class_name.find("std::") == 0 or namespace_class_name.find("cxx17::") == 0:
                 return namespace_class_name
+            if namespace_class_name.find("tsl::") == 0 or namespace_class_name.find("hlookup::") == 0:
+                return namespace_class_name
             else:
                 raise Exception("The namespace (%s) conversion wasn't set in 'ns_map' section of the conversions.yaml" % namespace_class_name)
         else:
@@ -1638,6 +1674,8 @@ def is_cocos_class(self, namespace_class_name):
         for (k, v) in script_ns_dict.items():
             if namespace_class_name.find("std::") == 0 or namespace_class_name.find("cxx17::") == 0:
                 return False
+            if namespace_class_name.find("tsl::") == 0 or namespace_class_name.find("hlookup::") == 0:
+                return False
             if namespace_class_name.find(k) >= 0:
                 return True
 
@@ -1659,6 +1697,8 @@ def js_typename_from_natve(self, namespace_class_name):
                 return "Array"
             if namespace_class_name.find("std::map") == 0 or namespace_class_name.find("std::unordered_map") == 0:
                 return "map_object"
+            if namespace_class_name.find("tsl::robin_") >= 0 or namespace_class_name.find("hlookup::string_map") == 0:
+                return "map_object"
             if namespace_class_name.find("std::function") == 0:
                 return "function"
 
@@ -1674,7 +1714,7 @@ def js_typename_from_natve(self, namespace_class_name):
                     return "mat4_object"
                 if namespace_class_name.find("cocos2d::Vector") == 0:
                     return "Array"
-                if namespace_class_name.find("cocos2d::Map") == 0:
+                if namespace_class_name.find("cocos2d::Map") == 0 or namespace_class_name.find("cocos2d::StringMap") == 0:
                     return "map_object"
                 if namespace_class_name.find("cocos2d::Point")  == 0:
                     return "point_object"
@@ -1703,6 +1743,8 @@ def lua_typename_from_natve(self, namespace_class_name, is_ret = False):
                 return "array_table"
             if namespace_class_name.find("std::map") == 0 or namespace_class_name.find("std::unordered_map") == 0:
                 return "map_table"
+            if namespace_class_name.find("tsl::robin_") >= 0 or namespace_class_name.find("hlookup::string_map") == 0:
+                return "map_table"
             if namespace_class_name.find("std::function") == 0:
                 return "function"
 
@@ -1718,7 +1760,7 @@ def lua_typename_from_natve(self, namespace_class_name, is_ret = False):
                     return "array_table"
                 if namespace_class_name.find("cocos2d::Mat4") == 0:
                     return "mat4_table"
-                if namespace_class_name.find("cocos2d::Map") == 0:
+                if namespace_class_name.find("cocos2d::Map") == 0 or namespace_class_name.find("cocos2d::StringMap") == 0:
                     return "map_table"
                 if namespace_class_name.find("cocos2d::Point")  == 0:
                     return "point_table"
@@ -1762,7 +1804,7 @@ def js_ret_name_from_native(self, namespace_class_name, is_enum) :
         if self.is_cocos_class(namespace_class_name):
             if namespace_class_name.find("cocos2d::Vector") >=0:
                 return "new Array()"
-            if namespace_class_name.find("cocos2d::Map") >=0:
+            if namespace_class_name.find("cocos2d::Map") >=0 or namespace_class_name.find("cocos2d::StringMap") >=0:
                 return "map_object"
             if is_enum:
                 return 0
@@ -1788,6 +1830,8 @@ def js_ret_name_from_native(self, namespace_class_name, is_enum) :
 
         if lower_name.find("std::map") >= 0 or lower_name.find("std::unordered_map") >= 0 or lower_name.find("unordered_map") >= 0 or lower_name.find("map") >= 0:
             return "map_object"
+        if lower_name.find("robin_") >= 0:
+            return "map_object"
 
         if lower_name == "std::function":
             return "func"
diff --git a/tools/bindings-generator/targets/lua/conversions.yaml b/tools/bindings-generator/targets/lua/conversions.yaml
index d60c9d26cbe7..d1db91df1878 100644
--- a/tools/bindings-generator/targets/lua/conversions.yaml
+++ b/tools/bindings-generator/targets/lua/conversions.yaml
@@ -26,6 +26,8 @@ conversions:
     "CocosDenshion::": "cc."
     "cocos2d::tweenfunc::": "cc."
     "cocos2d::backend::": "ccb."
+    "tsl::": "tsl."
+    "hlookup::": "hlookup."
 
   to_native:
     # lua to native
@@ -59,13 +61,14 @@ conversions:
     "AffineTransform": "ok &= luaval_to_affinetransform(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "FontDefinition":  "ok &= luaval_to_fontdefinition(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "@Vector<.*>": "ok &= luaval_to_ccvector(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
-    "@Map<std::string.*>": "ok &= luaval_to_ccmap_string_key(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
-    "@map<std::string.*,\\s*std::string.*>": "ok &= luaval_to_std_map_string_string(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
+    "@Map<std::string,.*>": "ok &= luaval_to_ccmap_string_key(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
+    "@robin_map<std::string.*,\\s*std::string.*>": "ok &= luaval_to_std_map_string_string(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "Value": "ok &= luaval_to_ccvalue(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "ValueMap": "ok &= luaval_to_ccvaluemap(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "ValueMapIntKey": "ok &= luaval_to_ccvaluemapintkey(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "ValueVector": "ok &= luaval_to_ccvaluevector(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
-    "@vector<std::string.*>": "ok &= luaval_to_std_vector_string(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
+    "@vector<std::string>": "ok &= luaval_to_std_vector_string(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
+    "@vector<std::string_view.*>": "ok &= luaval_to_std_vector_string_view(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "@vector<int.*>": "ok &= luaval_to_std_vector_int(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "kmMat4": "ok &= luaval_to_kmMat4(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
     "Mat4": "ok &= luaval_to_mat4(tolua_S, ${arg_idx}, &${out_value}, \"${lua_namespaced_class_name}:${func_name}\")"
@@ -121,12 +124,13 @@ conversions:
     "FontDefinition": "fontdefinition_to_luaval(tolua_S, ${in_value})"
     "@Vector<.*>": "ccvector_to_luaval(tolua_S, ${in_value})"
     "@Map<std::string.*>": "ccmap_string_key_to_luaval(tolua_S, ${in_value})"
-    "@map<std::string.*,\\s*std::string.*>": "${out_value} = std_map_string_string_to_luaval(tolua_S, ${in_value})"
+    "@robin_map<std::string.*,\\s*std::string.*>": "${out_value} = std_map_string_string_to_luaval(tolua_S, ${in_value})"
     "Value": "ccvalue_to_luaval(tolua_S, ${in_value})"
     "ValueMap": "ccvaluemap_to_luaval(tolua_S, ${in_value})"
     "ValueMapIntKey": "ccvaluemapintkey_to_luaval(tolua_S, ${in_value})"
     "ValueVector": "ccvaluevector_to_luaval(tolua_S, ${in_value})"
-    "@vector<std::string.*>": "ccvector_std_string_to_luaval(tolua_S, ${in_value})"
+    "@vector<std::string>": "ccvector_std_string_to_luaval(tolua_S, ${in_value})"
+    "@vector<std::string_view.*>": "ccvector_std_string_view_to_luaval(tolua_S, ${in_value})"
     "@vector<int.*>": "ccvector_int_to_luaval(tolua_S, ${in_value})"
     "Mat4": "mat4_to_luaval(tolua_S, ${in_value})"
     "BlendFunc": "blendfunc_to_luaval(tolua_S, ${in_value})"
diff --git a/tools/bindings-generator/test/test.ini b/tools/bindings-generator/test/test.ini
index 4cf5c44aa65c..3a923faf7fb6 100644
--- a/tools/bindings-generator/test/test.ini
+++ b/tools/bindings-generator/test/test.ini
@@ -7,7 +7,7 @@ android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include
 android_flags = -D_SIZE_T_DEFINED_
 
 clang_headers = -I%(clangllvmdir)s/lib/clang/%(clang_version)s/include
-clang_flags = -nostdinc -x c++ -std=c++11 -U __SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -U __SSE__
 
 simple_test_headers = -I%(cxxgeneratordir)s/test/simple_tes
 
diff --git a/tools/console/README.md b/tools/console/README.md
index 9e0ac874c934..35230c593aa2 100644
--- a/tools/console/README.md
+++ b/tools/console/README.md
@@ -1,19 +1,6 @@
 # adxe-console
 
 
-
-## Download
-
-```sh
-$ NOT DONE YET
-```
-
-## Install
-
-```sh
-$ NOT DONE YET
-```
-
 ## Vision of adxe-console
 
 
diff --git a/tools/console/config.json b/tools/console/config.json
deleted file mode 100644
index eb39f24b1fe8..000000000000
--- a/tools/console/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "version":"v3-console-16",
-    "zip_file_size":"38343506",
-    "repo_name":"console-binary",
-    "repo_parent":"https://github.com/cocos2d/"
-}
diff --git a/tools/console/download-bin.py b/tools/console/download-bin.py
deleted file mode 100644
index 65fd58a11029..000000000000
--- a/tools/console/download-bin.py
+++ /dev/null
@@ -1,308 +0,0 @@
-#!/usr/bin/env python
-#coding=utf-8
-#
-# ./download-bin.py
-#
-# Download adxe-console resources from github (https://github.com/natural-law/console-binary) and extract from ZIP
-#
-# Helps prevent repo bloat due to large binary files since they can
-# be hosted separately.
-#
-
-"""****************************************************************************
-Copyright (c) 2014 cocos2d-x.org
-Copyright (c) 2014 Chukong Technologies Inc.
-
-http://www.cocos2d-x.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-****************************************************************************"""
-
-import os.path,zipfile
-import shutil
-import sys
-import traceback
-import distutils
-import fileinput
-import json
-
-from optparse import OptionParser
-from time import time
-from sys import stdout
-from distutils.errors import DistutilsError
-from distutils.dir_util import copy_tree, remove_tree
-
-class UnrecognizedFormat:
-    def __init__(self, prompt):
-        self._prompt = prompt
-    def __str__(self):
-        return self._prompt
-
-class CocosZipInstaller(object):
-    def __init__(self, workpath, config_path, version_path, remote_version_key = None):
-        self._workpath = workpath
-        self._config_path = config_path
-        self._version_path = version_path
-
-        data = self.load_json_file(config_path)
-
-        self._current_version = data["version"]
-        self._repo_name = data["repo_name"]
-        self._filename = self._current_version + '.zip'
-        self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename
-        self._zip_file_size = int(data["zip_file_size"])
-        # 'v' letter was swallowed by github, so we need to substring it from the 2nd letter
-        self._extracted_folder_name = self._repo_name + '-' + self._current_version[1:]
-
-        try:
-            data = self.load_json_file(version_path)
-            if remote_version_key == None:
-                self._remote_version = data["version"]
-            else:
-                self._remote_version = data[remote_version_key]
-        except:
-            print("==> version file doesn't exist")
-
-    def get_input_value(self, prompt):
-        ret = ""
-        if(sys.version_info.major >= 3):
-            ret = input(prompt)
-        else:
-            ret = raw_input(prompt)
-        ret.rstrip(" \t")
-        return ret
-
-    def download_file(self):
-        print("==> Ready to download '%s' from '%s'" % (self._filename, self._url))
-        import urllib2
-        try:
-            u = urllib2.urlopen(self._url)
-        except urllib2.HTTPError as e:
-            if e.code == 404:
-                print("==> Error: Could not find the file from url: '%s'" % (self._url))
-            print("==> Http request failed, error code: " + str(e.code) + ", reason: " + e.read())
-            sys.exit(1)
-
-        f = open(self._filename, 'wb')
-        meta = u.info()
-        content_len = meta.getheaders("Content-Length")
-        file_size = 0
-        if content_len and len(content_len) > 0:
-            file_size = int(content_len[0])
-        else:
-            # github server may not reponse a header information which contains `Content-Length`,
-            # therefore, the size needs to be written hardcode here. While server doesn't return
-            # `Content-Length`, use it instead
-            print("==> WARNING: Couldn't grab the file size from remote, use 'zip_file_size' section in '%s'" % self._config_path)
-            file_size = self._zip_file_size
-
-        print("==> Starting to download, please wait ...")
-
-        file_size_dl = 0
-        block_sz = 8192
-        block_size_per_second = 0
-        old_time=time()
-
-        while True:
-            buffer = u.read(block_sz)
-            if not buffer:
-                break
-
-            file_size_dl += len(buffer)
-            block_size_per_second += len(buffer)
-            f.write(buffer)
-            new_time = time()
-            if (new_time - old_time) > 1:
-                speed = block_size_per_second / (new_time - old_time) / 1000.0
-                status = ""
-                if file_size != 0:
-                    percent = file_size_dl * 100. / file_size
-                    status = r"Downloaded: %6dK / Total: %dK, Percent: %3.2f%%, Speed: %6.2f KB/S " % (file_size_dl / 1000, file_size / 1000, percent, speed)
-                else:
-                    status = r"Downloaded: %6dK, Speed: %6.2f KB/S " % (file_size_dl / 1000, speed)
-
-                status = status + chr(8)*(len(status)+1)
-                print(status),
-                sys.stdout.flush()
-                block_size_per_second = 0
-                old_time = new_time
-
-        print("==> Downloading finished!")
-        f.close()
-
-    def ensure_directory(self, target):
-        if not os.path.exists(target):
-            os.mkdir(target)
-
-    def unpack_zipfile(self, extract_dir):
-        """Unpack zip `filename` to `extract_dir`
-
-        Raises ``UnrecognizedFormat`` if `filename` is not a zipfile (as determined
-        by ``zipfile.is_zipfile()``).
-        """
-
-        if not zipfile.is_zipfile(self._filename):
-            raise UnrecognizedFormat("%s is not a zip file" % (self._filename))
-
-        print("==> Extracting files, please wait ...")
-        z = zipfile.ZipFile(self._filename)
-        try:
-            for info in z.infolist():
-                name = info.filename
-
-                # don't extract absolute paths or ones with .. in them
-                if name.startswith('/') or '..' in name:
-                    continue
-
-                target = os.path.join(extract_dir, *name.split('/'))
-                if not target:
-                    continue
-                if name.endswith('/'):
-                    # directory
-                    self.ensure_directory(target)
-                else:
-                    # file
-                    data = z.read(info.filename)
-                    f = open(target,'wb')
-                    try:
-                        f.write(data)
-                    finally:
-                        f.close()
-                        del data
-                unix_attributes = info.external_attr >> 16
-                if unix_attributes:
-                    os.chmod(target, unix_attributes)
-        finally:
-            z.close()
-            print("==> Extraction done!")
-
-
-    def ask_to_delete_downloaded_zip_file(self):
-        ret = self.get_input_value("==> Delete '%s' file? It may be reused when you execute this script next time! (yes/no): " % self._filename)
-        ret = ret.strip()
-        if ret != 'yes' and ret != 'no':
-            print("==> Invalid answer, please answer 'yes' or 'no'!")
-            return self.ask_to_delete_downloaded_zip_file()
-        else:
-            return True if ret == 'yes' else False
-
-    def download_zip_file(self):
-        if not os.path.isfile(self._filename):
-            self.download_file()
-        try:
-            if not zipfile.is_zipfile(self._filename):
-                raise UnrecognizedFormat("%s is not a zip file" % (self._filename))
-        except UnrecognizedFormat as e:
-            print("==> Unrecognized zip format from your local '%s' file!" % (self._filename))
-            if os.path.isfile(self._filename):
-                os.remove(self._filename)
-            print("==> Download it from internet again, please wait...")
-            self.download_zip_file()
-
-    def need_to_update(self):
-        if not os.path.isfile(self._version_path):
-            return True
-
-        with open(self._version_path) as data_file:
-            data = json.load(data_file)
-
-        if self._remote_version == self._current_version:
-            return False
-        return True
-
-    def load_json_file(self, file_path):
-        if not os.path.isfile(file_path):
-            raise Exception("Could not find (%s)" % (file_path))
-
-        with open(file_path) as data_file:
-            data = json.load(data_file)
-        return data
-
-    def run(self, folder_for_extracting, remove_downloaded, force_update, download_only):
-        if not force_update and not self.need_to_update():
-            print("==> No need to update!")
-            return
-
-        if os.path.exists(self._extracted_folder_name):
-            shutil.rmtree(self._extracted_folder_name)
-
-        self.download_zip_file()
-
-        if not download_only:
-            self.unpack_zipfile(self._workpath)
-            print("==> Copying files...")
-            dst_folder_path = os.path.join(self._workpath, folder_for_extracting)
-            if not os.path.exists(dst_folder_path):
-                os.makedirs(dst_folder_path)
-            distutils.dir_util.copy_tree(self._extracted_folder_name, dst_folder_path)
-            print("==> Cleaning...")
-            if os.path.exists(self._extracted_folder_name):
-                shutil.rmtree(self._extracted_folder_name)
-            if os.path.isfile(self._filename):
-                if remove_downloaded != None:
-                    if remove_downloaded == 'yes':
-                        os.remove(self._filename)
-                elif self.ask_to_delete_downloaded_zip_file():
-                    os.remove(self._filename)
-        else:
-            print("==> Download (%s) finish!" % self._filename)
-
-
-def _check_python_version():
-    major_ver = sys.version_info[0]
-    if major_ver > 2:
-        print ("The python version is %d.%d. But python 2.x is required. (Version 2.7 is well tested)\n"
-               "Download it here: https://www.python.org/" % (major_ver, sys.version_info[1]))
-        return False
-
-    return True
-
-def main():
-    workpath = os.path.dirname(os.path.realpath(__file__))
-
-    if not _check_python_version():
-        sys.exit(1)
-
-    parser = OptionParser()
-    parser.add_option('-r', '--remove-download',
-                      action="store", type="string", dest='remove_downloaded', default=None,
-                      help="Whether to remove downloaded zip file, 'yes' or 'no'")
-
-    parser.add_option("-f", "--force-update",
-                      action="store_true", dest="force_update", default=False,
-                      help="Whether to force update the third party libraries")
-
-    parser.add_option("-d", "--download-only",
-                      action="store_true", dest="download_only", default=False,
-                      help="Only download zip file of the third party libraries, will not extract it")
-
-    (opts, args) = parser.parse_args()
-
-    print("=======================================================")
-    print("==> Preparing to download console binaries!")
-    installer = CocosZipInstaller(workpath, os.path.join(workpath, 'config.json'), os.path.join(workpath, 'version.json'), "version")
-    installer.run("", opts.remove_downloaded, opts.force_update, opts.download_only)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    try:
-        main()
-    except Exception as e:
-        traceback.print_exc()
-        sys.exit(1)
diff --git a/tools/jenkins-scripts/configs/autotest.py b/tools/jenkins-scripts/configs/autotest.py
deleted file mode 100644
index ea57782db70d..000000000000
--- a/tools/jenkins-scripts/configs/autotest.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import os
-os.system('git checkout develop')
-os.system('git pull origin develop')
-print('in building, run autotest.py.')
-ret = os.system('python -u tools/jenkins-scripts/autotest.py')
-os.system('git reset --hard')
-print ret
-if(ret > 0):
-    ret = 1
-exit(ret)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-develop-android.py b/tools/jenkins-scripts/configs/cocos-2dx-develop-android.py
deleted file mode 100644
index 60bdd4a17322..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-develop-android.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import os
-import platform
-print 'Build Config:'
-print '    Branch:develop'
-print '    Target:Android'
-print '    build script:python build/android-build.py all'
-if(os.path.exists('build/android-build.py') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name + "/."
-    os.system("cp -r" + source_dir + " .")
-    os.system('git pull origin develop')
-
-os.system('git submodule update --init --force')
-ret = os.system('python build/android-build.py -n -j8 all')
-os.system('git clean -xdf -f')
-print 'build exit'
-print ret
-if ret == 0:
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-develop-base-repo.py b/tools/jenkins-scripts/configs/cocos-2dx-develop-base-repo.py
deleted file mode 100644
index c7cd0f2fd3f3..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-develop-base-repo.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import sys
-
-def check_ret(ret):
-    if(ret != 0):
-        os.system('git checkout -B develop remotes/origin/develop')
-        os.system('git clean -xdf -f')
-        sys.exit(1)
-
-branchs = ['develop', 'master']
-for item in branchs:
-    os.system('git clean -xdf -f')
-    os.system('git checkout -B ' + item + ' remotes/origin/' + item)
-    os.system('git clean -xdf -f')
-    ret = os.system('git pull origin')
-    check_ret(ret)
-    ret = os.system('git submodule update --init --force')
-    check_ret(ret)
-
-#back to develop
-os.system('git checkout -B develop remotes/origin/develop')
-os.system('git clean -xdf -f')
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-develop-ios.py b/tools/jenkins-scripts/configs/cocos-2dx-develop-ios.py
deleted file mode 100644
index 0dedd56b3c45..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-develop-ios.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import os
-print 'Build Config:'
-print '    Host:MAC'
-print '    Branch:develop'
-print '    Target:iOS'
-if(os.path.exists('tools/jenkins-scripts/ios-build.sh') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name + "/."
-    os.system("cp -r " + source_dir + " .")
-    os.system('git pull origin develop')
-
-os.system('git submodule update --init --force')
-ret = os.system('tools/jenkins-scripts/ios-build.sh')
-os.system('git clean -xdf -f')
-print 'build exit'
-print ret
-if ret == 0:
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py b/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py
deleted file mode 100644
index 87f867403220..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-develop-win32.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-import subprocess
-import sys
-print 'Build Config:'
-print '    Host:win7 x86'
-print '    Branch:develop'
-print '    Target:win32'
-print '    "%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2013.sln" /Build "Debug|Win32"'
-if(os.path.exists('build/cocos2d-win32.vc2013.sln') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name
-    source_dir = source_dir.replace("/", os.sep)
-    os.system("xcopy " + source_dir + " . /E /Y /H")
-    os.system('git pull origin develop')
-
-os.system('git submodule update --init --force')
-ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2013.sln" /Build "Debug|Win32"', shell=True)
-os.system('git clean -xdf -f')
-print 'build exit'
-print ret
-if ret == 0:
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-doxygen.py b/tools/jenkins-scripts/configs/cocos-2dx-doxygen.py
deleted file mode 100644
index 2dadb80233e0..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-doxygen.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-import platform
-print 'Build Config:'
-print '    Branch:develop'
-print '    Target:Doxygen'
-print '    doxygen doxygen.config'
-if(os.path.exists('docs/doxygen.config') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name
-    source_dir = source_dir.replace("/", os.sep)
-    os.system("xcopy " + source_dir + " . /E /Y /H")
-    os.system('git pull origin develop')
-
-os.system('git submodule update --init --force')
-os.chdir('docs/')
-ret = os.system('doxygen doxygen.config')
-os.chdir('../')
-os.system('git clean -xdf -f')
-print 'build exit'
-print ret
-if ret == 0:
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-comment-trigger.py b/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-comment-trigger.py
deleted file mode 100644
index 3cc1053ce3cf..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-comment-trigger.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-#os.system('git checkout develop')
-#os.system('git pull origin develop')
-ret = os.system('python -u tools/jenkins-scripts/job-comment-trigger.py')
-if ret == 0: 
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-trigger.py b/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-trigger.py
deleted file mode 100644
index fcdca42b3887..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build-trigger.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-#os.system('git checkout develop')
-#os.system('git pull origin develop')
-ret = os.system('python -u tools/jenkins-scripts/job-trigger.py')
-if ret == 0: 
-    exit(0)
-else:
-    exit(1)
diff --git a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build.py b/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build.py
deleted file mode 100644
index 6783e89cb9d7..000000000000
--- a/tools/jenkins-scripts/configs/cocos-2dx-pull-request-build.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import os
-import platform
-if(os.path.exists('tools/jenkins-scripts/pull-request-builder.py') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../../../cocos-2dx-develop-base-repo/node/' + node_name
-    if(platform.system() == 'Windows'):
-        source_dir = source_dir.replace("/", os.sep)
-        os.system("xcopy " + source_dir + ' . /E /Y /H')
-    else:
-        os.system("cp -r " + source_dir + "/. .")
-
-def clean_workspace():
-    os.system('git reset --hard')
-    os.system('git clean -xdf -f')
-
-clean_workspace()
-os.system('git checkout develop')
-clean_workspace()
-os.system('git pull origin develop')
-
-for i in range(0, 3):
-    ret = os.system('python -u tools/jenkins-scripts/pull-request-builder.py')
-    if(ret > 255):
-        ret >>= 8
-    if(ret == 0) or (ret == 1):
-        break
-
-clean_workspace()
-print ret
-if(ret > 0):
-    ret = 1
-exit(ret)
diff --git a/tools/jenkins-scripts/configs/cocos2d-console-test.py b/tools/jenkins-scripts/configs/cocos2d-console-test.py
deleted file mode 100644
index 9e58f9f1ec10..000000000000
--- a/tools/jenkins-scripts/configs/cocos2d-console-test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-os.system('git checkout develop')
-os.system('git pull origin develop')
-os.system('git submodule update')
-print('in building, run cocos-console-test.py.')
-#ret=0
-ret = os.system('python -u tools/jenkins-scripts/cocos-console-test.py')
-os.system('git reset --hard')
-print ret
-if(ret > 0):
-    ret = 1
-exit(ret)
diff --git a/tools/jenkins-scripts/configs/cocostudiox-base-repo.py b/tools/jenkins-scripts/configs/cocostudiox-base-repo.py
deleted file mode 100644
index 8c264bc7dfbe..000000000000
--- a/tools/jenkins-scripts/configs/cocostudiox-base-repo.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-import sys
-ret = os.system('git pull origin master')
-if(ret != 0):
-    sys.exit(1)
-ret = os.system('git submodule update --init --force')
-if(ret != 0):
-    sys.exit(1)
diff --git a/tools/jenkins-scripts/configs/cocostudiox-daily-build.py b/tools/jenkins-scripts/configs/cocostudiox-daily-build.py
deleted file mode 100644
index b7f0e04a5c6f..000000000000
--- a/tools/jenkins-scripts/configs/cocostudiox-daily-build.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import os
-import platform
-if(os.path.exists('CocoStudio/CSX/CSX/CSX.pro') == False):
-    node_name = os.environ['NODE_NAME']
-    source_dir = '../../../cocostudiox-base-repo/node/' + node_name
-    if(platform.system() == 'Windows'):
-        source_dir = source_dir.replace("/", os.sep)
-        os.system("xcopy " + source_dir + ' . /E /Y /H')
-    else:
-        os.system("cp -r " + source_dir + "/. .")
-
-os.system('git pull origin')
-os.system('git submodule update --init --force')
-
-node_name = os.environ['NODE_NAME']
-os.chdir('CocoStudio/CSX/CSX')
-ret = os.system('qmake -r')
-if(ret == 0):
-    if(node_name == 'android_mac'):
-        ret = os.system('make -j8')
-    elif(node_name == 'win32_win7'):
-        ret = os.system('mingw32-make -j8')
-os.chdir('../../..')
-
-os.system('git clean -xdf')
-os.system('git reset --hard')
-print ret
-if(ret > 0):
-    ret = 1
-exit(ret)
diff --git a/tools/jenkins-scripts/configs/jenkins-job-watchdog.py b/tools/jenkins-scripts/configs/jenkins-job-watchdog.py
deleted file mode 100644
index 341cbd6adc05..000000000000
--- a/tools/jenkins-scripts/configs/jenkins-job-watchdog.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import os
-os.system("python -u tools/jenkins-scripts/watchdog.py")
diff --git a/tools/jenkins-scripts/configs/manual-update-jenkins-scripts.py b/tools/jenkins-scripts/configs/manual-update-jenkins-scripts.py
deleted file mode 100644
index 2b770f56aeea..000000000000
--- a/tools/jenkins-scripts/configs/manual-update-jenkins-scripts.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import os
-os.system("python -u update-jenkins-scripts.py")
diff --git a/tools/jenkins-scripts/daily-build.py b/tools/jenkins-scripts/daily-build.py
deleted file mode 100644
index 60c48431d287..000000000000
--- a/tools/jenkins-scripts/daily-build.py
+++ /dev/null
@@ -1,148 +0,0 @@
-#Cocos2D-X test project daily build
-
-import os
-import sys
-import traceback
-
-if('branch' in os.environ):
-    branch = os.environ['branch']
-else:
-    branch = 'v4-develop'
-
-if('WORKSPACE' in os.environ):
-    workspace = os.environ['WORKSPACE']
-else:
-    workspace = "."
-
-if('NODE_NAME' in os.environ):
-    node_name = os.environ['NODE_NAME']
-else:
-    node_name = 'ios'
-
-if('language' in os.environ):
-    language = os.environ['language']
-else:
-    language = 'lua'
-
-if('daily_build_type' in os.environ):
-    daily_build_type = os.environ['daily_build_type']
-else:
-    daily_build_type = 'tests'
-# for local debugging purpose, you could change the value to 0 and run
-# this scripts in your local machine
-remote_build = 1
-
-def download_3rd_library():
-    #run download-deps.py
-    print("prepare to downloading ...")
-    os.system('python download-deps.py -r no')
-
-
-def sync_remote_repo():
-    #reset path to workspace root
-    os.system("cd " + workspace)
-
-    #pull latest code
-    os.system("git fetch origin " + branch)
-    os.system("git checkout " + branch)
-    os.system("git merge origin/" + branch)
-    #clean workspace
-    print "Before checkout: git clean -xdf -f"
-    os.system("git clean -xdf -f")
-
-    #update submodule
-    git_update_submodule = "git submodule update --init --force"
-    ret = os.system(git_update_submodule)
-    if(ret != 0):
-        sys.exit(ret)
-
-
-def gen_scripting_bindings():
-    # Generate binding glue codes
-    if(branch == 'v3' or branch == 'v4-develop'):
-        ret = os.system("python tools/jenkins-scripts/slave-scripts/gen_jsb.py")
-    if(ret != 0):
-        sys.exit(ret)
-
-
-def do_build_slaves():
-    jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep + daily_build_type + os.sep
-
-    if(branch == 'v3' or branch == 'v4-develop'):
-        slave_build_scripts = ""
-        if(node_name == 'android') or (node_name == 'android_bak'):
-            slave_build_scripts = jenkins_script_path + "android-build.sh "
-        elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
-            if daily_build_type == "runtime" or daily_build_type == "templates":
-                slave_build_scripts = jenkins_script_path + "win32-" + language + ".bat "
-            else:
-                slave_build_scripts = jenkins_script_path + "win32-build.bat "
-        elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
-            if daily_build_type == "runtime" or daily_build_type == "templates":
-                slave_build_scripts = jenkins_script_path + "windows-universal-" + language + ".bat "
-            else:
-                slave_build_scripts = jenkins_script_path + "windows-universal.bat "
-        elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
-            slave_build_scripts = jenkins_script_path + "ios-build.sh "
-        elif(node_name == 'mac' or node_name == 'mac_bak'):
-            slave_build_scripts = jenkins_script_path + "mac-build.sh "
-        elif(node_name == 'tizen_mac'):
-            slave_build_scripts = jenkins_script_path + "tizen-build.sh "
-        elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
-            slave_build_scripts = jenkins_script_path + "linux-build.sh "
-        elif(node_name == 'wp8'):
-            if(branch != 'v4'):
-                slave_build_scripts = jenkins_script_path + "wp8-v3.bat "
-
-        if daily_build_type == 'templates':
-            ret = os.system("python tools/console/bin/adxe.py new -l " + language)
-        elif daily_build_type == 'runtime':
-            ret = os.system("python tools/console/bin/adxe.py new -l " + language + " -t runtime")
-        else:
-            ret = 0
-        slave_build_scripts += language
-        ret = ret + os.system(slave_build_scripts)
-
-    #get build result
-    print "build finished and return " + str(ret)
-    return ret
-
-
-def main():
-    if remote_build == 1:
-        #syntronize local git repository with remote and merge the PR
-        sync_remote_repo()
-        #copy check_current_3rd_libs
-        download_3rd_library()
-        #generate jsb and luabindings
-        gen_scripting_bindings()
-
-    #start build jobs on each slave
-    ret = do_build_slaves()
-
-    exit_code = 1
-    if ret == 0:
-        exit_code = 0
-    else:
-        exit_code = 1
-
-    # #clean workspace, we don't won't clean the repository
-    # if remote_build == 1:
-    #     os.system("cd " + workspace)
-    #     os.system("git reset --hard")
-    #     os.system("git clean -xdf -f")
-    # else:
-    #     print "local build, no need to cleanup"
-
-    return(exit_code)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/do-pull-request-builder.py b/tools/jenkins-scripts/do-pull-request-builder.py
deleted file mode 100755
index 250af1c7d315..000000000000
--- a/tools/jenkins-scripts/do-pull-request-builder.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import os
-import sys
-import traceback
-import json
-
-branch = "v3"
-node_name = "ios"
-
-payload_str = os.environ['payload']
-payload_str = payload_str.decode('utf-8', 'ignore')
-#parse to json obj
-payload = json.loads(payload_str)
-pr_num = payload['number']
-
-#get pr target branch
-branch = payload['branch']
-workspace = os.environ['WORKSPACE']
-node_name = os.environ['NODE_NAME']
-
-def download_3rd_libs(branch):
-    #run download-deps.py
-    print("prepare to downloading ...")
-    os.system('python download-deps.py -r no')
-
-def lint_include_of_cocos_headers():
-  global branch
-  if(branch != 'v1' and branch != 'v2'):
-      ret = os.system("python tools/coding-style/include-linter.py")
-  if(ret != 0):
-      sys.exit(1)
-
-def gen_scripting_bindings():
-    global branch
-    # Generate binding glue codes
-    if(branch != 'v1' and branch != 'v2'):
-        ret = os.system("python tools/jenkins-scripts/slave-scripts/gen_jsb.py")
-    if(ret != 0):
-        sys.exit(1)
-
-
-def do_build_slaves():
-    global branch
-    global node_name
-
-    jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep + "tests" + os.sep
-
-    if(branch != 'v1' and branch != 'v2'):
-        slave_build_scripts = ""
-        if(node_name == 'android') or (node_name == 'android_bak'):
-            slave_build_scripts = jenkins_script_path + "android-build.sh"
-        elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
-            slave_build_scripts = jenkins_script_path + "win32-build.bat"
-        elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
-            slave_build_scripts = jenkins_script_path + "windows-universal.bat"
-        elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
-            slave_build_scripts = jenkins_script_path + "ios-build.sh"
-        elif(node_name == 'mac' or node_name == 'mac_bak'):
-            slave_build_scripts = jenkins_script_path + "mac-build.sh"
-        elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
-            slave_build_scripts = jenkins_script_path + "linux-build.sh"
-        elif(node_name == 'wp8'):
-            if(branch != 'v4'):
-                slave_build_scripts = jenkins_script_path + "wp8-v3.bat"
-
-        ret = os.system(slave_build_scripts)
-
-    #get build result
-    print "build finished and return " + str(ret)
-    return ret
-
-def cleanup_workspace():
-    global workspace
-    global branch
-    global pr_num
-    #clean workspace
-    os.system("cd " + workspace)
-    os.system("git reset --hard")
-    os.system("git clean -xdf -f")
-    os.system("git checkout " + branch)
-    os.system("git branch -D pull" + str(pr_num))
-
-def main():
-    download_3rd_libs(branch)
-    lint_include_of_cocos_headers()
-    #generate jsb and luabindings
-    gen_scripting_bindings()
-    #start build jobs on each slave
-    ret = do_build_slaves()
-
-    cleanup_workspace()
-
-    exit_code = 1
-    if ret == 0:
-        exit_code = 0
-    else:
-        exit_code = 1
-
-    return(exit_code)
-
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        print "return value is " + str(sys_ret)
-        if sys_ret != 0:
-            sys.exit(1)
-        else:
-            sys.exit(0)
diff --git a/tools/jenkins-scripts/master-scripts/autotest.py b/tools/jenkins-scripts/master-scripts/autotest.py
deleted file mode 100755
index 712d3fb28205..000000000000
--- a/tools/jenkins-scripts/master-scripts/autotest.py
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/python
-import os
-import sys
-import socket
-import time
-
-HOST_MAC = 'localhost'
-HOST_ANDROID = ''
-HOST_IOS = '10.10.30.61'
-PORT = 5678
-
-suc_build_mac = 0
-suc_build_android = 0
-
-TYPE_MAC = 0
-TYPE_ANDROID = 1
-TYPE_IOS = 2
-
-sleep_time = 1.5
-
-#
-def getADBDeviceIP():
-    output = os.popen("adb shell netcfg")
-    configs = output.read().split('\r\n')
-    for l in configs:
-        items = l.split()
-        if(items[1] == 'UP'):
-            if(items[2] != '127.0.0.1'):
-                return items[2]
-
-def autotest(type):
-    soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-    if type == TYPE_MAC:
-        soc.connect((HOST_MAC, PORT))
-    if type == TYPE_ANDROID:
-        HOST_ANDROID = getADBDeviceIP()
-        soc.connect((HOST_ANDROID, PORT))
-    if type == TYPE_IOS:
-        soc.connect((HOST_IOS, PORT))
-    time.sleep(1)
-    print 'autotest run:'
-    soc.send('autotest run\r\n')
-
-    while True:
-        data = soc.recv(1024)
-        print data
-        if data == 'TestEnd':
-            lastTestInfo = True
-            break
-        global lastTestInfo
-        if len(data) > len('\n') :
-            lastTestInfo = data
-        if not data: break
-    
-    soc.send('director end\r\n')
-    print 'test end and close socket.'
-    soc.close()
-
-#----------------autotest build and run----------------#
-def MAC_BUILD():
-    def cleanProj():
-        infoClean = os.system('xcodebuild -project ./build/cocos2d_tests.xcodeproj -target cpp-tests\ Mac clean')
-        print 'infoClean: ', infoClean
-        if infoClean != 0:
-            return False
-        time.sleep(sleep_time)
-        return True
-    def buildProj():
-        infoBuild = os.system('xcodebuild -project ./build/cocos2d_tests.xcodeproj -target cpp-tests\ Mac')
-        print 'infoBuild: ', infoBuild
-        if infoBuild != 0:
-            return False
-        time.sleep(sleep_time)
-        return True
-    def openProj():
-        cmd = 'open ./build/build/Debug/cpp-tests\ Mac.app'
-        print 'cmd: ', cmd
-        infoOpen = os.system(cmd)
-        print 'infoOpen: ', infoOpen
-        if infoOpen != 0:
-            return False
-        time.sleep(sleep_time)
-        return True
-    def buildAndRun():
-        if not cleanProj():
-            print '**CLEAN FAILED**'
-        if not buildProj():
-            print '**BUILD FAILED**'
-            return False
-        if not openProj():
-            return False
-        time.sleep(sleep_time)
-        return True
-    return buildAndRun()
-#----------------autotest build and run end----------------#
-
-PATH_ANDROID_SRC = 'tests/cpp-tests/proj.android/'
-FILE_ANDROID_DELETE = ['libs','gen','assets','bin','obj']
-#----------------autotest-android build and run----------------#
-def ANDROID_BUILD():
-    def checkDevice():
-        cmd = 'adb devices'
-        infoDev = os.popen(cmd).readlines()
-        firstDev = infoDev[1]
-        if len(firstDev) < 5 or firstDev.find('device') < 0:
-            print 'no android device.'
-            return False
-        else:
-            print 'device info:', firstDev
-        return True
-    def cleanProj():
-        for strFile in FILE_ANDROID_DELETE:
-            infoClean = os.system('rm -rf '+PATH_ANDROID_SRC+strFile)
-        infoClean = os.system('adb uninstall org.cocos2dx.cpp_tests');
-        print 'infoClean: ', infoClean
-        if infoClean != 0:
-            print 'clean **CLEAN FAILED**'
-        time.sleep(sleep_time)
-    def updateProperty():
-        infoUpdate = os.system('android update project -p  ./cocos/platform/android/java/ -t 12')
-        print 'cocos update:', infoUpdate
-        infoUpdate = os.system('android update project -p '+PATH_ANDROID_SRC+' -t 12')
-        print 'test update:', infoUpdate
-    def buildProj():
-        infoBuild = os.system('./build/android-build.py  -p 13 cpp-tests')
-        print 'infoBuild cpp_tests: ', infoBuild
-        infoBuild = os.system('ant -buildfile '+PATH_ANDROID_SRC+' debug')
-        print 'infoBuild: ', infoBuild
-        if infoBuild != 0:
-            print 'build **BUILD FAILED**'
-        time.sleep(sleep_time)
-        return infoBuild
-    def installProj():
-        cmd = 'adb install '+PATH_ANDROID_SRC+'bin/CppTests-debug.apk'
-        infoInstall = os.system(cmd)
-        print 'infoInstall:', infoInstall
-        if infoInstall != 0:
-            print 'install **INSTALL FAILED**'
-        return infoInstall
-    def openProj():
-        cmd = 'adb shell am start -n org.cocos2dx.cpp_tests/org.cocos2dx.cpp_tests.Cocos2dxActivity'
-        print 'cmd: ', cmd
-        infoOpen = os.system(cmd)
-        print 'infoOpen: ', infoOpen
-        if infoOpen != 0:
-            return False
-        time.sleep(sleep_time)
-        return True
-    def buildAndRun():
-        if not checkDevice():
-            return False
-        cleanProj()
-        updateProperty()
-        buildProj()
-        installProj()
-        return openProj()
-    return buildAndRun()
-#----------------autotest-android build and run end----------------#
-
-def main():
-    print 'will build mac project.'
-    suc_build_mac = MAC_BUILD()
-    # print 'will build android project.'
-    # suc_build_android = ANDROID_BUILD()
-    if suc_build_mac:
-        autotest(TYPE_MAC)
-    if suc_build_android:
-        print 'will run android autotest.'
-        autotest(TYPE_ANDROID)
-
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:    
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
-
diff --git a/tools/jenkins-scripts/master-scripts/ci-dailybuild-android.py b/tools/jenkins-scripts/master-scripts/ci-dailybuild-android.py
deleted file mode 100644
index 2522edd37222..000000000000
--- a/tools/jenkins-scripts/master-scripts/ci-dailybuild-android.py
+++ /dev/null
@@ -1,168 +0,0 @@
-import os
-import json
-from shutil import copy
-import sys
-import traceback
-import MySQLdb
-from email.mime.text import MIMEText
-import smtplib
-import datetime
-def check_current_3rd_libs():
-    #get current_libs config
-    backup_files = range(2)
-    current_files = range(2)
-    config_file_paths = ['external/config.json','templates/lua-template-runtime/runtime/config.json']
-    for i, config_file_path in enumerate(config_file_paths):
-        if not os.path.isfile(config_file_path):
-            raise Exception("Could not find 'external/config.json'")
-
-        with open(config_file_path) as data_file:
-            data = json.load(data_file)
-
-        current_3rd_libs_version = data["version"]
-        filename = current_3rd_libs_version + '.zip'
-        node_name = os.environ['NODE_NAME']
-        backup_file = '../cocos-2dx-external/node/' + node_name + '/' + filename
-        backup_files[i] = backup_file
-        current_file = filename
-        current_files[i] = current_file
-        if os.path.isfile(backup_file):
-          copy(backup_file, current_file)
-    #run download-deps.py
-    os.system('python download-deps.py -r no')
-    #backup file
-    for i, backup_file in enumerate(backup_files):
-        current_file = current_files[i]
-        copy(current_file, backup_file)
-
-def strip_android_libs():
-    strip_cmd = os.environ['ndk_strip']
-    print strip_cmd
-    _cmd = strip_cmd + ' ./tests/cpp-tests/proj.android/obj/local/armeabi/*.a'
-    os.system(_cmd)
-
-def connect_db():
-    db_host = os.environ['db_host']
-    db_user = os.environ['db_user']
-    db_pw = os.environ['db_pw']
-    db = MySQLdb.connect(db_host, db_user, db_pw, "dailybuild" )
-    return db
-
-def close_db(db):
-    db.close()
-
-def save_build_stats(db, filename, size):
-    cursor = db.cursor()
-    sql = "INSERT INTO %s (size, createdTime) VALUES(%d, now())" % (filename, size)
-    print sql
-    cursor.execute(sql)
-    db.commit()
-
-def scan_all_libs(db):
-    stats = {}
-    _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so'
-    filesize = os.path.getsize(_path)/1024
-    stats['libcpp_empty_test'] = filesize
-    save_build_stats(db, 'libcpp_empty_test', filesize)
-    _path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so'
-    filesize = os.path.getsize(_path)/1024
-    stats['liblua_empty_test'] = filesize
-    save_build_stats(db, 'liblua_empty_test', filesize)
-    lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi'
-    for root, dirs, files in os.walk(lib_path):
-      for _file in files:
-        if not _file.endswith(".a"):
-          continue
-        print _file
-        libfile = lib_path + '/' + _file
-        _filename = _file.split('.')[0]
-        filesize = os.path.getsize(libfile)/1024
-        stats[_filename]=filesize
-        save_build_stats(db, _filename, filesize)
-    return stats
-
-def send_mail(sub,title,content):
-    #to_list = os.environ['EMAIL_LIST'].split(' ')
-    mail_user = os.environ['EMAIL_USER']
-    mail_pass = os.environ['EMAIL_PWD']
-    to_list = os.environ['EMAIL_LIST'].split(' ')
-    mail_postfix = 'gmail.com'
-    me = mail_user + "<" + mail_user + "@" + mail_postfix + ">"
-    msg = MIMEText(content, _subtype='plain', _charset='gb2312')
-    msg['Subject'] = sub
-    msg['From'] = me
-    msg['To'] = " ".join(to_list)
-    print 'to users:', msg['To']
-    msg['Content'] = 'test'
-    try:
-        s = smtplib.SMTP('smtp.gmail.com', 587)
-        s.ehlo()
-        s.starttls()
-        s.login(mail_user,mail_pass)
-        s.sendmail(me, to_list, str(msg))
-        print 'info:', me, to_list, str(msg)
-        s.close()
-        return True
-    except Exception, e:
-        print str(e)
-        return False
-
-def sendEmail(stats):
-    now = datetime.datetime.now()
-    sub = "Cocos2d-x Android dailybuild stats of " + now.strftime("%Y-%m-%d")
-    title = "Dailybuild stats"
-    content = "The following list tracks the sizes of Cocos2d-x Android built libraries:\n"
-
-    for key in stats:
-        content += key 
-        content += " : "
-        content += str(stats[key]) + "KB"
-        content += "\n"
-
-    send_mail(sub, title, content)
-
-def main():
-    print 'Build Config:'
-    print '    Branch:v3'
-    print '    Target:Android'
-    print '    build script:python build/android-build.py -b release all'
-    if(os.path.exists('build/android-build.py') == False):
-      node_name = os.environ['NODE_NAME']
-      source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name + "/."
-      os.system("cp -r " + source_dir + " .")
-
-    os.system('git pull origin v3')
-    os.system('git submodule update --init --force')
-    check_current_3rd_libs()
-
-    ret = os.system("python tools/jenkins-scripts/gen_jsb.py")
-    if(ret != 0):
-        return(1)
-
-    ret = os.system('python build/android-build.py -b release all')
-    if(ret == 0):
-      strip_android_libs()
-      db = connect_db()
-      stats = scan_all_libs(db)
-      close_db(db)
-      sendEmail(stats)
-    os.system('git clean -xdf -f')
-    print 'build exit'
-    print ret
-    if ret == 0:
-      ret = 0
-    else:
-      ret = 1
-    return ret
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:    
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
-
diff --git a/tools/jenkins-scripts/master-scripts/ci-release-test.py b/tools/jenkins-scripts/master-scripts/ci-release-test.py
deleted file mode 100644
index 065fccf131c4..000000000000
--- a/tools/jenkins-scripts/master-scripts/ci-release-test.py
+++ /dev/null
@@ -1,188 +0,0 @@
-#CI release for Jenkins 
-
-import json
-import os
-import re
-import urllib2
-import urllib
-import base64
-import requests
-import sys
-import traceback
-import platform
-import subprocess
-import codecs
-from shutil import copy
-
-#set Jenkins build description using submitDescription to mock browser behavior
-#TODO: need to set parent build description 
-def set_description(desc, url):
-    req_data = urllib.urlencode({'description': desc})
-    req = urllib2.Request(url + 'submitDescription', req_data)
-    #print(os.environ['BUILD_URL'])
-    req.add_header('Content-Type', 'application/x-www-form-urlencoded') 
-    base64string = base64.encodestring(os.environ['JENKINS_ADMIN']+ ":" + os.environ['JENKINS_ADMIN_PW']).replace('\n', '')
-    req.add_header("Authorization", "Basic " + base64string)
-    try:
-        urllib2.urlopen(req)
-    except:
-        traceback.print_exc()
-
-def make_temp_dir():
-    #make temp dir
-    print "current dir is: " + os.environ['WORKSPACE']
-    os.system("cd " + os.environ['WORKSPACE']);
-    os.mkdir("android_build_objs")
-    #add symbol link
-    PROJECTS=["cpp-empty-test", "cpp-tests"]
-
-    print platform.system()
-    if(platform.system() == 'Darwin'):
-        for item in PROJECTS:
-          cmd = "ln -s " + os.environ['WORKSPACE']+"/android_build_objs/ " + os.environ['WORKSPACE']+"/tests/"+item+"/proj.android/obj"  
-          os.system(cmd)
-    elif(platform.system() == 'Windows'):
-        for item in PROJECTS:
-          p = item.replace("/", os.sep)
-          cmd = "mklink /J "+os.environ['WORKSPACE']+os.sep+"tests"+os.sep +p+os.sep+"proj.android"+os.sep+"obj " + os.environ['WORKSPACE']+os.sep+"android_build_objs"
-          print cmd
-          os.system(cmd)
-
-def check_current_3rd_libs(branch):
-    #get current_libs config
-    backup_files = range(2)
-    current_files = range(2)
-    config_file_paths = ['external/config.json','templates/lua-template-runtime/runtime/config.json']
-    if (branch == 'v2'):
-        config_file_paths = ['external/config.json']
-    for i, config_file_path in enumerate(config_file_paths):
-        if not os.path.isfile(config_file_path):
-            raise Exception("Could not find 'external/config.json'")
-
-        with open(config_file_path) as data_file:
-            data = json.load(data_file)
-
-        current_3rd_libs_version = data["version"]
-        filename = current_3rd_libs_version + '.zip'
-        node_name = os.environ['NODE_NAME']
-        backup_file = '../../../cocos-2dx-external/node/' + node_name + '/' + filename
-        backup_files[i] = backup_file
-        current_file = filename
-        current_files[i] = current_file
-        if os.path.isfile(backup_file):
-          copy(backup_file, current_file)
-    #run download-deps.py
-    os.system('python download-deps.py -r no')
-    #backup file
-    for i, backup_file in enumerate(backup_files):
-        current_file = current_files[i]
-        copy(current_file, backup_file)
-
-def main():
-    #get tag
-    tag = os.environ['tag']
-    print 'tag:' + tag
-
-    pr_desc = '<h3>' + tag + ' is release' + '</h3>'
-
-    #get pr target branch
-    branch = 'v3'
-
-    #set parent build description
-    jenkins_url = os.environ['JENKINS_URL']
-    job_name = os.environ['JOB_NAME'].split('/')[0]
-    build_number = os.environ['BUILD_NUMBER']
-    target_url = jenkins_url + 'job/' + job_name + '/' + build_number + '/'
-
-    set_description(pr_desc, target_url)
-
-    #pull origin v3
-    os.system('git reset --hard')
-    os.system("git clean -xdf -f")
-    os.system("git checkout v3")
-    os.system("git branch -D " + tag)
-    os.system("git clean -xdf -f")
-    #fetch tag to local repo
-    git_fetch_pr = "git fetch origin tag " + tag
-    ret = os.system(git_fetch_pr)
-    if(ret != 0):
-        return(2)
-
-    #checkout
-    git_checkout = "git checkout -b " + tag + " FETCH_HEAD"
-    os.system(git_checkout)
-
-    # After checkout a new branch, clean workspace again
-    print "After checkout: git clean -xdf -f"    
-    os.system("git clean -xdf -f")
-    
-    #update submodule
-    git_update_submodule = "git submodule update --init --force"
-    ret = os.system(git_update_submodule)
-    if(ret != 0):
-        return(2)
-
-    #build
-    #TODO: add android-linux build
-    #TODO: add mac build
-    node_name = os.environ['NODE_NAME']
-    build_mode = ['debug', 'release']
-    tests_dirs = ['tests/cpp-empty-test/proj.android',
-                  'tests/cpp-tests/proj.android',
-                  'tests/lua-empty-test/project/proj.android',
-                  'tests/lua-tests/project/proj.android']
-    tests_names = ['cpp-empty-test', 'cpp-tests', 'lua-empty-test', 'lua-tests']
-    remote_home = os.environ['REMOTE_HOME']
-    for mode in build_mode:
-        os.system('git reset --hard')
-        os.system("git clean -xdf -f")
-        make_temp_dir()
-        #copy check_current_3rd_libs
-        check_current_3rd_libs(branch)
-        if(branch == 'v3'):
-          # Generate binding glue codes
-          ret = os.system("python tools/jenkins-scripts/gen_jsb.py")
-          if(ret != 0):
-            return(1)
-          if(node_name == 'android_mac') or (node_name == 'android_win7'):
-            print "Start build android..."
-            ret = os.system("python build/android-build.py -b " + mode + " -n -j10 all")
-            # create and save apk
-            if(ret == 0):
-              os.system('android update project -p cocos/platform/android/java/ -t android-13')
-              for i, test in enumerate(tests_dirs):
-                os.system('android update project -p ' + test + ' -t android-13')
-                local_apk = test + '/' + tests_names[i] + '.apk'
-                remote_dir = '/data/download/' + tag + '/'
-                remote_apk = remote_dir + tests_names[i] + '-' + tag + '-' + mode + '.apk'
-                os.system('ant debug -f ' + test + '/build.xml' + ' -Dout.final.file=$PWD/' + local_apk)
-                os.system('ssh ' + remote_home + ' "mkdir -p ' + remote_dir + '"')
-                os.system('scp ' + local_apk + ' ' + remote_home + ':' + remote_apk)
-
-    #get build result
-    print "build finished and return " + str(ret)
-    
-    exit_code = 1
-    if ret == 0:
-        exit_code = 0
-    else:
-        exit_code = 1
-    
-    #clean workspace
-    os.system("cd " + os.environ['WORKSPACE'])
-    os.system("git reset --hard")
-    os.system("git clean -xdf -f")
-    os.system("git checkout v3")
-
-    return(exit_code)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:    
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/master-scripts/cocos-console-test.py b/tools/jenkins-scripts/master-scripts/cocos-console-test.py
deleted file mode 100755
index 430f9da61c22..000000000000
--- a/tools/jenkins-scripts/master-scripts/cocos-console-test.py
+++ /dev/null
@@ -1,379 +0,0 @@
-#!/usr/bin/python
-# create new project by adxe-console
-# compile, deploy project and run
-# perpose: for autotest adxe-console command.
-# now support: mac- mac/ios/android
-# will add: window-android,linux-android
-
-import os
-import subprocess
-import sys
-import json
-import time
-import socket
-import threading
-import smtplib
-from email.mime.text import MIMEText
-from os.path import join, getsize
-
-# default console_param.
-console_param = '[console run]'
-# get param from commit.
-if os.environ.has_key('payload'):
-    payload_str = os.environ['payload']
-    payload = json.loads(payload_str)
-    if payload.has_key('console'):
-        console_param = payload['console']
-console_param = console_param[1:len(console_param)-1]
-print 'console_param:',console_param
-
-console_param_arr = console_param.split(' ')
-
-# enum command type
-class ENUM_PARAM:
-    new = 0
-    compile = 1
-    deploy = 2
-    run = 3
-
-# partition different level
-LEVEL_COCOS = {
-    ENUM_PARAM.new : 1,
-    ENUM_PARAM.compile : 2,
-    ENUM_PARAM.deploy : 4,
-    ENUM_PARAM.run : 8
-}
-
-# level's cocos command
-COCOS_CMD = {
-    ENUM_PARAM.new:'new',
-    ENUM_PARAM.compile:'compile',
-    ENUM_PARAM.deploy:'deploy',
-    ENUM_PARAM.run:'run'
-}
-
-# set cocos_param for run different command
-cocos_param = 0
-for level in LEVEL_COCOS:
-    if console_param_arr.count(COCOS_CMD[level]):
-        cocos_param = cocos_param + LEVEL_COCOS[level]
-if cocos_param < LEVEL_COCOS[ENUM_PARAM.new]:
-    cocos_param = LEVEL_COCOS[ENUM_PARAM.new]
-print 'cocos_param:', cocos_param
-
-# project types
-project_types = ['cpp', 'lua']
-# project suffix
-PROJ_SUFFIX = 'Proj'
-# different phone platform
-phonePlats = ['mac','ios','android']
-
-# need use console's position, perhaps should be set an env-param
-cocos_console_dir = 'tools/console/bin/'
-
-# now adxe-console suport different run on Platforms, e.g: only run android on win
-runSupport = {
-    'darwin' : {'mac':1,'ios':1,'android':1},
-    'win' : {'mac':0,'ios':0,'android':1},
-    'linux' : {'mac':0,'ios':0,'android':1}
-}
-
-# get current running system
-curPlat = sys.platform
-if curPlat.find('linux') >= 0:
-    curPlat = 'linux'
-elif curPlat.find('darwin') >= 0:
-    curPlat = 'darwin'
-else:
-    curPlat = 'win'
-print 'current platform is:', curPlat
-
-# delete project.(will use different system command to delete.just mac now.)
-def clean_project():
-    print 'delete older project.'
-    for proj in project_types:
-        cmd = 'rm -rf '+proj+PROJ_SUFFIX
-        os.system(cmd)
-
-# file path.(for add console listen command.)
-FILE_PATH = '/Classes/AppDelegate.cpp'
-FILE_DIR = {
-    'cpp':'',
-    'lua':'/frameworks/runtime-src'
-}
-PARSE_WORD = 'director->setDisplayStats(true);'
-CONSOLE_COMMAND = 'director->getConsole()->listenOnTCP(5678);'
-
-# add console listenOnTCP to AppDelegate.cpp.
-def addConsoleListenOnTCP(name):
-    filePath = name+PROJ_SUFFIX+FILE_DIR[name]+FILE_PATH
-    print 'filePath:',filePath
-    strCont = ''
-    if os.path.isfile(filePath):
-        file_object = open(filePath, 'r')
-        strLine = file_object.readline() 
-        while strLine:
-            strCont = strCont + strLine
-            if strLine.find(PARSE_WORD) > -1:
-                print 'add console listenOnTCP command.'
-                strCont = strCont+'\n\t' + CONSOLE_COMMAND + '\n'
-            strLine = file_object.readline() 
-        
-        file_object.close()
-        file_object = open(filePath, 'w')
-        file_object.write(strCont)
-        file_object.close()
-        time.sleep(2)
-    else:
-        print 'file is not exist.'
-
-# console result, for record result
-console_result = 'the result of cocos-console-test is:\n\r'
-
-# get current android devices count.
-def getAndroidDevices():
-    cmd = 'adb devices'
-    info_devices = os.popen(cmd).read()
-    arrDevices = info_devices.split('\n')
-    del arrDevices[0]
-    count = 0
-    for device in arrDevices:
-        # e.g: emulator-5554    device, contains 'device', so, min length is len('device')
-        if len(device) > len('device') and (device.find('device') >= 0):
-            count += 1
-    return count
-
-# close running app or exe by using console command.
-IP_PHONE = {
-    'mac':'localhost',
-    'ios':'localhost'
-}
-PORT = 5678
-
-def close_proj(proj, phone):
-    print 'close running project'
-    # connect socket
-    strClose = 'close ' + proj + ' on ' + phone
-    if IP_PHONE.has_key(phone):
-        soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-        print proj, phone, IP_PHONE[phone]
-        try:
-            soc.connect((IP_PHONE[phone], PORT))
-            cmd = 'director end\r\n'
-            print 'cmd close:', cmd
-            soc.send(cmd)
-            time.sleep(2) 
-            strClose = strClose + ' success.'
-        except Exception, e:
-            print 'socket is not connect.'
-            strClose = strClose + ' failed.' + ' socket is not connect.'
-    else:
-        strClose = strClose + ' failed.' + ' no ' +phone+ ' type.'
-    time.sleep(2)
-    return strClose
-
-# appendToResult
-def appendToResult(content):
-    global console_result
-    console_result = console_result + content
-
-info_of_close_app = {}
-cur_test_name = ''
-class myThread(threading.Thread):
-    def __init__(self,threadname):
-        threading.Thread.__init__(self,name=threadname)
-    def run(self):
-        run_name = self.getName()
-        print 'run_name:', run_name
-        if run_name == 'close':
-            while True:
-                soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-                try:
-                    soc.connect(('localhost', PORT))
-                    cmd_close = 'director end\r\n'
-                    print 'cmd close:', cmd_close
-                    soc.send(cmd_close)
-                    time.sleep(2)
-                    global cur_test_name
-                    print 'cur_test_name:', cur_test_name
-                    info_of_close_app[cur_test_name] = True
-                    break
-                except Exception, e:
-                    time.sleep(5)
-
-# if any error 
-ANY_ERROR_IN_RUN = 0
-# excute cocos command
-def cocos_project(level):
-    global ANY_ERROR_IN_RUN
-    print 'will excute cocos_command: ', COCOS_CMD[level], level
-    appendToResult('will excute ' + COCOS_CMD[level] + ' command:'+"\n\r\t")
-    for proj in project_types:
-        print 'proj: ', proj
-        if level == ENUM_PARAM.new:
-            cmd = './'+cocos_console_dir+'cocos new -l '+proj+' '+proj+PROJ_SUFFIX
-            print proj,'cmd:',cmd
-            info_create = os.system(cmd)    #call cmd on win is diff
-            if info_create == 0:
-                time.sleep(12)
-                addConsoleListenOnTCP(proj)
-            print 'create project',proj,' is:', not info_create
-            ANY_ERROR_IN_RUN = ANY_ERROR_IN_RUN + info_create
-            appendToResult('    '+cmd +': ' + str(not info_create) + ".\n\r\t")
-        else:
-            for phone in phonePlats:
-                print 'platform is: ', phone
-                cmd = './'+cocos_console_dir+'cocos '+COCOS_CMD[level]+' -s '+proj+PROJ_SUFFIX+' -p '+phone
-                print 'cmd:',cmd
-                info_cmd = ''
-                if level == ENUM_PARAM.compile:
-                    if runSupport[curPlat][phone]:
-                        info_cmd = os.system(cmd)
-                        print 'info '+COCOS_CMD[level]+':', not info_cmd
-                        appendToResult('    '+cmd +': ' + str(not info_cmd) + ".\n\r\t")
-                else:
-                    if runSupport[curPlat][phone]:
-                        print 'in desploy or run:', phone, getAndroidDevices()
-                        if phone == 'android' and getAndroidDevices() == 0:
-                            strInfo = 'no android device, please checkout the device is running ok.'
-                            print strInfo
-                        else:
-                            if level == ENUM_PARAM.run:
-                                global cur_test_name
-                                cur_test_name = proj+','+phone
-                                thread_close = myThread('close')
-                                thread_close.start()
-                            info_cmd = os.system(cmd)
-                            time.sleep(5)
-                            appendToResult('    '+cmd +': ' + str(not info_cmd) + ".\n\r\t")
-
-# build and run according to params of provided.(lv_ignore: e.g:ignore new)
-def build_run(lv_ignore):
-    print 'will build and run, in function build_run'
-    for level in LEVEL_COCOS:
-        print 'level:', level, cocos_param, LEVEL_COCOS[level]
-        if cocos_param >= LEVEL_COCOS[level] and level > lv_ignore:
-            if level == ENUM_PARAM.new:
-                clean_project()
-            cocos_project(level)
-
-# android simulator name.
-ANDROID_SIMULATOR_NAME = 'console-test'
-# start android simulator if no android devices connected.
-def start_android_simulator():
-    print 'in function start_android_simulator.'
-    if getAndroidDevices() > 0:
-        print 'already connected android device.'
-        return
-    if cocos_param >= LEVEL_COCOS[ENUM_PARAM.deploy]:
-        cmd_start = [ 'emulator -avd '+ANDROID_SIMULATOR_NAME ]
-        # print 'cmd_start:', cmd_start
-        # info_start = subprocess.Popen(cmd_start, stdin=subprocess.PIPE, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        # print 'start an android simulator:', not info_start
-
-# send email
-EMAIL_KEYS={
-    0:'EMAIL_HOST',
-    1:'EMAIL_USER',
-    2:'EMAIL_PWD',
-    3:'EMAIL_POSTFIX',
-    4:'EMAIL_LIST',
-    5:'NEED_SEND_EMAIL'
-}
-
-OBJ_EMAIL_INFO = {}
-print 'will get env info.'
-for key in EMAIL_KEYS:
-    if os.environ.has_key(EMAIL_KEYS[key]):
-        OBJ_EMAIL_INFO[EMAIL_KEYS[key]] = os.environ[EMAIL_KEYS[key]]
-        if key == 4:
-            # string to list by ' ', for separate users.
-            OBJ_EMAIL_INFO[EMAIL_KEYS[4]] = OBJ_EMAIL_INFO[EMAIL_KEYS[4]].split(' ')
-
-print 'will send email.', OBJ_EMAIL_INFO
-def send_mail(to_list,sub,title,content):
-    mail_user = OBJ_EMAIL_INFO[ EMAIL_KEYS[1] ]
-    mail_postfix = OBJ_EMAIL_INFO[ EMAIL_KEYS[3] ]
-    mail_host = OBJ_EMAIL_INFO[ EMAIL_KEYS[0] ]
-    mail_pass = OBJ_EMAIL_INFO[ EMAIL_KEYS[2] ]
-    me = mail_user+"<"+mail_user+"@"+mail_postfix+">"
-    msg = MIMEText(content,_subtype='plain',_charset='gb2312')
-    msg['Subject'] = sub
-    msg['From'] = me
-    msg['To'] = " ".join(to_list)
-    print 'to users:', msg['To']
-    msg['Content'] = 'test'
-    try:
-        s = smtplib.SMTP()
-        s.connect(mail_host)
-        s.login(mail_user,mail_pass)
-        s.sendmail(me, to_list, str(msg))
-        print 'info:', me, to_list, str(msg)
-        s.close()
-        appendToResult( 'send email true:' + str(msg) )
-        return True
-    except Exception, e:
-        appendToResult( 'send email false:' + str(e) )
-        print str(e)
-        return False
-
-def sendEmail(msg):
-    send_mail(OBJ_EMAIL_INFO[EMAIL_KEYS[4]], "cocos-console-test result", 'for error.', msg)
-
-# get package size 
-def getdirsize(dir):  
-    size = 0L  
-    for root, dirs, files in os.walk(dir):  
-        size += sum([getsize(join(root, name)) for name in files])  
-    return size
-APP_FILE_DIR = {
-    'cpp':'bin/debug/',
-    'lua':'runtime/'
-}
-APP_FILE_SUFFIX = {
-    'mac':'.app',
-    'ios':'.app',
-    'android':'-debug-unaligned.apk'
-}
-if os.environ.has_key('APP_FILE_SUFFIX'):
-    str_app_suffix = os.environ['APP_FILE_SUFFIX']
-    APP_FILE_SUFFIX = eval(str_app_suffix)
-
-def getPackageSize():
-    for proj in project_types:
-        for phone in phonePlats:
-            # if runSupport[curPlat][phone]:
-            package_path = './'+proj+PROJ_SUFFIX+'/'+APP_FILE_DIR[proj]+phone+'/'+proj+PROJ_SUFFIX+APP_FILE_SUFFIX[phone]
-            print 'package_path', package_path
-            package_size = 0
-            if os.path.isfile(package_path):
-                package_size = os.path.getsize(package_path);
-            else:
-                package_size = getdirsize(package_path);
-            strSize = 'size of '+proj+PROJ_SUFFIX+' '+phone+' is:'+str(package_size/(1024))+'KB'+'\n\t'
-            print 'strSize:', strSize
-            appendToResult(strSize)
-
-def main():
-    print 'in main:'
-    # start_android_simulator()
-    print 'will build_run:'
-    build_run(-1)
-    print 'ANY_ERROR_IN_RUN:', ANY_ERROR_IN_RUN
-    print 'end build run. and get package size.'
-    getPackageSize()
-    print 'will send email:'
-    print 'console_result:', console_result
-    if OBJ_EMAIL_INFO[ EMAIL_KEYS[5] ] or ANY_ERROR_IN_RUN:
-        sendEmail(console_result)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/master-scripts/cocos2dx-libsize-tracking.py b/tools/jenkins-scripts/master-scripts/cocos2dx-libsize-tracking.py
deleted file mode 100644
index 8047d69d8dc7..000000000000
--- a/tools/jenkins-scripts/master-scripts/cocos2dx-libsize-tracking.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import os
-import MySQLdb
-import datetime
-
-def connect_db():
-    db_host = os.environ['db_host']
-    db_user = os.environ['db_user']
-    db_pw = os.environ['db_pw']
-    db_name=os.environ['db_name']
-    db = MySQLdb.connect(db_host, db_user, db_pw, db_name)
-    return db
-
-def close_db(db):
-    db.close()
-
-def list_lib_names(db):
-    tables=[]
-    cursor = db.cursor()
-    #sql = "SELECT TABLE_NAME,TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='dailybuild'"
-    sql = 'show tables'
-    cursor.execute(sql)
-    results = cursor.fetchall()
-    for row in results:
-        tables.append(row[0])
-    return tables
-
-def today():
-    now = datetime.datetime.now()
-    return now.strftime("%Y-%m-%d")
-
-def prev_day(aDay, gap):
-    t = datetime.datetime.strptime(aDay, "%Y-%m-%d")
-    days = datetime.timedelta(hours=24*gap)
-    t = t - days
-    return t.strftime("%Y-%m-%d")
-
-def next_day(aDay, gap):
-    t = datetime.datetime.strptime(aDay, "%Y-%m-%d")
-    days = datetime.timedelta(hours=24*gap)
-    t = t + days
-    return t.strftime("%Y-%m-%d")
-
-def query_lib_size(db, libname, date):
-    cursor = db.cursor()
-    t1 = date + ' 00:00:00'
-    t2 = next_day(date,1) + ' 00:00:00'
-    sql = "SELECT size FROM %s WHERE createdTime > '%s' AND createdTime < '%s'" % (libname, t1, t2)
-    cursor.execute(sql)
-    result = cursor.fetchone()
-    #print libname + ":" + str(result[0])+'kB'
-    data = {}
-    data[libname] = result[0]
-    return data
-
-def query_all_libs(db, date):
-    tables = list_lib_names(db)
-    result = {}
-    for t in tables:
-        data = query_lib_size(db, t, date)
-        result.update(data)
-    return result
-
-db = connect_db()
-#print tables
-today = today()
-Monday = prev_day(today, 4)
-
-csv = "cocos2d-libsize-tracking-"+today+".csv"
-with open(csv, "w") as stats_file:
-    title = 'date,'
-    libs = list_lib_names(db)
-    for name in libs:
-        title += name
-        title += ','
-    stats_file.write(title)
-    stats_file.write('\n')
-    for i in range(0,5):
-        d = next_day(Monday, i)
-        stats_file.write(d)
-        stats_file.write(',')
-        stats = query_all_libs(db, d)
-        for name in libs:
-            size = str(stats[name])
-            stats_file.write(size)
-            stats_file.write(',')
-        stats_file.write('\n')
-close_db(db)
-#print yesterday
\ No newline at end of file
diff --git a/tools/jenkins-scripts/master-scripts/emptytest-post-build.py b/tools/jenkins-scripts/master-scripts/emptytest-post-build.py
deleted file mode 100644
index afc92f390ff1..000000000000
--- a/tools/jenkins-scripts/master-scripts/emptytest-post-build.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import os
-import json
-import requests
-import jenkinsapi
-from jenkinsapi.jenkins import Jenkins
-from jenkinsapi.constants import STATUS_SUCCESS
-
-payload_str = os.environ['payload']
-payload_str = payload_str.decode('utf-8','ignore')
-#parse to json obj
-payload = json.loads(payload_str)
-#pr = payload['pull_request']
-url = payload['html_url']
-print "build pr:" + url
-#get comments url
-comments_url = payload['comments_url']
-
-J = Jenkins(os.environ['JENKINS_URL'])
-target_url = os.environ['BUILD_URL']
-build_number = int(os.environ['BUILD_NUMBER'])
-data = {}
-access_token = os.environ['GITHUB_COMMENT_ACCESS_TOKEN']
-Headers = {"Authorization":"token " + access_token} 
-
-result = J[os.environ['JOB_NAME']].get_build(build_number).get_status()
-
-if(result == STATUS_SUCCESS):
-    data['body'] = "Emptytest run successfully: " + target_url
-else:
-    data['body'] = "Emptytest failed: " + target_url
-
-requests.post(comments_url, data=json.dumps(data), headers=Headers)
diff --git a/tools/jenkins-scripts/master-scripts/emptytest.py b/tools/jenkins-scripts/master-scripts/emptytest.py
deleted file mode 100644
index 86d671981a8f..000000000000
--- a/tools/jenkins-scripts/master-scripts/emptytest.py
+++ /dev/null
@@ -1,354 +0,0 @@
-#!/usr/bin/python
-# check crash of cppemptytest
-# install/open/uninstall apk
-# perpose: for emptytest.
-# now support: android
-# will add: autotest-win7
-
-import os
-import sys
-import json
-import time
-import socket
-import platform
-import threading
-import codecs
-import re
-import paramiko
-
-payload = {}
-#get payload from os env
-if os.environ.has_key('payload'):
-    payload_str = os.environ['payload']
-    #parse to json obj
-    payload = json.loads(payload_str)
-print 'payload:',payload
-pr_num = 6326
-#get pull number
-if payload.has_key('number'):
-    pr_num = payload['number']
-print 'pr_num:' + str(pr_num)
-run_app_time = 5
-if os.environ.has_key('RUN_APP_TIME'):
-    run_app_time = os.environ['RUN_APP_TIME']
-print 'run_app_time:', run_app_time
-
-test_name = ['cpp_empty_test']
-if os.environ.has_key('TESTS_NAME'):
-    temp_var = os.environ['TESTS_NAME']
-    test_name = temp_var.split(', ')
-package_name = ['org.cocos2dx.cpp_empty_test']
-if os.environ.has_key('PACKAGE_NAME'):
-    temp_var = os.environ['PACKAGE_NAME']
-    package_name = temp_var.split(', ')
-activity_name = ['org.cocos2dx.cpp_empty_test.AppActivity']
-if os.environ.has_key('ACTIVITY_NAME'):
-    temp_var = os.environ['ACTIVITY_NAME']
-    activity_name = temp_var.split(', ')
-gIdx = 0
-if os.environ.has_key('TEST_INDEX'):
-    gIdx = os.environ('TEST_INDEX')
-
-current_platform = platform.system()
-print 'current platform is:', current_platform
-
-arrDevices = []
-def getDevices():
-    cmd = 'adb devices'
-    info_devices = os.popen(cmd).read()
-    arr_info = info_devices.split('\n')
-    del arr_info[0]
-    count = 0
-    for device in arr_info:
-        if len(device) > 0:
-            count += 1
-            print 'device ', count,device
-            deviceInfo = device.split(' ')
-            global arrDevices
-            obj = {}
-            obj['name']  = deviceInfo[0]
-            arrDevices.append(obj)
-    return count
-
-def getADBDeviceIP(device_name):
-    output = os.popen("adb -s "+device_name+" shell netcfg")
-    configs = output.read().split('\r\n')
-    output.close()
-    for l in configs:
-        items = l.split()
-        if len(items)>1 and items[1] == 'UP':
-            if items[2].find('127.0.0.1') < 0 and items[2].find('0.0.0.0') < 0:
-                return items[2]
-    return False
-def mapIP():
-    for device in arrDevices:
-        ip_d = getADBDeviceIP(device['name'])
-        device['ip'] = ip_d
-
-allThreadIsRunning = {}
-def setThreadStatus():
-    for device in arrDevices:
-        allThreadIsRunning[device['name']] = 1
-
-devices_info = {}
-info_list = '{"product":["model","brand","name","cpu.abi","cpu.abi2","manufacturer","locale.language","locale.region"],"build":["id","version.sdk","version.release"]}'
-if os.environ.has_key('DEVICE_INFO_LIST'):
-    info_list = os.environ['DEVICE_INFO_LIST']
-info_list = eval(info_list)
-def getDeviceInfoByName(name):
-    cmd = ''
-    dev_name = name
-    if len(name) > 0:
-        cmd = 'adb -s '+name+' shell cat /system/build.prop'
-    else:
-        cmd = 'adb shell cat /system/build.prop'
-        dev_name = 'device one'
-    pip_cat = os.popen(cmd)
-    read_info = pip_cat.read()
-    read_info_list = read_info.split('\r\n')
-    device_info_one = {}
-    def checkProperty(item_str, device_name):
-        for argv in info_list:
-            for item in info_list[argv]:
-                prop = argv+'.'+item
-                if item_str.find(prop) > -1:
-                    arr_item = item_str.split('=')
-                    device_info_one[prop] = arr_item[1]
-                    break
-    for item in read_info_list:
-        checkProperty(item, dev_name)
-    devices_info[dev_name] = device_info_one
-
-#getDeviceInfoByName('')
-#print 'device_info:',device_info
-def getDeviceInfomation():
-    for device in arrDevices:
-        getDeviceInfoByName(device['name'])
-
-info_empty_test = {}
-info_empty_test_pro = ['install','open','socket','uninstall']
-def init_info_empty_test():
-    for item in info_empty_test_pro:
-        info_empty_test[item] = {}
-init_info_empty_test()
-
-apk_name = 'apks/'+test_name[gIdx]+'/'+test_name[gIdx]+'_'+str(pr_num)+'.apk'
-def install_apk_on_device(device):
-    name = device['name']
-    cmd = 'adb -s '+name+' install '+apk_name
-    print 'install on '+name
-    info_install = os.popen(cmd).read()
-    print 'infomation of install apk:', info_install
-    info_install_arr = info_install.split('\r\n')
-    info_install_result = False
-    for item in info_install_arr:
-        if item.find('Success') > -1:
-            info_install_result = True
-    info_empty_test['install'][name] = info_install_result
-    return True
-
-def open_apk_on_device(device):
-    print 'will open activity:'
-    name = device['name']
-    cmd = 'adb -s '+name+' shell am start -n '+package_name[gIdx]+'/'+activity_name[gIdx]
-    # print 'start activity:', cmd
-    info_start = os.popen(cmd).read()
-    info_start = info_start.split('\r\n')
-    # print 'info_start:', info_start
-    info_start_result = True
-    for info in info_start:
-        if info.find('Error:') > -1:
-            print 'infomation of open activity:',info
-            info_start_result = False
-    info_empty_test['open'][name] = info_start_result
-    return True
-
-PORT = 5678
-def socket_status_on_device(device):
-    name = device['name']
-    ip = device['ip']
-    soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-    status_socket = False
-    info_of_socket_result = ''
-    try:
-        print 'telnet ', ip, PORT
-        soc.connect((ip, PORT))
-        cmd = 'resolution\r\n'
-        print 'connected successfully.'
-        print 'send console command: resolution'
-        soc.send(cmd)
-        while True:
-            data = soc.recv(1024)
-            if len(data):
-                print data
-                if data.find('size:') > -1:
-                    info_of_socket_result = 'OK'
-                    print 'close', test_name[gIdx]
-                    soc.send('director end')
-                    status_socket = True
-                    break
-            if not data:
-                info_of_socket_result = test_name[gIdx]+' is crashed!'
-                break
-    except Exception, e:
-        info_of_socket_result = test_name[gIdx]+' is crashed!'
-    time.sleep(2)
-    soc.close()
-    time.sleep(2)
-    info_empty_test['socket'][name] = info_of_socket_result
-    return status_socket
-
-def uninstall_apk_on_device(device):
-    # adb shell pm uninstall -n org.cocos2dx.hellolua
-    print 'uninstall ', test_name[gIdx]
-    name = device['name']
-    cmd = 'adb -s '+name+' shell pm uninstall -n '+package_name[gIdx]
-    info_uninstall = os.popen(cmd).read()
-    info_uninstall_result = ''
-    if info_uninstall.find('Success') > -1:
-        info_uninstall_result = 'OK'
-    else:
-        info_uninstall_result = 'uninstall Failed!'
-    info_empty_test['uninstall'][name] = info_uninstall_result
-    return True
-
-def excute_test_on_device(device):
-    uninstall_apk_on_device(device)
-    print device
-    info_install = install_apk_on_device(device)
-    print 'install:', info_install
-    info_open = open_apk_on_device(device)
-    print 'open:', info_open
-    time.sleep(3)
-    info_socket = socket_status_on_device(device)
-    print 'socket:', info_socket
-    info_uninstall = uninstall_apk_on_device(device)
-    print 'uninstall:', info_uninstall
-    allThreadIsRunning[device['name']] = 0
-
-address_of_result_html = ''
-def send_result_to_master():
-    if not os.environ.has_key('REMOTE_IP'):
-        return false
-    remote_ip = os.environ['REMOTE_IP']
-    remote_port = os.environ['REMOTE_PORT']
-    remote_user = os.environ['REMOTE_USER']
-    remote_pwd = os.environ['REMOTE_PWD']
-    remote_dir = os.environ['REMOTE_DIR']
-    remote_dir = remote_dir + str(pr_num)+'/'
-    print remote_dir
-    ssh = paramiko.SSHClient()
-    print 'ssh:',ssh
-    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(remote_ip, int(remote_port), remote_user, remote_pwd)
-    # create dir
-    stdin, stdout, stderr = ssh.exec_command("mkdir "+remote_dir)
-    ssh.close()
-    trans = paramiko.Transport((remote_ip,int(remote_port)))
-    trans.connect(username = remote_user, password = remote_pwd)
-    sftp = paramiko.SFTPClient.from_transport(trans)
-    remotepath = remote_dir+test_name[gIdx]+'_'+str(pr_num)+'.html'
-    localpath = 'html/cpp_empty_test/cpp_empty_test_'+str(pr_num)+'.html'
-    sftp.put(localpath, remotepath)
-    sftp.close()
-    result_dir = remote_dir.replace('/data',':9000')
-    global address_of_result_html
-    address_of_result_html = 'http://'+remote_ip+result_dir+test_name[gIdx]+'_'+str(pr_num)+'.html'
-    
-def check_thread_is_running():
-    while 1:
-        in_running = 0
-        for key in allThreadIsRunning:
-            in_running = in_running + allThreadIsRunning[key]
-        # print 'in_running:', in_running
-        time.sleep(3)
-        if not in_running:
-            break
-    print 'all cpp emptytest is finished.'
-    log_emptytest_result()
-    print 'will send result:'
-    send_result_to_master()
-    print 'end of check thread is running.'
-    print 'address of result is:',address_of_result_html
-
-def generate_html_with_result(result):
-    target_path = 'html/cpp_empty_test/cpp_empty_test_'+str(pr_num)+'.html'
-    data = codecs.open('hello.html', encoding='UTF-8').read()
-    data = re.sub("content", result, data)
-    codecs.open(target_path, 'wb', encoding='UTF-8').write(data)
-
-empty_test_result = True
-str_result = ''
-def log_emptytest_result():
-    def appendToResult(one_str):
-        global str_result
-        str_result = str_result + one_str + '\r\n'
-    appendToResult('<pre>')
-    appendToResult('empty test start:')
-    for device in arrDevices:
-        name = device['name']
-        appendToResult('device infomation of : '+name)
-        for key in devices_info[name]:
-            appendToResult('\t'+key+':'+devices_info[name][key])
-        appendToResult('install: ' + str(info_empty_test['install'][name]))
-        appendToResult('open: ' + str(info_empty_test['open'][name]))
-        appendToResult('telnet ' + str(device['ip'])+' : ' + str(info_empty_test['socket'][name]))
-        appendToResult('close: ' + str(info_empty_test['socket'][name]))
-        appendToResult('uninstall: ' + str(info_empty_test['uninstall'][name]))
-        if not info_empty_test['install'][name] or not info_empty_test['open'][name] or not info_empty_test['socket'][name] or not info_empty_test['uninstall'][name]:
-            empty_test_result = False
-            appendToResult('run failed!')
-        else: appendToResult('run successfully!')
-        appendToResult('')
-    appendToResult('empty test end.</pre>')
-    generate_html_with_result(str_result)
-    print 'log empty test end'
-
-class myThread(threading.Thread):
-    def __init__(self,threadname):
-        threading.Thread.__init__(self,name=threadname)
-    def run(self):
-        time.sleep(2)
-        device = self.getName()
-        print type(device)
-        device = eval(device)
-        print type(device), device
-        excute_test_on_device(device)
-
-def run_emptytest():
-    for device in arrDevices:
-        th = myThread(device)
-        th.start()
-
-def main():
-    print 'in main:'
-    getDevices()
-    if len(arrDevices):
-        mapIP()
-        setThreadStatus()
-        print 'arrDevices:',arrDevices
-        time.sleep(1)
-    else:
-        print 'there is no device for emptytest, please check devices!'
-        return 1
-    if len(arrDevices):
-        getDeviceInfomation()
-    run_emptytest()
-    check_thread_is_running()
-    print 'info_empty_test:', info_empty_test
-    print 'empty test end', empty_test_result
-    if empty_test_result:
-        return 0
-    else:
-        return 1
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/master-scripts/github-pr-watchdog.py b/tools/jenkins-scripts/master-scripts/github-pr-watchdog.py
deleted file mode 100644
index cb8b30185003..000000000000
--- a/tools/jenkins-scripts/master-scripts/github-pr-watchdog.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#check latest pull request statuses, it no statuses found after 3 min, rebuild the pr
-import os
-import requests
-import datetime
-import re
-import json
-import sys
-import traceback
-
-url = 'https://api.github.com/repos/cocos2d/cocos2d-x/pulls?state=open&sort=created&direction=desc'
-job_trigger_url=os.environ['JOB_PULL_REQUEST_BUILD_TRIGGER_URL']
-access_token = os.environ['GITHUB_ACCESS_TOKEN']
-Headers = {"Authorization":"token " + access_token} 
-def main():
-	r = requests.get(url,headers=Headers)
-	payload = r.json()
-	print payload
-	for pr in payload:
-		pr_num = pr['number']
-		r = requests.get(pr['url']+"/commits",headers=Headers)
-    		commits = r.json()
-		#print commits
-    		last_commit = commits[len(commits)-1]
-    		message = last_commit['commit']['message']
-		
-		#print message
-    		pattern = re.compile("\[ci(\s+)skip\]", re.I)
-    		result_commit_title = pattern.search(message)
-
-    		title = pr['title']
-    		result_pr_title = pattern.search(title)
-    		if result_commit_title is not None or result_pr_title is not None:
-        		print 'skip build for pull request #' + str(pr_num)
-			break
-        	#return(0)
-		s = pr['statuses_url']
-		update_time = pr['updated_at']
-		print pr_num
-		print s
-		print update_time
-		t = datetime.datetime.strptime(update_time, "%Y-%m-%dT%H:%M:%SZ")
-		now = datetime.datetime.utcnow()
-		three_minutes = datetime.timedelta(seconds=3*60)
-		if (t + three_minutes < now):
-			#print pr_num
-			statuses = requests.get(s, headers=Headers)
-			#print statuses.json()
-			if(len(statuses.json()) < 1):
-				print pr_num
-				payload_forward = {}
-				payload_forward['number']=pr_num
-				payload_forward['action']=pr['state']
-				payload_forward['html_url']=pr['html_url']
-				payload_forward['statuses_url']=pr['statuses_url']
-				payload_forward['branch']=pr['base']['ref']
-				print payload_forward
-				post_data = {'payload':""}
-				post_data['payload']= json.dumps(payload_forward)
-
-				requests.post(job_trigger_url, data=post_data)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-    	main()
-    except:
-	traceback.print_exc()
-	sys_ret = 1
-    finally:
-	sys.exit(sys_ret)
-
diff --git a/tools/jenkins-scripts/master-scripts/job-comment-trigger.py b/tools/jenkins-scripts/master-scripts/job-comment-trigger.py
deleted file mode 100644
index 748892ae089c..000000000000
--- a/tools/jenkins-scripts/master-scripts/job-comment-trigger.py
+++ /dev/null
@@ -1,136 +0,0 @@
-import json
-import re
-import os
-import requests
-import sys
-import traceback
-import urllib2
-
-http_proxy = ''
-if('HTTP_PROXY' in os.environ):
-    http_proxy = os.environ['HTTP_PROXY']
-proxyDict = {'http': http_proxy, 'https': http_proxy}
-
-def main():
-    #get payload from os env
-    payload_str = os.environ['payload']
-    #parse to json obj
-    payload = json.loads(payload_str)
-
-    print payload
-
-    issue = payload['issue']
-    #get pull number
-    pr_num = issue['number']
-    print 'pr_num:' + str(pr_num)
-    payload_forword = {"number": pr_num}
-
-    comment = payload['comment']
-    #get comment body
-    comment_body = comment['body']
-    print comment_body
-    #will check 'ci' comment
-    searchCI = re.search("\[ci.*\]", comment_body)
-
-    #will check console/console create
-    searchConsole = re.search('\[console.*\]', comment_body)
-
-    if searchCI is None and searchConsole is None:
-        print 'skip build for pull request #' + str(pr_num)
-        return(0)
-
-    #build for pull request action 'open' and 'synchronize', skip 'close'
-    action = issue['state']
-    print 'action: ' + action
-    payload_forword['action'] = action
-
-    pr = issue['pull_request']
-    url = pr['html_url']
-    print "url:" + url
-    payload_forword['html_url'] = url
-
-    #get pull request info
-    req = os.environ['GITHUB_REMOTE'] + str(pr_num)
-    pr_payload = ''
-    try:
-        pr_payload = urllib2.urlopen(req).read()
-    except:
-        traceback.print_exc()
-
-    repository = json.loads(pr_payload)
-    #get statuses url
-    statuses_url = repository['statuses_url']
-    payload_forword['statuses_url'] = statuses_url
-    print 'statuses_url: ' + statuses_url
-    #get comments url
-    comments_url = repository['comments_url']
-    payload_forword['comments_url'] = comments_url
-    print 'comments_url: ' + comments_url
-
-    #get pr target branch
-    branch = repository['base']['ref']
-    payload_forword['branch'] = branch
-    print 'branch: ' + branch
-
-    #set commit status to pending
-    target_url = os.environ['JOB_PULL_REQUEST_BUILD_URL']
-
-    if(action == 'closed' or action == 'assigned'
-       or branch == 'v2' or branch == 'v3-doc' or action == 'unassigned'):
-        print 'pull request #' + str(pr_num) + ' is ' + action + ', no build triggered'
-        return(0)
-
-    data = {"state": "pending", "target_url": target_url, "context": "Jenkins CI",
-            "description": "Wait available build machine..."}
-    access_token = os.environ['GITHUB_ACCESS_TOKEN']
-    Headers = {"Authorization": "token " + access_token}
-
-    try:
-        if searchCI:
-            ciOper = searchCI.group()
-            if('rebuild' in ciOper):
-                requests.post(statuses_url, data=json.dumps(data),
-                              headers=Headers, proxies=proxyDict)
-    except:
-        traceback.print_exc()
-
-    job_trigger_url = ''
-    if searchCI:
-        ciOper = searchCI.group()
-        if('rebuild' in ciOper):
-            job_trigger_url = os.environ['JOB_PULL_REQUEST_BUILD_TRIGGER_URL']
-        if('emptytest' in ciOper):
-            job_trigger_url = os.environ['JOB_EMPTYTEST_TRIGGER_URL']
-        if('release' in ciOper):
-            searchTag = re.search('\[ci release (.*)\]', ciOper)
-            if searchTag:
-                ci_tag = searchTag.group(1)
-                payload_forword['tag'] = ci_tag
-                job_trigger_url = os.environ['JOB_RELEASE_TRIGGER_URL']
-    if searchConsole:
-        consoleOper = searchConsole.group()
-        job_trigger_url = os.environ['JOB_CONSOLE_TEST_TRIGGER_URL']
-        payload_forword['console'] = consoleOper
-    print 'job_trigger_url is: ', job_trigger_url
-
-    #send trigger and payload
-    if('tag' in payload_forword):
-        post_data = {'tag': ""}
-        post_data['tag'] = payload_forword['tag']
-    else:
-        post_data = {'payload': ""}
-        post_data['payload'] = json.dumps(payload_forword)
-    requests.post(job_trigger_url, data=post_data, proxies=proxyDict)
-
-    return(0)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/master-scripts/job-trigger.py b/tools/jenkins-scripts/master-scripts/job-trigger.py
deleted file mode 100755
index 424b05d98e7b..000000000000
--- a/tools/jenkins-scripts/master-scripts/job-trigger.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#Github pull reqest builder for Jenkins
-
-import json
-import re
-import os
-import requests
-import sys
-import traceback
-from jenkinsapi.jenkins import Jenkins
-
-access_token = os.environ['GITHUB_ACCESS_TOKEN']
-Headers = {"Authorization": "token " + access_token}
-
-http_proxy = ''
-if('HTTP_PROXY' in os.environ):
-    http_proxy = os.environ['HTTP_PROXY']
-proxyDict = {'http': http_proxy, 'https': http_proxy}
-
-def check_queue_build(action, pr_num, statuses_url):
-    username = os.environ['JENKINS_ADMIN']
-    password = os.environ['JENKINS_ADMIN_PW']
-    jenkins_url = os.environ['JENKINS_URL']
-    J = Jenkins(jenkins_url, username, password)
-    queues = J.get_queue()
-    for key, queue in queues.iteritems():
-        q_payload_str = queue.get_parameters()['payload'].decode('utf-8', 'ignore')
-        q_payload = json.loads(q_payload_str)
-        q_pr_num = q_payload['number']
-        q_statuses_url = q_payload['statuses_url']
-        if(q_pr_num == pr_num):
-            if(action == 'closed') or (q_statuses_url != statuses_url):
-                queues.delete_item(queue)
-                target_url = os.environ['JOB_PULL_REQUEST_BUILD_URL']
-                data = {"state": "error", "target_url": target_url}
-                try:
-                    requests.post(statuses_url, data=json.dumps(data),
-                                  headers=Headers, proxies=proxyDict)
-                except:
-                    traceback.print_exc()
-
-def main():
-    #get payload from os env
-    payload_str = os.environ['payload']
-    #parse to json obj
-    payload = json.loads(payload_str)
-
-    #get pull number
-    pr_num = payload['number']
-    print 'pr_num:' + str(pr_num)
-    payload_forword = {"number": pr_num}
-
-    #build for pull request action 'open' and 'synchronize', skip 'close'
-    action = payload['action']
-    print 'action: ' + action
-    payload_forword['action'] = action
-
-    pr = payload['pull_request']
-    url = pr['html_url']
-    print "url:" + url
-    payload_forword['html_url'] = url
-
-    #get statuses url
-    statuses_url = pr['statuses_url']
-    payload_forword['statuses_url'] = statuses_url
-
-    #get pr target branch
-    branch = pr['base']['ref']
-    payload_forword['branch'] = branch
-
-    #set commit status to pending
-    target_url = os.environ['JOB_PULL_REQUEST_BUILD_URL']
-
-    try:
-        check_queue_build(action, pr_num, statuses_url)
-    except:
-        print 'Can not find build in queue'
-
-    if(action == 'closed' or action == 'labeled' or action == 'unassigned'
-       or action == 'assigned' or action == 'unlabeled'
-       or branch == 'v2' or branch == 'v3-doc'):
-        print 'pull request #' + str(pr_num) + ' is ' + action + ', no build triggered'
-        return(0)
-
-    r = requests.get(pr['url'] + "/commits", headers=Headers, proxies=proxyDict)
-    commits = r.json()
-    last_commit = commits[len(commits) - 1]
-    message = last_commit['commit']['message']
-
-    pattern = re.compile("\[ci(\s+)skip\]", re.I)
-    result_commit_title = pattern.search(message)
-
-    title = pr['title']
-    result_pr_title = pattern.search(title)
-    if result_commit_title is not None or result_pr_title is not None:
-        print 'skip build for pull request #' + str(pr_num)
-        return(0)
-
-    data = {"state": "pending", "target_url": target_url,
-            "context": "Jenkins CI",
-            "description": "Waiting available build machine..."}
-
-    try:
-        requests.post(statuses_url, data=json.dumps(data),
-                      headers=Headers, proxies=proxyDict)
-    except:
-        traceback.print_exc()
-
-    job_trigger_url = os.environ['JOB_TRIGGER_URL']
-    #send trigger and payload
-    post_data = {'payload': ""}
-    post_data['payload'] = json.dumps(payload_forword)
-    requests.post(job_trigger_url, data=post_data, proxies=proxyDict)
-
-    return(0)
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
diff --git a/tools/jenkins-scripts/master-scripts/post-build.py b/tools/jenkins-scripts/master-scripts/post-build.py
deleted file mode 100644
index 2efc346ded2e..000000000000
--- a/tools/jenkins-scripts/master-scripts/post-build.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import os
-import json
-import requests
-import jenkinsapi
-from jenkinsapi.jenkins import Jenkins
-from jenkinsapi.constants import STATUS_SUCCESS
-from email.mime.text import MIMEText
-import smtplib
-def send_mail(sub,title,content):
-    #to_list = os.environ['EMAIL_LIST'].split(' ')
-    mail_user = os.environ['EMAIL_USER']
-    mail_pass = os.environ['EMAIL_PWD']
-    to_list = os.environ['EMAIL_LIST'].split(' ')
-    mail_postfix = 'gmail.com'
-    me = mail_user + "<" + mail_user + "@" + mail_postfix + ">"
-    msg = MIMEText(content, _subtype='plain', _charset='gb2312')
-    msg['Subject'] = sub
-    msg['From'] = me
-    msg['To'] = " ".join(to_list)
-    print 'to users:', msg['To']
-    msg['Content'] = 'test'
-    try:
-        s = smtplib.SMTP('smtp.gmail.com', 587)
-        s.ehlo()
-        s.starttls()
-        s.login(mail_user,mail_pass)
-        s.sendmail(me, to_list, str(msg))
-        print 'info:', me, to_list, str(msg)
-        s.close()
-        return True
-    except Exception, e:
-        print str(e)
-        return False
-
-def sendEmail(pr, html_url, target_url):
-	sub = "Pull request #" + str(pr) + " build is failed!"
-	title = "build failed!"
-	content = 'to view build result, check:\r\n'+target_url + '\r\nYou can view the failed pr at:\r\n'+html_url
-	send_mail(sub, title, content)
-
-payload_str = os.environ['payload']
-payload_str = payload_str.decode('utf-8','ignore')
-#parse to json obj
-payload = json.loads(payload_str)
-#pr = payload['pull_request']
-url = payload['html_url']
-print "build pr:" + url
-pr_num = payload['number']
-#get statuses url
-statuses_url = payload['statuses_url']
-
-J = Jenkins(os.environ['JENKINS_URL'])
-target_url = os.environ['BUILD_URL']
-build_number = int(os.environ['BUILD_NUMBER'])
-data = {"state":"pending", "target_url":target_url, "context":"Jenkins CI", "description":"Build finished!"}
-access_token = os.environ['GITHUB_ACCESS_TOKEN']
-Headers = {"Authorization":"token " + access_token} 
-
-result = J[os.environ['JOB_NAME']].get_build(build_number).get_status()
-
-if(result == STATUS_SUCCESS):
-    data['state'] = "success"
-    data['description'] = "Build successfully!"
-else:
-    data['state'] = "failure"
-    data['description'] = "Build failed!"
-    sendEmail(pr_num, url, target_url)
-http_proxy = ''
-if(os.environ.has_key('HTTP_PROXY')):
-    http_proxy = os.environ['HTTP_PROXY']
-proxyDict = {'http':http_proxy,'https':http_proxy}
-requests.post(statuses_url, data=json.dumps(data), headers=Headers, proxies = proxyDict)
diff --git a/tools/jenkins-scripts/master-scripts/watchdog.py b/tools/jenkins-scripts/master-scripts/watchdog.py
deleted file mode 100644
index e9fd9b1cbf4e..000000000000
--- a/tools/jenkins-scripts/master-scripts/watchdog.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import jenkinsapi
-from jenkinsapi.jenkins import Jenkins
-from jenkinsapi.node import Node
-import sys
-import time
-import os
-from email.mime.text import MIMEText
-import smtplib
-import requests
-
-def send_mail(sub,title,content):
-    to_list = os.environ['EMAIL_LIST'].split(' ')
-    mail_user = os.environ['EMAIL_USER']
-    mail_pass = os.environ['EMAIL_PWD']
-    mail_postfix = 'gmail.com'
-    me = mail_user + "<" + mail_user + "@" + mail_postfix + ">"
-    msg = MIMEText(content, _subtype='plain', _charset='gb2312')
-    msg['Subject'] = sub
-    msg['From'] = me
-    msg['To'] = " ".join(to_list)
-    print 'to users:', msg['To']
-    msg['Content'] = 'test'
-    try:
-        s = smtplib.SMTP('smtp.gmail.com', 587)
-        s.ehlo()
-        s.starttls()
-        s.login(mail_user,mail_pass)
-        s.sendmail(me, to_list, str(msg))
-        print 'info:', me, to_list, str(msg)
-        s.close()
-        return True
-    except Exception, e:
-        print str(e)
-        return False
-
-def sendEmail(msg):
-    send_mail("Jenkins node " + msg + " is offline", 'for offline.', msg + ' is offline')
-
-def rebuild_jobs(build):
-    rebuild_jobs = os.environ['REBUILD_JOBS'].split(' ')
-    trigger_urls = os.environ['JOB_TRIGGER_URLS'].split(' ')
-    for i, rebuild_job in enumerate(rebuild_jobs):
-        if rebuild_job in build.__str__():
-            payload = build._poll()['actions'][0]['parameters'][0]['value']
-            job_trigger_url = trigger_urls[i]
-            post_data = {'payload': payload}
-            requests.post(job_trigger_url, data=post_data)
-            print 'build_job:', rebuild_job, 'rebuild : TRUE'
-
-#check & kill dead buid
-def build_time(_job,_threshold):
-    #get jenkins-job-watchdog-threshold
-    #Get last build running
-    build = _job.get_last_build()
-    running = build.is_running()
-    print 'build_job:',_job,'running:',running
-    if not running:
-        return False
-    
-    #Get numerical ID of the last build.
-    buildnu = _job.get_last_buildnumber()
-    print "buildnumber:#",buildnu
-    #get nowtime
-    nowtime = int(time.time())
-    print 'nowtime:', time.ctime(nowtime)
-    #get build start time
-    timestamp = build._poll()['timestamp']
-    buildtime = int(timestamp)/1000
-    print 'buildtime:', time.ctime(buildtime)
-    subtime = (nowtime - buildtime)/60
-    print 'subtime:', subtime, _threshold
-    if subtime > _threshold:
-        rebuild_jobs(build)
-        #print 'subtime',subtime
-        #kill dead buid
-        build.stop()
-    
-def main():
-    username = os.environ['JENKINS_ADMIN']
-    password = os.environ['JENKINS_ADMIN_PW']
-    jenkins_url = os.environ['JENKINS_URL']
-    J = Jenkins(jenkins_url,username,password)
-    #get all jenkins jobs
-    for key,job in J.iteritems():
-        threshold = 0
-        if(os.environ.has_key(key+'-threshold')):
-            threshold = int(os.environ[key+'-threshold'])
-        else:
-            threshold = int(os.environ['jenkins-job-watchdog-threshold'])
-        build_time(job,threshold)
-
-    #check node status
-    node_names = os.environ['NODE_LIST'].split(' ')
-    for node_name in node_names:
-        node = J.get_node(node_name)
-        if node.is_online():
-            print node_name, ' : is online'
-        else:
-            sendEmail(node_name)
-            print node_name, ' : is offline'
-    return(0)
-    
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:    
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
-
diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py
deleted file mode 100755
index 018ac03b5709..000000000000
--- a/tools/jenkins-scripts/pull-request-builder.py
+++ /dev/null
@@ -1,149 +0,0 @@
-import os
-import sys
-import traceback
-import urllib
-import urllib2
-import base64
-import json
-import requests
-import subprocess
-
-#set Jenkins build description using submitDescription to mock browser behavior
-http_proxy = ''
-if('HTTP_PROXY' in os.environ):
-    http_proxy = os.environ['HTTP_PROXY']
-proxyDict = {'http': http_proxy, 'https': http_proxy}
-
-branch = "v3"
-pr_num = 0
-workspace = "."
-node_name = "ios"
-
-def set_jenkins_job_description(desc, url):
-    req_data = urllib.urlencode({'description': desc})
-    request = urllib2.Request(url + 'submitDescription', req_data)
-    #print(os.environ['BUILD_URL'])
-    request.add_header('Content-Type', 'application/x-www-form-urlencoded')
-    user_name = os.environ['JENKINS_ADMIN']
-    password = os.environ['JENKINS_ADMIN_PW']
-    base64string = base64.encodestring(user_name + ":" + password).replace('\n', '')
-    request.add_header("Authorization", "Basic " + base64string)
-    try:
-        urllib2.urlopen(request)
-    except:
-        traceback.print_exc()
-
-def send_notifies_to_github():
-    global branch
-    global pr_num
-    global workspace
-    global node_name
-    # get payload from os env
-    payload_str = os.environ['payload']
-    payload_str = payload_str.decode('utf-8', 'ignore')
-    #parse to json obj
-    payload = json.loads(payload_str)
-
-    #get pull number
-    pr_num = payload['number']
-    print 'pr_num:' + str(pr_num)
-
-    #build for pull request action 'open' and 'synchronize', skip 'close'
-    action = payload['action']
-    print 'action: ' + action
-
-    #pr = payload['pull_request']
-
-    url = payload['html_url']
-    print "url:" + url
-    pr_desc = '<h3><a href=' + url + '> pr#' + str(pr_num) + ' is ' + action + '</a></h3>'
-
-    #get statuses url
-    statuses_url = payload['statuses_url']
-
-    #get pr target branch
-    branch = payload['branch']
-    workspace = os.environ['WORKSPACE']
-    node_name = os.environ['NODE_NAME']
-
-    #set commit status to pending
-    # target_url = os.environ['BUILD_URL']
-    jenkins_url = os.environ['JENKINS_URL']
-    job_name = os.environ['JOB_NAME'].split('/')[0]
-    build_number = os.environ['BUILD_NUMBER']
-    target_url = jenkins_url + 'job/' + job_name + '/' + build_number + '/'
-
-    set_jenkins_job_description(pr_desc, target_url)
-
-    data = {"state": "pending", "target_url": target_url, "context": "Jenkins CI", "description": "Build started..."}
-    access_token = os.environ['GITHUB_ACCESS_TOKEN']
-    Headers = {"Authorization": "token " + access_token}
-
-    try:
-        requests.post(statuses_url, data=json.dumps(data), headers=Headers, proxies=proxyDict)
-    except:
-        traceback.print_exc()
-
-def syntronize_remote_pr():
-    global workspace
-    global branch
-    global pr_num
-    #reset path to workspace root
-    os.system("cd " + workspace)
-    #pull latest code
-    os.system("git fetch origin " + branch)
-    os.system("git --version")
-    os.system("git checkout " + branch)
-    os.system("git merge origin/" + branch)
-    os.system("git branch -D pull" + str(pr_num))
-    #clean workspace
-    print "Before checkout: git clean -xdf -f"
-    os.system("git clean -xdf -f")
-    #fetch pull request to local repo
-    git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/head"
-    ret = os.system(git_fetch_pr)
-    if(ret != 0):
-        sys.exit(1)
-
-    #checkout a new branch from v3 or v4-develop
-    git_checkout = "git checkout -b " + "pull" + str(pr_num)
-    os.system(git_checkout)
-    #merge pull reqeust head
-    subprocess.call("git merge --no-edit FETCH_HEAD", shell=True)
-
-    # The follow method is not working for Azure server
-    # p = os.popen('git merge --no-edit FETCH_HEAD')
-    # r = p.read()
-    # #check if merge fail
-    # if output.find('CONFLICT') > 0:
-    #     print output
-    #     raise Exception('There are conflicts in your PR!')
-
-    # After checkout a new branch, clean workspace again
-    print "After checkout: git clean -xdf -f"
-    os.system("git clean -xdf -f")
-
-    #update submodule
-    git_update_submodule = "git submodule update --init --force"
-    ret = os.system(git_update_submodule)
-    if(ret != 0):
-        sys.exit(1)
-
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:
-        send_notifies_to_github()
-        #syntronize local git repository with remote and merge the PR
-        syntronize_remote_pr()
-        jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "do-pull-request-builder.py"
-        sys_ret = os.system("python " + jenkins_script_path)
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        if sys_ret != 0:
-            sys.exit(1)
-        else:
-            sys.exit(0)
diff --git a/tools/jenkins-scripts/slave-scripts/framework/android-build.sh b/tools/jenkins-scripts/slave-scripts/framework/android-build.sh
deleted file mode 100755
index b3179aaf7c1a..000000000000
--- a/tools/jenkins-scripts/slave-scripts/framework/android-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-cd ${ADXE_ROOT}
-python tools/framework-compile/bin/gen_cocos_libs.py -c --android
diff --git a/tools/jenkins-scripts/slave-scripts/framework/mac-build.sh b/tools/jenkins-scripts/slave-scripts/framework/mac-build.sh
deleted file mode 100755
index 49ddc303c725..000000000000
--- a/tools/jenkins-scripts/slave-scripts/framework/mac-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-cd ${ADXE_ROOT}
-python tools/framework-compile/bin/gen_cocos_libs.py -c --mac | xcpretty
diff --git a/tools/jenkins-scripts/slave-scripts/framework/win32-build.bat b/tools/jenkins-scripts/slave-scripts/framework/win32-build.bat
deleted file mode 100644
index 54d467aa2773..000000000000
--- a/tools/jenkins-scripts/slave-scripts/framework/win32-build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-python tools/framework-compile/bin/gen_cocos_libs.py -c --win
diff --git a/tools/jenkins-scripts/slave-scripts/gen_jsb.py b/tools/jenkins-scripts/slave-scripts/gen_jsb.py
deleted file mode 100755
index 4f69233e0c07..000000000000
--- a/tools/jenkins-scripts/slave-scripts/gen_jsb.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-ret = 0
-genbindings_dirs = ['tolua', 'tojs']
-for item in genbindings_dirs:
-    os.chdir("tools/" + item)
-    ret = os.system('python genbindings.py')
-    os.chdir("../..")
-    if(ret != 0):
-        ret = 1
-        break
-
-sys.exit(ret)
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/android-build.sh b/tools/jenkins-scripts/slave-scripts/runtime/android-build.sh
deleted file mode 100755
index f183a97acfd3..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/android-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1 -t runtime
-if [ $1 = "cpp" ];then
-    projectname="MyCppGame"
-elif [ $1 = "lua" ];then
-    projectname="MyLuaGame"
-elif [ $1 = "js" ];then
-    projectname="MyJSGame"
-fi
-
-$adxe_cmd compile -p android -s $projectname --android-studio -j4  --ndk-mode release --compile-script 0
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/ios-build.sh b/tools/jenkins-scripts/slave-scripts/runtime/ios-build.sh
deleted file mode 100755
index 51b5be10981b..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/ios-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1 -t runtime
-
-if [ $1 = "cpp" ];then
-    schemename="MyCppGame-mobile"
-    projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
-    adxe_project_path="MyCppGame"
-elif [ $1 = "lua" ];then
-    schemename="MyLuaGame-mobile"
-    projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
-    adxe_project_path="MyLuaGame"
-elif [ $1 = "js" ];then
-    schemename="MyJSGame-mobile"
-    projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
-    adxe_project_path="MyJSGame"
-fi
-
-echo "start building..."
-adxe compile -p ios -s $adxe_project_path | xcpretty
-adxe compile -p ios -s $adxe_project_path
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-# #the following commands must not be removed
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/linux-build.sh b/tools/jenkins-scripts/slave-scripts/runtime/linux-build.sh
deleted file mode 100755
index 8cf8f10daf5b..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/linux-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash 
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1
-
-if [ $1 = "cpp" ]; then
-    projectname="MyCppGame"
-elif [ $1 = "lua" ]; then
-    projectname="MyLuaGame"
-elif [ $1 = "js" ]; then
-    projectname="MyJSGame"
-fi
-
-$adxe_cmd compile -p linux -s $projectname -m release -j4 --compile-script 0
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/mac-build.sh b/tools/jenkins-scripts/slave-scripts/runtime/mac-build.sh
deleted file mode 100755
index c20f5d39f0f3..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/mac-build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1 -t runtime
-
-if [ $1 = "cpp" ];then
-    schemename="MyCppGame-desktop"
-    projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
-elif [ $1 = "lua" ];then
-    schemename="MyLuaGame-desktop"
-    projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
-elif [ $1 = "js" ];then
-    schemename="MyJSGame-desktop"
-    projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
-fi
-
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-#the following commands must not be removed
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/win32-cpp.bat b/tools/jenkins-scripts/slave-scripts/runtime/win32-cpp.bat
deleted file mode 100644
index f1ec3c226772..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/win32-cpp.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyCppGame/proj.win32/MyCppGame.sln  /t:Build  /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/win32-js.bat b/tools/jenkins-scripts/slave-scripts/runtime/win32-js.bat
deleted file mode 100644
index 8e9c3b0da6e6..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/win32-js.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/win32-lua.bat b/tools/jenkins-scripts/slave-scripts/runtime/win32-lua.bat
deleted file mode 100644
index 857fd71423b6..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/win32-lua.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-cpp.bat b/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-cpp.bat
deleted file mode 100755
index 54a57c00f836..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-cpp.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyCppGame/proj.win8.1-universal/MyCppGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-js.bat b/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-js.bat
deleted file mode 100755
index 8dbfe57b1d12..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-js.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-lua.bat b/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-lua.bat
deleted file mode 100755
index 70212c9be1a8..000000000000
--- a/tools/jenkins-scripts/slave-scripts/runtime/windows-universal-lua.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/android-build.sh b/tools/jenkins-scripts/slave-scripts/templates/android-build.sh
deleted file mode 100755
index d90de02c98bd..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/android-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1
-if [ $1 = "cpp" ];then
-    projectname="MyCppGame"
-elif [ $1 = "lua" ];then
-    projectname="MyLuaGame"
-elif [ $1 = "js" ];then
-    projectname="MyJSGame"
-fi
-
-$adxe_cmd compile -p android -s $projectname --android-studio -j4  --ndk-mode release --compile-script 0
diff --git a/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh b/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh
deleted file mode 100755
index 06cdc2a7dd03..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1
-
-if [ $1 = "cpp" ];then
-    schemename="MyCppGame-mobile"
-    projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
-    cocos_project_path="MyCppGame"
-elif [ $1 = "lua" ];then
-    schemename="MyLuaGame-mobile"
-    projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
-    cocos_project_path="MyLuaGame"
-elif [ $1 = "js" ];then
-    schemename="MyJSGame-mobile"
-    projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
-    cocos_project_path="MyJSGame"
-fi
-
-echo "start building..."
-cocos compile -p ios -s $cocos_project_path | xcpretty
-cocos compile -p ios -s $cocos_project_path
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-# #the following commands must not be removed
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/templates/linux-build.sh b/tools/jenkins-scripts/slave-scripts/templates/linux-build.sh
deleted file mode 100755
index 8cf8f10daf5b..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/linux-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash 
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1
-
-if [ $1 = "cpp" ]; then
-    projectname="MyCppGame"
-elif [ $1 = "lua" ]; then
-    projectname="MyLuaGame"
-elif [ $1 = "js" ]; then
-    projectname="MyJSGame"
-fi
-
-$adxe_cmd compile -p linux -s $projectname -m release -j4 --compile-script 0
diff --git a/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh b/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh
deleted file mode 100755
index fb7f489683e1..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-adxe_cmd=tools/console/bin/adxe
-$adxe_cmd new -l $1
-
-if [ $1 = "cpp" ];then
-    schemename="MyCppGame-desktop"
-    projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
-    cocos_project_path="MyCppGame"
-elif [ $1 = "lua" ];then
-    schemename="MyLuaGame-desktop"
-    projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
-    cocos_project_path="MyLuaGame"
-elif [ $1 = "js" ];then
-    schemename="MyJSGame-desktop"
-    projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
-    cocos_project_path="MyJSGame"
-fi
-
-adxe compile -p mac -s $cocos_project_path | xcpretty
-adxe compile -p mac -s $cocos_project_path
-
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-# #the following commands must not be removed
-# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/templates/win32-cpp.bat b/tools/jenkins-scripts/slave-scripts/templates/win32-cpp.bat
deleted file mode 100644
index 77c26ba29d58..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/win32-cpp.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyCppGame/proj.win32/MyCppGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/win32-js.bat b/tools/jenkins-scripts/slave-scripts/templates/win32-js.bat
deleted file mode 100644
index 8e9c3b0da6e6..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/win32-js.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/win32-lua.bat b/tools/jenkins-scripts/slave-scripts/templates/win32-lua.bat
deleted file mode 100644
index 857fd71423b6..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/win32-lua.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-cpp.bat b/tools/jenkins-scripts/slave-scripts/templates/windows-universal-cpp.bat
deleted file mode 100755
index 54a57c00f836..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-cpp.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyCppGame/proj.win8.1-universal/MyCppGame.sln  /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-js.bat b/tools/jenkins-scripts/slave-scripts/templates/windows-universal-js.bat
deleted file mode 100755
index 8dbfe57b1d12..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-js.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-lua.bat b/tools/jenkins-scripts/slave-scripts/templates/windows-universal-lua.bat
deleted file mode 100755
index 70212c9be1a8..000000000000
--- a/tools/jenkins-scripts/slave-scripts/templates/windows-universal-lua.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/tests/android-build.sh b/tools/jenkins-scripts/slave-scripts/tests/android-build.sh
deleted file mode 100755
index 25cdcbf12245..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/android-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-cd ${ADXE_ROOT}
-python build/android-build.py -p 13 cpp-tests lua-tests js-tests
diff --git a/tools/jenkins-scripts/slave-scripts/tests/ios-build.sh b/tools/jenkins-scripts/slave-scripts/tests/ios-build.sh
deleted file mode 100755
index 3712d2f3b64c..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/ios-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-#the following commands must not be removed
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/tests/linux-build.sh b/tools/jenkins-scripts/slave-scripts/tests/linux-build.sh
deleted file mode 100755
index b26e390d2be5..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/linux-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-cd ${ADXE_ROOT}
-mkdir linux-build
-cd linux-build
-cmake ..
-if [ ! $? = 0 ]; then
-    echo "cmake generate error"
-    exit 1
-fi
-make -j4
diff --git a/tools/jenkins-scripts/slave-scripts/tests/mac-build.sh b/tools/jenkins-scripts/slave-scripts/tests/mac-build.sh
deleted file mode 100755
index 81a88f9238a6..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/mac-build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#put xctool.sh into your PATH
-
-#######
-# Cmake build
-####### 
-# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ADXE_ROOT="$DIR"/../../..
-# cd ${ADXE_ROOT}
-# mkdir mac-build
-# cd mac-build
-# cmake ..
-# make -j4
-
-#######
-# xcode build
-####### 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests Mac" clean | xcpretty
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests Mac" build | xcpretty
-#xcpretty has a bug, some xcodebuid fails return value would be treated as 0.
-xcodebuild -project "$ADXE_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests Mac" build
diff --git a/tools/jenkins-scripts/slave-scripts/tests/tizen-build.sh b/tools/jenkins-scripts/slave-scripts/tests/tizen-build.sh
deleted file mode 100755
index 12dc5c4585a8..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/tizen-build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../../../..
-cd ${ADXE_ROOT}
-cocos compile -p tizen --tizen-arch arm -s tests/cpp-tests
-if [ ! $? = 0 ]; then
-    echo "compile cpp-tests error"
-    exit 1
-fi
-
-cocos compile -p tizen --tizen-arch arm -s tests/cpp-empty-test
-if [ ! $? = 0 ]; then
-    echo "compile cpp-empty-test error"
-    exit 1
-fi
-
-cocos compile -p tizen --tizen-arch arm -s tests/lua-tests
-if [ ! $? = 0 ]; then
-    echo "compile lua-tests error"
-    exit 1
-fi
-
-cocos compile -p tizen --tizen-arch arm -s tests/lua-empty-test
-if [ ! $? = 0 ]; then
-    echo "compile lua empty test error"
-    exit 1
-fi
diff --git a/tools/jenkins-scripts/slave-scripts/tests/win32-build.bat b/tools/jenkins-scripts/slave-scripts/tests/win32-build.bat
deleted file mode 100644
index 7f29e5337dcb..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/win32-build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/tests/windows-universal.bat b/tools/jenkins-scripts/slave-scripts/tests/windows-universal.bat
deleted file mode 100755
index 7959cc3aedc4..000000000000
--- a/tools/jenkins-scripts/slave-scripts/tests/windows-universal.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-win8.1-universal.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/utils/create-job.py b/tools/jenkins-scripts/utils/create-job.py
deleted file mode 100644
index 2cd7ffddda3f..000000000000
--- a/tools/jenkins-scripts/utils/create-job.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#create ghprb job by pr number
-
-import sys
-import json
-import requests
-
-#get pr number from cmd
-pr_num = sys.argv[1]
-
-#get github access token
-
-
-#get pr data via github api
-
-api_get_pr = "https://api.github.com/repos/cocos2d/cocos2d-x/pulls/" + str(pr_num)
-
-r = requests.get(api_get_pr)
-pr = r.json()
-
-#forge a payload
-payload = {"action": "opened", "number": "", "pull_request": ""}
-payload['number'] = pr_num
-payload['pull_request'] = pr
-
-jenkins_job_url = "http://115.28.134.83:8000/job/ccs-pr"
-
-jenkins_trigger_url = jenkins_job_url + "/buildWithParameters?token=ced2014"
-
-#send trigger and payload
-post_data = {'payload': ""}
-post_data['payload'] = json.dumps(payload)
-requests.post(jenkins_trigger_url, data=post_data)
diff --git a/tools/jenkins-scripts/utils/create-template-project.py b/tools/jenkins-scripts/utils/create-template-project.py
deleted file mode 100644
index 3787e142a2c9..000000000000
--- a/tools/jenkins-scripts/utils/create-template-project.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import os
-
-languages = ['cpp', 'lua', 'javascript']
-base_path = 'tools/project-creator/'
-create_project = base_path + 'create_project.py'
-template_root = base_path + 'templateTest'
-
-# create project
-for item in languages:
-    ret = os.system('python ' + create_project
-                    + ' -n ' + 'template' + item
-                    + ' -k ' + 'com.test.template.' + item
-                    + ' -l ' + item
-                    + ' -p ' + template_root)
-    if(ret > 0):
-        ret = 1
-        exit(ret)
-
-exit(0)
diff --git a/tools/jenkins-scripts/utils/reboot.py b/tools/jenkins-scripts/utils/reboot.py
deleted file mode 100755
index a35ce631e4e2..000000000000
--- a/tools/jenkins-scripts/utils/reboot.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-import paramiko
-
-remote_machines = os.environ['REMOTE_MACHINES']
-remote_machines = remote_machines.split(', ')
-print 'remote_machines', remote_machines
-
-remote_dir=os.environ['REMOTE_DIR']
-remote_dir=remote_dir.split(', ')
-print 'remote_dir',remote_dir
-
-remote_ip=os.environ['REMOTE_IP']
-remote_ip=remote_ip.split(', ')
-print 'remote_ip',remote_ip
-
-remote_user=os.environ['REMOTE_USER']
-remote_user=remote_user.split(', ')
-print 'remote_user',remote_user
-
-remote_port=os.environ['REMOTE_PORT']
-remote_port=remote_port.split(', ')
-print 'remote_port',int(remote_port[0])
-
-all_machines = {}
-def set_default_value_to_all_machines():
-    for idx, item in enumerate(remote_machines):
-        all_machines[item]={}
-        all_machines[item]['ip']=remote_ip[idx]
-        all_machines[item]['dir']=remote_dir[idx]
-        all_machines[item]['port']=remote_port[idx]
-        all_machines[item]['user']=remote_user[idx]
-        all_machines[item]['pwd']=os.environ[item+'_PWD']
-
-def reboot_machine(machine, item):
-    print 'machine:',machine, 'item:', item
-    remote_ip = machine['ip']
-    remote_port = machine['port']
-    remote_user = machine['user']
-    remote_pwd = machine['pwd']
-    remote_dir = os.path.join(machine['dir'],'workspace','reboot', 'reboot.py')
-    print remote_dir
-    ssh = paramiko.SSHClient()
-    print 'ssh:',ssh
-    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(remote_ip, int(remote_port), remote_user, remote_pwd)
-    # excute reboot.py on machine
-    cmd = 'python '+remote_dir
-    if item == 'win32_win7':
-        cmd = 'cmd.exe /c "python '+remote_dir+'"'
-    stdin, stdout, stderr = ssh.exec_command(cmd)
-    print stdout.readlines()
-    ssh.close()
-    print 'OK'
-
-def main():
-    print 'in main'
-    set_default_value_to_all_machines()
-    for item in all_machines:
-        reboot_machine( all_machines[item], item )
-
-# -------------- main --------------
-if __name__ == '__main__':
-    sys_ret = 0
-    try:    
-        sys_ret = main()
-    except:
-        traceback.print_exc()
-        sys_ret = 1
-    finally:
-        sys.exit(sys_ret)
-
diff --git a/tools/jenkins-scripts/utils/upload_apk.sh b/tools/jenkins-scripts/utils/upload_apk.sh
deleted file mode 100755
index 8c0af6e9a71f..000000000000
--- a/tools/jenkins-scripts/utils/upload_apk.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-localfile=$1
-remotefile=$2
-
-sftp $FTP_HOME << EOF
-put $localfile $remotefile
-bye
-EOF
-echo "upload finished"
diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini
index 94fbc62a8fc6..6b589fec1f60 100644
--- a/tools/tolua/cocos2dx.ini
+++ b/tools/tolua/cocos2dx.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/extensions -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/extensions -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/robin-map/include -I%(cocosdir)s/thirdparty/jni.hpp/include
 cocos_flags = -DANDROID
 
 cxxgenerator_headers =
diff --git a/tools/tolua/cocos2dx_3d.ini b/tools/tolua/cocos2dx_3d.ini
index f845e328e84e..6b0b7984b534 100644
--- a/tools/tolua/cocos2dx_3d.ini
+++ b/tools/tolua/cocos2dx_3d.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 cocos_flags = -DANDROID
 
 cxxgenerator_headers = 
diff --git a/tools/tolua/cocos2dx_audioengine.ini b/tools/tolua/cocos2dx_audioengine.ini
index 88c98a0f3777..30444d4ed3f4 100644
--- a/tools/tolua/cocos2dx_audioengine.ini
+++ b/tools/tolua/cocos2dx_audioengine.ini
@@ -14,9 +14,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_backend.ini b/tools/tolua/cocos2dx_backend.ini
index 571121547171..e667d2415340 100644
--- a/tools/tolua/cocos2dx_backend.ini
+++ b/tools/tolua/cocos2dx_backend.ini
@@ -1,4 +1,4 @@
-[cocos2d-backend]
+[cocos2dx_backend]
 # the prefix to be added to the generated functions. You might or might not use this in your own
 # templates
 prefix = cocos2dx_backend
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/extensions -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/extensions -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 cocos_flags = -DANDROID
 
 cxxgenerator_headers =
diff --git a/tools/tolua/cocos2dx_controller.ini b/tools/tolua/cocos2dx_controller.ini
index d5500b7e45ea..d33ed315d793 100644
--- a/tools/tolua/cocos2dx_controller.ini
+++ b/tools/tolua/cocos2dx_controller.ini
@@ -14,9 +14,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 cocos_flags = -DANDROID
 
 cxxgenerator_headers = 
diff --git a/tools/tolua/cocos2dx_csloader.ini b/tools/tolua/cocos2dx_csloader.ini
index 6219300f969a..46c2684735d7 100644
--- a/tools/tolua/cocos2dx_csloader.ini
+++ b/tools/tolua/cocos2dx_csloader.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_extension.ini b/tools/tolua/cocos2dx_extension.ini
index 3ee56cbb665b..08236ee45481 100644
--- a/tools/tolua/cocos2dx_extension.ini
+++ b/tools/tolua/cocos2dx_extension.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/rapidjson -I%(cocosdir)s/thirdparty/box2d/include
+cocos_headers = -I%(cocosdir)s -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/rapidjson -I%(cocosdir)s/thirdparty/box2d/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_navmesh.ini b/tools/tolua/cocos2dx_navmesh.ini
index eb443e8e3934..56c1bb7d8a4b 100644
--- a/tools/tolua/cocos2dx_navmesh.ini
+++ b/tools/tolua/cocos2dx_navmesh.ini
@@ -14,11 +14,11 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -DCC_USE_NAVMESH
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -DCC_USE_NAVMESH
 
 win32_clang_flags = -U __SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/recast/Detour -I%(cocosdir)s/thirdparty/recast/DetourCrowd -I%(cocosdir)s/thirdparty/recast/DetourTileCache -I%(cocosdir)s/thirdparty/recast/DebugUtils -I%(cocosdir)s/thirdparty/recast/fastlz -I%(cocosdir)s/thirdparty/recast/Recast -I%(cocosdir)s/thirdparty/lua/luajit/include -I%(cocosdir)s/thirdparty/lua/tolua -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/scripting/lua-bindings/manual
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include -I%(cocosdir)s/thirdparty/recast/Detour -I%(cocosdir)s/thirdparty/recast/DetourCrowd -I%(cocosdir)s/thirdparty/recast/DetourTileCache -I%(cocosdir)s/thirdparty/recast/DebugUtils -I%(cocosdir)s/thirdparty/recast/fastlz -I%(cocosdir)s/thirdparty/recast/Recast -I%(cocosdir)s/thirdparty/lua/luajit/include -I%(cocosdir)s/thirdparty/lua/tolua -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/scripting/lua-bindings/manual
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_physics.ini b/tools/tolua/cocos2dx_physics.ini
index 8a5ab2e154eb..a2daf30d7023 100644
--- a/tools/tolua/cocos2dx_physics.ini
+++ b/tools/tolua/cocos2dx_physics.ini
@@ -14,9 +14,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_physics3d.ini b/tools/tolua/cocos2dx_physics3d.ini
index cbeee849c2b4..52399f7de19a 100644
--- a/tools/tolua/cocos2dx_physics3d.ini
+++ b/tools/tolua/cocos2dx_physics3d.ini
@@ -14,11 +14,11 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__ -DCC_ENABLE_BULLET_INTEGRATION
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__ -DCC_ENABLE_BULLET_INTEGRATION
 
 win32_clang_flags = -U __SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty -I%(cocosdir)s/thirdparty/bullet
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include -I%(cocosdir)s/thirdparty/bullet
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_spine.ini b/tools/tolua/cocos2dx_spine.ini
index 277fa1bb2965..a7f065c04a21 100644
--- a/tools/tolua/cocos2dx_spine.ini
+++ b/tools/tolua/cocos2dx_spine.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/spine -I%(cocosdir)s/extensions/spine/runtime/include -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/spine -I%(cocosdir)s/extensions/spine/runtime/include -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_studio.ini b/tools/tolua/cocos2dx_studio.ini
index bed1726c94af..18535d669141 100644
--- a/tools/tolua/cocos2dx_studio.ini
+++ b/tools/tolua/cocos2dx_studio.ini
@@ -15,9 +15,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/thirdparty -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty/lua/luajit/include -I%(cocosdir)s/thirdparty/lua/tolua -I%(cocosdir)s/extensions/scripting/lua-bindings/manual
+cocos_headers = -I%(cocosdir)s/thirdparty -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/extensions/cocostudio -I%(cocosdir)s/cocos/platform/android  -I%(cocosdir)s/thirdparty/robin-map/include  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/lua/luajit/include -I%(cocosdir)s/thirdparty/lua/tolua -I%(cocosdir)s/extensions/scripting/lua-bindings/manual
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_ui.ini b/tools/tolua/cocos2dx_ui.ini
index 129413893245..1597ab3cfc17 100644
--- a/tools/tolua/cocos2dx_ui.ini
+++ b/tools/tolua/cocos2dx_ui.ini
@@ -15,9 +15,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_video.ini b/tools/tolua/cocos2dx_video.ini
index 23ba4e382fa8..1f95fa36a4d3 100644
--- a/tools/tolua/cocos2dx_video.ini
+++ b/tools/tolua/cocos2dx_video.ini
@@ -12,9 +12,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/cocos2dx_webview.ini b/tools/tolua/cocos2dx_webview.ini
index a14606dfaf08..cb251c6b1b9d 100644
--- a/tools/tolua/cocos2dx_webview.ini
+++ b/tools/tolua/cocos2dx_webview.ini
@@ -11,9 +11,9 @@ android_headers =
 android_flags = -target armv7-none-linux-androideabi -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -DANDROID -D__ANDROID_API__=14 -gcc-toolchain %(gcc_toolchain_dir)s --sysroot=%(androidndkdir)s/platforms/android-14/arch-arm  -idirafter %(androidndkdir)s/sources/android/support/include -idirafter %(androidndkdir)s/sysroot/usr/include -idirafter %(androidndkdir)s/sysroot/usr/include/arm-linux-androideabi -idirafter %(clangllvmdir)s/lib64/clang/5.0/include -I%(androidndkdir)s/sources/cxx-stl/llvm-libc++/include
 
 clang_headers = 
-clang_flags = -nostdinc -x c++ -std=c++11 -fsigned-char -U__SSE__
+clang_flags = -nostdinc -x c++ -std=c++17 -fsigned-char -U__SSE__
 
-cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/extensions -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/thirdparty  -I%(cocosdir)s/thirdparty/jni.hpp/include -I%(cocosdir)s/thirdparty/robin-map/include
 
 cocos_flags = -DANDROID
 
diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py
index db8bc91a5181..328dd41a57c4 100755
--- a/tools/tolua/genbindings.py
+++ b/tools/tolua/genbindings.py
@@ -206,7 +206,7 @@ def main():
 
         cmd_args = {
                     'cocos2dx.ini' : ('cocos2d-x', 'lua_cocos2dx_auto'), \
-                    'cocos2dx_backend.ini' : ('cocos2d-backend', 'lua_cocos2dx_backend_auto'), \
+                    'cocos2dx_backend.ini' : ('cocos2dx_backend', 'lua_cocos2dx_backend_auto'), \
                     'cocos2dx_extension.ini' : ('cocos2dx_extension', 'lua_cocos2dx_extension_auto'), \
                     'cocos2dx_ui.ini' : ('cocos2dx_ui', 'lua_cocos2dx_ui_auto'), \
                     'cocos2dx_studio.ini' : ('cocos2dx_studio', 'lua_cocos2dx_studio_auto'), \
diff --git a/tools/travis-scripts/before-install.sh b/tools/travis-scripts/before-install.sh
deleted file mode 100755
index 7fcf3d95ae65..000000000000
--- a/tools/travis-scripts/before-install.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-
-# exit this script if any commmand fails
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../..
-HOST_NAME=""
-CURL="curl --retry 999 --retry-max-time 0"
-
-function install_android_sdk()
-{
-    echo "Installing android ndk ..."
-    # sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-    # sudo python get-pip.py
-    # sudo python -m pip install retry
-    python -m pip install --upgrade pip
-    which python
-    which pip
-    python -V
-    pip -V
-    pip install retry
-    mkdir -p ~/.android/ && touch ~/.android/repositories.cfg # Ensure cmdline-tools works well
-    # cmdlinetools: commandlinetools-mac-7302050_latest.zip commandlinetools-win-7302050_latest.zip commandlinetools-linux-7302050_latest.zip
-    # platforms:android-30 build-tools:30.0.3
-    # full cmd: echo yes|cmdline-tools/bin/sdkmanager --verbose --sdk_root=sdk platform-tools "cmdline-tools;latest" "platforms;android-28" "build-tools;29.0.2" "ndk;19.2.5345600"
-    if [ "$BUILD_TARGET" == "android" ]\
-        || [ "$BUILD_TARGET" == "android_lua" ] ; then
-        python $ADXE_ROOT/tools/appveyor-scripts/setup_android.py
-    else
-        python $ADXE_ROOT/tools/appveyor-scripts/setup_android.py --ndk_only
-    fi
-}
-
-function install_linux_environment()
-{
-    echo "Installing linux dependence packages ..."
-    echo -e "y" | bash $ADXE_ROOT/install-deps-linux.sh
-    echo "Installing linux dependence packages finished!"
-}
-
-function install_python_module_for_osx()
-{
-    pip install PyYAML
-    sudo pip install Cheetah
-}
-
-# set up environment according os and target
-function install_environement_for_pull_request()
-{
-    echo "Building pull request ..."
-
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-        sudo apt-get update
-        sudo apt-get install ninja-build
-        ninja --version
-
-        sudo apt-get install nasm
-        nasm -v
-        
-        if [ "$BUILD_TARGET" == "linux" ]; then
-            install_linux_environment
-        fi
-
-        if [ "$BUILD_TARGET" == "android" ]; then
-            install_android_sdk
-        fi
-    fi
-
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        brew install nasm
-        nasm -v
-        
-        install_python_module_for_osx
-    fi
-}
-
-# should generate binding codes & cocos_files.json after merging
-# function install_environement_for_after_merge()
-# {
-#     if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-#         install_python_module_for_osx
-#     fi
-
-#     echo "Building merge commit ..."
-# }
-
-# install newer python for android for ssl connection
-if [ "$BUILD_TARGET" == "android" ]; then
-    if [ $GITHUB_CI ]; then
-        echo "Installing pyenv for github ci..."
-        curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
-        export PATH="/home/runner/.pyenv/bin:$PATH"
-    else
-        # upgrade pyenv
-        cd $(pyenv root) && git checkout master && git pull && cd -
-    fi
-    pyenv install --list
-    pyenv install $PYENV_VERSION
-    pyenv versions
-    # pip install pyOpenSSL ndg-httpsclient pyasn1
-    # set by PYENV_VERSION environment variable implicit
-    # pyenv global $PYENV_VERSION
-fi
-
-python -V
-cmake --version
-
-if [ "$BUILD_TARGET" == "android_cocos_new_test" ]; then
-    sudo apt-get update
-    sudo apt-get install ninja-build
-    ninja --version
-    sudo pip install retry
-    python $ADXE_ROOT/tools/appveyor-scripts/setup_android.py
-    exit 0
-fi
-
-if [ "$BUILD_TARGET" == "linux_cocos_new_test" ]; then
-    install_linux_environment
-    # linux new lua project, so need to install
-    sudo pip install retry
-    python $ADXE_ROOT/tools/appveyor-scripts/setup_android.py --ndk_only
-    exit 0
-fi
-
-# build pull request
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-    install_environement_for_pull_request
-fi
-
-# run after merging
-# - make cocos robot to send PR to cocos2d-x for new binding codes
-# - generate cocos_files.json for template
-# if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-#     # only one job need to send PR, linux virtual machine has better performance
-#     if [ $TRAVIS_OS_NAME == "linux" ] && [ x$GEN_BINDING_AND_COCOSFILE == x"true" ]; then
-#         install_environement_for_after_merge
-#     fi 
-# fi
-
-echo "before-install.sh execution finished!"
diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh
deleted file mode 100755
index 758e942633fa..000000000000
--- a/tools/travis-scripts/run-script.sh
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/bin/bash
-
-# exit this script if any commmand fails
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ADXE_ROOT="$DIR"/../..
-COCOSFILE_PATH="$ADXE_ROOT/templates/cocos2dx_files.json"
-CPU_CORES=4
-
-function do_retry()
-{
-	cmd=$@
-	retry_times=5
-	retry_wait=3
-	c=0
-	while [ $c -lt $((retry_times+1)) ]; do
-		c=$((c+1))
-		echo "Executing \"$cmd\", try $c"
-		$cmd && return $?
-		if [ ! $c -eq $retry_times ]; then
-			echo "Command failed, will retry in $retry_wait secs"
-			sleep $retry_wait
-		else
-			echo "Command failed, giving up."
-			return 1
-		fi
-	done
-}
-
-function build_linux()
-{
-    echo "Building tests ..."
-    # source ../environment.sh
-    cd $ADXE_ROOT
-    set -x
-    cmake . -G "Unix Makefiles" -Bbuild -DCMAKE_BUILD_TYPE=Release
-    cmake --build build --target cpp-tests -- -j `nproc`
-    set +x
-}
-
-function build_osx()
-{
-    NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
-
-    # pushd $ADXE_ROOT
-    # python -u tools/console/bin/adxe.py --agreement n new -l cpp -p my.pack.qqqq cocos_new_test
-    # popd
-    # cd $ADXE_ROOT/cocos_new_test
-    cd $ADXE_ROOT
-    mkdir -p build
-    cmake -S . -B build -GXcode -DBUILD_EXTENSION_IMGUIEXT=ON -DBUILD_DEP_ALSOFT=ON
-    cmake --build build --config Release --target cpp-tests -- -quiet
-    #xcodebuild -project adxe.xcodeproj -alltargets -jobs $NUM_OF_CORES build  | xcpretty
-    ##the following commands must not be removed
-    #xcodebuild -project adxe.xcodeproj -alltargets -jobs $NUM_OF_CORES build
-    exit 0
-}
-
-function build_ios()
-{
-    NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
-
-    # pushd $ADXE_ROOT
-    # python -u tools/console/bin/adxe.py --agreement n new -l cpp -p my.pack.qqqq cocos_new_test
-    # popd
-    # cd $ADXE_ROOT/cocos_new_test
-    cd $ADXE_ROOT
-    # mkdir -p build
-
-    cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.mini.cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DBUILD_DEP_ALSOFT=ON
-    # cmake .. -GXcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DCMAKE_SYSTEM_NAME=iOS -DPLATFORM=OS -DENABLE_ARC=0   # too much logs on console when "cmake --build ."
-    cmake --build build --config Release --target cpp-tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" 
-
-    #xcodebuild -project adxe.xcodeproj -alltargets -jobs $NUM_OF_CORES  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build  | xcpretty
-    ##the following commands must not be removed
-    #xcodebuild -project adxe.xcodeproj -alltargets -jobs $NUM_OF_CORES  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
-    exit 0
-}
-
-function build_android()
-{
-    # Build all samples
-    echo "Building Android samples ..."
-    source ../environment.sh
-
-    # build cpp-tests
-    pushd $ADXE_ROOT/tests/cpp-tests/proj.android
-    
-    do_retry ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake -PPROP_APP_ABI=$BUILD_ARCH --parallel --info
-    popd
-}
-
-function build_android_lua()
-{
-    # Build all samples
-    echo "Building Android samples lua ..."
-    source ../environment.sh
-
-    # build lua-tests
-    pushd $ADXE_ROOT/tests/lua-tests/project/proj.android
-    do_retry ./gradlew assembleDebug -PPROP_BUILD_TYPE=cmake -PPROP_APP_ABI=arm64-v8a --parallel --info
-    popd
-
-}
-
-function genernate_binding_codes()
-{
-    if [ $TRAVIS_OS_NAME == "linux" ]; then
-        # print some log for libstdc++6
-        strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBC
-        ls -l /usr/lib/x86_64-linux-gnu/libstdc++*
-        dpkg-query -W libstdc++6
-        ldd $ADXE_ROOT/tools/bindings-generator/libclang/libclang.so
-    fi
-
-    source ../environment.sh
-
-    # Generate binding glue codes
-
-    echo "Create auto-generated luabinding glue codes."
-    pushd "$ADXE_ROOT/tools/tolua"
-    # python ./genbindings.py
-    popd
-}
-
-# generate cocos_files.json and check diff
-function update_cocos_files()
-{
-    # Don't exit on non-zero return value
-    set +e
-    echo "Updates cocos_files.json"
-    $ADXE_ROOT/tools/travis-scripts/generate-template-files.py
-    git diff FETCH_HEAD --stat --exit-code "$COCOSFILE_PATH"
-    COCOSFILE_DIFF_RETVAL=$?
-    echo $COCOSFILE_DIFF_RETVAL
-
-    # Exit on error
-    set -e
-}
-
-function generate_pull_request_for_binding_codes_and_cocosfiles()
-{
-    local COCOS_ROBOT_REMOTE="https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/adxe.git"
-    local LUA_AUTO_GENERATE_SCRIPT_PATH="$ADXE_ROOT/extensions/scripting/lua-bindings/auto"
-    local ELAPSEDSECS=`date +%s`
-    local COCOS_BRANCH="update_lua_bindings_$ELAPSEDSECS"
-    local COMMITTAG="[ci skip][AUTO]: updating luabinding & cocos_file.json automatically"
-    local PULL_REQUEST_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls"
-
-    pushd "$ADXE_ROOT"
-    #Set git user for cocos2d-lua repo
-    # git config user.email ${GH_EMAIL}
-    # git config user.name ${GH_USER}#Set remotes
-    # git remote add upstream "$COCOS_ROBOT_REMOTE" 2> /dev/null > /dev/null
-
-    # Run status to record the output in the log
-    git status
-
-    echo
-    echo Comparing with origin HEAD ...
-    echo
-    git fetch origin "$TRAVIS_BRANCH"
-
-    # Don't exit on non-zero return value
-    set +e
-    git diff FETCH_HEAD --stat --exit-code "$LUA_AUTO_GENERATE_SCRIPT_PATH"
-    local lua_binding_codes_diff=$?
-
-    # generate cocos_files.json and check diff
-    local cocos_file_diff=$(update_cocos_files)
-    if [ $lua_binding_codes_diff -eq 0 ] && [ $cocos_file_diff -eq 0 ]; then
-        echo "lua binding codes and cocos file are not differences"
-        exit 0
-    fi
-
-
-    # Exit on error
-    set -e
-
-    # git add -f --all "$LUA_AUTO_GENERATE_SCRIPT_PATH"
-    # git add -f --all "$COCOSFILE_PATH"
-    # git checkout -b "$COCOS_BRANCH"
-    # git commit -m "$COMMITTAG"
-
-    echo "Pushing to Robot's repo ..."
-    # git fetch --unshallow origin
-    # git push -f upstream "$COCOS_BRANCH"
-
-    echo "Sending Pull Request to base repo ..."
-    # curl --user "${GH_USER}:${GH_PASSWORD}" --request POST --data "{ \"title\": \"$COMMITTAG\", \"body\": \"\", \"head\": \"${GH_USER}:${COCOS_BRANCH}\", \"base\": \"${TRAVIS_BRANCH}\"}" "${PULL_REQUEST_REPO}" 2> /dev/null > /dev/null
-
-    popd
-}
-
-function run_build()
-{
-    echo "Building..."
-
-    if [ "$BUILD_TARGET" == "android_cocos_new_test" ]; then
-        source ../environment.sh
-        pushd $ADXE_ROOT
-        update_cocos_files
-        python -u tools/console/bin/adxe.py --agreement n new -l cpp -p my.pack.qqqq cocos_new_test
-        popd
-        pushd $ADXE_ROOT/cocos_new_test/proj.android
-        do_retry ./gradlew build
-        popd
-        exit 0
-    fi
-
-    if [ "$BUILD_TARGET" == "linux_cocos_new_test" ]; then
-        export PATH=$PATH:$ADXE_ROOT/tools/console/bin
-        genernate_binding_codes
-        pushd $ADXE_ROOT
-        update_cocos_files
-        python -u tools/console/bin/adxe.py --agreement n new -l lua -p my.pack.qqqq cocos_new_test
-        popd
-        echo "Building tests ..."
-
-        set -x
-        cd $ADXE_ROOT/cocos_new_test
-        mkdir -p linux-build
-        cd linux-build
-        cmake .. -G"Unix Makefiles"
-        cmake --build . -- -j `nproc`
-        exit 0
-    fi
-
-    if [ "$BUILD_TARGET" == "ios_cocos_new_lua_test" ]; then
-        export PATH=$PATH:$ADXE_ROOT/tools/console/bin
-        #NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
-        genernate_binding_codes
-        pushd $ADXE_ROOT
-        echo "Creating tests ..."
-
-        set -x
-        cocos --agreement n new -l lua ios_new_lua_proj
-        cd ios_new_lua_proj
-        mkdir build
-        cd build
-        cmake .. -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
-        cmake --build . --config Release -- -quiet
-        popd
-        exit 0
-    fi
-
-    if [ "$BUILD_TARGET" == "ios_cocos_new_cpp_test" ]; then
-        export PATH=$PATH:$ADXE_ROOT/tools/console/bin
-        #NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
-        genernate_binding_codes
-        pushd $ADXE_ROOT
-        echo "Creating tests ..."
-
-        set -x
-        cocos --agreement n new -l cpp ios_new_cpp_proj
-        cd ios_new_cpp_proj
-        mkdir build
-        cd build
-        echo "Building tests ..."
-        cmake .. -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
-        cmake --build . --config Release -- -quiet 
-        popd
-        exit 0
-    fi
-    
-    if [ $BUILD_TARGET == 'osx' ]; then
-        # genernate_binding_codes
-        set -x
-        build_osx
-        exit 0
-    fi
-
-    if [ $BUILD_TARGET == 'ios' ]; then
-        # genernate_binding_codes
-        set -x
-        build_ios
-        exit 0
-    fi
-
-    # linux
-    if [ $BUILD_TARGET == 'linux' ]; then
-        # genernate_binding_codes
-        build_linux
-    fi
-
-    # android
-    if [ $BUILD_TARGET == 'android' ]; then
-        build_android
-    fi
-
-    # android_lua
-    if [ $BUILD_TARGET == 'android_lua' ]; then
-        genernate_binding_codes
-        build_android_lua
-    fi
-}
-
-function run_after_merge()
-{
-    echo "Building merge commit ..."
-    # Re-generation of the javascript bindings can perform push of the new
-    # version back to github.  We don't do this for pull requests, or if
-    # GH_USER/GH_EMAIL/GH_PASSWORD environment variables are not set correctly
-    # by the encoded variables in the .travis.yml file.  (e.g. if cloned repo's
-    # want to use travis).
-    # if [ -z "${GH_EMAIL}" ]; then
-    #     echo "GH_EMAIL not set"
-    #     exit 1
-    # fi
-    # if [ -z "${GH_USER}" ]; then
-    #     echo "GH_USER not set"
-    #     exit 1
-    # fi
-    # if [ -z "${GH_PASSWORD}" ]; then
-    #     echo "GH_USER not set"
-    #     exit 1
-    # fi
-
-    genernate_binding_codes
-    generate_pull_request_for_binding_codes_and_cocosfiles
-}
-
-run_build
-
-# build pull request
-# if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-#     run_pull_request
-# fi
-
-# run after merging
-# - make cocos robot to send PR to cocos2d-x for new binding codes
-# - generate cocos_files.json for template
-# if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-#     # only one job need to send PR, linux virtual machine has better performance
-#     if [ $TRAVIS_OS_NAME == "linux" ] && [ x$GEN_BINDING_AND_COCOSFILE == x"true" ]; then
-#         run_after_merge
-#     fi
-# fi
diff --git a/tools/unix-ci/before-install.sh b/tools/unix-ci/before-install.sh
new file mode 100755
index 000000000000..7145a9de42ad
--- /dev/null
+++ b/tools/unix-ci/before-install.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# exit this script if any commmand fails
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ADXE_ROOT="$DIR"/../..
+HOST_NAME=""
+CURL="curl --retry 999 --retry-max-time 0"
+
+function install_android_sdk()
+{
+    echo "Installing android ndk ..."
+    # sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    # sudo python get-pip.py
+    # sudo python -m pip install retry
+    python -m pip install --upgrade pip
+    which python
+    which pip
+    python -V
+    pip -V
+    pip install retry
+    mkdir -p ~/.android/ && touch ~/.android/repositories.cfg # Ensure cmdline-tools works well
+    # cmdlinetools: commandlinetools-mac-7302050_latest.zip commandlinetools-win-7302050_latest.zip commandlinetools-linux-7302050_latest.zip
+    # platforms:android-30 build-tools:30.0.3
+    # full cmd: echo yes|cmdline-tools/bin/sdkmanager --verbose --sdk_root=sdk platform-tools "cmdline-tools;latest" "platforms;android-28" "build-tools;29.0.2" "ndk;19.2.5345600"
+    if [ "$BUILD_TARGET" == "android" ]\
+        || [ "$BUILD_TARGET" == "android_lua" ] ; then
+        python $ADXE_ROOT/tools/unix-ci/setup_android.py
+    else
+        python $ADXE_ROOT/tools/unix-ci/setup_android.py --ndk_only
+    fi
+}
+
+function install_linux_environment()
+{
+    echo "Installing linux dependence packages ..."
+    echo -e "y" | bash $ADXE_ROOT/install-deps-linux.sh
+    echo "Installing linux dependence packages finished!"
+}
+
+function install_python_module_for_osx()
+{
+    pip install PyYAML
+    sudo pip install Cheetah
+}
+
+# set up environment according os and target
+function install_environement()
+{
+    echo "Installing environement ..."
+
+    if [ "$GH_OS_NAME" == "linux" ]; then
+        sudo apt-get update
+        sudo apt-get install ninja-build
+        ninja --version
+
+        sudo apt-get install nasm
+        nasm -v
+        
+        if [ "$BUILD_TARGET" == "linux" ]; then
+            install_linux_environment
+        fi
+
+        if [ "$BUILD_TARGET" == "android" ]; then
+            install_android_sdk
+        fi
+    fi
+
+    if [ "$GH_OS_NAME" == "osx" ]; then
+        brew install nasm
+        nasm -v
+        
+        install_python_module_for_osx
+    fi
+}
+
+# install newer python for android for ssl connection
+if [ "$GH_OS_NAME" == "linux" ]; then
+    echo "Installing pyenv for github ci..."
+    curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
+    export PATH="/home/runner/.pyenv/bin:$PATH"
+    pyenv install --list
+    pyenv install $PYENV_VERSION
+    pyenv versions
+fi
+
+python -V
+cmake --version
+
+install_environement
+
+echo "before-install.sh execution finished!"
diff --git a/tools/travis-scripts/config.gitignore b/tools/unix-ci/config.gitignore
old mode 100644
new mode 100755
similarity index 100%
rename from tools/travis-scripts/config.gitignore
rename to tools/unix-ci/config.gitignore
diff --git a/tools/travis-scripts/for-each-file-in-dir.sh b/tools/unix-ci/for-each-file-in-dir.sh
similarity index 100%
rename from tools/travis-scripts/for-each-file-in-dir.sh
rename to tools/unix-ci/for-each-file-in-dir.sh
diff --git a/tools/travis-scripts/generate-template-files.py b/tools/unix-ci/generate-template-files.py
similarity index 100%
rename from tools/travis-scripts/generate-template-files.py
rename to tools/unix-ci/generate-template-files.py
diff --git a/tools/unix-ci/run-script.sh b/tools/unix-ci/run-script.sh
new file mode 100755
index 000000000000..24ef4f541ee1
--- /dev/null
+++ b/tools/unix-ci/run-script.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# exit this script if any commmand fails
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ADXE_ROOT="$DIR"/../..
+CPU_CORES=4
+
+function do_retry()
+{
+	cmd=$@
+	retry_times=5
+	retry_wait=3
+	c=0
+	while [ $c -lt $((retry_times+1)) ]; do
+		c=$((c+1))
+		echo "Executing \"$cmd\", try $c"
+		$cmd && return $?
+		if [ ! $c -eq $retry_times ]; then
+			echo "Command failed, will retry in $retry_wait secs"
+			sleep $retry_wait
+		else
+			echo "Command failed, giving up."
+			return 1
+		fi
+	done
+}
+
+function build_linux()
+{
+    # source ../environment.sh
+    cd $ADXE_ROOT
+    set -x
+    cmake . -G "Unix Makefiles" -Bbuild -DCMAKE_BUILD_TYPE=Release
+    cmake --build build --target cpp-tests -- -j `nproc`
+    set +x
+}
+
+function build_osx()
+{
+    NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
+
+    cd $ADXE_ROOT
+    mkdir -p build
+    cmake -S . -B build -GXcode -DBUILD_EXTENSION_IMGUIEXT=ON -DBUILD_DEP_ALSOFT=ON
+    cmake --build build --config Release --target cpp-tests -- -quiet
+
+    exit 0
+}
+
+function build_ios()
+{
+    NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
+
+    cd $ADXE_ROOT
+
+    cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.mini.cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DBUILD_DEP_ALSOFT=ON
+    # cmake .. -GXcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DCMAKE_SYSTEM_NAME=iOS -DPLATFORM=OS -DENABLE_ARC=0   # too much logs on console when "cmake --build ."
+    cmake --build build --config Release --target cpp-tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" 
+
+    exit 0
+}
+
+function build_android()
+{
+    # Build all samples
+    echo "Building Android samples ..."
+    source ../environment.sh
+
+    # build cpp-tests
+    pushd $ADXE_ROOT/tests/cpp-tests/proj.android
+    
+    do_retry ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake -PPROP_APP_ABI=$BUILD_ARCH --parallel --info
+    popd
+}
+
+function run_build()
+{
+    echo "Building..."
+    
+    if [ $BUILD_TARGET == 'osx' ]; then
+        set -x
+        build_osx
+        exit 0
+    fi
+
+    if [ $BUILD_TARGET == 'ios' ]; then
+        set -x
+        build_ios
+        exit 0
+    fi
+
+    # linux
+    if [ $BUILD_TARGET == 'linux' ]; then
+        build_linux
+    fi
+
+    # android
+    if [ $BUILD_TARGET == 'android' ]; then
+        build_android
+    fi
+}
+
+run_build
+
diff --git a/tools/appveyor-scripts/setup_android.py b/tools/unix-ci/setup_android.py
similarity index 100%
rename from tools/appveyor-scripts/setup_android.py
rename to tools/unix-ci/setup_android.py
diff --git a/tools/windows-ci/build.ps1 b/tools/win-ci/build.ps1
similarity index 100%
rename from tools/windows-ci/build.ps1
rename to tools/win-ci/build.ps1
diff --git a/tools/win-ci/genbindings.ps1 b/tools/win-ci/genbindings.ps1
new file mode 100644
index 000000000000..5a81624d957a
--- /dev/null
+++ b/tools/win-ci/genbindings.ps1
@@ -0,0 +1,37 @@
+## Installing pyenv
+mkdir $HOME/.pyenv/
+mkdir pyenv
+
+curl -L "https://github.com/pyenv-win/pyenv-win/archive/master.zip" -o "pyenv-win.zip"
+Expand-Archive -Path pyenv-win.zip -DestinationPath .\
+$pyenv_root="$HOME\.pyenv"
+move "pyenv-win-master\pyenv-win" "$pyenv_root\"
+$pyenv_bin="$pyenv_root\pyenv-win\bin"
+
+$env:Path = "$pyenv_bin;$env:Path"
+
+## Installing python-2.7.18-win32 and install packages
+pyenv install -l
+pyenv install 2.7.18-win32
+
+$python_root="$pyenv_root\pyenv-win\versions\2.7.18-win32"
+
+$env:Path = "$python_root\Scripts\;$python_root\;$env:Path"
+
+(Get-Command python.exe).Path
+python -V
+
+pip install PyYAML Cheetah
+
+## download ndk
+curl -L "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" -o "android-ndk-r19c-windows-x86_64.zip"
+Expand-Archive -Path android-ndk-r19c-windows-x86_64.zip -DestinationPath .\
+ls
+$ndk_root=(Resolve-Path .\android-ndk-r19c).Path
+$env:ANDROID_NDK=$ndk_root
+
+
+## run genbindings.py
+pwd
+cd tools/tolua
+python genbindings.py